[packages/fltk/DEVEL-1.4] - updated to 1.4.3 (new sonames, API breaks)

qboosh qboosh at pld-linux.org
Mon Jun 30 20:43:16 CEST 2025 

commit b5bae4c424b863ace092118c954e7d18fd7204f6
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Jun 30 20:44:34 2025 +0200

    - updated to 1.4.3 (new sonames, API breaks)

 fltk-as-needed.patch | 22 ++++++-------
 fltk-docdir.patch    | 25 ++++++++-------
 fltk-link.patch      | 48 ++++++++++++++--------------
 fltk-mime.patch      | 25 +++++++++++----
 fltk.spec            | 90 ++++++++++++++++++++++++++++++++++++++--------------
 5 files changed, 134 insertions(+), 76 deletions(-)
---
diff --git a/fltk.spec b/fltk.spec
index ad483b3..c8bf9ea 100644
--- a/fltk.spec
+++ b/fltk.spec
@@ -1,46 +1,55 @@
 #
 # Conditional build:
 %bcond_without	opengl	# OpenGL libraries
-%bcond_without	xft	# Xft support
 #
 Summary:	Fast Light Tool Kit
 Summary(pl.UTF-8):	FLTK - "lekki" X11 toolkit
 Summary(pt_BR.UTF-8):	Interface gráfica em C++ para X, OpenGL e Windows
 Name:		fltk
-Version:	1.3.11
+Version:	1.4.3
 Release:	1
 License:	LGPL v2 with amendments (see COPYING)
 Group:		X11/Libraries
 #Source0Download: https://www.fltk.org/software.php
 Source0:	https://github.com/fltk/fltk/releases/download/release-%{version}/%{name}-%{version}-source.tar.bz2
-# Source0-md5:	0e79fa6c4caad1d219b381330f2a0ea2
+# Source0-md5:	995dc0a61224261bc646b6639421a3cc
 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:	EGL-devel}
 %{?with_opengl:BuildRequires:	OpenGL-GLU-devel}
 %{?with_opengl:BuildRequires:	OpenGL-GLX-devel}
 BuildRequires:	alsa-lib-devel
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	cairo-devel
+BuildRequires:	dbus-devel
 BuildRequires:	doxygen
-%{?with_xft:BuildRequires:	fontconfig-devel}
+BuildRequires:	fontconfig-devel
+BuildRequires:	freetype-devel >= 2
 BuildRequires:	groff
+BuildRequires:	libdecor-devel >= 0.2.0
 BuildRequires:	libjpeg-devel
-BuildRequires:	libpng-devel
+BuildRequires:	libpng-devel >= 1.6
 BuildRequires:	libstdc++-devel
+BuildRequires:	pango-devel
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.315
+BuildRequires:	wayland-devel >= 1.18
+BuildRequires:	wayland-egl-devel
+BuildRequires:	wayland-protocols >= 1.15
 BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	xorg-lib-libXcursor-devel
 BuildRequires:	xorg-lib-libXext-devel
 BuildRequires:	xorg-lib-libXfixes-devel
-%{?with_xft:BuildRequires:	xorg-lib-libXft-devel}
+BuildRequires:	xorg-lib-libXft-devel
 BuildRequires:	xorg-lib-libXinerama-devel
 BuildRequires:	xorg-lib-libXrender-devel
+BuildRequires:	xorg-lib-libxkbcommon-devel
 BuildRequires:	xorg-util-makedepend
+Requires:	wayland >= 1.18
 Obsoletes:	libfltk1.1 < 1.2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -75,9 +84,9 @@ Summary(pt_BR.UTF-8):	Arquivos de inclusão para o FLTK
 Group:		X11/Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	libjpeg-devel
-Requires:	libpng-devel
+Requires:	libpng-devel >= 1.6
 Requires:	libstdc++-devel
-%{?with_xft:Requires:	xorg-lib-libXft-devel}
+Requires:	xorg-lib-libXft-devel
 Requires:	xorg-lib-libXinerama-devel
 Obsoletes:	libfltk1.1-devel < 1.2
 
@@ -221,6 +230,21 @@ FLTK games: Block Attack!, Checkers, or Sudoku on your computer.
 %description games -l pl.UTF-8
 Gry FLTK: Atak Klocków!, Warcaby, Sudoku.
 
