diff options
| author | freetz | 2006-02-18 20:52:07 (GMT) |
|---|---|---|
| committer | cvs2git | 2012-06-24 12:13:13 (GMT) |
| commit | e5b3d267c1fbf73edac595bfa73e9d223c5a95bb (patch) | |
| tree | 38f4ada56c6d69ede67b1e1a55a942935ec972c0 | |
| parent | 14d6725aecb924686ba841556900bcadbd5bee9d (diff) | |
| download | intltool-e5b3d267c1fbf73edac595bfa73e9d223c5a95bb.zip intltool-e5b3d267c1fbf73edac595bfa73e9d223c5a95bb.tar.gz | |
- http://bugzilla.gnome.org/show_bug.cgi?id=330509auto/th/intltool-0_34_2-2auto/ac/intltool-0_34_2-2
http://bugzilla.gnome.org/show_bug.cgi?id=321785
Changed files:
intltool-bugfixes.patch -> 1.1
| -rw-r--r-- | intltool-bugfixes.patch | 66 |
1 files changed, 66 insertions, 0 deletions
diff --git a/intltool-bugfixes.patch b/intltool-bugfixes.patch new file mode 100644 index 0000000..bb18d3f --- /dev/null +++ b/intltool-bugfixes.patch @@ -0,0 +1,66 @@ +diff -aurN intltool-0.34.2.orig/intltool-update.in.in intltool-0.34.2/intltool-update.in.in +--- intltool-0.34.2.orig/intltool-update.in.in 2005-11-29 02:24:14.000000000 +0100 ++++ intltool-0.34.2/intltool-update.in.in 2006-02-18 21:26:23.309822216 +0100 +@@ -125,7 +125,7 @@ + &Console_Write_IntltoolHelp if $arg_count > 1; + + # --version and --help don't require a module name +-my $MODULE = $GETTEXT_PACKAGE || &FindPackageName; ++my $MODULE = $GETTEXT_PACKAGE || &FindPackageName || "unknown"; + + if ($POT_ARG) + { +@@ -874,8 +874,10 @@ + { + my $rest = $3; + my $untouched = $1; +- my $sub = $varhash{$2}; +- ++ my $sub = ""; ++ # Ignore recursive definitions of variables ++ $sub = $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ /\${?$2}?/; ++ + return SubstituteVariable ("$untouched$sub$rest"); + } + +@@ -992,10 +994,10 @@ + ($name, $version) = ($1, $2); + $name =~ s/[\[\]\s]//g; + $version =~ s/[\[\]\s]//g; +- $varhash{"PACKAGE_NAME"} = $name; +- $varhash{"PACKAGE"} = $name; +- $varhash{"PACKAGE_VERSION"} = $version; +- $varhash{"VERSION"} = $version; ++ $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/); ++ $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/); ++ $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/); ++ $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/); + } + + if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)/m) +@@ -1003,10 +1005,10 @@ + ($name, $version) = ($1, $2); + $name =~ s/[\[\]\s]//g; + $version =~ s/[\[\]\s]//g; +- $varhash{"PACKAGE_NAME"} = $name; +- $varhash{"PACKAGE"} = $name; +- $varhash{"PACKAGE_VERSION"} = $version; +- $varhash{"VERSION"} = $version; ++ $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/); ++ $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/); ++ $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/); ++ $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/); + } + + # \s makes this not work, why? +diff -aurN intltool-0.34.2.orig/Makefile.in.in intltool-0.34.2/Makefile.in.in +--- intltool-0.34.2.orig/Makefile.in.in 2005-11-24 21:42:12.000000000 +0100 ++++ intltool-0.34.2/Makefile.in.in 2006-02-18 21:26:23.310822064 +0100 +@@ -71,6 +71,7 @@ + EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS + + POTFILES = \ ++#This Gets Replace for some reason + + CATALOGS = @CATALOGS@ + CATOBJEXT = @CATOBJEXT@ |