diff options
Diffstat (limited to 'source/l/gamin')
| -rw-r--r-- | source/l/gamin/fix-double-lock-in-inotify-helper-c.patch | 21 | ||||
| -rwxr-xr-x | source/l/gamin/gamin.SlackBuild | 10 | ||||
| -rw-r--r-- | source/l/gamin/no_g_const_return.patch | 44 |
3 files changed, 73 insertions, 2 deletions
diff --git a/source/l/gamin/fix-double-lock-in-inotify-helper-c.patch b/source/l/gamin/fix-double-lock-in-inotify-helper-c.patch new file mode 100644 index 000000000..8d2ef2d3f --- /dev/null +++ b/source/l/gamin/fix-double-lock-in-inotify-helper-c.patch @@ -0,0 +1,21 @@ +diff -rupN gamin-0.1.10/server/inotify-helper.c gamin-0.1.10-new/server/inotify-helper.c +--- gamin-0.1.10/server/inotify-helper.c 2008-11-12 21:45:28.000000000 +0100 ++++ gamin-0.1.10-new/server/inotify-helper.c 2012-02-02 23:11:47.247757385 +0100 +@@ -127,9 +127,6 @@ ih_sub_add (ih_sub_t * sub) + gboolean + ih_sub_cancel (ih_sub_t * sub) + { +- G_LOCK(inotify_lock); +- +- + if (!sub->cancelled) + { + IH_W("cancelling %s\n", sub->pathname); +@@ -140,7 +137,6 @@ ih_sub_cancel (ih_sub_t * sub) + sub_list = g_list_remove (sub_list, sub); + } + +- G_UNLOCK(inotify_lock); + return TRUE; + } + diff --git a/source/l/gamin/gamin.SlackBuild b/source/l/gamin/gamin.SlackBuild index 9eb379190..fb51e9254 100755 --- a/source/l/gamin/gamin.SlackBuild +++ b/source/l/gamin/gamin.SlackBuild @@ -24,7 +24,7 @@ PKGNAM=gamin VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-5} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -62,7 +62,7 @@ mkdir -p $TMP $PKG cd $TMP rm -rf $PKGNAM-$VERSION tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 -cd $PKGNAM-$VERSION +cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -70,6 +70,12 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# https://bugzilla.redhat.com/show_bug.cgi?id=786170 +zcat $CWD/fix-double-lock-in-inotify-helper-c.patch.gz | patch -p1 --verbose || exit 1 + +# Fix a build error with newer toolchain +zcat $CWD/no_g_const_return.patch.gz | patch -p1 --verbose || exit 1 + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/source/l/gamin/no_g_const_return.patch b/source/l/gamin/no_g_const_return.patch new file mode 100644 index 000000000..f8430a79b --- /dev/null +++ b/source/l/gamin/no_g_const_return.patch @@ -0,0 +1,44 @@ +--- ./server/gam_node.h.orig 2007-07-04 15:36:49.000000000 +0200 ++++ ./server/gam_node.h 2011-08-26 01:49:59.504423790 +0200 +@@ -58,7 +58,7 @@ + void gam_node_set_is_dir (GamNode *node, + gboolean is_dir); + +-G_CONST_RETURN char *gam_node_get_path (GamNode *node); ++const char *gam_node_get_path (GamNode *node); + + GList *gam_node_get_subscriptions (GamNode *node); + +--- ./server/gam_subscription.h.orig 2007-07-04 15:36:49.000000000 +0200 ++++ ./server/gam_subscription.h 2011-08-26 01:49:59.504423790 +0200 +@@ -21,7 +21,7 @@ + + int gam_subscription_get_reqno (GamSubscription *sub); + +-G_CONST_RETURN char *gam_subscription_get_path (GamSubscription *sub); ++const char *gam_subscription_get_path (GamSubscription *sub); + + GamListener *gam_subscription_get_listener (GamSubscription *sub); + +--- ./server/gam_node.c.orig 2007-07-04 15:36:49.000000000 +0200 ++++ ./server/gam_node.c 2011-08-26 01:49:59.504423790 +0200 +@@ -122,7 +122,7 @@ + * it has finished with the string. If it must keep it longer, it + * should makes its own copy. The returned string must not be freed. + */ +-G_CONST_RETURN char * ++const char * + gam_node_get_path(GamNode * node) + { + g_assert(node); +--- ./server/gam_subscription.c.orig 2007-07-04 15:36:49.000000000 +0200 ++++ ./server/gam_subscription.c 2011-08-26 01:49:59.504423790 +0200 +@@ -141,7 +141,7 @@ + * @param sub the GamSubscription + * @returns The path being monitored. It should not be freed. + */ +-G_CONST_RETURN char * ++const char * + gam_subscription_get_path(GamSubscription * sub) + { + if (sub == NULL) |