+%package options
+Summary:	FLTK Options Editor
+Summary(pl.UTF-8):	Edytor opcji FLTK
+Group:		X11/Development/Tools
+Requires(post,postun):	desktop-file-utils
+Requires(post,postun):	shared-mime-info
+Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}-cairo = %{version}-%{release}
+
+%description options
+Application to get and modify FLTK runtime options.
+
+%description options -l pl.UTF-8
+Aplikacja do odczytu i modyfikowania opcji FLTK.
+
 %prep
 %setup -q
 %patch -P0 -p1
@@ -239,14 +263,14 @@ fi
 %{__autoconf}
 %configure \
 	--enable-cairo \
+	%{!?with_opengl:--disable-gl} \
 	--enable-largefile \
 	--enable-shared \
 	--enable-threads \
-	--enable-xinerama \
+	--enable-use_std \
+	--enable-usecairo \
 	--with-x \
-	--with-optim="%{rpmcxxflags}" \
-	%{!?with_opengl:--disable-gl} \
-	%{?with_xft:--enable-xft}
+	--with-optim="%{rpmcxxflags}"
 
 %{__make}
 
@@ -298,13 +322,23 @@ rm -rf $RPM_BUILD_ROOT
 %postun	games
 %update_icon_cache hicolor
 
+%post	options
+%update_icon_cache hicolor
+%update_desktop_database
+%update_mime_database
+
+%postun	options
+%update_icon_cache hicolor
+%update_desktop_database
+%update_mime_database
+
 %files
 %defattr(644,root,root,755)
 # note: COPYING contains amendments to LGPL, so don't remove!
-%doc ANNOUNCEMENT CHANGES COPYING CREDITS README
-%attr(755,root,root) %{_libdir}/libfltk.so.*.*
-%attr(755,root,root) %{_libdir}/libfltk_forms.so.*.*
-%attr(755,root,root) %{_libdir}/libfltk_images.so.*.*
+%doc ANNOUNCEMENT CHANGES*.txt COPYING CREDITS.txt README.txt README.{Cairo,IDE,Wayland}.txt
+%attr(755,root,root) %{_libdir}/libfltk.so.1.4
+%attr(755,root,root) %{_libdir}/libfltk_forms.so.1.4
+%attr(755,root,root) %{_libdir}/libfltk_images.so.1.4
 
 %files devel
 %defattr(644,root,root,755)
@@ -327,7 +361,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files cairo
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libfltk_cairo.so.*.*
+%attr(755,root,root) %{_libdir}/libfltk_cairo.so.1.4
 
 %files cairo-devel
 %defattr(644,root,root,755)
@@ -341,7 +375,7 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with opengl}
 %files gl
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libfltk_gl.so.*.*
+%attr(755,root,root) %{_libdir}/libfltk_gl.so.1.4
 
 %files gl-devel
 %defattr(644,root,root,755)
@@ -368,15 +402,23 @@ rm -rf $RPM_BUILD_ROOT
 
 %files games
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/%{name}-blocks
-%attr(755,root,root) %{_bindir}/%{name}-checkers
-%attr(755,root,root) %{_bindir}/%{name}-sudoku
+%attr(755,root,root) %{_bindir}/fltk-blocks
+%attr(755,root,root) %{_bindir}/fltk-checkers
+%attr(755,root,root) %{_bindir}/fltk-sudoku
 %{_iconsdir}/hicolor/*x*/apps/blocks.png
 %{_iconsdir}/hicolor/*x*/apps/checkers.png
 %{_iconsdir}/hicolor/*x*/apps/sudoku.png
 %{_desktopdir}/blocks.desktop
 %{_desktopdir}/checkers.desktop
 %{_desktopdir}/sudoku.desktop
