[Buildroot] [PATCH 1/2] package/xscreensaver: fix build

* [Buildroot] [PATCH 1/2] package/xscreensaver: fix build
@ 2023-07-16 17:01 Bernd Kuhls
  2023-07-16 17:01 ` [Buildroot] [PATCH 2/2] package/xscreensaver: bump version to 6.06 Bernd Kuhls
  2023-07-18  9:46 ` [Buildroot] [PATCH 1/2] package/xscreensaver: fix build Thomas Petazzoni via buildroot
  0 siblings, 2 replies; 4+ messages in thread
From: Bernd Kuhls @ 2023-07-16 17:01 UTC (permalink / raw)
  To: buildroot; +Cc: Simon Dawson

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/

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
 .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

diff --git a/.checkpackageignore b/.checkpackageignore
index 504b96951b..fa557733e8 100644
--- a/.checkpackageignore
+++ b/.checkpackageignore
@@ -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
diff --git a/package/xscreensaver/0001-disable-check-for-pam.patch b/package/xscreensaver/0001-disable-check-for-pam.patch
new file mode 100644
index 0000000000..6d052a53e9
--- /dev/null
+++ b/package/xscreensaver/0001-disable-check-for-pam.patch
@@ -0,0 +1,16 @@
+Fix cross-build
+
+Detecting features of the host does not make sense when cross-compiling.
+
+Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
+
+--- 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
+ 
diff --git a/package/xscreensaver/0002-build-Do-not-build-po-files.patch b/package/xscreensaver/0002-build-Do-not-build-po-files.patch
new file mode 100644
index 0000000000..03674f5d50
--- /dev/null
+++ b/package/xscreensaver/0002-build-Do-not-build-po-files.patch
@@ -0,0 +1,58 @@
+From 6b5d022f6dd9848a2d5ca08a1968929b8c140981 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 16 Jul 2022 09:59:40 -0700
+Subject: [PATCH 2/2] build: Do not build po files
+
+Fixes
+| make[1]: Entering directory '/mnt/b/yoe/master/build/tmp/work/cortexa57-yoe-linux/xscreensaver/6.01-r0/xscreensaver-6.01/po'
+| make[1]: *** No rule to make target 'default'.  Stop.
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Downloaded from
+https://cgit.openembedded.org/meta-openembedded/plain/meta-oe/recipes-graphics/xscreensaver/files/0002-build-Do-not-build-po-files.patch
+
+Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
+---
+ Makefile.in        | 5 ++---
+ driver/Makefile.in | 2 +-
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 9de79b2..1c1d16c 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -6,8 +6,8 @@ srcdir		= @srcdir@
+ VPATH		= @srcdir@
+ 
+ SHELL		= /bin/sh
+-SUBDIRS 	= utils jwxyz hacks/images hacks hacks/glx hacks/fonts \
+-		  driver po
++SUBDIRS 	= utils jwxyz hacks/images hacks hacks/fonts \
++		  driver
+ SUBDIRS2	= $(SUBDIRS) OSX android
+ TARFILES	= README README.hacking INSTALL \
+ 		  configure configure.ac Makefile.in config.h.in \
+@@ -461,4 +461,3 @@ cerebrum::
+ 	--include 'ad2c' \
+ 	--include '*/' \
+ 	--exclude '*'
+-
+diff --git a/driver/Makefile.in b/driver/Makefile.in
+index e1fa1b2..feca6fc 100644
+--- a/driver/Makefile.in
++++ b/driver/Makefile.in
+@@ -211,7 +211,7 @@ TEST_EXES	= test-passwd   test-uid        test-xdpms      test-grab     \
+ 		  xdpyinfo      test-screens    test-yarandom   test-xinput   \
+ 	          test-xkb
+ 
+-EXES		= xscreensaver xscreensaver-command xscreensaver-settings
++EXES		= xscreensaver xscreensaver-command
+ UTIL_EXES	= xscreensaver-gfx @EXES_SYSTEMD@
+ SETUID_EXES	= xscreensaver-auth
+ DEMO_EXES	= @ALL_DEMO_PROGRAMS@
+-- 
+2.37.1
+
diff --git a/package/xscreensaver/xscreensaver.mk b/package/xscreensaver/xscreensaver.mk
index 6cc7e8febe..fed25925cc 100644
--- a/package/xscreensaver/xscreensaver.mk
+++ b/package/xscreensaver/xscreensaver.mk
@@ -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 \
-- 
2.39.2

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

^ permalink raw reply related	[flat|nested] 4+ messages in thread