Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-gnome-3.0.0 grimoire by Ladislav Hagara (d77ac0398cd72b6545c355586a364285c47b9463)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ladislav Hagara <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-gnome-3.0.0 grimoire by Ladislav Hagara (d77ac0398cd72b6545c355586a364285c47b9463)
  • Date: Sun, 9 Oct 2011 13:08:34 -0500

GIT changes to devel-gnome-3.0.0 grimoire by Ladislav Hagara <hgr AT vabo.cz>:

utils/notify-python/DETAILS | 1
utils/notify-python/HISTORY | 4 +
utils/notify-python/PRE_BUILD | 4 +
utils/notify-python/libnotify07.patch | 36
++++++++++
utils/notify-python/notify-python-0.1.1-fix-GTK-symbols.patch | 25 ++++++
5 files changed, 70 insertions(+)

New commits:
commit d77ac0398cd72b6545c355586a364285c47b9463
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

notify-python fixed to work with libnotify 0.7

diff --git a/utils/notify-python/DETAILS b/utils/notify-python/DETAILS
index fd05632..3a55725 100755
--- a/utils/notify-python/DETAILS
+++ b/utils/notify-python/DETAILS
@@ -1,5 +1,6 @@
SPELL=notify-python
VERSION=0.1.1
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.gz

SOURCE_URL[0]=http://www.galago-project.org/files/releases/source/$SPELL/$SOURCE
SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
diff --git a/utils/notify-python/HISTORY b/utils/notify-python/HISTORY
index 94ba377..5229d24 100644
--- a/utils/notify-python/HISTORY
+++ b/utils/notify-python/HISTORY
@@ -1,3 +1,7 @@
+2011-10-09 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: PATCHLEVEL=1
+ * PRE_BUILD, *.patch: added patches from Arch
+
2011-05-27 Peng Chang (Charles) <chp AT sourcemage.org>
* PRE_BUILD: remove source file needing to be re-generated,
http://bugs.gentoo.org/212128
diff --git a/utils/notify-python/PRE_BUILD b/utils/notify-python/PRE_BUILD
index 5ebaf9e..d895a91 100755
--- a/utils/notify-python/PRE_BUILD
+++ b/utils/notify-python/PRE_BUILD
@@ -1,4 +1,8 @@
default_pre_build &&

cd $SOURCE_DIRECTORY &&
+
+patch -p1 < $SPELL_DIRECTORY/libnotify07.patch &&
+patch -p1 < $SPELL_DIRECTORY/notify-python-0.1.1-fix-GTK-symbols.patch &&
+
rm -v src/pynotify.c
diff --git a/utils/notify-python/libnotify07.patch
b/utils/notify-python/libnotify07.patch
new file mode 100644
index 0000000..289573d
--- /dev/null
+++ b/utils/notify-python/libnotify07.patch
@@ -0,0 +1,36 @@
+diff -up notify-python-0.1.1/src/pynotify.defs.notify070
notify-python-0.1.1/src/pynotify.defs
+--- notify-python-0.1.1/src/pynotify.defs.notify070 2010-11-02
17:11:14.928179237 -0400
++++ notify-python-0.1.1/src/pynotify.defs 2010-11-02 17:11:51.153180231
-0400
+@@ -38,7 +38,6 @@
+ '("const-gchar*" "summary")
+ '("const-gchar*" "message" (null-ok) (default "NULL"))
+ '("const-gchar*" "icon" (null-ok) (default "NULL"))
+- '("GtkWidget*" "attach" (null-ok) (default "NULL"))
+ )
+ )
+
+@@ -53,24 +52,6 @@
+ )
+ )
+
+-(define-method attach_to_widget
+- (of-object "NotifyNotification")
+- (c-name "notify_notification_attach_to_widget")
+- (return-type "none")
+- (parameters
+- '("GtkWidget*" "attach")
+- )
+-)
+-
+-(define-method attach_to_status_icon
+- (of-object "NotifyNotification")
+- (c-name "notify_notification_attach_to_status_icon")
+- (return-type "none")
+- (parameters
+- '("GtkStatusIcon*" "attach")
+- )
+-)
+-
+ (define-method show
+ (of-object "NotifyNotification")
+ (c-name "notify_notification_show")
diff --git a/utils/notify-python/notify-python-0.1.1-fix-GTK-symbols.patch
b/utils/notify-python/notify-python-0.1.1-fix-GTK-symbols.patch
new file mode 100644
index 0000000..f985c01
--- /dev/null
+++ b/utils/notify-python/notify-python-0.1.1-fix-GTK-symbols.patch
@@ -0,0 +1,25 @@
+diff -up notify-python-0.1.1/src/__init__.py.BAD
notify-python-0.1.1/src/__init__.py
+--- notify-python-0.1.1/src/__init__.py.BAD 2010-08-31 09:04:45.353844005
-0400
++++ notify-python-0.1.1/src/__init__.py 2010-08-31 09:04:49.281844300
-0400
+@@ -1 +1,21 @@
++"""
++Fedora's libnotify.so is not linked against GTK2 or GTK3. The idea
++was to support being linked against different parallel-installable
++GTK stacks.
++
++Unfortunately, python needs to jump through some special hoops in order
++to share symbols with extension modules, specifically, pygtk, which does
++link against GTK2.
++
++Without using sys.setdlopenflags(sys.getdlopenflags() | ctypes.RTLD_GLOBAL),
++the result is:
++libnotify-WARNING **: Missing symbol 'gdk_screen_make_display_name'
++
++Thanks to David Malcolm for figuring out the workaround.
++"""
++import ctypes
++import sys
++sys.setdlopenflags(sys.getdlopenflags() | ctypes.RTLD_GLOBAL)
++import gtk
++
+ from _pynotify import *



  • [SM-Commit] GIT changes to devel-gnome-3.0.0 grimoire by Ladislav Hagara (d77ac0398cd72b6545c355586a364285c47b9463), Ladislav Hagara, 10/09/2011

Archive powered by MHonArc 2.6.24.

Top of Page