+++ /dev/null
-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);
+++ /dev/null
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-GNOME_TARBALL_SUFFIX="bz2"
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-r1
-
-DESCRIPTION="Libraries for the gnome desktop that are not part of the UI"
-HOMEPAGE="https://www.gnome.org/"
-
-LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="license-docs"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Note: gnome-desktop:2 and :3 install identical files in /usr/share/gnome/help
-# and /usr/share/omf when --enable-desktop-docs is passed to configure. To avoid
-# file conflict and pointless duplication, gnome-desktop:2[doc] will simply use
-# the files that are installed by :3[doc]
-# Note: depend on glib-2.34 to make sure users upgrade glib before gnome-desktop
-# to get a fix for bug #450930
-RDEPEND=">=x11-libs/gtk+-2.18:2
- >=dev-libs/glib-2.34:2
- >=x11-libs/libXrandr-1.2
- >=gnome-base/gconf-2:2
- >=x11-libs/startup-notification-0.5
- ${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}
- dev-util/gtk-doc-am
- >=dev-util/intltool-0.40
- virtual/pkgconfig
- >=app-text/gnome-doc-utils-0.3.2
- ~app-text/docbook-xml-dtd-4.1.2
- x11-base/xorg-proto
-"
-PDEPEND=">=dev-python/pygtk-2.8:2[${PYTHON_USEDEP}]
- >=dev-python/pygobject-2.14:2[${PYTHON_USEDEP}]
- license-docs? ( gnome-base/gnome-desktop:3[doc(+)] )
-"
-
-# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xproto
-# Includes X11/extensions/Xrandr.h that includes randr.h from randrproto (and
-# eventually libXrandr shouldn't RDEPEND on randrproto)
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-gold.patch
- epatch "${FILESDIR}"/${P}-thumbnails.patch #450930
- gnome2_src_prepare
-}
-
-src_configure() {
- python_setup
- gnome2_src_configure \
- --with-gnome-distributor=Gentoo \
- --disable-scrollkeeper \
- --disable-static \
- --disable-deprecations \
- --disable-desktop-docs
- # desktop-docs will be built by gnome-desktop:3
-}
-
-src_install() {
- DOCS="AUTHORS ChangeLog HACKING NEWS README"
- gnome2_src_install
- # python-r1.eclass doesn't like versioned python shebangs
- sed -e 's@#!\(.*python.*\)@#!/usr/bin/env python@' -i gnome-about/gnome-about
- python_doscript gnome-about/gnome-about
-}
projects / gentoo.git / commitdiff