From: Jakub Bogusz Date: Mon, 6 Feb 2017 14:26:40 +0000 (+0100) Subject: - updated to 1.7.57 X-Git-Tag: auto/th/fox-1.7.57-1 X-Git-Url: http://git.pld-linux.org/?p=packages%2Ffox.git;a=commitdiff_plain;h=910698a669cc0ea1c555ac4e5438642b042d7cf9 - updated to 1.7.57 - updated opt,Makefile,x32 patches --- diff --git a/fox-Makefile.patch b/fox-Makefile.patch index 73e0a42..a6c596e 100644 --- a/fox-Makefile.patch +++ b/fox-Makefile.patch @@ -1,11 +1,11 @@ ---- fox-1.7.36/Makefile.am.orig 2012-09-15 20:10:42.017935359 +0200 -+++ fox-1.7.36/Makefile.am 2012-09-15 20:24:24.477918216 +0200 +--- fox-1.7.57/Makefile.am.orig 2017-02-05 22:23:23.316756636 +0100 ++++ fox-1.7.57/Makefile.am 2017-02-06 05:34:14.393128130 +0100 @@ -3,7 +3,7 @@ # For non-gcc compilers, change the options to "no-dependencies" AUTOMAKE_OPTIONS = foreign dist-zip --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 +-SUBDIRS = utils include lib chart doc tests shutterbug adie pathfinder calculator controlpanel glviewer windows ++SUBDIRS = utils include lib chart tests shutterbug adie pathfinder calculator controlpanel glviewer windows EXTRA_DIST = ADDITIONS AUTHORS INSTALL LICENSE LICENSE_ADDENDUM TRACING README fox.spec fox-config index.html aclocal.m4 bin_SCRIPTS = fox-config diff --git a/fox-opt.patch b/fox-opt.patch index f91be2e..dd869c8 100644 --- a/fox-opt.patch +++ b/fox-opt.patch @@ -1,5 +1,5 @@ ---- fox-1.7.26/configure.ac.orig 2011-04-13 02:14:35.000000000 +0200 -+++ fox-1.7.26/configure.ac 2011-05-28 07:38:29.803780335 +0200 +--- fox-1.7.57/configure.ac.orig 2016-07-08 20:07:27.000000000 +0200 ++++ fox-1.7.57/configure.ac 2017-02-05 22:23:07.410090151 +0100 @@ -56,9 +56,6 @@ AC_SUBST(LT_REVISION) AC_SUBST(LT_AGE) @@ -10,7 +10,7 @@ # More secret source AC_GNU_SOURCE -@@ -120,7 +117,7 @@ +@@ -125,7 +122,7 @@ AC_ARG_ENABLE(debug,[ --enable-debug compile for debugging]) AC_MSG_RESULT([$enable_debug]) if test "x$enable_debug" = "xyes" ; then @@ -19,14 +19,14 @@ fi # Building for release -@@ -128,10 +125,9 @@ +@@ -133,10 +130,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" + CXXFLAGS="${CXXFLAGS} -ffast-math -fstrict-aliasing -finline-functions -fomit-frame-pointer" - LDFLAGS="-s ${LDFLAGS}" fi fi diff --git a/fox.spec b/fox.spec index a487371..28b32db 100644 --- a/fox.spec +++ b/fox.spec @@ -8,12 +8,12 @@ Summary: The FOX C++ GUI Toolkit Summary(pl.UTF-8): FOX - toolkit graficzny w C++ Name: fox # NOTE: after switching to 1.8.x keep stable (1.8.x) on HEAD and devel (1.9.x) on DEVEL -Version: 1.7.54 +Version: 1.7.57 Release: 1 License: LGPL v3+ with relinking exemption Group: X11/Libraries Source0: http://ftp.fox-toolkit.org/pub/%{name}-%{version}.tar.gz -# Source0-md5: 9e39886ef4c0e9ffa05658cf98a3e0b8 +# Source0-md5: caeed36d43b5d4f18193657bf236200d Patch0: %{name}-opt.patch Patch1: %{name}-link.patch Patch2: %{name}-Makefile.patch diff --git a/x32.patch b/x32.patch index b5de071..e5efb31 100644 --- a/x32.patch +++ b/x32.patch @@ -1,38 +1,38 @@ ---- fox-1.7.49/lib/FXAtomic.cpp.orig 2016-01-03 21:32:28.624304727 +0100 -+++ fox-1.7.49/lib/FXAtomic.cpp 2016-01-03 21:34:45.642765297 +0100 -@@ -266,7 +266,7 @@ - FXptr atomicSet(volatile FXptr* ptr,FXptr v){ - #if defined(WIN32) && ((_MSC_VER >= 1400) || (__BORLANDC__ >= 0x500)) - return (FXptr)InterlockedExchangePointer(ptr,v); --#elif ((defined(__GNUC__) || defined(__INTEL_COMPILER)) && defined(__i386__)) -+#elif ((defined(__GNUC__) || defined(__INTEL_COMPILER)) && (defined(__i386__) || defined(__ILP32__))) +--- fox-1.7.57/lib/FXAtomic.cpp.orig 2017-02-06 05:34:36.826461208 +0100 ++++ fox-1.7.57/lib/FXAtomic.cpp 2017-02-06 05:40:53.793123570 +0100 +@@ -404,7 +404,7 @@ + return result; + #elif (defined(WIN32) && (_MSC_VER >= 1500)) + return (FXptr)_InterlockedExchange((LONG*)ptr,(LONG)v); +-#elif (defined(HAVE_INLINE_ASSEMBLY) && defined(__i386__)) ++#elif (defined(HAVE_INLINE_ASSEMBLY) && (defined(__i386__) || (defined(__x86_64) && defined(__ILP32__)))) FXptr ret=v; __asm__ __volatile__("xchgl %0, (%1)\n\t" : "=r"(ret) : "r"(ptr), "0"(ret) : "memory", "cc"); return ret; -@@ -290,7 +290,7 @@ - return (FXptr)InterlockedExchangeAdd64((LONGLONG*)ptr,(LONGLONG)v); - #elif defined(WIN32) - return (FXptr)InterlockedExchangeAdd((LONG*)ptr,(LONG)v); --#elif ((defined(__GNUC__) || defined(__INTEL_COMPILER)) && defined(__i386__)) -+#elif ((defined(__GNUC__) || defined(__INTEL_COMPILER)) && (defined(__i386__) || defined(__ILP32__))) +@@ -429,7 +429,7 @@ + return (FXptr)_InterlockedExchangeAdd64((LONGLONG*)ptr,(LONGLONG)v); + #elif (defined(WIN32) && (_MSC_VER >= 1600)) + return (FXptr)_InterlockedExchangeAdd((LONG*)ptr,(LONG)v); +-#elif (defined(HAVE_INLINE_ASSEMBLY) && defined(__i386__)) ++#elif (defined(HAVE_INLINE_ASSEMBLY) && (defined(__i386__) || (defined(__x86_64) && defined(__ILP32__)))) register FXptr ret=(void*)v; __asm__ __volatile__ ("lock\n\t" "xaddl %0, (%1)\n\t" : "=r"(ret) : "r"(ptr), "0"(ret) : "memory", "cc"); -@@ -314,7 +314,7 @@ - FXptr atomicCas(volatile FXptr* ptr,FXptr expect,FXptr v){ - #if defined(WIN32) && ((_MSC_VER >= 1400) || (__BORLANDC__ >= 0x500)) - return (FXptr)InterlockedCompareExchangePointer((void**)ptr,v,expect); --#elif ((defined(__GNUC__) || defined(__INTEL_COMPILER)) && defined(__i386__)) -+#elif ((defined(__GNUC__) || defined(__INTEL_COMPILER)) && (defined(__i386__) || defined(__ILP32__))) - register FXptr ret=(FXptr)v; +@@ -455,7 +455,7 @@ + return (FXptr)_InterlockedCompareExchange64((LONGLONG*)ptr,(LONGLONG)v,(LONGLONG)expect); + #elif defined(WIN32) && (MSC_VER >=1500) + return (FXptr)_InterlockedCompareExchange((LONG*)ptr,(LONG)v,(LONG)expect); +-#elif (defined(HAVE_INLINE_ASSEMBLY) && defined(__i386__)) ++#elif (defined(HAVE_INLINE_ASSEMBLY) && (defined(__i386__) || (defined(__x86_64) && defined(__ILP32__)))) + register FXptr ret; __asm__ __volatile__("lock\n\t" "cmpxchgl %2, (%1)\n\t" : "=a"(ret) : "r"(ptr), "r"(v), "a"(expect) : "memory", "cc"); -@@ -340,7 +340,7 @@ - FXbool atomicBoolCas(volatile FXptr* ptr,FXptr expect,FXptr v){ - #if defined(WIN32) && ((_MSC_VER >= 1400) || (__BORLANDC__ >= 0x500)) - return (InterlockedCompareExchangePointer((void**)ptr,v,expect)==expect); --#elif ((defined(__GNUC__) || defined(__INTEL_COMPILER)) && defined(__i386__)) -+#elif ((defined(__GNUC__) || defined(__INTEL_COMPILER)) && (defined(__i386__) || defined(__ILP32__))) +@@ -483,7 +483,7 @@ + return (_InterlockedCompareExchange64((LONGLONG*)ptr,(LONGLONG)v,(LONGLONG)expect)==(LONGLONG)expect); + #elif defined(WIN32) && (MSC_VER >=1500) + return (_InterlockedCompareExchange((LONG*)ptr,(LONG)v,(LONG)expect)==(LONG)expect); +-#elif (defined(HAVE_INLINE_ASSEMBLY) && defined(__i386__)) ++#elif (defined(HAVE_INLINE_ASSEMBLY) && (defined(__i386__) || (defined(__x86_64) && defined(__ILP32__)))) register FXbool ret; __asm__ __volatile__ ("lock\n\t" "cmpxchgl %2, (%1)\n\t"