Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 538474 | Differences between
and this patch

Collapse All | Expand All

(-)a/dev-libs/libgamin/ChangeLog (+232 lines)
Line 0 Link Here
1
# ChangeLog for dev-libs/libgamin
2
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
3
# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgamin/ChangeLog,v 1.62 2014/12/06 16:40:07 ago Exp $
4
5
  06 Dec 2014; Agostino Sarubbo <ago@gentoo.org> libgamin-0.1.10-r5.ebuild:
6
  Stable for ia64, wrt bug #529418
7
8
  04 Dec 2014; Agostino Sarubbo <ago@gentoo.org> libgamin-0.1.10-r5.ebuild:
9
  Stable for ppc64, wrt bug #529418
10
11
  03 Dec 2014; Agostino Sarubbo <ago@gentoo.org> libgamin-0.1.10-r5.ebuild:
12
  Stable for ppc, wrt bug #529418
13
14
  02 Dec 2014; Pacho Ramos <pacho@gentoo.org> -libgamin-0.1.10-r2.ebuild,
15
  -libgamin-0.1.10-r3.ebuild:
16
  Drop old
17
18
  02 Dec 2014; Pacho Ramos <pacho@gentoo.org> libgamin-0.1.10-r5.ebuild:
19
  x86 stable, bug #529418
20
21
  02 Dec 2014; Agostino Sarubbo <ago@gentoo.org> libgamin-0.1.10-r5.ebuild:
22
  Stable for alpha, wrt bug #529418
23
24
  01 Dec 2014; Agostino Sarubbo <ago@gentoo.org> libgamin-0.1.10-r5.ebuild:
25
  Stable for sparc, wrt bug #529418
26
27
  26 Nov 2014; Agostino Sarubbo <ago@gentoo.org> libgamin-0.1.10-r5.ebuild:
28
  Stable for amd64, wrt bug #529418
29
30
  19 Nov 2014; Markus Meier <maekke@gentoo.org> libgamin-0.1.10-r5.ebuild:
31
  arm stable, bug #529418
32
33
  19 Nov 2014; Jeroen Roovers <jer@gentoo.org> libgamin-0.1.10-r5.ebuild:
