From 6097b49f1fe7183f7b34fa2e4c5a8fbfd805ed26 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 22 Dec 2012 18:08:20 +0100 Subject: links: upgrade to 2.7 to fix build with libpng-1.5 * cookies api changed between 2.1pre30 and 2.7 * LIC_FILES_CHKSUM changed because of formal change 296c296 < This program is free software; you can redistribute it and/or modify --- > on, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 > USAThis program is free software; you can redistribute it and/or > modify Signed-off-by: Martin Jansa --- .../links/files/cookies-save-0.96.patch | 106 --------------------- ...-2.1pre17-fix-segfault-on-loading-cookies.patch | 20 ---- .../links/links-x11_2.0+2.1pre30.bb | 26 ----- meta-oe/recipes-support/links/links-x11_2.7.bb | 27 ++++++ meta-oe/recipes-support/links/links.inc | 12 +-- .../recipes-support/links/links_2.0+2.1pre30.bb | 13 --- meta-oe/recipes-support/links/links_2.7.bb | 13 +++ 7 files changed, 43 insertions(+), 174 deletions(-) delete mode 100644 meta-oe/recipes-support/links/files/cookies-save-0.96.patch delete mode 100644 meta-oe/recipes-support/links/files/links-2.1pre17-fix-segfault-on-loading-cookies.patch delete mode 100644 meta-oe/recipes-support/links/links-x11_2.0+2.1pre30.bb create mode 100644 meta-oe/recipes-support/links/links-x11_2.7.bb delete mode 100644 meta-oe/recipes-support/links/links_2.0+2.1pre30.bb create mode 100644 meta-oe/recipes-support/links/links_2.7.bb (limited to 'meta-oe/recipes-support/links') diff --git a/meta-oe/recipes-support/links/files/cookies-save-0.96.patch b/meta-oe/recipes-support/links/files/cookies-save-0.96.patch deleted file mode 100644 index a1e35c01c..000000000 --- a/meta-oe/recipes-support/links/files/cookies-save-0.96.patch +++ /dev/null @@ -1,106 +0,0 @@ -diff -ru links-0.96/cookies.c links-0.96+cookies-save/cookies.c ---- links-0.96/cookies.c Mon Sep 3 07:19:37 2001 -+++ links-0.96+cookies-save/cookies.c Mon Sep 3 07:18:42 2001 -@@ -276,15 +276,99 @@ - - void init_cookies(void) - { -- /* !!! FIXME: read cookies */ -+ unsigned char in_buffer[MAX_STR_LEN]; -+ unsigned char *cookfile, *p, *q; -+ FILE *fp; -+ -+ /* must be called after init_home */ -+ if (! links_home) return; -+ -+ cookfile = stracpy(links_home); -+ if (! cookfile) return; -+ add_to_strn(&cookfile, "cookies"); -+ -+ fp = fopen(cookfile, "r"); -+ mem_free(cookfile); -+ if (fp == NULL) return; -+ -+ while (fgets(in_buffer, MAX_STR_LEN, fp)) { -+ struct cookie *cookie; -+ -+ if (!(cookie = mem_alloc(sizeof(struct cookie)))) return; -+ memset(cookie, 0, sizeof(struct cookie)); -+ -+ q = in_buffer; p = strchr(in_buffer, ' '); -+ if (p == NULL) goto inv; -+ *p++ = '\0'; -+ cookie->name = stracpy(q); -+ -+ q = p; p = strchr(p, ' '); -+ if (p == NULL) goto inv; -+ *p++ = '\0'; -+ cookie->value = stracpy(q); -+ -+ q = p; p = strchr(p, ' '); -+ if (p == NULL) goto inv; -+ *p++ = '\0'; -+ cookie->server = stracpy(q); -+ -+ q = p; p = strchr(p, ' '); -+ if (p == NULL) goto inv; -+ *p++ = '\0'; -+ cookie->path = stracpy(q); -+ -+ q = p; p = strchr(p, ' '); -+ if (p == NULL) goto inv; -+ *p++ = '\0'; -+ cookie->domain = stracpy(q); -+ -+ q = p; p = strchr(p, ' '); -+ if (p == NULL) goto inv; -+ *p++ = '\0'; -+ cookie->expires = atoi(q); -+ -+ cookie->secure = atoi(p); -+ -+ cookie->id = cookie_id++; -+ -+ accept_cookie(cookie); -+ -+ continue; -+ -+inv: -+ free_cookie(cookie); -+ free(cookie); -+ } -+ fclose(fp); - } - - void cleanup_cookies(void) - { - struct cookie *c; -+ unsigned char *cookfile; -+ FILE *fp; -+ - free_list(c_domains); -- /* !!! FIXME: save cookies */ -- foreach (c, cookies) free_cookie(c); -+ -+ cookfile = stracpy(links_home); -+ if (! cookfile) return; -+ add_to_strn(&cookfile, "cookies"); -+ -+ fp = fopen(cookfile, "w"); -+ mem_free(cookfile); -+ if (fp == NULL) return; -+ -+ foreach (c, cookies) { -+ if (c->expires && ! cookie_expired(c)) -+ fprintf(fp, "%s %s %s %s %s %d %d\n", c->name, c->value, -+ c->server?c->server:(unsigned char *)"", c->path?c->path:(unsigned char *)"", -+ c->domain?c->domain:(unsigned char *)"", c->expires, c->secure); -+ -+ free_cookie(c); -+ } -+ -+ fclose(fp); -+ - free_list(cookies); - } - diff --git a/meta-oe/recipes-support/links/files/links-2.1pre17-fix-segfault-on-loading-cookies.patch b/meta-oe/recipes-support/links/files/links-2.1pre17-fix-segfault-on-loading-cookies.patch deleted file mode 100644 index 0d3b407e2..000000000 --- a/meta-oe/recipes-support/links/files/links-2.1pre17-fix-segfault-on-loading-cookies.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- links-2.1pre17/cookies.c.pix 2005-05-15 23:05:10.000000000 +0800 -+++ links-2.1pre17/cookies.c 2005-05-15 23:17:21.000000000 +0800 -@@ -41,7 +41,7 @@ - - void free_cookie(struct cookie *c) - { -- mem_free(c->name); -+ if (c->value) mem_free(c->name); - if (c->value) mem_free(c->value); - if (c->server) mem_free(c->server); - if (c->path) mem_free(c->path); -@@ -355,7 +355,7 @@ - - inv: - free_cookie(cookie); -- free(cookie); -+ mem_free(cookie); - } - fclose(fp); - } diff --git a/meta-oe/recipes-support/links/links-x11_2.0+2.1pre30.bb b/meta-oe/recipes-support/links/links-x11_2.0+2.1pre30.bb deleted file mode 100644 index b71da9f88..000000000 --- a/meta-oe/recipes-support/links/links-x11_2.0+2.1pre30.bb +++ /dev/null @@ -1,26 +0,0 @@ -require links.inc - -DEPENDS += "virtual/libx11" -RCONFLICTS_${PN} = "links" - -SRC_URI += " file://links2.desktop \ - http://www.xora.org.uk/oe/links2.png;name=icon" - -EXTRA_OECONF = "--enable-javascript --with-libfl --enable-graphics \ - --with-ssl=${STAGING_LIBDIR}/.. --with-libjpeg \ - --without-libtiff --without-svgalib --without-fb \ - --without-directfb --without-pmshell --without-atheos \ - --with-x --without-gpm --without-sdl" - -do_install_append() { - install -d ${D}/${datadir}/applications - install -m 0644 ${WORKDIR}/links2.desktop ${D}/${datadir}/applications - install -d ${D}/${datadir}/pixmaps - install -m 0644 ${WORKDIR}/links2.png ${D}/${datadir}/pixmaps -} - - -SRC_URI[md5sum] = "f0f107cc824b71e43f0c6ab620209daf" -SRC_URI[sha256sum] = "f32314d851e86ec463967ddce78d051e3953b529878cbaeecf882c625ad29c75" -SRC_URI[icon.md5sum] = "477e8787927c634614bac01b44355a33" -SRC_URI[icon.sha256sum] = "eddcd8b8c8698aa621d1a453943892d77b72ed492e0d14e0dbac5c6a57e52f47" diff --git a/meta-oe/recipes-support/links/links-x11_2.7.bb b/meta-oe/recipes-support/links/links-x11_2.7.bb new file mode 100644 index 000000000..601742f9f --- /dev/null +++ b/meta-oe/recipes-support/links/links-x11_2.7.bb @@ -0,0 +1,27 @@ +require links.inc + +DEPENDS += "virtual/libx11" +RCONFLICTS_${PN} = "links" + +SRC_URI += " file://links2.desktop \ + http://www.xora.org.uk/oe/links2.png;name=icon" + +S = "${WORKDIR}/links-${PV}" + +EXTRA_OECONF = "--enable-javascript --with-libfl --enable-graphics \ + --with-ssl=${STAGING_LIBDIR}/.. --with-libjpeg \ + --without-libtiff --without-svgalib --without-fb \ + --without-directfb --without-pmshell --without-atheos \ + --with-x --without-gpm --without-sdl" + +do_install_append() { + install -d ${D}/${datadir}/applications + install -m 0644 ${WORKDIR}/links2.desktop ${D}/${datadir}/applications + install -d ${D}/${datadir}/pixmaps + install -m 0644 ${WORKDIR}/links2.png ${D}/${datadir}/pixmaps +} + +SRC_URI[md5sum] = "d06aa6e14b2172d73188871a5357185a" +SRC_URI[sha256sum] = "0c182b1cbcdfd5cdcd2f75a6032d1a4b660d07c1225c1e07757cec81d3302130" +SRC_URI[icon.md5sum] = "477e8787927c634614bac01b44355a33" +SRC_URI[icon.sha256sum] = "eddcd8b8c8698aa621d1a453943892d77b72ed492e0d14e0dbac5c6a57e52f47" diff --git a/meta-oe/recipes-support/links/links.inc b/meta-oe/recipes-support/links/links.inc index abd10f2ac..e77e2c454 100644 --- a/meta-oe/recipes-support/links/links.inc +++ b/meta-oe/recipes-support/links/links.inc @@ -3,17 +3,11 @@ browser, similar to Lynx." HOMEPAGE = "http://links.twibright.com/" SECTION = "console/network" LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b0c80473f97008e42e29a9f80fcc55ff" +LIC_FILES_CHKSUM = "file://COPYING;md5=65e735be2e05d5943803344148f57603" DEPENDS = "jpeg libpng flex openssl zlib" -LPV = "${@d.getVar("PV",1).split("+")[1]}" - -SRC_URI = "http://links.twibright.com/download/links-${LPV}.tar.bz2 \ +SRC_URI = "http://links.twibright.com/download/links-${PV}.tar.bz2 \ file://ac-prog-cxx.patch \ - file://cookies-save-0.96.patch \ - file://links-2.1pre17-fix-segfault-on-loading-cookies.patch" +" inherit autotools - -S = "${WORKDIR}/links-${LPV}" - diff --git a/meta-oe/recipes-support/links/links_2.0+2.1pre30.bb b/meta-oe/recipes-support/links/links_2.0+2.1pre30.bb deleted file mode 100644 index 24961737d..000000000 --- a/meta-oe/recipes-support/links/links_2.0+2.1pre30.bb +++ /dev/null @@ -1,13 +0,0 @@ -require links.inc - -DEPENDS += "gpm" -RCONFLICTS_${PN} = "links-x11" - -EXTRA_OECONF = "--enable-javascript --with-libfl --enable-graphics \ - --with-ssl=${STAGING_LIBDIR}/.. --with-libjpeg \ - --without-libtiff --without-svgalib --with-fb \ - --without-directfb --without-pmshell --without-atheos \ - --without-x --without-sdl" - -SRC_URI[md5sum] = "f0f107cc824b71e43f0c6ab620209daf" -SRC_URI[sha256sum] = "f32314d851e86ec463967ddce78d051e3953b529878cbaeecf882c625ad29c75" diff --git a/meta-oe/recipes-support/links/links_2.7.bb b/meta-oe/recipes-support/links/links_2.7.bb new file mode 100644 index 000000000..24c198557 --- /dev/null +++ b/meta-oe/recipes-support/links/links_2.7.bb @@ -0,0 +1,13 @@ +require links.inc + +DEPENDS += "gpm" +RCONFLICTS_${PN} = "links-x11" + +EXTRA_OECONF = "--enable-javascript --with-libfl --enable-graphics \ + --with-ssl=${STAGING_LIBDIR}/.. --with-libjpeg \ + --without-libtiff --without-svgalib --with-fb \ + --without-directfb --without-pmshell --without-atheos \ + --without-x --without-sdl" + +SRC_URI[md5sum] = "d06aa6e14b2172d73188871a5357185a" +SRC_URI[sha256sum] = "0c182b1cbcdfd5cdcd2f75a6032d1a4b660d07c1225c1e07757cec81d3302130" -- cgit v1.2.3-54-g00ecf