[packages/links2] - updated img,convert-old-bookmarks,gzip_fallback,segv patches - removed outdated ac25x,libpng15 pat
qboosh
qboosh at pld-linux.org
Sun Jun 23 20:46:28 CEST 2013
commit a8718b56e3c315a2bee7b608a00595117404d6ad
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Jun 23 20:46:04 2013 +0200
- updated img,convert-old-bookmarks,gzip_fallback,segv patches
- removed outdated ac25x,libpng15 patches
links2-ac25x.patch | 56 --------------------------------------
links2-convert-old-bookmarks.patch | 12 ++++----
links2-gzip_fallback.patch | 16 ++++++-----
links2-img.patch | 15 +++++-----
links2-libpng15.patch | 38 --------------------------
links2-segv.patch | 24 ++++++++++------
links2.spec | 21 ++++++--------
7 files changed, 46 insertions(+), 136 deletions(-)
---
diff --git a/links2.spec b/links2.spec
index aeac56e..4c3f0ff 100644
--- a/links2.spec
+++ b/links2.spec
@@ -25,18 +25,16 @@ Source2: %{name}.1.pl
Source3: %{name}.png
Source4: glinks.desktop
Patch0: %{name}-links-g_if_glinks.patch
-##Patch1: %{name}-ac25x.patch
-##Patch2: %{name}-img.patch
-##Patch3: %{name}-convert-old-bookmarks.patch
+Patch2: %{name}-img.patch
+Patch3: %{name}-convert-old-bookmarks.patch
Patch4: %{name}-cookies-save.patch
Patch5: %{name}-config-dirs.patch
-##Patch6: %{name}-gzip_fallback.patch
+Patch6: %{name}-gzip_fallback.patch
#Patch7: %{name}-js-Date-getTime.patch
#Patch8: %{name}-js-submit-nodefer.patch
-##Patch9: %{name}-segv.patch
+Patch9: %{name}-segv.patch
#Patch10: %{name}-pl-update.patch
#Patch15: %{name}-home_etc.patch
-##Patch16: %{name}-libpng15.patch
Patch17: ac_config_headers.patch
Patch18: ac_prog_cxx.patch
URL: http://links.twibright.com/
@@ -113,17 +111,15 @@ Links - це текстовий WWW броузер, на перший погля
%prep
%setup -q -n links-%{version}
%{?with_graphics:%patch0 -p1}
-#%patch1 -p1
-#%patch2 -p1
-#%patch3 -p1
+%patch2 -p1
+%patch3 -p1
%patch4 -p1
%patch5 -p1
-#%patch6 -p1
+%patch6 -p1
#%patch7 -p1
#%patch8 -p1
-#%patch9 -p1
+%patch9 -p1
#%patch10 -p1
-#%patch16 -p1
%patch17 -p1
%patch18 -p1
@@ -131,7 +127,6 @@ cd intl
./gen-intl
%build
-#autoreconf -ifv
%{__aclocal}
%{__automake}
%{__autoconf}
diff --git a/links2-ac25x.patch b/links2-ac25x.patch
deleted file mode 100644
index 0fec497..0000000
--- a/links2-ac25x.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff -urN aaa/links-current/configure.in links-current/configure.in
---- aaa/links-current/configure.in Thu May 16 08:06:43 2002
-+++ links-current/configure.in Thu May 23 20:57:36 2002
-@@ -16,6 +16,7 @@
- #AC_PROG_AWK
- #AM_PROG_LEX
- #AC_PROG_YACC
-+AC_PROG_CXX
-
- dnl Check for libraries
- #AC_CHECK_LIB(fl,main,AC_DEFINE(JS) LIBS="$LIBS -lfl",AC_MSG_WARN(You don't have libfl; you won't be able to run javascript))
-@@ -83,35 +83,8 @@
- AC_CHECK_SIZEOF(unsigned, "$default_int")
- AC_CHECK_SIZEOF(long, "$default_int")
- AC_CHECK_SIZEOF(unsigned long, "$default_int")
--AC_CACHE_CHECK([for big endian], ac_cv_big_endian,
-- AC_TRY_RUN([
-- long l;
-- char *c = (char *)&l;
-- int main()
-- {
-- l = 0x12345678L;
-- return !(c[[sizeof(long) - 1]] == 0x78 && c[[sizeof(long) - 2]] == 0x56 && c[[sizeof(long) - 3]] == 0x34 && c[[sizeof(long) - 4]] == 0x12);
-- }
-- ], ac_cv_big_endian=yes, ac_cv_big_endian=no, ac_cv_big_endian=no)
--)
--AC_CACHE_CHECK([for little endian], ac_cv_little_endian,
-- AC_TRY_RUN([
-- long l;
-- char *c = (char *)&l;
-- int main()
-- {
-- l = 0x12345678L;
-- return !(c[[0]] == 0x78 && c[[1]] == 0x56 && c[[2]] == 0x34 && c[[3]] == 0x12);
-- }
-- ], ac_cv_little_endian=yes, ac_cv_little_endian=no, ac_cv_little_endian="$ac_cv_have_emx")
--)
-
--if test "$ac_cv_big_endian" = yes; then
-- AC_DEFINE(C_BIG_ENDIAN)
--else if test "$ac_cv_little_endian" = yes; then
-- AC_DEFINE(C_LITTLE_ENDIAN)
--fi
--fi
-+AC_C_BIGENDIAN([AC_DEFINE(C_BIG_ENDIAN)], [AC_DEFINE(C_LITTLE_ENDIAN)])
-
- dnl Checks for library functions.
- AC_PROG_GCC_TRADITIONAL
-@@ -401,7 +402,6 @@
- AC_CHECK_LIB(stdc++, main)
- AC_CHECK_LIB(atheos, main)
- if test "$ac_cv_lib_atheos_main" = yes; then
-- AC_PROG_CXX
- AC_DEFINE(GRDRV_ATHEOS)
- drivers="$drivers ATHEOS"
- cf_have_atheos=yes
diff --git a/links2-convert-old-bookmarks.patch b/links2-convert-old-bookmarks.patch
index 9be3673..1859fb0 100644
--- a/links2-convert-old-bookmarks.patch
+++ b/links2-convert-old-bookmarks.patch
@@ -1,8 +1,8 @@
---- links-2.0pre1/bookmarks.c.pix 2002-05-20 09:58:06.000000000 +0200
-+++ links-2.0pre1/bookmarks.c 2002-05-22 14:29:30.000000000 +0200
-@@ -643,6 +643,18 @@
+--- links-2.7/bookmarks.c.orig 2013-06-23 18:55:29.428859752 +0200
++++ links-2.7/bookmarks.c 2013-06-23 19:03:09.398840448 +0200
+@@ -716,6 +716,18 @@
if (!*bookmarks_file)
- snprintf(bookmarks_file,MAX_STR_LEN,"%sbookmarks.html",links_home);
+ snprintf(cast_char bookmarks_file,MAX_STR_LEN,"%sbookmarks.html",links_home?links_home:(unsigned char*)"");
+ /* try to create bookmarks.html based on old bookmarks (from links <= 0.97) */
+ if (access(bookmarks_file, R_OK) != 0) {
@@ -16,6 +16,6 @@
+ }
+ }
+
- bookmark_ld.codepage=get_cp_index("utf-8");
- load_bookmarks();
+ bookmark_ld.codepage=utf8_table;
+ load_bookmarks(NULL);
}
diff --git a/links2-gzip_fallback.patch b/links2-gzip_fallback.patch
index 2e4e84f..3f7b799 100644
--- a/links2-gzip_fallback.patch
+++ b/links2-gzip_fallback.patch
@@ -1,17 +1,19 @@
---- links-2.1pre28/file.c.orig 2006-11-28 17:23:14.000000000 +0100
-+++ links-2.1pre28/file.c 2007-04-18 14:49:21.420434281 +0200
-@@ -235,9 +235,14 @@
+--- links-2.7/file.c.orig 2013-06-23 19:03:40.928839125 +0200
++++ links-2.7/file.c 2013-06-23 19:40:15.742080351 +0200
+@@ -233,11 +233,16 @@
mem_free(name);
setcstate(c, S_FILE_TYPE); abort_connection(c); return;
}
+opening:
- if ((h = open(name, O_RDONLY | O_NOCTTY)) == -1) {
+ EINTRLOOP(h, open(cast_const_char name, O_RDONLY | O_NOCTTY));
+ if (h == -1) {
int er = errno;
- if ((d = opendir(name))) goto dir;
+ ENULLLOOP(d, opendir(cast_const_char name));
+ if (d) goto dir;
+ if (strncmp(name + strlen(name) - 3, ".gz", 3) != 0) {
+ add_to_strn(&name, ".gz");
+ goto opening;
+ }
mem_free(name);
- setcstate(c, -er); abort_connection(c); return;
- }
+ setcstate(c, get_error_from_errno(er));
+ abort_connection(c);
diff --git a/links2-img.patch b/links2-img.patch
index d493bae..640f98e 100644
--- a/links2-img.patch
+++ b/links2-img.patch
@@ -1,11 +1,10 @@
-diff -urN aaa/links-2.0pre6/html.c links-2.0pre6/html.c
---- aaa/links-2.0pre6/html.c Mon May 20 00:32:57 2002
-+++ links-2.0pre6/html.c Sun Jun 16 12:02:57 2002
-@@ -838,7 +838,54 @@
- if (!d_opt->images && !format.link) goto ret;
- if (usemap) al = stracpy("[USEMAP]");
- else if (ismap) al = stracpy("[ISMAP]");
-- else al = stracpy("[IMG]");
+--- links-2.7/html.c.orig 2013-06-23 18:17:51.248954518 +0200
++++ links-2.7/html.c 2013-06-23 18:30:42.988922132 +0200
+@@ -1062,7 +1062,54 @@
+ add_to_strn(&al, cast_uchar "]");
+ } else if (usemap) al = stracpy(cast_uchar "[USEMAP]");
+ else if (ismap) al = stracpy(cast_uchar "[ISMAP]");
+- else al = stracpy(cast_uchar "[IMG]");
+ else{
+ unsigned char *str = get_attr_val(a, "src");
+ unsigned char *s;
diff --git a/links2-libpng15.patch b/links2-libpng15.patch
deleted file mode 100644
index ec103e3..0000000
--- a/links2-libpng15.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- links-2.2/png.c~ 2005-01-02 20:03:34.000000000 +0100
-+++ links-2.2/png.c 2012-02-11 01:39:31.224412608 +0100
-@@ -48,7 +48,7 @@
- /* Error for from-web PNG images. */
- void img_my_png_error(png_structp png_ptr, png_const_charp error_string)
- {
-- longjmp(png_ptr->jmpbuf,1);
-+ longjmp(png_jmpbuf(png_ptr),1);
- }
-
- void png_info_callback(png_structp png_ptr, png_infop info_ptr)
-@@ -203,7 +203,7 @@
- #ifdef DEBUG
- if (!info_ptr) internal ("png_create_info_struct failed\n");
- #endif /* #ifdef DEBUG */
-- if (setjmp(png_ptr->jmpbuf)){
-+ if (setjmp(png_jmpbuf(png_ptr))){
- error:
- png_destroy_read_struct(&png_ptr, &info_ptr,
- (png_infopp)NULL);
-@@ -213,7 +213,7 @@
- png_set_progressive_read_fn(png_ptr, NULL,
- png_info_callback, png_row_callback,
- png_end_callback);
-- if (setjmp(png_ptr->jmpbuf)) goto error;
-+ if (setjmp(png_jmpbuf(png_ptr))) goto error;
- decoder=mem_alloc(sizeof(*decoder));
- decoder->png_ptr=png_ptr;
- decoder->info_ptr=info_ptr;
-@@ -232,7 +232,7 @@
- png_ptr=((struct png_decoder *)(cimg->decoder))->png_ptr;
- info_ptr=((struct png_decoder *)(cimg->decoder))->info_ptr;
- end_callback_hit=0;
-- if (setjmp(png_ptr->jmpbuf)){
-+ if (setjmp(png_jmpbuf(png_ptr))){
- img_end(cimg);
- return;
- }
diff --git a/links2-segv.patch b/links2-segv.patch
index fba5a2b..566ac25 100644
--- a/links2-segv.patch
+++ b/links2-segv.patch
@@ -1,11 +1,19 @@
---- links-2.1pre15/default.c.orig 2004-04-17 23:35:56.000000000 +0200
-+++ links-2.1pre15/default.c 2004-04-17 23:53:43.466392248 +0200
-@@ -783,7 +783,7 @@
- add_to_str(s, l, " ");
- add_quoted_to_str(s, l, (dp->param) ? (dp->param) : (unsigned char*)"");
- add_to_str(s, l, " ");
+--- links-2.7/default.c.orig 2013-06-23 19:40:46.132079076 +0200
++++ links-2.7/default.c 2013-06-23 19:42:18.822075186 +0200
+@@ -1216,14 +1216,14 @@
+ {
+ struct driver_param *dp;
+ foreachback(dp, driver_params) {
+- if ((!dp->param || !*dp->param) && !dp->codepage && !*dp->shell) continue;
++ if ((!dp->param || !*dp->param) && !dp->codepage && (!dp->shell || !*dp->shell)) continue;
+ if (dp->nosave) continue;
+ add_nm(o, s, l);
+ add_quoted_to_str(s, l, dp->name);
+ add_to_str(s, l, cast_uchar " ");
+ add_quoted_to_str(s, l, dp->param ? dp->param : (unsigned char*)"");
+ add_to_str(s, l, cast_uchar " ");
- add_quoted_to_str(s, l, dp->shell);
-+ add_quoted_to_str(s, l, (dp->shell) ? (dp->shell) : (unsigned char*)"");
- add_to_str(s, l, " ");
++ add_quoted_to_str(s, l, dp->shell ? dp->shell : (unsigned char*)"");
+ add_to_str(s, l, cast_uchar " ");
add_to_str(s, l, get_cp_mime_name(dp->codepage));
}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/links2.git/commitdiff/a8718b56e3c315a2bee7b608a00595117404d6ad
More information about the pld-cvs-commit
mailing list