diff options
author | Michael Sterrett <mr_bones_@gentoo.org> | 2010-01-05 17:28:24 +0000 |
---|---|---|
committer | Michael Sterrett <mr_bones_@gentoo.org> | 2010-01-05 17:28:24 +0000 |
commit | 718763289fd948c5824d317f12c08c5172b3e807 (patch) | |
tree | f0eebc361a37a2d7061a989ea68160aa629eed9a /games-rpg | |
parent | Version bump, minor bug fixes. http://releases.xfce.org/feeds/project/libxfce... (diff) | |
download | gentoo-2-718763289fd948c5824d317f12c08c5172b3e807.tar.gz gentoo-2-718763289fd948c5824d317f12c08c5172b3e807.tar.bz2 gentoo-2-718763289fd948c5824d317f12c08c5172b3e807.zip |
apply desktop file patch; rerolled desktop file patch to quiet patch and quiet desktop-file-validate
(Portage version: 2.1.6.13/cvs/Linux i686)
Diffstat (limited to 'games-rpg')
-rw-r--r-- | games-rpg/tmw/ChangeLog | 9 | ||||
-rw-r--r-- | games-rpg/tmw/files/tmw-0.0.29.1-desktop.patch | 36 | ||||
-rw-r--r-- | games-rpg/tmw/tmw-0.0.29.1.ebuild | 6 |
3 files changed, 37 insertions, 14 deletions
diff --git a/games-rpg/tmw/ChangeLog b/games-rpg/tmw/ChangeLog index 7f1038cd93df..34dfaf1b00c2 100644 --- a/games-rpg/tmw/ChangeLog +++ b/games-rpg/tmw/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for games-rpg/tmw -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-rpg/tmw/ChangeLog,v 1.34 2009/09/30 19:50:14 nyhm Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-rpg/tmw/ChangeLog,v 1.35 2010/01/05 17:28:24 mr_bones_ Exp $ + + 05 Jan 2010; Michael Sterrett <mr_bones_@gentoo.org> tmw-0.0.29.1.ebuild, + files/tmw-0.0.29.1-desktop.patch: + apply desktop file patch; rerolled desktop file patch to quiet patch + and quiet desktop-file-validate 30 Sep 2009; Tristan Heaven <nyhm@gentoo.org> tmw-0.0.29.1.ebuild: Add dependencies for USE=nls diff --git a/games-rpg/tmw/files/tmw-0.0.29.1-desktop.patch b/games-rpg/tmw/files/tmw-0.0.29.1-desktop.patch index 127efd371f3a..4e3e0cf11913 100644 --- a/games-rpg/tmw/files/tmw-0.0.29.1-desktop.patch +++ b/games-rpg/tmw/files/tmw-0.0.29.1-desktop.patch @@ -1,15 +1,22 @@ -Make sure desktop/pixmaps dont get thrown into /usr/games. - ---- Makefile.in -+++ Makefile.in -@@ -163,3 +163,3 @@ - SUBDIRS = data docs src +diff -ru tmw-0.0.29.1.orig/Makefile.in tmw-0.0.29.1/Makefile.in +--- tmw-0.0.29.1.orig/Makefile.in 2009-06-09 13:55:16.000000000 -0400 ++++ tmw-0.0.29.1/Makefile.in 2010-01-05 12:24:52.394781633 -0500 +@@ -248,7 +248,7 @@ + + # Subdirectories to build + SUBDIRS = data docs po src -desktopdir = $(datadir)/applications +desktopdir =/usr/share/applications desktop_DATA = tmw.desktop ---- data/icons/Makefile.in -+++ data/icons/Makefile.in -@@ -318,7 +318,7 @@ + + # Extra files to include +Only in tmw-0.0.29.1: Makefile.in.orig +diff -ru tmw-0.0.29.1.orig/data/icons/Makefile.in tmw-0.0.29.1/data/icons/Makefile.in +--- tmw-0.0.29.1.orig/data/icons/Makefile.in 2009-06-09 15:24:27.000000000 -0400 ++++ tmw-0.0.29.1/data/icons/Makefile.in 2010-01-05 12:24:52.395781115 -0500 +@@ -400,11 +400,11 @@ + + install-data-local: - $(mkinstalldirs) $(DESTDIR)$(datadir)/pixmaps - $(INSTALL) $(srcdir)/tmw.png $(DESTDIR)$(datadir)/pixmaps/tmw.png @@ -19,4 +26,15 @@ Make sure desktop/pixmaps dont get thrown into /usr/games. uninstall-local: - rm -f $(DESTDIR)$(datadir)/pixmaps/tmw.png + rm -f $(DESTDIR)/usr/share/pixmaps/tmw.png + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. +diff -ru tmw-0.0.29.1.orig/tmw.desktop tmw-0.0.29.1/tmw.desktop +--- tmw-0.0.29.1.orig/tmw.desktop 2009-05-10 10:34:37.000000000 -0400 ++++ tmw-0.0.29.1/tmw.desktop 2010-01-05 12:25:15.731780837 -0500 +@@ -12,4 +12,4 @@ + Terminal=false + Type=Application + Icon=tmw +-Categories=Application;Game; ++Categories=Game; diff --git a/games-rpg/tmw/tmw-0.0.29.1.ebuild b/games-rpg/tmw/tmw-0.0.29.1.ebuild index 69dbd418a16a..9202e7ff4f37 100644 --- a/games-rpg/tmw/tmw-0.0.29.1.ebuild +++ b/games-rpg/tmw/tmw-0.0.29.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-rpg/tmw/tmw-0.0.29.1.ebuild,v 1.2 2009/09/30 19:50:14 nyhm Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-rpg/tmw/tmw-0.0.29.1.ebuild,v 1.3 2010/01/05 17:28:24 mr_bones_ Exp $ EAPI=2 inherit eutils games @@ -15,7 +15,6 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" IUSE="nls opengl" -PATCHES=( "${FILESDIR}"/${P}-desktop.patch ) RDEPEND=">=dev-games/physfs-1.0.0 dev-libs/libxml2 @@ -39,6 +38,7 @@ src_prepare() { -e '/^SUBDIRS/s/fonts//' \ data/Makefile.in \ || die "sed failed" + epatch "${FILESDIR}"/${P}-desktop.patch } src_configure() { |