From 7d102f4c5ce92723161a3f7f300d879b8e2dc1d6 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Dec 09 2009 00:32:59 +0000 Subject: - fltk-1.1.10rc3 --- diff --git a/.cvsignore b/.cvsignore index 764e5e8..e31ddfa 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -fltk-1.1.9-source.tar.bz2 +fltk-1.1.10rc3-source.tar.bz2 diff --git a/fltk-1.1.9-consts.patch b/fltk-1.1.9-consts.patch deleted file mode 100644 index 1ca0d84..0000000 --- a/fltk-1.1.9-consts.patch +++ /dev/null @@ -1,20 +0,0 @@ -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 - { diff --git a/fltk-1.1.9-gcc44.patch b/fltk-1.1.9-gcc44.patch deleted file mode 100644 index 0051306..0000000 --- a/fltk-1.1.9-gcc44.patch +++ /dev/null @@ -1,12 +0,0 @@ -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: diff --git a/fltk-1.1.9-rpath.patch b/fltk-1.1.9-rpath.patch index f56bff0..675b7ee 100644 --- a/fltk-1.1.9-rpath.patch +++ b/fltk-1.1.9-rpath.patch @@ -8,9 +8,9 @@ diff -up fltk-1.1.9/configure.in.rpath fltk-1.1.9/configure.in - if test "x$libdir" != "x/usr/lib"; then - DSOLINK="-Wl,-rpath,$libdir" - fi -+# if test "x$libdir" != "x/usr/lib"; then -+# DSOLINK="-Wl,-rpath,$libdir" -+# fi ++ if test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/usr/lib32" -a "x$libdir" != "x/usr/lib64"; then ++ DSOLINK="-Wl,-rpath,$libdir" ++ fi ;; AIX*) DSONAME="libfltk_s.a" diff --git a/fltk-1.1.9-scandir.patch b/fltk-1.1.9-scandir.patch new file mode 100644 index 0000000..0051306 --- /dev/null +++ b/fltk-1.1.9-scandir.patch @@ -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: diff --git a/fltk.spec b/fltk.spec index 53a2316..5702008 100644 --- a/fltk.spec +++ b/fltk.spec @@ -1,10 +1,12 @@ %global arch %(arch 2>/dev/null || echo undefined) +%define pre rc3 + Summary: C++ user interface toolkit Name: fltk -Version: 1.1.9 -Release: 7%{?dist} +Version: 1.1.10 +Release: 0.1.%{pre}%{?dist} # see COPYING (or http://www.fltk.org/COPYING.php ) for exceptions details License: LGPLv2+ with exceptions @@ -13,7 +15,8 @@ URL: http://www.fltk.org/ %if "%{?snap:1}" == "1" Source0: http://ftp.easysw.com/pub/fltk/snapshots/fltk-1.1.x-%{snap}.tar.bz2 %else -Source0: http://ftp.easysw.com/pub/fltk/%{version}/%{name}-%{version}-source.tar.bz2 +Source0: http://ftp.easysw.com/pub/fltk/%{version}%{?pre}/%{name}-%{version}%{?pre}-source.tar.bz2 +#Source0: http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/1.1.10rc3/fltk-1.1.10rc3-source.tar.bz2 %endif BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -27,8 +30,7 @@ Patch3: fltk-1.1.x-r5750-undefined.patch # nuke --rpath (#238284) Patch4: fltk-1.1.9-rpath.patch Patch5: fltk-1.1.8-fluid_desktop.patch -Patch6: fltk-1.1.9-consts.patch -Patch7: fltk-1.1.9-gcc44.patch +Patch7: fltk-1.1.9-scandir.patch %if 0%{?rhel} > 4 || 0%{?fedora} > 4 BuildRequires: libICE-devel libSM-devel @@ -85,7 +87,7 @@ Requires: %{name}-devel = %{version}-%{release} %if "%{?snap:1}" == "1" %setup -q -n fltk-1.1.x-%{snap} %else -%setup -q +%setup -q -n fltk-%{version}%{?pre} %endif %patch1 -p1 -b .fltk_config @@ -93,7 +95,6 @@ Requires: %{name}-devel = %{version}-%{release} %patch3 -p1 -b .undefined %patch4 -p1 -b .rpath %patch5 -p1 -b .fluid_desktop -%patch6 -p1 -b .consts # FIXME, why only needed for F-11+/gcc44 ? %if 0%{?fedora} > 10 %patch7 -p1 -b .gcc44 @@ -156,7 +157,7 @@ rm -rf $RPM_BUILD_ROOT%{_mandir}/cat* %check desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/fluid.desktop -make test +make -C test %clean @@ -224,6 +225,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || : %changelog +* Tue Dec 08 2009 Rex Dieter - 1.1.10-0.1.rc3 +- fltk-1.1.10rc3 + * Mon Dec 07 2009 Rex Dieter - 1.1.9-7 - real -static subpkg (#545145) diff --git a/sources b/sources index b806895..4705d60 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e146fd264e1001b1313acfd41ef75552 fltk-1.1.9-source.tar.bz2 +9e90a57291e2edb1a82d1083a765c8e4 fltk-1.1.10rc3-source.tar.bz2