Skip to contentSkip to conversation

package/xscreensaver: fix build

PATCH In review Bernd Kuhls 2 participants 4 messages Jul 16, 2023 – Jul 31, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 package/xscreensaver: fix build

Patch 0001 fixes the autobuilder error during configure. Patch 0002 fixes another bug while building the package.

Fixes:
http://autobuild.buildroot.net/results/845/84575eec1d4226c46ac96bfc98963f38fa75a762/

---
 .checkpackageignore                           |  2 +
 .../0001-disable-check-for-pam.patch          | 16 +++++
 .../0002-build-Do-not-build-po-files.patch    | 58 +++++++++++++++++++
 package/xscreensaver/xscreensaver.mk          | 10 ++++
 4 files changed, 86 insertions(+)
 create mode 100644 package/xscreensaver/0001-disable-check-for-pam.patch
 create mode 100644 package/xscreensaver/0002-build-Do-not-build-po-files.patch
.checkpackageignore +2 -0
index 504b96951b..fa557733e8 100644
@@ -1638,6 +1638,8 @@ package/xinetd/0004-configure-rlim_t.patch Upstream
 package/xinetd/0005-CVE-2013-4342-xinetd-ignores-user-and-group-directiv.patch Upstream
 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/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
package/xscreensaver/0001-disable-check-for-pam.patch new file +16 -0
new file mode 100644
index 0000000000..6d052a53e9
@@ -0,0 +1,16 @@
+Fix cross-build
+
+Detecting features of the host does not make sense when cross-compiling.
+
+Signed-off-by: Bernd Kuhls <[email protected]>
+
+--- a/configure.ac.orig	2022-02-20 22:05:40.029817049 +0100
++++ b/configure.ac	2023-07-16 14:32:57.562198378 +0200
+@@ -4802,7 +4802,6 @@
+   if test -d /etc/pam.d -o -f /etc/pam.conf ; then
+     warn  "Your system seems to have PAM, but PAM is not being used."
+     warn2 "That is probably not going to work out well."
+-    CONF_STATUS=1
+   fi
+ fi
+ 
package/xscreensaver/0002-build-Do-not-build-po-files.patch new file +58 -0

58 lines not on this page · raw message

package/xscreensaver/xscreensaver.mk +10 -0
index 6cc7e8febe..fed25925cc 100644
@@ -13,6 +13,16 @@ XSCREENSAVER_LICENSE_FILES = hacks/screenhack.h hacks/glx/chessmodels.h
 XSCREENSAVER_CPE_ID_VENDOR = xscreensaver_project
 XSCREENSAVER_SELINUX_MODULES = xdg xscreensaver xserver
 
+# 0001-disable-check-for-pam.patch
+# 0002-build-Do-not-build-po-files.patch
+XSCREENSAVER_AUTORECONF = YES
+
+# fix missing config.rpath (needed for autoreconf) in the codebase
+define XSCREENSAVER_TOUCH_CONFIG_RPATH
+	touch $(@D)/config.rpath
+endef
+XSCREENSAVER_PRE_CONFIGURE_HOOKS += XSCREENSAVER_TOUCH_CONFIG_RPATH
+
 XSCREENSAVER_DEPENDENCIES = \
 	gdk-pixbuf \
 	gdk-pixbuf-xlib \
Signature · 6 lines
2.39.2

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw

PATCH 2/2 package/xscreensaver: bump version to 6.06

Add more patches to fix build errors.

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

---
 .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
.checkpackageignore +2 -0
index fa557733e8..3ed92ded10 100644
@@ -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
package/xscreensaver/0003-disable-failure-ac_unrecognized_opts.patch new file +17 -0
new file mode 100644
index 0000000000..1fe9695c19
@@ -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 <[email protected]>
+
+--- 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
+ 
+ ###############################################################################
package/xscreensaver/0004-configure-Ignore-CONF_STATUS-for-gtk-and-openGL-need.patch new file +45 -0

45 lines not on this page · raw message

package/xscreensaver/xscreensaver.hash +1 -1
index 27ef7d8f00..db0a410bfc 100644
@@ -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
package/xscreensaver/xscreensaver.mk +1 -1
index fed25925cc..c0abade508 100644
@@ -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.
Signature · 6 lines
2.39.2

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#2 lore raw
In reply to Bernd Kuhls

Hello Bernd,

.checkpackageignore package/xinetd/0004-configure-rlim_t.patch Upstream · line 1642

Quoted 10 lines · On Sun, 16 Jul 2023 19:01:25 +0200 Bernd Kuhls <[email protected]> wrote:
.checkpackageignore +2 -0
index 504b96951b..fa557733e8 100644
@@ -1638,6 +1638,8 @@ package/xinetd/0004-configure-rlim_t.patch Upstream
 package/xinetd/0005-CVE-2013-4342-xinetd-ignores-user-and-group-directiv.patch Upstream
 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

Is this valid syntax? You're saying to ignore some warnings, but not which ones.

Also, for new patches, adding them in the checkpackageignore file is quite odd. We definitely want those new patches to have an "Upstream:" tag.

Quoted 9 lines
.checkpackageignore +0 -0
 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
package/xscreensaver/0001-disable-check-for-pam.patch new file +0 -0
new file mode 100644
index 0000000000..6d052a53e9

package/xscreensaver/0001-disable-check-for-pam.patch line 5

Quoted 5 lines
package/xscreensaver/0001-disable-check-for-pam.patch new file +5 -0
@@ -0,0 +1,16 @@
+Fix cross-build
+
+Detecting features of the host does not make sense when cross-compiling.
+
+Signed-off-by: Bernd Kuhls <[email protected]>

Meh, no Git repository of the project to have a nice Git formatted patch? :-/

package/xscreensaver/0002-build-Do-not-build-po-files.patch line 4

Quoted 10 lines
package/xscreensaver/0002-build-Do-not-build-po-files.patch new file +4 -0
new file mode 100644
index 0000000000..03674f5d50
@@ -0,0 +1,58 @@
+From 6b5d022f6dd9848a2d5ca08a1968929b8c140981 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Sat, 16 Jul 2022 09:59:40 -0700
+Subject: [PATCH 2/2] build: Do not build po files

No patch numbering, this raises a check-package warning.

I see Khem has been able to generate a git formatted patch, I wonder against which Git repository?

Thomas

Signature · 7 lines
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#3 lore raw

Hello Bernd,

Do you think you could follow-up on the below comments? It would help getting the patch merged.

Thanks!

Thomas

Quoted 57 lines · On Tue, 18 Jul 2023 11:46:08 +0200 Thomas Petazzoni via buildroot…

Hello Bernd,

.checkpackageignore package/xinetd/0004-configure-rlim_t.patch Upstream · line 1642

Quoted 10 lines · On Sun, 16 Jul 2023 19:01:25 +0200 Bernd Kuhls <[email protected]> wrote:
.checkpackageignore +2 -0
index 504b96951b..fa557733e8 100644
@@ -1638,6 +1638,8 @@ package/xinetd/0004-configure-rlim_t.patch Upstream
 package/xinetd/0005-CVE-2013-4342-xinetd-ignores-user-and-group-directiv.patch Upstream
 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  

Is this valid syntax? You're saying to ignore some warnings, but not which ones.

Also, for new patches, adding them in the checkpackageignore file is quite odd. We definitely want those new patches to have an "Upstream:" tag.

Quoted 9 lines
.checkpackageignore +0 -0
 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
package/xscreensaver/0001-disable-check-for-pam.patch new file +0 -0
new file mode 100644
index 0000000000..6d052a53e9

package/xscreensaver/0001-disable-check-for-pam.patch line 5

Quoted 5 lines
package/xscreensaver/0001-disable-check-for-pam.patch new file +5 -0
@@ -0,0 +1,16 @@
+Fix cross-build
+
+Detecting features of the host does not make sense when cross-compiling.
+
+Signed-off-by: Bernd Kuhls <[email protected]>  

Meh, no Git repository of the project to have a nice Git formatted patch? :-/

package/xscreensaver/0002-build-Do-not-build-po-files.patch line 4

Quoted 10 lines
package/xscreensaver/0002-build-Do-not-build-po-files.patch new file +4 -0
new file mode 100644
index 0000000000..03674f5d50
@@ -0,0 +1,58 @@
+From 6b5d022f6dd9848a2d5ca08a1968929b8c140981 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Sat, 16 Jul 2022 09:59:40 -0700
+Subject: [PATCH 2/2] build: Do not build po files  

No patch numbering, this raises a check-package warning.

I see Khem has been able to generate a git formatted patch, I wonder against which Git repository?

Thomas

Signature · 7 lines
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot