[arch-commits] Commit in intltool/trunk (3 files)
Jan Steffens
heftig at archlinux.org
Fri Jul 21 20:45:00 UTC 2017
Date: Friday, July 21, 2017 @ 20:44:59
Author: heftig
Revision: 301117
0.51.0-2
Added:
intltool/trunk/intltool-0.51.0-perl-5.26.patch
(from rev 301116, intltool/trunk/intltool-0.51.0-perl-5.22.patch)
Modified:
intltool/trunk/PKGBUILD
Deleted:
intltool/trunk/intltool-0.51.0-perl-5.22.patch
---------------------------------+
PKGBUILD | 10 +++----
intltool-0.51.0-perl-5.22.patch | 44 --------------------------------
intltool-0.51.0-perl-5.26.patch | 51 ++++++++++++++++++++++++++++++++++++++
3 files changed, 56 insertions(+), 49 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-07-21 20:44:54 UTC (rev 301116)
+++ PKGBUILD 2017-07-21 20:44:59 UTC (rev 301117)
@@ -6,16 +6,16 @@
pkgrel=2
pkgdesc="The internationalization tool collection"
arch=('any')
-url="https://edge.launchpad.net/intltool"
+url="https://launchpad.net/intltool"
license=('GPL')
depends=('perl-xml-parser')
-source=(http://launchpad.net/intltool/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz{,.asc}
- intltool-0.51.0-perl-5.22.patch
+source=(https://launchpad.net/intltool/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz{,.asc}
+ intltool-0.51.0-perl-5.26.patch
intltool-merge-Create-cache-file-atomically.patch
intltool_distcheck-fix.patch)
sha256sums=('67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd'
'SKIP'
- '3a02adba6d81b55834934ff2b8cefd45c5461e2693d711b1ba7a633fc3b748a7'
+ '458f5d53ac358810879080f69b11649901babcacc14471c243eb850e9436d546'
'13bd6deb65dc94933f132919d4eea4c24354d7c1c1c9e5930cb6e70c75703763'
'58cb7d60796bc69c7d0865f106feb589d0271619e62f8741bff6f5ce1a2615ff')
validpgpkeys=('9EBD001680E8C8F9FAC61A9BE1A701D4C9DE75B5')
@@ -22,7 +22,7 @@
prepare() {
cd ${pkgname}-${pkgver}
- patch -Np1 -i ../intltool-0.51.0-perl-5.22.patch
+ patch -Np1 -i ../intltool-0.51.0-perl-5.26.patch
patch -Np1 -i ../intltool-merge-Create-cache-file-atomically.patch
patch -Np1 -i ../intltool_distcheck-fix.patch
}
Deleted: intltool-0.51.0-perl-5.22.patch
===================================================================
--- intltool-0.51.0-perl-5.22.patch 2017-07-21 20:44:54 UTC (rev 301116)
+++ intltool-0.51.0-perl-5.22.patch 2017-07-21 20:44:59 UTC (rev 301117)
@@ -1,44 +0,0 @@
-diff -Naur intltool-0.51.0.orig/intltool-update.in intltool-0.51.0/intltool-update.in
---- intltool-0.51.0.orig/intltool-update.in 2015-03-09 02:39:54.000000000 +0100
-+++ intltool-0.51.0/intltool-update.in 2015-06-19 01:52:07.171228154 +0200
-@@ -1062,7 +1062,7 @@
- }
- }
-
-- if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/)
-+ if ($str =~ /^(.*)\$\{?([A-Z_]+)}?(.*)$/)
- {
- my $rest = $3;
- my $untouched = $1;
-@@ -1190,10 +1190,10 @@
- $name =~ s/\(+$//g;
- $version =~ s/\(+$//g;
-
-- $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}?/);
-+ $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)
-@@ -1219,11 +1219,11 @@
- $version =~ s/\(+$//g;
- $bugurl =~ s/\(+$//g if (defined $bugurl);
-
-- $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}?/);
-- $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\${?\w+}?/);
-+ $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}?/);
-+ $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\$\{?\w+}?/);
- }
-
- # \s makes this not work, why?
Copied: intltool/trunk/intltool-0.51.0-perl-5.26.patch (from rev 301116, intltool/trunk/intltool-0.51.0-perl-5.22.patch)
===================================================================
--- intltool-0.51.0-perl-5.26.patch (rev 0)
+++ intltool-0.51.0-perl-5.26.patch 2017-07-21 20:44:59 UTC (rev 301117)
@@ -0,0 +1,51 @@
+diff -Naur intltool-0.51.0.orig/intltool-update.in intltool-0.51.0/intltool-update.in
+--- intltool-0.51.0.orig/intltool-update.in 2015-03-09 02:39:54.000000000 +0100
++++ intltool-0.51.0/intltool-update.in 2017-07-21 22:35:10.613631420 +0200
+@@ -1062,13 +1062,13 @@
+ }
+ }
+
+- if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/)
++ if ($str =~ /^(.*)\$\{?([A-Z_]+)}?(.*)$/)
+ {
+ my $rest = $3;
+ my $untouched = $1;
+ my $sub = "";
+ # Ignore recursive definitions of variables
+- $sub = $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ /\${?$2}?/;
++ $sub = $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ /\$\{?$2}?/;
+
+ return SubstituteVariable ("$untouched$sub$rest");
+ }
+@@ -1190,10 +1190,10 @@
+ $name =~ s/\(+$//g;
+ $version =~ s/\(+$//g;
+
+- $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}?/);
++ $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)
+@@ -1219,11 +1219,11 @@
+ $version =~ s/\(+$//g;
+ $bugurl =~ s/\(+$//g if (defined $bugurl);
+
+- $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}?/);
+- $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\${?\w+}?/);
++ $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}?/);
++ $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\$\{?\w+}?/);
+ }
+
+ # \s makes this not work, why?
More information about the arch-commits
mailing list