packages: fox/fox-Makefile.patch, fox/fox-link.patch, fox/fox-opt.patch, fo...

qboosh qboosh at pld-linux.org
Fri May 13 17:32:07 CEST 2011 

Author: qboosh                       Date: Fri May 13 15:32:07 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 1.7.25
- updated opt,link,Makefile patches
- removed obsolete pkgconfig patch
- added Xlib patch (types fix)

---- Files affected:
packages/fox:
   fox-Makefile.patch (1.2 -> 1.3) , fox-link.patch (1.6 -> 1.7) , fox-opt.patch (1.3 -> 1.4) , fox.spec (1.115 -> 1.116) , fox-Xlib.patch (NONE -> 1.1)  (NEW), pkgconfig.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/fox/fox-Makefile.patch
diff -u packages/fox/fox-Makefile.patch:1.2 packages/fox/fox-Makefile.patch:1.3
--- packages/fox/fox-Makefile.patch:1.2	Mon Jun  8 15:37:14 2009
+++ packages/fox/fox-Makefile.patch	Fri May 13 17:32:02 2011
@@ -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

================================================================
Index: packages/fox/fox-link.patch
diff -u packages/fox/fox-link.patch:1.6 packages/fox/fox-link.patch:1.7
--- packages/fox/fox-link.patch:1.6	Sun Jan 30 17:47:52 2011
+++ packages/fox/fox-link.patch	Fri May 13 17:32:02 2011
@@ -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

================================================================
Index: packages/fox/fox-opt.patch
diff -u packages/fox/fox-opt.patch:1.3 packages/fox/fox-opt.patch:1.4
--- packages/fox/fox-opt.patch:1.3	Mon Jun  8 15:36:59 2009
+++ packages/fox/fox-opt.patch	Fri May 13 17:32:02 2011
@@ -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
+ 

================================================================
Index: packages/fox/fox.spec
diff -u packages/fox/fox.spec:1.115 packages/fox/fox.spec:1.116
--- packages/fox/fox.spec:1.115	Thu May 12 19:59:39 2011
+++ packages/fox/fox.spec	Fri May 13 17:32:02 2011
@@ -7,16 +7,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
@@ -155,8 +155,6 @@
 
 %{__make}
 
-%{__make} -C doc docs
-
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_datadir},%{_examplesdir}/%{name}-%{version}}
@@ -234,6 +232,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.116  2011/05/13 15:32:02  qboosh
+- updated to 1.7.25
+- updated opt,link,Makefile patches
+- removed obsolete pkgconfig patch
+- added Xlib patch (types fix)
+
 Revision 1.115  2011/05/12 17:59:39  qboosh
 - simplified static_libs bcond
 

================================================================
Index: packages/fox/fox-Xlib.patch
diff -u /dev/null packages/fox/fox-Xlib.patch:1.1
--- /dev/null	Fri May 13 17:32:07 2011
+++ packages/fox/fox-Xlib.patch	Fri May 13 17:32:02 2011
@@ -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
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/fox/fox-Makefile.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/fox/fox-link.patch?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/fox/fox-opt.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/fox/fox.spec?r1=1.115&r2=1.116&f=u

More information about the pld-cvs-commit mailing list