[Buildroot] [PATCH 2/2] package/xscreensaver: bump version to 6.06

[Bernd Kuhls <bernd@kuhls.net>]

Add more patches to fix build errors.

Changelog: https://www.jwz.org/xscreensaver/changelog.html

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
 .checkpackageignore                           |  2 +
 ...disable-failure-ac_unrecognized_opts.patch | 17 +++++++
 ...-CONF_STATUS-for-gtk-and-openGL-need.patch | 45 +++++++++++++++++++
 package/xscreensaver/xscreensaver.hash        |  2 +-
 package/xscreensaver/xscreensaver.mk          |  2 +-
 5 files changed, 66 insertions(+), 2 deletions(-)
 create mode 100644 package/xscreensaver/0003-disable-failure-ac_unrecognized_opts.patch
 create mode 100644 package/xscreensaver/0004-configure-Ignore-CONF_STATUS-for-gtk-and-openGL-need.patch

diff --git a/.checkpackageignore b/.checkpackageignore
index fa557733e8..3ed92ded10 100644
--- a/.checkpackageignore
+++ b/.checkpackageignore
@@ -1640,6 +1640,8 @@ package/xl2tp/xl2tpd TrailingSpace
 package/xml-security-c/0001-fix-build-with-libressl-3.5.0.patch Upstream
 package/xscreensaver/0001-disable-check-for-pam.patch
 package/xscreensaver/0002-build-Do-not-build-po-files.patch
+package/xscreensaver/0003-disable-failure-ac_unrecognized_opts.patch
+package/xscreensaver/0004-configure-Ignore-CONF_STATUS-for-gtk-and-openGL-need.patch
 package/xxhash/0001-fix-man-page-installation.patch Upstream
 package/xxhash/0002-Makefile-add-dedicated-install-targets.patch Upstream
 package/xxhash/0003-do-no-longer-depend-on-assert-h-for-XXH_STATIC_ASSERT.patch Upstream
diff --git a/package/xscreensaver/0003-disable-failure-ac_unrecognized_opts.patch b/package/xscreensaver/0003-disable-failure-ac_unrecognized_opts.patch
new file mode 100644
index 0000000000..1fe9695c19
--- /dev/null
+++ b/package/xscreensaver/0003-disable-failure-ac_unrecognized_opts.patch
@@ -0,0 +1,17 @@
+Do not return an error code when unrecognized configure options are used.
+
+Inspired by
+https://github.com/OpenMandrivaAssociation/xscreensaver/blob/master/xscreensaver.spec#L124
+
+Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
+
+--- a/configure.ac.orig	2023-07-16 14:51:57.982072603 +0200
++++ b/configure.ac	2023-07-16 15:35:13.616281941 +0200
+@@ -22,7 +22,6 @@
+ 
+ if ! test -z "$ac_unrecognized_opts" ; then
+   echo "" >&2
+-  exit 2
+ fi
+ 
+ ###############################################################################
diff --git a/package/xscreensaver/0004-configure-Ignore-CONF_STATUS-for-gtk-and-openGL-need.patch b/package/xscreensaver/0004-configure-Ignore-CONF_STATUS-for-gtk-and-openGL-need.patch
new file mode 100644
index 0000000000..d153f39a76
--- /dev/null
+++ b/package/xscreensaver/0004-configure-Ignore-CONF_STATUS-for-gtk-and-openGL-need.patch
@@ -0,0 +1,45 @@
+From 516fbcdcfe6343b1d64d35957ddb768346713ff6 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sun, 17 Jul 2022 09:47:35 -0700
+Subject: [PATCH] configure: Ignore CONF_STATUS for gtk and openGL needs
+
+These are just warnings
+
+Upstream-Status: Inappropriate [OE-Specific]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Downloaded from
+https://cgit.openembedded.org/meta-openembedded/tree/meta-oe/recipes-graphics/xscreensaver/files/0001-configure-Ignore-CONF_STATUS-for-gtk-and-openGL-need.patch
+
+[Bernd: rebased for 6.06]
+Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
+---
+ configure.ac | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index c4fd38f..d7463cf 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -4549,7 +4548,6 @@ if test "$have_motif" = no -a "$have_gtk" = no; then
+   else
+     warnL "The GTK libraries do not seem to be available; the"
+     warn2 "\`xscreensaver-settings' program requires them."
+-    CONF_STATUS=1
+ #   echo ''
+ #   warn2 'You can use Motif or Lesstif instead of GTK (use the'
+ #   warn2 "\`--with-motif' option) but that is NOT recommended."
+@@ -4735,10 +4733,8 @@ if test "$have_gl" = no ; then
+     CONF_STATUS=1
+   elif test "$with_gl_req" = no ; then
+     noteL 'The OpenGL 3D library is not being used.'
+-    CONF_STATUS=1
+   else
+     noteL 'The OpenGL 3D library was not found.'
+-    CONF_STATUS=1
+   fi
+ 
+   if test "$gl_halfassed" = yes ; then
+-- 
+2.37.1
+
diff --git a/package/xscreensaver/xscreensaver.hash b/package/xscreensaver/xscreensaver.hash
index 27ef7d8f00..db0a410bfc 100644
--- a/package/xscreensaver/xscreensaver.hash
+++ b/package/xscreensaver/xscreensaver.hash
@@ -1,4 +1,4 @@
 # Locally calculated
-sha256  328d51797352acf58ca5bab49e76fbf26034e7cad785f651ea11ce7b43fba25a  xscreensaver-6.03.tar.gz
+sha256  f534fab85a836de5b8be8e91fc21b80ca7d6a4ed9386ebe207d4be7a4e7499a7  xscreensaver-6.06.tar.gz
 sha256  8a03451ba5c4c9af669b53e47e50c38c149b9e152d3d627809b962da7b760bbd  hacks/screenhack.h
 sha256  56db580415bb313a4a82c5e08f106304904d15d42faf8e6ab14b34e14e2087a5  hacks/glx/chessmodels.h
diff --git a/package/xscreensaver/xscreensaver.mk b/package/xscreensaver/xscreensaver.mk
index fed25925cc..c0abade508 100644
--- a/package/xscreensaver/xscreensaver.mk
+++ b/package/xscreensaver/xscreensaver.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XSCREENSAVER_VERSION = 6.03
+XSCREENSAVER_VERSION = 6.06
 XSCREENSAVER_SITE = https://www.jwz.org/xscreensaver
 
 # N.B. GPL-2.0+ code (in the hacks/glx subdirectory) is not currently built.
-- 
2.39.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot