Gentoo Archives: gentoo-commits

From: Aaron Bauman <bman@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/ghostscript-gpl/files/
Date: Sat, 20 Apr 2019 23:27:11
Message-Id: 1555723758.e593a105c9f823583a25d6e4066bd6c2345409fb.bman@gentoo
1 commit: e593a105c9f823583a25d6e4066bd6c2345409fb
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Wed Apr 10 08:51:14 2019 +0000
4 Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
5 CommitDate: Sat Apr 20 01:29:18 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e593a105
7
8 app-text/ghostscript-gpl: remove unused patch(es)
9
10 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
11 Closes: https://github.com/gentoo/gentoo/pull/11648
12 Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
13
14 .../files/ghostscript-gpl-9.25-no-gtk3.patch | 43 ----------------------
15 1 file changed, 43 deletions(-)
16
17 diff --git a/app-text/ghostscript-gpl/files/ghostscript-gpl-9.25-no-gtk3.patch b/app-text/ghostscript-gpl/files/ghostscript-gpl-9.25-no-gtk3.patch
18 deleted file mode 100644
19 index 34cc2ec88c1..00000000000
20 --- a/app-text/ghostscript-gpl/files/ghostscript-gpl-9.25-no-gtk3.patch
21 +++ /dev/null
22 @@ -1,43 +0,0 @@
23 -From a73071b87a61acf1237da5ad9da59bae9316fb8c Mon Sep 17 00:00:00 2001
24 -From: Chris Liddell <chris.liddell@×××××××.com>
25 -Date: Mon, 8 Oct 2018 09:24:22 +0100
26 -Subject: [PATCH] Bug 699907: Reinstate GTK+ 2.x.x code.
27 -
28 -The fix (from March 2018) for deprecated API calls in the GTK+ 3.x.x API
29 -didn't account for the new, supported methods not being available in
30 -GTK+ 2.x.x. Handle both cases, as we do elsewhere.
31 ----
32 - psi/dxmain.c | 8 +++++++-
33 - 1 file changed, 7 insertions(+), 1 deletion(-)
34 -
35 -diff --git a/psi/dxmain.c b/psi/dxmain.c
36 -index 72c060e..250269a 100644
37 ---- a/psi/dxmain.c
38 -+++ b/psi/dxmain.c
39 -@@ -354,17 +354,23 @@ static void window_resize(IMAGE *img)
40 - #endif
41 -
42 - if (!visible) {
43 -- guint width, height;
44 - /* We haven't yet shown the window, so set a default size
45 - * which is smaller than the desktop to allow room for
46 - * desktop toolbars, and if possible a little larger than
47 - * the image to allow room for the scroll bars.
48 - * We don't know the width of the scroll bars, so just guess. */
49 -+#if !GTK_CHECK_VERSION(3, 0, 0)
50 -+ gtk_window_set_default_size(GTK_WINDOW(img->window),
51 -+ min(gdk_screen_width()-96, img->width+24),
52 -+ min(gdk_screen_height()-96, img->height+24));
53 -+#else
54 -+ guint width, height;
55 - width = gtk_widget_get_allocated_width (img->window) - 96;
56 - height = gtk_widget_get_allocated_height (img->window) - 96;
57 - gtk_window_set_default_size(GTK_WINDOW(img->window),
58 - min(width, img->width+24),
59 - min(height, img->height+24));
60 -+#endif
61 - }
62 - }
63 -
64 ---
65 -2.9.1