From 023391b4a7cb6c2e1492121a730d666cbc879b8ace83e02185400ca5b11a6319 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 23 Feb 2018 08:35:36 +0000 Subject: [PATCH] Accepting request 578138 from GNOME:Next - Update to version 3.22.28: - Update to version 3.22.27: OBS-URL: https://build.opensuse.org/request/show/578138 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk3?expand=0&rev=307 --- gtk+-3.22.26.tar.xz | 3 - gtk+-3.22.28.tar.xz | 3 + ...nt-FUSE-reachable-network-shares-in-.patch | 74 ------------------- gtk3.changes | 32 ++++++++ gtk3.spec | 9 +-- 5 files changed, 38 insertions(+), 83 deletions(-) delete mode 100644 gtk+-3.22.26.tar.xz create mode 100644 gtk+-3.22.28.tar.xz delete mode 100644 gtk3-placesview-Present-FUSE-reachable-network-shares-in-.patch diff --git a/gtk+-3.22.26.tar.xz b/gtk+-3.22.26.tar.xz deleted file mode 100644 index 9d65452..0000000 --- a/gtk+-3.22.26.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:61eef0d320e541976e2dfe445729f12b5ade53050ee9de6184235cb60cd4b967 -size 18922136 diff --git a/gtk+-3.22.28.tar.xz b/gtk+-3.22.28.tar.xz new file mode 100644 index 0000000..17a22dc --- /dev/null +++ b/gtk+-3.22.28.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d299612b018cfed7b2c689168ab52b668023708e17c335eb592260d186f15e1f +size 22157948 diff --git a/gtk3-placesview-Present-FUSE-reachable-network-shares-in-.patch b/gtk3-placesview-Present-FUSE-reachable-network-shares-in-.patch deleted file mode 100644 index 744b0ec..0000000 --- a/gtk3-placesview-Present-FUSE-reachable-network-shares-in-.patch +++ /dev/null @@ -1,74 +0,0 @@ -Index: gtk+-3.20.10/gtk/gtkplacesview.c -=================================================================== ---- gtk+-3.20.10.orig/gtk/gtkplacesview.c -+++ gtk+-3.20.10/gtk/gtkplacesview.c -@@ -1129,8 +1129,7 @@ update_places (GtkPlacesView *view) - populate_servers (view); - - /* fetch networks and add them asynchronously */ -- if (!gtk_places_view_get_local_only (view)) -- fetch_networks (view); -+ fetch_networks (view); - - update_view_mode (view); - /* Check whether we still are in a loading state */ -@@ -1895,12 +1894,37 @@ on_listbox_row_activated (GtkPlacesView - } - - static gboolean -+is_mount_locally_accessible (GMount *mount) -+{ -+ GFile *base_file; -+ gchar *path; -+ -+ if (mount == NULL) -+ return FALSE; -+ -+ base_file = g_mount_get_root (mount); -+ -+ if (base_file == NULL) -+ return FALSE; -+ -+ path = g_file_get_path (base_file); -+ g_object_unref (base_file); -+ -+ if (path == NULL) -+ return FALSE; -+ -+ g_free (path); -+ return TRUE; -+} -+ -+static gboolean - listbox_filter_func (GtkListBoxRow *row, - gpointer user_data) - { - GtkPlacesViewPrivate *priv; - gboolean is_network; - gboolean is_placeholder; -+ gboolean is_local = FALSE; - gboolean retval; - gboolean searching; - gchar *name; -@@ -1913,7 +1937,20 @@ listbox_filter_func (GtkListBoxRow *row, - is_network = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (row), "is-network")); - is_placeholder = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (row), "is-placeholder")); - -- if (is_network && priv->local_only) -+ if (GTK_IS_PLACES_VIEW_ROW (row)) -+ { -+ GtkPlacesViewRow *placesviewrow; -+ GMount *mount; -+ -+ placesviewrow = GTK_PLACES_VIEW_ROW (row); -+ g_object_get(G_OBJECT (placesviewrow), "mount", &mount, NULL); -+ -+ is_local = is_mount_locally_accessible (mount); -+ -+ g_clear_object (&mount); -+ } -+ -+ if (is_network && priv->local_only && !is_local) - return FALSE; - - if (is_placeholder && searching) diff --git a/gtk3.changes b/gtk3.changes index 4ba8407..02ab996 100644 --- a/gtk3.changes +++ b/gtk3.changes @@ -1,3 +1,35 @@ +------------------------------------------------------------------- +Mon Feb 19 10:52:48 UTC 2018 - dimstar@opensuse.org + +- Update to version 3.22.28: + + Improve frame clock accuracy (bgo#787665). + + Bugs fixed: bgo#793442. + +------------------------------------------------------------------- +Wed Feb 14 11:18:25 UTC 2018 - dimstar@opensuse.org + +- Update to version 3.22.27: + + Require libcloudproviders 0.2.5. + + The Emoji chooser can now be used with GtkTextView as well. + + The Emoji chooser avoids fallback sequences that break the + grid. + + GTK+ is now using ~/.config/gtk-3.0/settings.ini when using + Wayland without dconf. + + Make fuse-mounted network filesystems show up in Other + Locations. + + The font chooser dialog supports search now. + + Bugs fixed: bgo#737175, bgo#741633, bgo#771986, bgo#774248, + bgo#779009, bgo#786123, bgo#786509, bgo#786528, bgo#787089, + bgo#787128, bgo#789054, bgo#789160, bgo#789268, bgo#790029, + bgo#790031, bgo#790033, bgo#790201, bgo#790270, bgo#790862, + bgo#790963, bgo#791039, bgo#791062, bgo#791234, bgo#791281, + bgo#791363, bgo#791549, bgo#791650, bgo#791710, bgo#791943, + bgo#792279, bgo#792459, bgo#792624. + + Updated translations. +- Drop + gtk3-placesview-Present-FUSE-reachable-network-shares-in-.patch: + fixed upstream. + ------------------------------------------------------------------- Fri Dec 29 00:02:31 UTC 2017 - jengelh@inai.de diff --git a/gtk3.spec b/gtk3.spec index 70ea59c..09d67b2 100644 --- a/gtk3.spec +++ b/gtk3.spec @@ -1,7 +1,7 @@ # # spec file for package gtk3 # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2010 Dominique Leuenebrger, Amsterdam, Netherlands # # All modifications and additions to the file contributed by third parties @@ -29,7 +29,7 @@ Name: gtk3 %define _name gtk+ -Version: 3.22.26 +Version: 3.22.28 Release: 0 Summary: The GTK+ toolkit library (version 3) License: LGPL-2.1+ @@ -48,8 +48,6 @@ Patch1: gtk3-path-local.patch Patch3: gtk3-restore-filechooser-click-behavior.patch # PATCH-FIX-OPENSUSE revert-forced-xftdpi.patch fvogt@opensuse.org -- Revert very controversal commit on GTK3, forcing DPI to 96 Patch4: gtk3-revert-forced-xftdpi.patch -# PATCH-FIX-UPSTREAM gtk3-placesview-Present-FUSE-reachable-network-shares-in-.patch bgo#787128 bsc#1062879 vliaskovitis@suse.com -- Present FUSE reachable network shared in gtkplacesview -Patch6: gtk3-placesview-Present-FUSE-reachable-network-shares-in-.patch BuildRequires: cups-devel >= 1.2 BuildRequires: docbook-xsl-stylesheets BuildRequires: fdupes @@ -65,7 +63,7 @@ BuildRequires: pkgconfig(atk) >= 2.15.1 BuildRequires: pkgconfig(atk-bridge-2.0) BuildRequires: pkgconfig(cairo) >= 1.14.0 # Enable cloudproviders once upstream settles on a location and version -#BuildRequires: pkgconfig(cloudproviders) >= 0.2.0 +#BuildRequires: pkgconfig(cloudproviders) >= 0.2.5 BuildRequires: pkgconfig(colord) BuildRequires: pkgconfig(epoxy) >= 1.0 BuildRequires: pkgconfig(fontconfig) @@ -371,7 +369,6 @@ cp -a %{S:1} . #patch1 -p0 %patch3 -p1 %patch4 -p1 -%patch6 -p1 %build # Disabled since patch 1 is in need of rebase