[packages/links2] - disable DirectFB by default, use plain fbdev interface - added pkgconfig patch (fix pkgconfig usag

[qboosh]

commit 69eb7820b1da45b820aa4a4b4046344713a63891
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Oct 8 07:44:18 2022 +0200

    - disable DirectFB by default, use plain fbdev interface
    - added pkgconfig patch (fix pkgconfig usage: if first use is conditional, pkgconfig macros are not properly initialized)
    - updated dependencies

 links2-pkgconfig.patch | 11 +++++++++++
 links2.spec            | 16 ++++++++++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)
---
diff --git a/links2.spec b/links2.spec
index 08dba13..b637a88 100644
--- a/links2.spec
+++ b/links2.spec
@@ -2,6 +2,7 @@
 # Conditional build:
 %bcond_without	graphics	# graphics support
 %bcond_without	fb		# Linux Framebuffer graphics driver
+%bcond_with	directfb	# DirrectFB graphics driver
 %bcond_with	sdl		# SDL graphics driver [disabled in sources]
 %bcond_with	svga		# svgalib graphics driver
 %bcond_without	x		# X Window System graphics driver
@@ -25,6 +26,7 @@ Source2:	%{name}.1.pl
 Source3:	%{name}.png
 Source4:	glinks.desktop
 Patch0:		%{name}-links-g_if_glinks.patch
+Patch1:		%{name}-pkgconfig.patch
 Patch2:		%{name}-img.patch
 Patch3:		%{name}-convert-old-bookmarks.patch
 Patch5:		%{name}-config-dirs.patch
@@ -36,22 +38,30 @@ URL:		http://links.twibright.com/
 BuildRequires:	autoconf >= 2.59-9
 BuildRequires:	automake
 BuildRequires:	bzip2-devel
+BuildRequires:	fontconfig-devel
+BuildRequires:	freetype-devel >= 2
 BuildRequires:	gpm-devel
+BuildRequires:	libbrotli-devel
+BuildRequires:	libbsd-devel
 BuildRequires:	libevent-devel
+BuildRequires:	libgomp-devel
+BuildRequires:	lzlib-devel
 BuildRequires:	ncurses-devel >= 5.1
 BuildRequires:	openssl-devel >= 0.9.7d
 BuildRequires:	pkgconfig
 BuildRequires:	xz-devel
 BuildRequires:	zlib-devel
+BuildRequires:	zstd-devel
 %if %{with graphics}
-%{?with_fb:BuildRequires:	DirectFB-devel >= 0.9.17}
+%{?with_directfb:BuildRequires:	DirectFB-devel >= 0.9.17}
 %{?with_sdl:BuildRequires:	SDL-devel >= 1.2.0}
 BuildRequires:	cairo-devel
 BuildRequires:	libgomp-devel
 BuildRequires:	libjpeg-devel
-BuildRequires:	libpng-devel
+BuildRequires:	libpng-devel >= 1.0.0
 BuildRequires:	librsvg-devel >= 2.0.0
 BuildRequires:	libtiff-devel
+BuildRequires:	libwebp-devel
 %{?with_svga:BuildRequires:	svgalib-devel}
 %{?with_x:BuildRequires:	xorg-lib-libX11-devel}
 %endif
@@ -111,6 +121,7 @@ Links - це текстовий WWW броузер, на перший погля
 %prep
 %setup -q -n links-%{version}
 %{?with_graphics:%patch0 -p1}
+%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch5 -p1
@@ -130,6 +141,7 @@ cd intl
 %configure \
 	--program-suffix=2 \
 	%{?with_graphics:--enable-graphics} \
+	%{!?with_directfb:--without-directfb} \
 	%{!?with_fb:--without-fb} \
 	%{!?with_sdl:--without-sdl} \
 	%{!?with_svga:--without-svgalib} \
diff --git a/links2-pkgconfig.patch b/links2-pkgconfig.patch
new file mode 100644
index 0000000..93dad89
--- /dev/null
+++ b/links2-pkgconfig.patch
@@ -0,0 +1,11 @@
+--- links-2.28/configure.in.orig	2022-10-07 20:47:33.616006730 +0200
++++ links-2.28/configure.in	2022-10-07 22:59:34.119764346 +0200
+@@ -536,6 +536,8 @@ fi
+ 
+ AC_CHECK_LIB(bsd, strmode)
+ 
++PKG_PROG_PKG_CONFIG
++
+ dnl User option
+ 
+ AC_MSG_CHECKING([for requested debug level])
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/links2.git/commitdiff/69eb7820b1da45b820aa4a4b4046344713a63891