[packages/fltk] - updated to 1.3.8 - updated link patch

qboosh qboosh at pld-linux.org
Sat Feb 5 19:37:53 CET 2022


commit f8bf40837bc54a46b63d376609f2e419154ad0a4
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Feb 5 19:38:40 2022 +0100

    - updated to 1.3.8
    - updated link patch

 fltk-link.patch | 14 ++++++--------
 fltk.spec       | 11 +++++++----
 2 files changed, 13 insertions(+), 12 deletions(-)
---
diff --git a/fltk.spec b/fltk.spec
index 7f0dbfb..f70f5ae 100644
--- a/fltk.spec
+++ b/fltk.spec
@@ -1,19 +1,19 @@
 #
 # Conditional build:
-%bcond_without	opengl	# without OpenGL libraries
-%bcond_without	xft	# without Xft support
+%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.5
+Version:	1.3.8
 Release:	1
 License:	LGPL v2 with amendments (see COPYING)
 Group:		X11/Libraries
 #Source0Download: https://www.fltk.org/software.php
 Source0:	https://www.fltk.org/pub/fltk/%{version}/%{name}-%{version}-source.tar.bz2
-# Source0-md5:	0de2b45a1896be2b4a8cafae89b84248
+# Source0-md5:	ed08b7985779213dc6190dc7b75d01a2
 Patch0:		%{name}-desktop.patch
 Patch1:		%{name}-as-needed.patch
 Patch2:		%{name}-link.patch
@@ -23,6 +23,7 @@ Patch5:		%{name}-docdir.patch
 URL:		http://www.fltk.org/
 %{?with_opengl:BuildRequires:	OpenGL-GLU-devel}
 %{?with_opengl:BuildRequires:	OpenGL-GLX-devel}
+BuildRequires:	alsa-lib-devel
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	cairo-devel
 BuildRequires:	doxygen
@@ -33,11 +34,13 @@ BuildRequires:	libpng-devel
 BuildRequires:	libstdc++-devel
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.315
+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-libXinerama-devel
+BuildRequires:	xorg-lib-libXrender-devel
 BuildRequires:	xorg-util-makedepend
 Obsoletes:	libfltk1.1
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
diff --git a/fltk-link.patch b/fltk-link.patch
index 0489213..0c89d7b 100644
--- a/fltk-link.patch
+++ b/fltk-link.patch
@@ -20,21 +20,19 @@
  else
      DSOCOMMAND="echo"
      DSOLINK=""
---- fltk-1.3.5/src/Makefile.orig	2019-04-09 19:21:49.552045930 +0200
-+++ fltk-1.3.5/src/Makefile	2019-04-09 19:26:33.250509003 +0200
-@@ -556,7 +556,10 @@
- install: $(LIBNAME) $(DSONAME) \
+--- 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) \
  	$(FLLIBNAME) $(FLDSONAME) \
  	$(GLLIBNAME) $(GLDSONAME) \
--	$(IMGLIBNAME) $(IMGDSONAME) 
-+	$(IMGLIBNAME) $(IMGDSONAME)
+ 	$(IMGLIBNAME) $(IMGDSONAME)
 +	$(RANLIB) $(LIBNAME)
 +	$(RANLIB) $(FLLIBNAME)
-+	$(RANLIB) $(IMGLIBNAME) 
++	$(RANLIB) $(IMGLIBNAME)
  	echo "Installing libraries in $(DESTDIR)$(libdir)..."
  	-$(INSTALL_DIR) $(DESTDIR)$(libdir)
  	-$(INSTALL_DIR) $(DESTDIR)$(bindir)
-@@ -564,13 +567,10 @@
+@@ -576,13 +579,10 @@ install: $(LIBNAME) $(DSONAME) \
  	$(INSTALL_LIB) $(LIBNAME) $(DESTDIR)$(libdir)
  	$(INSTALL_LIB) $(FLLIBNAME) $(DESTDIR)$(libdir)
  	$(INSTALL_LIB) $(IMGLIBNAME) $(DESTDIR)$(libdir)
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list