diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000000000000000000000000000000000..c9a618551d7d788cde5f4326178966a3917277e9 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.gz filter=lfs diff=lfs merge=lfs -text diff --git a/.lfsconfig b/.lfsconfig new file mode 100644 index 0000000000000000000000000000000000000000..adee394cf772061738c1f6b4145c3a53a124e744 --- /dev/null +++ b/.lfsconfig @@ -0,0 +1,2 @@ +[lfs] + url = https://artlfs.openeuler.openatom.cn/src-openEuler/xscreensaver diff --git a/xscreensaver-5.35-0101-XIO-print-C-backtrace-on-error.patch b/xscreensaver-5.35-0101-XIO-print-C-backtrace-on-error.patch deleted file mode 100644 index 20b4d0cd807ec6fc424b4ddb8227143513187703..0000000000000000000000000000000000000000 --- a/xscreensaver-5.35-0101-XIO-print-C-backtrace-on-error.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 735cc1af7595890d9cd567f36dabaf41fae4210e Mon Sep 17 00:00:00 2001 -From: Mamoru TASAKA -Date: Mon, 11 Jul 2016 16:53:14 +0900 -Subject: [PATCH] XIO: print C backtrace on error - -For debugging purpose, show C backtrace with XIO -error happens. ---- - driver/xscreensaver.c | 41 +++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 41 insertions(+) - -diff --git a/driver/xscreensaver.c b/driver/xscreensaver.c -index 76969f2..04c2669 100644 ---- a/driver/xscreensaver.c -+++ b/driver/xscreensaver.c -@@ -148,10 +148,15 @@ - # include "config.h" - #endif - -+#include - #include - #include - #include - -+#ifdef __GNU_LIBRARY__ -+#include -+#endif -+ - #ifdef ENABLE_NLS - # include - # include -@@ -504,6 +509,41 @@ startup_ehandler (String name, String type, String class, - exit (1); - } - -+static void -+show_cstyle_backtrace(void) -+{ -+#ifdef __GNU_LIBRARY__ -+ void *bt_array[128]; -+ size_t bt_size; -+ -+ bt_size = backtrace(bt_array, countof(bt_array)); -+ fprintf(stderr, "C backtrace:\n"); -+ backtrace_symbols_fd(bt_array, bt_size, STDERR_FILENO); -+#endif -+} -+ -+static int (*default_xio_ehandler)(Display *dpy) = 0; -+ -+static int -+show_debug_info_xio_ehandler(Display *dpy) -+{ -+ show_cstyle_backtrace(); -+ if (default_xio_ehandler){ -+ (*default_xio_ehandler)(dpy); -+ } -+ return 0; -+} -+ -+static void -+hack_IOErrorHandler(void) -+{ -+#ifdef __GNU_LIBRARY__ -+ XIOErrorHandler old_handler; -+ old_handler = XSetIOErrorHandler(show_debug_info_xio_ehandler); -+ default_xio_ehandler = old_handler; -+#endif -+} -+ - - /* The zillions of initializations. - */ -@@ -1570,6 +1610,7 @@ main (int argc, char **argv) - - initialize_stderr (si); - handle_signals (si); -+ hack_IOErrorHandler(); - - make_splash_dialog (si); - --- -2.7.4 - diff --git a/xscreensaver-5.36-0007-misc-kill-gcc-warn_unused_result-warnings.patch b/xscreensaver-5.36-0007-misc-kill-gcc-warn_unused_result-warnings.patch deleted file mode 100644 index aa3852ebbdd591ee591f8818015e3fec3501d207..0000000000000000000000000000000000000000 --- a/xscreensaver-5.36-0007-misc-kill-gcc-warn_unused_result-warnings.patch +++ /dev/null @@ -1,96 +0,0 @@ -From 0d26e4514d7d6c90d2c5e35749c0b83121a66b77 Mon Sep 17 00:00:00 2001 -From: "mtasaka@fedoraproject.org" -Date: Tue, 7 Feb 2017 16:40:52 +0900 -Subject: [PATCH] misc: kill gcc warn_unused_result warnings - -Remove misc warnings generated gcc -Wall with -"warning: ignoring return value of 'foo', -declared with attribute warn_unused_result". - -For setuid() and fgets(), really check the returned value. -For system(), for now just use empty body to avoid this -warning. Note that casting the result to (void) does not -remove these warnings. ---- - driver/demo-Gtk.c | 9 +++++++-- - hacks/glx/sonar-icmp.c | 2 +- - hacks/glx/sonar.c | 5 +++-- - hacks/recanim.c | 6 +++++- - 4 files changed, 16 insertions(+), 6 deletions(-) - -diff --git a/driver/demo-Gtk.c b/driver/demo-Gtk.c -index f5c4839..7c34846 100644 ---- a/driver/demo-Gtk.c -+++ b/driver/demo-Gtk.c -@@ -4423,7 +4423,8 @@ kde_screensaver_active_p (void) - FILE *p = popen ("dcop kdesktop KScreensaverIface isEnabled 2>/dev/null", - "r"); - char buf[255]; -- fgets (buf, sizeof(buf)-1, p); -+ if (!p) return False; -+ if (!fgets (buf, sizeof(buf)-1, p)) return False; - pclose (p); - if (!strcmp (buf, "true\n")) - return True; -@@ -4434,7 +4435,11 @@ kde_screensaver_active_p (void) - static void - kill_kde_screensaver (void) - { -- system ("dcop kdesktop KScreensaverIface enable false"); -+ /* Use empty body to kill warning from gcc -Wall with -+ "warning: ignoring return value of 'system', -+ declared with attribute warn_unused_result" -+ */ -+ if (system ("dcop kdesktop KScreensaverIface enable false")) {} - } - - -diff --git a/hacks/glx/sonar-icmp.c b/hacks/glx/sonar-icmp.c -index 8256270..26eb90d 100644 ---- a/hacks/glx/sonar-icmp.c -+++ b/hacks/glx/sonar-icmp.c -@@ -1634,7 +1634,7 @@ sonar_init_ping (Display *dpy, char **error_ret, char **desc_ret, - fprintf (stderr, "%s: unable to open icmp socket\n", progname); - - /* Disavow privs */ -- setuid(getuid()); -+ if (setuid(getuid()) == -1) abort(); - - pd->pid = getpid() & 0xFFFF; - pd->seq = 0; -diff --git a/hacks/glx/sonar.c b/hacks/glx/sonar.c -index f3a4d9d..2c6ca5b 100644 ---- a/hacks/glx/sonar.c -+++ b/hacks/glx/sonar.c -@@ -930,8 +930,9 @@ init_sensor (ModeInfo *mi) - sp->ssd = sonar_init_ping (MI_DISPLAY (mi), &sp->error, &sp->desc, - ping_arg, ping_timeout, resolve_p, times_p, - debug_p); -- else -- setuid(getuid()); /* Disavow privs if not pinging. */ -+ else { -+ if (setuid(getuid()) == -1) abort(); /* Disavow privs if not pinging. */ -+ } - - sp->start_time = double_time (); /* for error message timing */ - -diff --git a/hacks/recanim.c b/hacks/recanim.c -index 51379ed..a526c25 100644 ---- a/hacks/recanim.c -+++ b/hacks/recanim.c -@@ -324,7 +324,11 @@ screenhack_record_anim_free (record_anim_state *st) - " 2>&-", - fn); - fprintf (stderr, "%s: exec: %s\n", progname, cmd); -- system (cmd); -+ /* Use empty body to kill warning from gcc -Wall with -+ "warning: ignoring return value of 'system', -+ declared with attribute warn_unused_result" -+ */ -+ if (system (cmd)) {} - - if (stat (fn, &s)) - { --- -2.9.3 - diff --git a/xscreensaver-6.06.tar.gz b/xscreensaver-6.06.tar.gz index de19bbd511fa6257ea0c28244421659aaf9509f8..f0937283b461e9f9d2aab208bdd09c1fb53aaf88 100644 Binary files a/xscreensaver-6.06.tar.gz and b/xscreensaver-6.06.tar.gz differ diff --git a/xscreensaver.spec b/xscreensaver.spec index 90e04dadac03816b37c198476c666735b2e2d40a..1aa720914f501c3c9596ad999c0f9e2478bc6717 100644 --- a/xscreensaver.spec +++ b/xscreensaver.spec @@ -6,7 +6,7 @@ %define modular_conf 1 %define split_getimage 1 -%define baserelease 7 +%define baserelease 8 %global use_clang_as_cc 0 %global use_clang_analyze 0 @@ -78,8 +78,6 @@ Patch1: xscreensaver-5.45-0001-barcode-glsnake-sanitize-the-names-of-mo ## Patches which must be discussed with upstream # See bug 472061 Patch21: xscreensaver-6.06-webcollage-default-nonet.patch -# misc: kill gcc warn_unused_result warnings -Patch3607: xscreensaver-5.36-0007-misc-kill-gcc-warn_unused_result-warnings.patch # switch_page_cb: backport debian fix for DPMS settings issue (debian bug 1031076) Patch4601: xscreensaver-6.06-0001-switch_page_cb-backport-debian-1031076-for-DPMS-settings.patch # distort_reset: restrict radius by xgwa correctly (bug 2174626) @@ -95,8 +93,6 @@ Patch10003: xscreensaver-6.00-0003-dialog.c-window_init-show-more-version-s # # Debugging patch # Not apply by default -# XIO: print C backtrace on error -Patch13501: xscreensaver-5.35-0101-XIO-print-C-backtrace-on-error.patch # # Patches end Requires: xscreensaver-base = %{epoch}:%{version}-%{release} @@ -319,40 +315,7 @@ This package contains cppcheck result of XScreenSaver. %prep -%setup -q -n %{name}-%{mainversion}%{?beta_ver} - -cat > .gitignore < - 1:6.06-8 +- fix build with gettext 0.24.1 +- use autosetup for patches + * Wed Jun 19 2024 Wenlong Zhang - 1:6.06-7 - fix build error for loongarch64