diff options
| author |   Matthias Maier <tamiko@gentoo.org> | 2014-12-09 21:39:06 +0000 |
|---|---|---|
| committer | Matthias Maier <tamiko@gentoo.org> | 2014-12-09 21:39:06 +0000 |
| commit | ce77596a958bf4bb176df5cb32afd7b2991b39be (patch) | |
| tree | debe880fbbd66b5a301353fff9deb8e85866561e /mate-base | |
| parent | Stable for x86, wrt bug #532074 (diff) | |
| download | gentoo-2-ce77596a958bf4bb176df5cb32afd7b2991b39be.tar.gz gentoo-2-ce77596a958bf4bb176df5cb32afd7b2991b39be.tar.bz2 gentoo-2-ce77596a958bf4bb176df5cb32afd7b2991b39be.zip | |
fix a renaming issue with marco, bug #525512, enable epatch_user
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key BD3A97A3)
Diffstat (limited to 'mate-base')
| -rw-r--r-- | mate-base/mate-panel/ChangeLog | 9 | ||||
| -rw-r--r-- | mate-base/mate-panel/files/mate-panel-1.8.1-update_marco_wm_name.patch | 11 | ||||
| -rw-r--r-- | mate-base/mate-panel/mate-panel-1.8.1-r1.ebuild (renamed from mate-base/mate-panel/mate-panel-1.8.1.ebuild) | 8 |
3 files changed, 25 insertions, 3 deletions
diff --git a/mate-base/mate-panel/ChangeLog b/mate-base/mate-panel/ChangeLog index 1e8a82855268..1565e29e12a8 100644 --- a/mate-base/mate-panel/ChangeLog +++ b/mate-base/mate-panel/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for mate-base/mate-panel # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-panel/ChangeLog,v 1.14 2014/12/09 00:54:59 tamiko Exp $ +# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-panel/ChangeLog,v 1.15 2014/12/09 21:39:06 tamiko Exp $ + +*mate-panel-1.8.1-r1 (09 Dec 2014) + + 09 Dec 2014; Matthias Maier <tamiko@gentoo.org> + +files/mate-panel-1.8.1-update_marco_wm_name.patch, + +mate-panel-1.8.1-r1.ebuild, -mate-panel-1.8.1.ebuild: + fix a renaming issue with marco, bug #525512, enable epatch_user *mate-panel-1.8.1 (09 Dec 2014) diff --git a/mate-base/mate-panel/files/mate-panel-1.8.1-update_marco_wm_name.patch b/mate-base/mate-panel/files/mate-panel-1.8.1-update_marco_wm_name.patch new file mode 100644 index 000000000000..f57bf983bef9 --- /dev/null +++ b/mate-base/mate-panel/files/mate-panel-1.8.1-update_marco_wm_name.patch @@ -0,0 +1,11 @@ +--- a/applets/wncklet/workspace-switcher.c ++++ b/applets/wncklet/workspace-switcher.c +@@ -143,6 +143,8 @@ + + if (!wm_name) + pager->wm = PAGER_WM_UNKNOWN; ++ else if (strcmp(wm_name, "Metacity (Marco)") == 0) ++ pager->wm = PAGER_WM_MARCO; + else if (strcmp(wm_name, "Marco") == 0) + pager->wm = PAGER_WM_MARCO; + else if (strcmp(wm_name, "Compiz") == 0) diff --git a/mate-base/mate-panel/mate-panel-1.8.1.ebuild b/mate-base/mate-panel/mate-panel-1.8.1-r1.ebuild index 5c570e9691ba..f83d8cf459cb 100644 --- a/mate-base/mate-panel/mate-panel-1.8.1.ebuild +++ b/mate-base/mate-panel/mate-panel-1.8.1-r1.ebuild @@ -1,13 +1,13 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-panel/mate-panel-1.8.1.ebuild,v 1.1 2014/12/09 00:54:59 tamiko Exp $ +# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-panel/mate-panel-1.8.1-r1.ebuild,v 1.1 2014/12/09 21:39:06 tamiko Exp $ EAPI="5" GCONF_DEBUG="no" GNOME2_LA_PUNT="yes" -inherit autotools gnome2 versionator +inherit eutils autotools gnome2 versionator MATE_BRANCH="$(get_version_component_range 1-2)" @@ -60,6 +60,10 @@ src_prepare() { # Disable python check. sed -e '/AM_PATH_PYTHON/d' -i configure.ac || die + epatch "${FILESDIR}/${P}-update_marco_wm_name.patch" + + epatch_user + eautoreconf gnome2_src_prepare |