mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-15 08:56:58 +02:00
dev-util/intltool: Drop unused package
We stopped pulling in that package in coreos-overlay.
This commit is contained in:
Krzesimir Nowak
parent
23c6ab4ae0
commit
00c2fed4ee
@ -1 +0,0 @@
|
|||||||
DIST intltool-0.51.0.tar.gz 162286 BLAKE2B 98fe40e4d669fdf65a777152ddee0a9656412b9cf5d1e682d1b4b7bd666f3e5aa623a50481b6df47e16a935550836c66c666229b0bb7ef143f7cde6893b97a69 SHA512 4c93cb26592ed0b1622d3b7800b5d6622ffa36f58ac73f2ef0bddfab522565fdfb8fa73d81914b9a202f1d62bc995a08960f8adb9f62c86918e75498e85fbfdf
|
|
||||||
@ -1,63 +0,0 @@
|
|||||||
From c262cb09fa9f4dad056ba5b25a8627408bcf909a Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
|
|
||||||
Date: Sun, 14 Apr 2013 20:41:41 +0200
|
|
||||||
Subject: [PATCH] Fix handling absolute paths in single file key output.
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
Signed-off-by: Michał Górny <mgorny@gentoo.org>
|
|
||||||
Fixes: https://bugs.gentoo.org/show_bug.cgi?id=464954
|
|
||||||
---
|
|
||||||
intltool-merge.in | 17 ++++++++++++-----
|
|
||||||
1 file changed, 12 insertions(+), 5 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/intltool-merge.in b/intltool-merge.in
|
|
||||||
index 1afa2a4..47dbbdf 100644
|
|
||||||
--- a/intltool-merge.in
|
|
||||||
+++ b/intltool-merge.in
|
|
||||||
@@ -1108,13 +1108,20 @@ sub keys_merge_translation
|
|
||||||
{
|
|
||||||
my ($lang) = @_;
|
|
||||||
|
|
||||||
- if ( ! -d $lang && $MULTIPLE_OUTPUT)
|
|
||||||
+ my $outpath = "$OUTFILE";
|
|
||||||
+
|
|
||||||
+ if ($MULTIPLE_OUTPUT)
|
|
||||||
{
|
|
||||||
- mkdir $lang or -d $lang or die "Cannot create subdirectory $lang: $!\n";
|
|
||||||
+ $outpath = "$lang/$outpath";
|
|
||||||
+
|
|
||||||
+ if ( ! -d $lang )
|
|
||||||
+ {
|
|
||||||
+ mkdir $lang or -d $lang or die "Cannot create subdirectory $lang: $!\n";
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
|
|
||||||
open INPUT, "<${FILE}" or die "Cannot open ${FILE}: $!\n";
|
|
||||||
- open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n";
|
|
||||||
+ open OUTPUT, ">$outpath" or die "Cannot open $outpath: $!\n";
|
|
||||||
binmode (OUTPUT) if $^O eq 'MSWin32';
|
|
||||||
|
|
||||||
while (<INPUT>)
|
|
||||||
@@ -1159,7 +1166,7 @@ sub keys_merge_translation
|
|
||||||
close OUTPUT;
|
|
||||||
close INPUT;
|
|
||||||
|
|
||||||
- print "CREATED $lang/$OUTFILE\n" unless $QUIET_ARG;
|
|
||||||
+ print "CREATED $outpath\n" unless $QUIET_ARG;
|
|
||||||
}
|
|
||||||
|
|
||||||
sub keys_merge_translations
|
|
||||||
@@ -1174,7 +1181,7 @@ sub keys_merge_translations
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
- keys_merge_translation (".");
|
|
||||||
+ keys_merge_translation ();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
--
|
|
||||||
1.8.1.5
|
|
||||||
|
|
||||||
@ -1,48 +0,0 @@
|
|||||||
https://bugs.launchpad.net/intltool/+bug/1490906
|
|
||||||
|
|
||||||
fix warnings w/newer perl:
|
|
||||||
Unescaped left brace in regex is deprecated, passed through in regex; marked by <-- HERE in m/^(.*)\${ <-- HERE ?([A-Z_]+)}?(.*)$/ at /usr/bin/intltool-update line 1065.
|
|
||||||
|
|
||||||
--- a/intltool-update.in
|
|
||||||
+++ b/intltool-update.in
|
|
||||||
@@ -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?
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
diff -ruN intltool-0.51.0.orig/intltool-update.in intltool-0.51.0/intltool-update.in
|
|
||||||
--- intltool-0.51.0.orig/intltool-update.in 2017-06-28 00:47:20.889269294 +0200
|
|
||||||
+++ intltool-0.51.0/intltool-update.in 2017-06-28 00:48:14.592271529 +0200
|
|
||||||
@@ -1068,7 +1068,7 @@
|
|
||||||
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");
|
|
||||||
}
|
|
||||||
@ -1,30 +0,0 @@
|
|||||||
# Copyright 1999-2021 Gentoo Authors
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI=6
|
|
||||||
|
|
||||||
DESCRIPTION="Internationalization Tool Collection"
|
|
||||||
HOMEPAGE="https://launchpad.net/intltool/"
|
|
||||||
SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
|
|
||||||
|
|
||||||
LICENSE="GPL-2"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
|
||||||
IUSE=""
|
|
||||||
|
|
||||||
DEPEND="
|
|
||||||
dev-lang/perl
|
|
||||||
dev-perl/XML-Parser
|
|
||||||
"
|
|
||||||
RDEPEND="${DEPEND}
|
|
||||||
sys-devel/gettext
|
|
||||||
"
|
|
||||||
DOCS=( AUTHORS ChangeLog NEWS README TODO doc/I18N-HOWTO )
|
|
||||||
|
|
||||||
PATCHES=(
|
|
||||||
# Fix handling absolute paths in single file key output, bug #470040
|
|
||||||
# https://bugs.launchpad.net/intltool/+bug/1168941
|
|
||||||
"${FILESDIR}"/${PN}-0.50.2-absolute-paths.patch
|
|
||||||
"${FILESDIR}"/${PN}-0.51.0-perl-5.22.patch
|
|
||||||
"${FILESDIR}"/${PN}-0.51.0-perl-5.26.patch
|
|
||||||
)
|
|
||||||
@ -1,10 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
|
||||||
<pkgmetadata>
|
|
||||||
<maintainer type="project">
|
|
||||||
<email>freedesktop-bugs@gentoo.org</email>
|
|
||||||
</maintainer>
|
|
||||||
<upstream>
|
|
||||||
<remote-id type="launchpad">intltool</remote-id>
|
|
||||||
</upstream>
|
|
||||||
</pkgmetadata>
|
|
||||||
Loading…
Reference in New Issue
Block a user