* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libindicator/files/, dev-libs/libindicator/
@ 2015-10-04 14:32 Ian Stakenvicius
0 siblings, 0 replies; 2+ messages in thread
From: Ian Stakenvicius @ 2015-10-04 14:32 UTC (permalink / raw
To: gentoo-commits
commit: 66cb7efcecc1ab67f5b64528ba251805656bcec4
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 4 14:15:57 2015 +0000
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Sun Oct 4 14:31:54 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66cb7efc
dev-libs/libindicator: add missing whitespace before -lm
When dev-util/pkgconfig-0.29 is in use, the _LIBS output of a PKG_CHECK*
does not have a trailing space assigned. This causes the link flags
to contain a "-lglib-2.0-lm" assignment as $LIBM was appended to
$LIBINDICATOR_LIBS without any whitespace separation. This commit
adds the necessary whitespace. Fixes bug 545334
.../libindicator/files/libindicator-ldflags-spacing.patch | 11 +++++++++++
dev-libs/libindicator/libindicator-12.10.0-r200.ebuild | 7 ++++++-
dev-libs/libindicator/libindicator-12.10.0-r300.ebuild | 7 ++++++-
dev-libs/libindicator/libindicator-12.10.1-r200.ebuild | 7 ++++++-
dev-libs/libindicator/libindicator-12.10.1-r201.ebuild | 7 ++++++-
dev-libs/libindicator/libindicator-12.10.1-r300.ebuild | 7 ++++++-
dev-libs/libindicator/libindicator-12.10.1-r301.ebuild | 7 ++++++-
7 files changed, 47 insertions(+), 6 deletions(-)
diff --git a/dev-libs/libindicator/files/libindicator-ldflags-spacing.patch b/dev-libs/libindicator/files/libindicator-ldflags-spacing.patch
new file mode 100644
index 0000000..8c4a55f
--- /dev/null
+++ b/dev-libs/libindicator/files/libindicator-ldflags-spacing.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac 2012-07-11 14:07:33.167169453 -0400
++++ b/configure.ac 2015-10-04 09:59:31.023669616 -0400
+@@ -66,7 +66,7 @@
+ AM_CONDITIONAL(USE_GTK3, [test "x$with_gtk" = x3])
+
+ LT_LIB_M
+-LIBINDICATOR_LIBS+="$LIBM"
++LIBINDICATOR_LIBS+=" $LIBM"
+
+ ##############################
+ # Custom Junk
diff --git a/dev-libs/libindicator/libindicator-12.10.0-r200.ebuild b/dev-libs/libindicator/libindicator-12.10.0-r200.ebuild
index 1438177..da93c44 100644
--- a/dev-libs/libindicator/libindicator-12.10.0-r200.ebuild
+++ b/dev-libs/libindicator/libindicator-12.10.0-r200.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI=4
-inherit eutils flag-o-matic virtualx
+inherit autotools eutils flag-o-matic virtualx
DESCRIPTION="A set of symbols and convience functions that all indicators would like to use"
HOMEPAGE="https://launchpad.net/libindicator"
@@ -20,6 +20,11 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
test? ( dev-util/dbus-test-runner )"
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-ldflags-spacing.patch
+ eautoreconf
+}
+
src_configure() {
append-flags -Wno-error
diff --git a/dev-libs/libindicator/libindicator-12.10.0-r300.ebuild b/dev-libs/libindicator/libindicator-12.10.0-r300.ebuild
index 2e6134c..d19d3a1 100644
--- a/dev-libs/libindicator/libindicator-12.10.0-r300.ebuild
+++ b/dev-libs/libindicator/libindicator-12.10.0-r300.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI=4
-inherit eutils flag-o-matic virtualx
+inherit autotools eutils flag-o-matic virtualx
DESCRIPTION="A set of symbols and convience functions that all indicators would like to use"
HOMEPAGE="https://launchpad.net/libindicator"
@@ -20,6 +20,11 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
test? ( dev-util/dbus-test-runner )"
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-ldflags-spacing.patch
+ eautoreconf
+}
+
src_configure() {
append-flags -Wno-error
diff --git a/dev-libs/libindicator/libindicator-12.10.1-r200.ebuild b/dev-libs/libindicator/libindicator-12.10.1-r200.ebuild
index 8180ac3..ef3c8a5 100644
--- a/dev-libs/libindicator/libindicator-12.10.1-r200.ebuild
+++ b/dev-libs/libindicator/libindicator-12.10.1-r200.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI=4
-inherit eutils flag-o-matic virtualx
+inherit autotools eutils flag-o-matic virtualx
DESCRIPTION="A set of symbols and convience functions that all indicators would like to use"
HOMEPAGE="https://launchpad.net/libindicator"
@@ -20,6 +20,11 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
test? ( dev-util/dbus-test-runner )"
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-ldflags-spacing.patch
+ eautoreconf
+}
+
src_configure() {
append-flags -Wno-error
diff --git a/dev-libs/libindicator/libindicator-12.10.1-r201.ebuild b/dev-libs/libindicator/libindicator-12.10.1-r201.ebuild
index a837b39..d9f5a82 100644
--- a/dev-libs/libindicator/libindicator-12.10.1-r201.ebuild
+++ b/dev-libs/libindicator/libindicator-12.10.1-r201.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI=5
-inherit eutils flag-o-matic virtualx multilib-minimal
+inherit autotools eutils flag-o-matic virtualx multilib-minimal
DESCRIPTION="A set of symbols and convience functions that all indicators would like to use"
HOMEPAGE="https://launchpad.net/libindicator"
@@ -20,6 +20,11 @@ DEPEND="${RDEPEND}
virtual/pkgconfig[${MULTILIB_USEDEP}]
test? ( dev-util/dbus-test-runner )"
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-ldflags-spacing.patch
+ eautoreconf
+}
+
multilib_src_configure() {
append-flags -Wno-error
diff --git a/dev-libs/libindicator/libindicator-12.10.1-r300.ebuild b/dev-libs/libindicator/libindicator-12.10.1-r300.ebuild
index c0bf1d5..6210182 100644
--- a/dev-libs/libindicator/libindicator-12.10.1-r300.ebuild
+++ b/dev-libs/libindicator/libindicator-12.10.1-r300.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI=4
-inherit eutils flag-o-matic virtualx
+inherit autotools eutils flag-o-matic virtualx
DESCRIPTION="A set of symbols and convience functions that all indicators would like to use"
HOMEPAGE="https://launchpad.net/libindicator"
@@ -20,6 +20,11 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
test? ( dev-util/dbus-test-runner )"
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-ldflags-spacing.patch
+ eautoreconf
+}
+
src_configure() {
append-flags -Wno-error
diff --git a/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild b/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
index 4300524..d28de01 100644
--- a/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
+++ b/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI=5
-inherit eutils flag-o-matic virtualx multilib-minimal
+inherit autotools eutils flag-o-matic virtualx multilib-minimal
DESCRIPTION="A set of symbols and convience functions that all indicators would like to use"
HOMEPAGE="https://launchpad.net/libindicator"
@@ -20,6 +20,11 @@ DEPEND="${RDEPEND}
virtual/pkgconfig[${MULTILIB_USEDEP}]
test? ( dev-util/dbus-test-runner )"
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-ldflags-spacing.patch
+ eautoreconf
+}
+
multilib_src_configure() {
append-flags -Wno-error
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libindicator/files/, dev-libs/libindicator/
@ 2021-03-19 2:50 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2021-03-19 2:50 UTC (permalink / raw
To: gentoo-commits
commit: 1e1a804922b8518f578619116c9084a08b24844d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 19 02:50:26 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 19 02:50:26 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e1a8049
dev-libs/libindicator: fix nonbash for both slots
Bug: https://bugs.gentoo.org/776670
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/libindicator-12.10.1-nonbash.patch | 23 ++++++++++++++++++++++
.../libindicator/libindicator-12.10.1-r201.ebuild | 4 +++-
.../libindicator/libindicator-12.10.1-r301.ebuild | 2 +-
3 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/dev-libs/libindicator/files/libindicator-12.10.1-nonbash.patch b/dev-libs/libindicator/files/libindicator-12.10.1-nonbash.patch
new file mode 100644
index 00000000000..eac1e73aa28
--- /dev/null
+++ b/dev-libs/libindicator/files/libindicator-12.10.1-nonbash.patch
@@ -0,0 +1,23 @@
+https://bugs.gentoo.org/777087
+https://bugs.launchpad.net/libindicator/+bug/1502925
+Thanks-to: orbea <orbea@riseup.net>
+--- a/configure.ac
++++ b/configure.ac
+@@ -15,7 +15,7 @@ AM_INIT_AUTOMAKE([1.11 -Wall tar-pax])
+
+ AM_MAINTAINER_MODE([enable])
+
+-AM_SILENT_RULES([yes])]
++AM_SILENT_RULES([yes])
+
+ # Check for programs
+ AC_PROG_CC
+@@ -66,7 +66,7 @@ AS_IF([test "x$with_gtk" = x3],
+ AM_CONDITIONAL(USE_GTK3, [test "x$with_gtk" = x3])
+
+ LT_LIB_M
+-LIBINDICATOR_LIBS+="$LIBM"
++LIBINDICATOR_LIBS="${LIBINDICATOR_LIBS} $LIBM"
+
+ ##############################
+ # Custom Junk
diff --git a/dev-libs/libindicator/libindicator-12.10.1-r201.ebuild b/dev-libs/libindicator/libindicator-12.10.1-r201.ebuild
index f470b6ff84b..3b0aa709944 100644
--- a/dev-libs/libindicator/libindicator-12.10.1-r201.ebuild
+++ b/dev-libs/libindicator/libindicator-12.10.1-r201.ebuild
@@ -27,9 +27,11 @@ BDEPEND="
"
PATCHES=(
- "${FILESDIR}"/${PN}-ldflags-spacing.patch
+ # Fixed version of https://bugs.launchpad.net/libindicator/+bug/1502925
+ "${FILESDIR}"/${PN}-12.10.1-nonbash.patch
)
+
src_prepare() {
default
diff --git a/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild b/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
index 18d09e5d511..12baf401ad2 100644
--- a/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
+++ b/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
@@ -27,7 +27,7 @@ BDEPEND="
PATCHES=(
# Fixed version of https://bugs.launchpad.net/libindicator/+bug/1502925
- "${FILESDIR}"/${PN}-12.10.1-r301-nonbash.patch
+ "${FILESDIR}"/${PN}-12.10.1-nonbash.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-03-19 2:50 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-03-19 2:50 [gentoo-commits] repo/gentoo:master commit in: dev-libs/libindicator/files/, dev-libs/libindicator/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2015-10-04 14:32 Ian Stakenvicius
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox