From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B7061138334 for ; Sat, 20 Apr 2019 23:27:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C1071E0960; Sat, 20 Apr 2019 23:20:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A998AE0AB5 for ; Sat, 20 Apr 2019 23:20:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 900AD341DD5 for ; Sat, 20 Apr 2019 01:29:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5D31A5C3 for ; Sat, 20 Apr 2019 01:29:34 +0000 (UTC) From: "Aaron Bauman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Aaron Bauman" Message-ID: <1555723758.e593a105c9f823583a25d6e4066bd6c2345409fb.bman@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/ghostscript-gpl/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/ghostscript-gpl/files/ghostscript-gpl-9.25-no-gtk3.patch X-VCS-Directories: app-text/ghostscript-gpl/files/ X-VCS-Committer: bman X-VCS-Committer-Name: Aaron Bauman X-VCS-Revision: e593a105c9f823583a25d6e4066bd6c2345409fb X-VCS-Branch: master Date: Sat, 20 Apr 2019 01:29:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 708857b4-1690-485a-a522-2ee4cbc35879 X-Archives-Hash: 05191e150ccfe0ca2d2a3cabf96d0b16 commit: e593a105c9f823583a25d6e4066bd6c2345409fb Author: Michael Mair-Keimberger gmail com> AuthorDate: Wed Apr 10 08:51:14 2019 +0000 Commit: Aaron Bauman gentoo org> CommitDate: Sat Apr 20 01:29:18 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e593a105 app-text/ghostscript-gpl: remove unused patch(es) Signed-off-by: Michael Mair-Keimberger gmail.com> Closes: https://github.com/gentoo/gentoo/pull/11648 Signed-off-by: Aaron Bauman gentoo.org> .../files/ghostscript-gpl-9.25-no-gtk3.patch | 43 ---------------------- 1 file changed, 43 deletions(-) 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 deleted file mode 100644 index 34cc2ec88c1..00000000000 --- a/app-text/ghostscript-gpl/files/ghostscript-gpl-9.25-no-gtk3.patch +++ /dev/null @@ -1,43 +0,0 @@ -From a73071b87a61acf1237da5ad9da59bae9316fb8c Mon Sep 17 00:00:00 2001 -From: Chris Liddell -Date: Mon, 8 Oct 2018 09:24:22 +0100 -Subject: [PATCH] Bug 699907: Reinstate GTK+ 2.x.x code. - -The fix (from March 2018) for deprecated API calls in the GTK+ 3.x.x API -didn't account for the new, supported methods not being available in -GTK+ 2.x.x. Handle both cases, as we do elsewhere. ---- - psi/dxmain.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/psi/dxmain.c b/psi/dxmain.c -index 72c060e..250269a 100644 ---- a/psi/dxmain.c -+++ b/psi/dxmain.c -@@ -354,17 +354,23 @@ static void window_resize(IMAGE *img) - #endif - - if (!visible) { -- guint width, height; - /* We haven't yet shown the window, so set a default size - * which is smaller than the desktop to allow room for - * desktop toolbars, and if possible a little larger than - * the image to allow room for the scroll bars. - * We don't know the width of the scroll bars, so just guess. */ -+#if !GTK_CHECK_VERSION(3, 0, 0) -+ gtk_window_set_default_size(GTK_WINDOW(img->window), -+ min(gdk_screen_width()-96, img->width+24), -+ min(gdk_screen_height()-96, img->height+24)); -+#else -+ guint width, height; - width = gtk_widget_get_allocated_width (img->window) - 96; - height = gtk_widget_get_allocated_height (img->window) - 96; - gtk_window_set_default_size(GTK_WINDOW(img->window), - min(width, img->width+24), - min(height, img->height+24)); -+#endif - } - } - --- -2.9.1