rpms/fltk
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 1.3.0rc5

Browse Source 
- patches no longer needed
  - fltk-1.1.9-test.patch
  - fltk-1.1.9-rpath.patch
  - fltk-1.1.10-pkgconfig_xft.patch
  - fltk-1.1.10-fluid_target.patch
- regenerated other patches to match current source

Signed-off-by: Adam Tkac <atkac@redhat.com>
This commit is contained in:
Adam Tkac 2011-05-25 17:51:47 +02:00
parent 794d95431d
commit ce175deea7
11 changed files with 37 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1 +1,2 @@
fltk-1.1.10-source.tar.bz2
/fltk-1.3.0rc5-source.tar.gz

12
fltk-1.1.10-fluid_target.patch
View File

@ -1,12 +0,0 @@
diff -up fltk-1.1.10/fluid/Makefile.fluid_target fltk-1.1.10/fluid/Makefile
--- fltk-1.1.10/fluid/Makefile.fluid_target 2008-12-29 14:21:29.000000000 -0600
+++ fltk-1.1.10/fluid/Makefile 2010-12-07 12:54:32.836737792 -0600
@@ -52,7 +52,7 @@ OBJECTS = $(CPPFILES:.cxx=.o)
include ../makeinclude
-all: $(FLUID) fluid$(EXEEXT)
+all: $(FLUID)
fluid$(EXEEXT): $(OBJECTS) $(LIBNAME) $(FLLIBNAME) \
$(IMGLIBNAME)

32
fltk-1.1.10-pkgconfig_xft.patch
View File

@ -1,32 +0,0 @@
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 --cflags xft` $CPPFLAGS"
+ CXXFLAGS="`pkg-config --cflags xft` $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 --libs xft` $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

13
fltk-1.1.8-fluid_desktop.patch
View File

@ -1,12 +1,7 @@
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
diff -up fltk-1.3.0rc5/fluid/fluid.desktop.fluid_desktop fltk-1.3.0rc5/fluid/fluid.desktop
--- fltk-1.3.0rc5/fluid/fluid.desktop.fluid_desktop 2010-11-14 17:37:34.000000000 +0100
+++ fltk-1.3.0rc5/fluid/fluid.desktop 2011-05-25 17:03:20.728727569 +0200
@@ -6,5 +6,5 @@ Exec=fluid %F
Icon=fluid
Terminal=false
Type=Application

18
fltk-1.1.9-fltk_config.patch
View File

@ -1,15 +1,6 @@
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
@ -19,12 +10,3 @@ diff -up fltk-1.1.9/fltk-config.in.ldstaticflags fltk-1.1.9/fltk-config.in
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

31
fltk-1.1.9-rpath.patch
View File

@ -1,31 +0,0 @@
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" -a "x$libdir" != "x/usr/lib32" -a "x$libdir" != "x/usr/lib64"; 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"

16
fltk-1.1.9-scandir.patch
View File

@ -1,12 +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
diff -up fltk-1.3.0rc5/src/filename_list.cxx.gcc44 fltk-1.3.0rc5/src/filename_list.cxx
--- fltk-1.3.0rc5/src/filename_list.cxx.gcc44 2011-01-05 17:50:10.000000000 +0100
+++ fltk-1.3.0rc5/src/filename_list.cxx 2011-05-25 16:26:16.842727901 +0200
@@ -119,7 +119,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(dirloc, 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:
#endif
#ifndef __APPLE__

22
fltk-1.1.9-test.patch
View File

@ -1,22 +0,0 @@
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

11
fltk-1.1.x-r5750-undefined.patch
View File

@ -1,11 +1,12 @@
--- 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 @@
diff -up fltk-1.3.0rc5/src/Makefile.undefined fltk-1.3.0rc5/src/Makefile
--- fltk-1.3.0rc5/src/Makefile.undefined 2011-02-06 15:08:08.000000000 +0100
+++ fltk-1.3.0rc5/src/Makefile 2011-05-25 16:19:41.430727963 +0200
@@ -312,7 +312,7 @@ $(GLLIBNAME): $(GLOBJECTS)
libfltk_gl.so.1.1: $(GLOBJECTS) libfltk.so.1.1
libfltk_gl.so.1.3: $(GLOBJECTS) libfltk.so.1.3
echo $(DSOCOMMAND) $@ ...
- $(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk
+ $(DSOCOMMAND) $@ $(GLOBJECTS) -L. $(GLDLIBS) -lfltk
$(RM) libfltk_gl.so
$(LN) libfltk_gl.so.1.1 libfltk_gl.so
$(LN) libfltk_gl.so.1.3 libfltk_gl.so

36
fltk.spec
View File

@ -1,10 +1,11 @@
%global arch %(arch 2>/dev/null || echo undefined)
%global pre rc5
Summary: C++ user interface toolkit
Name: fltk
Version: 1.1.10
Release: 6%{?dist}
Version: 1.3.0
Release: 0.1.%{?pre}%{?dist}
# see COPYING (or http://www.fltk.org/COPYING.php ) for exceptions details
License: LGPLv2+ with exceptions
@ -13,7 +14,7 @@ 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}%{?pre}/%{name}-%{version}%{?pre}-source.tar.bz2
Source0: http://ftp.easysw.com/pub/fltk/%{version}%{?pre}/%{name}-%{version}%{?pre}-source.tar.gz
#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)
@ -22,17 +23,10 @@ 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
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
# only build the fluid binary we intend to install/use (ie, don't build both fluid, fluid-shared)
Patch9: fltk-1.1.10-fluid_target.patch
%if 0%{?rhel} > 4 || 0%{?fedora} > 4
BuildRequires: libICE-devel libSM-devel
@ -92,16 +86,12 @@ Requires: %{name}-devel = %{version}-%{release}
%endif
%patch1 -p1 -b .fltk_config
%patch2 -p1 -b .test
%patch3 -p1 -b .undefined
%patch4 -p1 -b .rpath
%patch5 -p1 -b .fluid_desktop
# FIXME, why only needed for F-11+/gcc44 ?
%if 0%{?fedora} > 10
%patch7 -p1 -b .gcc44
%endif
%patch8 -p1 -b .pkgconfig_xft
%patch9 -p1 -b .fluid_target
# verbose build output
sed -i.silent '\,^.SILENT:,d' makeinclude.in
@ -197,10 +187,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
%files
%defattr(-,root,root,-)
%doc ANNOUNCEMENT CHANGES COPYING CREDITS README
%{_libdir}/libfltk.so.1.1
%{_libdir}/libfltk_forms.so.1.1
%{_libdir}/libfltk_gl.so.1.1
%{_libdir}/libfltk_images.so.1.1
%{_libdir}/libfltk.so.1.3
%{_libdir}/libfltk_forms.so.1.3
%{_libdir}/libfltk_gl.so.1.3
%{_libdir}/libfltk_images.so.1.3
%files devel
%defattr(-,root,root,-)
@ -209,7 +199,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
%{_bindir}/fltk-config
%{_bindir}/fltk-config-%{arch}
%{_includedir}/FL/
%{_includedir}/Fl
%{_libdir}/libfltk.so
%{_libdir}/libfltk_forms.so
%{_libdir}/libfltk_gl.so
@ -235,6 +224,15 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
%changelog
* Wed May 25 2011 Adam Tkac <atkac redhat com> - 1.3.0-0.1.rc5
- update to 1.3.0rc5
- patches no longer needed
- fltk-1.1.9-test.patch
- fltk-1.1.9-rpath.patch
- fltk-1.1.10-pkgconfig_xft.patch
- fltk-1.1.10-fluid_target.patch
- regenerated other patches to match current source
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.10-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild

2
sources
View File

@ -1 +1 @@
a1765594bc427ff892e36089fe1fa672 fltk-1.1.10-source.tar.bz2
6aab36475176c7176bf54e6aa54531eb fltk-1.3.0rc5-source.tar.gz