[packages/fltk] - patch to remove unwanted flags from fltk-config

qboosh qboosh at pld-linux.org
Tue May 12 21:43:59 CEST 2026


commit 2172f7038de823fb6efe9ce94e7440cf720de2a4
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue May 12 21:38:45 2026 +0200

    - patch to remove unwanted flags from fltk-config

 fltk-config.patch | 25 +++++++++++++++++++++++++
 fltk.spec         | 17 ++++++++++-------
 2 files changed, 35 insertions(+), 7 deletions(-)
---
diff --git a/fltk.spec b/fltk.spec
index ad483b3..c716df8 100644
--- a/fltk.spec
+++ b/fltk.spec
@@ -18,10 +18,14 @@ Patch0:		%{name}-desktop.patch
 Patch1:		%{name}-as-needed.patch
 Patch2:		%{name}-link.patch
 Patch3:		%{name}-mime.patch
-Patch5:		%{name}-docdir.patch
-URL:		http://www.fltk.org/
-%{?with_opengl:BuildRequires:	OpenGL-GLU-devel}
-%{?with_opengl:BuildRequires:	OpenGL-GLX-devel}
+Patch4:		%{name}-docdir.patch
+Patch5:		%{name}-config.patch
+URL:		https://www.fltk.org/
+%if %{with opengl}
+BuildRequires:	OpenGL-GLU-devel
+BuildRequires:	OpenGL-GLX-devel
+BuildRequires:	OpenGL-devel
+%endif
 BuildRequires:	alsa-lib-devel
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	cairo-devel
@@ -44,9 +48,6 @@ BuildRequires:	xorg-util-makedepend
 Obsoletes:	libfltk1.1 < 1.2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-# don't propagate strip-flags to fltk-config.
-%define		filterout_ld	(-Wl,)?-[sS] (-Wl,)?--strip.*
-
 %description
 The Fast Light Tool Kit ("FLTK", pronounced "fulltick") is a LGPL'd
 C++ graphical user interface toolkit for X (UNIX(r)), OpenGL(r), and
@@ -74,6 +75,7 @@ Summary(pl.UTF-8):	Narzędzia programistyczne dla FLTK
 Summary(pt_BR.UTF-8):	Arquivos de inclusão para o FLTK
 Group:		X11/Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+Requires:	cairo-devel
 Requires:	libjpeg-devel
 Requires:	libpng-devel
 Requires:	libstdc++-devel
@@ -227,6 +229,7 @@ Gry FLTK: Atak Klocków!, Warcaby, Sudoku.
 %patch -P1 -p1
 %patch -P2 -p1
 %patch -P3 -p1
+%patch -P4 -p1
 %patch -P5 -p1
 
 %build
diff --git a/fltk-config.patch b/fltk-config.patch
new file mode 100644
index 0000000..d1738b0
--- /dev/null
+++ b/fltk-config.patch
@@ -0,0 +1,25 @@
+--- fltk-1.3.11/configure.ac.orig	2026-05-12 18:39:30.759497777 +0200
++++ fltk-1.3.11/configure.ac	2026-05-12 21:19:55.674021806 +0200
+@@ -1057,6 +1057,7 @@ case $host_os_gui in
+             CPPFLAGS="$FT_FLAGS $CPPFLAGS"
+             CXXFLAGS="$FT_FLAGS $CXXFLAGS"
+             CFLAGS="$FT_FLAGS $CFLAGS"
++            AC_SUBST(FT_FLAGS)
+ 
+             AC_CHECK_LIB(fontconfig, FcPatternCreate)
+             AC_CHECK_HEADER(X11/Xft/Xft.h,
+--- fltk-1.3.11/fltk-config.in.orig	2026-05-12 21:20:46.227081270 +0200
++++ fltk-1.3.11/fltk-config.in	2026-05-12 21:20:49.013732840 +0200
+@@ -42,9 +42,9 @@ CXX="@CXX@"
+ 
+ # flags for C++ compiler:
+ ARCHFLAGS="@ARCHFLAGS@"
+-CFLAGS="@CFLAGS@ @LARGEFILE@ @PTHREAD_FLAGS@"
+-CXXFLAGS="@CXXFLAGS@ @LARGEFILE@ @PTHREAD_FLAGS@"
+-LDFLAGS="@LDFLAGS@"
++CFLAGS="@CAIROFLAGS@ @FT_FLAGS@ @LARGEFILE@ @PTHREAD_FLAGS@"
++CXXFLAGS="@CAIROFLAGS@ @FT_FLAGS@ @LARGEFILE@ @PTHREAD_FLAGS@"
++LDFLAGS=""
+ LDLIBS="@LIBS@"
+ OPTIM="@OPTIM@"
+ CAIROFLAGS="@CAIROFLAGS@"
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/fltk.git/commitdiff/32d78c063e8b44660bb70fd4bec001f14d14c6e8



More information about the pld-cvs-commit mailing list