summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVlad Glagolev2010-10-31 16:55:11 +0300
committerVlad Glagolev2010-10-31 16:55:11 +0300
commit91618901f9494e9ddf1224fc38352079a222f20c (patch)
treef2a07c940d12ea3126b909e70562909c9837d8c5
parent79900384e614d3fa42651303f9b63cd69368a05c (diff)
sonata: fixed segfault with new PyGTK
-rwxr-xr-xpython-pypi/sonata/DETAILS2
-rw-r--r--python-pypi/sonata/HISTORY5
-rwxr-xr-xpython-pypi/sonata/PRE_BUILD1
-rw-r--r--python-pypi/sonata/pygtk222.patch15
4 files changed, 22 insertions, 1 deletions
diff --git a/python-pypi/sonata/DETAILS b/python-pypi/sonata/DETAILS
index 208e2871ff..e4970b9f73 100755
--- a/python-pypi/sonata/DETAILS
+++ b/python-pypi/sonata/DETAILS
@@ -1,6 +1,6 @@
SPELL=sonata
VERSION=1.6.2.1
- PATCHLEVEL=1
+ PATCHLEVEL=2
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://download.berlios.de/$SPELL/$SOURCE
SOURCE_HASH=sha512:8022b69380714e9c3c685c61d0f1e62be087fc2cbd77a55f32008edea53411f8493d416bd0a446ccb52b4b5603ba9f4a00b655af485d739932dc06af69345c27
diff --git a/python-pypi/sonata/HISTORY b/python-pypi/sonata/HISTORY
index dc4f8052be..8f8449b840 100644
--- a/python-pypi/sonata/HISTORY
+++ b/python-pypi/sonata/HISTORY
@@ -1,3 +1,8 @@
+2010-10-31 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: PATCHLEVEL=2
+ * PRE_BUILD: apply the patch
+ * pygtk222.patch: added, to fix running with recent PyGTK (2.22)
+
2010-07-06 Vlad Glagolev <stealth@sourcemage.org>
* DEPENDS: added python dep
diff --git a/python-pypi/sonata/PRE_BUILD b/python-pypi/sonata/PRE_BUILD
index e87db7699d..ed166b2c1c 100755
--- a/python-pypi/sonata/PRE_BUILD
+++ b/python-pypi/sonata/PRE_BUILD
@@ -1,4 +1,5 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
+patch -p0 < "$SPELL_DIRECTORY/pygtk222.patch" &&
patch -p0 < "$SPELL_DIRECTORY/threading.patch"
diff --git a/python-pypi/sonata/pygtk222.patch b/python-pypi/sonata/pygtk222.patch
new file mode 100644
index 0000000000..67007bae7b
--- /dev/null
+++ b/python-pypi/sonata/pygtk222.patch
@@ -0,0 +1,15 @@
+--- sonata/main.py.orig 2009-09-22 01:02:16.000000000 +0400
++++ sonata/main.py 2010-10-31 16:40:39.759577403 +0300
+@@ -1993,9 +1993,9 @@
+ # When withdrawing an app, extra configure events (with wrong coords)
+ # are fired (at least on Openbox). This prevents a user from moving
+ # the window, withdrawing it, then unwithdrawing it and finding it in
+- # an older position
+- if not window.props.visible:
+- return
++ # an older position. Broken with recent PyGTK (2.22).
++ # if not window.props.visible:
++ # return
+
+ width, height = window.get_size()
+ if self.config.expanded: self.config.w, self.config.h = width, height