r42697 - in /attic/libwnck/debian: changelog patches/01_tasklist_orientation.patch rules

joss at users.alioth.debian.org joss at users.alioth.debian.org
Tue Sep 9 14:15:14 UTC 2014 

Author: joss
Date: Tue Sep  9 14:15:13 2014
New Revision: 42697

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=42697
Log:
* 01_tasklist_orientation.patch: define 
  WNCK_I_KNOW_THIS_IS_NOT_UPSTREAM in Makefile.am.
  Really closes: #558581.
* Remove the CFLAGS.

Modified:
    attic/libwnck/debian/changelog
    attic/libwnck/debian/patches/01_tasklist_orientation.patch
    attic/libwnck/debian/rules

Modified: attic/libwnck/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libwnck/debian/changelog?rev=42697&op=diff
==============================================================================
--- attic/libwnck/debian/changelog	[utf-8] (original)
+++ attic/libwnck/debian/changelog	[utf-8] Tue Sep  9 14:15:13 2014
@@ -1,3 +1,12 @@
+libwnck (2.30.7-3) UNRELEASED; urgency=low
+
+  * 01_tasklist_orientation.patch: define 
+    WNCK_I_KNOW_THIS_IS_NOT_UPSTREAM in Makefile.am.
+    Really closes: #558581.
+  * Remove the CFLAGS.
+
+ -- Josselin Mouette <joss at debian.org>  Tue, 09 Sep 2014 16:13:52 +0200
+
 libwnck (2.30.7-2) unstable; urgency=medium
 
   * Team upload.

Modified: attic/libwnck/debian/patches/01_tasklist_orientation.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libwnck/debian/patches/01_tasklist_orientation.patch?rev=42697&op=diff
==============================================================================
--- attic/libwnck/debian/patches/01_tasklist_orientation.patch	[utf-8] (original)
+++ attic/libwnck/debian/patches/01_tasklist_orientation.patch	[utf-8] Tue Sep  9 14:15:13 2014
@@ -1,11 +1,11 @@
 Debian #524117
 GNOME #513347 and #86382
 
-Index: libwnck-2.30.3/libwnck/tasklist.c
+Index: libwnck-2.30.7/libwnck/tasklist.c
 ===================================================================
---- libwnck-2.30.3.orig/libwnck/tasklist.c	2010-08-16 19:49:35.885871012 +0200
-+++ libwnck-2.30.3/libwnck/tasklist.c	2010-08-17 00:06:53.550368075 +0200
-@@ -234,6 +234,8 @@ struct _WnckTasklistPrivate
+--- libwnck-2.30.7.orig/libwnck/tasklist.c	2011-08-31 10:44:50.000000000 +0200
++++ libwnck-2.30.7/libwnck/tasklist.c	2014-09-09 16:13:23.362751307 +0200
+@@ -234,6 +234,8 @@
    GdkPixmap *background;
  
    guint drag_start_time;
@@ -14,7 +14,7 @@
  };
  
  static GType wnck_task_get_type (void);
-@@ -316,6 +318,7 @@ static int      wnck_tasklist_layout
+@@ -316,6 +318,7 @@
  					     int             max_width,
  					     int             max_height,
  					     int             n_buttons,
@@ -22,7 +22,7 @@
  					     int            *n_cols_out,
  					     int            *n_rows_out);
  
