| 1 |
commit: c5847976afc0970df6ae46f0e60028de8773a47c |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Feb 7 04:04:30 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 7 04:04:48 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=c5847976 |
| 7 |
|
| 8 |
dev-libs/libgamin: treeclean (now in ::gentoo) |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/538474 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-libs/libgamin/Manifest | 4 - |
| 14 |
.../libgamin-0.1.10-G_CONST_RETURN-removal.patch | 67 -------------- |
| 15 |
.../files/libgamin-0.1.10-armel-features.patch | 47 ---------- |
| 16 |
.../files/libgamin-0.1.10-compilewarnings.patch | 22 ----- |
| 17 |
.../files/libgamin-0.1.10-crosscompile-fix.patch | 38 -------- |
| 18 |
.../libgamin/files/libgamin-0.1.10-deadlock.patch | 65 ------------- |
| 19 |
...amin-0.1.10-disable_python_static_library.patch | 13 --- |
| 20 |
.../files/libgamin-0.1.10-fix-pthread-mutex.patch | 11 --- |
| 21 |
.../files/libgamin-0.1.10-noinst-lib.patch | 76 --------------- |
| 22 |
dev-libs/libgamin/libgamin-0.1.10-r6.ebuild | 102 --------------------- |
| 23 |
dev-libs/libgamin/metadata.xml | 7 -- |
| 24 |
11 files changed, 452 deletions(-) |
| 25 |
|
| 26 |
diff --git a/dev-libs/libgamin/Manifest b/dev-libs/libgamin/Manifest |
| 27 |
deleted file mode 100644 |
| 28 |
index 94ac1dcd..00000000 |
| 29 |
--- a/dev-libs/libgamin/Manifest |
| 30 |
+++ /dev/null |
| 31 |
@@ -1,4 +0,0 @@ |
| 32 |
-DIST gamin-0.1.10.tar.bz2 452194 BLAKE2B 75537862c2b90734b616630b80103499f549fbab69f2417cc089b050a7e245d89701b0703a0916d6dc08a706785ee509ee4feed0375107f777fdf4248ff5f93b SHA512 ccdbc06eeb958ed2d888aee3fcadbadf00e9e6566802adee82035e0762ac3351ed2a2983eabe07503ddde2ddf035185c6cd98cbece2feadaaa36e8f656a38306 |
| 33 |
-DIST gamin-0.1.9-freebsd.patch.bz2 4635 BLAKE2B ea27afc7b978e15e9e957cbc1129b5bc8f0dfea7571e7bbfda981bc319929f8702d6a823bababb97af2b1da95c8403e9189c5ecaf599275e063f71d370526b89 SHA512 a9d9a8e4d85b289df6f87bf2b966ff262281db0d7e6094deb4f2c179f12c6cc3e387c1e1c28306a9fb54f2eb2837f9bdd3a34b2bb68db8abfdbecc7492e9730b |
| 34 |
-DIST libgamin-0.1.10-opensolaris.patch.bz2 16955 BLAKE2B a7c8466fbe9f6613108a6a1b450c47c69018f9f252c17647b07591cf9fba2ba3a08cc344ca54f4647a9c809cecaa18b42bf9f2eff9e253749518b68565024b48 SHA512 fd1cfc5a6b5ba429622f8d426cfba0e3c1c05c3677fb58c53af39b4030ae56f3f71caf63eb5ecb16169c2f7e8c79a32d7d440857c2c7fd3a259cf8312a9b2004 |
| 35 |
-DIST pkg-config-0.28.tar.gz 1931203 BLAKE2B bafdd4e838623965c6bd454421ddd9051fc43fc29948e1615b49fef463c3c3a18807aabe6416f96cfdf58d6b1c9e114d77f97bd985facee7c14284a8a64a768b SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320 |
| 36 |
|
| 37 |
diff --git a/dev-libs/libgamin/files/libgamin-0.1.10-G_CONST_RETURN-removal.patch b/dev-libs/libgamin/files/libgamin-0.1.10-G_CONST_RETURN-removal.patch |
| 38 |
deleted file mode 100644 |
| 39 |
index 087312f5..00000000 |
| 40 |
--- a/dev-libs/libgamin/files/libgamin-0.1.10-G_CONST_RETURN-removal.patch |
| 41 |
+++ /dev/null |
| 42 |
@@ -1,67 +0,0 @@ |
| 43 |
-From 2a9d32734a2e5125ae77de6c75789e1c6ee24dbe Mon Sep 17 00:00:00 2001 |
| 44 |
-From: Maciej Piechotka <uzytkownik2@×××××.com> |
| 45 |
-Date: Tue, 13 Sep 2011 09:47:05 +0200 |
| 46 |
-Subject: [PATCH] Fix compilation of recent glib removing G_CONST_RETURN |
| 47 |
- |
| 48 |
---- |
| 49 |
- server/gam_node.c | 2 +- |
| 50 |
- server/gam_node.h | 2 +- |
| 51 |
- server/gam_subscription.c | 2 +- |
| 52 |
- server/gam_subscription.h | 2 +- |
| 53 |
- 4 files changed, 4 insertions(+), 4 deletions(-) |
| 54 |
- |
| 55 |
-diff --git a/server/gam_node.c b/server/gam_node.c |
| 56 |
-index 02358ba..d0302d2 100644 |
| 57 |
---- a/server/gam_node.c |
| 58 |
-+++ b/server/gam_node.c |
| 59 |
-@@ -122,7 +122,7 @@ gam_node_set_is_dir(GamNode * node, gboolean is_dir) |
| 60 |
- * it has finished with the string. If it must keep it longer, it |
| 61 |
- * should makes its own copy. The returned string must not be freed. |
| 62 |
- */ |
| 63 |
--G_CONST_RETURN char * |
| 64 |
-+const char * |
| 65 |
- gam_node_get_path(GamNode * node) |
| 66 |
- { |
| 67 |
- g_assert(node); |
| 68 |
-diff --git a/server/gam_node.h b/server/gam_node.h |
| 69 |
-index 02c8692..83349a8 100644 |
| 70 |
---- a/server/gam_node.h |
| 71 |
-+++ b/server/gam_node.h |
| 72 |
-@@ -58,7 +58,7 @@ gboolean gam_node_is_dir (GamNode *node); |
| 73 |
- void gam_node_set_is_dir (GamNode *node, |
| 74 |
- gboolean is_dir); |
| 75 |
- |
| 76 |
--G_CONST_RETURN char *gam_node_get_path (GamNode *node); |
| 77 |
-+const char *gam_node_get_path (GamNode *node); |
| 78 |
- |
| 79 |
- GList *gam_node_get_subscriptions (GamNode *node); |
| 80 |
- |
| 81 |
-diff --git a/server/gam_subscription.c b/server/gam_subscription.c |
| 82 |
-index dfa3273..4675b34 100644 |
| 83 |
---- a/server/gam_subscription.c |
| 84 |
-+++ b/server/gam_subscription.c |
| 85 |
-@@ -141,7 +141,7 @@ gam_subscription_pathlen(GamSubscription * sub) |
| 86 |
- * @param sub the GamSubscription |
| 87 |
- * @returns The path being monitored. It should not be freed. |
| 88 |
- */ |
| 89 |
--G_CONST_RETURN char * |
| 90 |
-+const char * |
| 91 |
- gam_subscription_get_path(GamSubscription * sub) |
| 92 |
- { |
| 93 |
- if (sub == NULL) |
| 94 |
-diff --git a/server/gam_subscription.h b/server/gam_subscription.h |
| 95 |
-index d894fbe..e6b4e15 100644 |
| 96 |
---- a/server/gam_subscription.h |
| 97 |
-+++ b/server/gam_subscription.h |
| 98 |
-@@ -21,7 +21,7 @@ int gam_subscription_pathlen (GamSubscription *sub); |
| 99 |
- |
| 100 |
- int gam_subscription_get_reqno (GamSubscription *sub); |
| 101 |
- |
| 102 |
--G_CONST_RETURN char *gam_subscription_get_path (GamSubscription *sub); |
| 103 |
-+const char *gam_subscription_get_path (GamSubscription *sub); |
| 104 |
- |
| 105 |
- GamListener *gam_subscription_get_listener (GamSubscription *sub); |
| 106 |
- |
| 107 |
--- |
| 108 |
-1.7.6.1 |
| 109 |
- |
| 110 |
|
| 111 |
diff --git a/dev-libs/libgamin/files/libgamin-0.1.10-armel-features.patch b/dev-libs/libgamin/files/libgamin-0.1.10-armel-features.patch |
| 112 |
deleted file mode 100644 |
| 113 |
index fdfcbd7e..00000000 |
| 114 |
--- a/dev-libs/libgamin/files/libgamin-0.1.10-armel-features.patch |
| 115 |
+++ /dev/null |
| 116 |
@@ -1,47 +0,0 @@ |
| 117 |
-From 05dcfcd69848e119c6a30d363bc41e896029f8af Mon Sep 17 00:00:00 2001 |
| 118 |
-From: Sebastian Dröge <slomo@××××××.org> |
| 119 |
-Date: Tue, 15 Dec 2009 12:24:25 +0000 |
| 120 |
-Subject: Bug 588338 - Enable linux specific features on armel |
| 121 |
- |
| 122 |
---- |
| 123 |
-diff --git a/configure.in b/configure.in |
| 124 |
-index b0bbaec..e4b684e 100644 |
| 125 |
---- a/configure.in |
| 126 |
-+++ b/configure.in |
| 127 |
-@@ -176,7 +176,7 @@ fi |
| 128 |
- |
| 129 |
- dnl check what OS we're on |
| 130 |
- #AM_CONDITIONAL(HAVE_LINUX, test x$target_os = xlinux-gnu) |
| 131 |
--if test x$target_os = xlinux-gnu; then |
| 132 |
-+if test x$target_os = xlinux-gnu -o x$target_os = xlinux-gnueabi; then |
| 133 |
- AC_DEFINE([HAVE_LINUX],[],[Whether we are using linux or not]) |
| 134 |
- fi |
| 135 |
- |
| 136 |
-@@ -223,7 +223,7 @@ fi |
| 137 |
- dnl check if inotify backend is enabled |
| 138 |
- AM_CONDITIONAL(ENABLE_INOTIFY, test x$inotify = xtrue) |
| 139 |
- |
| 140 |
--if test x$os = xlinux-gnu; then |
| 141 |
-+if test x$os = xlinux-gnu -o x$os = xlinux-gnueabi; then |
| 142 |
- AC_ARG_ENABLE(dnotify, |
| 143 |
- AC_HELP_STRING([--disable-dnotify], [Disable the DNotify backend]), |
| 144 |
- [dnotify="${enableval}"], [dnotify=true]) |
| 145 |
-@@ -297,10 +297,12 @@ else |
| 146 |
- fi |
| 147 |
- |
| 148 |
- dnl Use weak symbols on linux/gcc to avoid imposing libpthreads to apps |
| 149 |
--if test x$os = xlinux-gnu -a x$WITH_THREADS = x1 ; then |
| 150 |
-- if test "${CC}" = "gcc" ; then |
| 151 |
-- echo Use weak symbols ! |
| 152 |
-- THREAD_LIBS= |
| 153 |
-+if test x$os = xlinux-gnu -o x$os = xlinux-gnueabi ; then |
| 154 |
-+ if test x$WITH_THREADS = x1 ; then |
| 155 |
-+ if test "${CC}" = "gcc" ; then |
| 156 |
-+ echo Use weak symbols ! |
| 157 |
-+ THREAD_LIBS= |
| 158 |
-+ fi |
| 159 |
- fi |
| 160 |
- fi |
| 161 |
- AC_SUBST(THREAD_LIBS) |
| 162 |
--- |
| 163 |
-cgit v0.9.0.2 |
| 164 |
|
| 165 |
diff --git a/dev-libs/libgamin/files/libgamin-0.1.10-compilewarnings.patch b/dev-libs/libgamin/files/libgamin-0.1.10-compilewarnings.patch |
| 166 |
deleted file mode 100644 |
| 167 |
index d3e09313..00000000 |
| 168 |
--- a/dev-libs/libgamin/files/libgamin-0.1.10-compilewarnings.patch |
| 169 |
+++ /dev/null |
| 170 |
@@ -1,22 +0,0 @@ |
| 171 |
---- gamin-0.1.9/lib/gam_error.h.1 2007-08-15 01:09:13.000000000 +0200 |
| 172 |
-+++ gamin-0.1.9/lib/gam_error.h 2007-08-15 01:09:27.000000000 +0200 |
| 173 |
-@@ -47,6 +47,9 @@ |
| 174 |
- |
| 175 |
- int gam_errno(void); |
| 176 |
- |
| 177 |
-+void gam_error_init(void); |
| 178 |
-+void gam_error_check(void); |
| 179 |
-+ |
| 180 |
- #ifdef GAM_DEBUG_ENABLED |
| 181 |
- |
| 182 |
- #ifdef GAMIN_DEBUG_API |
| 183 |
-@@ -70,9 +73,6 @@ |
| 184 |
- const char* format, ...); |
| 185 |
- #define GAM_DEBUG if (gam_debug_active) gam_debug |
| 186 |
- |
| 187 |
--void gam_error_init(void); |
| 188 |
--void gam_error_check(void); |
| 189 |
-- |
| 190 |
- #else |
| 191 |
- /* |
| 192 |
- * no debug, redefine the macro empty content |
| 193 |
|
| 194 |
diff --git a/dev-libs/libgamin/files/libgamin-0.1.10-crosscompile-fix.patch b/dev-libs/libgamin/files/libgamin-0.1.10-crosscompile-fix.patch |
| 195 |
deleted file mode 100644 |
| 196 |
index ce3a15b5..00000000 |
| 197 |
--- a/dev-libs/libgamin/files/libgamin-0.1.10-crosscompile-fix.patch |
| 198 |
+++ /dev/null |
| 199 |
@@ -1,38 +0,0 @@ |
| 200 |
---- configure.in.orig 2009-04-26 23:00:43.445135823 +0300 |
| 201 |
-+++ configure.in 2009-04-26 23:25:04.042489243 +0300 |
| 202 |
-@@ -389,8 +389,7 @@ |
| 203 |
- |
| 204 |
- AC_MSG_CHECKING(abstract socket namespace) |
| 205 |
- AC_LANG_PUSH(C) |
| 206 |
--AC_RUN_IFELSE([AC_LANG_PROGRAM( |
| 207 |
--[[ |
| 208 |
-+AC_TRY_RUN([ |
| 209 |
- #include <sys/types.h> |
| 210 |
- #include <stdlib.h> |
| 211 |
- #include <string.h> |
| 212 |
-@@ -398,8 +397,8 @@ |
| 213 |
- #include <sys/socket.h> |
| 214 |
- #include <sys/un.h> |
| 215 |
- #include <errno.h> |
| 216 |
--]], |
| 217 |
--[[ |
| 218 |
-+ |
| 219 |
-+int main() { |
| 220 |
- int listen_fd; |
| 221 |
- struct sockaddr_un addr; |
| 222 |
- |
| 223 |
-@@ -424,9 +423,11 @@ |
| 224 |
- } |
| 225 |
- else |
| 226 |
- exit (0); |
| 227 |
--]])], |
| 228 |
-- [have_abstract_sockets=yes], |
| 229 |
-- [have_abstract_sockets=no]) |
| 230 |
-+} |
| 231 |
-+], |
| 232 |
-+have_abstract_sockets=yes, |
| 233 |
-+have_abstract_sockets=no, |
| 234 |
-+have_abstract_sockets=no) |
| 235 |
- AC_LANG_POP(C) |
| 236 |
- AC_MSG_RESULT($have_abstract_sockets) |
| 237 |
- |
| 238 |
|
| 239 |
diff --git a/dev-libs/libgamin/files/libgamin-0.1.10-deadlock.patch b/dev-libs/libgamin/files/libgamin-0.1.10-deadlock.patch |
| 240 |
deleted file mode 100644 |
| 241 |
index 9f2b2a51..00000000 |
| 242 |
--- a/dev-libs/libgamin/files/libgamin-0.1.10-deadlock.patch |
| 243 |
+++ /dev/null |
| 244 |
@@ -1,65 +0,0 @@ |
| 245 |
-From cc14440eface093548cb3bc7814da11d9a99d283 Mon Sep 17 00:00:00 2001 |
| 246 |
-From: Anssi Hannula <anssi@××××××.org> |
| 247 |
-Date: Wed, 4 Jan 2012 00:23:55 +0200 |
| 248 |
-Subject: [PATCH] fix possible server deadlock in ih_sub_cancel |
| 249 |
- |
| 250 |
-ih_sub_foreach() calls ih_sub_cancel() while inotify_lock is locked. |
| 251 |
-However, ih_sub_cancel() locks it again, and locking GMutex recursively |
| 252 |
-causes undefined behaviour. |
| 253 |
- |
| 254 |
-Fix that by removing locking from ih_sub_cancel() as ih_sub_foreach() |
| 255 |
-is its only user. Also make the function static so that it won't |
| 256 |
-accidentally get used by other files without locking (inotify-helper.h |
| 257 |
-is an internal server header). |
| 258 |
- |
| 259 |
-This should fix the intermittent deadlocks I've been experiencing |
| 260 |
-causing KDE applications to no longer start, and probably also |
| 261 |
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=542361 |
| 262 |
---- |
| 263 |
- server/inotify-helper.c | 7 ++----- |
| 264 |
- server/inotify-helper.h | 1 - |
| 265 |
- 2 files changed, 2 insertions(+), 6 deletions(-) |
| 266 |
- |
| 267 |
-diff --git a/server/inotify-helper.c b/server/inotify-helper.c |
| 268 |
-index d77203e..0789fa4 100644 |
| 269 |
---- a/server/inotify-helper.c |
| 270 |
-+++ b/server/inotify-helper.c |
| 271 |
-@@ -123,13 +123,11 @@ ih_sub_add (ih_sub_t * sub) |
| 272 |
- |
| 273 |
- /** |
| 274 |
- * Cancels a subscription which was being monitored. |
| 275 |
-+ * inotify_lock must be held when calling. |
| 276 |
- */ |
| 277 |
--gboolean |
| 278 |
-+static gboolean |
| 279 |
- ih_sub_cancel (ih_sub_t * sub) |
| 280 |
- { |
| 281 |
-- G_LOCK(inotify_lock); |
| 282 |
-- |
| 283 |
-- |
| 284 |
- if (!sub->cancelled) |
| 285 |
- { |
| 286 |
- IH_W("cancelling %s\n", sub->pathname); |
| 287 |
-@@ -140,7 +138,6 @@ ih_sub_cancel (ih_sub_t * sub) |
| 288 |
- sub_list = g_list_remove (sub_list, sub); |
| 289 |
- } |
| 290 |
- |
| 291 |
-- G_UNLOCK(inotify_lock); |
| 292 |
- return TRUE; |
| 293 |
- } |
| 294 |
- |
| 295 |
-diff --git a/server/inotify-helper.h b/server/inotify-helper.h |
| 296 |
-index 5d3b6d0..d36b5fd 100644 |
| 297 |
---- a/server/inotify-helper.h |
| 298 |
-+++ b/server/inotify-helper.h |
| 299 |
-@@ -34,7 +34,6 @@ gboolean ih_startup (event_callback_t ecb, |
| 300 |
- found_callback_t fcb); |
| 301 |
- gboolean ih_running (void); |
| 302 |
- gboolean ih_sub_add (ih_sub_t *sub); |
| 303 |
--gboolean ih_sub_cancel (ih_sub_t *sub); |
| 304 |
- |
| 305 |
- /* Return FALSE from 'f' if the subscription should be cancelled */ |
| 306 |
- void ih_sub_foreach (void *callerdata, gboolean (*f)(ih_sub_t *sub, void *callerdata)); |
| 307 |
--- |
| 308 |
-1.7.7.2 |
| 309 |
- |
| 310 |
|
| 311 |
diff --git a/dev-libs/libgamin/files/libgamin-0.1.10-disable_python_static_library.patch b/dev-libs/libgamin/files/libgamin-0.1.10-disable_python_static_library.patch |
| 312 |
deleted file mode 100644 |
| 313 |
index 562fc071..00000000 |
| 314 |
--- a/dev-libs/libgamin/files/libgamin-0.1.10-disable_python_static_library.patch |
| 315 |
+++ /dev/null |
| 316 |
@@ -1,13 +0,0 @@ |
| 317 |
---- python/Makefile.am |
| 318 |
-+++ python/Makefile.am |
| 319 |
-@@ -10,8 +10,9 @@ |
| 320 |
- python_LTLIBRARIES = _gamin.la |
| 321 |
- |
| 322 |
- _gamin_la_SOURCES = gamin.c |
| 323 |
-+_gamin_la_CFLAGS = -shared |
| 324 |
- _gamin_la_LIBADD = $(top_builddir)/libgamin/libgamin-1.la |
| 325 |
--_gamin_la_LDFLAGS = -module -avoid-version |
| 326 |
-+_gamin_la_LDFLAGS = -module -avoid-version -shared |
| 327 |
- |
| 328 |
- python_PYTHON = gamin.py |
| 329 |
- |
| 330 |
|
| 331 |
diff --git a/dev-libs/libgamin/files/libgamin-0.1.10-fix-pthread-mutex.patch b/dev-libs/libgamin/files/libgamin-0.1.10-fix-pthread-mutex.patch |
| 332 |
deleted file mode 100644 |
| 333 |
index c8c5b000..00000000 |
| 334 |
--- a/dev-libs/libgamin/files/libgamin-0.1.10-fix-pthread-mutex.patch |
| 335 |
+++ /dev/null |
| 336 |
@@ -1,11 +0,0 @@ |
| 337 |
---- gamin-0.1.10.orig/libgamin/gam_data.c |
| 338 |
-+++ gamin-0.1.10/libgamin/gam_data.c |
| 339 |
-@@ -470,7 +470,7 @@ |
| 340 |
- } |
| 341 |
- if (is_threaded > 0) { |
| 342 |
- pthread_mutexattr_init(&attr); |
| 343 |
--#if defined(linux) || defined(PTHREAD_MUTEX_RECURSIVE_NP) |
| 344 |
-+#if defined(linux) && defined(PTHREAD_MUTEX_RECURSIVE_NP) |
| 345 |
- pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE_NP); |
| 346 |
- #else |
| 347 |
- pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); |
| 348 |
|
| 349 |
diff --git a/dev-libs/libgamin/files/libgamin-0.1.10-noinst-lib.patch b/dev-libs/libgamin/files/libgamin-0.1.10-noinst-lib.patch |
| 350 |
deleted file mode 100644 |
| 351 |
index 1f2fcff6..00000000 |
| 352 |
--- a/dev-libs/libgamin/files/libgamin-0.1.10-noinst-lib.patch |
| 353 |
+++ /dev/null |
| 354 |
@@ -1,76 +0,0 @@ |
| 355 |
-From e68aacc084d65fd0780991265444061b24422bd0 Mon Sep 17 00:00:00 2001 |
| 356 |
-From: Remi Cardona <remi@g.o> |
| 357 |
-Date: Mon, 20 Oct 2008 19:17:36 +0200 |
| 358 |
-Subject: [PATCH] make libgamin_shared a "noinst" libtool helper lib |
| 359 |
- |
| 360 |
---- |
| 361 |
- lib/Makefile.am | 4 ++-- |
| 362 |
- libgamin/Makefile.am | 15 ++------------- |
| 363 |
- server/Makefile.am | 2 +- |
| 364 |
- 3 files changed, 5 insertions(+), 16 deletions(-) |
| 365 |
- |
| 366 |
-diff --git a/lib/Makefile.am b/lib/Makefile.am |
| 367 |
-index 3e2289c..af2152a 100644 |
| 368 |
---- a/lib/Makefile.am |
| 369 |
-+++ b/lib/Makefile.am |
| 370 |
-@@ -7,9 +7,9 @@ if GAMIN_DEBUG |
| 371 |
- INCLUDES += -DGAM_DEBUG_ENABLED |
| 372 |
- endif |
| 373 |
- |
| 374 |
--lib_LIBRARIES = libgamin_shared.a |
| 375 |
-+noinst_LTLIBRARIES = libgamin_shared.la |
| 376 |
- |
| 377 |
--libgamin_shared_a_SOURCES = \ |
| 378 |
-+libgamin_shared_la_SOURCES = \ |
| 379 |
- gam_event.c \ |
| 380 |
- gam_event.h \ |
| 381 |
- gam_error.c \ |
| 382 |
-diff --git a/libgamin/Makefile.am b/libgamin/Makefile.am |
| 383 |
-index 35aa740..14fc06b 100644 |
| 384 |
---- a/libgamin/Makefile.am |
| 385 |
-+++ b/libgamin/Makefile.am |
| 386 |
-@@ -25,19 +25,9 @@ libgamin_1_la_SOURCES = \ |
| 387 |
- gam_data.h \ |
| 388 |
- gam_fork.c \ |
| 389 |
- gam_fork.h \ |
| 390 |
-- gam_protocol.h \ |
| 391 |
-- gam_error.c \ |
| 392 |
-- gam_event.c |
| 393 |
-+ gam_protocol.h |
| 394 |
- |
| 395 |
--gam_error.c: $(top_srcdir)/lib/gam_error.c |
| 396 |
-- @(cp $(top_srcdir)/lib/gam_error.c gam_error.c) |
| 397 |
-- |
| 398 |
--gam_event.c: $(top_srcdir)/lib/gam_event.c |
| 399 |
-- @(cp $(top_srcdir)/lib/gam_event.c gam_event.c) |
| 400 |
-- |
| 401 |
--CLEANFILES=gam_error.c gam_event.c |
| 402 |
-- |
| 403 |
--libgamin_1_la_LIBADD = |
| 404 |
-+libgamin_1_la_LIBADD = $(top_builddir)/lib/libgamin_shared.la |
| 405 |
- |
| 406 |
- libgamin_1_la_LDFLAGS = -Wl,--version-script=$(srcdir)/gamin_sym.version \ |
| 407 |
- -version-info @GAMIN_VERSION_INFO@ @THREAD_LIBS@ |
| 408 |
-@@ -54,6 +44,5 @@ noinst_PROGRAMS= gamin |
| 409 |
- |
| 410 |
- gamin_SOURCES = gamin.c |
| 411 |
- gamin_LDFLAGS = |
| 412 |
--gamin_DEPENDENCIES = $(DEPS) libgamin-1.la |
| 413 |
- gamin_LDADD= $(LDADDS) libgamin-1.la |
| 414 |
- |
| 415 |
-diff --git a/server/Makefile.am b/server/Makefile.am |
| 416 |
-index 37aed8b..6aa5e02 100644 |
| 417 |
---- a/server/Makefile.am |
| 418 |
-+++ b/server/Makefile.am |
| 419 |
-@@ -80,7 +80,7 @@ endif |
| 420 |
- |
| 421 |
- gam_server_LDFLAGS = |
| 422 |
- gam_server_DEPENDENCIES = $(DEPS) |
| 423 |
--gam_server_LDADD= $(top_builddir)/lib/libgamin_shared.a $(LDADDS) $(DAEMON_LIBS) |
| 424 |
-+gam_server_LDADD= $(top_builddir)/lib/libgamin_shared.la $(LDADDS) $(DAEMON_LIBS) |
| 425 |
- |
| 426 |
- if ENABLE_HURD_MACH_NOTIFY |
| 427 |
- gam_server_LDADD += -lports -lthreads |
| 428 |
--- |
| 429 |
-1.6.0.2 |
| 430 |
- |
| 431 |
|
| 432 |
diff --git a/dev-libs/libgamin/libgamin-0.1.10-r6.ebuild b/dev-libs/libgamin/libgamin-0.1.10-r6.ebuild |
| 433 |
deleted file mode 100644 |
| 434 |
index f8315d4e..00000000 |
| 435 |
--- a/dev-libs/libgamin/libgamin-0.1.10-r6.ebuild |
| 436 |
+++ /dev/null |
| 437 |
@@ -1,102 +0,0 @@ |
| 438 |
-# Copyright 1999-2021 Gentoo Authors |
| 439 |
-# Distributed under the terms of the GNU General Public License v2 |
| 440 |
- |
| 441 |
-EAPI="6" |
| 442 |
- |
| 443 |
-GNOME_ORG_MODULE="gamin" |
| 444 |
-GNOME_TARBALL_SUFFIX="bz2" |
| 445 |
- |
| 446 |
-inherit autotools epatch flag-o-matic libtool ltprune gnome.org multilib-minimal |
| 447 |
- |
| 448 |
-DESCRIPTION="Library providing the FAM File Alteration Monitor API" |
| 449 |
-HOMEPAGE="https://www.gnome.org/~veillard/gamin/" |
| 450 |
-SRC_URI="${SRC_URI} |
| 451 |
- mirror://gentoo/gamin-0.1.9-freebsd.patch.bz2 |
| 452 |
- https://dev.gentoo.org/~grobian/patches/libgamin-0.1.10-opensolaris.patch.bz2 |
| 453 |
- https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf |
| 454 |
- |
| 455 |
-LICENSE="LGPL-2" |
| 456 |
-SLOT="0" |
| 457 |
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" |
| 458 |
-IUSE="debug kernel_linux static-libs" |
| 459 |
- |
| 460 |
-RESTRICT="test" # needs gam-server |
| 461 |
- |
| 462 |
-RDEPEND=" |
| 463 |
- !app-admin/fam |
| 464 |
- !<app-admin/gamin-0.1.10" |
| 465 |
-DEPEND="${RDEPEND}" |
| 466 |
- |
| 467 |
-src_prepare() { |
| 468 |
- default |
| 469 |
- mv "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die |
| 470 |
- |
| 471 |
- # Fix QA warnings, bug #257281, upstream #466791 |
| 472 |
- epatch "${FILESDIR}"/${PN}-0.1.10-compilewarnings.patch |
| 473 |
- |
| 474 |
- if [[ ${CHOST} != *-solaris* ]] ; then |
| 475 |
- # Fix compile warnings; bug #188923 |
| 476 |
- epatch "${DISTDIR}"/gamin-0.1.9-freebsd.patch.bz2 |
| 477 |
- else |
| 478 |
- # (Open)Solaris necessary patches (changes configure.in), unfortunately |
| 479 |
- # conflicts with freebsd patch and breaks some linux installs so it must |
| 480 |
- # only be applied if on solaris. |
| 481 |
- epatch "${DISTDIR}"/${P}-opensolaris.patch.bz2 |
| 482 |
- fi |
| 483 |
- |
| 484 |
- # Fix collision problem due to intermediate library, upstream bug #530635 |
| 485 |
- epatch "${FILESDIR}"/${PN}-0.1.10-noinst-lib.patch |
| 486 |
- |
| 487 |
- # Fix compilation with latest glib, bug #382783 |
| 488 |
- epatch "${FILESDIR}/${PN}-0.1.10-G_CONST_RETURN-removal.patch" |
| 489 |
- |
| 490 |
- # Fix crosscompilation issues, bug #267604 |
| 491 |
- epatch "${FILESDIR}/${PN}-0.1.10-crosscompile-fix.patch" |
| 492 |
- |
| 493 |
- # Enable linux specific features on armel, upstream bug #588338 |
| 494 |
- epatch "${FILESDIR}/${P}-armel-features.patch" |
| 495 |
- |
| 496 |
- # Fix possible server deadlock in ih_sub_cancel, upstream bug #667230 |
| 497 |
- epatch "${FILESDIR}/${PN}-0.1.10-deadlock.patch" |
| 498 |
- |
| 499 |
- # Fix build on musl |
| 500 |
- if use elibc_musl ; then |
| 501 |
- epatch "${FILESDIR}"/${PN}-0.1.10-fix-pthread-mutex.patch |
| 502 |
- fi |
| 503 |
- |
| 504 |
- # Drop DEPRECATED flags |
| 505 |
- sed -i -e 's:-DG_DISABLE_DEPRECATED:$(NULL):g' server/Makefile.am || die |
| 506 |
- |
| 507 |
- sed -i \ |
| 508 |
- -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \ |
| 509 |
- -e 's:AM_PROG_CC_STDC:AC_PROG_CC:' \ |
| 510 |
- configure.in || die #466962 |
| 511 |
- |
| 512 |
- mv configure.in configure.ac || die |
| 513 |
- # autoconf is required as the user-cflags patch modifies configure.in |
| 514 |
- # however, elibtoolize is also required, so when the above patch is |
| 515 |
- # removed, replace the following call with a call to elibtoolize |
| 516 |
- AT_M4DIR="${WORKDIR}" eautoreconf |
| 517 |
-} |
| 518 |
- |
| 519 |
-multilib_src_configure() { |
| 520 |
- local myconf=( |
| 521 |
- $(use_enable static-libs static) |
| 522 |
- --disable-debug |
| 523 |
- --disable-server |
| 524 |
- $(use_enable kernel_linux inotify) |
| 525 |
- $(use_enable debug debug-api) |
| 526 |
- --without-python |
| 527 |
- ) |
| 528 |
- local ECONF_SOURCE=${S} |
| 529 |
- |
| 530 |
- econf "${myconf[@]}" |
| 531 |
-} |
| 532 |
- |
| 533 |
-multilib_src_install_all() { |
| 534 |
- DOCS=( AUTHORS ChangeLog README TODO NEWS doc/*txt ) |
| 535 |
- HTML_DOCS=( doc/*.{html,gif} ) |
| 536 |
- einstalldocs |
| 537 |
- |
| 538 |
- prune_libtool_files --all |
| 539 |
-} |
| 540 |
|
| 541 |
diff --git a/dev-libs/libgamin/metadata.xml b/dev-libs/libgamin/metadata.xml |
| 542 |
deleted file mode 100644 |
| 543 |
index fb76b944..00000000 |
| 544 |
--- a/dev-libs/libgamin/metadata.xml |
| 545 |
+++ /dev/null |
| 546 |
@@ -1,7 +0,0 @@ |
| 547 |
-<?xml version="1.0" encoding="UTF-8"?> |
| 548 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 549 |
-<pkgmetadata> |
| 550 |
-<maintainer type="project"> |
| 551 |
-<email>freedesktop-bugs@g.o</email> |
| 552 |
-</maintainer> |
| 553 |
-</pkgmetadata> |
Archives