| 1 |
ssuominen 09/04/30 14:49:25 |
| 2 |
|
| 3 |
Added: xscreensaver-5.08-po-recreate.patch |
| 4 |
Log: |
| 5 |
Apply a patch from Fedora CVS to fix translations. Don't run eautoreconf wrt #240958, instead only unset LINGUAS because zh matches zh_CN or zh_TW which causes CATALOG error wrt #113681. |
| 6 |
(Portage version: 2.1.6.11/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 x11-misc/xscreensaver/files/xscreensaver-5.08-po-recreate.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/files/xscreensaver-5.08-po-recreate.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/files/xscreensaver-5.08-po-recreate.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: xscreensaver-5.08-po-recreate.patch |
| 15 |
=================================================================== |
| 16 |
--- xscreensaver-5.08/aclocal.m4.po 2002-05-11 10:44:33.000000000 +0900 |
| 17 |
+++ xscreensaver-5.08/aclocal.m4 2008-12-30 04:33:01.000000000 +0900 |
| 18 |
@@ -252,7 +252,10 @@ |
| 19 |
|
| 20 |
AC_OUTPUT_COMMANDS( |
| 21 |
[case "$CONFIG_FILES" in *po/Makefile.in*) |
| 22 |
+ rm -f po/stamp-it po/stamp-it.tmp |
| 23 |
+ > po/stamp-it.tmp |
| 24 |
sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile |
| 25 |
+ mv po/stamp-it.tmp po/stamp-it |
| 26 |
esac]) |
| 27 |
|
| 28 |
dnl These rules are solely for the distribution goal. While doing this |
| 29 |
--- xscreensaver-5.08/po/Makefile.in.in.po 2007-11-11 09:44:42.000000000 +0900 |
| 30 |
+++ xscreensaver-5.08/po/Makefile.in.in 2008-12-30 04:47:58.000000000 +0900 |
| 31 |
@@ -190,7 +190,7 @@ |
| 32 |
all-yes: $(CATALOGS) |
| 33 |
all-no: |
| 34 |
|
| 35 |
-$(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES) |
| 36 |
+$(GETTEXT_PACKAGE).pot: $(POTFILES) |
| 37 |
@INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) ; \ |
| 38 |
export INTLTOOL_EXTRACT ; \ |
| 39 |
echo top_srcdir=$(top_srcdir) $(GENPOT) ; \ |
| 40 |
@@ -274,6 +274,7 @@ |
| 41 |
|
| 42 |
distclean: clean |
| 43 |
rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m *.gmo *.pot |
| 44 |
+ rm -f stamp-it |
| 45 |
|
| 46 |
maintainer-clean: distclean |
| 47 |
@echo "This command is intended for maintainers to use;" |
| 48 |
@@ -282,8 +283,8 @@ |
| 49 |
|
| 50 |
depend: |
| 51 |
# fuck off. love, jwz. |
| 52 |
-#distdepend: generate_potfiles_in update-po $(DISTFILES) |
| 53 |
-distdepend:: |
| 54 |
+distdepend: generate_potfiles_in update-po $(DISTFILES) |
| 55 |
+#distdepend:: |
| 56 |
|
| 57 |
|
| 58 |
# jwz: Generates po/POTFILES.in by examining the source tree: |
| 59 |
@@ -292,6 +293,8 @@ |
| 60 |
generate_potfiles_in: |
| 61 |
@tmp=po.$$$$ ; \ |
| 62 |
file=POTFILES.in ; \ |
| 63 |
+ echo "sleeping 3 seconds..." ;\ |
| 64 |
+ sleep 3; \ |
| 65 |
( cd $(top_srcdir); \ |
| 66 |
echo "# Auto-generated: `LANG=C date`" ; \ |
| 67 |
( grep -l '_("' driver/*.[ch] ; \ |
| 68 |
@@ -362,16 +365,22 @@ |
| 69 |
&& (sed -e '/^#/d' \ |
| 70 |
-e "s/^\[.*\] +//" \ |
| 71 |
-e '/^[ ]*$$/d' \ |
| 72 |
- -e "s@.*@ $$posrcprefix& \\\\@" < $(srcdir)/$@.in \ |
| 73 |
+ -e "s@.*@ $$posrcprefix& \\\\@" < $@.in \ |
| 74 |
| sed -e '$$s/\\$$//') > $@-t \ |
| 75 |
&& chmod a-w $@-t \ |
| 76 |
&& mv $@-t $@ ) |
| 77 |
|
| 78 |
+Makefile: stamp-it |
| 79 |
+ @if test ! -f $@; then \ |
| 80 |
+ rm -f stamp-it; \ |
| 81 |
+ $(MAKE) stamp-it; \ |
| 82 |
+ fi |
| 83 |
+ |
| 84 |
# Please to be fucking the hell off. This breaks "make distdepend". -jwz |
| 85 |
-#Makefile: Makefile.in.in ../config.status POTFILES |
| 86 |
-# cd .. \ |
| 87 |
-# && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \ |
| 88 |
-# $(SHELL) ./config.status |
| 89 |
+stamp-it: Makefile.in.in ../config.status POTFILES |
| 90 |
+ cd .. \ |
| 91 |
+ && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= \ |
| 92 |
+ $(SHELL) ./config.status |
| 93 |
|
| 94 |
# Tell versions [3.59,3.63) of GNU make not to export all variables. |
| 95 |
# Otherwise a system limit (for SysV at least) may be exceeded. |
Archives