rpms/fltk/EL-4 fltk-1.1.8-fluid_desktop.patch, NONE, 1.1 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-1.1.x-r5750-undefined.patch, NONE, 1.1 fltk-config.sh, NONE, 1.1 .cvsignore, 1.3, 1.4 fltk.spec, 1.9, 1.10 sources, 1.3, 1.4 fltk-1.1.7-config.patch, 1.1, NONE
Rex Dieter
rdieter at fedoraproject.org
Thu May 14 13:03:26 UTC 2009
Author: rdieter
Update of /cvs/pkgs/rpms/fltk/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3587
Modified Files:
.cvsignore fltk.spec sources
Added Files:
fltk-1.1.8-fluid_desktop.patch 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-1.1.x-r5750-undefined.patch fltk-config.sh
Removed Files:
fltk-1.1.7-config.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.8-fluid_desktop.patch:
--- NEW FILE fltk-1.1.8-fluid_desktop.patch ---
diff -up fltk-1.1.8/fluid/fluid.desktop.dt fltk-1.1.8/fluid/fluid.desktop
--- fltk-1.1.8/fluid/fluid.desktop.dt 2008-03-16 07:07:41.000000000 -0500
+++ fltk-1.1.8/fluid/fluid.desktop 2008-03-29 17:07:49.000000000 -0500
@@ -2,9 +2,9 @@
Name=FLUID
Comment=FLTK GUI Designer
TryExec=fluid
-Exec=cd %D && fluid %F
+Exec=fluid %F
Icon=fluid
Terminal=false
Type=Application
-MimeType=application/x-fluid
+MimeType=application/x-fluid;
Categories=Development;GUIDesigner;
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
fltk-1.1.x-r5750-undefined.patch:
--- NEW FILE fltk-1.1.x-r5750-undefined.patch ---
--- fltk-1.1.x-r5750/src/Makefile.undefined 2007-02-10 08:31:12.000000000 -0600
+++ fltk-1.1.x-r5750/src/Makefile 2007-04-05 07:51:31.000000000 -0500
@@ -282,7 +282,7 @@
libfltk_gl.so.1.1: $(GLOBJECTS) libfltk.so.1.1
echo $(DSOCOMMAND) $@ ...
- $(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk
+ $(DSOCOMMAND) $@ $(GLOBJECTS) -L. $(GLDLIBS) -lfltk
$(RM) libfltk_gl.so
$(LN) libfltk_gl.so.1.1 libfltk_gl.so
--- NEW FILE fltk-config.sh ---
#!/bin/bash
exec fltk-config-$(arch) "$@"
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fltk/EL-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore 11 Dec 2006 22:49:01 -0000 1.3
+++ .cvsignore 14 May 2009 13:03:25 -0000 1.4
@@ -1 +1 @@
-fltk-1.1.7-source.tar.bz2
+fltk-1.1.9-source.tar.bz2
Index: fltk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fltk/EL-4/fltk.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- fltk.spec 12 Dec 2006 06:11:39 -0000 1.9
+++ fltk.spec 14 May 2009 13:03:26 -0000 1.10
@@ -1,22 +1,39 @@
+%global arch %(arch 2>/dev/null || echo undefined)
+
Summary: C++ user interface toolkit
Name: fltk
-Version: 1.1.7
-Release: 5%{?dist}
+Version: 1.1.9
+Release: 4%{?dist}
-License: LGPL with exceptions
+# see COPYING (or http://www.fltk.org/COPYING.php ) for exceptions details
+License: LGPLv2+ with exceptions
Group: System Environment/Libraries
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
+%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# See http://bugzilla.redhat.com/199656
-Patch1: fltk-1.1.7-config.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.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
-BuildRequires: libXext-devel libXft-devel libXt-devel libX11-devel
-BuildRequires: xorg-x11-proto-devel
+BuildRequires: libXext-devel libXinerama-devel libXft-devel libXt-devel libX11-devel
+BuildRequires: xorg-x11-proto-devel xorg-x11-utils
%else
BuildRequires: xorg-x11-devel
%endif
@@ -26,9 +43,16 @@ BuildRequires: libpng-devel
BuildRequires: libGL-devel libGLU-devel
BuildRequires: pkgconfig
BuildRequires: desktop-file-utils
+BuildRequires: man
+
+%description
+FLTK (pronounced "fulltick") is a cross-platform C++ GUI toolkit.
+It provides modern GUI functionality without the bloat, and supports
+3D graphics via OpenGL and its built-in GLUT emulation.
+
%package devel
-Summary: Development package for %{name}
+Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: libstdc++-devel
@@ -39,47 +63,51 @@ Requires: libX11-devel libSM-devel
%else
Requires: xorg-x11-devel
%endif
+# includes static libs
+Provides: %{name}-static = %{version}-%{release}
+%description devel
+%{summary}.
%package fluid
Summary: Fast Light User Interface Designer
Group: Development/Tools
Requires: %{name}-devel = %{version}-%{release}
-
-%description
-FLTK (pronounced "fulltick") is a cross-platform C++ GUI toolkit for
-UNIX/Linux (X11), Microsoft Windows, and Mac OS X. It provides modern
-GUI functionality without the bloat, and supports 3D graphics via
-OpenGL and its built-in GLUT emulation. FLTK is designed to be small
-and modular enough to be statically linked, and also works fine as a
-shared library.
-
-%description devel
-This package contains development files for %{name}
-FLTK (pronounced "fulltick") is a cross-platform C++ GUI toolkit for
-UNIX/Linux (X11), Microsoft Windows, and Mac OS X. It provides modern
-GUI functionality without the bloat, and supports 3D graphics via
-OpenGL and its built-in GLUT emulation.
-
%description fluid
-fluid stands for the Fast Light User Interface Designer. It is an
-interactive GUI designer for FLTK.
+%{summary}, an interactive GUI designer for %{name}.
%prep
-%setup -q -n %{name}-%{version}%{?extraversion}
+%if "%{?snap:1}" == "1"
+%setup -q -n fltk-1.1.x-%{snap}
+%else
+%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
-export CPPFLAGS="$(pkg-config xft --cflags)"
-export LDFLAGS="$(pkg-config xft --libs)"
+
+# using --with-optim, so unset CFLAGS/CXXFLAGS
+export CFLAGS=" "
+export CXXFLAGS=" "
%configure \
- --disable-static \
+ --with-optim="%{optflags}" \
+ --enable-largefile \
--enable-shared \
--enable-threads \
--enable-xdbe \
+ --enable-xinerama \
--enable-xft
make %{?_smp_mflags}
@@ -87,14 +115,34 @@ make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
+
+# Makefile hack for 64bitness
+%if "%{_lib}" != "lib"
+mkdir -p $RPM_BUILD_ROOT%{_libdir}
+pushd $RPM_BUILD_ROOT%{_libdir}/..
+ln -s %{_lib} lib
+popd
+%endif
+
make install install-desktop DESTDIR=$RPM_BUILD_ROOT
-desktop-file-install --vendor=%{name} \
+# omit examples/games:
+make -C test uninstall-linux DESTDIR=$RPM_BUILD_ROOT
+rm -f $RPM_BUILD_ROOT%{_mandir}/man?/{blocks,checkers,sudoku}*
+
+# Makefile hack for 64bitness
+%if "%{_lib}" != "lib"
+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 \
- --add-category="Development" \
- --add-category="GUIDesigner" \
- --delete-original \
- $RPM_BUILD_ROOT%{_datadir}/applnk/Development/*.desktop
+ $RPM_BUILD_ROOT%{_datadir}/applications/fluid.desktop
# docs
rm -rf __docs
@@ -103,11 +151,10 @@ mv $RPM_BUILD_ROOT%{_docdir}/fltk __docs
## unpackaged files
# errant docs
rm -rf $RPM_BUILD_ROOT%{_mandir}/cat*
-# static libs
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.a
-# games: checkers/sudoku
-make -C test uninstall-linux DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT%{_mandir}/man?/{sudoku,checkers}*
+
+
+%check
+make test ||:
%clean
@@ -132,21 +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
+%{_libdir}/libfltk.a
+%{_libdir}/libfltk_forms.a
+%{_libdir}/libfltk_gl.a
+%{_libdir}/libfltk_images.a
%{_mandir}/man1/fltk-config.1*
%{_mandir}/man3/fltk.3*
@@ -155,12 +208,72 @@ update-desktop-database >& /dev/null ||:
%{_bindir}/fluid
%{_mandir}/man1/fluid.1*
%{_datadir}/applications/*fluid.desktop
+%{_datadir}/icons/hicolor/*/*/*
# FIXME
%{_datadir}/mimelnk/*/*.desktop
-%{_datadir}/icons/hicolor/*/*/*
%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)
+
+* Tue Feb 29 2008 Rex Dieter <rdieter at fedoraproject.org> 1.1.8-0.8.r6027
+- fltk-1.1.x-r6027
+
+* Mon Feb 11 2008 Rex Dieter <rdieter at fedoraproject.org> 1.1.8-0.7.r5989
+- respin (gcc43)
+
+* Wed Dec 12 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.1.8-0.6.r5989
+- --enable-largefile
+- fltk-1.1.x-r5989 snapshot (1.1.8 pre-release)
+
+* Mon Aug 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.1.8-0.5.r5750
+- License: LGPLv2+ with exceptions
+
+* Sat Aug 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.1.8-0.4.r5750
+- License: LGPLv2+ (with exceptions)
+
+* Sun Apr 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.1.8-0.3.r5750
+- *really* fix --rpath issue, using non-empty patch this time (#238284)
+
+* Sun Apr 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.1.8-0.2.r5750
+- nuke --rpath (#238284)
+
+* Thu Apr 05 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.1.8-0.1.r5750
+- fltk-1.1.x-r5750 snapshot (1.1.8 pre-release)
+- --enable-xinerama
+- patch for undefined symbols in libfltk_gl
+
+* Wed Apr 4 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.1.7-9.r5555
+- Always apply fltk-config patch (#199656)
+- Update fltk-1.1.7-config.patch
+
+* Wed Dec 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.1.7-8.r5555
+- more 64bit hackage to workaround broken Makefile logic (#219348)
+
+* Wed Dec 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.1.7-7.r5555
+- fltk-1.1.x-r5555 snapshot, for 64bit issues (#219348)
+- restore static libs (they're tightly coupled with fltk-config)
+- cleanup %%description's
+
+* Mon Dec 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.1.7-6
+- move tests to %%check section
+
* Mon Dec 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.1.7-5
- use included icon/.desktop files
- fix up fltk-config (#199656)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fltk/EL-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources 11 Dec 2006 22:49:01 -0000 1.3
+++ sources 14 May 2009 13:03:26 -0000 1.4
@@ -1 +1 @@
-2e29319119adc9d63b2f26b72cae0a88 fltk-1.1.7-source.tar.bz2
+e146fd264e1001b1313acfd41ef75552 fltk-1.1.9-source.tar.bz2
--- fltk-1.1.7-config.patch DELETED ---
More information about the scm-commits
mailing list