diff options
Diffstat (limited to 'x11-libs/libgksu')
| -rw-r--r-- | x11-libs/libgksu/Manifest | 2 | ||||
| -rw-r--r-- | x11-libs/libgksu/files/libgksu-2.0.12-automake-1.11.2-v2.patch | 61 | ||||
| -rw-r--r-- | x11-libs/libgksu/libgksu-2.0.12-r4.ebuild | 82 |
3 files changed, 145 insertions, 0 deletions
diff --git a/x11-libs/libgksu/Manifest b/x11-libs/libgksu/Manifest index efb28230df29..d41f82d41d72 100644 --- a/x11-libs/libgksu/Manifest +++ b/x11-libs/libgksu/Manifest @@ -1,4 +1,5 @@ AUX libgksu-2.0.0-fbsd.patch 2847 BLAKE2B fd7d41e5ff64164bb3954e3ddca9af47477e9bb9dff67c8c5e8649b39b1d372ef50a86b79c2c92f616d786b6585fff36b5ef467ed2cd128ea43981bcc45ae687 SHA512 8c99781e617b7fa96d9ff019a42b362c18f107bf335fbd591c23ac49d9f8ab4ee15a633968a60ba3ae92fe2004f4cdbd4d69b7f7c60c8d5abbd3db90c632c9be +AUX libgksu-2.0.12-automake-1.11.2-v2.patch 2074 BLAKE2B 15cf831d6646de360579efb651238a628c9cede514532c6fe662d050e41e36cfae98179e9b544f7e6a4fa424793626852e18224db0ef1f9521e968a5911630bb SHA512 b7b09e23e2f947b37cdf5f8a299e7f2f7e6f64b387b1b388c36d29d8e44872dc0d44e0457485597e1cb4da6713d45495cf8a4da5b0942b768dc5434cf462ccf4 AUX libgksu-2.0.12-automake-1.11.2.patch 836 BLAKE2B 39737f6783e1b2b08952796cbc7658c44db5e5260d7cb66e0a32be43b564718e93107afdc0f4762ee5463af95af810884849c6df05b38e8dc706493fea5bd1ea SHA512 f4509984cfcd2de42a786cd111c980a985fac21956042a4d68431503f5d2f7fb28850052d876545be538a8bdeaf7a0cd9f7df823ee3011149c6f819e612fec8e AUX libgksu-2.0.12-correct_colormap_get.patch 507 BLAKE2B 11b70cadf9835b7f995e7babaa192dbf53833d592661dc676ec93f41022b94a4194dbb03dd35707087305d59b09f07a65fbc6312e045638bf04d0bc16c2a9d4f SHA512 14da334403bcd48bf0e697eba115e2533cb0dd188ea69535d24401a71e40004c474f0c889d3b1096e2d47880fab9b12bd6c814abbb0bfed80275825f05912bbf AUX libgksu-2.0.12-desktop-validation.patch 507 BLAKE2B 885bae4c59ec44900707be8e4a0e1de2e79133c8617ac815e22019238ab62da17c99578308b49d268ab42da4829775468b7ab802dc71dc6dfbb474b5e603b4ef SHA512 768a6ce966eec9f55f70e87122d557fe861545b120c990835386e17e24b2f3ebab744d5bb945fadb92513f70920cfbb4de6060f76f1a0cdf2e08fbe52cb327a7 @@ -13,4 +14,5 @@ AUX libgksu-2.0.7-libs.patch 3129 BLAKE2B 1ccd6e9fa0dc83c0853375e17c9df1e243b91f AUX libgksu-2.0.7-polinguas.patch 749 BLAKE2B 8b8b675686d23cdfc1b30e0cafcb653c4ae3485413f499172f77396f06b1a4dc7da0ec1b8657d0d7926fc6f674b8bd2b033cb809b2451bc7130e215e4a668fb9 SHA512 9a9488703e28ce048ec1a5844ec386ba969d702e499e70342af44cbdc881ead450d182c0c270a54be42cc4ec7f35f66904a94f221a7446280b8bfe7b3b138103 DIST libgksu-2.0.12.tar.gz 477903 BLAKE2B c4a130b43d1e9acffd740b9160f98ed318f9861db90acaa047fd9c2a162707fdffa86a4b0854b81486f982099f9440ee7d5b8c5ca65122e0cb2872e3a8aa508f SHA512 06935583787c2d63db5ee345efeabd46ce1b2f36ec5c94ba0219d7c27d0935ddbf9987c0368158e57486d541b4a8e75140da53a806061d465985452fd1128573 EBUILD libgksu-2.0.12-r3.ebuild 2029 BLAKE2B fc8def81a770dae2baf3b2def02f5e94aa741798adf2e4b0d4b202598729959e7af0f83df1a76a79038dc616e0c51ba403826fcb25e52aa2f88ce145ea9d94e3 SHA512 db47d0e8a0184976671ff1b616962ccaa5ca37b61b73d7a83bad2badd5f0799d2d3758edab8276e607018edab1708194516e0c4946f17866031afa6d43fdd089 +EBUILD libgksu-2.0.12-r4.ebuild 2081 BLAKE2B 601ad593462289fab04e47259b22a1524896d8d2d25559694d3f29306ed5e852403879a7fcae47446960840cfcedad1236a9dadb0bdffb407afabf3eab5246a4 SHA512 0559ac5132c72bb84427548f922bc70ef2bad19a440b67d4087f031936c0b540161e91d50c0af1d5517e537904d7c5fe0783ca5d99dd06b4392b5f994f793d69 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 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 new file mode 100644 index 000000000000..cd24235a05e7 --- /dev/null +++ b/x11-libs/libgksu/files/libgksu-2.0.12-automake-1.11.2-v2.patch @@ -0,0 +1,61 @@ +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+ + +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 | 5 ++--- + libgksu/libgksu.c | 2 +- + 2 files changed, 3 insertions(+), 4 deletions(-) + +diff --git a/libgksu/Makefile.am b/libgksu/Makefile.am +index 4a37305..3ddde5b 100644 +--- a/libgksu/Makefile.am ++++ b/libgksu/Makefile.am +@@ -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 ++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/libgksu-2.0.12-r4.ebuild b/x11-libs/libgksu/libgksu-2.0.12-r4.ebuild new file mode 100644 index 000000000000..d143ddc533c2 --- /dev/null +++ b/x11-libs/libgksu/libgksu-2.0.12-r4.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME2_EAUTORECONF="yes" + +inherit gnome2 + +DESCRIPTION="A library for integration of su into applications" +HOMEPAGE="http://www.nongnu.org/gksu/" +SRC_URI="https://people.debian.org/~kov/gksu/${P}.tar.gz" + +LICENSE="LGPL-2" +SLOT="2" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="nls static-libs" + +COMMON_DEPEND=" + >=x11-libs/gtk+-2.12:2 + x11-libs/libX11 + >=gnome-base/gconf-2 + gnome-base/libgnome-keyring + x11-libs/startup-notification + >=gnome-base/libgtop-2:2= + nls? ( >=sys-devel/gettext-0.14.1 ) +" +DEPEND="${COMMON_DEPEND} + dev-util/gtk-doc-am + >=dev-util/intltool-0.35.5 + virtual/pkgconfig +" +RDEPEND="${COMMON_DEPEND} + app-admin/sudo +" + +PATCHES=( + # Fix compilation on bsd + "${FILESDIR}"/${PN}-2.0.0-fbsd.patch + + # Fix wrong usage of LDFLAGS, bug #226837 + "${FILESDIR}"/${PN}-2.0.7-libs.patch + + # Use po/LINGUAS + "${FILESDIR}"/${PN}-2.0.7-polinguas.patch + + # Don't forkpty; bug #298289 + "${FILESDIR}"/${P}-revert-forkpty.patch + + # Make this gmake-3.82 compliant, bug #333961 + "${FILESDIR}"/${P}-fix-make-3.82.patch + + # Do not build test programs that are never executed; also fixes bug + # #367397 (underlinking issues). + "${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 + + # Fix build with format-security, bug #517614 + "${FILESDIR}"/${P}-format_security.patch + + # Fix .desktop file validation, bug #512364 + "${FILESDIR}"/${P}-desktop-validation.patch + + # Collection of patches from Debian + "${FILESDIR}"/${P}-g_markup_escape_text_for_command.patch + "${FILESDIR}"/${P}-sudo_keep_env.patch + "${FILESDIR}"/${P}-correct_colormap_get.patch +) + +src_prepare() { + sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #467026 + gnome2_src_prepare +} + +src_configure() { + gnome2_src_configure \ + $(use_enable nls) \ + $(use_enable static-libs static) +} |