summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2011-01-13 11:34:59 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2011-01-13 11:34:59 +0000
commit3e0b1454ed54b28037457fadc09cee52146185e2 (patch)
tree07a2fc4d7c18280963cfc4883158789234ad75e0 /x11-misc/xscreensaver/files
parentVersion bump (diff)
downloadgentoo-2-3e0b1454ed54b28037457fadc09cee52146185e2.tar.gz
gentoo-2-3e0b1454ed54b28037457fadc09cee52146185e2.tar.bz2
gentoo-2-3e0b1454ed54b28037457fadc09cee52146185e2.zip
Fix password string display wrt #349512 by Sergey and Mamoru Tasaka. Fix gtkext memory leak wrt #351173 by Brian Beardall and Mamoru Tasaka.
(Portage version: 2.2.0_alpha14/cvs/Linux x86_64)
Diffstat (limited to 'x11-misc/xscreensaver/files')
-rw-r--r--x11-misc/xscreensaver/files/xscreensaver-5.12-for-now-set-lang-on-daemon-to-C.patch20
-rw-r--r--x11-misc/xscreensaver/files/xscreensaver-5.12-gltext-memleak.patch13
2 files changed, 33 insertions, 0 deletions
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.12-for-now-set-lang-on-daemon-to-C.patch b/x11-misc/xscreensaver/files/xscreensaver-5.12-for-now-set-lang-on-daemon-to-C.patch
new file mode 100644
index 000000000000..14a9f789a770
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.12-for-now-set-lang-on-daemon-to-C.patch
@@ -0,0 +1,20 @@
+http://bugs.gentoo.org/349512
+
+--- driver/xscreensaver.c
++++ driver/xscreensaver.c
+@@ -1382,6 +1382,7 @@
+ struct passwd *spasswd;
+ int i;
+
++#if 0
+ #ifdef ENABLE_NLS
+ if (!setlocale (LC_ALL, ""))
+ fprintf (stderr, "locale not supported by C library\n");
+@@ -1389,6 +1390,7 @@
+ bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+ textdomain (GETTEXT_PACKAGE);
+ #endif /* ENABLE_NLS */
++#endif
+
+ memset(si, 0, sizeof(*si));
+ global_si_kludge = si; /* I hate C so much... */
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.12-gltext-memleak.patch b/x11-misc/xscreensaver/files/xscreensaver-5.12-gltext-memleak.patch
new file mode 100644
index 000000000000..0a80767735ee
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.12-gltext-memleak.patch
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/351173
+
+--- hacks/glx/tube.c
++++ hacks/glx/tube.c
+@@ -181,6 +181,8 @@
+ glDrawArrays ((wire_p ? GL_LINE_LOOP : GL_TRIANGLE_FAN), 0, out);
+ }
+
++ free(array);
++
+ return polys;
+ }
+