diff --git a/xscreensaver-5.45-1001-test-password.c-add-skel-definition-for-clientmessa.patch b/xscreensaver-5.45-1001-test-password.c-add-skel-definition-for-clientmessa.patch new file mode 100644 index 0000000..c7e55c3 --- /dev/null +++ b/xscreensaver-5.45-1001-test-password.c-add-skel-definition-for-clientmessa.patch @@ -0,0 +1,31 @@ +From bcb4b5355e73274722a6169dfa4f532353b3d6a7 Mon Sep 17 00:00:00 2001 +From: XScreenSaver owners +Date: Wed, 9 Dec 2020 22:35:55 +0900 +Subject: [PATCH] test-password.c: add skel definition for + clientmessage_response + +Fix below + +/usr/bin/ld: /tmp/test-passwd.BnNU2t.ltrans0.ltrans.o: in function `passwd_event_loop': +/foo/xscreensaver-5.45/x86_64-pc-linux-gnu/driver/../../driver/lock.c:1937: undefined reference to `clientmessage_response' +collect2: error: ld returned 1 exit status +make: *** [Makefile:842: test-passwd] Error 1 +--- + driver/test-passwd.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/driver/test-passwd.c b/driver/test-passwd.c +index 9b4f98e..1c4dccc 100644 +--- a/driver/test-passwd.c ++++ b/driver/test-passwd.c +@@ -67,6 +67,7 @@ void describe_monitor_layout (saver_info *si) { } + Bool update_screen_layout (saver_info *si) { return 0; } + Bool in_signal_handler_p = 0; + char *timestring (time_t when) { return ""; } ++void clientmessage_response (saver_info *si, Window w, Bool error, const char *stderr_msg, const char *protocol_msg) {} + + const char *blurb(void) { return progname; } + Atom XA_SCREENSAVER, XA_DEMO, XA_PREFS; +-- +2.29.2 + diff --git a/xscreensaver.spec b/xscreensaver.spec index db84d3b..1b1141a 100644 --- a/xscreensaver.spec +++ b/xscreensaver.spec @@ -81,7 +81,7 @@ Source13: xscreensaver-newlogin-wrapper ## Patches ## # bug 129335 -Patch1: xscreensaver-5.44-0001-barcode-glsnake-sanitize-the-names-of-modes.patch +Patch1: xscreensaver-5.45-0001-barcode-glsnake-sanitize-the-names-of-modes.patch ## Patches already sent to the upsteam ## Patches which must be discussed with upstream # See bug 472061 @@ -93,7 +93,8 @@ Patch52: xscreensaver-5.44-0002-Patch-to-compile-driver-test-xdpms.patch Patch3607: xscreensaver-5.36-0007-misc-kill-gcc-warn_unused_result-warnings.patch # open new window for man when using gnome-terminal Patch4261: xscreensaver-5.42-0061-open-new-window-for-man-when-using-gnome-terminal.patch -# +# test-password.c: add skel definition for clientmessage_response +Patch4501: xscreensaver-5.45-1001-test-password.c-add-skel-definition-for-clientmessa.patch # # gcc warning cleanup # Some cppcheck cleanup @@ -367,6 +368,7 @@ find . -name \*.c -exec chmod ugo-x {} \; #%%__cat %PATCH3607 | %__git am %__cat %PATCH4261 | %__git am +%__cat %PATCH4501 | %__git am #%%__cat %PATCH13501 | %%__git am @@ -659,6 +661,9 @@ EOF fi # Workaround end +# From 5.45: temporary workaround for installation issue +cp -p ../driver/xscreensaver-demo.ui driver/ + %if 0%{?use_clang_analyze} < 1 # Workaround for ppc64 build failure make -C ../hacks/images -j1