[libwnck] 04/38: * 01_tasklist_orientation.patch: define WNCK_I_KNOW_THIS_IS_NOT_UPSTREAM in Makefile.am. Really closes: #558581. * Remove the CFLAGS.
Mike Gabriel
sunweaver at debian.org
Mon Feb 8 15:01:17 UTC 2016
This is an automated email from the git hooks/post-receive script.
sunweaver pushed a commit to branch master
in repository libwnck.
commit cd5853c4e29fc7be3ec59c73635bfdf05eb07c82
Author: joss <joss at db0db5de-e4c8-0310-9441-90abf70311f7>
Date: Tue Sep 9 14:15:13 2014 +0000
* 01_tasklist_orientation.patch: define
WNCK_I_KNOW_THIS_IS_NOT_UPSTREAM in Makefile.am.
Really closes: #558581.
* Remove the CFLAGS.
git-svn-id: svn://anonscm.debian.org/pkg-gnome/attic/libwnck@42697 db0db5de-e4c8-0310-9441-90abf70311f7
---
debian/changelog | 9 ++++++
debian/patches/01_tasklist_orientation.patch | 48 +++++++++++++++++-----------
debian/rules | 1 -
3 files changed, 39 insertions(+), 19 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 64b7913..040e36d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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.
diff --git a/debian/patches/01_tasklist_orientation.patch b/debian/patches/01_tasklist_orientation.patch
index 786135a..bd71ed8 100644
--- a/debian/patches/01_tasklist_orientation.patch
+++ b/debian/patches/01_tasklist_orientation.patch
@@ -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 @@ Index: libwnck-2.30.3/libwnck/tasklist.c
};
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 @@ Index: libwnck-2.30.3/libwnck/tasklist.c
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 @@ Index: libwnck-2.30.3/libwnck/tasklist.c
* 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 @@ Index: libwnck-2.30.3/libwnck/tasklist.c
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 @@ Index: libwnck-2.30.3/libwnck/tasklist.c
}
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 @@ Index: libwnck-2.30.3/libwnck/tasklist.c
}
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 @@ Index: libwnck-2.30.3/libwnck/tasklist.c
}
/**
-@@ -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 @@ Index: libwnck-2.30.3/libwnck/tasklist.c
&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 @@ Index: libwnck-2.30.3/libwnck/tasklist.c
&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 @@ Index: libwnck-2.30.3/libwnck/tasklist.c
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 @@ Index: libwnck-2.30.3/libwnck/tasklist.c
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 @@ Index: libwnck-2.30.3/libwnck/tasklist.h
#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)
+
diff --git a/debian/rules b/debian/rules
index 60b4a06..ed9a3e7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,6 @@ include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk
-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 \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/libwnck.git
More information about the pkg-mate-commits
mailing list