diff --git a/system/base/comar/pspec.xml b/system/base/comar/pspec.xml index 35cade01..bd9dc1d5 100644 --- a/system/base/comar/pspec.xml +++ b/system/base/comar/pspec.xml @@ -49,7 +49,7 @@ - 2018-07-15 + 2018-07-20 3.0.3 Rebuild Ertuğrul Erata diff --git a/system/base/dbus-glib/pspec.xml b/system/base/dbus-glib/pspec.xml index 15776d37..440431c1 100644 --- a/system/base/dbus-glib/pspec.xml +++ b/system/base/dbus-glib/pspec.xml @@ -63,7 +63,7 @@ - 2018-07-15 + 2018-07-20 0.108 Rebuild Ertuğrul Erata diff --git a/system/base/dbus/pspec.xml b/system/base/dbus/pspec.xml index 52dad85e..83ecf88e 100644 --- a/system/base/dbus/pspec.xml +++ b/system/base/dbus/pspec.xml @@ -13,7 +13,7 @@ service A message bus system, a simple way for applications to talk to each other D-Bus supplies both a system daemon (for events such as "new hardware device added" or "printer queue changed") and a per-user-login-session daemon (for general IPC needs among user applications). Also, the message bus is built on top of a general one-to-one message passing framework, which can be used by any two apps to communicate directly (without going through the message bus daemon). Currently the communicating applications are on one computer, but TCP/IP option is available and remote support planned. - https://dbus.freedesktop.org/releases/dbus/dbus-1.11.8.tar.gz + https://dbus.freedesktop.org/releases/dbus/dbus-1.12.8.tar.gz expat-devel libX11-devel @@ -98,6 +98,13 @@ + + 2018-07-20 + 1.12.8 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2018-07-15 1.11.8 diff --git a/system/base/perl-Locale-gettext/pspec.xml b/system/base/perl-Locale-gettext/pspec.xml index 3a6eb1a0..cbaecba9 100644 --- a/system/base/perl-Locale-gettext/pspec.xml +++ b/system/base/perl-Locale-gettext/pspec.xml @@ -33,7 +33,7 @@ - 2018-07-15 + 2018-07-19 1.07 Rebuild Ertuğrul Erata diff --git a/system/base/polkit/pspec.xml b/system/base/polkit/pspec.xml index 4839d18a..225545ef 100644 --- a/system/base/polkit/pspec.xml +++ b/system/base/polkit/pspec.xml @@ -84,7 +84,7 @@ - 2018-07-15 + 2018-07-20 0.113 Rebuild Ertuğrul Erata diff --git a/system/base/spidermonkey/pspec.xml b/system/base/spidermonkey/pspec.xml index 8924fc03..39bc4412 100644 --- a/system/base/spidermonkey/pspec.xml +++ b/system/base/spidermonkey/pspec.xml @@ -55,7 +55,7 @@ - 2018-07-15 + 2018-07-19 17.0.0 Rebuild Ertuğrul Erata diff --git a/system/devel/autogen/pspec.xml b/system/devel/autogen/pspec.xml index c3a47297..0b38aa70 100644 --- a/system/devel/autogen/pspec.xml +++ b/system/devel/autogen/pspec.xml @@ -56,7 +56,7 @@ - 2018-07-15 + 2018-07-20 5.18.10 Rebuild. Ertuğrul Erata diff --git a/system/devel/gc/pspec.xml b/system/devel/gc/pspec.xml index efe069fd..02440735 100644 --- a/system/devel/gc/pspec.xml +++ b/system/devel/gc/pspec.xml @@ -47,7 +47,7 @@ - 2018-07-15 + 2018-07-20 7.6.4 Version bump. Ertuğrul Erata diff --git a/system/devel/gmp/pspec.xml b/system/devel/gmp/pspec.xml index 930003b2..cca0b307 100644 --- a/system/devel/gmp/pspec.xml +++ b/system/devel/gmp/pspec.xml @@ -57,7 +57,7 @@ - 2018-07-17 + 2018-07-20 6.1.2 Rebuild Ertuğrul Erata diff --git a/system/devel/intltool/files/intltool-0.51.0-perl-5.26.patch b/system/devel/intltool/files/intltool-0.51.0-perl-5.26.patch new file mode 100644 index 00000000..8f6a0b32 --- /dev/null +++ b/system/devel/intltool/files/intltool-0.51.0-perl-5.26.patch @@ -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? diff --git a/system/devel/intltool/files/intltool-merge-Create-cache-file-atomically.patch b/system/devel/intltool/files/intltool-merge-Create-cache-file-atomically.patch new file mode 100644 index 00000000..677ea457 --- /dev/null +++ b/system/devel/intltool/files/intltool-merge-Create-cache-file-atomically.patch @@ -0,0 +1,38 @@ +From d328542bea50b9445c63cdf2454052392282a1ce Mon Sep 17 00:00:00 2001 +From: Colin Walters +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 + diff --git a/system/devel/intltool/files/intltool_distcheck-fix.patch b/system/devel/intltool/files/intltool_distcheck-fix.patch new file mode 100644 index 00000000..6e7f198b --- /dev/null +++ b/system/devel/intltool/files/intltool_distcheck-fix.patch @@ -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 diff --git a/system/devel/intltool/pspec.xml b/system/devel/intltool/pspec.xml index ff63d45f..e7ae5574 100644 --- a/system/devel/intltool/pspec.xml +++ b/system/devel/intltool/pspec.xml @@ -17,6 +17,11 @@ perl perl-XML-Parser + + intltool-0.51.0-perl-5.26.patch + intltool-merge-Create-cache-file-atomically.patch + intltool_distcheck-fix.patch + @@ -35,7 +40,7 @@ - 2018-07-19 + 2018-07-20 0.51.0 Rebuild Ertuğrul Erata diff --git a/system/devel/make/actions.py b/system/devel/make/actions.py index 5b471c70..5d48c8ac 100644 --- a/system/devel/make/actions.py +++ b/system/devel/make/actions.py @@ -10,7 +10,7 @@ from pisi.actionsapi import get from pisi.actionsapi import pisitools def setup(): - autotools.autoreconf("-fi") + shelltools.system("sed -i '211,217 d; 219,229 d; 232 d' glob/glob.c") autotools.configure("--enable-nls \ --program-prefix=g") diff --git a/system/devel/make/pspec.xml b/system/devel/make/pspec.xml index d1ea0ea7..cd8c1def 100644 --- a/system/devel/make/pspec.xml +++ b/system/devel/make/pspec.xml @@ -19,11 +19,11 @@ gnuconfig patch gc-devel - guile-devel + - glibc_2_27.patch - + + @@ -44,9 +44,9 @@ - 2018-07-18 + 2018-07-20 4.2.1 - Rebuild + Rebuild. Ertuğrul Erata ertugrulerata@gmail.com