rpms/fltk/EL-5 fltk-1.1.9-consts.patch, NONE, 1.1 fltk-1.1.9-fltk_config.patch, NONE, 1.1 fltk-1.1.9-gcc44.patch, NONE, 1.1 fltk-1.1.9-rpath.patch, NONE, 1.1 fltk-1.1.9-test.patch, NONE, 1.1 fltk-config.sh, NONE, 1.1 .cvsignore, 1.6, 1.7 fltk.spec, 1.18, 1.19 sources, 1.6, 1.7 fltk-1.1.7-test.patch, 1.1, NONE fltk-1.1.x-r5750-199656.patch, 1.1, NONE fltk-1.1.x-r5750-rpath.patch, 1.1, NONE
Rex Dieter
rdieter at fedoraproject.org
Thu May 14 12:56:15 UTC 2009
- Previous message: rpms/xorg-x11-drv-nouveau/F-11 nouveau-bicubic-2x.patch, 1.3, 1.4 nouveau-fb-resize.patch, 1.7, 1.8 nouveau-multiple-xserver.patch, 1.7, 1.8 nouveau-nv50-fb-accel.patch, 1.7, 1.8 nouveau-nv50-nva0-noaccel.patch, 1.7, 1.8 nouveau-store-vbios.patch, 1.7, 1.8 nouveau-transition-hack.patch, 1.7, 1.8 xorg-x11-drv-nouveau.spec, 1.47, 1.48
- Next message: rpms/xorg-x11-drv-nouveau/F-11 .cvsignore, 1.36, 1.37 sources, 1.37, 1.38
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rdieter
Update of /cvs/pkgs/rpms/fltk/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv805
Modified Files:
.cvsignore fltk.spec sources
Added Files:
fltk-1.1.9-consts.patch fltk-1.1.9-fltk_config.patch
fltk-1.1.9-gcc44.patch fltk-1.1.9-rpath.patch
fltk-1.1.9-test.patch fltk-config.sh
Removed Files:
fltk-1.1.7-test.patch fltk-1.1.x-r5750-199656.patch
fltk-1.1.x-r5750-rpath.patch
Log Message:
* Wed May 13 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.9-4
- unbreak fltk-config --ldstaticflags (#500201)
- (another?) gcc44 patch
- -devel: +Provides: %name-static
- fix multiarch conflicts (#341141)
fltk-1.1.9-consts.patch:
--- NEW FILE fltk-1.1.9-consts.patch ---
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
{
fltk-1.1.9-fltk_config.patch:
--- NEW FILE fltk-1.1.9-fltk_config.patch ---
diff -up fltk-1.1.9/fltk-config.in.ldstaticflags fltk-1.1.9/fltk-config.in
--- fltk-1.1.9/fltk-config.in.ldstaticflags 2008-02-20 12:10:13.000000000 -0600
+++ fltk-1.1.9/fltk-config.in 2009-05-13 10:23:15.071926233 -0500
@@ -57,7 +57,7 @@ ARCHFLAGS="@ARCHFLAGS@"
CFLAGS="@CFLAGS@ @LARGEFILE@ @PTHREAD_FLAGS@"
CXXFLAGS="@CXXFLAGS@ @LARGEFILE@ @PTHREAD_FLAGS@"
LDFLAGS="@LDFLAGS@"
-LDLIBS="@LIBS@"
+LDSTATICLIBS="@LIBS@"
OPTIM="@OPTIM@"
# Check for local invocation, and update paths accordingly...
@@ -216,7 +216,7 @@ else
includes=
fi
-if test "$libdir" != /usr/lib -a "$libdir" != /usr/lib32; then
+if test "$libdir" != /usr/lib -a "$libdir" != /usr/lib32 -a "$libdir" != /usr/lib64; then
libs=-L$libdir
else
libs=
@@ -240,7 +240,7 @@ if test x$use_images = xyes; then
fi
LDLIBS="$DSOLINK $LDFLAGS $libs $LDLIBS"
-LDSTATIC="$LDFLAGS $LDSTATIC"
+LDSTATIC="$LDFLAGS $LDSTATIC $LDSTATICLIBS"
# Answer to user requests
if test -n "$echo_help"; then
fltk-1.1.9-gcc44.patch:
--- NEW FILE fltk-1.1.9-gcc44.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:
fltk-1.1.9-rpath.patch:
--- NEW FILE fltk-1.1.9-rpath.patch ---
diff -up fltk-1.1.9/configure.in.rpath fltk-1.1.9/configure.in
--- fltk-1.1.9/configure.in.rpath 2008-04-11 11:53:01.000000000 -0500
+++ fltk-1.1.9/configure.in 2009-05-13 10:20:15.159163817 -0500
@@ -180,9 +180,9 @@ if test x$enable_shared = xyes; then
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
+# if test "x$libdir" != "x/usr/lib"; then
+# DSOLINK="-Wl,-rpath,$libdir"
+# fi
;;
AIX*)
DSONAME="libfltk_s.a"
diff -up fltk-1.1.9/configure.rpath fltk-1.1.9/configure
--- fltk-1.1.9/configure.rpath 2008-04-27 03:28:21.000000000 -0500
+++ fltk-1.1.9/configure 2009-05-13 10:20:15.164164455 -0500
@@ -1930,9 +1930,9 @@ if test x$enable_shared = xyes; then
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
+ 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
+ fi
;;
AIX*)
DSONAME="libfltk_s.a"
fltk-1.1.9-test.patch:
--- NEW FILE fltk-1.1.9-test.patch ---
diff -up fltk-1.1.9/Makefile.test fltk-1.1.9/Makefile
--- fltk-1.1.9/Makefile.test 2007-11-20 15:15:08.000000000 -0600
+++ fltk-1.1.9/Makefile 2009-05-13 10:31:55.161166535 -0500
@@ -27,7 +27,7 @@
include makeinclude
-DIRS = $(IMAGEDIRS) src fluid test documentation
+DIRS = $(IMAGEDIRS) src fluid documentation
all: makeinclude fltk-config
for dir in $(DIRS); do\
@@ -35,6 +35,9 @@ all: makeinclude fltk-config
(cd $$dir; $(MAKE) $(MFLAGS)) || exit 1;\
done
+test:
+ (cd test;; $(MAKE) $(MFLAGS)) || exit 1
+
install: makeinclude
-mkdir -p $(DESTDIR)$(bindir)
$(RM) $(DESTDIR)$(bindir)/fltk-config
--- NEW FILE fltk-config.sh ---
#!/bin/bash
exec fltk-config-$(arch) "$@"
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fltk/EL-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore 30 Mar 2008 00:05:25 -0000 1.6
+++ .cvsignore 14 May 2009 12:55:44 -0000 1.7
@@ -1 +1 @@
-fltk-1.1.8-source.tar.bz2
+fltk-1.1.9-source.tar.bz2
Index: fltk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fltk/EL-5/fltk.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- fltk.spec 30 Mar 2008 00:05:25 -0000 1.18
+++ fltk.spec 14 May 2009 12:55:44 -0000 1.19
@@ -1,11 +1,10 @@
-#define snap r6027
-#define _disable_static --disable-static
+%global arch %(arch 2>/dev/null || echo undefined)
Summary: C++ user interface toolkit
Name: fltk
-Version: 1.1.8
-Release: 1%{?dist}
+Version: 1.1.9
+Release: 4%{?dist}
# see COPYING (or http://www.fltk.org/COPYING.php ) for exceptions details
License: LGPLv2+ with exceptions
@@ -18,14 +17,18 @@ Source0: http://ftp.easysw.com/pu
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# omit extraneous bits from fltk-config --cflags|--libs (http://bugzilla.redhat.com/199656)
-Patch1: fltk-1.1.x-r5750-199656.patch
-Patch2: fltk-1.1.7-test.patch
+Source1: fltk-config.sh
+
+## FIXME/TODO: upstream these asap -- Rex
+Patch1: fltk-1.1.9-fltk_config.patch
+Patch2: fltk-1.1.9-test.patch
# libfltk_gl.so had undefined symbols
Patch3: fltk-1.1.x-r5750-undefined.patch
# nuke --rpath (#238284)
-Patch4: fltk-1.1.x-r5750-rpath.patch
+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
%if 0%{?rhel} > 4 || 0%{?fedora} > 4
BuildRequires: libICE-devel libSM-devel
@@ -60,6 +63,8 @@ Requires: libX11-devel libSM-devel
%else
Requires: xorg-x11-devel
%endif
+# includes static libs
+Provides: %{name}-static = %{version}-%{release}
%description devel
%{summary}.
@@ -78,11 +83,16 @@ Requires: %{name}-devel = %{version}-%{r
%setup -q
%endif
-%patch1 -p1 -b .199656
+%patch1 -p1 -b .fltk_config
%patch2 -p1 -b .test
%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
%build
@@ -92,7 +102,6 @@ export CFLAGS=" "
export CXXFLAGS=" "
%configure \
- %{?_disable_static} \
--with-optim="%{optflags}" \
--enable-largefile \
--enable-shared \
@@ -126,6 +135,11 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/man?/{b
rm -f $RPM_BUILD_ROOT%{_libdir}/../lib
%endif
+# hack to make fltk-config multilib-safe
+mv $RPM_BUILD_ROOT%{_bindir}/fltk-config \
+ $RPM_BUILD_ROOT%{_bindir}/fltk-config-%{arch}
+install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/fltk-config
+
desktop-file-install --vendor="%{name}" \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
$RPM_BUILD_ROOT%{_datadir}/applications/fluid.desktop
@@ -137,10 +151,6 @@ mv $RPM_BUILD_ROOT%{_docdir}/fltk __docs
## unpackaged files
# errant docs
rm -rf $RPM_BUILD_ROOT%{_mandir}/cat*
-# static libs
-%if "%{?_disable_static:1}" == "1"
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.a
-%endif
%check
@@ -169,27 +179,27 @@ update-desktop-database >& /dev/null ||:
%files
%defattr(-,root,root,-)
%doc ANNOUNCEMENT CHANGES COPYING CREDITS README
-%{_libdir}/libfltk.so.*
-%{_libdir}/libfltk_forms.so.*
-%{_libdir}/libfltk_gl.so.*
-%{_libdir}/libfltk_images.so.*
+%{_libdir}/libfltk.so.1.1
+%{_libdir}/libfltk_forms.so.1.1
+%{_libdir}/libfltk_gl.so.1.1
+%{_libdir}/libfltk_images.so.1.1
%files devel
%defattr(-,root,root,-)
%doc __docs/*
+# fltk-config multilib-safe wrapper
%{_bindir}/fltk-config
+%{_bindir}/fltk-config-%{arch}
%{_includedir}/FL/
%{_includedir}/Fl
%{_libdir}/libfltk.so
%{_libdir}/libfltk_forms.so
%{_libdir}/libfltk_gl.so
%{_libdir}/libfltk_images.so
-%if "%{?_disable_static:1}" != "1"
%{_libdir}/libfltk.a
%{_libdir}/libfltk_forms.a
%{_libdir}/libfltk_gl.a
%{_libdir}/libfltk_images.a
-%endif
%{_mandir}/man1/fltk-config.1*
%{_mandir}/man3/fltk.3*
@@ -204,6 +214,21 @@ update-desktop-database >& /dev/null ||:
%changelog
+* Wed May 13 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.9-4
+- unbreak fltk-config --ldstaticflags (#500201)
+- (another?) gcc44 patch
+- -devel: +Provides: %%name-static
+- fix multiarch conflicts (#341141)
+
+* Wed Mar 04 2009 Caolán McNamara <caolanm at redhat.com> - 1.1.9-3
+- fix uses of strchr wrt. constness
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.9-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Wed Oct 01 2008 Rex Dieter <rdieter at fedoraproject.org> 1.1.9-1
+- fltk-1.1.9
+
* Sat Mar 29 2008 Rex Dieter <rdieter at fedoraproject.org> 1.1.8-1
- fltk-1.1.8 (final)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fltk/EL-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources 30 Mar 2008 00:05:25 -0000 1.6
+++ sources 14 May 2009 12:55:44 -0000 1.7
@@ -1 +1 @@
-0f272d7299778e42fcbedf3c01741f4f fltk-1.1.8-source.tar.bz2
+e146fd264e1001b1313acfd41ef75552 fltk-1.1.9-source.tar.bz2
--- fltk-1.1.7-test.patch DELETED ---
--- fltk-1.1.x-r5750-199656.patch DELETED ---
--- fltk-1.1.x-r5750-rpath.patch DELETED ---
- Previous message: rpms/xorg-x11-drv-nouveau/F-11 nouveau-bicubic-2x.patch, 1.3, 1.4 nouveau-fb-resize.patch, 1.7, 1.8 nouveau-multiple-xserver.patch, 1.7, 1.8 nouveau-nv50-fb-accel.patch, 1.7, 1.8 nouveau-nv50-nva0-noaccel.patch, 1.7, 1.8 nouveau-store-vbios.patch, 1.7, 1.8 nouveau-transition-hack.patch, 1.7, 1.8 xorg-x11-drv-nouveau.spec, 1.47, 1.48
- Next message: rpms/xorg-x11-drv-nouveau/F-11 .cvsignore, 1.36, 1.37 sources, 1.37, 1.38
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list