Author: ken
Date: 2009-10-04 07:07:42 -0600 (Sun, 04 Oct 2009)
New Revision: 2133
Added:
trunk/rxvt-unicode/rxvt-unicode-9.06-build_fix-1.patch
trunk/ufraw/
trunk/ufraw/ufraw-0.15-build_fix-1.patch
Log:
Fixes for glibc-2.10.1's c++ compliance change to strchr.
Added: trunk/rxvt-unicode/rxvt-unicode-9.06-build_fix-1.patch
===================================================================
--- trunk/rxvt-unicode/rxvt-unicode-9.06-build_fix-1.patch
(rev 0)
+++ trunk/rxvt-unicode/rxvt-unicode-9.06-build_fix-1.patch 2009-10-04
13:07:42 UTC (rev 2133)
@@ -0,0 +1,55 @@
+Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
+Date: 2009-10-04
+Initial Package Version: 9.06
+Upstream Status: Slightly different fix applied.
+Origin: From fedora, via gentoo and arch.
+Description: Fixes build error, "invalid conversion from 'const char*' to
'char*'.
+ Fedora think this is a gcc-4.4 problem, the gentoo bugzilla entry thinks it's
a
+glibc-2.10.1 problem, see http://udrepper.livejournal.com/20948.html
+Rediffed to apply with -p1.
+
+diff -Naur rxvt-unicode-9.06.orig/src/background.C
rxvt-unicode-9.06/src/background.C
+--- rxvt-unicode-9.06.orig/src/background.C 2008-11-04 14:43:06.000000000
+0000
++++ rxvt-unicode-9.06/src/background.C 2009-10-02 00:36:58.000000000 +0100
+@@ -261,7 +261,7 @@
+ unsigned int w = 0, h = 0;
+ unsigned int n;
+ unsigned long new_flags = (flags & (~geometryFlags));
+- char *p;
++ const char *p;
+ # define MAXLEN_GEOM 256 /* could be longer than regular geometry
string */
+
+ if (geom == NULL)
+@@ -677,7 +677,7 @@
+ if (!target->asimman)
+ target->asimman = create_generic_imageman (target->rs[Rs_path]);
+
+- if (char *f = strchr (file, ';'))
++ if (char *f = (char *) strchr (file, ';'))
+ {
+ size_t len = f - file;
+ f = (char *)malloc (len + 1);
+diff -Naur rxvt-unicode-9.06.orig/src/command.C rxvt-unicode-9.06/src/command.C
+--- rxvt-unicode-9.06.orig/src/command.C 2008-11-05 16:21:05.000000000
+0000
++++ rxvt-unicode-9.06/src/command.C 2009-10-02 00:36:58.000000000 +0100
+@@ -3336,7 +3336,7 @@
+ }
+ else
+ {
+- char *eq = strchr (str, '='); // constness lost, but verified to
be ok
++ char *eq = (char *) strchr (str, '='); // constness lost, but
verified to be ok
+
+ if (eq)
+ {
+diff -Naur rxvt-unicode-9.06.orig/src/misc.C rxvt-unicode-9.06/src/misc.C
+--- rxvt-unicode-9.06.orig/src/misc.C 2008-04-26 03:57:18.000000000 +0100
++++ rxvt-unicode-9.06/src/misc.C 2009-10-02 00:36:58.000000000 +0100
+@@ -170,7 +170,7 @@
+ char *
+ rxvt_basename (const char *str) NOTHROW
+ {
+- char *base = strrchr (str, '/');
++ char *base = (char *) strrchr (str, '/');
+
+ return (char *) (base ? base + 1 : str);
+ }
Added: trunk/ufraw/ufraw-0.15-build_fix-1.patch
===================================================================
--- trunk/ufraw/ufraw-0.15-build_fix-1.patch (rev 0)
+++ trunk/ufraw/ufraw-0.15-build_fix-1.patch 2009-10-04 13:07:42 UTC (rev
2133)
@@ -0,0 +1,24 @@
+Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
+Date: 2009-10-04
+Initial Package Version: 0.15
+Upstream Status: Applied (along with many other changes from dcraw).
+Origin: From Dave Coffin's original dcraw, applied by hand.
+Description: Fixes "invalid conversion from 'const char*' to 'char*' error
with glibc-2.10.1
+NB - the additional 'g' at the end of the string is intended.
+References:
+http://sourceforge.net/tracker/?func=detail&aid=2867424&group_id=127649&atid=709086
+http://sourceforge.net/mailarchive/forum.php?thread_name=E1Mbo4h-0001hh-LX%40ddv4jf1.ch3.sourceforge.com&forum_name=ufraw-cvs
+http://udrepper.livejournal.com/20948.html
+
+diff -Naur ufraw-0.15.orig/dcraw.cc ufraw-0.15/dcraw.cc
+--- ufraw-0.15.orig/dcraw.cc 2008-12-23 07:19:41.000000000 +0000
++++ ufraw-0.15/dcraw.cc 2009-10-02 16:03:26.000000000 +0100
+@@ -8401,7 +8401,7 @@
+ argv[argc] = "";
+ for (arg=1; (((opm = argv[arg][0]) - 2) | 2) == '+'; ) {
+ opt = argv[arg++][1];
+- if ((cp = strchr (sp="nbrkStqmHAC", opt)))
++ if ((cp = (char*) strchr (sp="nbrkStqmHACg", opt)))
+ for (i=0; i < "11411111142"[cp-sp]-'0'; i++)
+ if (!isdigit(argv[arg+i][0])) {
+ dcraw_message (DCRAW_ERROR,_("Non-numeric argument to \"-%c\"\n"),
opt);
--
http://linuxfromscratch.org/mailman/listinfo/patches
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
