From 0ad6e36e38cca2f6e20276fc10d452a379f2efcf Mon Sep 17 00:00:00 2001 From: raveit65 Date: Feb 19 2022 22:26:37 +0000 Subject: update to 40.1 --- diff --git a/.gitignore b/.gitignore index ff2f7c3..02f46c5 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ libwnck-2.30.3.tar.bz2 /sources /libwnck-3.36.0.tar.xz /libwnck-40.0.tar.xz +/libwnck-40.1.tar.xz diff --git a/libwnck3.spec b/libwnck3.spec index c514b1d..62f19d6 100644 --- a/libwnck3.spec +++ b/libwnck3.spec @@ -2,13 +2,12 @@ Summary: Window Navigator Construction Kit Name: libwnck3 -Version: 40.0 -Release: 3%{?dist} +Version: 40.1 +Release: 1%{?dist} URL: http://download.gnome.org/sources/%{source_name}/ Source0: http://download.gnome.org/sources/%{source_name}/40/%{source_name}-%{version}.tar.xz License: LGPLv2+ -Patch1: libwnck_0001-Revert-pager-do-not-change-workspace-size-from-size_.patch # https://gitlab.gnome.org/GNOME/libwnck/-/commit/bd8ab37 Patch2: libwnck_0001-xutils-move-WnckIconCache-to-its-own-file.patch # https://gitlab.gnome.org/GNOME/libwnck/-/merge_requests/10 @@ -80,6 +79,9 @@ developing applications that use %{name}. %changelog +* Sat Feb 19 2022 Wolfgang Ulbrich - 40.1-1 +- update to 40.1 + * Sun Dec 12 2021 Wolfgang Ulbrich - 40.0-3 - use https://gitlab.gnome.org/GNOME/libwnck/-/commit/bd8ab37 - Scale tasklist icons diff --git a/libwnck_0001-Revert-pager-do-not-change-workspace-size-from-size_.patch b/libwnck_0001-Revert-pager-do-not-change-workspace-size-from-size_.patch deleted file mode 100644 index 528f747..0000000 --- a/libwnck_0001-Revert-pager-do-not-change-workspace-size-from-size_.patch +++ /dev/null @@ -1,98 +0,0 @@ -From 89a5825eb20bfa91b91055e5a3dfe6445e6b9bd2 Mon Sep 17 00:00:00 2001 -From: raveit65 -Date: Fri, 11 Jun 2021 21:26:40 +0200 -Subject: [PATCH] Revert "pager: do not change workspace size from - size_allocate" - -This reverts commit 3456b747b6381f17d48629dd8fdd4d511e739b10. ---- - libwnck/pager.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 59 insertions(+) - -diff --git a/libwnck/pager.c b/libwnck/pager.c -index c769d62..a563a4d 100644 ---- a/libwnck/pager.c -+++ b/libwnck/pager.c -@@ -122,6 +122,8 @@ static void wnck_pager_get_preferred_height_for_width (GtkWidget *widget, - int width, - int *minimum_height, - int *natural_height); -+static void wnck_pager_size_allocate (GtkWidget *widget, -+ GtkAllocation *allocation); - static gboolean wnck_pager_draw (GtkWidget *widget, - cairo_t *cr); - static gboolean wnck_pager_button_press (GtkWidget *widget, -@@ -247,6 +249,7 @@ wnck_pager_class_init (WnckPagerClass *klass) - widget_class->get_preferred_width_for_height = wnck_pager_get_preferred_width_for_height; - widget_class->get_preferred_height = wnck_pager_get_preferred_height; - widget_class->get_preferred_height_for_width = wnck_pager_get_preferred_height_for_width; -+ widget_class->size_allocate = wnck_pager_size_allocate; - widget_class->draw = wnck_pager_draw; - widget_class->button_press_event = wnck_pager_button_press; - widget_class->button_release_event = wnck_pager_button_release; -@@ -684,6 +687,62 @@ wnck_pager_get_preferred_height_for_width (GtkWidget *widget, - *natural_height = *minimum_height = MAX (height, 0); - } - -+static gboolean -+_wnck_pager_queue_resize (gpointer data) -+{ -+ gtk_widget_queue_resize (GTK_WIDGET (data)); -+ return FALSE; -+} -+ -+static void -+wnck_pager_size_allocate (GtkWidget *widget, -+ GtkAllocation *allocation) -+{ -+ WnckPager *pager; -+ int workspace_size; -+ GtkBorder padding; -+ int width; -+ int height; -+ -+ pager = WNCK_PAGER (widget); -+ -+ width = allocation->width; -+ height = allocation->height; -+ -+ _wnck_pager_get_padding (pager, &padding); -+ width -= padding.left + padding.right; -+ height -= padding.top + padding.bottom; -+ -+ g_assert (pager->priv->n_rows > 0); -+ -+ if (pager->priv->orientation == GTK_ORIENTATION_VERTICAL) -+ { -+ if (pager->priv->show_all_workspaces) -+ workspace_size = (width - (pager->priv->n_rows - 1)) / pager->priv->n_rows; -+ else -+ workspace_size = width; -+ } -+ else -+ { -+ if (pager->priv->show_all_workspaces) -+ workspace_size = (height - (pager->priv->n_rows - 1))/ pager->priv->n_rows; -+ else -+ workspace_size = height; -+ } -+ -+ workspace_size = MAX (workspace_size, 1); -+ -+ if (workspace_size != pager->priv->workspace_size) -+ { -+ pager->priv->workspace_size = workspace_size; -+ g_idle_add (_wnck_pager_queue_resize, pager); -+ return; -+ } -+ -+ GTK_WIDGET_CLASS (wnck_pager_parent_class)->size_allocate (widget, -+ allocation); -+} -+ - static void - get_workspace_rect (WnckPager *pager, - int space, --- -2.31.1 - diff --git a/sources b/sources index 1fff0ee..41553b7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libwnck-40.0.tar.xz) = 059f2a2add3f95feb7759e827072905652a4dc9c6756d526743319b5016ee36191b5c9a4fb5204f85a13049c2bd1bb3d01b2456ddb3ddc8f76148a0ee1651696 +SHA512 (libwnck-40.1.tar.xz) = 50ba20547e95280d10f1f66f36eea6c649b59d385da7a9217c295150520099585a5ff43c08a552afb8b0db3ee7305bbb2c38d0baed84cc6dc0942f3ca1e43e29