Pisilinux/core
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/pisilinux/core into openssl_rebuild

Browse Source
This commit is contained in:
Ertuğrul Erata
2018-07-20 21:34:56 +03:00
parent 592f36cddf 4989e3ee8f
commit 73d9195d84
15 changed files with 147 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
system/base/comar/pspec.xml
+1 -1
View File
@@ -49,7 +49,7 @@
<History>
<Update release="4">
<Date>2018-07-15</Date>
<Date>2018-07-20</Date>
<Version>3.0.3</Version>
<Comment>Rebuild</Comment>
<Name>Ertuğrul Erata</Name>
system/base/dbus-glib/pspec.xml
+1 -1
View File
@@ -63,7 +63,7 @@
<History>
<Update release="4">
<Date>2018-07-15</Date>
<Date>2018-07-20</Date>
<Version>0.108</Version>
<Comment>Rebuild</Comment>
<Name>Ertuğrul Erata</Name>
system/base/dbus/pspec.xml
+8 -1
View File
@@ -13,7 +13,7 @@
<IsA>service</IsA>
<Summary>A message bus system, a simple way for applications to talk to each other</Summary>
<Description>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.</Description>
<Archive sha1sum="3f90a3d2ae6c67d2d1637039be9125c295c85a1a" type="targz">https://dbus.freedesktop.org/releases/dbus/dbus-1.11.8.tar.gz</Archive>
<Archive sha1sum="8e50e46796e8297eaa633da3a61cdc79a500e34a" type="targz">https://dbus.freedesktop.org/releases/dbus/dbus-1.12.8.tar.gz</Archive>
<BuildDependencies>
<Dependency>expat-devel</Dependency>
<Dependency>libX11-devel</Dependency>
@@ -98,6 +98,13 @@
</Package>
<History>
<Update release="7">
<Date>2018-07-20</Date>
<Version>1.12.8</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="6">
<Date>2018-07-15</Date>
<Version>1.11.8</Version>
system/base/perl-Locale-gettext/pspec.xml
+1 -1
View File
@@ -33,7 +33,7 @@
<History>
<Update release="4">
<Date>2018-07-15</Date>
<Date>2018-07-19</Date>
<Version>1.07</Version>
<Comment>Rebuild</Comment>
<Name>Ertuğrul Erata</Name>
system/base/polkit/pspec.xml
+1 -1
View File
@@ -84,7 +84,7 @@
<History>
<Update release="4">
<Date>2018-07-15</Date>
<Date>2018-07-20</Date>
<Version>0.113</Version>
<Comment>Rebuild</Comment>
<Name>Ertuğrul Erata</Name>
system/base/spidermonkey/pspec.xml
+1 -1
View File
@@ -55,7 +55,7 @@
<History>
<Update release="4">
<Date>2018-07-15</Date>
<Date>2018-07-19</Date>
<Version>17.0.0</Version>
<Comment>Rebuild</Comment>
<Name>Ertuğrul Erata</Name>
system/devel/autogen/pspec.xml
+1 -1
View File
@@ -56,7 +56,7 @@
<History>
<Update release="4">
<Date>2018-07-15</Date>
<Date>2018-07-20</Date>
<Version>5.18.10</Version>
<Comment>Rebuild.</Comment>
<Name>Ertuğrul Erata</Name>
system/devel/gc/pspec.xml
+1 -1
View File
@@ -47,7 +47,7 @@
<History>
<Update release="4">
<Date>2018-07-15</Date>
<Date>2018-07-20</Date>
<Version>7.6.4</Version>
<Comment>Version bump.</Comment>
<Name>Ertuğrul Erata</Name>
system/devel/gmp/pspec.xml
+1 -1
View File
@@ -57,7 +57,7 @@
<History>
<Update release="5">
<Date>2018-07-17</Date>
<Date>2018-07-20</Date>
<Version>6.1.2</Version>
<Comment>Rebuild</Comment>
<Name>Ertuğrul Erata</Name>
system/devel/intltool/files/intltool-0.51.0-perl-5.26.patch
+51
View File
@@ -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?
system/devel/intltool/files/intltool-merge-Create-cache-file-atomically.patch
+38
View File
@@ -0,0 +1,38 @@
From d328542bea50b9445c63cdf2454052392282a1ce Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@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
system/devel/intltool/files/intltool_distcheck-fix.patch
+30
View File
@@ -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
system/devel/intltool/pspec.xml
+6 -1
View File
@@ -17,6 +17,11 @@
<Dependency>perl</Dependency>
<Dependency>perl-XML-Parser</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">intltool-0.51.0-perl-5.26.patch</Patch>
<Patch level="1">intltool-merge-Create-cache-file-atomically.patch</Patch>
<Patch level="1">intltool_distcheck-fix.patch</Patch>
</Patches>
</Source>
<Package>
@@ -35,7 +40,7 @@
<History>
<Update release="4">
<Date>2018-07-19</Date>
<Date>2018-07-20</Date>
<Version>0.51.0</Version>
<Comment>Rebuild</Comment>
<Name>Ertuğrul Erata</Name>
system/devel/make/actions.py
+1 -1
View File
@@ -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")
system/devel/make/pspec.xml
+5 -5
View File
@@ -19,11 +19,11 @@
<Dependency>gnuconfig</Dependency>
<Dependency>patch</Dependency>
<Dependency>gc-devel</Dependency>
<Dependency>guile-devel</Dependency>
<!-- <Dependency>guile-devel</Dependency> -->
</BuildDependencies>
<Patches>
<Patch>glibc_2_27.patch</Patch>
<!--Patch>guile-2.2.patch</Patch-->
<!-- <Patch>glibc_2_27.patch</Patch> -->
<!-- <Patch>guile-2.2.patch</Patch> -->
</Patches>
</Source>
@@ -44,9 +44,9 @@
<History>
<Update release="4">
<Date>2018-07-18</Date>
<Date>2018-07-20</Date>
<Version>4.2.1</Version>
<Comment>Rebuild</Comment>
<Comment>Rebuild.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>