From 69a28458ad7e8ce31f9ca0f9a50581d091d67c61 Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka@fedoraproject.org>
Date: Dec 11 2020 02:33:08 +0000
Subject: test-screens.c: add skel XA_SCREENSAVER_VERSION definition


---

diff --git a/xscreensaver-5.45-1004-test-screens.c-add-skel-XA_SCREENSAVER_VERSION-defin.patch b/xscreensaver-5.45-1004-test-screens.c-add-skel-XA_SCREENSAVER_VERSION-defin.patch
new file mode 100644
index 0000000..b6dfabe
--- /dev/null
+++ b/xscreensaver-5.45-1004-test-screens.c-add-skel-XA_SCREENSAVER_VERSION-defin.patch
@@ -0,0 +1,33 @@
+From 9b948db8377c0ac146eae2d865c987e73d9109ad Mon Sep 17 00:00:00 2001
+From: Mamoru TASAKA <mtasaka@fedoraproject.org>
+Date: Fri, 11 Dec 2020 10:40:09 +0900
+Subject: [PATCH] test-screens.c: add skel XA_SCREENSAVER_VERSION definition
+
+To avoid the following link error:
+----------------------------------------------------
+/usr/bin/ld: test-screens.o: in function `update_screen_layout':
+/builddir/build/BUILD/xscreensaver-5.45/x86_64-pc-linux-gnu/driver/../../driver/screens.c:1104: undefined reference to `XA_SCREENSAVER_VERSION'
+collect2: error: ld returned 1 exit status
+----------------------------------------------------
+
+On xscreensaver-5.45, in screens.c/update_screen_layout some logic is added using
+XA_SCREENSAVER_VERSION .
+---
+ driver/test-screens.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/driver/test-screens.c b/driver/test-screens.c
+index 2fb3e35..c5dfa02 100644
+--- a/driver/test-screens.c
++++ b/driver/test-screens.c
+@@ -39,6 +39,7 @@
+ 
+ char *progname = 0;
+ char *progclass = "XScreenSaver";
++Atom XA_SCREENSAVER_VERSION;
+ 
+ const char *blurb(void) { return progname; }
+ 
+-- 
+2.29.2
+
diff --git a/xscreensaver.spec b/xscreensaver.spec
index e95a45f..d903d4e 100644
--- a/xscreensaver.spec
+++ b/xscreensaver.spec
@@ -10,12 +10,12 @@
 %define split_getimage   1
 %endif
 
-%define fedora_rel    1
+%define fedora_rel    1.102
 
 %global use_clang_as_cc 0
 %global use_clang_analyze 0
 %global use_cppcheck   0
-%global use_gcc_strict_sanitize 0
+%global use_gcc_strict_sanitize 1
 %global use_gcc_trap_on_sanitize 0
 %global use_gcc_analyzer 0
 %undefine extrarel
@@ -99,6 +99,8 @@ Patch4501:      xscreensaver-5.45-1001-test-password.c-add-skel-definition-for-c
 Patch4502:      xscreensaver-5.45-0002-asm6502.c-immediate-readd-free-call-accidentally-rem.patch
 # beats/draw_beats: avoid integer overflow by multiplication
 Patch4503:      xscreensaver-5.45-0003-beats-draw_beats-avoid-integer-overflow-by-multiplic.patch
+# test-screens.c: add skel XA_SCREENSAVER_VERSION definition
+Patch4504:      xscreensaver-5.45-1004-test-screens.c-add-skel-XA_SCREENSAVER_VERSION-defin.patch
 #
 # gcc warning cleanup
 # Some cppcheck cleanup
@@ -375,6 +377,7 @@ find . -name \*.c -exec chmod ugo-x {} \;
 %__cat %PATCH4501 | %__git am
 %__cat %PATCH4502 | %__git am
 %__cat %PATCH4503 | %__git am
+%__cat %PATCH4504 | %__git am
 
 #%%__cat %PATCH13501 | %%__git am
 
@@ -723,11 +726,7 @@ cd ..
 
 # test
 # for now, build tests anyway (even if they are not to be installed)
-# test-screens fails to build on F-32??
-make tests -C driver -k \
-%if 0%{?fedora} <= 32
-	|| true
-%endif
+make tests -C driver
 
 %if 0%{?use_cppcheck} >= 1
 cd ..
@@ -1112,6 +1111,9 @@ exit 0
 %endif
 
 %changelog
+* Fri Dec 11 2020 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1:5.45-2
+- test-screens.c: add skel XA_SCREENSAVER_VERSION definition
+
 * Thu Dec 10 2020 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1:5.45-1
 - Update to 5.45
 - asm6502.c/immediate: readd free() call accidentally removed during gcc warnings fix