diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /gnome-base/gnome-desktop | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'gnome-base/gnome-desktop')
7 files changed, 354 insertions, 0 deletions
diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest new file mode 100644 index 000000000000..1a87b3c9845d --- /dev/null +++ b/gnome-base/gnome-desktop/Manifest @@ -0,0 +1,3 @@ +DIST gnome-desktop-2.32.1.tar.bz2 1633847 SHA256 55cbecf67efe1fa1e57ac966520a7c46d799c8ba3c652a1219f60cafccb3739d SHA512 b8084d08366dab661a7ee369cd03ba62beddbdfa9a36b988b7d13d207b33d6916f7fa8691717fba7b6a70d8276779e35360b1dc385e6ec876f30ea7b8b373c28 WHIRLPOOL 0889e79b1b3956b0ef1330f661676b77bdb40e8110657ea7f4035618ea023fc4b35364629d68741f042c0b971db9fa4c7731065717612486f7546e07fe048a0d +DIST gnome-desktop-3.14.2.tar.xz 1105916 SHA256 3c284378fd4d5c9aba1ef98b8bab78d0f7fe514964f9dfcfc3b1591328d6b873 SHA512 f6b07219cd99f2b891d6a887380f05c5775a85bac74f545ab94fa1c1758aee2a9839aaa10d313f8b3806e36a0e554ef336cf5176c424618d79e954c892cf1ac3 WHIRLPOOL 122c7bd2bd7d06b278a034ddc413b61188603b36c9880788226fd9f8394a80d7f88aed1c8c880388a024c60bd0f46514a597fc163f5a8445d41a6770b7f84864 +DIST gnome-desktop-3.16.2.tar.xz 1078328 SHA256 3a8f196b46eb9dbd3ba2afb8fb5fef6a8825539d449a02181311242e22227bd0 SHA512 0b82cfd19fb38926313c5bb92061770a4242da87b0da4281d23d5bf7e566c3470f42c71f5d05b6913e16594d3ced331131fe7076e4fcd13319ef139a5265246c WHIRLPOOL 342b988422c7bbdc1d442e238e50f6e61bb18b5fc3ea03dc3fa326badda41d8ee6a917edc9a5e4d90b056ac3bc9a4b8dc0ce616e0b2b570727199a86efad971c 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 new file mode 100644 index 000000000000..2e845da46e5b --- /dev/null +++ b/gnome-base/gnome-desktop/files/gnome-desktop-2.32.1-gold.patch @@ -0,0 +1,16 @@ + 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 new file mode 100644 index 000000000000..583d7274379a --- /dev/null +++ b/gnome-base/gnome-desktop/files/gnome-desktop-2.32.1-thumbnails.patch @@ -0,0 +1,118 @@ +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 new file mode 100644 index 000000000000..f1e03e35cc7c --- /dev/null +++ b/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r2.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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="http://www.gnome.org/" + +LICENSE="GPL-2+ FDL-1.1+ LGPL-2+" +SLOT="2" +KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris" +IUSE="license-docs" + +# 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-proto/xproto + >=x11-proto/randrproto-1.2 +" +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_export_best + 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/gnome-desktop-3.14.2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.14.2.ebuild new file mode 100644 index 000000000000..491d0f2a1c54 --- /dev/null +++ b/gnome-base/gnome-desktop/gnome-desktop-3.14.2.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +GCONF_DEBUG="yes" + +inherit gnome2 virtualx + +DESCRIPTION="Libraries for the gnome desktop that are not part of the UI" +HOMEPAGE="https://git.gnome.org/browse/gnome-desktop" + +LICENSE="GPL-2+ FDL-1.1+ LGPL-2+" +SLOT="3/10" # subslot = libgnome-desktop-3 soname version +IUSE="+introspection" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris" + +# cairo[X] needed for gnome-bg +COMMON_DEPEND=" + app-text/iso-codes + >=dev-libs/glib-2.38:2 + >=x11-libs/gdk-pixbuf-2.21.3:2[introspection?] + >=x11-libs/gtk+-3.3.6:3[introspection?] + >=x11-libs/libXext-1.1 + >=x11-libs/libXrandr-1.3 + x11-libs/cairo:=[X] + x11-libs/libX11 + x11-misc/xkeyboard-config + >=gnome-base/gsettings-desktop-schemas-3.5.91 + introspection? ( >=dev-libs/gobject-introspection-0.9.7 ) +" +RDEPEND="${COMMON_DEPEND} + !<gnome-base/gnome-desktop-2.32.1-r1:2[doc] +" +DEPEND="${COMMON_DEPEND} + app-text/docbook-xml-dtd:4.1.2 + dev-util/gdbus-codegen + >=dev-util/gtk-doc-am-1.4 + >=dev-util/intltool-0.40.6 + sys-devel/gettext + x11-proto/xproto + >=x11-proto/randrproto-1.2 + virtual/pkgconfig +" + +# 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_configure() { + DOCS="AUTHORS ChangeLog HACKING NEWS README" + # Note: do *not* use "--with-pnp-ids-path" argument. Otherwise, the pnp.ids + # file (needed by other packages such as >=gnome-settings-daemon-3.1.2) + # will not get installed in ${pnpdatadir} (/usr/share/libgnome-desktop-3.0). + gnome2_src_configure \ + --disable-static \ + --with-gnome-distributor=Gentoo \ + --enable-desktop-docs \ + $(use_enable introspection) \ + ITSTOOL=$(type -P true) +} + +src_test() { + # Makes unittest fail without this locale installed + rm "${S}"/tests/he_IL* || die + + Xemake check +} diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.16.2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.16.2.ebuild new file mode 100644 index 000000000000..1ce011cb4a5b --- /dev/null +++ b/gnome-base/gnome-desktop/gnome-desktop-3.16.2.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +GCONF_DEBUG="yes" + +inherit gnome2 virtualx + +DESCRIPTION="Libraries for the gnome desktop that are not part of the UI" +HOMEPAGE="https://git.gnome.org/browse/gnome-desktop" + +LICENSE="GPL-2+ FDL-1.1+ LGPL-2+" +SLOT="3/10" # subslot = libgnome-desktop-3 soname version +IUSE="+introspection" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris" + +# cairo[X] needed for gnome-bg +COMMON_DEPEND=" + app-text/iso-codes + >=dev-libs/glib-2.38:2 + >=x11-libs/gdk-pixbuf-2.21.3:2[introspection?] + >=x11-libs/gtk+-3.3.6:3[introspection?] + >=x11-libs/libXext-1.1 + >=x11-libs/libXrandr-1.3 + x11-libs/cairo:=[X] + x11-libs/libX11 + x11-misc/xkeyboard-config + >=gnome-base/gsettings-desktop-schemas-3.5.91 + introspection? ( >=dev-libs/gobject-introspection-0.9.7 ) +" +RDEPEND="${COMMON_DEPEND} + !<gnome-base/gnome-desktop-2.32.1-r1:2[doc] +" +DEPEND="${COMMON_DEPEND} + app-text/docbook-xml-dtd:4.1.2 + dev-util/gdbus-codegen + >=dev-util/gtk-doc-am-1.14 + >=dev-util/intltool-0.40.6 + sys-devel/gettext + x11-proto/xproto + >=x11-proto/randrproto-1.2 + virtual/pkgconfig +" + +# 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_configure() { + DOCS="AUTHORS ChangeLog HACKING NEWS README" + # Note: do *not* use "--with-pnp-ids-path" argument. Otherwise, the pnp.ids + # file (needed by other packages such as >=gnome-settings-daemon-3.1.2) + # will not get installed in ${pnpdatadir} (/usr/share/libgnome-desktop-3.0). + gnome2_src_configure \ + --disable-static \ + --with-gnome-distributor=Gentoo \ + --enable-desktop-docs \ + $(use_enable introspection) \ + ITSTOOL=$(type -P true) +} + +src_test() { + Xemake check +} diff --git a/gnome-base/gnome-desktop/metadata.xml b/gnome-base/gnome-desktop/metadata.xml new file mode 100644 index 000000000000..683680a1275b --- /dev/null +++ b/gnome-base/gnome-desktop/metadata.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>gnome</herd> + <use> + <flag name="license-docs">Install help files documenting GNOME's + licenses</flag> + </use> +</pkgmetadata> |