commit f3c95c8409a43a09472fb841e5198721c64a08bf Author: Jakub Bogusz <qbo...@pld-linux.org> Date: Wed Oct 25 22:01:59 2023 +0200
- started update to 1.7.84 fox-link.patch | 8 ++++---- fox-opt.patch | 19 ++++++++----------- fox.spec | 12 +++++------- 3 files changed, 17 insertions(+), 22 deletions(-) --- diff --git a/fox.spec b/fox.spec index fe981f1..3d19e6c 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.57 -Release: 3 +Version: 1.7.84 +Release: 0.1 License: LGPL v3+ with relinking exemption Group: X11/Libraries -Source0: http://ftp.fox-toolkit.org/pub/%{name}-%{version}.tar.gz -# Source0-md5: caeed36d43b5d4f18193657bf236200d +Source0: http://fox-toolkit.org/ftp/%{name}-%{version}.tar.gz +# Source0-md5: 48eaf928985a52be0ef628f51fb5599f Patch0: %{name}-opt.patch Patch1: %{name}-link.patch Patch2: %{name}-Makefile.patch @@ -41,8 +41,6 @@ BuildRequires: xorg-lib-libXrandr-devel BuildRequires: zlib-devel >= 1.1.4 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _noautoreqdep libGL.so.1 libGLU.so.1 - %description FOX is a C++-Based Library for Graphical User Interface Development FOX supports modern GUI features, such as Drag-and-Drop, Tooltips, Tab @@ -64,7 +62,7 @@ Summary: FOX example applications Summary(pl.UTF-8): Przykłady aplikacji w FOX Group: X11/Applications Requires: %{name} = %{version}-%{release} -Obsoletes: fox-example-apps +Obsoletes: fox-example-apps < 0.99.173 %description progs Editor and file browser, written with FOX. diff --git a/fox-link.patch b/fox-link.patch index 1cb360e..3e63330 100644 --- a/fox-link.patch +++ b/fox-link.patch @@ -1,11 +1,11 @@ ---- fox-1.7.25/lib/Makefile.am.orig 2010-11-02 03:07:14.000000000 +0100 -+++ fox-1.7.25/lib/Makefile.am 2011-05-13 16:24:24.319335269 +0200 -@@ -7,7 +7,7 @@ +--- fox-1.7.84/lib/Makefile.am.orig 2023-10-25 07:07:48.220902965 +0200 ++++ fox-1.7.84/lib/Makefile.am 2023-10-25 06:19:02.042506050 +0200 +@@ -8,7 +8,7 @@ SUFFIXES = .gif .bmp lib_LTLIBRARIES = libFOX-1.7.la -libFOX_1_7_la_LIBADD = $(X_LIBS) $(X_PRE_LIBS) $(X_BASE_LIBS) $(X_EXTRA_LIBS) $(GL_LIBS) +libFOX_1_7_la_LIBADD = $(X_LIBS) $(X_BASE_LIBS) $(X_EXTRA_LIBS) $(GL_LIBS) -lfontconfig - libFOX_1_7_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -export-dynamic + libFOX_1_7_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -export-dynamic -no-undefined diff --git a/fox-opt.patch b/fox-opt.patch index dd869c8..97cf078 100644 --- a/fox-opt.patch +++ b/fox-opt.patch @@ -1,6 +1,6 @@ ---- 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 @@ +--- 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 +@@ -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 -@@ -125,7 +122,7 @@ +@@ -133,7 +130,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,15 +19,12 @@ fi # Building for release -@@ -133,10 +130,9 @@ +@@ -141,7 +138,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} -O2 -DNDEBUG" +- CXXFLAGS="${CXXFLAGS} -O3 -DNDEBUG" + CXXFLAGS="${CXXFLAGS} -DNDEBUG" if test "${GXX}" = "yes" ; then - CXXFLAGS="${CXXFLAGS} -ffast-math -fstrict-aliasing -finline-functions -fomit-frame-pointer" -- LDFLAGS="-s ${LDFLAGS}" - fi - fi - + CXXFLAGS="${CXXFLAGS} -ffast-math -fstrict-overflow -fstrict-aliasing -finline-functions -fomit-frame-pointer -fcf-protection=none -fno-stack-protector" + LDFLAGS="-s ${LDFLAGS}" ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/fox.git/commitdiff/f3c95c8409a43a09472fb841e5198721c64a08bf _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit