Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (6ad58d2b99410e7cf86e85f2ac41ea5ea08b5960)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (6ad58d2b99410e7cf86e85f2ac41ea5ea08b5960)
  • Date: Mon, 24 Oct 2011 16:56:32 -0500

GIT changes to devel-xorg-modular grimoire by Vlad Glagolev
<stealth AT sourcemage.org>:

dev/null |binary
gnome2-apps/giggle/DETAILS | 2
gnome2-apps/giggle/HISTORY | 3 +
gnome2-apps/giggle/giggle-0.6.1.tar.bz2.sig |binary
gnome2-apps/giggle/giggle-0.6.tar.bz2.sig | 0
gnome2-apps/gnome-mount/BUILD | 4 +
gnome2-apps/gnome-mount/DEPENDS | 7 --
gnome2-apps/gnome-mount/HISTORY | 7 ++
gnome2-apps/gnome-mount/PRE_BUILD | 11 ++--
gnome2-apps/gnome-mount/header.patch | 14 ++++-
gnome2-apps/gnome-mount/libnotify.patch | 77
++++++++++++++++++++++++++++
graphics-libs/sane-backends/HISTORY | 4 +
graphics-libs/sane-backends/PRE_BUILD | 4 +
graphics-libs/sane-backends/libv4l.patch | 45 ++++++++++++++++
x11/evrouter/BUILD | 3 +
x11/evrouter/CONFIGURE | 3 +
x11/evrouter/DEPENDS | 4 +
x11/evrouter/DETAILS | 12 ++--
x11/evrouter/HISTORY | 7 ++
x11/evrouter/PRE_BUILD | 4 +
20 files changed, 191 insertions(+), 20 deletions(-)

New commits:
commit 6dc317919ed4ddffbe2e2dc9641e95f11420d2eb
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

gnome-mount: fixed compilation with recent libraries

commit c547e76235290367dc058b3c203221828330404c
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

evrouter: => 0.4

commit 24e53e86c89dae498cbdefdd7abdc975d8525ef1
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

sane-backends: fix compilation with libv4l 0.8.3+

commit 8df8f49d6caab97cf437c158b0f7162f8e944e05
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

giggle: => 0.6.1

diff --git a/gnome2-apps/giggle/DETAILS b/gnome2-apps/giggle/DETAILS
index 43972aa..6c743e6 100755
--- a/gnome2-apps/giggle/DETAILS
+++ b/gnome2-apps/giggle/DETAILS
@@ -1,5 +1,5 @@
SPELL=giggle
- VERSION=0.6
+ VERSION=0.6.1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/gnome2-apps/giggle/HISTORY b/gnome2-apps/giggle/HISTORY
index dded3b6..14549aa 100644
--- a/gnome2-apps/giggle/HISTORY
+++ b/gnome2-apps/giggle/HISTORY
@@ -1,3 +1,6 @@
+2011-10-25 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.6.1
+
2011-10-21 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.6
* DEPENDS: gtk+2 -> gtk+3; gtksourceview -> gtksourceview3; vte ->
vte3;
diff --git a/gnome2-apps/giggle/giggle-0.6.1.tar.bz2.sig
b/gnome2-apps/giggle/giggle-0.6.1.tar.bz2.sig
new file mode 100644
index 0000000..b8acaa4
Binary files /dev/null and b/gnome2-apps/giggle/giggle-0.6.1.tar.bz2.sig
differ
diff --git a/gnome2-apps/giggle/giggle-0.6.tar.bz2.sig
b/gnome2-apps/giggle/giggle-0.6.tar.bz2.sig
deleted file mode 100644
index 985d0a8..0000000
Binary files a/gnome2-apps/giggle/giggle-0.6.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-apps/gnome-mount/BUILD b/gnome2-apps/gnome-mount/BUILD
new file mode 100755
index 0000000..fdcdefa
--- /dev/null
+++ b/gnome2-apps/gnome-mount/BUILD
@@ -0,0 +1,4 @@
+# permanently disable notify support cause of broken API in 0.7
+OPTS="--disable-libnotify $OPTS" &&
+
+default_build
diff --git a/gnome2-apps/gnome-mount/DEPENDS b/gnome2-apps/gnome-mount/DEPENDS
index fa749bc..3f42285 100755
--- a/gnome2-apps/gnome-mount/DEPENDS
+++ b/gnome2-apps/gnome-mount/DEPENDS
@@ -9,9 +9,4 @@ depends libglade2 &&
optional_depends nautilus2 \
"--enable-nautilus-extension" \
"--disable-nautilus-extension" \
- "To build Nautilus extension" &&
-
-optional_depends libnotify \
- "" \
- "" \
- "For nice notifications from the systray icon"
+ "to build Nautilus extension"
diff --git a/gnome2-apps/gnome-mount/HISTORY b/gnome2-apps/gnome-mount/HISTORY
index a46db75..438a2f5 100644
--- a/gnome2-apps/gnome-mount/HISTORY
+++ b/gnome2-apps/gnome-mount/HISTORY
@@ -1,3 +1,10 @@
+2011-10-25 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: removed libnotify optional dependency
+ * BUILD: force disable libnotify
+ * PRE_BUILD: apply the patches
+ * header.patch: updated, to compile with recent GTK+2
+ * libnotify.patch: added, to allow enable/disable libnotify
dynamically
+
2010-04-05 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DEPENDS: removed libgnomeui, added gconf2, glib2, libglade2

diff --git a/gnome2-apps/gnome-mount/PRE_BUILD
b/gnome2-apps/gnome-mount/PRE_BUILD
index 37da2ad..28128a1 100755
--- a/gnome2-apps/gnome-mount/PRE_BUILD
+++ b/gnome2-apps/gnome-mount/PRE_BUILD
@@ -1,3 +1,8 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p1 < $SCRIPT_DIRECTORY/header.patch
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/header.patch" &&
+patch -p0 < "$SPELL_DIRECTORY/libnotify.patch" &&
+
+# reconfigure to make libnotify flags work
+autoreconf -i
diff --git a/gnome2-apps/gnome-mount/header.patch
b/gnome2-apps/gnome-mount/header.patch
index d357b6c..a6596f3 100644
--- a/gnome2-apps/gnome-mount/header.patch
+++ b/gnome2-apps/gnome-mount/header.patch
@@ -1,6 +1,5 @@
-diff -uprN gnome-mount-0.8.orig/src/gnome-mount.c
gnome-mount-0.8/src/gnome-mount.c
---- gnome-mount-0.8.orig/src/gnome-mount.c 2009-06-24 08:15:31.000000000
+0800
-+++ gnome-mount-0.8/src/gnome-mount.c 2009-06-24 08:16:00.000000000 +0800
+--- src/gnome-mount.c.orig 2008-04-17 03:41:32.000000000 +0400
++++ src/gnome-mount.c 2011-10-25 01:24:30.000000000 +0400
@@ -30,6 +30,7 @@
#include <fcntl.h>
#include <string.h>
@@ -9,3 +8,12 @@ diff -uprN gnome-mount-0.8.orig/src/gnome-mount.c
gnome-mount-0.8/src/gnome-moun