34
  Stable for HPPA (bug #529418).
35
36
  28 Apr 2014; Michał Górny <mgorny@gentoo.org> libgamin-0.1.10-r5.ebuild:
37
  Replace multilib_build_binaries with multilib_is_native_abi. The two are
38
  equivalent now, and the team has decided to use the old name as being less
39
  confusing.
40
41
  12 Apr 2014; Samuli Suominen <ssuominen@gentoo.org> libgamin-0.1.10-r5.ebuild:
42
  Use the tarball of latest pkg-config version to get pkg.m4
43
44
*libgamin-0.1.10-r5 (12 Apr 2014)
45
46
  12 Apr 2014; Michał Górny <mgorny@gentoo.org> +libgamin-0.1.10-r5.ebuild:
47
  Convert to python-r1. Fix typo in multilib phases.
48
49
  18 Jan 2014; Agostino Sarubbo <ago@gentoo.org> libgamin-0.1.10-r4.ebuild:
50
  Stable for alpha, wrt bug #492040
51
52
  15 Jan 2014; Agostino Sarubbo <ago@gentoo.org> libgamin-0.1.10-r4.ebuild:
53
  Stable for ia64, wrt bug #492040
54
55
  23 Dec 2013; Agostino Sarubbo <ago@gentoo.org> libgamin-0.1.10-r4.ebuild:
56
  Stable for sparc, wrt bug #492040
57
58
  23 Dec 2013; Agostino Sarubbo <ago@gentoo.org> libgamin-0.1.10-r4.ebuild:
59
  Stable for ppc, wrt bug #492040
60
61
  22 Dec 2013; Agostino Sarubbo <ago@gentoo.org> libgamin-0.1.10-r4.ebuild:
62
  Stable for ppc64, wrt bug #492040
63
64
  08 Dec 2013; Pacho Ramos <pacho@gentoo.org> libgamin-0.1.10-r4.ebuild:
65
  x86 stable, bug #492040
66
67
  01 Dec 2013; Markus Meier <maekke@gentoo.org> libgamin-0.1.10-r4.ebuild:
68
  arm stable, bug #492040
69
70
  26 Nov 2013; Jeroen Roovers <jer@gentoo.org> libgamin-0.1.10-r4.ebuild:
71
  Stable for HPPA (bug #492040).
72
73
  24 Nov 2013; Pacho Ramos <pacho@gentoo.org> libgamin-0.1.10-r4.ebuild:
74
  amd64 stable, bug #492040
75
76
*libgamin-0.1.10-r4 (08 Aug 2013)
77
78
  08 Aug 2013; Alexis Ballier <aballier@gentoo.org> +libgamin-0.1.10-r4.ebuild:
79
  Convert to multilib, bug #479320
80
81
  28 Apr 2013; Samuli Suominen <ssuominen@gentoo.org>
82
  libgamin-0.1.10-r3.ebuild:
83
  Fix automake-1.13 compability wrt #466962 by Alphat-PC
84
85
  30 Sep 2012; Raúl Porcel <armin76@gentoo.org> libgamin-0.1.10-r3.ebuild:
86
  alpha/ia64/m68k/s390/sh/sparc stable wrt #433227
87
88
  22 Sep 2012; Anthony G. Basile <blueness@gentoo.org>
89
  libgamin-0.1.10-r3.ebuild:
90
  stable ppc ppc64, bug #433227
91
92
  19 Sep 2012; Jeroen Roovers <jer@gentoo.org> libgamin-0.1.10-r3.ebuild:
93
  Stable for HPPA (bug #433227).
94
95
  17 Sep 2012; Johannes Huber <johu@gentoo.org> libgamin-0.1.10-r3.ebuild:
96
  Stable for x86, wrt bug #433227
97
98
  16 Sep 2012; Markus Meier <maekke@gentoo.org> libgamin-0.1.10-r3.ebuild:
99
  arm stable, bug #433227
100
101
  13 Sep 2012; Agostino Sarubbo <ago@gentoo.org> libgamin-0.1.10-r3.ebuild:
102
  Stable for amd64, wrt bug #433227
103
104
*libgamin-0.1.10-r3 (08 Jul 2012)
105
106
  08 Jul 2012; Pacho Ramos <pacho@gentoo.org>
107
  +files/libgamin-0.1.10-deadlock.patch, +libgamin-0.1.10-r3.ebuild:
108
  Fix deadlock, bug #420353 by Michael Boone.
109
110
  30 Apr 2012; Fabian Groffen <grobian@gentoo.org> libgamin-0.1.10-r2.ebuild:
111
  Fix for Prefix, add (Open)Solaris patch, bug #413415
112
113
  26 Apr 2012; Alexis Ballier <aballier@gentoo.org> libgamin-0.1.10-r2.ebuild:
114
  keyword ~amd64-fbsd
115
116
  22 Feb 2012; Patrick Lauer <patrick@gentoo.org> libgamin-0.1.10-r2.ebuild:
117
  Restricting jython
118
119
  03 Jan 2012; Samuli Suominen <ssuominen@gentoo.org>
120
  libgamin-0.1.10-r2.ebuild:
121
  Empty py-compile script instead of symlinking it wrt #397487 by Billy
122
  DeVincentis
123
124
  25 Sep 2011; Pacho Ramos <pacho@gentoo.org> libgamin-0.1.10-r2.ebuild,
125
  +files/libgamin-0.1.10-G_CONST_RETURN-removal.patch,
126
  +files/libgamin-0.1.10-armel-features.patch,
127
  +files/libgamin-0.1.10-crosscompile-fix.patch:
128
  Fix compilation with latest glib, bug #382783 by Maciej Piechotka; fix
129
  crosscompilation issues, bug #267604 by Andrei Slavoiu; enable linux specific
130
  features on armel, upstream bug #588338; drop DG_DISABLE_DEPRECATED; don't
131
  try to even check for python, simplifying ebuild for people running python3
132
  as main interpreter; use gnome.org eclass to set SRC_URI and use bz2 tarball
133
  instead of gz.
134
135
  11 Jul 2011; Samuli Suominen <ssuominen@gentoo.org>
136
  libgamin-0.1.10-r2.ebuild:
137
  Stop depending on dev-util/pkgconfig wrt #374775 by dragos240. USE="static-libs"
138
  and remove libtool archive.
139
140
  16 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
141
  libgamin-0.1.10-r2.ebuild,
142
  +files/libgamin-0.1.10-disable_python_static_library.patch:
143
  Set SUPPORT_PYTHON_ABIS, don't build static version of Python module (bug #312187).
144
145
  25 Sep 2009; Diego E. Pettenò <flameeyes@gentoo.org>
146
  -files/gamin-0.1.9-freebsd.patch, libgamin-0.1.10-r1.ebuild,
147
  libgamin-0.1.10-r2.ebuild:
148
  Move the freebsd patch to the mirrors.
149
150
  30 Jun 2009; Jeroen Roovers <jer@gentoo.org> libgamin-0.1.10-r2.ebuild:
151
  Stable for HPPA too.
152
153
  28 Apr 2009; Raúl Porcel <armin76@gentoo.org> libgamin-0.1.10-r2.ebuild:
154
  m68k stable
155
156
  12 Apr 2009; Friedrich Oslage <bluebird@gentoo.org>
157
  libgamin-0.1.10-r2.ebuild:
158
  Stable on sparc, bug #260063
159
160
  30 Mar 2009; Raúl Porcel <armin76@gentoo.org> libgamin-0.1.10-r2.ebuild:
161
  arm/s390/sh/sparc stable
162
163
  18 Mar 2009; Raúl Porcel <armin76@gentoo.org> libgamin-0.1.10-r2.ebuild:
164
  alpha/ia64 stable wrt #260063
165
166
  15 Mar 2009; Markus Meier <maekke@gentoo.org> libgamin-0.1.10-r2.ebuild:
167
  x86 stable, bug #260063
168
169
  11 Mar 2009; Daniel Gryniewicz <dang@gentoo.org>
170
  libgamin-0.1.10-r2.ebuild:
171
  Marked stable on amd64
172
173
  06 Mar 2009; Brent Baude <ranger@gentoo.org> libgamin-0.1.10-r2.ebuild:
174
  Marking libgamin-0.1.10-r2 ppc stable for bug 260063
175
176
  05 Mar 2009; Brent Baude <ranger@gentoo.org> libgamin-0.1.10-r2.ebuild:
177
  Marking libgamin-0.1.10-r2 ppc64 stable for bug 260063
178
179
*libgamin-0.1.10-r2 (15 Feb 2009)
180
181
  15 Feb 2009; Gilles Dartiguelongue <eva@gentoo.org>
182
  +files/libgamin-0.1.10-compilewarnings.patch, +libgamin-0.1.10-r2.ebuild:
183
  Fix QA warnings: poor programming practices, bug #257281
184
185
  07 Feb 2009; Jeroen Roovers <jer@gentoo.org> libgamin-0.1.10-r1.ebuild:
186
  Stable for HPPA (bug #252350).
187
188
  06 Feb 2009; Raúl Porcel <armin76@gentoo.org> libgamin-0.1.10-r1.ebuild:
189
  arm/ia64/s390/sh stable wrt #252350
190
191
  04 Feb 2009; Christoph Mende <angelos@gentoo.org> metadata.xml:
192
  Changed gnome/kde/xfce to freedesktop
193
194
  31 Jan 2009; Gilles Dartiguelongue <eva@gentoo.org>
195
  -libgamin-0.1.10.ebuild, libgamin-0.1.10-r1.ebuild:
196
  Add blocker for app-admin/fam, bug #254658.
197
198
  25 Jan 2009; Tobias Klausmann <klausman@gentoo.org>
199
  libgamin-0.1.10-r1.ebuild:
200
  Stable on alpha, bug #252350
201
202
  20 Jan 2009; Tiago Cunha <tcunha@gentoo.org> libgamin-0.1.10-r1.ebuild:
203
  stable sparc, bug 252350
204
205
  10 Jan 2009; Markus Meier <maekke@gentoo.org> libgamin-0.1.10-r1.ebuild:
206
  amd64/x86 stable, bug #252350
207
208
  06 Jan 2009; Brent Baude <ranger@gentoo.org> libgamin-0.1.10-r1.ebuild:
209
  Marking libgamin-0.1.10-r1 ppc64 and ppc for bug 252350
210
211
  06 Jan 2009; Brent Baude <ranger@gentoo.org> libgamin-0.1.10.ebuild:
212
  Marking libgamin-0.1.10 ppc64 and ppc for bug 252350
213
214
  05 Jan 2009; Markus Meier <maekke@gentoo.org> libgamin-0.1.10.ebuild:
215
  amd64/x86 stable, bug #252350
216
217
  29 Dec 2008; Friedrich Oslage <bluebird@gentoo.org>
218
  libgamin-0.1.10.ebuild:
219
  Stable on sparc, bug #252350
220
221
*libgamin-0.1.10-r1 (25 Nov 2008)
222
223
  25 Nov 2008; Rémi Cardona <remi@gentoo.org> +libgamin-0.1.10-r1.ebuild:
224
  fix python installation (see bug #248737)
225
226
*libgamin-0.1.10 (24 Nov 2008)
227
228
  24 Nov 2008; Gilles Dartiguelongue <eva@gentoo.org>
229
  +files/gamin-0.1.9-freebsd.patch, +files/libgamin-0.1.10-noinst-lib.patch,
230
  +libgamin-0.1.10.ebuild, +metadata.xml:
231
  New ebuild split off gamin. Initial ebuild inspired by Pacho Ramos, closes
232
  bug #217861.
(-)a/dev-libs/libgamin/Manifest (+15 lines)
Line 0 Link Here
1
AUX libgamin-0.1.10-G_CONST_RETURN-removal.patch 2470 SHA256 adddd1f54bb33669d9163398308ebb732f33b6c12b1363a0dcf765ff28fc30ad SHA512 56cf8439d64c3856cc768a0d6aa67e00e82579b0db60b1f25b195024eec1628f61013718f3139910735eafa15e05f4fabe4373ebac053778abb1c89201c6cf0c WHIRLPOOL 425495ec6bb9cc5993631b9c5ef24d33261f71e9a039120a373235bae3cb386b8a938cd06714a6fba57a2378f868d372b063efc325bc98faa43b3c136c4d00b1
2
AUX libgamin-0.1.10-armel-features.patch 1490 SHA256 6b6faf3084ca2ddf577575395172901d637a96e5db8dd42bc5268d58a767d30e SHA512 fe6365489428ca9206a36b8dea495d5c4beb381fe43dd49aa2fa022f8ea34d8068275ce42f41211ef7ce8bb2c1dce952673d4b2e72eec5be00161fa8f8bcb2a5 WHIRLPOOL 935fde8a3683a1cb9f7f44307fe136a7f8251982501e54209625bee681d8ef23cfbf27d5f8b127da200a800c778b91013124ddd8caf970810c018d7f44dc356a
3
AUX libgamin-0.1.10-compilewarnings.patch 526 SHA256 dfca2bee08ba14c873a6bcd732359dd7e3a9372d6d9fb82378194d7a73a30e68 SHA512 f413fbd5db1e0412d1fabe6b46e049d347735cf6db7a7ca1eecc9ede1b299a7e622be3c508df40990159e05470d285069a0fa4e2cfcf6fd80378d0aa2b69fd0f WHIRLPOOL ae2277d225551e1b7bbaa897b675b51e561b8e3f71a2456dafea4d7cf697437534aedf286ae9399e8445aca83c02dedd5ce2ac3d9c085293210e3c0bf9af2dea
4
AUX libgamin-0.1.10-crosscompile-fix.patch 764 SHA256 27e92227c19a6ae61336f66cefe7d44fca43fe7e0c8122fe32c313b4d848f28c SHA512 11aca975f98d9364bfdd8e28162f922a96493012fb3c6c704115d33155b2a2e9bbd20aba64354db922f16c3589b88a07091590a5bd6aa806582b9b7875ba8e23 WHIRLPOOL 61c2c95cd7874eb106fcb1e474a10e21ce79d0c10220520810d904e4dac106ccfe12a09782d0ea7cb42c7369a1226fca9b7f4d826e5f62140713ea6a8ac967c2
5
AUX libgamin-0.1.10-deadlock.patch 2090 SHA256 75cee6cb0210cec02be1e042454f561da20724c55810f968b0a5f4972f9cbfd5 SHA512 c0a4a318eb78b9666930e9d1a6fac5e7762f38796e5892d849c893df524310408020ea75fb02a4d79000be3440435ae640340cf2a3dd43fa031df5787762f8de WHIRLPOOL 9d5b26134ccd1e13c25f5bfe3295bdec7c1a8cdd73f21b1cb65ff50dc910e533c3ac5b28508cb7f93a15096e365aa25cdaf9f32d8d76cadf435215b8aebdb090
6
AUX libgamin-0.1.10-disable_python_static_library.patch 340 SHA256 460306119bc6be6fd19d173eadfa28493fc72e90fceaf3ee49b50fee50a4f5d1 SHA512 8d11f4b891bfc9e1aa6ba99aa485279b29c0a0f154742349035032c5122ae6ef29da5e5f0482791a7b1f7bceebd2bc871f14c3eb96f1947ad791b8036e488b00 WHIRLPOOL 59fb95c4acb5f14897f274d1ad72bf0ddd67a0e905f4098894e2d56767c3930a99b4a459c0bcab607917b0305dab1ca516c8158ce9700c6de88648995e688be1
7
AUX libgamin-0.1.10-fix-pthread-mutex.patch 417 SHA256 bfd5ee42e385367718a4dac8ab318f9a5881ab8b669e4020f87aacaef16a2f8e SHA512 70628fc39521ea8bc4a40b009d0881f6ee540334a31b2f0cb67dde0f75808c69feb78088ad24c3c4a0dec9fa59e87960fd81d1a2e56963ce9268d0a5e14f88e8 WHIRLPOOL e2268fe0e7ee84d4b5656ff392717c1888e6438a24132ccc701a9a3b19ad1717409df7ccc2945cdd350ce79630e3debc4b28da5d857323a128f8ad0892d8f4bb
8
AUX libgamin-0.1.10-noinst-lib.patch 2207 SHA256 e19ede71d259fbe5888c06635441365a48687034b24c5f15edd808a7cbd9cdc7 SHA512 ba7ce391f4da1a6b4c75941b8440a72f483b6f2597592f64ddca720bf46b1269e64a20a27da9c35b134100a121990d84e28ac737cffef48e90974a017ba3a4cb WHIRLPOOL d3605973df5f148d03d65a6660925dd2c1bca5bda9574714fb3259f630341cdeb3d5d7c73986fa0a6eacb0f34c584eb25c8f6ed431d1b95df21a974241678124
9
DIST gamin-0.1.10.tar.bz2 452194 SHA256 a59948b20ce2f14136c013f155abb8c8d51db2ea167c063ff33461e453fec10a SHA512 ccdbc06eeb958ed2d888aee3fcadbadf00e9e6566802adee82035e0762ac3351ed2a2983eabe07503ddde2ddf035185c6cd98cbece2feadaaa36e8f656a38306 WHIRLPOOL 49ca0e192d8f5e28d6ffbb201b98b0f2c736554447b37c50eaa6e76e499ab77d696cf585c96c6a38f94c2589c634e694daf2e4969ffddbbb245b07b8a6e7b2d8
10
DIST gamin-0.1.9-freebsd.patch.bz2 4635 SHA256 fcd1a6655d1c7cd86db6102931a4da1c22bc85f1c4692959c1a966fec5231723 SHA512 a9d9a8e4d85b289df6f87bf2b966ff262281db0d7e6094deb4f2c179f12c6cc3e387c1e1c28306a9fb54f2eb2837f9bdd3a34b2bb68db8abfdbecc7492e9730b WHIRLPOOL 462173a33e8f804b71c6991aa5925a5c9a6ee83f80b13967369c5c45721069e629c052e5daebfc3fb03bbad4d3054b523afb6e430db997581f3ff942f7da3180
11
DIST libgamin-0.1.10-opensolaris.patch.bz2 16955 SHA256 9cb1bde5a34888ce4de4c4894c7d31dbfdbfb3279007b9eddf2da35510f6a9b5 SHA512 fd1cfc5a6b5ba429622f8d426cfba0e3c1c05c3677fb58c53af39b4030ae56f3f71caf63eb5ecb16169c2f7e8c79a32d7d440857c2c7fd3a259cf8312a9b2004 WHIRLPOOL 3efbf3781a55f44f383e573db4a3b3df731e9f77608d73db4ff3027eae0bda6abb6eae022c094735c0d8d2a85e224a980436d8557f9350bb1558b40d99280701
12
DIST pkg-config-0.28.tar.gz 1931203 SHA256 6b6eb31c6ec4421174578652c7e141fdaae2dabad1021f420d8713206ac1f845 SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320 WHIRLPOOL db4ddb4ce61724e629931c5ffccb4d7a551b4dc0f4efed5a966822307e4b5a786adee5705dd80ec0a9aa32cb1af9ad9615e307360e131fc34688207216161486
13
EBUILD libgamin-0.1.10-r99.ebuild 4061 SHA256 4a309ff64993ee78ef757487a6c2eeb9b23201744b1db70906eaf7279889b4c4 SHA512 34fea1f9327fd1b75e6d0c123d75801d6d0f0963c7ddfc057c780fc4e9682c5ba5aee5ee80c71cecd1504d6c1cd76e1bf1efb5e8244d267e00289aea7e37d4ad WHIRLPOOL caf86538b138ae0ab10f71969f05694fed401e45956144b8e5f13153f29f364395b6be2a7ae6d1d50a1a91e87f4df720fbd931898f80f9af01f02771a9f790d7
14
MISC ChangeLog 8723 SHA256 eee1eed2168609c697fa14cde143b95464378389c850ff49ed3b0a75236adc9e SHA512 ea881584b2bd089799480af6beec14f30558ee7b49a983f85f458308b6c739f1d5d20e48c398690ddec8c8c06293aff6c6a2061723a3c9512d5244875abe5f6d WHIRLPOOL 740909dbdc477922799c93743369a6e232c51a206b7d1603ac1b3edb2435dc1e58c537349831d60bc5a39c9a5f6599bbf4eed34d066dad22c036802ab53b9121
15
MISC metadata.xml 234 SHA256 3018e3b31ed690a57bfc14e35699dd20ea3b352fc28b918f699e6955b57a2d97 SHA512 eed880663c66280f6688f896bd6b82d600cac0063eb79da7b1be0fe3bf866e7289edb389a505dfbf45bd9c7e5282748dadd7bf3477759788c1024300796545c3 WHIRLPOOL 79028c7efb93b6255351aebe7f35d1587d07ec1405e8fbee4fd874e42e57e6d10368b0f4ab60c89e115493a094f36af8be1bc2fe79fc2d34daae83dc0f8d7b16
(-)a/dev-libs/libgamin/files/libgamin-0.1.10-G_CONST_RETURN-removal.patch (+67 lines)
Line 0 Link Here
1
From 2a9d32734a2e5125ae77de6c75789e1c6ee24dbe Mon Sep 17 00:00:00 2001
2
From: Maciej Piechotka <uzytkownik2@gmail.com>
3
Date: Tue, 13 Sep 2011 09:47:05 +0200
4
Subject: [PATCH] Fix compilation of recent glib removing G_CONST_RETURN
5
6
---
7
 server/gam_node.c         |    2 +-
8
 server/gam_node.h         |    2 +-
9
 server/gam_subscription.c |    2 +-
10
 server/gam_subscription.h |    2 +-
11
 4 files changed, 4 insertions(+), 4 deletions(-)
12
13
diff --git a/server/gam_node.c b/server/gam_node.c
14
index 02358ba..d0302d2 100644
15
--- a/server/gam_node.c
16
+++ b/server/gam_node.c
17
@@ -122,7 +122,7 @@ gam_node_set_is_dir(GamNode * node, gboolean is_dir)
18
  * it has finished with the string.  If it must keep it longer, it
19
  * should makes its own copy.  The returned string must not be freed.
20
  */
21
-G_CONST_RETURN char *
22
+const char *
23
 gam_node_get_path(GamNode * node)
24
 {
25
     g_assert(node);
26
diff --git a/server/gam_node.h b/server/gam_node.h
27
index 02c8692..83349a8 100644
28
--- a/server/gam_node.h
29
+++ b/server/gam_node.h
30
@@ -58,7 +58,7 @@ gboolean              gam_node_is_dir              (GamNode         *node);
31
 void                  gam_node_set_is_dir          (GamNode         *node,
32
 						   gboolean        is_dir);
33
 	
34
-G_CONST_RETURN char  *gam_node_get_path            (GamNode         *node);
35
+const char           *gam_node_get_path            (GamNode         *node);
36
 
37
 GList                *gam_node_get_subscriptions   (GamNode         *node);
38
 
39
diff --git a/server/gam_subscription.c b/server/gam_subscription.c
40
index dfa3273..4675b34 100644
41
--- a/server/gam_subscription.c
42
+++ b/server/gam_subscription.c
43
@@ -141,7 +141,7 @@ gam_subscription_pathlen(GamSubscription * sub)
44
  * @param sub the GamSubscription
45
  * @returns The path being monitored.  It should not be freed.
46
  */
47
-G_CONST_RETURN char *
48
+const char *
49
 gam_subscription_get_path(GamSubscription * sub)
50
 {
51
     if (sub == NULL)
52
diff --git a/server/gam_subscription.h b/server/gam_subscription.h
53
index d894fbe..e6b4e15 100644
54
--- a/server/gam_subscription.h
55
+++ b/server/gam_subscription.h
56
@@ -21,7 +21,7 @@ int                  gam_subscription_pathlen      (GamSubscription *sub);
57
 
58
 int                  gam_subscription_get_reqno    (GamSubscription *sub);
59
 
60
-G_CONST_RETURN char *gam_subscription_get_path     (GamSubscription *sub);
61
+const char          *gam_subscription_get_path     (GamSubscription *sub);
62
 
63
 GamListener         *gam_subscription_get_listener (GamSubscription *sub);
64
 
65
-- 
66
1.7.6.1
67
(-)a/dev-libs/libgamin/files/libgamin-0.1.10-armel-features.patch (+47 lines)
Line 0 Link Here
1
From 05dcfcd69848e119c6a30d363bc41e896029f8af Mon Sep 17 00:00:00 2001
2
From: Sebastian Dröge <slomo@debian.org>
3
Date: Tue, 15 Dec 2009 12:24:25 +0000
4
Subject: Bug 588338 - Enable linux specific features on armel
5
6
---
7
diff --git a/configure.in b/configure.in
8
index b0bbaec..e4b684e 100644
9
--- a/configure.in
10
+++ b/configure.in
11
@@ -176,7 +176,7 @@ fi
12
 
13
 dnl check what OS we're on
14
 #AM_CONDITIONAL(HAVE_LINUX, test x$target_os = xlinux-gnu)
15
-if test x$target_os = xlinux-gnu; then
16
+if test x$target_os = xlinux-gnu -o x$target_os = xlinux-gnueabi; then
17
 	AC_DEFINE([HAVE_LINUX],[],[Whether we are using linux or not])
18
 fi
19
 
20
@@ -223,7 +223,7 @@ fi
21
 dnl check if inotify backend is enabled
22
 AM_CONDITIONAL(ENABLE_INOTIFY, test x$inotify = xtrue)
23
 
24
-if test x$os = xlinux-gnu; then
25
+if test x$os = xlinux-gnu -o x$os = xlinux-gnueabi; then
26
 	AC_ARG_ENABLE(dnotify,
27
 		AC_HELP_STRING([--disable-dnotify], [Disable the DNotify backend]),
28
 		[dnotify="${enableval}"], [dnotify=true])
29
@@ -297,10 +297,12 @@ else
30
 fi
31
 
32
 dnl Use weak symbols on linux/gcc to avoid imposing libpthreads to apps
33
-if test x$os = xlinux-gnu -a x$WITH_THREADS = x1 ; then
34
-    if test "${CC}" = "gcc" ; then
35
-        echo Use weak symbols !
36
-        THREAD_LIBS=
37
+if test x$os = xlinux-gnu -o x$os = xlinux-gnueabi ; then
38
+    if test x$WITH_THREADS = x1 ; then
39
+      if test "${CC}" = "gcc" ; then
40
+          echo Use weak symbols !
41
+          THREAD_LIBS=
42
+      fi
43
     fi
44
 fi	
45
 AC_SUBST(THREAD_LIBS)
46
--
47
cgit v0.9.0.2
(-)a/dev-libs/libgamin/files/libgamin-0.1.10-deadlock.patch (+67 lines)
Line 0 Link Here
1
--- gamin-0.1.9/lib/gam_error.h.1	2007-08-15 01:09:13.000000000 +0200
Line 0 Link Here
1
--- configure.in.orig	2009-04-26 23:00:43.445135823 +0300
Line 0 Link Here
1
From cc14440eface093548cb3bc7814da11d9a99d283 Mon Sep 17 00:00:00 2001
2
From: Anssi Hannula <anssi@mageia.org>
3
Date: Wed, 4 Jan 2012 00:23:55 +0200
4
Subject: [PATCH] fix possible server deadlock in ih_sub_cancel
5
6
ih_sub_foreach() calls ih_sub_cancel() while inotify_lock is locked.
7
However, ih_sub_cancel() locks it again, and locking GMutex recursively
8
causes undefined behaviour.
9
10
Fix that by removing locking from ih_sub_cancel() as ih_sub_foreach()
11
is its only user. Also make the function static so that it won't
12
accidentally get used by other files without locking (inotify-helper.h
13
is an internal server header).
14
15
This should fix the intermittent deadlocks I've been experiencing
16
causing KDE applications to no longer start, and probably also
17
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=542361
18
---
19
 server/inotify-helper.c |    7 ++-----
20
 server/inotify-helper.h |    1 -
21
 2 files changed, 2 insertions(+), 6 deletions(-)
22
23
diff --git a/server/inotify-helper.c b/server/inotify-helper.c
24
index d77203e..0789fa4 100644
25
--- a/server/inotify-helper.c
26
+++ b/server/inotify-helper.c
27
@@ -123,13 +123,11 @@ ih_sub_add (ih_sub_t * sub)
28
 
29
 /**
30
  * Cancels a subscription which was being monitored.
31
+ * inotify_lock must be held when calling.
32
  */
33
-gboolean
34
+static gboolean
35
 ih_sub_cancel (ih_sub_t * sub)
36
 {
37
-	G_LOCK(inotify_lock);
38
-
39
-
40
 	if (!sub->cancelled)
41
 	{
42
 		IH_W("cancelling %s\n", sub->pathname);
43
@@ -140,7 +138,6 @@ ih_sub_cancel (ih_sub_t * sub)
44
 		sub_list = g_list_remove (sub_list, sub);
45
 	}
46
 
47
-	G_UNLOCK(inotify_lock);
48
 	return TRUE;
49
 }
50
 
51
diff --git a/server/inotify-helper.h b/server/inotify-helper.h
52
index 5d3b6d0..d36b5fd 100644
53
--- a/server/inotify-helper.h
54
+++ b/server/inotify-helper.h
55
@@ -34,7 +34,6 @@ gboolean	 ih_startup		(event_callback_t ecb,
56
 					 found_callback_t fcb);
57
 gboolean	 ih_running		(void);
58
 gboolean	 ih_sub_add		(ih_sub_t *sub);
59
-gboolean	 ih_sub_cancel		(ih_sub_t *sub);
60
 
61
 /* Return FALSE from 'f' if the subscription should be cancelled */
62
 void		 ih_sub_foreach		(void *callerdata, gboolean (*f)(ih_sub_t *sub, void *callerdata));
63
-- 
64
1.7.7.2
65
(-)a/dev-libs/libgamin/files/libgamin-0.1.10-disable_python_static_library.patch (+13 lines)
Line 0 Link Here
1
--- python/Makefile.am
2
+++ python/Makefile.am
3
@@ -10,8 +10,9 @@
4
 python_LTLIBRARIES = _gamin.la
5
 
6
 _gamin_la_SOURCES = gamin.c
7
+_gamin_la_CFLAGS = -shared
8
 _gamin_la_LIBADD = $(top_builddir)/libgamin/libgamin-1.la
9
-_gamin_la_LDFLAGS = -module -avoid-version
10
+_gamin_la_LDFLAGS = -module -avoid-version -shared
11
 
12
 python_PYTHON = gamin.py
13
 
(-)a/dev-libs/libgamin/files/libgamin-0.1.10-fix-pthread-mutex.patch (+11 lines)
Line 0 Link Here
1
--- gamin-0.1.10.orig/libgamin/gam_data.c
2
+++ gamin-0.1.10/libgamin/gam_data.c
3
@@ -470,7 +470,7 @@
4
     }
5
     if (is_threaded > 0) {
6
 	pthread_mutexattr_init(&attr);
7
-#if defined(linux) || defined(PTHREAD_MUTEX_RECURSIVE_NP)
8
+#if defined(linux) && defined(PTHREAD_MUTEX_RECURSIVE_NP)
9
 	pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE_NP);
10
 #else
11
 	pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
(-)a/dev-libs/libgamin/files/libgamin-0.1.10-noinst-lib.patch (+76 lines)
Line 0 Link Here
1
From e68aacc084d65fd0780991265444061b24422bd0 Mon Sep 17 00:00:00 2001
2
From: Remi Cardona <remi@gentoo.org>
3
Date: Mon, 20 Oct 2008 19:17:36 +0200
4
Subject: [PATCH] make libgamin_shared a "noinst" libtool helper lib
5
6
---
7
 lib/Makefile.am      |    4 ++--
8
 libgamin/Makefile.am |   15 ++-------------
9
 server/Makefile.am   |    2 +-
10
 3 files changed, 5 insertions(+), 16 deletions(-)
11
12
diff --git a/lib/Makefile.am b/lib/Makefile.am
13
index 3e2289c..af2152a 100644
14
--- a/lib/Makefile.am
15
+++ b/lib/Makefile.am
16
@@ -7,9 +7,9 @@ if GAMIN_DEBUG
17
 INCLUDES += -DGAM_DEBUG_ENABLED
18
 endif
19
 
20
-lib_LIBRARIES = libgamin_shared.a
21
+noinst_LTLIBRARIES = libgamin_shared.la
22
 
23
-libgamin_shared_a_SOURCES =				\
24
+libgamin_shared_la_SOURCES =				\
25
 	gam_event.c					\
26
 	gam_event.h					\
27
 	gam_error.c					\
28
diff --git a/libgamin/Makefile.am b/libgamin/Makefile.am
29
index 35aa740..14fc06b 100644
30
--- a/libgamin/Makefile.am
31
+++ b/libgamin/Makefile.am
32
@@ -25,19 +25,9 @@ libgamin_1_la_SOURCES =					\
33
 	gam_data.h					\
34
 	gam_fork.c					\
35
 	gam_fork.h					\
36
-	gam_protocol.h					\
37
-	gam_error.c					\
38
-	gam_event.c
39
+	gam_protocol.h
40
 
41
-gam_error.c: $(top_srcdir)/lib/gam_error.c
42
-	@(cp $(top_srcdir)/lib/gam_error.c gam_error.c)
43
-
44
-gam_event.c: $(top_srcdir)/lib/gam_event.c
45
-	@(cp $(top_srcdir)/lib/gam_event.c gam_event.c)
46
-
47
-CLEANFILES=gam_error.c gam_event.c
48
-
49
-libgamin_1_la_LIBADD =
50
+libgamin_1_la_LIBADD = $(top_builddir)/lib/libgamin_shared.la
51
 
52
 libgamin_1_la_LDFLAGS = -Wl,--version-script=$(srcdir)/gamin_sym.version \
53
                         -version-info @GAMIN_VERSION_INFO@ @THREAD_LIBS@
54
@@ -54,6 +44,5 @@ noinst_PROGRAMS= gamin
55
 
56
 gamin_SOURCES = gamin.c
57
 gamin_LDFLAGS =
58
-gamin_DEPENDENCIES = $(DEPS) libgamin-1.la
59
 gamin_LDADD= $(LDADDS) libgamin-1.la
60
 
61
diff --git a/server/Makefile.am b/server/Makefile.am
62
index 37aed8b..6aa5e02 100644
63
--- a/server/Makefile.am
64
+++ b/server/Makefile.am
65
@@ -80,7 +80,7 @@ endif
66
 
67
 gam_server_LDFLAGS =
68
 gam_server_DEPENDENCIES = $(DEPS)
69
-gam_server_LDADD= $(top_builddir)/lib/libgamin_shared.a $(LDADDS) $(DAEMON_LIBS)
70
+gam_server_LDADD= $(top_builddir)/lib/libgamin_shared.la $(LDADDS) $(DAEMON_LIBS)
71
 
72
 if ENABLE_HURD_MACH_NOTIFY
73
 gam_server_LDADD += -lports -lthreads
74
-- 
75
1.6.0.2
76
(-)a/dev-libs/libgamin/libgamin-0.1.10-r99.ebuild (+142 lines)
Line 0 Link Here
1
# Copyright 1999-2014 Gentoo Foundation
2
# Distributed under the terms of the GNU General Public License v2
3
# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgamin/libgamin-0.1.10-r5.ebuild,v 1.12 2014/12/06 16:40:07 ago Exp $
4
5
EAPI="5"
6
7
PYTHON_COMPAT=( python{2_6,2_7} )
8
GNOME_ORG_MODULE="gamin"
9
GNOME_TARBALL_SUFFIX="bz2"
10
11
inherit autotools eutils flag-o-matic libtool python-r1 gnome.org multilib-minimal
12
13
DESCRIPTION="Library providing the FAM File Alteration Monitor API"
14
HOMEPAGE="http://www.gnome.org/~veillard/gamin/"
15
SRC_URI="${SRC_URI}
16
	mirror://gentoo/gamin-0.1.9-freebsd.patch.bz2
17
	http://dev.gentoo.org/~grobian/patches/libgamin-0.1.10-opensolaris.patch.bz2
18
	http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf
19
20
LICENSE="LGPL-2"
21
SLOT="0"
22
KEYWORDS="amd64 arm ~mips ppc x86"
23
IUSE="debug kernel_linux python static-libs"
24
25
RESTRICT="test" # needs gam-server
26
27
RDEPEND="!app-admin/fam
28
	!<app-admin/gamin-0.1.10"
29
DEPEND="${RDEPEND}"
30
31
src_prepare() {
32
	mv "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die
33
34
	# Fix QA warnings, bug #257281, upstream #466791
35
	epatch "${FILESDIR}"/${PN}-0.1.10-compilewarnings.patch
36
37
	if [[ ${CHOST} != *-solaris* ]] ; then
38
		# Fix compile warnings; bug #188923
39
		epatch "${DISTDIR}"/gamin-0.1.9-freebsd.patch.bz2
40
	else
41
		# (Open)Solaris necessary patches (changes configure.in), unfortunately
42
		# conflicts with freebsd patch and breaks some linux installs so it must
43
		# only be applied if on solaris.
44
		epatch "${DISTDIR}"/${P}-opensolaris.patch.bz2
45
	fi
46
47
	# Fix collision problem due to intermediate library, upstream bug #530635
48
	epatch "${FILESDIR}"/${PN}-0.1.10-noinst-lib.patch
49
50
	# Fix compilation with latest glib, bug #382783
51
	epatch "${FILESDIR}/${PN}-0.1.10-G_CONST_RETURN-removal.patch"
52
53
	# Fix crosscompilation issues, bug #267604
54
	epatch "${FILESDIR}/${PN}-0.1.10-crosscompile-fix.patch"
55
56
	# Enable linux specific features on armel, upstream bug #588338
57
	epatch "${FILESDIR}/${P}-armel-features.patch"
58
59
	# Fix possible server deadlock in ih_sub_cancel, upstream bug #667230
60
	epatch "${FILESDIR}/${PN}-0.1.10-deadlock.patch"
61
62
	# Drop DEPRECATED flags
63
	sed -i -e 's:-DG_DISABLE_DEPRECATED:$(NULL):g' server/Makefile.am || die
64
65
	# Build only shared version of Python module.
66
	epatch "${FILESDIR}"/${PN}-0.1.10-disable_python_static_library.patch
67
68
	# Fix build on musl
69
	epatch "${FILESDIR}"/${PN}-0.1.10-fix-pthread-mutex.patch
70
71
	sed -i \
72
		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
73
		-e 's:AM_PROG_CC_STDC:AC_PROG_CC:' \
74
		configure.in || die #466962
75
76
	# autoconf is required as the user-cflags patch modifies configure.in
77
	# however, elibtoolize is also required, so when the above patch is
78
	# removed, replace the following call with a call to elibtoolize
79
	AT_M4DIR="${WORKDIR}" eautoreconf
80
}
81
82
multilib_src_configure() {
83
	local myconf=(
84
		$(use_enable static-libs static)
85
		--disable-debug
86
		--disable-server
87
		$(use_enable kernel_linux inotify)
88
		$(use_enable debug debug-api)
89
		--without-python
90
	)
91
	local ECONF_SOURCE=${S}
92
93
	econf "${myconf[@]}"
94
	if multilib_is_native_abi && use python; then
95
		python_configure() {
96
			mkdir -p "${BUILD_DIR}" || die
97
			cd "${BUILD_DIR}" || die
98
			econf "${myconf[@]}" --with-python
99
		}
100
101
		python_parallel_foreach_impl python_configure
102
	fi
103
}
104
105
multilib_src_compile() {
106
	default
107
108
	if multilib_is_native_abi && use python; then
109
		local native_builddir=${BUILD_DIR}
110
111
		python_compile() {
112
			emake -C "${BUILD_DIR}"/python \
113
				VPATH="${native_builddir}/python:${S}/python" \
114
				_gamin_la_LIBADD="${native_builddir}/libgamin/libgamin-1.la"
115
		}
116
117
		python_foreach_impl python_compile
118
	fi
119
}
120
121
multilib_src_install() {
122
	emake DESTDIR="${D}" install
123
124
	if multilib_is_native_abi && use python; then
125
		local native_builddir=${BUILD_DIR}
126
127
		python_install() {
128
			emake -C "${BUILD_DIR}"/python \
129
				DESTDIR="${D}" install \
130
				VPATH="${native_builddir}/python:${S}/python"
131
		}
132
133
		python_foreach_impl python_install
134
	fi
135
}
136
137
multilib_src_install_all() {
138
	dodoc AUTHORS ChangeLog README TODO NEWS doc/*txt
139
	dohtml doc/*
140
141
	prune_libtool_files --all
142
}
(-)a/dev-libs/libgamin/metadata.xml (-1 / +8 lines)
Line 0 Link Here
0
- 
1
<?xml version="1.0" encoding="UTF-8"?>
2
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
3
<pkgmetadata>
4
<herd>freedesktop</herd>
5
<maintainer>
6
<email>freedesktop-bugs@gentoo.org</email>
7
</maintainer>
8
</pkgmetadata>

Return to bug 538474