Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/xsnap/files/
Date: Sun, 13 Aug 2017 11:31:53
Message-Id: 1502623769.b1273a49b3f1ba4ccd5e54c4ddafb87022ab0700.soap@gentoo
1 commit: b1273a49b3f1ba4ccd5e54c4ddafb87022ab0700
2 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Thu Aug 10 17:50:59 2017 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 13 11:29:29 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1273a49
7
8 x11-misc/xsnap: remove unused patch
9
10 Closes: https://github.com/gentoo/gentoo/pull/5383
11
12 x11-misc/xsnap/files/xsnap-1.5.10-prefix.patch | 40 --------------------------
13 1 file changed, 40 deletions(-)
14
15 diff --git a/x11-misc/xsnap/files/xsnap-1.5.10-prefix.patch b/x11-misc/xsnap/files/xsnap-1.5.10-prefix.patch
16 deleted file mode 100644
17 index ac4f96f3fd7..00000000000
18 --- a/x11-misc/xsnap/files/xsnap-1.5.10-prefix.patch
19 +++ /dev/null
20 @@ -1,40 +0,0 @@
21 -From: Nathan Phillip Brink <binki@g.o>
22 -Subject: Fix installation of xsnap on gentoo-prefix.
23 -
24 ---- a/po/Makefile
25 -+++ b/po/Makefile
26 -@@ -19,7 +19,6 @@
27 - # along with this program. If not, see <http://www.gnu.org/licenses/>.
28 -
29 - CATALOGS="fr"
30 --LOCALEDIR=/usr/share/locale
31 -
32 - all:
33 - for cat in $(CATALOGS) ; do msgfmt -o $$cat.mo -v $$cat.po ; done
34 -
35 ---- a/Imakefile
36 -+++ b/Imakefile
37 -@@ -37,9 +37,10 @@
38 - /* This is the right link order [Steff] */
39 - LOCAL_LIBRARIES = -lz $(XPMLIB) $(XFTLIB) $(PNGLIB) $(JPEGLIB) $(XLIB)
40 -
41 -- DEFINES = -DENABLE_NLS -DXPM -DPNG -DJPG -DPACKAGE=\"xsnap\" -DLOCALEDIR=\"/usr/share/locale\"
42 -+LOCALEDIR = /usr/share/locale
43 -+ DEFINES = -DENABLE_NLS -DXPM -DPNG -DJPG -DPACKAGE=\"xsnap\" -DLOCALEDIR=\"$(LOCALEDIR)\"
44 -
45 --# DEFINES = -DXPM -DPNG -DJPG -DPACKAGE=\"xsnap\" -DLOCALEDIR=\"/usr/share/locale\"
46 -+# DEFINES = -DXPM -DPNG -DJPG -DPACKAGE=\"xsnap\" -DLOCALEDIR=\"$(LOCALEDIR)\"
47 -
48 - ComplexProgramTarget(xsnap)
49 -
50 -@@ -55,8 +56,8 @@
51 - install::
52 - cp -f xsnap-ocr $(DESTDIR)/$(BINDIR)
53 - chmod a+rx $(DESTDIR)/$(BINDIR)/xsnap-ocr
54 -- cp -f xsnap.1.gz xsnap-ocr.1.gz $(DESTDIR)/usr/share/man/man1
55 -- cd po ; $(MAKE) install
56 -+ cp -f xsnap.1.gz xsnap-ocr.1.gz $(DESTDIR)/$(MANDIR)
57 -+ cd po ; $(MAKE) LOCALEDIR='$(LOCALEDIR)' install
58 -
59 - clean::
60 - cd po ; $(MAKE) clean