[packages/fox] - updated to 1.7.85
qboosh
qboosh at pld-linux.org
Sat Nov 9 22:21:51 CET 2024
commit 705c9fac8b3e19f5c9164d1abe925d9a8f9925d0
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Nov 9 22:17:37 2024 +0100
- updated to 1.7.85
fox-opt.patch | 10 ++++----
fox.spec | 6 ++---
x32.patch | 73 +++++++++++++++++++++++++++++++++--------------------------
3 files changed, 49 insertions(+), 40 deletions(-)
---
diff --git a/fox.spec b/fox.spec
index 71d9cc1..1cc3125 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.84
-Release: 2
+Version: 1.7.85
+Release: 1
License: LGPL v3+ with relinking exemption
Group: X11/Libraries
Source0: http://fox-toolkit.org/ftp/%{name}-%{version}.tar.gz
-# Source0-md5: 48eaf928985a52be0ef628f51fb5599f
+# Source0-md5: 9e1dc636bbe3f0b679a66dc50396b3ea
Patch0: %{name}-opt.patch
Patch1: %{name}-link.patch
Patch2: %{name}-Makefile.patch
diff --git a/fox-opt.patch b/fox-opt.patch
index 97cf078..0f9f0fd 100644
--- a/fox-opt.patch
+++ b/fox-opt.patch
@@ -1,5 +1,5 @@
---- fox-1.7.84/configure.ac.orig 2023-09-11 23:22:01.000000000 +0200
-+++ fox-1.7.84/configure.ac 2023-10-25 06:16:57.746509915 +0200
+--- fox-1.7.85/configure.ac.orig 2024-08-16 06:27:28.000000000 +0200
++++ fox-1.7.85/configure.ac 2024-11-09 21:39:12.397936536 +0100
@@ -65,9 +65,6 @@ AC_SUBST(LT_CURRENT)
AC_SUBST(LT_REVISION)
AC_SUBST(LT_AGE)
@@ -10,7 +10,7 @@
# More secret source
AC_GNU_SOURCE
-@@ -133,7 +130,7 @@ AC_MSG_CHECKING(for debugging)
+@@ -134,7 +131,7 @@ AC_MSG_CHECKING(for debugging)
AC_ARG_ENABLE(debug,[ --enable-debug compile for debugging])
AC_MSG_RESULT([$enable_debug])
if test "x$enable_debug" = "xyes" ; then
@@ -19,11 +19,11 @@
fi
# Building for release
-@@ -141,7 +138,7 @@ AC_MSG_CHECKING(for release build)
+@@ -142,7 +139,7 @@ AC_MSG_CHECKING(for release build)
AC_ARG_ENABLE(release,[ --enable-release compile for release])
AC_MSG_RESULT([$enable_release])
if test "x$enable_release" = "xyes" ; then
-- CXXFLAGS="${CXXFLAGS} -O3 -DNDEBUG"
+- CXXFLAGS="${CXXFLAGS} -O2 -DNDEBUG"
+ CXXFLAGS="${CXXFLAGS} -DNDEBUG"
if test "${GXX}" = "yes" ; then
CXXFLAGS="${CXXFLAGS} -ffast-math -fstrict-overflow -fstrict-aliasing -finline-functions -fomit-frame-pointer -fcf-protection=none -fno-stack-protector"
diff --git a/x32.patch b/x32.patch
index 2da05d7..c95458b 100644
--- a/x32.patch
+++ b/x32.patch
@@ -1,38 +1,47 @@
---- fox-1.7.84/lib/FXAtomic.cpp.orig 2023-06-14 06:50:33.000000000 +0200
-+++ fox-1.7.84/lib/FXAtomic.cpp 2023-10-26 06:19:01.695280795 +0200
-@@ -721,7 +721,7 @@ FXptr atomicSet(volatile FXptr* ptr,FXpt
- 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__))))
+--- fox-1.7.85/include/FXAtomic.h.orig 2024-11-09 22:01:30.184022460 +0100
++++ fox-1.7.85/include/FXAtomic.h 2024-11-09 22:01:42.180624136 +0100
+@@ -810,7 +810,7 @@ static inline FXptr atomicSet(volatile F
+ return __atomic_exchange_n(ptr,v,__ATOMIC_SEQ_CST);
+ #elif ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 1)))
+ return (TPtr)__sync_lock_test_and_set(ptr,v);
+-#elif (defined(__GNUC__) && defined(__i386__))
++#elif (defined(__GNUC__) && (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");
+ __asm__ __volatile__("xchgl %0,(%1)\n\t" : "=r"(ret) : "r"(ptr), "0"(ret) : "memory", "cc");
return ret;
-@@ -746,7 +746,7 @@ FXptr atomicAdd(volatile FXptr* ptr,FXiv
- return (FXptr)_InterlockedExchangeAdd64((volatile LONGLONG*)ptr,(LONGLONG)v);
- #elif (defined(WIN32) && (_MSC_VER >= 1600))
- return (FXptr)_InterlockedExchangeAdd((volatile 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=(void*)v;
- __asm__ __volatile__ ("lock\n\t"
- "xaddl %0, (%1)\n\t" : "=r"(ret) : "r"(ptr), "0"(ret) : "memory", "cc");
-@@ -772,7 +772,7 @@ FXptr atomicCas(volatile FXptr* ptr,FXpt
- return (FXptr)_InterlockedCompareExchange64((volatile LONGLONG*)ptr,(LONGLONG)v,(LONGLONG)expect);
- #elif defined(WIN32) && (MSC_VER >=1500)
- return (FXptr)_InterlockedCompareExchange((volatile 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__))))
+@@ -836,7 +836,7 @@ static inline FXptr atomicCas(volatile F
+ return ex;
+ #elif ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 1)))
+ return __sync_val_compare_and_swap(ptr,expect,v);
+-#elif (defined(__GNUC__) && defined(__i386__))
++#elif (defined(__GNUC__) && (defined(__i386__) || (defined(__x86_64__) && defined(__ILP32__))))
FXptr ret;
__asm__ __volatile__("lock\n\t"
- "cmpxchgl %2, (%1)\n\t" : "=a"(ret) : "r"(ptr), "r"(v), "a"(expect) : "memory", "cc");
-@@ -800,7 +800,7 @@ FXbool atomicBoolCas(volatile FXptr* ptr
- return (_InterlockedCompareExchange64((volatile LONGLONG*)ptr,(LONGLONG)v,(LONGLONG)expect)==(LONGLONG)expect);
- #elif defined(WIN32) && (MSC_VER >=1500)
- return (_InterlockedCompareExchange((volatile 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__))))
+ "cmpxchgl %2,(%1)\n\t" : "=a"(ret) : "r"(ptr), "r"(v), "a"(expect) : "memory", "cc");
+@@ -864,7 +864,7 @@ static inline FXbool atomicBoolCas(volat
+ return __atomic_compare_exchange_n(ptr,&ex,v,false,__ATOMIC_SEQ_CST,__ATOMIC_RELAXED);
+ #elif ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 1)))
+ return __sync_bool_compare_and_swap(ptr,expect,v);
+-#elif (defined(__GNUC__) && defined(__i386__))
++#elif (defined(__GNUC__) && (defined(__i386__) || (defined(__x86_64__) && defined(__ILP32__))))
FXbool ret;
__asm__ __volatile__ ("lock\n\t"
- "cmpxchgl %2, (%1)\n\t"
+ "cmpxchgl %2,(%1)\n\t"
+@@ -916,7 +916,7 @@ static inline FXbool atomicBoolDCas(vola
+ "andl $1, %%eax\n\t"
+ "xchgl %%esi, %%ebx\n\t" : "=a"(ret) : "D"(ptr), "a"(cmpa), "d"(cmpb), "S"(a), "c"(b) : "memory", "cc");
+ return ret;
+-#elif (defined(__GNUC__) && defined(__i386__))
++#elif (defined(__GNUC__) && (defined(__i386__) || (defined(__x86_64__) && defined(__ILP32__))))
+ FXptr ret;
+ __asm__ __volatile__ ("lock\n\t"
+ "cmpxchg8b (%1)\n\t"
+@@ -948,7 +948,7 @@ static inline FXptr atomicAdd(volatile F
+ return __atomic_fetch_add(ptr,v,__ATOMIC_SEQ_CST);
+ #elif ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 1)))
+ return __sync_fetch_and_add(ptr,v);
+-#elif (defined(__GNUC__) && defined(__i386__))
++#elif (defined(__GNUC__) && (defined(__i386__) || (defined(__x86_64__) && defined(__ILP32__))))
+ FXptr ret=(TPtr)v;
+ __asm__ __volatile__ ("lock\n\t"
+ "xaddl %0,(%1)\n\t" : "=r"(ret) : "r"(ptr), "0"(ret) : "memory", "cc");
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/fox.git/commitdiff/705c9fac8b3e19f5c9164d1abe925d9a8f9925d0
More information about the pld-cvs-commit
mailing list