[gentoo-commits] repo/gentoo:master commit in: x11-misc/xsnap/files/

[gentoo-commits] repo/gentoo:master commit in: x11-misc/xsnap/files/

[David Seifert]

commit:     b1273a49b3f1ba4ccd5e54c4ddafb87022ab0700
Author:     Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Thu Aug 10 17:50:59 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Aug 13 11:29:29 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1273a49

x11-misc/xsnap: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/5383

 x11-misc/xsnap/files/xsnap-1.5.10-prefix.patch | 40 --------------------------
 1 file changed, 40 deletions(-)

diff --git a/x11-misc/xsnap/files/xsnap-1.5.10-prefix.patch b/x11-misc/xsnap/files/xsnap-1.5.10-prefix.patch
deleted file mode 100644
index ac4f96f3fd7..00000000000
--- a/x11-misc/xsnap/files/xsnap-1.5.10-prefix.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Nathan Phillip Brink <binki@gentoo.org>
-Subject: Fix installation of xsnap on gentoo-prefix.
-
---- a/po/Makefile
-+++ b/po/Makefile
-@@ -19,7 +19,6 @@
- #       along with this program. If not, see <http://www.gnu.org/licenses/>.
- 
- CATALOGS="fr"
--LOCALEDIR=/usr/share/locale
- 
- all:
- 	for cat in $(CATALOGS) ; do msgfmt -o $$cat.mo -v $$cat.po ; done
-
---- a/Imakefile
-+++ b/Imakefile
-@@ -37,9 +37,10 @@
- /* This is the right link order [Steff] */
- LOCAL_LIBRARIES = -lz $(XPMLIB) $(XFTLIB) $(PNGLIB) $(JPEGLIB) $(XLIB)
- 
--	DEFINES = -DENABLE_NLS -DXPM -DPNG -DJPG -DPACKAGE=\"xsnap\" -DLOCALEDIR=\"/usr/share/locale\"
-+LOCALEDIR = /usr/share/locale
-+	DEFINES = -DENABLE_NLS -DXPM -DPNG -DJPG -DPACKAGE=\"xsnap\" -DLOCALEDIR=\"$(LOCALEDIR)\"
- 
--#        DEFINES = -DXPM -DPNG -DJPG -DPACKAGE=\"xsnap\" -DLOCALEDIR=\"/usr/share/locale\"
-+#        DEFINES = -DXPM -DPNG -DJPG -DPACKAGE=\"xsnap\" -DLOCALEDIR=\"$(LOCALEDIR)\"
- 
- ComplexProgramTarget(xsnap)
- 
-@@ -55,8 +56,8 @@
- install::
- 	cp -f xsnap-ocr $(DESTDIR)/$(BINDIR)
- 	chmod a+rx $(DESTDIR)/$(BINDIR)/xsnap-ocr
--	cp -f xsnap.1.gz xsnap-ocr.1.gz $(DESTDIR)/usr/share/man/man1
--	cd po ; $(MAKE) install
-+	cp -f xsnap.1.gz xsnap-ocr.1.gz $(DESTDIR)/$(MANDIR)
-+	cd po ; $(MAKE) LOCALEDIR='$(LOCALEDIR)' install
- 
- clean::
- 	cd po ; $(MAKE) clean