-%{_mandir}/man6/%{name}-blocks.6*
-%{_mandir}/man6/%{name}-checkers.6*
-%{_mandir}/man6/%{name}-sudoku.6*
+%{_mandir}/man6/fltk-blocks.6*
+%{_mandir}/man6/fltk-checkers.6*
+%{_mandir}/man6/fltk-sudoku.6*
+
+%files options
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/fltk-options
+%{_desktopdir}/fltk-options.desktop
+%{_iconsdir}/hicolor/*x*/apps/fltk-options.png
+%{_datadir}/mime/packages/fltk-options.xml
+%{_mandir}/man1/fltk-options.1*
diff --git a/fltk-as-needed.patch b/fltk-as-needed.patch
index 91e73f8..f522186 100644
--- a/fltk-as-needed.patch
+++ b/fltk-as-needed.patch
@@ -1,14 +1,14 @@
---- fltk-1.3.5/configure.ac.orig	2019-04-09 19:15:01.127591888 +0200
-+++ fltk-1.3.5/configure.ac	2019-04-09 19:18:55.769654056 +0200
-@@ -274,7 +274,7 @@
- 	    GLDSONAME="libfltk_gl.so.$FL_DSO_VERSION"
- 	    IMGDSONAME="libfltk_images.so.$FL_DSO_VERSION"
- 	    CAIRODSONAME="libfltk_cairo.so.$FL_DSO_VERSION"
--	    DSOCOMMAND="\$(CXX) \$(DSOFLAGS) -Wl,-soname,\$@ \$(LDLIBS) -shared -fPIC $DEBUGFLAG -o"
-+	    DSOCOMMAND="\$(CXX) \$(DSOFLAGS) \$(LDFLAGS) -Wl,-soname,\$@ -shared -fPIC $DEBUGFLAG -o"
- 
- 	    # See if the compiler supports -fvisibility...
- 	    AC_CACHE_CHECK([if the compiler supports -fvisibility],
+--- fltk-1.4.3/configure.ac.orig	2025-04-29 13:40:25.000000000 +0200
++++ fltk-1.4.3/configure.ac	2025-06-30 18:59:12.030909262 +0200
+@@ -328,7 +328,7 @@ AS_IF([test "x$enable_shared" = xyes], [
+         GLDSONAME="libfltk_gl.so.$FL_DSO_VERSION"
+         IMGDSONAME="libfltk_images.so.$FL_DSO_VERSION"
+         CAIRODSONAME="libfltk_cairo.so.$FL_DSO_VERSION"
+-        DSOCOMMAND="\$(CXX) \$(DSOFLAGS) -Wl,-soname,\$@ \$(LDLIBS) -shared -fPIC $DEBUGFLAG -o"
++        DSOCOMMAND="\$(CXX) \$(DSOFLAGS) \$(LDFLAGS) -Wl,-soname,\$@ -shared -fPIC $DEBUGFLAG -o"
+         AS_IF([test "x$libdir" != "x/usr/lib"], [
+             DSOLINK="-R$libdir"
+         ])
 --- fltk-1.3.3/src/Makefile.orig	2014-10-30 17:05:22.000000000 +0100
 +++ fltk-1.3.3/src/Makefile	2014-11-18 22:26:21.624514932 +0100
 @@ -258,7 +258,7 @@
diff --git a/fltk-docdir.patch b/fltk-docdir.patch
index 3a57199..4e2fba2 100644
--- a/fltk-docdir.patch
+++ b/fltk-docdir.patch
@@ -1,11 +1,14 @@
---- fltk-1.3.5/configure.ac.orig	2019-04-10 06:14:17.019965891 +0200
-+++ fltk-1.3.5/configure.ac	2019-04-10 06:29:12.975112086 +0200
-@@ -1470,7 +1470,7 @@
-     if test x$prefix = xNONE; then
- 	AC_DEFINE_UNQUOTED(FLTK_DOCDIR, "/usr/local/share/doc/fltk")
-     else
--	AC_DEFINE_UNQUOTED(FLTK_DOCDIR, "$prefix/share/doc/fltk")
-+	AC_DEFINE_UNQUOTED(FLTK_DOCDIR, "$prefix/share/doc/fltk-apidocs-$FL_VERSION")
-     fi
-     ;;
- esac
+--- fltk-1.4.3/configure.ac.orig	2025-06-30 19:06:48.688435336 +0200
++++ fltk-1.4.3/configure.ac	2025-06-30 19:09:57.347413283 +0200
+@@ -1799,9 +1799,9 @@ AS_CASE([$host_os], [mingw*], [
+     AC_DEFINE_UNQUOTED([FLTK_DOCDIR], "$msyspath/local/share/doc/fltk")
+ ], [*], [
+     AS_IF([test x$prefix = xNONE], [
+-        AC_DEFINE_UNQUOTED([FLTK_DOCDIR], "/usr/local/share/doc/fltk")
++        AC_DEFINE_UNQUOTED([FLTK_DOCDIR], "/usr/local/share/doc/fltk-apidocs-$FL_VERSION")
+     ], [
+-        AC_DEFINE_UNQUOTED([FLTK_DOCDIR], "$prefix/share/doc/fltk")
++        AC_DEFINE_UNQUOTED([FLTK_DOCDIR], "$prefix/share/doc/fltk-apidocs-$FL_VERSION")
+     ])
+ ])
+ 
diff --git a/fltk-link.patch b/fltk-link.patch
index 45e907d..527931d 100644
--- a/fltk-link.patch
+++ b/fltk-link.patch
@@ -10,20 +10,20 @@
  # Build commands and filename extensions...
  .SUFFIXES:	.0 .1 .3 .6 .c .cxx .mm .h .fl .man .o .z $(EXEEXT)
  
---- fltk-1.3.5/configure.ac.orig	2011-12-11 18:23:15.000000000 +0100
-+++ fltk-1.3.5/configure.ac	2011-12-11 18:30:07.000000000 +0100
-@@ -335,7 +335,7 @@
- 	    ;;
-     esac
+--- fltk-1.4.3/configure.ac.orig	2025-06-30 18:59:41.217417812 +0200
++++ fltk-1.4.3/configure.ac	2025-06-30 19:00:59.373661070 +0200
+@@ -451,7 +451,7 @@ AS_IF([test "x$enable_shared" = xyes], [
+         DSOCOMMAND="\$(CXX) \$(DSOFLAGS) -Wl,-soname,\$@ \$(LDLIBS) -shared $DEBUGFLAG -o"
+     ])
  
--    LINKSHARED="-L../src $FLTKCAIROOPTION -lfltk_images$SHAREDSUFFIX -lfltk_forms$SHAREDSUFFIX -lfltk$SHAREDSUFFIX"
-+    LINKSHARED="-L../src $FLTKCAIROOPTION  -l:../src/libfltk_images.so -l:../src/libfltk_forms.so -l:../src/libfltk.so"
- else
+-    LINKSHARED="-L../src $FLTKCAIROOPTION -lfltk_images$SHAREDSUFFIX -lfltk$SHAREDSUFFIX"
++    LINKSHARED="-L../src $FLTKCAIROOPTION -l:../src/libfltk_images.so -l:../src/libfltk.so"
+ ], [
      DSOCOMMAND="echo"
      DSOLINK=""
---- fltk-1.3.8/src/Makefile.orig	2022-02-05 15:58:57.974760005 +0100
-+++ fltk-1.3.8/src/Makefile	2022-02-05 16:08:42.471593514 +0100
-@@ -569,6 +569,9 @@ install: $(LIBNAME) $(DSONAME) \
+--- fltk-1.4.3/src/Makefile.orig	2025-06-30 18:59:41.217417812 +0200
++++ fltk-1.4.3/src/Makefile	2025-06-30 19:02:33.403151668 +0200
+@@ -852,6 +852,9 @@ install: $(LIBNAME) $(DSONAME) \
  	$(FLLIBNAME) $(FLDSONAME) \
  	$(GLLIBNAME) $(GLDSONAME) \
  	$(IMGLIBNAME) $(IMGDSONAME)
@@ -31,20 +31,20 @@
 +	$(RANLIB) $(FLLIBNAME)
 +	$(RANLIB) $(IMGLIBNAME)
  	echo "Installing libraries in $(DESTDIR)$(libdir)..."
- 	-$(INSTALL_DIR) $(DESTDIR)$(libdir)
- 	-$(INSTALL_DIR) $(DESTDIR)$(bindir)
-@@ -576,13 +579,10 @@ install: $(LIBNAME) $(DSONAME) \
- 	$(INSTALL_LIB) $(LIBNAME) $(DESTDIR)$(libdir)
- 	$(INSTALL_LIB) $(FLLIBNAME) $(DESTDIR)$(libdir)
- 	$(INSTALL_LIB) $(IMGLIBNAME) $(DESTDIR)$(libdir)
--	$(RANLIB) $(DESTDIR)$(libdir)/$(LIBBASENAME)
--	$(RANLIB) $(DESTDIR)$(libdir)/$(FLLIBBASENAME)
+ 	-$(INSTALL_DIR) "$(DESTDIR)$(libdir)"
+ 	-$(INSTALL_DIR) "$(DESTDIR)$(bindir)"
+@@ -859,13 +862,10 @@ install: $(LIBNAME) $(DSONAME) \
+ 	$(INSTALL_LIB) $(LIBNAME) "$(DESTDIR)$(libdir)"
+ 	$(INSTALL_LIB) $(FLLIBNAME) "$(DESTDIR)$(libdir)"
+ 	$(INSTALL_LIB) $(IMGLIBNAME) "$(DESTDIR)$(libdir)"
+-	$(RANLIB) "$(DESTDIR)$(libdir)/$(LIBBASENAME)"
+-	$(RANLIB) "$(DESTDIR)$(libdir)/$(FLLIBBASENAME)"
  	if test x$(GLLIBNAME) != x; then \
 +		$(RANLIB) $(GLLIBNAME); \
- 		$(INSTALL_LIB) $(GLLIBNAME) $(DESTDIR)$(libdir); \
--		$(RANLIB) $(DESTDIR)$(libdir)/$(GLLIBBASENAME); \
+ 		$(INSTALL_LIB) $(GLLIBNAME) "$(DESTDIR)$(libdir)"; \
+-		$(RANLIB) "$(DESTDIR)$(libdir)/$(GLLIBBASENAME)"; \
  	fi
--	$(RANLIB) $(DESTDIR)$(libdir)/$(IMGLIBBASENAME)
+-	$(RANLIB) "$(DESTDIR)$(libdir)/$(IMGLIBBASENAME)"
  	if test x$(DSONAME) = xlibfltk.so.$(FL_DSO_VERSION); then\
- 		$(RM) $(DESTDIR)$(libdir)/libfltk.so*;\
- 		$(INSTALL_LIB) libfltk.so.$(FL_DSO_VERSION) $(DESTDIR)$(libdir); \
+ 		$(RM) "$(DESTDIR)$(libdir)"/libfltk.so*;\
+ 		$(INSTALL_LIB) libfltk.so.$(FL_DSO_VERSION) "$(DESTDIR)$(libdir)"; \
diff --git a/fltk-mime.patch b/fltk-mime.patch
index d6cb863..fe24081 100644
--- a/fltk-mime.patch
+++ b/fltk-mime.patch
@@ -1,13 +1,26 @@
---- fltk-1.3.5/fluid/Makefile.orig	2019-03-03 09:40:23.000000000 +0100
-+++ fltk-1.3.5/fluid/Makefile	2019-04-10 06:08:07.201969367 +0200
-@@ -85,8 +85,8 @@
+--- fltk-1.4.3/fluid/Makefile.orig	2025-04-29 13:40:25.000000000 +0200
++++ fltk-1.4.3/fluid/Makefile	2025-06-30 19:06:29.711871474 +0200
+@@ -109,8 +109,8 @@ install-linux:
  		fi; \
- 		$(INSTALL_DATA) icons/fluid-$$size.png $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/apps/fluid.png; \
+ 		$(INSTALL_DATA) icons/fluid-$$size.png "$(DESTDIR)$(datadir)/icons/hicolor/$${size}x$${size}/apps/fluid.png"; \
  	done
--	-$(INSTALL_DIR) $(DESTDIR)/usr/share/mimelnk/application
--	$(INSTALL_DATA) x-fluid.desktop  $(DESTDIR)/usr/share/mimelnk/application
+-	-$(INSTALL_DIR) "$(DESTDIR)$(datadir)/mimelnk/application"
+-	$(INSTALL_DATA) x-fluid.desktop "$(DESTDIR)$(datadir)/mimelnk/application"
 +	-$(INSTALL_DIR) $(DESTDIR)/usr/share/mime/packages
 +	$(INSTALL_DATA) fluid.xml $(DESTDIR)/usr/share/mime/packages
  
  install-osx:
  	echo Installing Fluid in $(DESTDIR)/Applications...
+--- fltk-1.4.3/fltk-options/Makefile.orig	2025-04-29 13:40:25.000000000 +0200
++++ fltk-1.4.3/fltk-options/Makefile	2025-06-30 19:42:28.936840615 +0200
+@@ -67,8 +67,8 @@ install-linux:
+ 		fi; \
+ 		$(INSTALL_DATA) icons/fltk-options-$$size.png "$(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/apps/fltk-options.png"; \
+ 	done
+-	-$(INSTALL_DIR) "$(DESTDIR)/usr/share/mimelnk/application"
+-	$(INSTALL_DATA) x-fltk-options.desktop "$(DESTDIR)/usr/share/mimelnk/application"
++	-$(INSTALL_DIR) "$(DESTDIR)/usr/share/mime/packages"
++	$(INSTALL_DATA) fltk-options.xml "$(DESTDIR)/usr/share/mime/packages"
+ 
+ install-osx:
+ 	echo Installing fltk-options in $(DESTDIR)/Applications...
================================================================

---- gitweb:

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

More information about the pld-cvs-commit mailing list