1 |
commit: 97ea70276fcfcdb557a9e7852b238937daa85e7e |
2 |
Author: Alexander Tsoy <alexander <AT> tsoy <DOT> me> |
3 |
AuthorDate: Tue Mar 6 13:55:17 2018 +0000 |
4 |
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Apr 2 17:50:39 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97ea7027 |
7 |
|
8 |
x11-libs/libgksu: fix gksu-run-helper installation path |
9 |
|
10 |
Closes: https://bugs.gentoo.org/640772 |
11 |
Closes: https://github.com/gentoo/gentoo/pull/7321 |
12 |
|
13 |
.../files/libgksu-2.0.12-automake-1.11.2-v2.patch | 26 +++++++ |
14 |
.../libgksu-2.0.12-gksu-run-helper_path.patch | 23 ++++++ |
15 |
x11-libs/libgksu/libgksu-2.0.12-r4.ebuild | 84 ++++++++++++++++++++++ |
16 |
3 files changed, 133 insertions(+) |
17 |
|
18 |
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 |
19 |
new file mode 100644 |
20 |
index 00000000000..c69715af8c3 |
21 |
--- /dev/null |
22 |
+++ b/x11-libs/libgksu/files/libgksu-2.0.12-automake-1.11.2-v2.patch |
23 |
@@ -0,0 +1,26 @@ |
24 |
+Due to the following change, pkglib_PROGRAMS is invalid: |
25 |
+ http://git.savannah.gnu.org/cgit/automake.git/commit/?id=9ca632642b006ac6b0fc4ce0ae5b34023faa8cbf |
26 |
+ |
27 |
+https://savannah.nongnu.org/bugs/index.php?35241 |
28 |
+https://bugs.gentoo.org/397411 |
29 |
+https://bugs.gentoo.org/640772 |
30 |
+ |
31 |
+--- |
32 |
+ libgksu/Makefile.am | 4 ++-- |
33 |
+ 1 files changed, 2 insertions(+), 2 deletions(-) |
34 |
+ |
35 |
+diff --git a/libgksu/Makefile.am b/libgksu/Makefile.am |
36 |
+index 49362f9..3cb1090 100644 |
37 |
+--- a/libgksu/Makefile.am |
38 |
++++ b/libgksu/Makefile.am |
39 |
+@@ -22,8 +22,8 @@ includedir = ${prefix}/include/${PACKAGE} |
40 |
+ pkgconfigdir = ${libdir}/pkgconfig |
41 |
+ pkgconfig_DATA = libgksu2.pc |
42 |
+ |
43 |
+-pkglibdir = ${libdir}/${PACKAGE} |
44 |
+-pkglib_PROGRAMS = gksu-run-helper |
45 |
++pkglibexecdir = ${libexecdir}/${PACKAGE} |
46 |
++pkglibexec_PROGRAMS = gksu-run-helper |
47 |
+ gksu_run_helper_LDADD = ${GLIB_LIBS} |
48 |
+ gksu_run_helper_SOURCES = gksu-run-helper.c |
49 |
+ |
50 |
|
51 |
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 |
52 |
new file mode 100644 |
53 |
index 00000000000..3c6774b1d2f |
54 |
--- /dev/null |
55 |
+++ b/x11-libs/libgksu/files/libgksu-2.0.12-gksu-run-helper_path.patch |
56 |
@@ -0,0 +1,23 @@ |
57 |
+diff -urN libgksu-2.0.12.orig/libgksu/libgksu.c libgksu-2.0.12/libgksu/libgksu.c |
58 |
+--- libgksu-2.0.12.orig/libgksu/libgksu.c 2018-03-06 15:39:34.594733354 +0300 |
59 |
++++ libgksu-2.0.12/libgksu/libgksu.c 2018-03-06 16:03:11.812213290 +0300 |
60 |
+@@ -1937,7 +1937,7 @@ |
61 |
+ GQuark gksu_quark; |
62 |
+ int i = 0; |
63 |
+ |
64 |
+- gchar auxcommand[] = PREFIX "/lib/" PACKAGE "/gksu-run-helper"; |
65 |
++ gchar auxcommand[] = LIBEXECDIR "/" PACKAGE "/gksu-run-helper"; |
66 |
+ |
67 |
+ int fdpty; |
68 |
+ pid_t pid; |
69 |
+diff -urN libgksu-2.0.12.orig/libgksu/Makefile.am libgksu-2.0.12/libgksu/Makefile.am |
70 |
+--- libgksu-2.0.12.orig/libgksu/Makefile.am 2018-03-06 15:39:34.545736138 +0300 |
71 |
++++ libgksu-2.0.12/libgksu/Makefile.am 2018-03-06 16:01:23.700033494 +0300 |
72 |
+@@ -1,6 +1,6 @@ |
73 |
+ AM_CFLAGS = -g -O2 -Wall |
74 |
+ INCLUDES = ${LIBGKSU_CFLAGS} |
75 |
+-AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" -DDATA_DIR=\"$(datadir)\" -DPREFIX=\"$(prefix)\" |
76 |
++AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" -DDATA_DIR=\"$(datadir)\" -DPREFIX=\"$(prefix)\" -DLIBEXECDIR=\"$(libexecdir)\" |
77 |
+ |
78 |
+ lib_LTLIBRARIES = libgksu2.la |
79 |
+ libgksu2_la_SOURCES = libgksu.c libgksu.h |
80 |
|
81 |
diff --git a/x11-libs/libgksu/libgksu-2.0.12-r4.ebuild b/x11-libs/libgksu/libgksu-2.0.12-r4.ebuild |
82 |
new file mode 100644 |
83 |
index 00000000000..2d24958e35d |
84 |
--- /dev/null |
85 |
+++ b/x11-libs/libgksu/libgksu-2.0.12-r4.ebuild |
86 |
@@ -0,0 +1,84 @@ |
87 |
+# Copyright 1999-2017 Gentoo Foundation |
88 |
+# Distributed under the terms of the GNU General Public License v2 |
89 |
+ |
90 |
+EAPI=6 |
91 |
+GNOME2_EAUTORECONF="yes" |
92 |
+ |
93 |
+inherit gnome2 |
94 |
+ |
95 |
+DESCRIPTION="A library for integration of su into applications" |
96 |
+HOMEPAGE="http://www.nongnu.org/gksu/" |
97 |
+SRC_URI="https://people.debian.org/~kov/gksu/${P}.tar.gz" |
98 |
+ |
99 |
+LICENSE="LGPL-2" |
100 |
+SLOT="2" |
101 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" |
102 |
+IUSE="nls static-libs" |
103 |
+ |
104 |
+COMMON_DEPEND=" |
105 |
+ >=x11-libs/gtk+-2.12:2 |
106 |
+ x11-libs/libX11 |
107 |
+ >=gnome-base/gconf-2 |
108 |
+ gnome-base/libgnome-keyring |
109 |
+ x11-libs/startup-notification |
110 |
+ >=gnome-base/libgtop-2:2= |
111 |
+ nls? ( >=sys-devel/gettext-0.14.1 ) |
112 |
+" |
113 |
+DEPEND="${COMMON_DEPEND} |
114 |
+ dev-util/gtk-doc-am |
115 |
+ >=dev-util/intltool-0.35.5 |
116 |
+ virtual/pkgconfig |
117 |
+" |
118 |
+RDEPEND="${COMMON_DEPEND} |
119 |
+ app-admin/sudo |
120 |
+" |
121 |
+ |
122 |
+PATCHES=( |
123 |
+ # Fix compilation on bsd |
124 |
+ "${FILESDIR}"/${PN}-2.0.0-fbsd.patch |
125 |
+ |
126 |
+ # Fix wrong usage of LDFLAGS, bug #226837 |
127 |
+ "${FILESDIR}"/${PN}-2.0.7-libs.patch |
128 |
+ |
129 |
+ # Use po/LINGUAS |
130 |
+ "${FILESDIR}"/${PN}-2.0.7-polinguas.patch |
131 |
+ |
132 |
+ # Don't forkpty; bug #298289 |
133 |
+ "${FILESDIR}"/${P}-revert-forkpty.patch |
134 |
+ |
135 |
+ # Make this gmake-3.82 compliant, bug #333961 |
136 |
+ "${FILESDIR}"/${P}-fix-make-3.82.patch |
137 |
+ |
138 |
+ # Do not build test programs that are never executed; also fixes bug |
139 |
+ # #367397 (underlinking issues). |
140 |
+ "${FILESDIR}"/${P}-notests.patch |
141 |
+ |
142 |
+ # Fix automake-1.11.2 compatibility, bug #397411 |
143 |
+ "${FILESDIR}"/${P}-automake-1.11.2-v2.patch |
144 |
+ "${FILESDIR}"/${P}-missing-libs.patch |
145 |
+ |
146 |
+ # Fix build with format-security, bug #517614 |
147 |
+ "${FILESDIR}"/${P}-format_security.patch |
148 |
+ |
149 |
+ # Fix .desktop file validation, bug #512364 |
150 |
+ "${FILESDIR}"/${P}-desktop-validation.patch |
151 |
+ |
152 |
+ # Collection of patches from Debian |
153 |
+ "${FILESDIR}"/${P}-g_markup_escape_text_for_command.patch |
154 |
+ "${FILESDIR}"/${P}-sudo_keep_env.patch |
155 |
+ "${FILESDIR}"/${P}-correct_colormap_get.patch |
156 |
+ |
157 |
+ # Fix gksu-run-helper path |
158 |
+ "${FILESDIR}"/${P}-gksu-run-helper_path.patch |
159 |
+) |
160 |
+ |
161 |
+src_prepare() { |
162 |
+ sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #467026 |
163 |
+ gnome2_src_prepare |
164 |
+} |
165 |
+ |
166 |
+src_configure() { |
167 |
+ gnome2_src_configure \ |
168 |
+ $(use_enable nls) \ |
169 |
+ $(use_enable static-libs static) |
170 |
+} |