commit cdf2caaed782592c2ba4f3696ab152e6e2f7d2e7
Author: Krzysztof Mrozowicz <mrozo...@pld-linux.org>
Date: Wed Oct 26 11:54:01 2022 +0000
- adding patches
...demo-Gtk.c-main-enable-localization-again.patch | 31 ++++++++++++++++++++
...populate_prefs_page-use-correct-pointer-f.patch | 33 ++++++++++++++++++++++
2 files changed, 64 insertions(+)
---
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
new file mode 100644
index 0000000..e31cf0c
--- /dev/null
+++ b/xscreensaver-6.05-0001-demo-Gtk.c-main-enable-localization-again.patch
@@ -0,0 +1,31 @@
+From 8e78268b11e76648a2d7924bb5ed402e9f926a85 Mon Sep 17 00:00:00 2001
+From: Mamoru TASAKA <mtas...@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
new file mode 100644
index 0000000..29a5874
--- /dev/null
+++
b/xscreensaver-6.05-0002-demo-Gtk.c-populate_prefs_page-use-correct-pointer-f.patch
@@ -0,0 +1,33 @@
+From ae526a4276abeccdd0b0c738dea903c5575a52b6 Mon Sep 17 00:00:00 2001
+From: Mamoru TASAKA <mtas...@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
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xscreensaver.git/commitdiff/cdf2caaed782592c2ba4f3696ab152e6e2f7d2e7
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
