more progress in stage4 patches

5 files changed, 50 insertions, 25 deletions

diff --git a/src/stage4/patches/generic/colord-breakdeps.patch b/src/stage4/patches/generic/colord-breakdeps.patch
index 0f64440..9f4a4f8 100644
--- a/src/stage4/patches/generic/colord-breakdeps.patch
+++ b/src/stage4/patches/generic/colord-breakdeps.patch
@@ -1,23 +1,23 @@
 diff -rupN a/PKGBUILD b/PKGBUILD
---- a/PKGBUILD	2018-04-09 07:49:37.470052499 +0200
-+++ b/PKGBUILD	2018-04-09 07:49:37.470052499 +0200
-@@ -10,7 +10,7 @@ arch=(x86_64)
- url="https://www.freedesktop.org/software/colord"
+--- a/PKGBUILD	2018-06-07 14:38:00.630248269 +0200
++++ b/PKGBUILD	2018-06-07 14:50:16.570255611 +0200
+@@ -11,7 +11,7 @@ url="https://www.freedesktop.org/softwar
+ arch=(x86_64)
  license=(GPL2)
  depends=(lcms2 libgusb polkit sqlite systemd dconf dbus libgudev shared-mime-info)
 -makedepends=(gobject-introspection vala sane bash-completion argyllcms git docbook-utils
 +makedepends=(gobject-introspection bash-completion argyllcms git docbook-utils
               docbook-sgml perl-sgmls meson gtk-doc)
- optdepends=('sane: scanner support'
-             'argyllcms: color profiling')
-@@ -36,8 +36,8 @@ prepare() {
+ options=(!emptydirs)
+ _commit=cd7faac0d81f2dabef6c9787baf78b9e8fb0e1ae  # tags/1.4.3^0
+@@ -31,8 +31,8 @@ prepare() {
  build() {
-   arch-meson $pkgname build \
-     -Denable-libcolordcompat=true \
--    -Denable-sane=true \
--    -Denable-vala=true \
-+    -Denable-sane=false \
-+    -Denable-vala=false \
-     -Denable-print-profiles=true \
-     -Dwith-daemon-user=colord
+   arch-meson colord build \
+     -D libcolordcompat=true \
+-    -D sane=true \
+-    -D vapi=true \
++    -D sane=false \
++    -D vapi=false \
+     -D print_profiles=true \
+     -D daemon_user=colord
    ninja -C build
diff --git a/src/stage4/patches/generic/gcc.patch b/src/stage4/patches/generic/gcc.patch
index 17d8544..4bb7c5e 100644
--- a/src/stage4/patches/generic/gcc.patch
+++ b/src/stage4/patches/generic/gcc.patch
@@ -1,6 +1,6 @@
 diff -rupN a/0001-pthread-reentrant.patch b/0001-pthread-reentrant.patch
 --- a/0001-pthread-reentrant.patch	1970-01-01 01:00:00.000000000 +0100
-+++ b/0001-pthread-reentrant.patch	2018-05-25 10:19:14.186356955 +0200
++++ b/0001-pthread-reentrant.patch	2018-06-07 11:53:03.550149516 +0200
 @@ -0,0 +1,11 @@
 +--- trunk/gcc/config/riscv/linux.h	2018/01/03 10:03:58	256169
 ++++ trunk/gcc/config/riscv/linux.h	2018/02/13 11:21:01	257621
@@ -14,8 +14,8 @@ diff -rupN a/0001-pthread-reentrant.patch b/0001-pthread-reentrant.patch
 + -melf" XLEN_SPEC "lriscv \
 + %{shared} \
 diff -rupN a/PKGBUILD b/PKGBUILD
---- a/PKGBUILD	2018-05-25 10:15:30.533015789 +0200
-+++ b/PKGBUILD	2018-05-25 10:18:49.539689424 +0200
+--- a/PKGBUILD	2018-06-07 04:45:58.776560502 +0200
++++ b/PKGBUILD	2018-06-07 11:52:53.533482750 +0200
 @@ -5,8 +5,9 @@
  # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
  # NOTE: libtool requires rebuilt with each new gcc version
@@ -34,7 +34,7 @@ diff -rupN a/PKGBUILD b/PKGBUILD
  url='http://gcc.gnu.org'
 -makedepends=(binutils libmpc gcc-ada doxygen lib32-glibc lib32-gcc-libs python)
 -checkdepends=(dejagnu inetutils)
-+makedepends=(binutils libmpc)
++makedepends=(binutils libmpc python)
 +[ "x@MULTILIB@" == "xdisable" ] || makedepends+=(lib32-glibc lib32-gcc-libs)
 +checkdepends=(dejagnu)
  options=(!emptydirs)
diff --git a/src/stage4/patches/generic/graphviz-breakdeps.patch b/src/stage4/patches/generic/graphviz-breakdeps.patch
index eb56bb2..50bfbb0 100644
--- a/src/stage4/patches/generic/graphviz-breakdeps.patch
+++ b/src/stage4/patches/generic/graphviz-breakdeps.patch
@@ -1,10 +1,10 @@
 diff -rupN a/PKGBUILD b/PKGBUILD
---- a/PKGBUILD	2018-04-10 16:12:42.814002849 +0200
-+++ b/PKGBUILD	2018-04-10 17:01:16.056726739 +0200
+--- a/PKGBUILD	2018-06-07 13:00:30.566856564 +0200
++++ b/PKGBUILD	2018-06-07 13:33:35.840209706 +0200
 @@ -11,9 +11,8 @@ url='http://www.graphviz.org/'
  license=('CPL')
  arch=('x86_64')
- depends=('libltdl' 'gd' 'librsvg' 'libxaw' 'ghostscript' 'pango' 'gts' 'gsfonts')
+ depends=('libltdl' 'gd' 'librsvg' 'libxaw' 'ghostscript' 'pango' 'gts' 'gsfonts' 'libnsl')
 -makedepends=('swig' 'mono' 'guile' 'lua' 'ocaml' 'perl' 'python2' 'r' 'tk' 'qt4' 'gtk2')
 -optdepends=('mono: sharp bindings'
 -            'guile: guile bindings'
diff --git a/src/stage4/patches/generic/perl-locale-gettext.patch b/src/stage4/patches/generic/perl-locale-gettext.patch
new file mode 100644
index 0000000..a53b395
--- /dev/null
+++ b/src/stage4/patches/generic/perl-locale-gettext.patch
@@ -0,0 +1,25 @@
+diff -rupN a/PKGBUILD b/PKGBUILD
+--- a/PKGBUILD	2018-06-06 12:56:52.759325634 +0200
++++ b/PKGBUILD	2018-06-06 12:56:52.759325634 +0200
+@@ -30,6 +30,8 @@ check() {
+   make test
+ }
+ 
++perlver() { perl -e '$v = $^V->{version}; print $v->[0].".".($v->[1]+$ARGV[0]);' $1; }
++
+ package() {
+   cd "${srcdir}/${_realname}-${pkgver}"
+   make install DESTDIR="${pkgdir}"
+@@ -38,11 +40,7 @@ package() {
+   find "${pkgdir}" -name perllocal.pod -delete
+   find "${pkgdir}" -name .packlist -delete
+ 
+-# template start; name=perl-binary-module-dependency; version=1;
+ if [[ $(find "$pkgdir/usr/lib/perl5/" -name "*.so") ]]; then
+-	_perlver_min=$(perl -e '$v = $^V->{version}; print $v->[0].".".($v->[1]);')
+-	_perlver_max=$(perl -e '$v = $^V->{version}; print $v->[0].".".($v->[1]+1);')
+-	depends+=("perl>=$_perlver_min" "perl<$_perlver_max")
++	depends+=("perl>=$(perlver)" "perl<$(perlver 1)")
+ fi
+-# template end;
+ }
diff --git a/src/stage4/patches/generic/vala-breakdeps.patch b/src/stage4/patches/generic/vala-breakdeps.patch
index d7df56d..b7a4d04 100644
--- a/src/stage4/patches/generic/vala-breakdeps.patch
+++ b/src/stage4/patches/generic/vala-breakdeps.patch
@@ -1,6 +1,6 @@
 diff -rupN a/PKGBUILD b/PKGBUILD
---- a/PKGBUILD	2018-04-10 13:59:21.242761216 +0200
-+++ b/PKGBUILD	2018-04-10 13:59:21.243761216 +0200
+--- a/PKGBUILD	2018-06-07 14:37:41.456914744 +0200
++++ b/PKGBUILD	2018-06-07 14:49:30.713588487 +0200
 @@ -11,37 +11,35 @@ url="https://wiki.gnome.org/Projects/Val
  arch=(x86_64)
  license=(LGPL)
@@ -11,7 +11,7 @@ diff -rupN a/PKGBUILD b/PKGBUILD
  provides=(valadoc)
  conflicts=(valadoc)
  replaces=(valadoc)
- _commit=3a11e70aefae4f2344b6352440e82cab0963f4f7  # tags/0.40.2^0
+ _commit=2efef16d7e6265bc251050d22cfb4d8830706621  # tags/0.40.6^0
 -source=("git+https://git.gnome.org/browse/vala#commit=$_commit")
 -sha256sums=('SKIP')
 +source=("git://git.gnome.org/vala-bootstrap"