From ba52950b97f468044839bdd319b2a0f66b8f4dde Mon Sep 17 00:00:00 2001
From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Fri, 13 May 2011 14:17:20 +0000
Subject: [PATCH] - updated to 1.6.44 - updated opt,Makefile patches

Changed files:
    fox16-Makefile.patch -> 1.2
    fox16-opt.patch -> 1.2
    fox16.spec -> 1.2
---
 fox16-Makefile.patch | 12 ------------
 fox16-opt.patch      | 35 ++++++++++++++++++++++++-----------
 fox16.spec           |  6 +++---
 3 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/fox16-Makefile.patch b/fox16-Makefile.patch
index c54b8f6..6d50469 100644
--- a/fox16-Makefile.patch
+++ b/fox16-Makefile.patch
@@ -9,16 +9,4 @@ diff -Nru fox-1.4.5.orig/Makefile.am fox-1.4.5/Makefile.am
 +SUBDIRS    = utils include src chart tests shutterbug adie pathfinder calculator 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 windows
-+SUBDIRS = utils include src chart tests shutterbug adie pathfinder calculator windows
- EXTRA_DIST = ADDITIONS AUTHORS INSTALL LICENSE LICENSE_ADDENDUM TRACING README fox.lsm index.html aclocal.m4
- 
  bin_SCRIPTS = fox-config
diff --git a/fox16-opt.patch b/fox16-opt.patch
index 0a69fde..d79aa6c 100644
--- a/fox16-opt.patch
+++ b/fox16-opt.patch
@@ -1,20 +1,33 @@
---- 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.6.44/configure.ac.orig	2011-02-10 02:25:34.000000000 +0100
++++ fox-1.6.44/configure.ac	2011-05-13 15:28:57.982557225 +0200
+@@ -56,9 +56,6 @@
+ AC_SUBST(LT_REVISION)
+ AC_SUBST(LT_AGE)
+ 
+-# Prevents setting flags.
+-CXXFLAGS=""
+-
+ # More secret source
+ AC_GNU_SOURCE
+ 
+@@ -118,7 +115,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"
+-  CXXFLAGS="${CXXFLAGS} -g -DDEBUG"
++  CXXFLAGS="${CXXFLAGS} -DDEBUG"
  fi
  
- dnl Building for release
-@@ -248,7 +245,7 @@
+ # Building for release
+@@ -126,10 +123,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 -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/fox16.spec b/fox16.spec
index f7811f0..b643bdf 100644
--- a/fox16.spec
+++ b/fox16.spec
@@ -6,12 +6,12 @@
 Summary:	The FOX 1.6 C++ GUI Toolkit
 Summary(pl.UTF-8):	FOX 1.6 - toolkit graficzny w C++
 Name:		fox16
-Version:	1.6.34
+Version:	1.6.44
 Release:	1
 License:	LGPL v2.1+
 Group:		X11/Libraries
-Source0:	ftp://ftp.fox-toolkit.com/pub/fox-%{version}.tar.gz
-# Source0-md5:	920124025d6495bbd008be635ff759ad
+Source0:	http://fox-toolkit.org/ftp/fox-%{version}.tar.gz
+# Source0-md5:	f3c66bbe87b65de3a3fb480278bcfffd
 Patch0:		%{name}-opt.patch
 Patch1:		%{name}-link.patch
 Patch2:		%{name}-Makefile.patch
-- 
2.44.0