summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gentoo.org>2020-04-21 22:58:11 -0700
committerMatt Turner <mattst88@gentoo.org>2020-04-21 22:59:12 -0700
commitf2b92e94ab64f45c691cf4f1ec90b2ae7d231e04 (patch)
treeadb9be755ba06232ae084f5f9394fbb741462aaf /gnome-base/gnome-desktop/files
parentdev-ruby/optimist: add 3.0.1 (diff)
downloadgentoo-f2b92e94ab64f45c691cf4f1ec90b2ae7d231e04.tar.gz
gentoo-f2b92e94ab64f45c691cf4f1ec90b2ae7d231e04.tar.bz2
gentoo-f2b92e94ab64f45c691cf4f1ec90b2ae7d231e04.zip
gnome-base/gnome-desktop:2: Remove
Signed-off-by: Matt Turner <mattst88@gentoo.org>
Diffstat (limited to 'gnome-base/gnome-desktop/files')
-rw-r--r--gnome-base/gnome-desktop/files/gnome-desktop-2.32.1-gold.patch16
-rw-r--r--gnome-base/gnome-desktop/files/gnome-desktop-2.32.1-thumbnails.patch118
2 files changed, 0 insertions, 134 deletions
diff --git a/gnome-base/gnome-desktop/files/gnome-desktop-2.32.1-gold.patch b/gnome-base/gnome-desktop/files/gnome-desktop-2.32.1-gold.patch
deleted file mode 100644
index 2e845da46e5..00000000000
--- a/gnome-base/gnome-desktop/files/gnome-desktop-2.32.1-gold.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- libgnome-desktop/Makefile.in | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/libgnome-desktop/Makefile.in b/libgnome-desktop/Makefile.in
-index 39209f6..a57b09e 100644
---- a/libgnome-desktop/Makefile.in
-+++ b/libgnome-desktop/Makefile.in
-@@ -388,7 +388,7 @@ libgnome_desktop_2_la_SOURCES = \
-
- libgnome_desktop_2_la_LIBADD = \
- $(XLIB_LIBS) \
-- $(GNOME_DESKTOP_LIBS)
-+ $(GNOME_DESKTOP_LIBS) -lm
-
- libgnome_desktop_2_la_LDFLAGS = \
- -version-info $(LT_VERSION) \
diff --git a/gnome-base/gnome-desktop/files/gnome-desktop-2.32.1-thumbnails.patch b/gnome-base/gnome-desktop/files/gnome-desktop-2.32.1-thumbnails.patch
deleted file mode 100644
index 583d7274379..00000000000
--- a/gnome-base/gnome-desktop/files/gnome-desktop-2.32.1-thumbnails.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-Originally from https://github.com/mate-desktop/mate-desktop/commit/fcede97471263b7f145ceeb988f569d4aa9129b8
-Ported to gnome-desktop by Matthew Turnbull <sparky@bluefang-logic.com>
-
-Fixes nautilus-2 thumbnailing with >=glib-2.34
-
-https://bugs.gentoo.org/show_bug.cgi?id=450930
-
-diff -rupN a/libgnome-desktop/gnome-desktop-thumbnail.c b/libgnome-desktop/gnome-desktop-thumbnail.c
---- a/libgnome-desktop/gnome-desktop-thumbnail.c
-+++ b/libgnome-desktop/gnome-desktop-thumbnail.c
-@@ -526,8 +526,13 @@ gnome_desktop_thumbnail_factory_lookup (
-
- file = g_strconcat (g_checksum_get_string (checksum), ".png", NULL);
-
-+#if GLIB_CHECK_VERSION (2, 34, 0)
-+ path = g_build_filename (g_get_user_cache_dir (),
-+ "thumbnails",
-+#else
- path = g_build_filename (g_get_home_dir (),
- ".thumbnails",
-+#endif
- (priv->size == GNOME_DESKTOP_THUMBNAIL_SIZE_NORMAL)?"normal":"large",
- file,
- NULL);
-@@ -587,8 +592,13 @@ gnome_desktop_thumbnail_factory_has_vali
-
- file = g_strconcat (g_checksum_get_string (checksum), ".png", NULL);
-
-+#if GLIB_CHECK_VERSION (2, 34, 0)
-+ path = g_build_filename (g_get_user_cache_dir (),
-+ "thumbnails/fail",
-+#else
- path = g_build_filename (g_get_home_dir (),
- ".thumbnails/fail",
-+#endif
- appname,
- file,
- NULL);
-@@ -917,12 +927,17 @@ make_thumbnail_dirs (GnomeDesktopThumbna
-
- res = FALSE;
-
-+#if GLIB_CHECK_VERSION (2, 34, 0)
-+ thumbnail_dir = g_build_filename (g_get_user_cache_dir (),
-+ "thumbnails",
-+#else
- thumbnail_dir = g_build_filename (g_get_home_dir (),
- ".thumbnails",
-+#endif
- NULL);
- if (!g_file_test (thumbnail_dir, G_FILE_TEST_IS_DIR))
- {
-- g_mkdir (thumbnail_dir, 0700);
-+ g_mkdir_with_parents (thumbnail_dir, 0700);
- res = TRUE;
- }
-
-@@ -951,12 +966,17 @@ make_thumbnail_fail_dirs (GnomeDesktopTh
-
- res = FALSE;
-
-+#if GLIB_CHECK_VERSION (2, 34, 0)
-+ thumbnail_dir = g_build_filename (g_get_user_cache_dir (),
-+ "thumbnails",
-+#else
- thumbnail_dir = g_build_filename (g_get_home_dir (),
- ".thumbnails",
-+#endif
- NULL);
- if (!g_file_test (thumbnail_dir, G_FILE_TEST_IS_DIR))
- {
-- g_mkdir (thumbnail_dir, 0700);
-+ g_mkdir_with_parents (thumbnail_dir, 0700);
- res = TRUE;
- }
-
-@@ -1025,8 +1045,13 @@ gnome_desktop_thumbnail_factory_save_thu
-
- file = g_strconcat (g_checksum_get_string (checksum), ".png", NULL);
-
-+#if GLIB_CHECK_VERSION (2, 34, 0)
-+ path = g_build_filename (g_get_user_cache_dir (),
-+ "thumbnails",
-+#else
- path = g_build_filename (g_get_home_dir (),
- ".thumbnails",
-+#endif
- (priv->size == GNOME_DESKTOP_THUMBNAIL_SIZE_NORMAL)?"normal":"large",
- file,
- NULL);
-@@ -1129,8 +1154,13 @@ gnome_desktop_thumbnail_factory_create_f
-
- file = g_strconcat (g_checksum_get_string (checksum), ".png", NULL);
-
-+#if GLIB_CHECK_VERSION (2, 34, 0)
-+ path = g_build_filename (g_get_user_cache_dir (),
-+ "thumbnails/fail",
-+#else
- path = g_build_filename (g_get_home_dir (),
- ".thumbnails/fail",
-+#endif
- appname,
- file,
- NULL);
-@@ -1221,8 +1251,13 @@ gnome_desktop_thumbnail_path_for_uri (co
- file = g_strconcat (md5, ".png", NULL);
- g_free (md5);
-
-+#if GLIB_CHECK_VERSION (2, 34, 0)
-+ path = g_build_filename (g_get_user_cache_dir (),
-+ "thumbnails",
-+#else
- path = g_build_filename (g_get_home_dir (),
- ".thumbnails",
-+#endif
- (size == GNOME_DESKTOP_THUMBNAIL_SIZE_NORMAL)?"normal":"large",
- file,
- NULL);