- up to 1.7.32

Changed files:
    fox-Xlib.patch -> 1.2
    fox.spec -> 1.121

diff --git a/fox-Xlib.patch b/fox-Xlib.patch
deleted file mode 100644 (file)
index f8ceaea..0000000
--- a/fox-Xlib.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- 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.spec b/fox.spec
index 9def4cab98982d72435aedf501e54b464418ab54..0c7b71104dd1c0fa1f8fa12bc31d3ab8b830986b 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.26
-Release:       4
+# 1.7 is devel, we should try to keep stable line
+Version:       1.7.32
+Release:       1
 License:       LGPL v2.1+
 Group:         X11/Libraries
-Source0:       http://fox-toolkit.org/ftp/%{name}-%{version}.tar.gz
-# Source0-md5: acaf8a1f33d02265b26a2b0c3fd06625
+Source0:       http://ftp.fox-toolkit.org/pub/%{name}-%{version}.tar.gz
+# Source0-md5: 1cf2607d15ffad5b664cf65bfcd249bc
 Patch0:                %{name}-opt.patch
 Patch1:                %{name}-link.patch
 Patch2:                %{name}-Makefile.patch
-Patch3:                %{name}-Xlib.patch
 URL:           http://www.fox-toolkit.org/
 BuildRequires: OpenGL-GLU-devel
 BuildRequires: autoconf >= 2.59-9
@@ -133,7 +133,6 @@ FOX - przykładowe programy.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %build
 %{__libtoolize}