1 |
commit: b2bad0a1c4b45c2ca46cfbeed3848d7dc5dcf7fc |
2 |
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Apr 2 16:33:36 2018 +0000 |
4 |
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Apr 2 17:50:40 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2bad0a1 |
7 |
|
8 |
x11-libs/libgksu: merge gksu-run-helper patch in automake 1.11 patch |
9 |
|
10 |
These patches are actually tied together. |
11 |
|
12 |
Package-Manager: Portage-2.3.27, Repoman-2.3.9 |
13 |
|
14 |
.../files/libgksu-2.0.12-automake-1.11.2-v2.patch | 55 ++++++++++++++++++---- |
15 |
.../libgksu-2.0.12-gksu-run-helper_path.patch | 23 --------- |
16 |
x11-libs/libgksu/libgksu-2.0.12-r4.ebuild | 6 +-- |
17 |
3 files changed, 47 insertions(+), 37 deletions(-) |
18 |
|
19 |
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 |
20 |
index c69715af8c3..cd24235a05e 100644 |
21 |
--- a/x11-libs/libgksu/files/libgksu-2.0.12-automake-1.11.2-v2.patch |
22 |
+++ b/x11-libs/libgksu/files/libgksu-2.0.12-automake-1.11.2-v2.patch |
23 |
@@ -1,26 +1,61 @@ |
24 |
-Due to the following change, pkglib_PROGRAMS is invalid: |
25 |
- http://git.savannah.gnu.org/cgit/automake.git/commit/?id=9ca632642b006ac6b0fc4ce0ae5b34023faa8cbf |
26 |
+From 8137cbfa13954b10cf349eb392166c677cb78ff6 Mon Sep 17 00:00:00 2001 |
27 |
+From: Alexander Tsoy <alexander@××××.me> |
28 |
+Date: Mon, 2 Apr 2018 18:27:33 +0200 |
29 |
+Subject: [PATCH] Fix build with automake 1.11+ |
30 |
|
31 |
-https://savannah.nongnu.org/bugs/index.php?35241 |
32 |
-https://bugs.gentoo.org/397411 |
33 |
-https://bugs.gentoo.org/640772 |
34 |
+Initial patch from AlphatPC at gmail dot com. |
35 |
+ |
36 |
+Due to a change in automake [1], pkglib_PROGRAMS is invalid and we must now |
37 |
+use pkglibexec_PROGRAMS. Fix hardcoded location to gksu-run-helper to reflect |
38 |
+this. |
39 |
+ |
40 |
+[1] http://git.savannah.gnu.org/cgit/automake.git/commit/?id=9ca632642b006ac6b0fc4ce0ae5b34023faa8cbf |
41 |
+ |
42 |
+Gentoo-Bug-URL: https://bugs.gentoo.org/397411 |
43 |
+Gentoo-Bug-URL: https://bugs.gentoo.org/640772 |
44 |
+Project-Bug-URL: https://savannah.nongnu.org/bugs/index.php?35241 |
45 |
+Signed-off-by: Gilles Dartiguelongue <eva@g.o> |
46 |
|
47 |
--- |
48 |
- libgksu/Makefile.am | 4 ++-- |
49 |
- 1 files changed, 2 insertions(+), 2 deletions(-) |
50 |
+ libgksu/Makefile.am | 5 ++--- |
51 |
+ libgksu/libgksu.c | 2 +- |
52 |
+ 2 files changed, 3 insertions(+), 4 deletions(-) |
53 |
|
54 |
diff --git a/libgksu/Makefile.am b/libgksu/Makefile.am |
55 |
-index 49362f9..3cb1090 100644 |
56 |
+index 4a37305..3ddde5b 100644 |
57 |
--- a/libgksu/Makefile.am |
58 |
+++ b/libgksu/Makefile.am |
59 |
-@@ -22,8 +22,8 @@ includedir = ${prefix}/include/${PACKAGE} |
60 |
+@@ -1,6 +1,6 @@ |
61 |
+ AM_CFLAGS = -g -O2 -Wall |
62 |
+ INCLUDES = ${LIBGKSU_CFLAGS} |
63 |
+-AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" -DDATA_DIR=\"$(datadir)\" -DPREFIX=\"$(prefix)\" |
64 |
++AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" -DDATA_DIR=\"$(datadir)\" -DPREFIX=\"$(prefix)\" -DLIBEXECDIR=\"$(libexecdir)\" |
65 |
+ |
66 |
+ lib_LTLIBRARIES = libgksu2.la |
67 |
+ libgksu2_la_SOURCES = libgksu.c libgksu.h |
68 |
+@@ -22,8 +22,7 @@ includedir = ${prefix}/include/${PACKAGE} |
69 |
pkgconfigdir = ${libdir}/pkgconfig |
70 |
pkgconfig_DATA = libgksu2.pc |
71 |
|
72 |
-pkglibdir = ${libdir}/${PACKAGE} |
73 |
-pkglib_PROGRAMS = gksu-run-helper |
74 |
-+pkglibexecdir = ${libexecdir}/${PACKAGE} |
75 |
+pkglibexec_PROGRAMS = gksu-run-helper |
76 |
gksu_run_helper_LDADD = ${GLIB_LIBS} |
77 |
gksu_run_helper_SOURCES = gksu-run-helper.c |
78 |
|
79 |
+diff --git a/libgksu/libgksu.c b/libgksu/libgksu.c |
80 |
+index 7203549..612e712 100644 |
81 |
+--- a/libgksu/libgksu.c |
82 |
++++ b/libgksu/libgksu.c |
83 |
+@@ -1937,7 +1937,7 @@ gksu_su_fuller (GksuContext *context, |
84 |
+ GQuark gksu_quark; |
85 |
+ int i = 0; |
86 |
+ |
87 |
+- gchar auxcommand[] = PREFIX "/lib/" PACKAGE "/gksu-run-helper"; |
88 |
++ gchar auxcommand[] = LIBEXECDIR "/" PACKAGE "/gksu-run-helper"; |
89 |
+ |
90 |
+ int fdpty; |
91 |
+ pid_t pid; |
92 |
+-- |
93 |
+2.16.2 |
94 |
+ |
95 |
|
96 |
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 |
97 |
deleted file mode 100644 |
98 |
index 3c6774b1d2f..00000000000 |
99 |
--- a/x11-libs/libgksu/files/libgksu-2.0.12-gksu-run-helper_path.patch |
100 |
+++ /dev/null |
101 |
@@ -1,23 +0,0 @@ |
102 |
-diff -urN libgksu-2.0.12.orig/libgksu/libgksu.c libgksu-2.0.12/libgksu/libgksu.c |
103 |
---- libgksu-2.0.12.orig/libgksu/libgksu.c 2018-03-06 15:39:34.594733354 +0300 |
104 |
-+++ libgksu-2.0.12/libgksu/libgksu.c 2018-03-06 16:03:11.812213290 +0300 |
105 |
-@@ -1937,7 +1937,7 @@ |
106 |
- GQuark gksu_quark; |
107 |
- int i = 0; |
108 |
- |
109 |
-- gchar auxcommand[] = PREFIX "/lib/" PACKAGE "/gksu-run-helper"; |
110 |
-+ gchar auxcommand[] = LIBEXECDIR "/" PACKAGE "/gksu-run-helper"; |
111 |
- |
112 |
- int fdpty; |
113 |
- pid_t pid; |
114 |
-diff -urN libgksu-2.0.12.orig/libgksu/Makefile.am libgksu-2.0.12/libgksu/Makefile.am |
115 |
---- libgksu-2.0.12.orig/libgksu/Makefile.am 2018-03-06 15:39:34.545736138 +0300 |
116 |
-+++ libgksu-2.0.12/libgksu/Makefile.am 2018-03-06 16:01:23.700033494 +0300 |
117 |
-@@ -1,6 +1,6 @@ |
118 |
- AM_CFLAGS = -g -O2 -Wall |
119 |
- INCLUDES = ${LIBGKSU_CFLAGS} |
120 |
--AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" -DDATA_DIR=\"$(datadir)\" -DPREFIX=\"$(prefix)\" |
121 |
-+AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" -DDATA_DIR=\"$(datadir)\" -DPREFIX=\"$(prefix)\" -DLIBEXECDIR=\"$(libexecdir)\" |
122 |
- |
123 |
- lib_LTLIBRARIES = libgksu2.la |
124 |
- libgksu2_la_SOURCES = libgksu.c libgksu.h |
125 |
|
126 |
diff --git a/x11-libs/libgksu/libgksu-2.0.12-r4.ebuild b/x11-libs/libgksu/libgksu-2.0.12-r4.ebuild |
127 |
index 2d24958e35d..d143ddc533c 100644 |
128 |
--- a/x11-libs/libgksu/libgksu-2.0.12-r4.ebuild |
129 |
+++ b/x11-libs/libgksu/libgksu-2.0.12-r4.ebuild |
130 |
@@ -1,4 +1,4 @@ |
131 |
-# Copyright 1999-2017 Gentoo Foundation |
132 |
+# Copyright 1999-2018 Gentoo Foundation |
133 |
# Distributed under the terms of the GNU General Public License v2 |
134 |
|
135 |
EAPI=6 |
136 |
@@ -54,6 +54,7 @@ PATCHES=( |
137 |
"${FILESDIR}"/${P}-notests.patch |
138 |
|
139 |
# Fix automake-1.11.2 compatibility, bug #397411 |
140 |
+ # Fix gksu-run-helper path, bug #640772 |
141 |
"${FILESDIR}"/${P}-automake-1.11.2-v2.patch |
142 |
"${FILESDIR}"/${P}-missing-libs.patch |
143 |
|
144 |
@@ -67,9 +68,6 @@ PATCHES=( |
145 |
"${FILESDIR}"/${P}-g_markup_escape_text_for_command.patch |
146 |
"${FILESDIR}"/${P}-sudo_keep_env.patch |
147 |
"${FILESDIR}"/${P}-correct_colormap_get.patch |
148 |
- |
149 |
- # Fix gksu-run-helper path |
150 |
- "${FILESDIR}"/${P}-gksu-run-helper_path.patch |
151 |
) |
152 |
|
153 |
src_prepare() { |