[oe-commits] org.oe.oz354x links-x11_2.1pre26.bb, links_2.1pre26.bb : add latest versions of links
xora commit
openembedded-commits at lists.openembedded.org
Mon Dec 18 19:14:30 UTC 2006
links-x11_2.1pre26.bb, links_2.1pre26.bb : add latest versions of links
Author: xora at openembedded.org
Branch: org.openembedded.oz354x
Revision: 38244c29e103124a7b5d8defc370de23cfe19f10
ViewMTN: http://monotone.openembedded.org/revision.psp?id=38244c29e103124a7b5d8defc370de23cfe19f10
Files:
1
packages/links/files/cookies-save-0.96.patch
packages/links/files/links-2.1pre17-fix-segfault-on-loading-cookies.patch
packages/links/files/links2.desktop
packages/links/links-x11_2.1pre26.bb
packages/links/links_2.1pre26.bb
Diffs:
#
# mt diff -r34c5ce953bad32235c573a57be785ea80799a890 -r38244c29e103124a7b5d8defc370de23cfe19f10
#
#
#
# add_file "packages/links/files/cookies-save-0.96.patch"
# content [b29c939c8e7752c001f921c897516c75ea28f873]
#
# add_file "packages/links/files/links-2.1pre17-fix-segfault-on-loading-cookies.patch"
# content [fa597ff24630e2e933b7bacb6bd24489e9b40cc1]
#
# add_file "packages/links/files/links2.desktop"
# content [4177b22481212548a84cfc41c070febd1a1543b8]
#
# add_file "packages/links/links-x11_2.1pre26.bb"
# content [d55f6680607e6d931c016aa814b26069628058cb]
#
# add_file "packages/links/links_2.1pre26.bb"
# content [71bd9b87bf414f336e107268c767ba2802693cfa]
#
============================================================
--- packages/links/files/cookies-save-0.96.patch b29c939c8e7752c001f921c897516c75ea28f873
+++ packages/links/files/cookies-save-0.96.patch b29c939c8e7752c001f921c897516c75ea28f873
@@ -0,0 +1,106 @@
+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);
+ }
+
============================================================
--- packages/links/files/links-2.1pre17-fix-segfault-on-loading-cookies.patch fa597ff24630e2e933b7bacb6bd24489e9b40cc1
+++ packages/links/files/links-2.1pre17-fix-segfault-on-loading-cookies.patch fa597ff24630e2e933b7bacb6bd24489e9b40cc1
@@ -0,0 +1,20 @@
+--- 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);
+ }
============================================================
--- packages/links/files/links2.desktop 4177b22481212548a84cfc41c070febd1a1543b8
+++ packages/links/files/links2.desktop 4177b22481212548a84cfc41c070febd1a1543b8
@@ -0,0 +1,14 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Links
+Comment=Links is a browser very similar to lynx
+Comment[es]=El links es un browser para modo texto, similar a lynx
+Comment[pl]=Links jest przeglÄ…darkÄ… podobnÄ… do lynksa
+Comment[pt]=O links é um browser para modo texto, similar ao lynx
+Comment[pt_BR]=O links é um browser para modo texto, similar ao lynx
+Exec=links -g
+Terminal=true
+Icon=links2
+Type=Application
+Categories=Application;ConsoleOnly;Network;WebBrowser;
+# vi: encoding=utf-8
============================================================
--- packages/links/links-x11_2.1pre26.bb d55f6680607e6d931c016aa814b26069628058cb
+++ packages/links/links-x11_2.1pre26.bb d55f6680607e6d931c016aa814b26069628058cb
@@ -0,0 +1,31 @@
+DESCRIPTION = "Links is graphics and text mode WWW \
+browser, similar to Lynx."
+HOMEPAGE = "http://links.twibright.com/"
+SECTION = "console/network"
+LICENSE = "GPL"
+DEPENDS = "jpeg libpng flex openssl zlib x11"
+RCONFLICTS = "links"
+PR = "r0"
+SRC_URI = "http://links.twibright.com/download/links-${PV}.tar.bz2 \
+ file://ac-prog-cxx.patch;patch=1 \
+ file://cookies-save-0.96.patch;patch=1 \
+ file://links-2.1pre17-fix-segfault-on-loading-cookies.patch;patch=1 \
+ file://links2.desktop \
+ http://www.xora.org.uk/oe/links2.png"
+S = "${WORKDIR}/links-${PV}"
+
+inherit autotools
+
+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
+}
+
============================================================
--- packages/links/links_2.1pre26.bb 71bd9b87bf414f336e107268c767ba2802693cfa
+++ packages/links/links_2.1pre26.bb 71bd9b87bf414f336e107268c767ba2802693cfa
@@ -0,0 +1,20 @@
+DESCRIPTION = "Links is graphics and text mode WWW \
+browser, similar to Lynx."
+HOMEPAGE = "http://links.twibright.com/"
+SECTION = "console/network"
+LICENSE = "GPL"
+DEPENDS = "jpeg libpng gpm flex openssl zlib"
+RCONFLICTS="links-x11"
+PR = "r0"
+SRC_URI = "http://links.twibright.com/download/links-${PV}.tar.bz2 \
+ file://ac-prog-cxx.patch;patch=1 \
+ file://cookies-save-0.96.patch;patch=1 \
+ file://links-2.1pre17-fix-segfault-on-loading-cookies.patch;patch=1"
+
+inherit autotools
+
+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"
More information about the Openembedded-commits
mailing list