x11-libs/libgksu: merge gksu-run-helper patch in automake 1.11 patch

These patches are actually tied together.

Package-Manager: Portage-2.3.27, Repoman-2.3.9

diff --git a/x11-libs/libgksu/files/libgksu-2.0.12-automake-1.11.2-v2.patch b/x11-libs/libgksu/files/libgksu-2.0.12-automake-1.11.2-v2.patch
index c69715af8c390d9c6203a748c6ea789100612c1b..cd24235a05e77494d3d04a4a0552b296fc0d33ac 100644 (file)
--- a/x11-libs/libgksu/files/libgksu-2.0.12-automake-1.11.2-v2.patch
+++ b/x11-libs/libgksu/files/libgksu-2.0.12-automake-1.11.2-v2.patch
@@ -1,26 +1,61 @@
-Due to the following change, pkglib_PROGRAMS is invalid:
-    http://git.savannah.gnu.org/cgit/automake.git/commit/?id=9ca632642b006ac6b0fc4ce0ae5b34023faa8cbf
+From 8137cbfa13954b10cf349eb392166c677cb78ff6 Mon Sep 17 00:00:00 2001
+From: Alexander Tsoy <alexander@tsoy.me>
+Date: Mon, 2 Apr 2018 18:27:33 +0200
+Subject: [PATCH] Fix build with automake 1.11+
 
-https://savannah.nongnu.org/bugs/index.php?35241
-https://bugs.gentoo.org/397411
-https://bugs.gentoo.org/640772
+Initial patch from AlphatPC at gmail dot com.
+
+Due to a change in automake [1], pkglib_PROGRAMS is invalid and we must now
+use pkglibexec_PROGRAMS. Fix hardcoded location to gksu-run-helper to reflect
+this.
+
+[1] http://git.savannah.gnu.org/cgit/automake.git/commit/?id=9ca632642b006ac6b0fc4ce0ae5b34023faa8cbf
+
+Gentoo-Bug-URL: https://bugs.gentoo.org/397411
+Gentoo-Bug-URL: https://bugs.gentoo.org/640772
+Project-Bug-URL: https://savannah.nongnu.org/bugs/index.php?35241
+Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org>
 
 ---
- libgksu/Makefile.am |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ libgksu/Makefile.am | 5 ++---
+ libgksu/libgksu.c   | 2 +-
+ 2 files changed, 3 insertions(+), 4 deletions(-)
 
 diff --git a/libgksu/Makefile.am b/libgksu/Makefile.am
-index 49362f9..3cb1090 100644
+index 4a37305..3ddde5b 100644
 --- a/libgksu/Makefile.am
 +++ b/libgksu/Makefile.am
-@@ -22,8 +22,8 @@ includedir = ${prefix}/include/${PACKAGE}
+@@ -1,6 +1,6 @@
+ AM_CFLAGS = -g -O2 -Wall
+ INCLUDES = ${LIBGKSU_CFLAGS}
+-AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" -DDATA_DIR=\"$(datadir)\" -DPREFIX=\"$(prefix)\"
++AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" -DDATA_DIR=\"$(datadir)\" -DPREFIX=\"$(prefix)\" -DLIBEXECDIR=\"$(libexecdir)\"
+ 
+ lib_LTLIBRARIES = libgksu2.la
+ libgksu2_la_SOURCES = libgksu.c libgksu.h
+@@ -22,8 +22,7 @@ includedir = ${prefix}/include/${PACKAGE}
  pkgconfigdir = ${libdir}/pkgconfig
  pkgconfig_DATA = libgksu2.pc
  
 -pkglibdir = ${libdir}/${PACKAGE}
 -pkglib_PROGRAMS = gksu-run-helper
-+pkglibexecdir = ${libexecdir}/${PACKAGE}
 +pkglibexec_PROGRAMS = gksu-run-helper
  gksu_run_helper_LDADD = ${GLIB_LIBS} 
  gksu_run_helper_SOURCES = gksu-run-helper.c
  
+diff --git a/libgksu/libgksu.c b/libgksu/libgksu.c
+index 7203549..612e712 100644
+--- a/libgksu/libgksu.c
++++ b/libgksu/libgksu.c
+@@ -1937,7 +1937,7 @@ gksu_su_fuller (GksuContext *context,
+   GQuark gksu_quark;
+   int i = 0;
+ 
+-  gchar auxcommand[] = PREFIX "/lib/" PACKAGE "/gksu-run-helper";
++  gchar auxcommand[] = LIBEXECDIR "/" PACKAGE "/gksu-run-helper";
+ 
+   int fdpty;
+   pid_t pid;
+-- 
+2.16.2
+

diff --git a/x11-libs/libgksu/files/libgksu-2.0.12-gksu-run-helper_path.patch b/x11-libs/libgksu/files/libgksu-2.0.12-gksu-run-helper_path.patch
deleted file mode 100644 (file)
index 3c6774b..0000000
--- a/x11-libs/libgksu/files/libgksu-2.0.12-gksu-run-helper_path.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -urN libgksu-2.0.12.orig/libgksu/libgksu.c libgksu-2.0.12/libgksu/libgksu.c
---- libgksu-2.0.12.orig/libgksu/libgksu.c      2018-03-06 15:39:34.594733354 +0300
-+++ libgksu-2.0.12/libgksu/libgksu.c   2018-03-06 16:03:11.812213290 +0300
-@@ -1937,7 +1937,7 @@
-   GQuark gksu_quark;
-   int i = 0;
- 
--  gchar auxcommand[] = PREFIX "/lib/" PACKAGE "/gksu-run-helper";
-+  gchar auxcommand[] = LIBEXECDIR "/" PACKAGE "/gksu-run-helper";
- 
-   int fdpty;
-   pid_t pid;
-diff -urN libgksu-2.0.12.orig/libgksu/Makefile.am libgksu-2.0.12/libgksu/Makefile.am
---- libgksu-2.0.12.orig/libgksu/Makefile.am    2018-03-06 15:39:34.545736138 +0300
-+++ libgksu-2.0.12/libgksu/Makefile.am 2018-03-06 16:01:23.700033494 +0300
-@@ -1,6 +1,6 @@
- AM_CFLAGS = -g -O2 -Wall
- INCLUDES = ${LIBGKSU_CFLAGS}
--AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" -DDATA_DIR=\"$(datadir)\" -DPREFIX=\"$(prefix)\"
-+AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" -DDATA_DIR=\"$(datadir)\" -DPREFIX=\"$(prefix)\" -DLIBEXECDIR=\"$(libexecdir)\"
- 
- lib_LTLIBRARIES = libgksu2.la
- libgksu2_la_SOURCES = libgksu.c libgksu.h

diff --git a/x11-libs/libgksu/libgksu-2.0.12-r4.ebuild b/x11-libs/libgksu/libgksu-2.0.12-r4.ebuild
index 2d24958e35dffcbeebc3129ef12c3d18105fb1bd..d143ddc533c218d6af2710b0748238762673126e 100644 (file)
--- a/x11-libs/libgksu/libgksu-2.0.12-r4.ebuild
+++ b/x11-libs/libgksu/libgksu-2.0.12-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -54,6 +54,7 @@ PATCHES=(
        "${FILESDIR}"/${P}-notests.patch
 
        # Fix automake-1.11.2 compatibility, bug #397411
+       # Fix gksu-run-helper path, bug #640772
        "${FILESDIR}"/${P}-automake-1.11.2-v2.patch
        "${FILESDIR}"/${P}-missing-libs.patch
 
@@ -67,9 +68,6 @@ PATCHES=(
        "${FILESDIR}"/${P}-g_markup_escape_text_for_command.patch
        "${FILESDIR}"/${P}-sudo_keep_env.patch
        "${FILESDIR}"/${P}-correct_colormap_get.patch
-
-       # Fix gksu-run-helper path
-       "${FILESDIR}"/${P}-gksu-run-helper_path.patch
 )
 
 src_prepare() {