packages: fltk/fltk-link.patch, fltk/fltk.spec, fltk/fltk-1.1.9-as-needed.p...

arekm arekm at pld-linux.org
Fri Jul 10 22:10:17 CEST 2009 

Author: arekm                        Date: Fri Jul 10 20:10:17 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 3; build fixed (patches from gentoo)

---- Files affected:
packages/fltk:
   fltk-link.patch (1.7 -> 1.8) , fltk.spec (1.67 -> 1.68) , fltk-1.1.9-as-needed.patch (NONE -> 1.1)  (NEW), fltk-1.1.9-consts.patch (NONE -> 1.1)  (NEW), fltk-1.1.9-glibc2.10-scandir.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/fltk/fltk-link.patch
diff -u packages/fltk/fltk-link.patch:1.7 packages/fltk/fltk-link.patch:1.8
--- packages/fltk/fltk-link.patch:1.7	Fri Mar 28 23:46:39 2008
+++ packages/fltk/fltk-link.patch	Fri Jul 10 22:10:09 2009
@@ -1,52 +1,3 @@
---- fltk-1.1.4/src/Makefile.orig	2003-08-24 15:09:06.000000000 +0200
-+++ fltk-1.1.4/src/Makefile	2004-04-07 00:16:16.828411328 +0200
-@@ -200,7 +200,7 @@
- 
- libfltk.so.1.1: $(OBJECTS)
- 	echo $(DSOCOMMAND) $@ ...
--	$(DSOCOMMAND) $@ $(OBJECTS)
-+	$(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS)
- 	$(RM) libfltk.so
- 	$(LN) libfltk.so.1.1 libfltk.so
- 
-@@ -236,7 +236,7 @@
- 
- libfltk_forms.so.1.1: $(FLOBJECTS) libfltk.so.1.1
- 	echo $(DSOCOMMAND) $@ ...
--	$(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk
-+	$(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk $(LDLIBS) $(IMAGELIBS)
- 	$(RM) libfltk_forms.so
- 	$(LN) libfltk_forms.so.1.1 libfltk_forms.so
- 
-@@ -272,7 +272,7 @@
- 
- libfltk_gl.so.1.1: $(GLOBJECTS) libfltk.so.1.1
- 	echo $(DSOCOMMAND) $@ ...
--	$(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk
-+	$(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk $(GLDLIBS)
- 	$(RM) libfltk_gl.so
- 	$(LN) libfltk_gl.so.1.1 libfltk_gl.so
- 
-@@ -308,7 +308,7 @@
- 
- libfltk_images.so.1.1: $(IMGOBJECTS) libfltk.so.1.1
- 	echo $(DSOCOMMAND) $@ ...
--	$(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk
-+	$(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk $(LDLIBS) $(IMAGELIBS)
- 	$(RM) libfltk_images.so
- 	$(LN) libfltk_images.so.1.1 libfltk_images.so
- 
---- fltk-1.1.8/configure.in~	2008-03-28 10:38:36.000000000 +0100
-+++ fltk-1.1.8/configure.in	2008-03-28 10:38:50.000000000 +0100
-@@ -179,7 +179,7 @@
-             FLDSONAME="libfltk_forms.so.$FL_API_VERSION"
-             GLDSONAME="libfltk_gl.so.$FL_API_VERSION"
-             IMGDSONAME="libfltk_images.so.$FL_API_VERSION"
--            DSOCOMMAND="\$(CXX) \$(DSOFLAGS) -Wl,-soname,\$@ \$(LDLIBS) -shared -fPIC $DEBUGFLAG -o"
-+            DSOCOMMAND="\$(CXX) \$(DSOFLAGS) -Wl,-soname,\$@ -shared -fPIC $DEBUGFLAG -o"
- 	    if test "x$libdir" != "x/usr/lib"; then
- 		    DSOLINK="-Wl,-rpath,$libdir"
-             fi
 -- fltk-1.1.8/makeinclude.in~	2008-03-28 22:31:50.280354265 +0100
 +++ fltk-1.1.8/makeinclude.in	2008-03-28 22:31:55.920623903 +0100
 @@ -127,7 +127,7 @@

================================================================
Index: packages/fltk/fltk.spec
diff -u packages/fltk/fltk.spec:1.67 packages/fltk/fltk.spec:1.68
--- packages/fltk/fltk.spec:1.67	Fri Jul 10 21:53:01 2009
+++ packages/fltk/fltk.spec	Fri Jul 10 22:10:09 2009
@@ -9,15 +9,18 @@
 Summary(pt_BR.UTF-8):	Interface gráfica em C++ para X, OpenGL e Windows
 Name:		fltk
 Version:	1.1.9
-Release:	2
+Release:	3
 License:	LGPL with amendments (see COPYING)
 Group:		X11/Libraries
 Source0:	http://ftp.easysw.com/pub/fltk/%{version}/%{name}-%{version}-source.tar.bz2
 # Source0-md5:	e146fd264e1001b1313acfd41ef75552
 Source1:	http://www.fltk.org/doc-1.1/%{name}.pdf
 # Source1-md5:	d3a073741c94d532ec7af9d96c138ea3
-Patch0:		%{name}-link.patch
-Patch1:		%{name}-desktop.patch
+Patch0:		%{name}-desktop.patch
+Patch1:		%{name}-1.1.9-as-needed.patch
+Patch2:		%{name}-1.1.9-consts.patch
+Patch3:		%{name}-1.1.9-glibc2.10-scandir.patch
+Patch4:		%{name}-link.patch
 URL:		http://www.fltk.org/
 %{?with_opengl:BuildRequires:	OpenGL-GLU-devel}
 BuildRequires:	autoconf
@@ -146,6 +149,9 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 install %{SOURCE1} .
 
@@ -257,6 +263,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.68  2009/07/10 20:10:09  arekm
+- rel 3; build fixed (patches from gentoo)
+
 Revision 1.67  2009/07/10 19:53:01  arekm
 - release 2
 

================================================================
Index: packages/fltk/fltk-1.1.9-as-needed.patch
diff -u /dev/null packages/fltk/fltk-1.1.9-as-needed.patch:1.1
--- /dev/null	Fri Jul 10 22:10:17 2009
+++ packages/fltk/fltk-1.1.9-as-needed.patch	Fri Jul 10 22:10:09 2009
@@ -0,0 +1,118 @@
+diff -Nur fltk-1.1.9.orig/configure.in fltk-1.1.9/configure.in
+--- fltk-1.1.9.orig/configure.in	2009-01-08 17:53:52.000000000 +0000
++++ fltk-1.1.9/configure.in	2009-01-09 14:11:39.000000000 +0000
+@@ -179,10 +179,7 @@
+             FLDSONAME="libfltk_forms.so.$FL_API_VERSION"
+             GLDSONAME="libfltk_gl.so.$FL_API_VERSION"
+             IMGDSONAME="libfltk_images.so.$FL_API_VERSION"
+-            DSOCOMMAND="\$(CXX) \$(DSOFLAGS) -Wl,-soname,\$@ \$(LDLIBS) -shared -fPIC $DEBUGFLAG -o"
+-	    if test "x$libdir" != "x/usr/lib"; then
+-		    DSOLINK="-Wl,-rpath,$libdir"
+-            fi
++            DSOCOMMAND="\$(CXX) \$(DSOFLAGS) \$(LDFLAGS) -Wl,-soname,\$@ -shared -fPIC $DEBUGFLAG -o"
+ 	    ;;
+ 	AIX*)
+             DSONAME="libfltk_s.a"
+diff -Nur fltk-1.1.9.orig/src/Makefile fltk-1.1.9/src/Makefile
+--- fltk-1.1.9.orig/src/Makefile	2009-01-08 17:53:51.000000000 +0000
++++ fltk-1.1.9/src/Makefile	2009-01-09 14:08:53.000000000 +0000
+@@ -210,13 +210,13 @@
+ 
+ libfltk.so.1.1: $(OBJECTS)
+ 	echo $(DSOCOMMAND) $@ ...
+-	$(DSOCOMMAND) $@ $(OBJECTS)
++	$(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS)
+ 	$(RM) libfltk.so
+ 	$(LN) libfltk.so.1.1 libfltk.so
+ 
+ libfltk.sl.1.1: $(OBJECTS)
+ 	echo $(DSOCOMMAND) $@ ...
+-	$(DSOCOMMAND) $@ $(OBJECTS)
++	$(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS)
+ 	$(RM) libfltk.sl
+ 	$(LN) libfltk.sl.1.1 libfltk.sl
+ 
+@@ -232,7 +232,7 @@
+ 
+ libfltk_s.a: $(OBJECTS)
+ 	echo $(DSOCOMMAND) libfltk_s.o ...
+-	$(DSOCOMMAND) libfltk_s.o $(OBJECTS) $(IMAGELIBS)
++	$(DSOCOMMAND) libfltk_s.o $(OBJECTS) $(IMAGELIBS) $(LDLIBS)
+ 	echo $(LIBCOMMAND) libfltk_s.a libfltk_s.o
+ 	$(RM) $@
+ 	$(LIBCOMMAND) libfltk_s.a libfltk_s.o
+@@ -246,13 +246,13 @@
+ 
+ libfltk_forms.so.1.1: $(FLOBJECTS) libfltk.so.1.1
+ 	echo $(DSOCOMMAND) $@ ...
+-	$(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk
++	$(DSOCOMMAND) $@ $(FLOBJECTS) $(LDLIBS) -L. -lfltk
+ 	$(RM) libfltk_forms.so
+ 	$(LN) libfltk_forms.so.1.1 libfltk_forms.so
+ 
+ libfltk_forms.sl.1.1: $(FLOBJECTS) libfltk.sl.1.1
+ 	echo $(DSOCOMMAND) $@ ...
+-	$(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk
++	$(DSOCOMMAND) $@ $(FLOBJECTS) $(LDLIBS) -L. -lfltk
+ 	$(RM) libfltk_forms.sl
+ 	$(LN) libfltk_forms.sl.1.1 libfltk_forms.sl
+ 
+@@ -268,7 +268,7 @@
+ 
+ libfltk_forms_s.a: $(FLOBJECTS)
+ 	echo $(DSOCOMMAND) libfltk_forms_s.o ...
+-	$(DSOCOMMAND) libfltk_forms_s.o $(FLOBJECTS)
++	$(DSOCOMMAND) libfltk_forms_s.o $(FLOBJECTS) $(LDLIBS)
+ 	echo $(LIBCOMMAND) libfltk_forms_s.a libfltk_forms_s.o
+ 	$(RM) $@
+ 	$(LIBCOMMAND) libfltk_forms_s.a libfltk_forms_s.o
+@@ -282,13 +282,13 @@
+ 
+ libfltk_gl.so.1.1: $(GLOBJECTS) libfltk.so.1.1
+ 	echo $(DSOCOMMAND) $@ ...
+-	$(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk
++	$(DSOCOMMAND) $@ $(GLOBJECTS) $(LDLIBS) -L. -lfltk
+ 	$(RM) libfltk_gl.so
+ 	$(LN) libfltk_gl.so.1.1 libfltk_gl.so
+ 
+ libfltk_gl.sl.1.1: $(GLOBJECTS) libfltk.sl.1.1
+ 	echo $(DSOCOMMAND) $@ ...
+-	$(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk
++	$(DSOCOMMAND) $@ $(GLOBJECTS) $(LDLIBS) -L. -lfltk
+ 	$(RM) libfltk_gl.sl
+ 	$(LN) libfltk_gl.sl.1.1 libfltk_gl.sl
+ 
+@@ -304,7 +304,7 @@
+ 
+ libfltk_gl_s.a: $(GLOBJECTS)
+ 	echo $(DSOCOMMAND) libfltk_gl_s.o ...
+-	$(DSOCOMMAND) libfltk_gl_s.o $(GLOBJECTS)
++	$(DSOCOMMAND) libfltk_gl_s.o $(GLOBJECTS) $(LDLIBS)
+ 	echo $(LIBCOMMAND) libfltk_gl_s.a libfltk_gl_s.o
+ 	$(RM) $@
+ 	$(LIBCOMMAND) libfltk_gl_s.a libfltk_gl_s.o
+@@ -318,13 +318,13 @@
+ 
+ libfltk_images.so.1.1: $(IMGOBJECTS) libfltk.so.1.1
+ 	echo $(DSOCOMMAND) $@ ...
+-	$(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk
++	$(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) $(LDLIBS) -lfltk
+ 	$(RM) libfltk_images.so
+ 	$(LN) libfltk_images.so.1.1 libfltk_images.so
+ 
+ libfltk_images.sl.1.1: $(IMGOBJECTS) libfltk.sl.1.1
+ 	echo $(DSOCOMMAND) $@ ...
+-	$(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk
++	$(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) $(LDLIBS) -lfltk
+ 	$(RM) libfltk_images.sl
+ 	$(LN) libfltk_images.sl.1.1 libfltk_images.sl
+ 
+@@ -340,7 +340,7 @@
+ 
+ libfltk_images_s.a: $(IMGOBJECTS)
+ 	echo $(DSOCOMMAND) libfltk_images_s.o ...
+-	$(DSOCOMMAND) libfltk_images_s.o $(IMGOBJECTS)
++	$(DSOCOMMAND) libfltk_images_s.o $(IMGOBJECTS) $(LDLIBS)
+ 	echo $(LIBCOMMAND) libfltk_images_s.a libfltk_images_s.o
+ 	$(RM) $@
+ 	$(LIBCOMMAND) libfltk_images_s.a libfltk_images_s.o

================================================================
Index: packages/fltk/fltk-1.1.9-consts.patch
diff -u /dev/null packages/fltk/fltk-1.1.9-consts.patch:1.1
--- /dev/null	Fri Jul 10 22:10:17 2009
+++ packages/fltk/fltk-1.1.9-consts.patch	Fri Jul 10 22:10:09 2009
@@ -0,0 +1,20 @@
+diff -ru fltk-1.1.9.orig/src/fl_set_fonts_xft.cxx fltk-1.1.9/src/fl_set_fonts_xft.cxx
+--- fltk-1.1.9.orig/src/fl_set_fonts_xft.cxx	2009-03-04 10:58:49.000000000 +0000
++++ fltk-1.1.9/src/fl_set_fonts_xft.cxx	2009-03-04 11:01:25.000000000 +0000
+@@ -253,13 +253,13 @@
+       // So the bit we want is up to the first comma - BUT some strings have
+       // more than one name, separated by, guess what?, a comma...
+       stop = start = first = 0;
+-      stop = strchr((const char *)font, ',');
+-      start = strchr((const char *)font, ':');
++      stop = strchr((char *)font, ',');
++      start = strchr((char *)font, ':');
+       if ((stop) && (start) && (stop < start))
+       {
+         first = stop + 1; // discard first version of name
+         // find first comma *after* the end of the name
+-        stop = strchr((const char *)start, ',');
++        stop = strchr((char *)start, ',');
+       }
+       else
+       {

================================================================
Index: packages/fltk/fltk-1.1.9-glibc2.10-scandir.patch
diff -u /dev/null packages/fltk/fltk-1.1.9-glibc2.10-scandir.patch:1.1
--- /dev/null	Fri Jul 10 22:10:17 2009
+++ packages/fltk/fltk-1.1.9-glibc2.10-scandir.patch	Fri Jul 10 22:10:09 2009
@@ -0,0 +1,12 @@
+diff -up fltk-1.1.9/src/filename_list.cxx.gcc44 fltk-1.1.9/src/filename_list.cxx
+--- fltk-1.1.9/src/filename_list.cxx.gcc44	2006-06-09 11:16:34.000000000 -0500
++++ fltk-1.1.9/src/filename_list.cxx	2009-05-13 09:46:42.372917879 -0500
+@@ -67,7 +67,7 @@ int fl_filename_list(const char *d, dire
+   // The vast majority of UNIX systems want the sort function to have this
+   // prototype, most likely so that it can be passed to qsort without any
+   // changes:
+-  int n = scandir(d, list, 0, (int(*)(const void*,const void*))sort);
++  int n = scandir(d, list, 0, (int(*)(const dirent **,const dirent **))sort);
+ #else
+   // This version is when we define our own scandir (WIN32 and perhaps
+   // some Unix systems) and apparently on IRIX:
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/fltk/fltk-link.patch?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/fltk/fltk.spec?r1=1.67&r2=1.68&f=u

More information about the pld-cvs-commit mailing list