SOURCES: rezound-fox.patch (NEW) - fox 1.6 compatibility

[qboosh]

Author: qboosh                       Date: Tue Oct 18 22:10:58 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- fox 1.6 compatibility

---- Files affected:
SOURCES:
   rezound-fox.patch (1.6 -> 1.7)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/rezound-fox.patch
diff -u /dev/null SOURCES/rezound-fox.patch:1.7
--- /dev/null	Wed Oct 19 00:10:58 2005
+++ SOURCES/rezound-fox.patch	Wed Oct 19 00:10:52 2005
@@ -0,0 +1,71 @@
+--- rezound-0.12.2beta/src/frontend_fox/Makefile.am.orig	2005-04-30 23:58:16.000000000 +0200
++++ rezound-0.12.2beta/src/frontend_fox/Makefile.am	2005-10-18 21:12:38.264695520 +0200
+@@ -115,14 +115,14 @@
+ 	$(top_builddir)/src/misc/CNestedDataFile/libmiscCN.la \
+ 	$(top_builddir)/src/PoolFile/libPoolFile.la
+ 
+-rezound_LDADD=$(_rezound_LDADD) @FOX_1_5_LIBS@  @FOX_1_4_LIBS@ @FOX_1_3_LIBS@ @FOX_1_2_LIBS@ @FOX_1_1_LIBS@ @FOX_LIBS@
++rezound_LDADD=$(_rezound_LDADD) @FOX_1_6_LIBS@ @FOX_1_5_LIBS@  @FOX_1_4_LIBS@ @FOX_1_3_LIBS@ @FOX_1_2_LIBS@ @FOX_1_1_LIBS@ @FOX_LIBS@
+ 
+ ## if I don't do this, automake leaves out @abc@ vars when creating the rezound_DEPENDENCES value
+ ## so changes to the LADSPA lib (that may or may not be built) don't cause a re-link
+ rezound_DEPENDENCIES=$(_rezound_LDADD)
+ 
+ 
+-AM_CXXFLAGS=@FOX_1_5_CXXFLAGS@ @FOX_1_4_CXXFLAGS@ @FOX_1_3_CXXFLAGS@ @FOX_1_2_CXXFLAGS@ @FOX_1_1_CXXFLAGS@ @FOX_CXXFLAGS@
++AM_CXXFLAGS=@FOX_1_6_CXXFLAGS@ @FOX_1_5_CXXFLAGS@ @FOX_1_4_CXXFLAGS@ @FOX_1_3_CXXFLAGS@ @FOX_1_2_CXXFLAGS@ @FOX_1_1_CXXFLAGS@ @FOX_CXXFLAGS@
+ 
+ noinst_HEADERS=\
+ 	fox_compat.h \
+--- rezound-0.12.2beta/configure.ac.orig	2005-10-18 21:06:06.851199000 +0200
++++ rezound-0.12.2beta/configure.ac	2005-10-18 21:12:07.902311304 +0200
+@@ -615,6 +615,8 @@
+ 
+ # This is a check for a class in a C++ library. To pinpoint the specific version we need we could change what class is linked.
+ # it sets $1_CXXFLAGS and $1_LIBS to either something useful or nothing
++ajv_CXX_CHECK_LIB(FOX-1.6,FXApp,fox-1.6/fx.h,[http://fox-toolkit.org],[],false)
++if test -z "$FOX_1_6_LIBS"; then
+ ajv_CXX_CHECK_LIB(FOX-1.5,FXApp,fox-1.5/fx.h,[http://fox-toolkit.org],[],false)
+ if test -z "$FOX_1_5_LIBS"; then
+ 	ajv_CXX_CHECK_LIB(FOX-1.4,FXApp,fox-1.4/fx.h,[http://fox-toolkit.org],[],false)
+@@ -633,6 +635,7 @@
+ 		fi
+ 	fi
+ fi
++fi
+ 
+ AC_SUBST(FOX_1_1_CXXFLAGS)
+ AC_SUBST(FOX_1_1_LIBS)
+@@ -644,6 +647,8 @@
+ AC_SUBST(FOX_1_4_LIBS)
+ AC_SUBST(FOX_1_5_CXXFLAGS)
+ AC_SUBST(FOX_1_5_LIBS)
++AC_SUBST(FOX_1_6_CXXFLAGS)
++AC_SUBST(FOX_1_6_LIBS)
+ AC_SUBST(FOX_CXXFLAGS)
+ AC_SUBST(FOX_LIBS)
+ 
+--- rezound-0.12.2beta/src/frontend_fox/fox_compat.h.orig	2005-08-22 01:49:53.000000000 +0200
++++ rezound-0.12.2beta/src/frontend_fox/fox_compat.h	2005-10-18 22:34:11.912747936 +0200
+@@ -21,6 +21,9 @@
+ #elif defined(HAVE_LIBFOX_1_5)
+ 	#include <fox-1.5/fx.h>
+ 	#include <fox-1.5/fxkeys.h>
++#elif defined(HAVE_LIBFOX_1_6)
++	#include <fox-1.6/fx.h>
++	#include <fox-1.6/fxkeys.h>
+ #else
+ 	#error no HAVE_LIBFOX defined
+ #endif
+@@ -102,6 +105,10 @@
+ 	#define FONTSLANT_REGULAR FXFont::Straight
+ #endif
+ 
+-
++#if REZ_FOX_VERSION>=10512
++	// ~1.5.12 renamed fxparse*
++	#define fxparseAccel parseAccel
++	#define fxunparseAccel unparseAccel
++#endif
+ 
+ #endif
================================================================