- adjusted for 1.7.19

Changed files:
    fox-Makefile.patch -> 1.2
    fox-link.patch -> 1.5
    fox-opt.patch -> 1.3

diff --git a/fox-Makefile.patch b/fox-Makefile.patch
index c54b8f678a425d0719fff47fdaa14baa90d9dbcc..34ec9179c016663ca5d9f22baca522d09b53ed94 100644 (file)
--- a/fox-Makefile.patch
+++ b/fox-Makefile.patch
@@ -5,8 +5,8 @@ diff -Nru fox-1.4.5.orig/Makefile.am fox-1.4.5/Makefile.am
  AUTOMAKE_OPTIONS = foreign dist-zip
  #AUTOMAKE_OPTIONS = foreign dist-zip no-dependencies
  
--SUBDIRS    = utils include src chart doc tests shutterbug adie pathfinder calculator windows
-+SUBDIRS    = utils include src chart tests shutterbug adie pathfinder calculator windows
+-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
@@ -17,8 +17,8 @@ diff -Nru fox-1.4.5.orig/Makefile.in fox-1.4.5/Makefile.in
  AUTOMAKE_OPTIONS = foreign dist-zip
  #AUTOMAKE_OPTIONS = foreign dist-zip no-dependencies
  
--SUBDIRS = utils include src chart doc tests shutterbug adie pathfinder calculator windows
-+SUBDIRS = utils include src chart tests shutterbug adie pathfinder calculator windows
+-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 --git a/fox-link.patch b/fox-link.patch
index f0abe629710fc619377ac2e4c3aeb67b0f655e46..f9877c065baef7a200f0eb02b287cdd1f99d76e6 100644 (file)
--- a/fox-link.patch
+++ b/fox-link.patch
@@ -1,11 +1,11 @@
---- fox-1.6.0/chart/Makefile.am.orig   2005-09-23 09:23:31.000000000 +0200
-+++ fox-1.6.0/chart/Makefile.am        2005-10-18 19:56:09.182342080 +0200
+--- 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.6.la
+ lib_LTLIBRARIES = libCHART-1.7.la
  
--libCHART_1_6_la_LIBADD  = $(X_LIBS) $(X_BASE_LIBS) $(X_EXTRA_LIBS)
-+libCHART_1_6_la_LIBADD  = $(X_LIBS) $(X_BASE_LIBS) $(X_EXTRA_LIBS) ../src/libFOX-1.6.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_6_la_LDFLAGS = \
-         -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)    \
+ libCHART_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 0a69fde18418db3a7870b34cb1dae953212bf4b1..9a058e7949ef433425bab72687f44201aeda3add 100644 (file)
--- a/fox-opt.patch
+++ b/fox-opt.patch
@@ -1,20 +1,20 @@
---- fox-1.0.30/configure.in.orig       Sat Jan 11 06:01:11 2003
-+++ fox-1.0.30/configure.in    Tue Jan 28 19:29:29 2003
-@@ -240,7 +237,7 @@
+--- 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 @@
  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
  fi
- 
- dnl Building for release
-@@ -248,7 +245,7 @@
+@@ -380,7 +380,7 @@
  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 -finline-functions -fomit-frame-pointer -fexpensive-optimizations"
+ CXXFLAGS="${CXXFLAGS} -Wuninitialized -ffast-math -fstrict-aliasing -finline-functions -fomit-frame-pointer -fexpensive-optimizations"
  fi