From 8e51b11d980e4af072f351d439896146bc71120c Mon Sep 17 00:00:00 2001 From: guibuilder_pel7x64builder0 Date: Tue, 25 Jun 2019 19:13:55 +0200 Subject: [PATCH] xscreensaver package update Signed-off-by: guibuilder_pel7x64builder0 --- ...1-fontglide.c-forbit-C-style-comment.patch | 34 +++++++++++++++++++ ...ow-for-man-when-using-gnome-terminal.patch | 27 +++++++++++++++ SPECS/xscreensaver.spec | 17 ++++++++-- 3 files changed, 75 insertions(+), 3 deletions(-) create mode 100644 SOURCES/xscreensaver-5.42-0001-fontglide.c-forbit-C-style-comment.patch create mode 100644 SOURCES/xscreensaver-5.42-0061-open-new-window-for-man-when-using-gnome-terminal.patch diff --git a/SOURCES/xscreensaver-5.42-0001-fontglide.c-forbit-C-style-comment.patch b/SOURCES/xscreensaver-5.42-0001-fontglide.c-forbit-C-style-comment.patch new file mode 100644 index 0000000..383abab --- /dev/null +++ b/SOURCES/xscreensaver-5.42-0001-fontglide.c-forbit-C-style-comment.patch @@ -0,0 +1,34 @@ +From e491478965fc9005362e44ba62c6b167d4d1b4b2 Mon Sep 17 00:00:00 2001 +From: XScreenSaver owners +Date: Sun, 30 Dec 2018 14:45:54 +0900 +Subject: [PATCH] fontglide.c: forbit C++ style comment + +../../hacks/fontglide.c: In function 'fontglide_free': +../../hacks/fontglide.c:2424:1: error: C++ style comments are not allowed in ISO C90 + // if (s->b && s->b != s->window) XFreePixmap (dpy, s->b); + +Change comments with C style +--- + hacks/fontglide.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/hacks/fontglide.c b/hacks/fontglide.c +index df8f498..6c33d1a 100644 +--- a/hacks/fontglide.c ++++ b/hacks/fontglide.c +@@ -2421,8 +2421,10 @@ fontglide_free (Display *dpy, Window window, void *closure) + + textclient_close (s->tc); + +-// if (s->b && s->b != s->window) XFreePixmap (dpy, s->b); +-// if (s->ba && s->ba != s->b) XFreePixmap (dpy, s->ba); ++/* ++ if (s->b && s->b != s->window) XFreePixmap (dpy, s->b); ++ if (s->ba && s->ba != s->b) XFreePixmap (dpy, s->ba); ++*/ + XFreeGC (dpy, s->bg_gc); + if (s->charset) free (s->charset); + if (s->font_override) free (s->font_override); +-- +2.20.1 + diff --git a/SOURCES/xscreensaver-5.42-0061-open-new-window-for-man-when-using-gnome-terminal.patch b/SOURCES/xscreensaver-5.42-0061-open-new-window-for-man-when-using-gnome-terminal.patch new file mode 100644 index 0000000..5eedf19 --- /dev/null +++ b/SOURCES/xscreensaver-5.42-0061-open-new-window-for-man-when-using-gnome-terminal.patch @@ -0,0 +1,27 @@ +From 95ae80c0e7bc1b92535067df1fd0129829ce67af Mon Sep 17 00:00:00 2001 +From: Mamoru TASAKA +Date: Sun, 30 Dec 2018 15:23:37 +0900 +Subject: [PATCH] open new window for man when using gnome-terminal + +Instead of opening man page in another tab, force opening +new window. +--- + driver/XScreenSaver.ad.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/driver/XScreenSaver.ad.in b/driver/XScreenSaver.ad.in +index eec998f..b7a0846 100644 +--- a/driver/XScreenSaver.ad.in ++++ b/driver/XScreenSaver.ad.in +@@ -100,7 +100,7 @@ GetViewPortIsFullOfLies: False + ! Gnome 2.4, 2.6: (yelp can't display man pages, as of 2.6.3) + ! + @GNOME24@*loadURL: @WITH_BROWSER@ '%s' +-@GNOME24@*manualCommand: gnome-terminal --title '%s manual' \ ++@GNOME24@*manualCommand: gnome-terminal --window --title '%s manual' \ + @GNOME24@ --command '/bin/sh -c "man %s; read foo"' + ! + ! Gnome 2.2: +-- +2.20.1 + diff --git a/SPECS/xscreensaver.spec b/SPECS/xscreensaver.spec index 6e1f6a0..bb8a2ab 100644 --- a/SPECS/xscreensaver.spec +++ b/SPECS/xscreensaver.spec @@ -1,6 +1,6 @@ %define name xscreensaver -%define mainversion 5.40 +%define mainversion 5.42 %define beta_ver %{nil} @@ -76,6 +76,8 @@ Patch51: xscreensaver-5.12-test-passwd-segv-tty.patch %global PATCH52_desc \ # patch to compile driver/test-xdpms Patch52: xscreensaver-5.12-tests-miscfix.patch +# open new window for man when using gnome-terminal +Patch61: xscreensaver-5.42-0061-open-new-window-for-man-when-using-gnome-terminal.patch # # reset_strip: kill gcc7 -Wint-in-bool-context Patch3603: xscreensaver-5.36-0003-reset_strip-kill-gcc7-Wint-in-bool-context.patch @@ -83,6 +85,8 @@ Patch3603: xscreensaver-5.36-0003-reset_strip-kill-gcc7-Wint-in-bool-conte Patch3604: xscreensaver-5.36-0004-init_crystal-kill-gcc7-Wint-in-bool-context.patch # misc: kill gcc warn_unused_result warnings Patch3607: xscreensaver-5.36-0007-misc-kill-gcc-warn_unused_result-warnings.patch +# fontglide.c: forbit C++ style comment +Patch4201: xscreensaver-5.42-0001-fontglide.c-forbit-C-style-comment.patch # # Debugging patch # Not apply by default @@ -160,8 +164,8 @@ BuildRequires: %{default_text} %endif # For https://fedoraproject.org/wiki/Packaging:Perl#Build_Dependencies # https://fedoraproject.org/wiki/Changes/Build_Root_Without_Perl -#BuildRequires: perl-interpreter -#BuildRequires: perl-generators +BuildRequires: perl-interpreter +BuildRequires: perl-generators # For --with-login-manager option %if 0%{?fedora} >= 14 # Use pseudo symlink, not writing BR: gdm @@ -357,9 +361,12 @@ find . -name \*.c -exec chmod ugo-x {} \; %patch52 -p1 %__git commit -m "%PATCH52_desc" -a +%__cat %PATCH61 | %__git am + %__cat %PATCH3603 | %__git am %__cat %PATCH3604 | %__git am #%%__cat %PATCH3607 | %__git am +%__cat %PATCH4201 | %__git am #%%__cat %PATCH13501 | %%__git am @@ -1046,6 +1053,10 @@ exit 0 %endif %changelog +* Sun Dec 30 2018 Mamoru TASAKA - 1:5.42-1 +- Update to 5.42 +- fontglide.c: forbit C++ style comment + * Wed Aug 15 2018 Mamoru TASAKA - 1:5.40-1 - Update to 5.40