Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package nautilus-dropbox for
openSUSE:Factory checked in at 2022-03-19 22:20:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/nautilus-dropbox (Old)
and /work/SRC/openSUSE:Factory/.nautilus-dropbox.new.25692 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nautilus-dropbox"
Sat Mar 19 22:20:41 2022 rev:17 rq:962976 version:2020.03.04
Changes:
--------
--- /work/SRC/openSUSE:Factory/nautilus-dropbox/nautilus-dropbox.changes
2021-03-19 16:43:40.422152096 +0100
+++
/work/SRC/openSUSE:Factory/.nautilus-dropbox.new.25692/nautilus-dropbox.changes
2022-03-19 22:22:55.476952025 +0100
@@ -1,0 +2,5 @@
+Wed Jan 12 16:38:08 UTC 2022 - Dominique Leuenberger <[email protected]>
+
+- Add nautilus-dropbox-gtk4.patch: Fix build against Nautils/GTK4.
+
+-------------------------------------------------------------------
New:
----
nautilus-dropbox-gtk4.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nautilus-dropbox.spec ++++++
--- /var/tmp/diff_new_pack.YvcxZr/_old 2022-03-19 22:22:55.864952516 +0100
+++ /var/tmp/diff_new_pack.YvcxZr/_new 2022-03-19 22:22:55.868952521 +0100
@@ -28,6 +28,7 @@
Source:
https://www.dropbox.com/download?dl=packages/%{name}-%{version}.tar.bz2
# PATCH-FIX-OPENSUSE 98.patch [email protected] -- Hack together something
to accept GNOME 40 version schemes
Patch0:
https://patch-diff.githubusercontent.com/raw/dropbox/nautilus-dropbox/pull/98.patch
+Patch1: nautilus-dropbox-gtk4.patch
BuildRequires: libtool
BuildRequires: pkgconfig
BuildRequires: gobject-introspection
@@ -57,7 +58,7 @@
Summary: Dropbox client integrated into Nautilus
Group: Productivity/File utilities
Requires: dropbox >= %{version}
-Supplements: packageand(nautilus:dropbox-cli)
+Supplements: (nautilus and dropbox-cli)
%description -n nautilus-extension-dropbox
Dropbox is a free service that lets you bring your photos, docs, and videos
anywhere
++++++ nautilus-dropbox-gtk4.patch ++++++
diff --git a/src/nautilus-dropbox.c b/src/nautilus-dropbox.c
index c75ccbf..f554be3 100644
--- a/src/nautilus-dropbox.c
+++ b/src/nautilus-dropbox.c
@@ -808,11 +808,19 @@ remove_emblem_paths(GHashTable* emblem_paths_response)
gchar ** paths;
gint path_count;
+#if GTK_MAJOR_VERSION >= 4
+ paths = gtk_icon_theme_get_search_path(icon_theme);
+#else
gtk_icon_theme_get_search_path(icon_theme, &paths, &path_count);
+#endif
gint i, j, out = 0;
gboolean found = FALSE;
+#if GTK_MAJOR_VERSION >= 4
+ for (i = 0; paths[i]; i++) {
+#else
for (i = 0; i < path_count; i++) {
+#endif
gboolean keep = TRUE;
for (j = 0; emblem_paths_list[j] != NULL; j++) {
if (emblem_paths_list[j][0]) {
@@ -834,7 +842,11 @@ remove_emblem_paths(GHashTable* emblem_paths_response)
accomodate the changes */
if (found) {
paths[out] = NULL; /* Clear the last one */
+#if GTK_MAJOR_VERSION >= 4
+ gtk_icon_theme_set_search_path(icon_theme, (const gchar **)paths);
+#else
gtk_icon_theme_set_search_path(icon_theme, (const gchar **)paths, out);
+#endif
}
g_strfreev(paths);
