Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Ian Stakenvicius <axs@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libindicator/files/, dev-libs/libindicator/
Date: Sun, 04 Oct 2015 14:32:23
Message-Id: 1443969114.66cb7efcecc1ab67f5b64528ba251805656bcec4.axs@gentoo
1 commit: 66cb7efcecc1ab67f5b64528ba251805656bcec4
2 Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
3 AuthorDate: Sun Oct 4 14:15:57 2015 +0000
4 Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 4 14:31:54 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66cb7efc
7
8 dev-libs/libindicator: add missing whitespace before -lm
9
10 When dev-util/pkgconfig-0.29 is in use, the _LIBS output of a PKG_CHECK*
11 does not have a trailing space assigned. This causes the link flags
12 to contain a "-lglib-2.0-lm" assignment as $LIBM was appended to
13 $LIBINDICATOR_LIBS without any whitespace separation. This commit
14 adds the necessary whitespace. Fixes bug 545334
15
16 .../libindicator/files/libindicator-ldflags-spacing.patch | 11 +++++++++++
17 dev-libs/libindicator/libindicator-12.10.0-r200.ebuild | 7 ++++++-
18 dev-libs/libindicator/libindicator-12.10.0-r300.ebuild | 7 ++++++-
19 dev-libs/libindicator/libindicator-12.10.1-r200.ebuild | 7 ++++++-
20 dev-libs/libindicator/libindicator-12.10.1-r201.ebuild | 7 ++++++-
21 dev-libs/libindicator/libindicator-12.10.1-r300.ebuild | 7 ++++++-
22 dev-libs/libindicator/libindicator-12.10.1-r301.ebuild | 7 ++++++-
23 7 files changed, 47 insertions(+), 6 deletions(-)
24
25 diff --git a/dev-libs/libindicator/files/libindicator-ldflags-spacing.patch b/dev-libs/libindicator/files/libindicator-ldflags-spacing.patch
26 new file mode 100644
27 index 0000000..8c4a55f
28 --- /dev/null
29 +++ b/dev-libs/libindicator/files/libindicator-ldflags-spacing.patch
30 @@ -0,0 +1,11 @@
31 +--- a/configure.ac 2012-07-11 14:07:33.167169453 -0400
32 ++++ b/configure.ac 2015-10-04 09:59:31.023669616 -0400
33 +@@ -66,7 +66,7 @@
34 + AM_CONDITIONAL(USE_GTK3, [test "x$with_gtk" = x3])
35 +
36 + LT_LIB_M
37 +-LIBINDICATOR_LIBS+="$LIBM"
38 ++LIBINDICATOR_LIBS+=" $LIBM"
39 +
40 + ##############################
41 + # Custom Junk
42
43 diff --git a/dev-libs/libindicator/libindicator-12.10.0-r200.ebuild b/dev-libs/libindicator/libindicator-12.10.0-r200.ebuild
44 index 1438177..da93c44 100644
45 --- a/dev-libs/libindicator/libindicator-12.10.0-r200.ebuild
46 +++ b/dev-libs/libindicator/libindicator-12.10.0-r200.ebuild
47 @@ -3,7 +3,7 @@
48 # $Id$
49
50 EAPI=4
51 -inherit eutils flag-o-matic virtualx
52 +inherit autotools eutils flag-o-matic virtualx
53
54 DESCRIPTION="A set of symbols and convience functions that all indicators would like to use"
55 HOMEPAGE="https://launchpad.net/libindicator"
56 @@ -20,6 +20,11 @@ DEPEND="${RDEPEND}
57 virtual/pkgconfig
58 test? ( dev-util/dbus-test-runner )"
59
60 +src_prepare() {
61 + epatch "${FILESDIR}"/${PN}-ldflags-spacing.patch
62 + eautoreconf
63 +}
64 +
65 src_configure() {
66 append-flags -Wno-error
67
68
69 diff --git a/dev-libs/libindicator/libindicator-12.10.0-r300.ebuild b/dev-libs/libindicator/libindicator-12.10.0-r300.ebuild
70 index 2e6134c..d19d3a1 100644
71 --- a/dev-libs/libindicator/libindicator-12.10.0-r300.ebuild
72 +++ b/dev-libs/libindicator/libindicator-12.10.0-r300.ebuild
73 @@ -3,7 +3,7 @@
74 # $Id$
75
76 EAPI=4
77 -inherit eutils flag-o-matic virtualx
78 +inherit autotools eutils flag-o-matic virtualx
79
80 DESCRIPTION="A set of symbols and convience functions that all indicators would like to use"
81 HOMEPAGE="https://launchpad.net/libindicator"
82 @@ -20,6 +20,11 @@ DEPEND="${RDEPEND}
83 virtual/pkgconfig
84 test? ( dev-util/dbus-test-runner )"
85
86 +src_prepare() {
87 + epatch "${FILESDIR}"/${PN}-ldflags-spacing.patch
88 + eautoreconf
89 +}
90 +
91 src_configure() {
92 append-flags -Wno-error
93
94
95 diff --git a/dev-libs/libindicator/libindicator-12.10.1-r200.ebuild b/dev-libs/libindicator/libindicator-12.10.1-r200.ebuild
96 index 8180ac3..ef3c8a5 100644
97 --- a/dev-libs/libindicator/libindicator-12.10.1-r200.ebuild
98 +++ b/dev-libs/libindicator/libindicator-12.10.1-r200.ebuild
99 @@ -3,7 +3,7 @@
100 # $Id$
101
102 EAPI=4
103 -inherit eutils flag-o-matic virtualx
104 +inherit autotools eutils flag-o-matic virtualx
105
106 DESCRIPTION="A set of symbols and convience functions that all indicators would like to use"
107 HOMEPAGE="https://launchpad.net/libindicator"
108 @@ -20,6 +20,11 @@ DEPEND="${RDEPEND}
109 virtual/pkgconfig
110 test? ( dev-util/dbus-test-runner )"
111
112 +src_prepare() {
113 + epatch "${FILESDIR}"/${PN}-ldflags-spacing.patch
114 + eautoreconf
115 +}
116 +
117 src_configure() {
118 append-flags -Wno-error
119
120
121 diff --git a/dev-libs/libindicator/libindicator-12.10.1-r201.ebuild b/dev-libs/libindicator/libindicator-12.10.1-r201.ebuild
122 index a837b39..d9f5a82 100644
123 --- a/dev-libs/libindicator/libindicator-12.10.1-r201.ebuild
124 +++ b/dev-libs/libindicator/libindicator-12.10.1-r201.ebuild
125 @@ -3,7 +3,7 @@
126 # $Id$
127
128 EAPI=5
129 -inherit eutils flag-o-matic virtualx multilib-minimal
130 +inherit autotools eutils flag-o-matic virtualx multilib-minimal
131
132 DESCRIPTION="A set of symbols and convience functions that all indicators would like to use"
133 HOMEPAGE="https://launchpad.net/libindicator"
134 @@ -20,6 +20,11 @@ DEPEND="${RDEPEND}
135 virtual/pkgconfig[${MULTILIB_USEDEP}]
136 test? ( dev-util/dbus-test-runner )"
137
138 +src_prepare() {
139 + epatch "${FILESDIR}"/${PN}-ldflags-spacing.patch
140 + eautoreconf
141 +}
142 +
143 multilib_src_configure() {
144 append-flags -Wno-error
145
146
147 diff --git a/dev-libs/libindicator/libindicator-12.10.1-r300.ebuild b/dev-libs/libindicator/libindicator-12.10.1-r300.ebuild
148 index c0bf1d5..6210182 100644
149 --- a/dev-libs/libindicator/libindicator-12.10.1-r300.ebuild
150 +++ b/dev-libs/libindicator/libindicator-12.10.1-r300.ebuild
151 @@ -3,7 +3,7 @@
152 # $Id$
153
154 EAPI=4
155 -inherit eutils flag-o-matic virtualx
156 +inherit autotools eutils flag-o-matic virtualx
157
158 DESCRIPTION="A set of symbols and convience functions that all indicators would like to use"
159 HOMEPAGE="https://launchpad.net/libindicator"
160 @@ -20,6 +20,11 @@ DEPEND="${RDEPEND}
161 virtual/pkgconfig
162 test? ( dev-util/dbus-test-runner )"
163
164 +src_prepare() {
165 + epatch "${FILESDIR}"/${PN}-ldflags-spacing.patch
166 + eautoreconf
167 +}
168 +
169 src_configure() {
170 append-flags -Wno-error
171
172
173 diff --git a/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild b/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
174 index 4300524..d28de01 100644
175 --- a/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
176 +++ b/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
177 @@ -3,7 +3,7 @@
178 # $Id$
179
180 EAPI=5
181 -inherit eutils flag-o-matic virtualx multilib-minimal
182 +inherit autotools eutils flag-o-matic virtualx multilib-minimal
183
184 DESCRIPTION="A set of symbols and convience functions that all indicators would like to use"
185 HOMEPAGE="https://launchpad.net/libindicator"
186 @@ -20,6 +20,11 @@ DEPEND="${RDEPEND}
187 virtual/pkgconfig[${MULTILIB_USEDEP}]
188 test? ( dev-util/dbus-test-runner )"
189
190 +src_prepare() {
191 + epatch "${FILESDIR}"/${PN}-ldflags-spacing.patch
192 + eautoreconf
193 +}
194 +
195 multilib_src_configure() {
196 append-flags -Wno-error
Report Message
Find on MARC Find on Google Groups