diff --git a/dev-util/intltool/intltool-0.51.0.recipe b/dev-util/intltool/intltool-0.51.0.recipe index 79455bb87..3d23389c1 100644 --- a/dev-util/intltool/intltool-0.51.0.recipe +++ b/dev-util/intltool/intltool-0.51.0.recipe @@ -12,39 +12,37 @@ files. This merge step will happen at build resp. installation time." HOMEPAGE="http://freedesktop.org/wiki/Software/intltool" COPYRIGHT="1994-1996, 1999-2002, 2004-2015 Free Software Foundation, Inc." LICENSE="GNU GPL v2" -REVISION="2" +REVISION="3" SOURCE_URI="https://launchpad.net/intltool/trunk/$portVersion/+download/intltool-$portVersion.tar.gz" CHECKSUM_SHA256="67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd" +PATCHES="intltool-$portVersion.patchset" -ARCHITECTURES="x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="any" PROVIDES=" - intltool$secondaryArchSuffix = $portVersion - cmd:intltool_extract$secondaryArchSuffix = $portVersion - cmd:intltool_merge$secondaryArchSuffix = $portVersion - cmd:intltool_prepare$secondaryArchSuffix = $portVersion - cmd:intltool_update$secondaryArchSuffix = $portVersion - cmd:intltoolize$secondaryArchSuffix = $portVersion + intltool = $portVersion + cmd:intltool_extract = $portVersion + cmd:intltool_merge = $portVersion + cmd:intltool_prepare = $portVersion + cmd:intltool_update = $portVersion + cmd:intltoolize = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix + haiku cmd:file cmd:perl xml_parser " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel + haiku_devel xml_parser " BUILD_PREREQUIRES=" - cmd:file - cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix + cmd:gawk cmd:make cmd:perl - cmd:autoconf + cmd:sed " BUILD() diff --git a/dev-util/intltool/patches/intltool-0.51.0.patchset b/dev-util/intltool/patches/intltool-0.51.0.patchset new file mode 100644 index 000000000..624c64b56 --- /dev/null +++ b/dev-util/intltool/patches/intltool-0.51.0.patchset @@ -0,0 +1,61 @@ +From 3602bd8448dc1cbcb757316f359cf744968b6b43 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Wed, 26 Jul 2017 19:29:49 +0200 +Subject: patch for perl 5.26 from arch linux. + + +diff --git a/intltool-update.in b/intltool-update.in +index 6992ab4..d878410 100644 +--- a/intltool-update.in ++++ b/intltool-update.in +@@ -1062,13 +1062,13 @@ sub SubstituteVariable + } + } + +- 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 @@ sub FindPackageName + $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 @@ sub FindPackageName + $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? +-- +2.13.3 +