- updated to 1.7.25

- updated opt,link,Makefile patches
- removed obsolete pkgconfig patch
- added Xlib patch (types fix)

Changed files:
    fox-Makefile.patch -> 1.3
    fox-Xlib.patch -> 1.1
    fox-link.patch -> 1.7
    fox-opt.patch -> 1.4
    fox.spec -> 1.116
    pkgconfig.patch -> 1.2

diff --git a/fox-Makefile.patch b/fox-Makefile.patch
index 34ec9179c016663ca5d9f22baca522d09b53ed94..838d678da4f978e2215038f6cb3e7bde559a4cd7 100644 (file)
--- a/fox-Makefile.patch
+++ b/fox-Makefile.patch
@@ -1,24 +1,11 @@
-diff -Nru fox-1.4.5.orig/Makefile.am fox-1.4.5/Makefile.am
---- fox-1.4.5.orig/Makefile.am 2005-02-16 13:32:39.178606728 +0000
-+++ fox-1.4.5/Makefile.am      2005-02-16 13:32:53.081493168 +0000
-@@ -4,7 +4,7 @@
+--- fox-1.7.25/Makefile.am.orig        2010-10-07 04:46:48.000000000 +0200
++++ fox-1.7.25/Makefile.am     2011-05-13 16:25:36.062671005 +0200
+@@ -3,7 +3,7 @@
+ # For non-gcc compilers, change the options to "no-dependencies"
  AUTOMAKE_OPTIONS = foreign dist-zip
- #AUTOMAKE_OPTIONS = foreign dist-zip no-dependencies
  
--SUBDIRS    = utils include src chart doc tests shutterbug adie pathfinder calculator controlpanel windows
-+SUBDIRS    = utils include src chart tests shutterbug adie pathfinder calculator controlpanel windows
- EXTRA_DIST = ADDITIONS AUTHORS INSTALL LICENSE LICENSE_ADDENDUM TRACING README fox.lsm index.html aclocal.m4
- 
- bin_SCRIPTS = fox-config
-diff -Nru fox-1.4.5.orig/Makefile.in fox-1.4.5/Makefile.in
---- fox-1.4.5.orig/Makefile.in 2005-02-16 13:32:39.178606728 +0000
-+++ fox-1.4.5/Makefile.in      2005-02-16 13:32:49.459043864 +0000
-@@ -102,7 +102,7 @@
- AUTOMAKE_OPTIONS = foreign dist-zip
- #AUTOMAKE_OPTIONS = foreign dist-zip no-dependencies
- 
--SUBDIRS = utils include src chart doc tests shutterbug adie pathfinder calculator controlpanel windows
-+SUBDIRS = utils include src chart tests shutterbug adie pathfinder calculator controlpanel windows
- EXTRA_DIST = ADDITIONS AUTHORS INSTALL LICENSE LICENSE_ADDENDUM TRACING README fox.lsm index.html aclocal.m4
+-SUBDIRS    = utils include lib chart doc tests shutterbug adie pathfinder calculator controlpanel windows
++SUBDIRS    = utils include lib chart tests shutterbug adie pathfinder calculator controlpanel windows
+ EXTRA_DIST = ADDITIONS AUTHORS INSTALL LICENSE LICENSE_ADDENDUM TRACING README fox.spec fox.lsm index.html aclocal.m4
  
  bin_SCRIPTS = fox-config

diff --git a/fox-Xlib.patch b/fox-Xlib.patch
new file mode 100644 (file)
index 0000000..f8ceaea
--- /dev/null
+++ b/fox-Xlib.patch
@@ -0,0 +1,29 @@
+--- fox-1.7.25/lib/FXApp.cpp.orig      2010-09-28 02:55:41.000000000 +0200
++++ fox-1.7.25/lib/FXApp.cpp   2011-05-13 16:48:16.326049884 +0200
+@@ -1207,7 +1207,7 @@
+ #ifndef NO_XIM
+   XIMCallback ximcallback;
+   fxwarning("Warning: input method server restarted.\n");
+-  XUnregisterIMInstantiateCallback((Display*)app->getDisplay(),NULL,NULL,NULL,(XIMProc)imcreatecallback,(XPointer)a);
++  XUnregisterIMInstantiateCallback((Display*)app->getDisplay(),NULL,NULL,NULL,(XIDProc)imcreatecallback,(XPointer)a);
+   a->xim=XOpenIM((Display*)app->display,NULL,NULL,NULL);
+   if(a->xim){
+     ximcallback.callback=(XIMProc)imdestroycallback;
+@@ -1222,7 +1222,7 @@
+ void FXApp::imdestroycallback(void*,FXApp* a,void*){
+ #ifndef NO_XIM
+   fxwarning("Warning: input method server terminated.\n");
+-  XRegisterIMInstantiateCallback((Display*)a->getDisplay(),NULL,NULL,NULL,(XIMProc)imcreatecallback,(XPointer)a);
++  XRegisterIMInstantiateCallback((Display*)a->getDisplay(),NULL,NULL,NULL,(XIDProc)imcreatecallback,(XPointer)a);
+   a->xim=NULL;
+ #endif
+   }
+@@ -1538,7 +1538,7 @@
+       FXTRACE((100,"Got Input Method\n"));
+       }
+     else{
+-      XRegisterIMInstantiateCallback((Display*)display,NULL,NULL,NULL,(XIMProc)imcreatecallback,(XPointer)this);
++      XRegisterIMInstantiateCallback((Display*)display,NULL,NULL,NULL,(XIDProc)imcreatecallback,(XPointer)this);
+       }
+ #endif
+ 

diff --git a/fox-link.patch b/fox-link.patch
index 23635cab1b3e11aa5390ca5051a2d8c79b234f19..1cb360e41ae9529f753e5eca540f6e9d975b7fe9 100644 (file)
--- a/fox-link.patch
+++ b/fox-link.patch
@@ -1,21 +1,10 @@
---- fox-1.7.19/chart/Makefile.am.orig  2005-09-23 09:23:31.000000000 +0200
-+++ fox-1.7.19/chart/Makefile.am       2005-10-18 19:56:09.182342080 +0200
-@@ -8,7 +8,7 @@
- 
- lib_LTLIBRARIES = libCHART-1.7.la
- 
--libCHART_1_7_la_LIBADD  = $(X_LIBS) $(X_BASE_LIBS) $(X_EXTRA_LIBS)
-+libCHART_1_7_la_LIBADD  = $(X_LIBS) $(X_BASE_LIBS) $(X_EXTRA_LIBS) ../src/libFOX-1.7.la
- 
- libCHART_1_7_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -export-dynamic
-
---- fox-1.7.19/src/Makefile.am~        2009-01-23 04:34:27.000000000 +0100
-+++ fox-1.7.19/src/Makefile.am 2011-01-30 17:37:53.232169448 +0100
+--- fox-1.7.25/lib/Makefile.am.orig    2010-11-02 03:07:14.000000000 +0100
++++ fox-1.7.25/lib/Makefile.am 2011-05-13 16:24:24.319335269 +0200
 @@ -7,7 +7,7 @@
  
  lib_LTLIBRARIES = libFOX-1.7.la
  
--libFOX_1_7_la_LIBADD  = $(X_LIBS) $(X_BASE_LIBS) $(X_EXTRA_LIBS) $(GL_LIBS)
+-libFOX_1_7_la_LIBADD  = $(X_LIBS) $(X_PRE_LIBS) $(X_BASE_LIBS) $(X_EXTRA_LIBS) $(GL_LIBS)
 +libFOX_1_7_la_LIBADD  = $(X_LIBS) $(X_BASE_LIBS) $(X_EXTRA_LIBS) $(GL_LIBS) -lfontconfig
  
  libFOX_1_7_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -export-dynamic

diff --git a/fox-opt.patch b/fox-opt.patch
index 9a058e7949ef433425bab72687f44201aeda3add..dad8b0ae138ea953d50d008d485d5c269a2202aa 100644 (file)
--- a/fox-opt.patch
+++ b/fox-opt.patch
@@ -1,20 +1,33 @@
---- fox-1.7.19/configure.in.orig       2009-06-08 15:44:02.800305559 +0200
-+++ fox-1.7.19/configure.in    2009-06-08 15:44:19.686993869 +0200
-@@ -370,7 +370,7 @@
+--- fox-1.7.25/configure.ac.orig       2010-11-24 06:11:50.000000000 +0100
++++ fox-1.7.25/configure.ac    2011-05-13 16:20:27.532660673 +0200
+@@ -56,9 +56,6 @@
+ AC_SUBST(LT_REVISION)
+ AC_SUBST(LT_AGE)
+ 
+-# Prevents setting flags.
+-CXXFLAGS=""
+-
+ # More secret source
+ AC_GNU_SOURCE
+ 
+@@ -120,7 +117,7 @@
  AC_ARG_ENABLE(debug,[  --enable-debug          compile for debugging])
  AC_MSG_RESULT([$enable_debug])
  if test "x$enable_debug" = "xyes" ; then
--CXXFLAGS="${CXXFLAGS} -g -DDEBUG"
-+CXXFLAGS="${CXXFLAGS} -DDEBUG"
- echo DEBUG
- echo CXXFLAGS=$CXXFLAGS
+-  CXXFLAGS="${CXXFLAGS} -g -DDEBUG"
++  CXXFLAGS="${CXXFLAGS} -DDEBUG"
  fi
-@@ -380,7 +380,7 @@
+ 
+ # Building for release
+@@ -128,10 +125,9 @@
  AC_ARG_ENABLE(release,[  --enable-release        compile for release])
  AC_MSG_RESULT([$enable_release])
  if test "x$enable_release" = "xyes" ; then
--CXXFLAGS="${CXXFLAGS} -O2 -DNDEBUG"
-+CXXFLAGS="${CXXFLAGS} -DNDEBUG"
- if test "${GXX}" = "yes" ; then
- CXXFLAGS="${CXXFLAGS} -Wuninitialized -ffast-math -fstrict-aliasing -finline-functions -fomit-frame-pointer -fexpensive-optimizations"
+-  CXXFLAGS="${CXXFLAGS} -O2 -DNDEBUG"
++  CXXFLAGS="${CXXFLAGS} -DNDEBUG"
+   if test "${GXX}" = "yes" ; then
+     CXXFLAGS="${CXXFLAGS} -Wuninitialized -ffast-math -fstrict-aliasing -finline-functions -fomit-frame-pointer -fexpensive-optimizations"
+-    LDFLAGS="-s ${LDFLAGS}"
+   fi
  fi
+ 

diff --git a/fox.spec b/fox.spec
index 0dfcffd2ef7f840287d3c2563377d7fc9d28cb42..abf4cf525f2f1077ec84db330bef7706e730b952 100644 (file)
--- a/fox.spec
+++ b/fox.spec
@@ -6,16 +6,16 @@
 Summary:       The FOX C++ GUI Toolkit
 Summary(pl.UTF-8):     FOX - toolkit graficzny w C++
 Name:          fox
-Version:       1.7.19
-Release:       7
-License:       LGPL
+Version:       1.7.25
+Release:       1
+License:       LGPL v2.1+
 Group:         X11/Libraries
-Source0:       ftp://ftp.fox-toolkit.com/pub/%{name}-%{version}.tar.gz
-# Source0-md5: fb4d0934be26c27c7e76fcbefe2b5d30
+Source0:       http://fox-toolkit.org/ftp/%{name}-%{version}.tar.gz
+# Source0-md5: 232e2996be39148287e80b59061c7a66
 Patch0:                %{name}-opt.patch
 Patch1:                %{name}-link.patch
 Patch2:                %{name}-Makefile.patch
-Patch3:                pkgconfig.patch
+Patch3:                %{name}-Xlib.patch
 URL:           http://www.fox-toolkit.org/
 BuildRequires: OpenGL-GLU-devel
 BuildRequires: autoconf >= 2.59-9
@@ -154,8 +154,6 @@ FOX - przykładowe programy.
 
 %{__make}
 
-%{__make} -C doc docs
-
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_datadir},%{_examplesdir}/%{name}-%{version}}

diff --git a/pkgconfig.patch b/pkgconfig.patch
deleted file mode 100644 (file)
index cc8915c..0000000
--- a/pkgconfig.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- fox-1.7.19/fox.pc.in~      2006-06-15 05:26:39.000000000 +0200
-+++ fox-1.7.19/fox.pc.in       2010-08-31 09:10:41.830197882 +0200
-@@ -2,16 +2,16 @@
- exec_prefix="@exec_prefix@"
- libdir="@libdir@"
- includedir="@includedir@/fox-@FOX_MAJOR_VERSION@.@FOX_MINOR_VERSION@"
--LIBS="@LIBS@"
--X_LIBS="@X_LIBS@""
--X_BASE_LIBS="@X_BASE_LIBS@"
--X_EXTRA_LIBS="@X_EXTRA_LIBS@"
--GL_LIBS="@GL_LIBS@"
-+LIBS="@LIBS@ "
-+X_LIBS="@X_LIBS@" "
-+X_BASE_LIBS="@X_BASE_LIBS@ "
-+X_EXTRA_LIBS="@X_EXTRA_LIBS@ "
-+GL_LIBS="@GL_LIBS@ "
- FOX_LIBS=-lFOX-@FOX_MAJOR_VERSION@.@FOX_MINOR_VERSION@
- 
- Name: FOX
- Description: The FOX Toolkit
- URL: www.fox-toolkit.com
- Version: @FOX_MAJOR_VERSION@.@FOX_MINOR_VERSION@.@FOX_PATCH_LEVEL@
--Libs: ${FOX_LIBS} ${X_LIBS} ${X_BASE_LIBS} ${X_EXTRA_LIBS} ${GL_LIBS} ${LIBS}
-+Libs: ${FOX_LIBS} ${X_LIBS}${X_BASE_LIBS}${X_EXTRA_LIBS}${GL_LIBS}${LIBS}
- Cflags: -I${includedir}