r23988 - in /desktop/unstable/libwnck/debian: changelog patches/01_vertical_panel.patch patches/99_ltmain_as-needed.patch patches/series rules source/ source/format
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Fri Apr 23 17:51:39 UTC 2010
Author: joss
Date: Fri Apr 23 17:51:38 2010
New Revision: 23988
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23988
Log:
* Switch to 3.0 (quilt) format.
* 01_vertical_panel.patch: patch from Carey Underwood and Leniviy to
fix lockups when the window list applet is on a vertical panel.
Closes: #524117.
Added:
desktop/unstable/libwnck/debian/patches/01_vertical_panel.patch
desktop/unstable/libwnck/debian/patches/series
desktop/unstable/libwnck/debian/source/
desktop/unstable/libwnck/debian/source/format
Modified:
desktop/unstable/libwnck/debian/changelog
desktop/unstable/libwnck/debian/patches/99_ltmain_as-needed.patch
desktop/unstable/libwnck/debian/rules
Modified: desktop/unstable/libwnck/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libwnck/debian/changelog?rev=23988&op=diff
==============================================================================
--- desktop/unstable/libwnck/debian/changelog [utf-8] (original)
+++ desktop/unstable/libwnck/debian/changelog [utf-8] Fri Apr 23 17:51:38 2010
@@ -1,3 +1,12 @@
+libwnck (2.30.0-2) unstable; urgency=low
+
+ * Switch to 3.0 (quilt) format.
+ * 01_vertical_panel.patch: patch from Carey Underwood and Leniviy to
+ fix lockups when the window list applet is on a vertical panel.
+ Closes: #524117.
+
+ -- Josselin Mouette <joss at debian.org> Fri, 23 Apr 2010 19:47:04 +0200
+
libwnck (2.30.0-1) unstable; urgency=low
* New upstream stable release:
Added: desktop/unstable/libwnck/debian/patches/01_vertical_panel.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libwnck/debian/patches/01_vertical_panel.patch?rev=23988&op=file
==============================================================================
--- desktop/unstable/libwnck/debian/patches/01_vertical_panel.patch (added)
+++ desktop/unstable/libwnck/debian/patches/01_vertical_panel.patch [utf-8] Fri Apr 23 17:51:38 2010
@@ -1,0 +1,163 @@
+GNOME #86382
+Debian #524117
+
+Index: libwnck-2.30.0/libwnck/tasklist.c
+===================================================================
+--- libwnck-2.30.0.orig/libwnck/tasklist.c 2010-04-23 19:40:31.782860411 +0200
++++ libwnck-2.30.0/libwnck/tasklist.c 2010-04-23 19:41:07.139359218 +0200
+@@ -1152,17 +1152,18 @@ wnck_tasklist_layout (GtkAllocation *all
+ {
+ int n_cols, n_rows;
+
++ /* For our purposes, assume we always have a button */
++ n_buttons = MAX(1, n_buttons);
++
+ /* How many rows fit in the allocation */
+ n_rows = allocation->height / max_height;
+
+- /* Don't have more rows than buttons */
+- n_rows = MIN (n_rows, n_buttons);
+-
+- /* At least one row */
+- n_rows = MAX (n_rows, 1);
++ /* Don't have more rows than buttons, but have at least one row */
++/* n_rows = MIN(n_rows, n_buttons);*/
++ n_rows = MAX(1, n_rows);
+
+- /* We want to use as many rows as possible to limit the width */
+- n_cols = (n_buttons + n_rows - 1) / n_rows;
++ /* And how many columns are needed */
++ n_cols = ((n_buttons - 1) / n_rows) + 1;
+
+ /* At least one column */
+ n_cols = MAX (n_cols, 1);
+@@ -1304,6 +1305,7 @@ wnck_tasklist_size_request (GtkWidget
+ int n_windows;
+ int n_startup_sequences;
+ int n_rows;
++ int n_buttons;
+ int n_cols, last_n_cols;
+ int n_grouped_buttons;
+ gboolean score_set;
+@@ -1363,20 +1365,32 @@ wnck_tasklist_size_request (GtkWidget
+ tasklist->priv->max_button_width);
+
+ /* Try ungrouped mode */
++ n_buttons = n_windows + n_startup_sequences;
+ wnck_tasklist_layout (&fake_allocation,
+ tasklist->priv->max_button_width,
+ tasklist->priv->max_button_height,
+- n_windows + n_startup_sequences,
++ n_buttons,
+ &n_cols, &n_rows);
++ n_rows = MAX(1,n_buttons);
+
+ last_n_cols = G_MAXINT;
+ lowest_range = G_MAXINT;
+ if (tasklist->priv->grouping != WNCK_TASKLIST_ALWAYS_GROUP)
+ {
++ if (fake_allocation.height < fake_allocation.width)
++ {
+ val = n_cols * tasklist->priv->max_button_width;
+ g_array_insert_val (array, array->len, val);
+ val = n_cols * grouping_limit;
+ g_array_insert_val (array, array->len, val);
++ }
++ else
++ {
++ val = n_rows * tasklist->priv->max_button_height;
++ g_array_insert_val (array, array->len, val);
++ val = n_rows * grouping_limit;
++ g_array_insert_val (array, array->len, val);
++ }
+
+ last_n_cols = n_cols;
+ lowest_range = val;
+@@ -1395,15 +1409,20 @@ wnck_tasklist_size_request (GtkWidget
+
+ n_grouped_buttons += g_list_length (class_group_task->windows) - 1;
+
++ n_buttons = n_startup_sequences + n_windows - n_grouped_buttons;
+ wnck_tasklist_layout (&fake_allocation,
+ tasklist->priv->max_button_width,
+ tasklist->priv->max_button_height,
+- n_startup_sequences + n_windows - n_grouped_buttons,
++ n_buttons,
+ &n_cols, &n_rows);
++ n_rows = MAX(1,n_buttons);
++
+ if (n_cols != last_n_cols &&
+ (tasklist->priv->grouping == WNCK_TASKLIST_AUTO_GROUP ||
+ ungrouped_class_groups == NULL))
+ {
++ if (fake_allocation.height < fake_allocation.width)
++ {
+ val = n_cols * tasklist->priv->max_button_width;
+ if (val >= lowest_range)
+ { /* Overlaps old range */
+@@ -1419,7 +1438,25 @@ wnck_tasklist_size_request (GtkWidget
+ g_array_insert_val (array, array->len, val);
+ lowest_range = val;
+ }
+-
++ }
++ else
++ {
++ val = n_rows * tasklist->priv->max_button_height;
++ if (val >= lowest_range)
++ { /* Overlaps old range */
++ g_assert (array->len > 0);
++ lowest_range = n_rows * grouping_limit;
++ g_array_index(array, int, array->len-1) = lowest_range;
++ }
++ else
++ {
++ /* Full new range */
++ g_array_insert_val (array, array->len, val);
++ val = n_rows * grouping_limit;
++ g_array_insert_val (array, array->len, val);
++ lowest_range = val;
++ }
++ }
+ last_n_cols = n_cols;
+ }
+ }
+@@ -1443,8 +1480,14 @@ wnck_tasklist_size_request (GtkWidget
+
+ tasklist->priv->size_hints = (int *)g_array_free (array, FALSE);
+
++ if (fake_allocation.height < fake_allocation.width)
++ {
+ requisition->width = tasklist->priv->size_hints[0];
+ requisition->height = fake_allocation.height;
++ } else {
++ requisition->width = fake_allocation.width;
++ requisition->height = tasklist->priv->size_hints[0];
++ }
+ }
+
+ /**
+@@ -1640,6 +1683,8 @@ wnck_tasklist_size_allocate (GtkWidget
+ int row = i % n_rows;
+ int col = i / n_rows;
+
++ if (allocation->width > allocation->height)
++ {
+ if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
+ col = n_cols - col - 1;
+
+@@ -1647,6 +1692,14 @@ wnck_tasklist_size_allocate (GtkWidget
+ child_allocation.y = allocation->height*row / n_rows;
+ child_allocation.width = total_width*(col + 1) / n_cols - child_allocation.x;
+ child_allocation.height = allocation->height*(row + 1) / n_rows - child_allocation.y;
++ }
++ else
++ {
++ child_allocation.x = total_width*col / n_cols;
++ child_allocation.y = MIN(row * tasklist->priv->max_button_height, allocation->height / n_rows * row);
++ child_allocation.width = allocation->width / n_cols;
++ child_allocation.height = MIN(tasklist->priv->max_button_height, allocation->height / n_rows);
++ }
+ child_allocation.x += allocation->x;
+ child_allocation.y += allocation->y;
+
Modified: desktop/unstable/libwnck/debian/patches/99_ltmain_as-needed.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libwnck/debian/patches/99_ltmain_as-needed.patch?rev=23988&op=diff
==============================================================================
--- desktop/unstable/libwnck/debian/patches/99_ltmain_as-needed.patch [utf-8] (original)
+++ desktop/unstable/libwnck/debian/patches/99_ltmain_as-needed.patch [utf-8] Fri Apr 23 17:51:38 2010
@@ -1,7 +1,9 @@
---- ltmain.sh.orig 2008-10-04 20:32:58.000000000 +0200
-+++ ltmain.sh 2008-11-22 15:32:21.983530240 +0100
-@@ -1807,6 +1807,11 @@
- arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
+Index: libwnck-2.30.0/ltmain.sh
+===================================================================
+--- libwnck-2.30.0.orig/ltmain.sh 2010-04-23 19:41:31.894859918 +0200
++++ libwnck-2.30.0/ltmain.sh 2010-04-23 19:41:34.679353830 +0200
+@@ -4716,6 +4716,11 @@ func_mode_link ()
+ arg=$func_stripname_result
;;
+ -Wl,--as-needed)
@@ -10,9 +12,9 @@
+ ;;
+
-Wl,*)
- args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
- arg=
-@@ -2147,6 +2152,15 @@
+ func_stripname '-Wl,' '' "$arg"
+ args=$func_stripname_result
+@@ -5067,6 +5072,15 @@ func_mode_link ()
lib=
found=no
case $deplib in
Added: desktop/unstable/libwnck/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libwnck/debian/patches/series?rev=23988&op=file
==============================================================================
--- desktop/unstable/libwnck/debian/patches/series (added)
+++ desktop/unstable/libwnck/debian/patches/series [utf-8] Fri Apr 23 17:51:38 2010
@@ -1,0 +1,2 @@
+01_vertical_panel.patch
+99_ltmain_as-needed.patch
Modified: desktop/unstable/libwnck/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libwnck/debian/rules?rev=23988&op=diff
==============================================================================
--- desktop/unstable/libwnck/debian/rules [utf-8] (original)
+++ desktop/unstable/libwnck/debian/rules [utf-8] Fri Apr 23 17:51:38 2010
@@ -1,7 +1,6 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
include /usr/share/cdbs/1/class/gnome.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
Added: desktop/unstable/libwnck/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libwnck/debian/source/format?rev=23988&op=file
==============================================================================
--- desktop/unstable/libwnck/debian/source/format (added)
+++ desktop/unstable/libwnck/debian/source/format [utf-8] Fri Apr 23 17:51:38 2010
@@ -1,0 +1,1 @@
+3.0 (quilt)
More information about the pkg-gnome-commits
mailing list