Updated compiz, pidgin and rhythmbox

This commit is contained in:
Rubén Rodríguez 2012-11-24 08:33:02 +01:00
parent 0f46fef85d
commit 8298f4a4ed
4 changed files with 33 additions and 5 deletions

View file

@ -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 */
+ }
}
}
}

View file

@ -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

View file

@ -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"

View file

@ -17,7 +17,8 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
VERSION=1
VERSION=2
COMPONENT=main
. ./config