[arch-commits] Commit in intltool/repos/extra-any (9 files)
Jelle van der Waa
jelle at archlinux.org
Sun Jun 21 15:23:47 UTC 2020
Date: Sunday, June 21, 2020 @ 15:23:46
Author: jelle
Revision: 389848
archrelease: copy trunk to extra-any
Added:
intltool/repos/extra-any/PKGBUILD
(from rev 389847, intltool/trunk/PKGBUILD)
intltool/repos/extra-any/intltool-0.51.0-perl-5.26.patch
(from rev 389847, intltool/trunk/intltool-0.51.0-perl-5.26.patch)
intltool/repos/extra-any/intltool-fixrace.patch
(from rev 389847, intltool/trunk/intltool-fixrace.patch)
intltool/repos/extra-any/intltool-merge-Create-cache-file-atomically.patch
(from rev 389847, intltool/trunk/intltool-merge-Create-cache-file-atomically.patch)
intltool/repos/extra-any/intltool_distcheck-fix.patch
(from rev 389847, intltool/trunk/intltool_distcheck-fix.patch)
Deleted:
intltool/repos/extra-any/PKGBUILD
intltool/repos/extra-any/intltool-0.51.0-perl-5.26.patch
intltool/repos/extra-any/intltool-merge-Create-cache-file-atomically.patch
intltool/repos/extra-any/intltool_distcheck-fix.patch
---------------------------------------------------+
PKGBUILD | 91 +++++++++--------
intltool-0.51.0-perl-5.26.patch | 102 ++++++++++----------
intltool-fixrace.patch | 43 ++++++++
intltool-merge-Create-cache-file-atomically.patch | 76 +++++++-------
intltool_distcheck-fix.patch | 60 +++++------
5 files changed, 209 insertions(+), 163 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-06-21 15:23:33 UTC (rev 389847)
+++ PKGBUILD 2020-06-21 15:23:46 UTC (rev 389848)
@@ -1,44 +0,0 @@
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-
-pkgname=intltool
-pkgver=0.51.0
-pkgrel=5
-pkgdesc="The internationalization tool collection"
-arch=('any')
-url="https://launchpad.net/intltool"
-license=('GPL')
-depends=('perl-xml-parser')
-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'
- '458f5d53ac358810879080f69b11649901babcacc14471c243eb850e9436d546'
- '13bd6deb65dc94933f132919d4eea4c24354d7c1c1c9e5930cb6e70c75703763'
- '58cb7d60796bc69c7d0865f106feb589d0271619e62f8741bff6f5ce1a2615ff')
-validpgpkeys=('9EBD001680E8C8F9FAC61A9BE1A701D4C9DE75B5')
-
-prepare() {
- cd ${pkgname}-${pkgver}
- 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
-}
-
-build() {
- cd ${pkgname}-${pkgver}
- ./configure --prefix=/usr
- make
-}
-
-check() {
- cd ${pkgname}-${pkgver}
- make check
-}
-
-package() {
- cd ${pkgname}-${pkgver}
- make DESTDIR="${pkgdir}" install
- install -D -m644 doc/I18N-HOWTO "${pkgdir}/usr/share/doc/${pkgname}/I18N-HOWTO"
-}
Copied: intltool/repos/extra-any/PKGBUILD (from rev 389847, intltool/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-06-21 15:23:46 UTC (rev 389848)
@@ -0,0 +1,47 @@
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=intltool
+pkgver=0.51.0
+pkgrel=6
+pkgdesc="The internationalization tool collection"
+arch=('any')
+url="https://launchpad.net/intltool"
+license=('GPL')
+depends=('perl-xml-parser')
+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
+ intltool-fixrace.patch)
+sha256sums=('67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd'
+ 'SKIP'
+ '458f5d53ac358810879080f69b11649901babcacc14471c243eb850e9436d546'
+ '13bd6deb65dc94933f132919d4eea4c24354d7c1c1c9e5930cb6e70c75703763'
+ '58cb7d60796bc69c7d0865f106feb589d0271619e62f8741bff6f5ce1a2615ff'
+ '5c453ccb8bfe6e0b05d7a55e66dcfa793ea81d9bbe9fdc41f668326ba9310deb')
+validpgpkeys=('9EBD001680E8C8F9FAC61A9BE1A701D4C9DE75B5')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ 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
+ patch -Np1 -i ../intltool-fixrace.patch # https://bugs.launchpad.net/intltool/+bug/1687644
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ ./configure --prefix=/usr
+ make
+}
+
+check() {
+ cd ${pkgname}-${pkgver}
+ make check
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+ install -D -m644 doc/I18N-HOWTO "${pkgdir}/usr/share/doc/${pkgname}/I18N-HOWTO"
+}
Deleted: intltool-0.51.0-perl-5.26.patch
===================================================================
--- intltool-0.51.0-perl-5.26.patch 2020-06-21 15:23:33 UTC (rev 389847)
+++ intltool-0.51.0-perl-5.26.patch 2020-06-21 15:23:46 UTC (rev 389848)
@@ -1,51 +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 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?
Copied: intltool/repos/extra-any/intltool-0.51.0-perl-5.26.patch (from rev 389847, intltool/trunk/intltool-0.51.0-perl-5.26.patch)
===================================================================
--- intltool-0.51.0-perl-5.26.patch (rev 0)
+++ intltool-0.51.0-perl-5.26.patch 2020-06-21 15:23:46 UTC (rev 389848)
@@ -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?
Copied: intltool/repos/extra-any/intltool-fixrace.patch (from rev 389847, intltool/trunk/intltool-fixrace.patch)
===================================================================
--- intltool-fixrace.patch (rev 0)
+++ intltool-fixrace.patch 2020-06-21 15:23:46 UTC (rev 389848)
@@ -0,0 +1,43 @@
+From: Bernhard M. Wiedemann <bmwiedemann+intltool at suse.de>
+
+avoid a race where some processes try to use a partial cache file
+that is still being written to.
+Note that we release the lock before load_cache,
+because if we got the lock, the cache is already completely written
+and it is OK to have multiple parallel readers
+
+Index: intltool-0.51.0/intltool-merge.in
+===================================================================
+--- intltool-0.51.0.orig/intltool-merge.in
++++ intltool-0.51.0/intltool-merge.in
+@@ -43,6 +43,7 @@ use Getopt::Long;
+ use Text::Wrap;
+ use File::Basename;
+ use Encode;
++use Fcntl qw(:flock);
+
+ my $must_end_tag = -1;
+ my $last_depth = -1;
+@@ -392,11 +393,14 @@ sub load_cache
+
+ sub get_cached_translation_database
+ {
++ open(my $lockfh, ">", "$cache_file.lock") or die $!;
++ flock($lockfh, LOCK_EX) or die "Could not lock '$cache_file.lock' - $!";
+ my $cache_file_age = -M $cache_file;
+ if (defined $cache_file_age)
+ {
+ if ($cache_file_age <= &get_newest_po_age)
+ {
++ close($lockfh);
+ &load_cache;
+ return;
+ }
+@@ -404,6 +408,7 @@ sub get_cached_translation_database
+ }
+
+ &create_cache;
++ close($lockfh);
+ }
+
+ sub add_translation
Deleted: intltool-merge-Create-cache-file-atomically.patch
===================================================================
--- intltool-merge-Create-cache-file-atomically.patch 2020-06-21 15:23:33 UTC (rev 389847)
+++ intltool-merge-Create-cache-file-atomically.patch 2020-06-21 15:23:46 UTC (rev 389848)
@@ -1,38 +0,0 @@
-From d328542bea50b9445c63cdf2454052392282a1ce Mon Sep 17 00:00:00 2001
-From: Colin Walters <walters at verbum.org>
-Date: Thu, 8 Oct 2015 16:25:47 -0400
-Subject: [PATCH] intltool-merge: Create cache file atomically
-
-It's going to be relatively common for build systems operating in
-parallel to run multiple copies of `intltool-merge`, yet the cache
-file is not created atomically (i.e. with the "open .tmp file and
-rename()" dance).
-
-I suspect (but have not yet determined conclusively) this is the cause
-of some systemd build issues where translations don't appear in the
-merged file.
-
-Regardless, this patch can't hurt.
----
- intltool-merge.in | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/intltool-merge.in b/intltool-merge.in
-index 1afa2a4..d1eba8f 100644
---- a/intltool-merge.in
-+++ b/intltool-merge.in
-@@ -371,9 +371,10 @@ sub create_cache
-
- &create_translation_database;
-
-- open CACHE, ">$cache_file" || die;
-+ open CACHE, ">$cache_file" . ".tmp" || die;
- print CACHE join "\x01", %translations;
- close CACHE;
-+ rename("$cache_file" . ".tmp", "$cache_file");
- }
-
- sub load_cache
---
-1.8.3.1
-
Copied: intltool/repos/extra-any/intltool-merge-Create-cache-file-atomically.patch (from rev 389847, intltool/trunk/intltool-merge-Create-cache-file-atomically.patch)
===================================================================
--- intltool-merge-Create-cache-file-atomically.patch (rev 0)
+++ intltool-merge-Create-cache-file-atomically.patch 2020-06-21 15:23:46 UTC (rev 389848)
@@ -0,0 +1,38 @@
+From d328542bea50b9445c63cdf2454052392282a1ce Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters at verbum.org>
+Date: Thu, 8 Oct 2015 16:25:47 -0400
+Subject: [PATCH] intltool-merge: Create cache file atomically
+
+It's going to be relatively common for build systems operating in
+parallel to run multiple copies of `intltool-merge`, yet the cache
+file is not created atomically (i.e. with the "open .tmp file and
+rename()" dance).
+
+I suspect (but have not yet determined conclusively) this is the cause
+of some systemd build issues where translations don't appear in the
+merged file.
+
+Regardless, this patch can't hurt.
+---
+ intltool-merge.in | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/intltool-merge.in b/intltool-merge.in
+index 1afa2a4..d1eba8f 100644
+--- a/intltool-merge.in
++++ b/intltool-merge.in
+@@ -371,9 +371,10 @@ sub create_cache
+
+ &create_translation_database;
+
+- open CACHE, ">$cache_file" || die;
++ open CACHE, ">$cache_file" . ".tmp" || die;
+ print CACHE join "\x01", %translations;
+ close CACHE;
++ rename("$cache_file" . ".tmp", "$cache_file");
+ }
+
+ sub load_cache
+--
+1.8.3.1
+
Deleted: intltool_distcheck-fix.patch
===================================================================
--- intltool_distcheck-fix.patch 2020-06-21 15:23:33 UTC (rev 389847)
+++ intltool_distcheck-fix.patch 2020-06-21 15:23:46 UTC (rev 389848)
@@ -1,30 +0,0 @@
-diff -upr intltool-0.51.0-orig/intltool-update.in intltool-0.51.0/intltool-update.in
---- intltool-0.51.0-orig/intltool-update.in 2016-07-29 14:08:06.276987000 +0200
-+++ intltool-0.51.0/intltool-update.in 2016-07-29 14:11:09.562126918 +0200
-@@ -620,6 +620,14 @@ sub FindLeftoutFiles
-
- my @result;
-
-+ # If the builddir is a subdir of srcdir, the list of files found will be prefixed with
-+ # an additional prefix (e.g. "_build/sub" for automake 1.15 make distcheck). Try to
-+ # handle that, by removing those matches as well.
-+ my $absbuilddir = Cwd::abs_path("..\/");
-+ my $abssrcdir = Cwd::abs_path("$SRCDIR/..");
-+ # Check if builddir is a subdir of srcdir
-+ my ($abspath,$relpath) = split /\s*$abssrcdir\/\s*/, $absbuilddir, 2;
-+
- foreach (@buf_allfiles_sorted)
- {
- my $dummy = $_;
-@@ -628,7 +636,10 @@ sub FindLeftoutFiles
- $srcdir =~ s#^../##;
- $dummy =~ s#^$srcdir/../##;
- $dummy =~ s#^$srcdir/##;
-- $dummy =~ s#_build/##;
-+ if ($relpath)
-+ {
-+ $dummy =~ s#^$relpath/##;
-+ }
- if (!exists($in2{$dummy}))
- {
- push @result, $dummy
Copied: intltool/repos/extra-any/intltool_distcheck-fix.patch (from rev 389847, intltool/trunk/intltool_distcheck-fix.patch)
===================================================================
--- intltool_distcheck-fix.patch (rev 0)
+++ intltool_distcheck-fix.patch 2020-06-21 15:23:46 UTC (rev 389848)
@@ -0,0 +1,30 @@
+diff -upr intltool-0.51.0-orig/intltool-update.in intltool-0.51.0/intltool-update.in
+--- intltool-0.51.0-orig/intltool-update.in 2016-07-29 14:08:06.276987000 +0200
++++ intltool-0.51.0/intltool-update.in 2016-07-29 14:11:09.562126918 +0200
+@@ -620,6 +620,14 @@ sub FindLeftoutFiles
+
+ my @result;
+
++ # If the builddir is a subdir of srcdir, the list of files found will be prefixed with
++ # an additional prefix (e.g. "_build/sub" for automake 1.15 make distcheck). Try to
++ # handle that, by removing those matches as well.
++ my $absbuilddir = Cwd::abs_path("..\/");
++ my $abssrcdir = Cwd::abs_path("$SRCDIR/..");
++ # Check if builddir is a subdir of srcdir
++ my ($abspath,$relpath) = split /\s*$abssrcdir\/\s*/, $absbuilddir, 2;
++
+ foreach (@buf_allfiles_sorted)
+ {
+ my $dummy = $_;
+@@ -628,7 +636,10 @@ sub FindLeftoutFiles
+ $srcdir =~ s#^../##;
+ $dummy =~ s#^$srcdir/../##;
+ $dummy =~ s#^$srcdir/##;
+- $dummy =~ s#_build/##;
++ if ($relpath)
++ {
++ $dummy =~ s#^$relpath/##;
++ }
+ if (!exists($in2{$dummy}))
+ {
+ push @result, $dummy
More information about the arch-commits
mailing list