From 8298f4a4edb00043699fe3b43bff9aacf54e18d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rub=C3=A9n=20Rodr=C3=ADguez?= <ruben@trisquel.info>
Date: Sat, 24 Nov 2012 08:33:02 +0100
Subject: [PATCH] Updated compiz, pidgin and rhythmbox
---
helpers/DATA/compiz/fix-974242.patch | 25 +++++++++++++++++++++++++
helpers/make-compiz | 4 +++-
helpers/make-pidgin | 6 +++---
helpers/make-rhythmbox | 3 ++-
4 files changed, 33 insertions(+), 5 deletions(-)
create mode 100644 helpers/DATA/compiz/fix-974242.patch
diff --git a/helpers/DATA/compiz/fix-974242.patch b/helpers/DATA/compiz/fix-974242.patch
new file mode 100644
index 00000000..8d9c327c
--- /dev/null
+++ b/helpers/DATA/compiz/fix-974242.patch
@@ -0,0 +1,25 @@
+diff -uNr compiz-0.9.7.8.orig/plugins/place/src/place.cpp compiz-0.9.7.8/plugins/place/src/place.cpp
+--- compiz-0.9.7.8.orig/plugins/place/src/place.cpp 2012-04-26 07:47:01.000000000 +0100
++++ compiz-0.9.7.8/plugins/place/src/place.cpp 2012-05-11 18:15:22.023909137 +0100
+@@ -228,12 +228,15 @@
+ w = screen->findWindow (event->xproperty.window);
+ if (w)
+ {
+- mStrutWindows.remove (w);
+- /* Only do when handling screen size change.
+- ps->strutWindowCount is 0 at any other time */
+- if (mStrutWindows.empty ())
+- doHandleScreenSizeChange (screen->width (),
+- screen->height ()); /* 2nd pass */
++ if (!mStrutWindows.empty ())
++ {
++ mStrutWindows.remove (w);
++ /* Only do when handling screen size change.
++ ps->strutWindowCount is 0 at any other time */
++ if (mStrutWindows.empty ())
++ doHandleScreenSizeChange (screen->width (),
++ screen->height ()); /* 2nd pass */
++ }
+ }
+ }
+ }
diff --git a/helpers/make-compiz b/helpers/make-compiz
index 0171e222..80c9367f 100644
--- a/helpers/make-compiz
+++ b/helpers/make-compiz
@@ -17,10 +17,12 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-VERSION=2
+VERSION=4
+COMPONENT=main
. ./config
+patch -p1 < $DATA/fix-974242.patch
cp $DATA/config.patch debian/patches/config.patch
sed 's/ubuntu-config/config/' -i debian/patches/series
diff --git a/helpers/make-pidgin b/helpers/make-pidgin
index 9285d506..9858d165 100644
--- a/helpers/make-pidgin
+++ b/helpers/make-pidgin
@@ -17,18 +17,18 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-VERSION=1
+VERSION=2
COMPONENT=main
. ./config
-for PATCH in default_to_irc_ubuntu lpi let_crasher_for_apport docklet_default_off
+for PATCH in default_to_irc_ubuntu lpi let_crasher_for_apport
do
rm debian/patches/*$PATCH*
sed -i /$PATCH/d debian/patches/series
done
-sed '/purple_prefs_add_bool.*conv_focus/ s/FALSE/TRUE/' ./finch/gntsound.c -i
+#sed '/purple_prefs_add_bool.*conv_focus/ s/FALSE/TRUE/' ./finch/gntsound.c -i
changelog "Compiled for Trisquel"
diff --git a/helpers/make-rhythmbox b/helpers/make-rhythmbox
index efdd4378..c7d1258c 100644
--- a/helpers/make-rhythmbox
+++ b/helpers/make-rhythmbox
@@ -17,7 +17,8 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-VERSION=1
+VERSION=2
+COMPONENT=main
. ./config
--
GitLab