summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/intltool
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/intltool')
-rw-r--r--meta/recipes-devtools/intltool/intltool-0.50.2/uclibc.patch19
-rw-r--r--meta/recipes-devtools/intltool/intltool/intltool-nowarn.patch (renamed from meta/recipes-devtools/intltool/intltool-0.50.2/intltool-nowarn.patch)0
-rw-r--r--meta/recipes-devtools/intltool/intltool/noperlcheck.patch (renamed from meta/recipes-devtools/intltool/intltool-0.50.2/noperlcheck.patch)0
-rw-r--r--meta/recipes-devtools/intltool/intltool/perl-522-deprecations.patch55
-rw-r--r--meta/recipes-devtools/intltool/intltool/remove-xml-check.patch (renamed from meta/recipes-devtools/intltool/intltool-0.50.2/remove-xml-check.patch)0
-rw-r--r--meta/recipes-devtools/intltool/intltool/use-nativeperl.patch (renamed from meta/recipes-devtools/intltool/intltool-0.50.2/use-nativeperl.patch)0
-rw-r--r--meta/recipes-devtools/intltool/intltool_0.51.0.bb (renamed from meta/recipes-devtools/intltool/intltool_0.50.2.bb)6
7 files changed, 58 insertions, 22 deletions
diff --git a/meta/recipes-devtools/intltool/intltool-0.50.2/uclibc.patch b/meta/recipes-devtools/intltool/intltool-0.50.2/uclibc.patch
deleted file mode 100644
index 145c181f17..0000000000
--- a/meta/recipes-devtools/intltool/intltool-0.50.2/uclibc.patch
+++ /dev/null
@@ -1,19 +0,0 @@
1on uclibc systems localedir should point to /usr/'share' as usual.
2
3Upstream-Status: Pending
4Signed-off-by: Khem Raj <raj.khem@gmail.com>
5
6Index: intltool-0.50.2/intltool.m4
7===================================================================
8--- intltool-0.50.2.orig/intltool.m4 2014-03-15 22:09:01.016627665 -0700
9+++ intltool-0.50.2/intltool.m4 2014-03-15 22:12:09.732631206 -0700
10@@ -173,6 +173,9 @@
11 AC_CHECK_FUNC(bind_textdomain_codeset,
12 [DATADIRNAME=share], [DATADIRNAME=lib])
13 ;;
14+ *-*-*uclibc*)
15+ [DATADIRNAME=share]
16+ ;;
17 *)
18 [DATADIRNAME=lib]
19 ;;
diff --git a/meta/recipes-devtools/intltool/intltool-0.50.2/intltool-nowarn.patch b/meta/recipes-devtools/intltool/intltool/intltool-nowarn.patch
index 06c938b7e3..06c938b7e3 100644
--- a/meta/recipes-devtools/intltool/intltool-0.50.2/intltool-nowarn.patch
+++ b/meta/recipes-devtools/intltool/intltool/intltool-nowarn.patch
diff --git a/meta/recipes-devtools/intltool/intltool-0.50.2/noperlcheck.patch b/meta/recipes-devtools/intltool/intltool/noperlcheck.patch
index 853ee1a438..853ee1a438 100644
--- a/meta/recipes-devtools/intltool/intltool-0.50.2/noperlcheck.patch
+++ b/meta/recipes-devtools/intltool/intltool/noperlcheck.patch
diff --git a/meta/recipes-devtools/intltool/intltool/perl-522-deprecations.patch b/meta/recipes-devtools/intltool/intltool/perl-522-deprecations.patch
new file mode 100644
index 0000000000..eb52172e10
--- /dev/null
+++ b/meta/recipes-devtools/intltool/intltool/perl-522-deprecations.patch
@@ -0,0 +1,55 @@
1Perl 5.22 has deprecated some regex features, which causes warnings when
2intltool-update runs:
3
4Unescaped left brace in regex is deprecated, passed through in regex; marked by
5<-- HERE in m/^(.*)\${ <-- HERE ?([A-Z_]+)}?(.*)$/ at
6/data/poky-master/tmp/sysroots/x86_64-linux/usr/bin/intltool-update line 1065.
7
8Take a patch from Debian to solve this.
9
10Upstream-Status: Submitted (https://bugs.launchpad.net/intltool/+bug/1465010)
11Signed-off-by: Ross Burton <ross.burton@intel.com>
12
13--- intltool-0.51.0-ORIG/intltool-update.in 2015-05-27 00:20:43.038379963 +0200
14+++ intltool-0.51.0/intltool-update.in 2015-05-27 00:23:53.309078052 +0200
15@@ -1062,7 +1062,7 @@
16 }
17 }
18
19- if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/)
20+ if ($str =~ /^(.*)\$\{?([A-Z_]+)\}?(.*)$/)
21 {
22 my $rest = $3;
23 my $untouched = $1;
24@@ -1190,10 +1190,10 @@
25 $name =~ s/\(+$//g;
26 $version =~ s/\(+$//g;
27
28- $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
29- $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
30- $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
31- $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
32+ $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME\}?/);
33+ $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE\}?/);
34+ $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION\}?/);
35+ $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION\}?/);
36 }
37
38 if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)[,]?([^,\)]+)?/m)
39@@ -1219,11 +1219,11 @@
40 $version =~ s/\(+$//g;
41 $bugurl =~ s/\(+$//g if (defined $bugurl);
42
43- $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
44- $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
45- $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
46- $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
47- $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\${?\w+}?/);
48+ $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME\}?/);
49+ $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE\}?/);
50+ $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION\}?/);
51+ $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION\}?/);
52+ $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\$\{?\w+\}?/);
53 }
54
55 # \s makes this not work, why? \ No newline at end of file
diff --git a/meta/recipes-devtools/intltool/intltool-0.50.2/remove-xml-check.patch b/meta/recipes-devtools/intltool/intltool/remove-xml-check.patch
index fc69e37b45..fc69e37b45 100644
--- a/meta/recipes-devtools/intltool/intltool-0.50.2/remove-xml-check.patch
+++ b/meta/recipes-devtools/intltool/intltool/remove-xml-check.patch
diff --git a/meta/recipes-devtools/intltool/intltool-0.50.2/use-nativeperl.patch b/meta/recipes-devtools/intltool/intltool/use-nativeperl.patch
index 5f5fed3853..5f5fed3853 100644
--- a/meta/recipes-devtools/intltool/intltool-0.50.2/use-nativeperl.patch
+++ b/meta/recipes-devtools/intltool/intltool/use-nativeperl.patch
diff --git a/meta/recipes-devtools/intltool/intltool_0.50.2.bb b/meta/recipes-devtools/intltool/intltool_0.51.0.bb
index 483239d472..d520d43c1d 100644
--- a/meta/recipes-devtools/intltool/intltool_0.50.2.bb
+++ b/meta/recipes-devtools/intltool/intltool_0.51.0.bb
@@ -3,7 +3,7 @@ LICENSE = "GPLv2"
3LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" 3LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
4 4
5SRC_URI += "file://intltool-nowarn.patch \ 5SRC_URI += "file://intltool-nowarn.patch \
6 file://uclibc.patch \ 6 file://perl-522-deprecations.patch \
7 ${NATIVEPATCHES} \ 7 ${NATIVEPATCHES} \
8 " 8 "
9 9
@@ -15,5 +15,5 @@ NATIVEPATCHES = "file://noperlcheck.patch \
15 file://remove-xml-check.patch" 15 file://remove-xml-check.patch"
16NATIVEPATCHES_class-native = "file://use-nativeperl.patch" 16NATIVEPATCHES_class-native = "file://use-nativeperl.patch"
17 17
18SRC_URI[md5sum] = "23fbd879118253cb99aeac067da5f591" 18SRC_URI[md5sum] = "12e517cac2b57a0121cda351570f1e63"
19SRC_URI[sha256sum] = "67f25c5c6fb71d095793a7f895b245e65e829e8bde68c6c8b4c912144ff34406" 19SRC_URI[sha256sum] = "67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd"