From 38fbc4fad56ec527a5a06373beb736c74d94f5d3 Mon Sep 17 00:00:00 2001 From: Alex Ferguson Date: Sat, 27 Nov 2010 21:04:02 +0200 Subject: [PATCH] netsurf: Remove old/obsolete recipes, update netsurf-fb Removed older versions of recipes for netsurf and its dependancies which were accidentally left behind in the last update. Bumped SRCREV for netsurf-fb for some important framebuffer related changes in the upstream source. Signed-off-by: Alex Ferguson Signed-off-by: Kristoffer Ericson --- .../netsurf/files/hubbub-uninitialised.patch | 35 -------- .../files/libnsgif-strict-aliasing.patch | 82 ------------------ recipes/netsurf/files/netsurf.desktop | 10 --- recipes/netsurf/hubbub_0.0.1.bb | 34 -------- recipes/netsurf/libnsbmp_0.0.1.bb | 27 ------ recipes/netsurf/libnsgif_0.0.1.bb | 30 ------- recipes/netsurf/libparserutils_0.0.1.bb | 39 --------- recipes/netsurf/netsurf-2.1/Makefile.config | 9 -- .../netsurf/netsurf-2.1/debugxml_fix.patch | 64 -------------- .../netsurf/netsurf-2.1/fix_makefile.patch | 12 --- recipes/netsurf/netsurf-2.1/netsurf.desktop | 10 --- recipes/netsurf/netsurf-2.1/netsurf.png | Bin 9329 -> 0 bytes recipes/netsurf/netsurf-fb_svn.bb | 2 +- recipes/netsurf/netsurf_2.1.bb | 37 -------- 14 files changed, 1 insertion(+), 390 deletions(-) delete mode 100644 recipes/netsurf/files/hubbub-uninitialised.patch delete mode 100644 recipes/netsurf/files/libnsgif-strict-aliasing.patch delete mode 100644 recipes/netsurf/files/netsurf.desktop delete mode 100644 recipes/netsurf/hubbub_0.0.1.bb delete mode 100644 recipes/netsurf/libnsbmp_0.0.1.bb delete mode 100644 recipes/netsurf/libnsgif_0.0.1.bb delete mode 100644 recipes/netsurf/libparserutils_0.0.1.bb delete mode 100644 recipes/netsurf/netsurf-2.1/Makefile.config delete mode 100644 recipes/netsurf/netsurf-2.1/debugxml_fix.patch delete mode 100644 recipes/netsurf/netsurf-2.1/fix_makefile.patch delete mode 100644 recipes/netsurf/netsurf-2.1/netsurf.desktop delete mode 100644 recipes/netsurf/netsurf-2.1/netsurf.png delete mode 100644 recipes/netsurf/netsurf_2.1.bb diff --git a/recipes/netsurf/files/hubbub-uninitialised.patch b/recipes/netsurf/files/hubbub-uninitialised.patch deleted file mode 100644 index 4f87120c31..0000000000 --- a/recipes/netsurf/files/hubbub-uninitialised.patch +++ /dev/null @@ -1,35 +0,0 @@ -http://source.netsurf-browser.org/?view=rev&revision=7398 -Initialise variables to stop GCC 4.4 complaining (credit: Jeroen Habraken) - ---- hubbub/src/tokeniser/tokeniser.c 2009/04/06 15:22:16 7052 -+++ hubbub/src/tokeniser/tokeniser.c 2009/05/05 17:18:41 7398 -@@ -787,7 +787,7 @@ - + 1); - } else { - parserutils_error error; -- const uint8_t *cptr; -+ const uint8_t *cptr = NULL; - error = parserutils_inputstream_peek( - tokeniser->input, - tokeniser->context.pending, -@@ -1590,8 +1590,8 @@ - tokeniser->context.match_entity.length - + 1; - } else { -- size_t len; -- const uint8_t *cptr; -+ size_t len = 0; -+ const uint8_t *cptr = NULL; - parserutils_error error; - - error = parserutils_inputstream_peek( -@@ -3137,7 +3137,7 @@ - { - hubbub_token token; - size_t len; -- const uint8_t *cptr; -+ const uint8_t *cptr = NULL; - parserutils_error error; - - /* Calling this with nothing to output is a probable bug */ - diff --git a/recipes/netsurf/files/libnsgif-strict-aliasing.patch b/recipes/netsurf/files/libnsgif-strict-aliasing.patch deleted file mode 100644 index 4fe913c491..0000000000 --- a/recipes/netsurf/files/libnsgif-strict-aliasing.patch +++ /dev/null @@ -1,82 +0,0 @@ -http://source.netsurf-browser.org/?view=rev&revision=9027 -Stop utterly insane palette entry population. -Palette entries are always ABGR, regardless of platform endianness. -This change probably breaks big-endian platforms which, under the old approach, -had palette entries of the form RGBA (assuming I understood the code correctly). - -http://source.netsurf-browser.org/?view=rev&revision=9138 -Fix palette entry population some more. Hopefully, it's completely endian -agnostic now and still builds with GCC 4.4 - ---- libnsgif/src/libnsgif.c 2009/03/29 01:43:27 6984 -+++ libnsgif/src/libnsgif.c 2009/08/09 22:24:14 9138 -@@ -319,19 +319,34 @@ - return GIF_INSUFFICIENT_DATA; - } - for (index = 0; index < gif->colour_table_size; index++) { -- char colour[] = {0, 0, 0, (char)0xff}; -- colour[0] = gif_data[0]; -- colour[1] = gif_data[1]; -- colour[2] = gif_data[2]; -- gif->global_colour_table[index] = *((int *) (void *) colour); -+ /* Gif colour map contents are r,g,b. -+ * -+ * We want to pack them bytewise into the -+ * colour table, such that the red component -+ * is in byte 0 and the alpha component is in -+ * byte 3. -+ */ -+ unsigned char *entry = (unsigned char *) &gif-> -+ global_colour_table[index]; -+ -+ entry[0] = gif_data[0]; /* r */ -+ entry[1] = gif_data[1]; /* g */ -+ entry[2] = gif_data[2]; /* b */ -+ entry[3] = 0xff; /* a */ -+ - gif_data += 3; - } - gif->buffer_position = (gif_data - gif->gif_data); - } else { - /* Create a default colour table with the first two colours as black and white - */ -- gif->global_colour_table[0] = 0xff000000; -- gif->global_colour_table[1] = 0xffffffff; -+ unsigned int *entry = gif->global_colour_table; -+ -+ entry[0] = 0x00000000; -+ /* Force Alpha channel to opaque */ -+ ((unsigned char *) entry)[3] = 0xff; -+ -+ entry[1] = 0xffffffff; - } - } - -@@ -844,11 +859,21 @@ - colour_table = gif->local_colour_table; - if (!clear_image) { - for (index = 0; index < colour_table_size; index++) { -- char colour[] = {0, 0, 0, (char)0xff}; -- colour[0] = gif_data[0]; -- colour[1] = gif_data[1]; -- colour[2] = gif_data[2]; -- colour_table[index] = *((int *) (void *) colour); -+ /* Gif colour map contents are r,g,b. -+ * -+ * We want to pack them bytewise into the -+ * colour table, such that the red component -+ * is in byte 0 and the alpha component is in -+ * byte 3. -+ */ -+ unsigned char *entry = -+ (unsigned char *) &colour_table[index]; -+ -+ entry[0] = gif_data[0]; /* r */ -+ entry[1] = gif_data[1]; /* g */ -+ entry[2] = gif_data[2]; /* b */ -+ entry[3] = 0xff; /* a */ -+ - gif_data += 3; - } - } else { - diff --git a/recipes/netsurf/files/netsurf.desktop b/recipes/netsurf/files/netsurf.desktop deleted file mode 100644 index 4188d3019d..0000000000 --- a/recipes/netsurf/files/netsurf.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[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/hubbub_0.0.1.bb b/recipes/netsurf/hubbub_0.0.1.bb deleted file mode 100644 index 88a6ce7b92..0000000000 --- a/recipes/netsurf/hubbub_0.0.1.bb +++ /dev/null @@ -1,34 +0,0 @@ -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 \ - file://hubbub-uninitialised.patch" - -PR = "r1" - -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] = "58c6e2b5a5906f3f0bf136c0c71b5403" -SRC_URI[sha256sum] = "3ba0bdf71376429bb3ce8ae51595fc25e6a5147cdcc26e47b6da17386eb78cdf" diff --git a/recipes/netsurf/libnsbmp_0.0.1.bb b/recipes/netsurf/libnsbmp_0.0.1.bb deleted file mode 100644 index 96b48c2999..0000000000 --- a/recipes/netsurf/libnsbmp_0.0.1.bb +++ /dev/null @@ -1,27 +0,0 @@ -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] = "61e1e5703580c1bc7d950a1aacea7bad" -SRC_URI[sha256sum] = "424d12aae7a6ea8c90438cf4ccff486dc01a3a2a7b68eb602ee2b8c28178b6d1" diff --git a/recipes/netsurf/libnsgif_0.0.1.bb b/recipes/netsurf/libnsgif_0.0.1.bb deleted file mode 100644 index 4845398ca8..0000000000 --- a/recipes/netsurf/libnsgif_0.0.1.bb +++ /dev/null @@ -1,30 +0,0 @@ -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 \ - file://libnsgif-strict-aliasing.patch" - -PR = "r1" - -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] = "a547da766fccacd00fd05190baf644da" -SRC_URI[sha256sum] = "54f316f530caaacd55dc23f546537759382a45ac6378ead249b5a5d51cf4db52" diff --git a/recipes/netsurf/libparserutils_0.0.1.bb b/recipes/netsurf/libparserutils_0.0.1.bb deleted file mode 100644 index 56bc4d0ae7..0000000000 --- a/recipes/netsurf/libparserutils_0.0.1.bb +++ /dev/null @@ -1,39 +0,0 @@ -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] = "5999c2d52f8c07eeef2a8808fee4f858" -SRC_URI[sha256sum] = "5aed4edfd2023ed3ccd566fe76131d10faf43c8c3efa2e90978eed37c5503165" diff --git a/recipes/netsurf/netsurf-2.1/Makefile.config b/recipes/netsurf/netsurf-2.1/Makefile.config deleted file mode 100644 index 72c86003f5..0000000000 --- a/recipes/netsurf/netsurf-2.1/Makefile.config +++ /dev/null @@ -1,9 +0,0 @@ -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.1/debugxml_fix.patch b/recipes/netsurf/netsurf-2.1/debugxml_fix.patch deleted file mode 100644 index 3a6626abe8..0000000000 --- a/recipes/netsurf/netsurf-2.1/debugxml_fix.patch +++ /dev/null @@ -1,64 +0,0 @@ ---- netsurf-2.0/gtk/gtk_scaffolding.c.orig 2009-05-15 01:18:44.000000000 +0400 -+++ netsurf-2.0/gtk/gtk_scaffolding.c 2009-05-15 01:24:32.000000000 +0400 -@@ -22,7 +22,6 @@ - #include - #include - #include --#include - #include "content/content.h" - #include "desktop/browser.h" - #include "desktop/history_core.h" -@@ -1040,52 +1039,7 @@ - - MENUHANDLER(save_dom_tree) - { -- GtkWidget *save_dialog; -- struct gtk_scaffolding *gw = (struct gtk_scaffolding *)g; -- -- save_dialog = gtk_file_chooser_dialog_new("Save File", gw->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 = nsgtk_get_browser_window(gw->top_level); -- -- if (bw->current_content && -- bw->current_content->type == -- CONTENT_HTML) { -- xmlDebugDumpDocument(fh, -- bw->current_content-> -- data.html.document); -- } -- -- fclose(fh); -- } -- -- g_free(filename); -- } -- -- gtk_widget_destroy(save_dialog); -- -- return TRUE; -+ return FALSE; - } - - diff --git a/recipes/netsurf/netsurf-2.1/fix_makefile.patch b/recipes/netsurf/netsurf-2.1/fix_makefile.patch deleted file mode 100644 index 1783921d1e..0000000000 --- a/recipes/netsurf/netsurf-2.1/fix_makefile.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: Makefile -=================================================================== ---- a/Makefile (revision 7536) -+++ b/Makefile (working copy) -@@ -820,7 +820,6 @@ - @cp -vRL gtk/res/netsurf-16x16.xpm $(DESTDIR)$(NETSURF_GTK_RESOURCES) - @cp -vRL gtk/res/throbber/*.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)/throbber - @cp -vRL gtk/res/Aliases $(DESTDIR)$(NETSURF_GTK_RESOURCES) -- @cp -vrL gtk/res/docs $(DESTDIR)/$(NETSURF_GTK_RESOURCES) - gzip -9v < gtk/res/messages > $(DESTDIR)$(NETSURF_GTK_RESOURCES)messages - gzip -9v < gtk/res/downloads.glade > $(DESTDIR)$(NETSURF_GTK_RESOURCES)downloads.glade - gzip -9v < gtk/res/netsurf.glade > $(DESTDIR)$(NETSURF_GTK_RESOURCES)netsurf.glade diff --git a/recipes/netsurf/netsurf-2.1/netsurf.desktop b/recipes/netsurf/netsurf-2.1/netsurf.desktop deleted file mode 100644 index 4188d3019d..0000000000 --- a/recipes/netsurf/netsurf-2.1/netsurf.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[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.1/netsurf.png b/recipes/netsurf/netsurf-2.1/netsurf.png deleted file mode 100644 index 3064e5d4f37bb31f98c6acdbce3807a905d3ebcb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 diff --git a/recipes/netsurf/netsurf-fb_svn.bb b/recipes/netsurf/netsurf-fb_svn.bb index 3d384be1ba..692da98043 100644 --- a/recipes/netsurf/netsurf-fb_svn.bb +++ b/recipes/netsurf/netsurf-fb_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "NetSurf is a lightweight, multi-platform web browser." HOMEPAGE = "http://www.netsurf-browser.org/" SECTION = "x11/network" LICENSE = "GPLv2" -SRCREV = "10946" +SRCREV = "10950" PV = "2.6+svnr${SRCPV}" PR = "r0" diff --git a/recipes/netsurf/netsurf_2.1.bb b/recipes/netsurf/netsurf_2.1.bb deleted file mode 100644 index 3aeae0c8c7..0000000000 --- a/recipes/netsurf/netsurf_2.1.bb +++ /dev/null @@ -1,37 +0,0 @@ -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 = "r1" - -# Workaround for 2.1 tarball (unpacks into netsurf/, not netsurf-2.1/ ) -S = "${WORKDIR}/netsurf" - -DEPENDS = "gtk+ lemon-native re2c-native jpeg openssl curl libxml2 \ - libglade hubbub 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] = "f0a34fd076b492c1a13b45432e8d7e49" -SRC_URI[sha256sum] = "cda2cf41c852938c226c47c2b995d527387120141f68b416ea745e50a7165a81" -- 2.39.5