From e800b4433fe87669e960aa35361852217fb5721f Mon Sep 17 00:00:00 2001 From: Alex Ferguson Date: Sat, 20 Nov 2010 15:44:01 +0200 Subject: [PATCH] netsurf: Update netsurf, dependancies, add netsurf-fb recipe. Updated netsurf-2.1 to netsurf-2.6 and updated fix_makefile.patch and debugxml_fix.patch for netsurf-2.6. Updated hubbub, libnsbmp, libnsgif, libparserutils from version 0.0.1 to version 0.0.2. Added two new recipes libcss and libwapcaplet which are needed by netsurf-2.6. Recipe libcss comes with patch no-werror.patch which removed the definition of -Werror from the makefile for building with gcc-4.5, as per the recommendation of the netsurf developers. Added netsurf-fb recipe, which builds netsurf with a framebuffer frontend, which is much lighter than the GTK frontend (and can run under a plain tty). The framebuffer frontend is set to use SDL because it's the most stable backend at the moment. Font rendering is handled by freetype and uses the DejaVu fonts. Added libnsfb, a framebuffer abstraction layer library needed by netsurf-fb along with a patch, no-werror.patch, which removes the definition of -Werror from the makefile for building with gcc-4.5. Signed-off-by: Alex Ferguson Signed-off-by: Kristoffer Ericson --- recipes/netsurf/hubbub_0.0.2.bb | 33 +++++++++ recipes/netsurf/libcss-0.0.2/no-werror.patch | 16 +++++ recipes/netsurf/libcss_0.0.2.bb | 30 +++++++++ recipes/netsurf/libnsbmp_0.0.2.bb | 27 ++++++++ recipes/netsurf/libnsfb/no-werror.patch | 12 ++++ recipes/netsurf/libnsfb_svn.bb | 32 +++++++++ recipes/netsurf/libnsgif_0.0.2.bb | 28 ++++++++ recipes/netsurf/libparserutils_0.0.2.bb | 39 +++++++++++ recipes/netsurf/libwapcaplet_0.0.2.bb | 28 ++++++++ recipes/netsurf/netsurf-2.6/Makefile.config | 9 +++ .../netsurf/netsurf-2.6/debugxml_fix.patch | 63 ++++++++++++++++++ .../netsurf/netsurf-2.6/fix_makefile.patch | 12 ++++ recipes/netsurf/netsurf-2.6/netsurf.desktop | 10 +++ recipes/netsurf/netsurf-2.6/netsurf.png | Bin 0 -> 9329 bytes recipes/netsurf/netsurf-fb/Makefile.config | 19 ++++++ recipes/netsurf/netsurf-fb/debugxml_fix.patch | 63 ++++++++++++++++++ recipes/netsurf/netsurf-fb/fix_makefile.patch | 12 ++++ recipes/netsurf/netsurf-fb_svn.bb | 31 +++++++++ recipes/netsurf/netsurf_2.6.bb | 37 ++++++++++ 19 files changed, 501 insertions(+) create mode 100644 recipes/netsurf/hubbub_0.0.2.bb create mode 100644 recipes/netsurf/libcss-0.0.2/no-werror.patch create mode 100644 recipes/netsurf/libcss_0.0.2.bb create mode 100644 recipes/netsurf/libnsbmp_0.0.2.bb create mode 100644 recipes/netsurf/libnsfb/no-werror.patch create mode 100644 recipes/netsurf/libnsfb_svn.bb create mode 100644 recipes/netsurf/libnsgif_0.0.2.bb create mode 100644 recipes/netsurf/libparserutils_0.0.2.bb create mode 100644 recipes/netsurf/libwapcaplet_0.0.2.bb create mode 100644 recipes/netsurf/netsurf-2.6/Makefile.config create mode 100644 recipes/netsurf/netsurf-2.6/debugxml_fix.patch create mode 100644 recipes/netsurf/netsurf-2.6/fix_makefile.patch create mode 100644 recipes/netsurf/netsurf-2.6/netsurf.desktop create mode 100644 recipes/netsurf/netsurf-2.6/netsurf.png create mode 100644 recipes/netsurf/netsurf-fb/Makefile.config create mode 100644 recipes/netsurf/netsurf-fb/debugxml_fix.patch create mode 100644 recipes/netsurf/netsurf-fb/fix_makefile.patch create mode 100644 recipes/netsurf/netsurf-fb_svn.bb create mode 100644 recipes/netsurf/netsurf_2.6.bb diff --git a/recipes/netsurf/hubbub_0.0.2.bb b/recipes/netsurf/hubbub_0.0.2.bb new file mode 100644 index 0000000000..e488f8d6cb --- /dev/null +++ b/recipes/netsurf/hubbub_0.0.2.bb @@ -0,0 +1,33 @@ +DESCRIPTION = "Hubbub is an HTML5 compliant parsing library" +HOMEPAGE = "http://www.netsurf-browser.org/projects/hubbub/" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "MIT" +DEPENDS = "libparserutils" + +SRC_URI = "http://www.netsurf-browser.org/projects/releases/hubbub-${PV}-src.tar.gz" + +PR = "r0" + +inherit pkgconfig + +EXTRA_OEMAKE = "CURDIR=${S} DESTDIR=${D} PREFIX=${prefix} BUILDDIR=build-OE" + +# NOTE: we're using default buildmode here, which results in building only +# static libraries (.a) Not a problem as hubbub is only used by Netsurf +# at the moment + +do_stage() { + oe_libinstall -a -C build-OE/ libhubbub ${STAGING_LIBDIR} + + install -d ${STAGING_INCDIR}/hubbub + install -m 0644 include/hubbub/*.h ${STAGING_INCDIR}/hubbub +} + + +do_install() { + oe_runmake install +} + +SRC_URI[md5sum] = "dbdc6bb13a71ce72384d7ee5891a0382" +SRC_URI[sha256sum] = "fd195b91e80ef2ea1f558f94bd5bb5df89228b1af3e9b7c5c1039f65d506aa1d" diff --git a/recipes/netsurf/libcss-0.0.2/no-werror.patch b/recipes/netsurf/libcss-0.0.2/no-werror.patch new file mode 100644 index 0000000000..9becd0d682 --- /dev/null +++ b/recipes/netsurf/libcss-0.0.2/no-werror.patch @@ -0,0 +1,16 @@ +diff -ru libcss-0.0.2.old/Makefile libcss-0.0.2/Makefile +--- libcss-0.0.2.old/Makefile 2010-09-21 22:32:37.000000000 +0300 ++++ libcss-0.0.2/Makefile 2010-11-18 21:30:11.206667670 +0200 +@@ -13,12 +13,6 @@ + WARNFLAGS := -Wall -W -Wundef -Wpointer-arith -Wcast-align \ + -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes \ + -Wmissing-declarations -Wnested-externs -pedantic +-# BeOS/Haiku/AmigaOS4 standard library headers create warnings +-ifneq ($(TARGET),beos) +- ifneq ($(TARGET),AmigaOS) +- WARNFLAGS := $(WARNFLAGS) -Werror +- endif +-endif + CFLAGS := -D_BSD_SOURCE -I$(CURDIR)/include/ \ + -I$(CURDIR)/src $(WARNFLAGS) $(CFLAGS) + ifneq ($(GCCVER),2) diff --git a/recipes/netsurf/libcss_0.0.2.bb b/recipes/netsurf/libcss_0.0.2.bb new file mode 100644 index 0000000000..038c257268 --- /dev/null +++ b/recipes/netsurf/libcss_0.0.2.bb @@ -0,0 +1,30 @@ +DESCRIPTION = "LibCSS is a CSS parser and selection engine, written in C" +HOMEPAGE = "http://www.netsurf-browser.org/projects/libcss/" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "MIT" +DEPENDS = "libwapcaplet" + +SRC_URI = "http://www.netsurf-browser.org/projects/releases/libcss-${PV}-src.tar.gz \ + file://no-werror.patch" + +inherit pkgconfig + +EXTRA_OEMAKE = "CURDIR=${S} DESTDIR=${D} PREFIX=${prefix} BUILDDIR=build-OE" + +# NOTE: we're using default buildmode here, which results in building only +# static libraries (.a) Not a problem as libnsbmp is only used by Netsurf +# at the moment + +do_stage() { + oe_libinstall -a -C build-OE/ libcss ${STAGING_LIBDIR} + install -d ${STAGING_INCDIR}/libcss + install -m 0644 include/libcss/*.h ${STAGING_INCDIR}/libcss +} + +do_install() { + oe_runmake install +} + +SRC_URI[md5sum] = "3bbdd853a2f52db7ab0e2ea3597e62fa" +SRC_URI[sha256sum] = "5205351cb3231173eded5885c22cb7d1c26ae66d3c30c48e2fb826719d78989a" diff --git a/recipes/netsurf/libnsbmp_0.0.2.bb b/recipes/netsurf/libnsbmp_0.0.2.bb new file mode 100644 index 0000000000..15802b504c --- /dev/null +++ b/recipes/netsurf/libnsbmp_0.0.2.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "Libnsbmp is a decoding library for the BMP and ICO image file formats" +HOMEPAGE = "http://www.netsurf-browser.org/projects/libnsbmp/" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "MIT" + +SRC_URI = "http://www.netsurf-browser.org/projects/releases/libnsbmp-${PV}-src.tar.gz" + +inherit pkgconfig + +EXTRA_OEMAKE = "CURDIR=${S} DESTDIR=${D} PREFIX=${prefix} BUILDDIR=build-OE" + +# NOTE: we're using default buildmode here, which results in building only +# static libraries (.a) Not a problem as libnsbmp is only used by Netsurf +# at the moment + +do_stage() { + oe_libinstall -a -C build-OE/ libnsbmp ${STAGING_LIBDIR} + install -m 0644 include/*.h ${STAGING_INCDIR}/ +} + +do_install() { + oe_runmake install +} + +SRC_URI[md5sum] = "6196f5223f744c7c6493421d205e591c" +SRC_URI[sha256sum] = "b18b9252b274699379cadff398e40c727930c9fcfb6bcf8ed3d346e7a93c720e" diff --git a/recipes/netsurf/libnsfb/no-werror.patch b/recipes/netsurf/libnsfb/no-werror.patch new file mode 100644 index 0000000000..defa22bb41 --- /dev/null +++ b/recipes/netsurf/libnsfb/no-werror.patch @@ -0,0 +1,12 @@ +diff -ru libnsfb.orig/Makefile libnsfb/Makefile +--- libnsfb.orig/Makefile 2010-11-18 22:03:40.000000000 +0200 ++++ libnsfb/Makefile 2010-11-18 22:04:51.803334238 +0200 +@@ -13,7 +13,7 @@ + # Toolchain flags + WARNFLAGS := -Wall -Wextra -Wundef -Wpointer-arith -Wcast-align \ + -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes \ +- -Wmissing-declarations -Wnested-externs -Werror -pedantic \ ++ -Wmissing-declarations -Wnested-externs -pedantic \ + -Wno-overlength-strings # For nsglobe.c + CFLAGS := -g -std=c99 -D_BSD_SOURCE -I$(CURDIR)/include/ \ + -I$(CURDIR)/src $(WARNFLAGS) $(CFLAGS) diff --git a/recipes/netsurf/libnsfb_svn.bb b/recipes/netsurf/libnsfb_svn.bb new file mode 100644 index 0000000000..41d8d1b302 --- /dev/null +++ b/recipes/netsurf/libnsfb_svn.bb @@ -0,0 +1,32 @@ +DESCRIPTION = "LibNSFB is a framebuffer abstraction library, written in C" +HOMEPAGE = "http://www.netsurf-browser.org/projects/libnsfb/" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "MIT" +DEPENDS = "xcb-util" + +SRCREV = "10944" +PV = "0.0.1+svnr${SRCPV}" +PR = "r0" + +SRC_URI = "svn://svn.netsurf-browser.org/trunk;module=libnsfb \ + file://no-werror.patch" + +S = ${WORKDIR}/libnsfb + +inherit pkgconfig + +EXTRA_OEMAKE = "CURDIR=${S} DESTDIR=${D} PREFIX=${prefix} BUILDDIR=build-OE" + +# NOTE: we're using default buildmode here, which results in building only +# static libraries (.a) Not a problem as libnsbmp is only used by Netsurf +# at the moment + +do_stage() { + oe_libinstall -a -C build-OE/ libnsfb ${STAGING_LIBDIR} + install -m 0644 include/*.h ${STAGING_INCDIR}/ +} + +do_install() { + oe_runmake install +} diff --git a/recipes/netsurf/libnsgif_0.0.2.bb b/recipes/netsurf/libnsgif_0.0.2.bb new file mode 100644 index 0000000000..f9184b64ac --- /dev/null +++ b/recipes/netsurf/libnsgif_0.0.2.bb @@ -0,0 +1,28 @@ +DESCRIPTION = "Libnsgif is a decoding library for the GIF image file format" +HOMEPAGE = "http://www.netsurf-browser.org/projects/libnsgif/" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "MIT" + +SRC_URI = "http://www.netsurf-browser.org/projects/releases/libnsgif-${PV}-src.tar.gz" +PR = "r0" + +inherit pkgconfig + +EXTRA_OEMAKE = "CURDIR=${S} DESTDIR=${D} PREFIX=${prefix} BUILDDIR=build-OE" + +# NOTE: we're using default buildmode here, which results in building only +# static libraries (.a) Not a problem as libnsbmp is only used by Netsurf +# at the moment + +do_stage() { + oe_libinstall -a -C build-OE/ libnsgif ${STAGING_LIBDIR} + install -m 0644 include/*.h ${STAGING_INCDIR}/ +} + +do_install() { + oe_runmake install +} + +SRC_URI[md5sum] = "08dd5fc3ea330784f6c1e55c58244749" +SRC_URI[sha256sum] = "dcb68be6a49ecc376cfa283d2f1e7eae035c75f99c0934ac80951e1777059617" diff --git a/recipes/netsurf/libparserutils_0.0.2.bb b/recipes/netsurf/libparserutils_0.0.2.bb new file mode 100644 index 0000000000..3e2623b399 --- /dev/null +++ b/recipes/netsurf/libparserutils_0.0.2.bb @@ -0,0 +1,39 @@ +DESCRIPTION = "LibParserUtils is a library for building efficient parsers" +HOMEPAGE = "http://www.netsurf-browser.org/projects/libparserutils/" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "MIT" + +SRC_URI = "http://www.netsurf-browser.org/projects/releases/libparserutils-${PV}-src.tar.gz" + +inherit pkgconfig + +EXTRA_OEMAKE = "CURDIR=${S} DESTDIR=${D} PREFIX=${prefix} BUILDDIR=build-OE" + +# NOTE: we're using default buildmode here, which results in building only +# static libraries (.a) Not a problem as libparserutils is only used by Netsurf +# at the moment + +do_stage () { + oe_libinstall -a -C build-OE/ libparserutils ${STAGING_LIBDIR} + + install -d ${STAGING_INCDIR}/parserutils + install -d ${STAGING_INCDIR}/parserutils/charset + install -d ${STAGING_INCDIR}/parserutils/input + install -d ${STAGING_INCDIR}/parserutils/utils + install -m 0644 include/parserutils/*.h ${STAGING_INCDIR}/parserutils + install -m 0644 include/parserutils/charset/*.h \ + ${STAGING_INCDIR}/parserutils/charset + install -m 0644 include/parserutils/input/*.h \ + ${STAGING_INCDIR}/parserutils/input + install -m 0644 include/parserutils/utils/*.h \ + ${STAGING_INCDIR}/parserutils/utils +} + + +do_install() { + oe_runmake install +} + +SRC_URI[md5sum] = "5b2e4ddeebe451cc801ccd6e7da06f87" +SRC_URI[sha256sum] = "769be8da5c9a012d2d968fc814567c1067febf3d3df5e18f1ae2521324dcd923" diff --git a/recipes/netsurf/libwapcaplet_0.0.2.bb b/recipes/netsurf/libwapcaplet_0.0.2.bb new file mode 100644 index 0000000000..4954933a62 --- /dev/null +++ b/recipes/netsurf/libwapcaplet_0.0.2.bb @@ -0,0 +1,28 @@ +DESCRIPTION = "LibWapcaplet is a string internment library, written in C" +HOMEPAGE = "http://www.netsurf-browser.org/projects/libwapcaplet/" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "MIT" + +SRC_URI = "http://www.netsurf-browser.org/projects/releases/libwapcaplet-${PV}-src.tar.gz" + +inherit pkgconfig + +EXTRA_OEMAKE = "CURDIR=${S} DESTDIR=${D} PREFIX=${prefix} BUILDDIR=build-OE" + +# NOTE: we're using default buildmode here, which results in building only +# static libraries (.a) Not a problem as libnsbmp is only used by Netsurf +# at the moment + +do_stage() { + oe_libinstall -a -C build-OE/ libwapcaplet ${STAGING_LIBDIR} + install -d ${STAGING_INCDIR}/libwapcaplet + install -m 0644 include/libwapcaplet/*.h ${STAGING_INCDIR}/libwapcaplet +} + +do_install() { + oe_runmake install +} + +SRC_URI[md5sum] = "c73b5ff5fce55819cc698e8cb486d5eb" +SRC_URI[sha256sum] = "4246215ceff620a882d170b3ef4abaa04fcb4190122a62b6e9b3e662ab880869" diff --git a/recipes/netsurf/netsurf-2.6/Makefile.config b/recipes/netsurf/netsurf-2.6/Makefile.config new file mode 100644 index 0000000000..72c86003f5 --- /dev/null +++ b/recipes/netsurf/netsurf-2.6/Makefile.config @@ -0,0 +1,9 @@ +override NETSURF_USE_BMP := YES +override NETSURF_USE_GIF := YES +override NETSURF_USE_JPEG := YES +override NETSURF_USE_PNG := YES +override NETSURF_USE_MNG := NO +override NETSURF_USE_HARU_PDF := NO +override NETSURF_USE_RSVG := NO +override NETSURF_USE_ROSPRITE := NO + diff --git a/recipes/netsurf/netsurf-2.6/debugxml_fix.patch b/recipes/netsurf/netsurf-2.6/debugxml_fix.patch new file mode 100644 index 0000000000..df7b635140 --- /dev/null +++ b/recipes/netsurf/netsurf-2.6/debugxml_fix.patch @@ -0,0 +1,63 @@ +diff -ru netsurf-old/gtk/gtk_scaffolding.c netsurf/gtk/gtk_scaffolding.c +--- netsurf-old/gtk/gtk_scaffolding.c 2010-09-18 23:53:43.000000000 +0300 ++++ netsurf/gtk/gtk_scaffolding.c 2010-11-18 18:16:07.650000875 +0200 +@@ -27,7 +27,6 @@ + #include + #include + #include +-#include + #include "gtk/gtk_scaffolding.h" + #include "content/content.h" + #include "content/hlcache.h" +@@ -1099,50 +1098,7 @@ + + MULTIHANDLER(savedomtree) + { +- GtkWidget *save_dialog; +- +- save_dialog = gtk_file_chooser_dialog_new("Save File", g->window, +- GTK_FILE_CHOOSER_ACTION_SAVE, +- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, +- GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, +- NULL); +- +- gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(save_dialog), +- getenv("HOME") ? getenv("HOME") : "/"); +- +- gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(save_dialog), +- "domtree.txt"); +- +- if (gtk_dialog_run(GTK_DIALOG(save_dialog)) == GTK_RESPONSE_ACCEPT) { +- gchar *filename = gtk_file_chooser_get_filename( +- GTK_FILE_CHOOSER(save_dialog)); +- FILE *fh; +- LOG(("Saving dom tree to %s...\n", filename)); +- +- fh = fopen((const char *) filename, "w"); +- if (fh == NULL) { +- warn_user("Error saving box tree dump.", +- "Unable to open file for writing."); +- } else { +- struct browser_window *bw; +- bw = gui_window_get_browser_window(g->top_level); +- +- if (bw->current_content && +- content_get_type(bw->current_content) == +- CONTENT_HTML) { +- xmlDebugDumpDocument(fh, +- html_get_document(bw->current_content)); +- } +- +- fclose(fh); +- } +- +- g_free(filename); +- } +- +- gtk_widget_destroy(save_dialog); +- +- return TRUE; ++ return FALSE; + } + + diff --git a/recipes/netsurf/netsurf-2.6/fix_makefile.patch b/recipes/netsurf/netsurf-2.6/fix_makefile.patch new file mode 100644 index 0000000000..a8cea0f34f --- /dev/null +++ b/recipes/netsurf/netsurf-2.6/fix_makefile.patch @@ -0,0 +1,12 @@ +diff -ru netsurf-old/Makefile netsurf/Makefile +--- netsurf-old/Makefile 2010-09-21 22:35:54.000000000 +0300 ++++ netsurf/Makefile 2010-11-18 18:13:37.793334209 +0200 +@@ -842,7 +842,7 @@ + @cp -RL gtk/res/toolbarIndices $(DESTDIR)$(NETSURF_GTK_RESOURCES) + @cp -RL gtk/res/Aliases $(DESTDIR)$(NETSURF_GTK_RESOURCES) + @cp -RL gtk/res/SearchEngines $(DESTDIR)$(NETSURF_GTK_RESOURCES) +- @cp -RL gtk/res/docs $(DESTDIR)$(NETSURF_GTK_RESOURCES) ++# @cp -RL gtk/res/docs $(DESTDIR)$(NETSURF_GTK_RESOURCES) + @cp -RL gtk/res/themes $(DESTDIR)$(NETSURF_GTK_RESOURCES) + @# Install translations + @cp -RL gtk/res/C $(DESTDIR)$(NETSURF_GTK_RESOURCES) diff --git a/recipes/netsurf/netsurf-2.6/netsurf.desktop b/recipes/netsurf/netsurf-2.6/netsurf.desktop new file mode 100644 index 0000000000..4188d3019d --- /dev/null +++ b/recipes/netsurf/netsurf-2.6/netsurf.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Type=Application +Name=NetSurf +Comment=NetSurf Web Browser +GenericName=Web Browser +Icon=netsurf +Exec=netsurf +Terminal=false +StartupNotify=false +Categories=Network;WebBrowser; diff --git a/recipes/netsurf/netsurf-2.6/netsurf.png b/recipes/netsurf/netsurf-2.6/netsurf.png new file mode 100644 index 0000000000000000000000000000000000000000..3064e5d4f37bb31f98c6acdbce3807a905d3ebcb GIT binary patch literal 9329 zcmYj%2{=@5^#7gJm>CR>G1;2xTg@;uNJKGXNhpndugNZA>`5{UB|;0SP}Xm@WY1E} z$d*Eu3fUz~wl+)1f4;xp^Z!5p`#kUaKKI`D-20w;&iS14o_lW6&5T5l(ntURM2t@v zSO~^wLA!y0|JPHMOay~)D3j*-e{TR^RHjV@CvX>2BZHm)IfU)jhX0$!JY^pw7*G9A zJNd>(2LSdzGB%)DT^?G@h{$($-`!ee@Gqg|!2@aIgp0T0I`ra<7Y`t@X6(8Y4>qY-I?$) z|Hz0ZpI`h9_gp;YIo9>(+PCoMW9K5Oa^x1hjI@V(5<@Fp?e}o`O_l$h-|yl0Q@xF} zr4iCp!96$!ek-&xhfQ!>8`~kB4ett)))ZVe6p4;p4gZz1=jQ`HW4goh#JBeSLR_w> zL*rj1|J~@vYcDIh>eeUujFGy|wC67aDViH!oa^N;Gu*mQtaWKGH%3t|f2zOsD~G?6 z6x6jbA=Wl1Ao$tU)i5O&HmuUu@cY@=&Na`oTHZ5VOW};~S1w1s+ye+LzX0XPi6A5w z;v^MqOU|9ZAD<9D9JL`cN^xM>4Wwy|MTU8H>+U?&mGd0?`FPJxO~vxHHRrHScS#~1 z;~%vtc8!t>(`200-HsTO@!U-W-o!~3*~kT+f(RJKtd=H442v7R{PTg!H$4|P8lLKW z6#sHL^2O+%8C@~Bl+()3Ct;|0?w;X3zoFnZxwR3EKT$9QG3HF#wIBB$QW?x&u;#R} ztKXhY0sPf7{(qLjJclgLZg+*X+7mN!5{F)fw}duQl#LSNm;$cwQF+ijNW7%o0lwim}9$iema~Bt)@K(|;`bCsokp*Z+VY^kacha^5hI-%NsyN7A{wJL5o_&+>|QGQsX$1UAn+2s z1`yvh(6IeDLJPxFCE&3DuliEN5?u~}S$rgi zmc`@U2L(*t9NY2;yVfMEG5mgTDru~$Xmj)s>Q*Q@f_L`*%WY1crFaVrH^n zf~R-=rmG+UFpf%B5eD?w+5RgQwSsZ6gs0;w#^XKch+2w0%uNq$^UX<~;exU#Shh#�@ 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 Fe*lRf9GL(B literal 0 HcmV?d00001 diff --git a/recipes/netsurf/netsurf-fb/Makefile.config b/recipes/netsurf/netsurf-fb/Makefile.config new file mode 100644 index 0000000000..ebb6d4eef1 --- /dev/null +++ b/recipes/netsurf/netsurf-fb/Makefile.config @@ -0,0 +1,19 @@ +override NETSURF_USE_BMP := YES +override NETSURF_USE_GIF := YES +override NETSURF_USE_JPEG := YES +override NETSURF_USE_PNG := YES +override NETSURF_USE_MNG := NO +override NETSURF_USE_HARU_PDF := NO +override NETSURF_USE_RSVG := NO +override NETSURF_USE_ROSPRITE := NO +override NETSURF_FB_FRONTEND := sdl + +override NETSURF_FB_FONTLIB := freetype +override NETSURF_FB_FONT_SANS_SERIF := /usr/share/fonts/truetype/DejaVuSans.ttf +override NETSURF_FB_FONT_SANS_SERIF_BOLD := /usr/share/fonts/truetype/DejaVuSans-Bold.ttf +override NETSURF_FB_FONT_SANS_SERIF_ITALIC := /usr/share/fonts/truetype/DejaVuSans-Oblique.ttf +override NETSURF_FB_FONT_SANS_SERIF_ITALIC_BOLD := /usr/share/fonts/truetype/DejaVuSans-BoldOblique.ttf +override NETSURF_FB_FONT_SERIF := /usr/share/fonts/truetype/DejaVuSerif.ttf +override NETSURF_FB_FONT_SERIF_BOLD := /usr/share/fonts/truetype/DejaVuSerif-Bold.ttf +override NETSURF_FB_FONT_MONOSPACE := /usr/share/fonts/truetype/DejaVuSansMono.ttf +override NETSURF_FB_FONT_MONOSPACE_BOLD := /usr/share/fonts/truetype/DejaVuSansMono-Bold.ttf diff --git a/recipes/netsurf/netsurf-fb/debugxml_fix.patch b/recipes/netsurf/netsurf-fb/debugxml_fix.patch new file mode 100644 index 0000000000..df7b635140 --- /dev/null +++ b/recipes/netsurf/netsurf-fb/debugxml_fix.patch @@ -0,0 +1,63 @@ +diff -ru netsurf-old/gtk/gtk_scaffolding.c netsurf/gtk/gtk_scaffolding.c +--- netsurf-old/gtk/gtk_scaffolding.c 2010-09-18 23:53:43.000000000 +0300 ++++ netsurf/gtk/gtk_scaffolding.c 2010-11-18 18:16:07.650000875 +0200 +@@ -27,7 +27,6 @@ + #include + #include + #include +-#include + #include "gtk/gtk_scaffolding.h" + #include "content/content.h" + #include "content/hlcache.h" +@@ -1099,50 +1098,7 @@ + + MULTIHANDLER(savedomtree) + { +- GtkWidget *save_dialog; +- +- save_dialog = gtk_file_chooser_dialog_new("Save File", g->window, +- GTK_FILE_CHOOSER_ACTION_SAVE, +- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, +- GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, +- NULL); +- +- gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(save_dialog), +- getenv("HOME") ? getenv("HOME") : "/"); +- +- gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(save_dialog), +- "domtree.txt"); +- +- if (gtk_dialog_run(GTK_DIALOG(save_dialog)) == GTK_RESPONSE_ACCEPT) { +- gchar *filename = gtk_file_chooser_get_filename( +- GTK_FILE_CHOOSER(save_dialog)); +- FILE *fh; +- LOG(("Saving dom tree to %s...\n", filename)); +- +- fh = fopen((const char *) filename, "w"); +- if (fh == NULL) { +- warn_user("Error saving box tree dump.", +- "Unable to open file for writing."); +- } else { +- struct browser_window *bw; +- bw = gui_window_get_browser_window(g->top_level); +- +- if (bw->current_content && +- content_get_type(bw->current_content) == +- CONTENT_HTML) { +- xmlDebugDumpDocument(fh, +- html_get_document(bw->current_content)); +- } +- +- fclose(fh); +- } +- +- g_free(filename); +- } +- +- gtk_widget_destroy(save_dialog); +- +- return TRUE; ++ return FALSE; + } + + diff --git a/recipes/netsurf/netsurf-fb/fix_makefile.patch b/recipes/netsurf/netsurf-fb/fix_makefile.patch new file mode 100644 index 0000000000..a8cea0f34f --- /dev/null +++ b/recipes/netsurf/netsurf-fb/fix_makefile.patch @@ -0,0 +1,12 @@ +diff -ru netsurf-old/Makefile netsurf/Makefile +--- netsurf-old/Makefile 2010-09-21 22:35:54.000000000 +0300 ++++ netsurf/Makefile 2010-11-18 18:13:37.793334209 +0200 +@@ -842,7 +842,7 @@ + @cp -RL gtk/res/toolbarIndices $(DESTDIR)$(NETSURF_GTK_RESOURCES) + @cp -RL gtk/res/Aliases $(DESTDIR)$(NETSURF_GTK_RESOURCES) + @cp -RL gtk/res/SearchEngines $(DESTDIR)$(NETSURF_GTK_RESOURCES) +- @cp -RL gtk/res/docs $(DESTDIR)$(NETSURF_GTK_RESOURCES) ++# @cp -RL gtk/res/docs $(DESTDIR)$(NETSURF_GTK_RESOURCES) + @cp -RL gtk/res/themes $(DESTDIR)$(NETSURF_GTK_RESOURCES) + @# Install translations + @cp -RL gtk/res/C $(DESTDIR)$(NETSURF_GTK_RESOURCES) diff --git a/recipes/netsurf/netsurf-fb_svn.bb b/recipes/netsurf/netsurf-fb_svn.bb new file mode 100644 index 0000000000..3d384be1ba --- /dev/null +++ b/recipes/netsurf/netsurf-fb_svn.bb @@ -0,0 +1,31 @@ +DESCRIPTION = "NetSurf is a lightweight, multi-platform web browser." +HOMEPAGE = "http://www.netsurf-browser.org/" +SECTION = "x11/network" +LICENSE = "GPLv2" +SRCREV = "10946" +PV = "2.6+svnr${SRCPV}" +PR = "r0" + +DEPENDS = "virtual/libsdl lemon-native re2c-native jpeg openssl curl \ + libxml2 hubbub libcss libnsfb libnsgif libnsbmp lcms" + +RDEPENDS_${PN} = "ttf-dejavu-sans ttf-dejavu-serif ttf-dejavu-sans-mono" + +SRC_URI = "svn://svn.netsurf-browser.org/trunk;module=netsurf \ + file://fix_makefile.patch \ + file://debugxml_fix.patch \ + file://Makefile.config" + +S = "${WORKDIR}/netsurf" + +EXTRA_OEMAKE = "CURDIR=${S} DESTDIR=${D} PREFIX=${prefix}" + +FILES_${PN} += " /usr/share/netsurf " + +do_configure() { + cp ${WORKDIR}/Makefile.config ${S}/ +} + +do_install() { + oe_runmake TARGET=framebuffer install +} diff --git a/recipes/netsurf/netsurf_2.6.bb b/recipes/netsurf/netsurf_2.6.bb new file mode 100644 index 0000000000..d4b992326e --- /dev/null +++ b/recipes/netsurf/netsurf_2.6.bb @@ -0,0 +1,37 @@ +DESCRIPTION = "Lightweight web browser capable of handling many of the \ +web standards in use today." +HOMEPAGE = "http://www.netsurf-browser.org/" +SECTION = "x11/network" +LICENSE = "GPLv2" + +SRC_URI = "http://www.netsurf-browser.org/downloads/releases/netsurf-${PV}-src.tar.gz \ + file://fix_makefile.patch \ + file://debugxml_fix.patch \ + file://netsurf.png \ + file://netsurf.desktop \ + file://Makefile.config" + +PR = "r0" + +# Workaround for 2.6 tarball (unpacks into netsurf/, not netsurf-2.6/ ) +S = "${WORKDIR}/netsurf" + +DEPENDS = "gtk+ lemon-native re2c-native jpeg openssl curl libxml2 \ + libglade hubbub libcss libnsgif libnsbmp lcms" + +EXTRA_OEMAKE = "CURDIR=${S} DESTDIR=${D} PREFIX=${prefix}" + +do_configure() { + cp ${WORKDIR}/Makefile.config ${S}/ +} + +do_install() { + oe_runmake install + install -d ${D}/${datadir}/applications + install -d ${D}/${datadir}/pixmaps + install -m 0644 ${WORKDIR}/netsurf.png ${D}/${datadir}/pixmaps/ + install -m 0644 ${WORKDIR}/netsurf.desktop ${D}/${datadir}/applications/ +} + +SRC_URI[md5sum] = "8653789d2ede6dbbfe79882afc7538fc" +SRC_URI[sha256sum] = "366ad15e1879776b54882fd6f3fa4e421a049644c029e4c14fc163b76c6fc190" -- 2.39.5