| 1 |
tetromino 12/02/11 07:59:16 |
| 2 |
|
| 3 |
Added: deja-dup-21.2-linguas.patch |
| 4 |
Log: |
| 5 |
Add patch to respect LINGUAS (bug #402677, thanks to Piotr Szymaniak for reporting); with this patch, the nls USE flag no longer needed. Do not install static libraries and .la files. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha85/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 app-backup/deja-dup/files/deja-dup-21.2-linguas.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/deja-dup/files/deja-dup-21.2-linguas.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/deja-dup/files/deja-dup-21.2-linguas.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: deja-dup-21.2-linguas.patch |
| 16 |
=================================================================== |
| 17 |
From 45e4b91bc7a987dc784c18564c9f8d2585befb0d Mon Sep 17 00:00:00 2001 |
| 18 |
From: Alexandre Rostovtsev <tetromino@g.o> |
| 19 |
Date: Sat, 11 Feb 2012 02:43:18 -0500 |
| 20 |
Subject: [PATCH] Use intltool's LINGUAS handling code for man pages |
| 21 |
|
| 22 |
LINGUAS needs to be handled the same way in man/ and po/. |
| 23 |
|
| 24 |
Otherwise, if building with LINGUAS set, the build system tries to |
| 25 |
generate man pages for languages for which localization messages |
| 26 |
had not been generated, resulting in build failure: |
| 27 |
|
| 28 |
make[2]: Entering directory |
| 29 |
`/var/tmp/portage/app-backup/deja-dup-21.2-r1/work/deja-dup-21.2/man' |
| 30 |
make[2]: Nothing to be done for `install-exec-am'. |
| 31 |
make[2]: *** No rule to make target `ar/stamp', needed by `man'. Stop. |
| 32 |
--- |
| 33 |
man/Makefile.am | 17 +++++++++++++---- |
| 34 |
1 files changed, 13 insertions(+), 4 deletions(-) |
| 35 |
|
| 36 |
diff --git a/man/Makefile.am b/man/Makefile.am |
| 37 |
index 4aab2b1..cd837ed 100644 |
| 38 |
--- a/man/Makefile.am |
| 39 |
+++ b/man/Makefile.am |
| 40 |
@@ -17,9 +17,18 @@ |
| 41 |
# along with Déjà Dup. If not, see <http://www.gnu.org/licenses/>. |
| 42 |
|
| 43 |
# Here's a bunch of translation support. Some stolen from dpkg |
| 44 |
+# and intltool. |
| 45 |
+ |
| 46 |
+ALL_LINGUAS = @ALL_LINGUAS@ |
| 47 |
+ |
| 48 |
+PO_LINGUAS=$(shell if test -r $(top_srcdir)/po/LINGUAS; then grep -v "^\#" $(top_srcdir)/po/LINGUAS; else echo "$(ALL_LINGUAS)"; fi) |
| 49 |
+ |
| 50 |
+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep \^$$lang$$ $(top_srcdir)/po/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep \^$$lang$$`"; then printf "$$lang "; fi; done; fi) |
| 51 |
+ |
| 52 |
+USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done) |
| 53 |
+ |
| 54 |
+MAN_LINGUAS = C $(USE_LINGUAS) |
| 55 |
|
| 56 |
-POLINGUAS = $(shell grep -v "^\#" $(top_srcdir)/po/LINGUAS) |
| 57 |
-MAN_LINGUAS = C $(POLINGUAS) |
| 58 |
|
| 59 |
PAGES = deja-dup.1 deja-dup-preferences.1 |
| 60 |
|
| 61 |
@@ -52,7 +61,7 @@ clean-local-yes: |
| 62 |
install-data-local: install-data-local-@USE_NLS@ |
| 63 |
install-data-local-no: |
| 64 |
install-data-local-yes: man |
| 65 |
- for lang in $(POLINGUAS); do \ |
| 66 |
+ for lang in $(USE_LINGUAS); do \ |
| 67 |
$(mkinstalldirs) "$(DESTDIR)$(mandir)/$$lang/man1"; \ |
| 68 |
$(INSTALL_DATA) $$lang/*.1 "$(DESTDIR)$(mandir)/$$lang/man1"; \ |
| 69 |
done |
| 70 |
@@ -62,7 +71,7 @@ install-data-local-yes: man |
| 71 |
uninstall-local: uninstall-local-@USE_NLS@ |
| 72 |
uninstall-local-no: |
| 73 |
uninstall-local-yes: man |
| 74 |
- for lang in $(POLINGUAS); do \ |
| 75 |
+ for lang in $(USE_LINGUAS); do \ |
| 76 |
for file in $(PAGES); do \ |
| 77 |
rm -f "$(DESTDIR)$(mandir)/$$lang/man1/$$file"; \ |
| 78 |
done \ |
| 79 |
-- |
| 80 |
1.7.8.4 |
Archives