#include <dbus/dbus.h>
#include <dbus/dbus-glib-lowlevel.h>
+@@ -39,6 +40,8 @@
+ #include <glib/gi18n.h>
+ #include <gconf/gconf-client.h>
+ #include <gdk/gdkx.h>
++#include <gtk/gtkmessagedialog.h>
++#include <gtk/gtkstock.h>
+ #include "copy-paste/gnome-password-dialog.h"
+ #include <gnome-keyring.h>
+ #include <libnotify/notify.h>
diff --git a/gnome2-apps/gnome-mount/libnotify.patch
b/gnome2-apps/gnome-mount/libnotify.patch
new file mode 100644
index 0000000..35dc2f0
--- /dev/null
+++ b/gnome2-apps/gnome-mount/libnotify.patch
@@ -0,0 +1,77 @@
+--- src/gnome-mount.c.orig
++++ src/gnome-mount.c
+@@ -41,7 +41,11 @@
+ #include <gdk/gdkx.h>
+ #include "copy-paste/gnome-password-dialog.h"
+ #include <gnome-keyring.h>
++#include <gtk/gtk.h>
++
++#ifdef ENABLE_NOTIFY
+ #include <libnotify/notify.h>
++#endif
+
+ #if !defined(NOTIFY_EXPIRES_NEVER)
+ #define NOTIFY_EXPIRES_NEVER 0
+@@ -1549,17 +1553,21 @@
+
+ static guint unmount_cache_timeout_id = -1;
+
++#ifdef ENABLE_NOTIFY
+ static NotifyNotification *unmount_note = NULL;
++#endif
+
+ static gboolean unmount_note_is_eject = FALSE;
+ static char *unmount_note_drive_name = NULL;
+
++#ifdef ENABLE_NOTIFY
+ static void
+ unmount_note_close_func (NotifyNotification *note, gpointer user_data)
+ {
+ g_debug ("in unmount_note_close_func()");
+ unmount_note = NULL;
+ }
++#endif
+
+ static gboolean
+ unmount_cache_timeout_func (gpointer data)
+@@ -1602,13 +1610,16 @@
+ g_strchug (unmount_note_drive_name);
+ g_debug ("Setting up 750ms timer for Flushing Cache dialog");
+ unmount_cache_timeout_id = g_timeout_add (750,
unmount_cache_timeout_func, NULL);
++#ifdef ENABLE_NOTIFY
+ unmount_note = NULL;
++#endif
+ }
+
+ static void
+ unmount_cache_timeout_cancel (gboolean was_success)
+ {
+ g_source_remove (unmount_cache_timeout_id);
++#ifdef ENABLE_NOTIFY
+ if (unmount_note != NULL) {
+ if (was_success) {
+ char *summary;
+@@ -1628,6 +1639,7 @@
+ notify_notification_show (unmount_note, NULL);
+ }
+ }
++#endif
+ }
+
+ static gboolean unmount_still_in_progress = FALSE;
+--- configure.in.orig
++++ configure.in
+@@ -100,8 +100,11 @@
+ AC_SUBST(NAUTILUS_LIBS)
+ fi
+
+-PKG_CHECK_MODULES([NOTIFY], [libnotify >= 0.3.0], [enable_notify=yes],
[enable_notify=yes])
+-if test "x$enable_notify" != "xno"; then
++AC_ARG_ENABLE(libnotify,
++ AS_HELP_STRING([--enable-libnotify],[Use libnotify]),
++ ,[enable_libnotify=yes])
++if test "x$enable_libnotify" != "xno"; then
++ PKG_CHECK_MODULES([NOTIFY], [libnotify >= 0.3.0])
+ AC_DEFINE_UNQUOTED([ENABLE_NOTIFY], 1, [Enable notifications with
libnotify])
+ AC_SUBST(NOTIFY_CFLAGS)
+ AC_SUBST(NOTIFY_LIBS)
diff --git a/graphics-libs/sane-backends/HISTORY
b/graphics-libs/sane-backends/HISTORY
index e631dc2..07ae8d0 100644
--- a/graphics-libs/sane-backends/HISTORY
+++ b/graphics-libs/sane-backends/HISTORY
@@ -1,3 +1,7 @@
+2011-10-25 Vlad Glagolev <stealth AT sourcemage.org>
+ * PRE_BUILD: apply the patch
+ * libv4l.patch: added, to fix compilation with libv4l 0.8.3+
+
2011-07-23 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: fixed SOURCE_URL[1]
(http://bugs.sourcemage.org/show_bug.cgi?id=15998)

diff --git a/graphics-libs/sane-backends/PRE_BUILD
b/graphics-libs/sane-backends/PRE_BUILD
new file mode 100755
index 0000000..a34cef7
--- /dev/null
+++ b/graphics-libs/sane-backends/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p1 < "$SPELL_DIRECTORY/libv4l.patch"
diff --git a/graphics-libs/sane-backends/libv4l.patch
b/graphics-libs/sane-backends/libv4l.patch
new file mode 100644
index 0000000..91781d7
--- /dev/null
+++ b/graphics-libs/sane-backends/libv4l.patch
@@ -0,0 +1,45 @@
+From c5ca46c2d1be78c651afb843cc834cf2b5b24953 Mon Sep 17 00:00:00 2001
+From: Julien BLACHE <jb AT jblache.org>
+Date: Wed, 16 Feb 2011 19:37:43 +0100
+Subject: [PATCH] Fix v4l build with libv4l 0.8.3+
+
+---
+diff --git a/backend/v4l.c b/backend/v4l.c
+index 6510ef0..38595ed 100644
+--- a/backend/v4l.c
++++ b/backend/v4l.c
+@@ -84,9 +84,8 @@
+ #include "../include/sane/sanei_config.h"
+ #define V4L_CONFIG_FILE "v4l.conf"
+
+-#include "v4l.h"
+-
+ #include <libv4l1.h>
++#include "v4l.h"
+
+ static const SANE_Device **devlist = NULL;
+ static int num_devices;
+diff --git a/backend/v4l.h b/backend/v4l.h
+index 588b96e..6aee586 100644
+--- a/backend/v4l.h
++++ b/backend/v4l.h
+@@ -29,6 +29,7 @@
+ #ifndef v4l_h
+ #define v4l_h
+
++#ifndef __LINUX_VIDEODEV_H
+ /* Kernel interface */
+ /* Only the stuff we need. For more features, more defines are needed */
+
+@@ -165,7 +166,7 @@ struct video_channel
+
+
+ /* end of kernel interface */
+-
++#endif /* !__LINUX_VIDEODEV_H */
+
+ #include <../include/sane/sane.h>
+
+--
+1.7.2.5
+
diff --git a/x11/evrouter/BUILD b/x11/evrouter/BUILD
new file mode 100755
index 0000000..d2105c7
--- /dev/null
+++ b/x11/evrouter/BUILD
@@ -0,0 +1,3 @@
+OPTS="$EVROUTER_OPTS $OPTS" &&
+
+default_build
diff --git a/x11/evrouter/CONFIGURE b/x11/evrouter/CONFIGURE
new file mode 100755
index 0000000..8b96c11
--- /dev/null
+++ b/x11/evrouter/CONFIGURE
@@ -0,0 +1,3 @@
+config_query_option EVROUTER_OPTS "Enable shell actions?" y \
+ "--enable-shell" \
+ "--disable-shell"
diff --git a/x11/evrouter/DEPENDS b/x11/evrouter/DEPENDS
new file mode 100755
index 0000000..9b251d2
--- /dev/null
+++ b/x11/evrouter/DEPENDS
@@ -0,0 +1,4 @@
+optional_depends xmms \
+ "--with-xmms" \
+ "--without-xmms" \
+ "to enable XMMS actions"
diff --git a/x11/evrouter/DETAILS b/x11/evrouter/DETAILS
index 457ec1c..6f3fe08 100755
--- a/x11/evrouter/DETAILS
+++ b/x11/evrouter/DETAILS
@@ -1,14 +1,14 @@
SPELL=evrouter
- VERSION=0.3.3
+ VERSION=0.4
SOURCE=${SPELL}_$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
-
SOURCE_URL[0]=http://www.bedroomlan.org/~alexios/files/SOFTWARE/$SPELL/$SOURCE
- WEB_SITE=http://www.bedroomlan.org/~alexios/coding_evrouter.html
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+
SOURCE_URL[0]=http://debian.bedroomlan.org/debian/pool/main/e/$SPELL/$SOURCE
+ WEB_SITE=http://www.bedroomlan.org/projects/evrouter
ENTERED=20040425
-
SOURCE_HASH=sha512:ba36be5664811c221f72b483678c9d34dc725f62c15e0ee78b6027a53cf9ad61621a1d4532caf184badd19fb6e46e3710e548bf5f56b1f9407d17243205678b5
+
SOURCE_HASH=sha512:cffc8dddb8b649196a3ec8493e68a4b13bcc554e1e20dfc58caddb432c18862cafd2c232a2284d9dced49e6cc050cddb5328fb1c1966a739d0cb7d2e55134a62
LICENSE[0]=GPL
KEYWORDS="x11"
- SHORT="An Event Router for the Linux Event Interface"
+ SHORT="Event Router for the Linux Event Interface"
cat << EOF
Evrouter reads events from the Linux input layer, and, based on a user-
specified set of rules, acts on them. Currently, evrouter can map events
diff --git a/x11/evrouter/HISTORY b/x11/evrouter/HISTORY
index 9cbedc4..5d49b52 100644
--- a/x11/evrouter/HISTORY
+++ b/x11/evrouter/HISTORY
@@ -1,3 +1,9 @@
+2011-10-25 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.4; renewed website and source url
+ * BUILD, CONFIGURE: added, for custom options
+ * DEPENDS: added, for optional xmms dependency
+ * PRE_BUILD: added, to install missing configure toolchain
+
2007-01-29 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DETAILS: updated spell to 0.3.3, fixed urls and source dir

@@ -12,4 +18,3 @@

2004-02-10 Vladimir Navrat <vn158 AT seznam.cz>
* Spell created
-
diff --git a/x11/evrouter/PRE_BUILD b/x11/evrouter/PRE_BUILD
new file mode 100755
index 0000000..f99d3af
--- /dev/null
+++ b/x11/evrouter/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+autoreconf -i



  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (6ad58d2b99410e7cf86e85f2ac41ea5ea08b5960), Vlad Glagolev, 10/24/2011

Archive powered by MHonArc 2.6.24.

Top of Page