diff options
Diffstat (limited to 'gnome-base/gsettings-desktop-schemas')
| -rw-r--r-- | gnome-base/gsettings-desktop-schemas/ChangeLog | 13 | ||||
| -rw-r--r-- | gnome-base/gsettings-desktop-schemas/files/gsettings-desktop-schemas-3.8.0-metacity-theme.patch | 12 | ||||
| -rw-r--r-- | gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.4.2.ebuild | 29 | ||||
| -rw-r--r-- | gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.8.0-r1.ebuild (renamed from gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.8.0.ebuild) | 22 |
4 files changed, 39 insertions, 37 deletions
diff --git a/gnome-base/gsettings-desktop-schemas/ChangeLog b/gnome-base/gsettings-desktop-schemas/ChangeLog index 336b09c4b33a..36df84bdaef5 100644 --- a/gnome-base/gsettings-desktop-schemas/ChangeLog +++ b/gnome-base/gsettings-desktop-schemas/ChangeLog @@ -1,6 +1,17 @@ # ChangeLog for gnome-base/gsettings-desktop-schemas # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gsettings-desktop-schemas/ChangeLog,v 1.54 2013/04/09 16:43:10 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gsettings-desktop-schemas/ChangeLog,v 1.55 2013/05/12 10:03:44 pacho Exp $ + +*gsettings-desktop-schemas-3.8.0-r1 (12 May 2013) + + 12 May 2013; Pacho Ramos <pacho@gentoo.org> + +files/gsettings-desktop-schemas-3.8.0-metacity-theme.patch, + +gsettings-desktop-schemas-3.8.0-r1.ebuild, + -gsettings-desktop-schemas-3.4.2.ebuild, + -gsettings-desktop-schemas-3.8.0.ebuild: + Apply Debian patch to not migrate metacity theme for consistency with the rest + of Gnome 3 theming (as other themes are not migrated), upstream bug #700154, + drop old. 09 Apr 2013; Agostino Sarubbo <ago@gentoo.org> gsettings-desktop-schemas-3.6.1.ebuild: diff --git a/gnome-base/gsettings-desktop-schemas/files/gsettings-desktop-schemas-3.8.0-metacity-theme.patch b/gnome-base/gsettings-desktop-schemas/files/gsettings-desktop-schemas-3.8.0-metacity-theme.patch new file mode 100644 index 000000000000..86f97b2cb6fa --- /dev/null +++ b/gnome-base/gsettings-desktop-schemas/files/gsettings-desktop-schemas-3.8.0-metacity-theme.patch @@ -0,0 +1,12 @@ +Index: gsettings-desktop-schemas-3.4.2/schemas/wm-schemas.convert +=================================================================== +--- gsettings-desktop-schemas-3.4.2.orig/schemas/wm-schemas.convert 2012-03-05 18:29:05.000000000 +0100 ++++ gsettings-desktop-schemas-3.4.2/schemas/wm-schemas.convert 2012-11-01 15:29:43.159883408 +0100 +@@ -11,7 +11,6 @@ action-middle-click-titlebar = /apps/met + action-right-click-titlebar = /apps/metacity/general/action_right_click_titlebar + auto-raise = /apps/metacity/general/auto_raise + auto-raise-delay = /apps/metacity/general/auto_raise_delay +-theme = /apps/metacity/general/theme + titlebar-uses-system-font = /apps/metacity/general/titlebar_uses_system_font + titlebar-font = /apps/metacity/general/titlebar_font + num-workspaces = /apps/metacity/general/num_workspaces diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.4.2.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.4.2.ebuild deleted file mode 100644 index 7e0da81106b5..000000000000 --- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.4.2.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.4.2.ebuild,v 1.12 2012/10/28 15:51:03 armin76 Exp $ - -EAPI="4" -GCONF_DEBUG="no" - -inherit gnome2 - -DESCRIPTION="Collection of GSettings schemas for GNOME desktop" -HOMEPAGE="http://www.gnome.org/" - -LICENSE="LGPL-2.1+" -SLOT="0" -IUSE="+introspection" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris" - -RDEPEND=">=dev-libs/glib-2.31:2 - introspection? ( >=dev-libs/gobject-introspection-1.31.0 )" -DEPEND="${RDEPEND} - sys-devel/gettext - >=dev-util/intltool-0.40 - virtual/pkgconfig" - -pkg_setup() { - G2CONF="${G2CONF} - $(use_enable introspection)" - DOCS="AUTHORS HACKING NEWS README" -} diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.8.0.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.8.0-r1.ebuild index 30a571424752..6a38e56e4d3c 100644 --- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.8.0.ebuild +++ b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.8.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.8.0.ebuild,v 1.1 2013/03/28 17:12:47 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.8.0-r1.ebuild,v 1.1 2013/05/12 10:03:44 pacho Exp $ EAPI="5" GCONF_DEBUG="no" @@ -15,16 +15,24 @@ SLOT="0" IUSE="+introspection" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris" -RDEPEND=">=dev-libs/glib-2.31:2 - introspection? ( >=dev-libs/gobject-introspection-1.31.0 )" +RDEPEND=" + >=dev-libs/glib-2.31:2 + introspection? ( >=dev-libs/gobject-introspection-1.31.0 ) +" DEPEND="${RDEPEND} sys-devel/gettext >=dev-util/intltool-0.40 - virtual/pkgconfig" + virtual/pkgconfig +" + +src_prepare() { + # Don't migrate metacity theme for consistency with the rest of + # Gnome 3 theming (as other themes are not migrated), upstream bug #700154 + epatch "${FILESDIR}/${PN}-3.8.0-metacity-theme.patch" + gnome2_src_prepare +} src_configure() { - G2CONF="${G2CONF} - $(use_enable introspection)" DOCS="AUTHORS HACKING NEWS README" - gnome2_src_configure + gnome2_src_configure $(use_enable introspection) } |