diff options
| -rw-r--r-- | gnome-base/gnome-desktop/Manifest | 1 | ||||
| -rw-r--r-- | gnome-base/gnome-desktop/files/gnome-desktop-2.32.1-gold.patch | 16 | ||||
| -rw-r--r-- | gnome-base/gnome-desktop/files/gnome-desktop-2.32.1-thumbnails.patch | 118 | ||||
| -rw-r--r-- | gnome-base/gnome-desktop/gnome-desktop-2.32.1-r2.ebuild | 74 | ||||
| -rw-r--r-- | gnome-base/gnome-desktop/metadata.xml | 4 | ||||
| -rw-r--r-- | profiles/package.mask | 4 |
6 files changed, 0 insertions, 217 deletions
diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest index 7ba4bac82715..625c0c5f50f3 100644 --- a/gnome-base/gnome-desktop/Manifest +++ b/gnome-base/gnome-desktop/Manifest @@ -1,4 +1,3 @@ -DIST gnome-desktop-2.32.1.tar.bz2 1633847 BLAKE2B 9c69504b0f904fe04bdaa2e2fd3c6fbdd0cdd67033bae6e21377cce2deb68f05ed85bc735547c036923978ebdb8952c262676a01a33f8d7acffb0b964f97366a SHA512 b8084d08366dab661a7ee369cd03ba62beddbdfa9a36b988b7d13d207b33d6916f7fa8691717fba7b6a70d8276779e35360b1dc385e6ec876f30ea7b8b373c28 DIST gnome-desktop-3.32.2-patchset.tar.xz 7404 BLAKE2B ecc821d3338957d0a123d625607d727019d9500915a76ff6d10d3000e1fc1e51fc7c0382374752582aef641d005cd73d39148466b08c53dc1ce9872e73a21215 SHA512 0471f0a6d9213ea60e867bd4f381575f6a94fa0fde57cc1a360e2d4ef98c11f2f973d3d95347db8f24aacb2249ba84ffc4e35e05bb595d9d3b6debe561ed88da DIST gnome-desktop-3.32.2.tar.xz 709128 BLAKE2B f0335d1ad583f0b000c47826cd4b6eb24624862b22b00e9d42759ed1cfcf3dba6f091dd85504c9c8da8b9789bf78cf53d284942ba6e2d3c630db028b4a0a69c6 SHA512 7dfa5c3e4b77637cc40e6244eb8ce8cb314cf92d865b64e36c5dffa8a699e91c81bd359f0a89a725c064eafec965d2b9d119aa05f1de103cd836a4bff9119a99 DIST gnome-desktop-3.34.4.tar.xz 715280 BLAKE2B 34ee3d4a36e7b8212d5285f766b030ae9369ec99be90dbf86a10f6b6727f221770c43db012c9e4634b8c95c7ffb97d435fb3555b1bc184ec4127538ba6ab261b SHA512 de3ac71725f4cc55b22af4f6f04516d9a5cbdd27876f302fc78c864c1461e444967de3dae3a6944124b33335c9e6f4f96b9de63053c582917509b90844acbe3f 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 2e845da46e5b..000000000000 --- 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 583d7274379a..000000000000 --- 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); diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r2.ebuild deleted file mode 100644 index c0b20f78db31..000000000000 --- a/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r2.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# 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 -} diff --git a/gnome-base/gnome-desktop/metadata.xml b/gnome-base/gnome-desktop/metadata.xml index 65b08cd27572..996e7cacd217 100644 --- a/gnome-base/gnome-desktop/metadata.xml +++ b/gnome-base/gnome-desktop/metadata.xml @@ -5,8 +5,4 @@ <email>gnome@gentoo.org</email> <name>Gentoo GNOME Desktop</name> </maintainer> - <use> - <flag name="license-docs">Install help files documenting GNOME's - licenses</flag> - </use> </pkgmetadata> diff --git a/profiles/package.mask b/profiles/package.mask index f3621dc71868..d3217cef1455 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -639,10 +639,6 @@ games-misc/OilWar x11-libs/gtkglarea media-sound/galan -# Matt Turner <mattst88@gentoo.org> (2020-03-20) -# No reverse deps. GNOME 2 era slot. Removal in 30 days -gnome-base/gnome-desktop:2 - # Andreas Sturmlechner <asturm@gentoo.org> (2020-03-14) # Breaks at least dev-games/simgear right now, bug #709878. ~dev-games/openscenegraph-3.6.5 |