-@@ -976,6 +979,20 @@ wnck_tasklist_set_button_relief (WnckTas
+@@ -976,6 +979,20 @@
  }
  
  /**
@@ -43,7 +43,7 @@
   * wnck_tasklist_set_switch_workspace_on_unminimize:
   * @tasklist: a #WnckTasklist.
   * @switch_workspace_on_unminimize: whether to activate the #WnckWorkspace a
-@@ -1147,29 +1164,38 @@ wnck_tasklist_layout (GtkAllocation *all
+@@ -1147,29 +1164,38 @@
  		      int            max_width,
  		      int            max_height,
  		      int            n_buttons,
@@ -97,7 +97,7 @@
    return allocation->width / n_cols;
  }
  
-@@ -1367,19 +1393,31 @@ wnck_tasklist_size_request  (GtkWidget
+@@ -1367,19 +1393,31 @@
  			tasklist->priv->max_button_width,
  			tasklist->priv->max_button_height,
  			n_windows + n_startup_sequences,
@@ -136,7 +136,7 @@
      }
  
    while (ungrouped_class_groups != NULL &&
-@@ -1399,29 +1437,56 @@ wnck_tasklist_size_request  (GtkWidget
+@@ -1399,29 +1437,56 @@
  			    tasklist->priv->max_button_width,
  			    tasklist->priv->max_button_height,
  			    n_startup_sequences + n_windows - n_grouped_buttons,
@@ -215,7 +215,7 @@
      }
  
    g_list_free (ungrouped_class_groups);
-@@ -1443,8 +1508,13 @@ wnck_tasklist_size_request  (GtkWidget
+@@ -1443,8 +1508,13 @@
      
    tasklist->priv->size_hints = (int *)g_array_free (array, FALSE);
  
@@ -231,7 +231,7 @@
  }
  
  /**
-@@ -1540,6 +1610,7 @@ wnck_tasklist_size_allocate (GtkWidget
+@@ -1540,6 +1610,7 @@
  				       tasklist->priv->max_button_width,
  				       tasklist->priv->max_button_height,
  				       n_startup_sequences + n_windows,
@@ -239,7 +239,7 @@
  				       &n_cols, &n_rows);
    while (ungrouped_class_groups != NULL &&
  	 ((tasklist->priv->grouping == WNCK_TASKLIST_ALWAYS_GROUP) ||
-@@ -1589,6 +1660,7 @@ wnck_tasklist_size_allocate (GtkWidget
+@@ -1589,6 +1660,7 @@
  					   tasklist->priv->max_button_width,
  					   tasklist->priv->max_button_height,
  					   n_startup_sequences + n_windows - n_grouped_buttons,
@@ -247,7 +247,7 @@
  					   &n_cols, &n_rows);
      }
  
-@@ -2143,6 +2215,7 @@ wnck_tasklist_new (WnckScreen *screen)
+@@ -2143,6 +2215,7 @@
    WnckTasklist *tasklist;
  
    tasklist = g_object_new (WNCK_TYPE_TASKLIST, NULL);
@@ -255,7 +255,7 @@
  
    return GTK_WIDGET (tasklist);
  }
-@@ -4275,7 +4348,6 @@ wnck_task_new_from_window (WnckTasklist
+@@ -4275,7 +4348,6 @@
    WnckTask *task;
  
    task = g_object_new (WNCK_TYPE_TASK, NULL);
@@ -263,11 +263,11 @@
    task->type = WNCK_TASK_WINDOW;
    task->window = g_object_ref (window);
    task->class_group = g_object_ref (wnck_window_get_class_group (window));
-Index: libwnck-2.30.3/libwnck/tasklist.h
+Index: libwnck-2.30.7/libwnck/tasklist.h
 ===================================================================
---- libwnck-2.30.3.orig/libwnck/tasklist.h	2010-08-16 19:49:35.841870516 +0200
-+++ libwnck-2.30.3/libwnck/tasklist.h	2010-08-17 00:07:59.713865796 +0200
-@@ -99,6 +99,11 @@ void wnck_tasklist_set_include_all_works
+--- libwnck-2.30.7.orig/libwnck/tasklist.h	2011-08-31 10:44:50.000000000 +0200
++++ libwnck-2.30.7/libwnck/tasklist.h	2014-09-09 16:13:23.362751307 +0200
+@@ -99,6 +99,11 @@
  					       gboolean      include_all_workspaces);
  void wnck_tasklist_set_button_relief (WnckTasklist *tasklist,
                                        GtkReliefStyle relief);
@@ -279,3 +279,15 @@
  #ifndef WNCK_DISABLE_DEPRECATED
  void wnck_tasklist_set_minimum_width (WnckTasklist *tasklist, gint size);
  gint wnck_tasklist_get_minimum_width (WnckTasklist *tasklist);
+Index: libwnck-2.30.7/libwnck/Makefile.am
+===================================================================
+--- libwnck-2.30.7.orig/libwnck/Makefile.am	2011-08-31 10:45:21.000000000 +0200
++++ libwnck-2.30.7/libwnck/Makefile.am	2014-09-09 16:13:39.718653480 +0200
+@@ -13,6 +13,7 @@
+ 	$(LIBWNCK_CFLAGS)			\
+ 	-I$(top_srcdir)				\
+ 	-DWNCK_I_KNOW_THIS_IS_UNSTABLE		\
++	-DWNCK_I_KNOW_THIS_IS_NOT_UPSTREAM	\
+ 	-DWNCK_LOCALEDIR=\"$(wncklocaledir)\"	\
+ 	$(DISABLE_DEPRECATED_CFLAGS)
+ 

Modified: attic/libwnck/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libwnck/debian/rules?rev=42697&op=diff
==============================================================================
--- attic/libwnck/debian/rules	[utf-8] (original)
+++ attic/libwnck/debian/rules	[utf-8] Tue Sep  9 14:15:13 2014
@@ -10,7 +10,6 @@
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
-CFLAGS += -Wno-error=missing-prototypes
 
 DEB_CONFIGURE_EXTRA_FLAGS += \
 	--disable-gtk-doc \

More information about the pkg-gnome-commits mailing list