- up to 6.06

diff --git a/xscreensaver-6.05-0001-demo-Gtk.c-main-enable-localization-again.patch b/xscreensaver-6.05-0001-demo-Gtk.c-main-enable-localization-again.patch
deleted file mode 100644 (file)
index e31cf0c..0000000
--- a/xscreensaver-6.05-0001-demo-Gtk.c-main-enable-localization-again.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 8e78268b11e76648a2d7924bb5ed402e9f926a85 Mon Sep 17 00:00:00 2001
-From: Mamoru TASAKA <mtasaka@fedoraproject.org>
-Date: Sun, 23 Oct 2022 01:03:21 +0900
-Subject: [PATCH] demo-Gtk.c/main: enable localization again
-
-Even if demo-Gtk.c switched to use g_application_run(), for localization
-gettext stuff must be called.
----
- driver/demo-Gtk.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/driver/demo-Gtk.c b/driver/demo-Gtk.c
-index 442dac1..404fc88 100644
---- a/driver/demo-Gtk.c
-+++ b/driver/demo-Gtk.c
-@@ -5094,6 +5094,12 @@ main (int argc, char *argv[])
-   if (s) progname = s+1;
-   g_log_set_default_handler (g_logger, NULL);
-   g_log_set_writer_func (g_other_logger, NULL, NULL);
-+# ifdef ENABLE_NLS
-+  bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
-+  textdomain (GETTEXT_PACKAGE);
-+  bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-+# endif /* ENABLE_NLS */
-+
-   return g_application_run (G_APPLICATION (xscreensaver_app_new()),
-                             argc, argv);
- }
--- 
-2.38.1
-

diff --git a/xscreensaver-6.05-0002-demo-Gtk.c-populate_prefs_page-use-correct-pointer-f.patch b/xscreensaver-6.05-0002-demo-Gtk.c-populate_prefs_page-use-correct-pointer-f.patch
deleted file mode 100644 (file)
index 29a5874..0000000
--- a/xscreensaver-6.05-0002-demo-Gtk.c-populate_prefs_page-use-correct-pointer-f.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From ae526a4276abeccdd0b0c738dea903c5575a52b6 Mon Sep 17 00:00:00 2001
-From: Mamoru TASAKA <mtasaka@fedoraproject.org>
-Date: Sun, 23 Oct 2022 02:41:03 +0900
-Subject: [PATCH] demo-Gtk.c/populate_prefs_page: use correct pointer for
- pref_changed_cb
-
-With xscreensaver 6.05. xscreensaver-settings causes segfault when
-trying to choose another theme for auth window. This is because
-in populate_prefs_page() wrong pointer is passed to pref_changed_cb(),
-then XSCREENSAVER_WINDOW cast complains.
-
-The first line in populate_prefs_page() actually writes what pointer
-should be used - use the same pointer here.
----
- driver/demo-Gtk.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/driver/demo-Gtk.c b/driver/demo-Gtk.c
-index 404fc88..aa85923 100644
---- a/driver/demo-Gtk.c
-+++ b/driver/demo-Gtk.c
-@@ -2518,7 +2518,7 @@ populate_prefs_page (state *s)
-         if (! signal_connected_p)
-           {
-             g_signal_connect (G_OBJECT (cbox), "changed",
--                              G_CALLBACK (pref_changed_cb), (gpointer) s);
-+                              G_CALLBACK (pref_changed_cb), (gpointer) s->window);
-             signal_connected_p = TRUE;
-           }
-       }
--- 
-2.38.1
-

diff --git a/xscreensaver.spec b/xscreensaver.spec
index b3f7ed04c7bc8d84f01996cab333c52686d6d2a0..54c4334847ecc5f9ffbd27b37a1326445ed283c2 100644 (file)
--- a/xscreensaver.spec
+++ b/xscreensaver.spec
@@ -7,23 +7,18 @@ Summary(pt_BR.UTF-8): Salvadores de tela X
 Summary(ru.UTF-8):     Набор программ хранения экрана для X Window
 Summary(uk.UTF-8):     Набір програм збереження екрану для X Window
 Summary(zh_CN.UTF-8):  X 窗口系统保护器
-%define                main_ver 6.05
 Name:          xscreensaver
-Version:       6.05.1
+Version:       6.06
 Release:       1
 Epoch:         1
 License:       BSD
 Group:         X11/Applications
 Source0:       https://www.jwz.org/xscreensaver/%{name}-%{version}.tar.gz
-# Source0-md5: 79d6618adeabda8419f8390b3d85c51b
+# Source0-md5: 7e9437089cc8162a3cf9ff335633faed
 Source1:       %{name}-autostart.desktop
 Source2:       %{name}-lock.desktop
 Source3:       %{name}.pamd
 Patch0:                %{name}-desktop.patch
-# from fedora
-Patch1:                %{name}-6.05-0001-demo-Gtk.c-main-enable-localization-again.patch
-# from fedora
-Patch2:                %{name}-6.05-0002-demo-Gtk.c-populate_prefs_page-use-correct-pointer-f.patch
 URL:           https://www.jwz.org/xscreensaver/
 BuildRequires: EGL-devel
 BuildRequires: OpenGL-GLU-devel
@@ -173,10 +168,8 @@ Screen savers which uses OpenGL and GLE libraries.
 Wygaszacze ekranu pod X Window używające OpenGL oraz GLE.
 
 %prep
-%setup -q -n %{name}-%{main_ver}
+%setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 # fix encoding (xscreensaver-6.05: actual encoding is ISO-8869-1, but file specifies UTF-8)
 iconv -f iso-8859-1 -t utf-8 po/ca.po -o po/ca.po.tmp