rpms/fltk/EL-6 fltk-1.1.10-pkgconfig_xft.patch, NONE, 1.1 fltk-1.1.9-scandir.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 fltk-1.1.9-rpath.patch, 1.1, 1.2 fltk.spec, 1.44, 1.45 sources, 1.10, 1.11 fltk-1.1.9-consts.patch, 1.1, NONE fltk-1.1.9-gcc44.patch, 1.1, NONE
Rex Dieter
rdieter at fedoraproject.org
Wed Jun 23 12:32:08 UTC 2010
Author: rdieter
Update of /cvs/pkgs/rpms/fltk/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv12093
Modified Files:
.cvsignore fltk-1.1.9-rpath.patch fltk.spec sources
Added Files:
fltk-1.1.10-pkgconfig_xft.patch fltk-1.1.9-scandir.patch
Removed Files:
fltk-1.1.9-consts.patch fltk-1.1.9-gcc44.patch
Log Message:
* Sun Feb 10 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.1.10-1
- fltk-1.1.10
- FTBFS fltk-1.1.10-0.1.rc3.fc13: ImplicitDSOLinking (#564877)
fltk-1.1.10-pkgconfig_xft.patch:
configure | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--- NEW FILE fltk-1.1.10-pkgconfig_xft.patch ---
diff -up fltk-1.1.10/configure.pkgconfig_xft fltk-1.1.10/configure
--- fltk-1.1.10/configure.pkgconfig_xft 2010-02-14 14:03:17.730616944 -0600
+++ fltk-1.1.10/configure 2010-02-14 14:05:05.369368026 -0600
@@ -11945,8 +11945,8 @@ fi
if test "x$FTCONFIG" != x; then
- CPPFLAGS="`$FTCONFIG --cflags` $CPPFLAGS"
- CXXFLAGS="`$FTCONFIG --cflags` $CXXFLAGS"
+ CPPFLAGS="`pkg-config xft --cflags` $CPPFLAGS"
+ CXXFLAGS="`pkg-config xft --cflags` $CXXFLAGS"
if test "${ac_cv_header_X11_Xft_Xft_h+set}" = set; then
{ echo "$as_me:$LINENO: checking for X11/Xft/Xft.h" >&5
@@ -12080,7 +12080,7 @@ if test "${ac_cv_lib_Xft_XftDrawCreate+s
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lXft $LIBS"
+LIBS="`pkg-config xft --libs` $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -12140,7 +12140,7 @@ if test $ac_cv_lib_Xft_XftDrawCreate = y
#define USE_XFT 1
_ACEOF
- LIBS="-lXft $LIBS"
+ LIBS="`pkg-config xft --libs` $LIBS"
fi
fi
fltk-1.1.9-scandir.patch:
filename_list.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE fltk-1.1.9-scandir.patch ---
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:
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fltk/EL-6/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore 1 Oct 2008 17:22:37 -0000 1.10
+++ .cvsignore 23 Jun 2010 12:32:08 -0000 1.11
@@ -1 +1 @@
-fltk-1.1.9-source.tar.bz2
+fltk-1.1.10-source.tar.bz2
fltk-1.1.9-rpath.patch:
configure | 4 ++--
configure.in | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
Index: fltk-1.1.9-rpath.patch
===================================================================
RCS file: /cvs/pkgs/rpms/fltk/EL-6/fltk-1.1.9-rpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- fltk-1.1.9-rpath.patch 13 May 2009 15:37:43 -0000 1.1
+++ fltk-1.1.9-rpath.patch 23 Jun 2010 12:32:08 -0000 1.2
@@ -8,9 +8,9 @@ diff -up fltk-1.1.9/configure.in.rpath f
- 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"
Index: fltk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fltk/EL-6/fltk.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- fltk.spec 9 Dec 2009 00:23:12 -0000 1.44
+++ fltk.spec 23 Jun 2010 12:32:08 -0000 1.45
@@ -3,8 +3,8 @@
Summary: C++ user interface toolkit
Name: fltk
-Version: 1.1.9
-Release: 7%{?dist}
+Version: 1.1.10
+Release: 1%{?dist}
# see COPYING (or http://www.fltk.org/COPYING.php ) for exceptions details
License: LGPLv2+ with exceptions
@@ -13,7 +13,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 +28,9 @@ Patch3: fltk-1.1.x-r5750-undefined.patc
# 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
+# use output of `pkg-config xft --libs` instead of just -lXft
+Patch8: fltk-1.1.10-pkgconfig_xft.patch
%if 0%{?rhel} > 4 || 0%{?fedora} > 4
BuildRequires: libICE-devel libSM-devel
@@ -85,7 +87,7 @@ Requires: %{name}-devel = %{version}-%{r
%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,11 +95,11 @@ Requires: %{name}-devel = %{version}-%{r
%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
%endif
+%patch8 -p1 -b .pkgconfig_xft
%build
@@ -156,7 +158,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
@@ -205,7 +207,6 @@ gtk-update-icon-cache %{_datadir}/icons/
%{_mandir}/man1/fltk-config.1*
%{_mandir}/man3/fltk.3*
-
%files static
%defattr(-,root,root,-)
%{_libdir}/libfltk.a
@@ -224,6 +225,13 @@ gtk-update-icon-cache %{_datadir}/icons/
%changelog
+* Sun Feb 10 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.1.10-1
+- fltk-1.1.10
+- FTBFS fltk-1.1.10-0.1.rc3.fc13: ImplicitDSOLinking (#564877)
+
+* Tue Dec 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.10-0.1.rc3
+- fltk-1.1.10rc3
+
* Mon Dec 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.9-7
- real -static subpkg (#545145)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fltk/EL-6/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources 1 Oct 2008 17:22:37 -0000 1.10
+++ sources 23 Jun 2010 12:32:08 -0000 1.11
@@ -1 +1 @@
-e146fd264e1001b1313acfd41ef75552 fltk-1.1.9-source.tar.bz2
+a1765594bc427ff892e36089fe1fa672 fltk-1.1.10-source.tar.bz2
--- fltk-1.1.9-consts.patch DELETED ---
--- fltk-1.1.9-gcc44.patch DELETED ---
More information about the scm-commits
mailing list