summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Grapentin <andreas@grapentin.org>2018-06-15 09:56:10 +0200
committerAndreas Grapentin <andreas@grapentin.org>2018-06-15 09:56:10 +0200
commit312ea899314790b7f9ab3ebe2fe970c0a25a7f52 (patch)
tree501d546f4079bbb34ff84b8624775bb5aff5d26d
parent1768d209054df9b2795dd673cacc2685856acc06 (diff)
progress in stage4
-rw-r--r--src/stage3/patches/generic/glibc.patch10
-rw-r--r--src/stage4/patches/generic/avahi-breakdeps.patch28
-rw-r--r--src/stage4/patches/generic/cairo-breakdeps.patch11
-rw-r--r--src/stage4/patches/generic/colord-breakdeps.patch34
-rw-r--r--src/stage4/patches/generic/doxygen.patch7
-rw-r--r--src/stage4/patches/generic/ffmpeg-breakdeps.patch6
-rw-r--r--src/stage4/patches/generic/ffmpeg.patch11
-rw-r--r--src/stage4/patches/generic/glibc.patch17
-rw-r--r--src/stage4/patches/generic/harfbuzz-breakdeps.patch29
-rw-r--r--src/stage4/patches/generic/imagemagick.patch15
-rw-r--r--src/stage4/patches/generic/imagemagick6.patch15
-rw-r--r--src/stage4/patches/generic/lash.patch23
-rw-r--r--src/stage4/patches/generic/libffado-breakdeps.patch56
-rw-r--r--src/stage4/patches/generic/libffado.patch57
-rw-r--r--src/stage4/patches/generic/librsvg-breakdeps.patch11
-rw-r--r--src/stage4/patches/generic/libsigc++-breakdeps.libsigc++-docs-breakdeps.patch (renamed from src/stage4/patches/generic/libsigc++-breakdeps.patch)12
-rw-r--r--src/stage4/patches/generic/libsigc++.patch12
-rw-r--r--src/stage4/patches/generic/libxml++.patch54
-rw-r--r--src/stage4/patches/generic/vala-breakdeps.patch8
-rw-r--r--src/stage4/patches/generic/vala.patch12
-rw-r--r--src/stage4/patches/generic/webkit2gtk.patch11
21 files changed, 348 insertions, 91 deletions
diff --git a/src/stage3/patches/generic/glibc.patch b/src/stage3/patches/generic/glibc.patch
index 2fe287d..ca64f4c 100644
--- a/src/stage3/patches/generic/glibc.patch
+++ b/src/stage3/patches/generic/glibc.patch
@@ -1,7 +1,7 @@
diff -rupN a/PKGBUILD b/PKGBUILD
---- a/PKGBUILD 2018-06-02 23:14:43.099580493 +0200
-+++ b/PKGBUILD 2018-06-03 08:56:01.259928500 +0200
-@@ -6,13 +6,13 @@
+--- a/PKGBUILD 2018-06-10 02:55:37.495747371 +0200
++++ b/PKGBUILD 2018-06-10 08:10:22.642602471 +0200
+@@ -6,13 +6,15 @@
# NOTE: valgrind requires rebuilt with each major glibc version
pkgbase=glibc
@@ -14,10 +14,12 @@ diff -rupN a/PKGBUILD b/PKGBUILD
url='http://www.gnu.org/software/libc'
license=(GPL LGPL)
-makedepends=(git gd lib32-gcc-libs)
++makedepends=(git gd)
++[ "x@MULTILIB@" != "xenable" ] || makedepends+=(lib32-gcc-libs)
options=(!strip staticlibs)
_commit=23158b08a0908f381459f273a984c6fd328363cb
#source=(git+https://sourceware.org/git/glibc.git#commit=$_commit
-@@ -53,10 +53,10 @@ build() {
+@@ -53,10 +55,10 @@ build() {
--enable-add-ons
--enable-bind-now
--enable-lock-elision
diff --git a/src/stage4/patches/generic/avahi-breakdeps.patch b/src/stage4/patches/generic/avahi-breakdeps.patch
deleted file mode 100644
index 74d0d90..0000000
--- a/src/stage4/patches/generic/avahi-breakdeps.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -rupN a/PKGBUILD b/PKGBUILD
---- a/PKGBUILD 2018-06-07 18:29:45.797053680 +0200
-+++ b/PKGBUILD 2018-06-07 21:00:31.723810605 +0200
-@@ -11,14 +11,12 @@ url='https://github.com/lathiat/avahi'
- license=(LGPL)
- arch=(x86_64)
- depends=(expat libdaemon glib2 libcap gdbm dbus)
--makedepends=(git qt4 pygtk mono intltool gtk-sharp-2 gobject-introspection gtk3
-+makedepends=(git pygtk intltool gobject-introspection gtk3
- xmltoman python-dbus python-gobject doxygen graphviz)
- optdepends=('gtk3: avahi-discover, avahi-discover-standalone, bshell, bssh, bvnc'
- 'gtk2: gtk2 bindings'
-- 'qt4: qt4 bindings'
- 'pygtk: avahi-bookmarks'
- 'python2-twisted: avahi-bookmarks'
-- 'mono: mono bindings'
- 'nss-mdns: NSS support for mDNS'
- 'python-gobject: avahi-discover'
- 'python-dbus: avahi-discover')
-@@ -43,7 +41,7 @@ prepare() {
-
- build() {
- cd $pkgname
-- export MOC_QT4=/usr/bin/moc-qt4 PYTHON=/usr/bin/python3
-+ export PYTHON=/usr/bin/python3
-
- ./configure \
- --prefix=/usr \
diff --git a/src/stage4/patches/generic/cairo-breakdeps.patch b/src/stage4/patches/generic/cairo-breakdeps.patch
index 84f76c5..462a26c 100644
--- a/src/stage4/patches/generic/cairo-breakdeps.patch
+++ b/src/stage4/patches/generic/cairo-breakdeps.patch
@@ -6,7 +6,16 @@ diff -rupN a/PKGBUILD b/PKGBUILD
license=(LGPL MPL)
depends=(libpng libxrender libxext fontconfig pixman glib2 lzo)
-makedepends=(librsvg gtk2 poppler-glib libspectre gtk-doc valgrind git)
-+makedepends=(librsvg libspectre gtk-doc git)
++makedepends=(libspectre gtk-doc git)
_commit=7149686456ec3c481fa1d3dbe76a0dab1e42b519 # tags/1.15.12^0
source=("git+https://anongit.freedesktop.org/git/cairo#commit=$_commit"
utf-8.diff)
+@@ -50,7 +50,7 @@ build() {
+ --enable-ps \
+ --enable-pdf \
+ --enable-gobject \
+- --enable-gtk-doc
++ --disable-gtk-doc
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+ make
+ }
diff --git a/src/stage4/patches/generic/colord-breakdeps.patch b/src/stage4/patches/generic/colord-breakdeps.patch
index 9f4a4f8..fa8029d 100644
--- a/src/stage4/patches/generic/colord-breakdeps.patch
+++ b/src/stage4/patches/generic/colord-breakdeps.patch
@@ -1,6 +1,15 @@
diff -rupN a/PKGBUILD b/PKGBUILD
---- a/PKGBUILD 2018-06-07 14:38:00.630248269 +0200
-+++ b/PKGBUILD 2018-06-07 14:50:16.570255611 +0200
+--- a/PKGBUILD 2018-06-12 19:26:26.354731391 +0200
++++ b/PKGBUILD 2018-06-12 21:15:53.914796921 +0200
+@@ -3,7 +3,7 @@
+ # Contributor: Ionut Biru <ibiru@archlinux.org>
+
+ pkgbase=colord
+-pkgname=(colord colord-sane)
++pkgname=(colord)
+ pkgver=1.4.3
+ pkgrel=1
+ pkgdesc="System daemon for managing color devices"
@@ -11,7 +11,7 @@ url="https://www.freedesktop.org/softwar
arch=(x86_64)
license=(GPL2)
@@ -21,3 +30,24 @@ diff -rupN a/PKGBUILD b/PKGBUILD
-D print_profiles=true \
-D daemon_user=colord
ninja -C build
+@@ -44,19 +44,13 @@ check() {
+ }
+
+ package_colord() {
+- optdepends=('argyllcms: color profiling'
+- 'colord-sane: SANE support')
++ optdepends=('argyllcms: color profiling')
+ replaces=(shared-color-profiles)
+
+ DESTDIR="$pkgdir" ninja -C build install
+
+ echo 'u colord - "Color management daemon" /var/lib/colord' |
+ install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/colord.conf"
+-
+-### Split colord-sane
+- mkdir -p colord-sane/usr/lib/colord-plugins
+- mv {"$pkgdir",colord-sane}/usr/lib/colord-sane
+- mv {"$pkgdir",colord-sane}/usr/lib/colord-plugins/libcolord_sensor_sane.so
+ }
+
+ package_colord-sane() {
diff --git a/src/stage4/patches/generic/doxygen.patch b/src/stage4/patches/generic/doxygen.patch
index 4399ee0..e92d047 100644
--- a/src/stage4/patches/generic/doxygen.patch
+++ b/src/stage4/patches/generic/doxygen.patch
@@ -1,6 +1,6 @@
diff -rupN a/PKGBUILD b/PKGBUILD
---- a/PKGBUILD 2018-04-14 16:29:01.773155012 +0200
-+++ b/PKGBUILD 2018-04-14 16:50:58.123030252 +0200
+--- a/PKGBUILD 2018-06-15 02:49:04.173387228 +0200
++++ b/PKGBUILD 2018-06-15 07:43:24.360230106 +0200
@@ -28,15 +28,16 @@ prepare() {
build() {
cd ${pkgbase}-Release_${pkgver//./_}/build
@@ -11,8 +11,9 @@ diff -rupN a/PKGBUILD b/PKGBUILD
-DDOC_INSTALL_DIR:PATH=share/doc/doxygen \
-DPYTHON_EXECUTABLE:FILE=/usr/bin/python2 \
- -Dbuild_doc:BOOL=ON \
+- -Dbuild_wizard:BOOL=ON
+ -Dbuild_doc:BOOL=OFF \
- -Dbuild_wizard:BOOL=ON
++ -Dbuild_wizard:BOOL=OFF
make
- make docs
diff --git a/src/stage4/patches/generic/ffmpeg-breakdeps.patch b/src/stage4/patches/generic/ffmpeg-breakdeps.patch
index e2295e0..362e617 100644
--- a/src/stage4/patches/generic/ffmpeg-breakdeps.patch
+++ b/src/stage4/patches/generic/ffmpeg-breakdeps.patch
@@ -10,7 +10,7 @@ diff -rupN a/PKGBUILD b/PKGBUILD
makedepends=('ffnvcodec-headers' 'ladspa' 'yasm')
optdepends=('ladspa: LADSPA filters')
provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so'
-@@ -69,8 +69,6 @@ build() {
+@@ -69,12 +69,9 @@ build() {
--enable-libvorbis \
--enable-libvpx \
--enable-libwebp \
@@ -19,3 +19,7 @@ diff -rupN a/PKGBUILD b/PKGBUILD
--enable-libxcb \
--enable-libxml2 \
--enable-libxvid \
+- --enable-nvenc \
+ --enable-omx \
+ --enable-shared \
+ --enable-version3
diff --git a/src/stage4/patches/generic/ffmpeg.patch b/src/stage4/patches/generic/ffmpeg.patch
new file mode 100644
index 0000000..f2f59d0
--- /dev/null
+++ b/src/stage4/patches/generic/ffmpeg.patch
@@ -0,0 +1,11 @@
+diff -rupN a/PKGBUILD b/PKGBUILD
+--- a/PKGBUILD 2018-06-14 22:51:35.396578389 +0200
++++ b/PKGBUILD 2018-06-15 07:38:13.570227004 +0200
+@@ -74,7 +74,6 @@ build() {
+ --enable-libxcb \
+ --enable-libxml2 \
+ --enable-libxvid \
+- --enable-nvenc \
+ --enable-omx \
+ --enable-shared \
+ --enable-version3
diff --git a/src/stage4/patches/generic/glibc.patch b/src/stage4/patches/generic/glibc.patch
index 9dea8a9..ca64f4c 100644
--- a/src/stage4/patches/generic/glibc.patch
+++ b/src/stage4/patches/generic/glibc.patch
@@ -19,7 +19,7 @@ diff -rupN a/PKGBUILD b/PKGBUILD
options=(!strip staticlibs)
_commit=23158b08a0908f381459f273a984c6fd328363cb
#source=(git+https://sourceware.org/git/glibc.git#commit=$_commit
-@@ -53,7 +55,7 @@ build() {
+@@ -53,10 +55,10 @@ build() {
--enable-add-ons
--enable-bind-now
--enable-lock-elision
@@ -27,7 +27,20 @@ diff -rupN a/PKGBUILD b/PKGBUILD
+ --@MULTILIB@-multi-arch
--enable-stack-protector=strong
--enable-stackguard-randomization
- --enable-static-pie
+- --enable-static-pie
++ --disable-static-pie
+ --disable-profile
+ --disable-werror
+ )
+@@ -70,6 +70,8 @@ build() {
+
+ # remove fortify for building libraries
+ CPPFLAGS=${CPPFLAGS/-D_FORTIFY_SOURCE=2/}
++ CFLAGS="$CFLAGS -no-pie -fno-PIE"
++ CXXFLAGS="$CXXFLAGS -no-pie -fno-PIE"
+
+ "$srcdir/glibc/configure" \
+ --libdir=/usr/lib \
@@ -87,6 +89,8 @@ build() {
echo "CXX += -D_FORTIFY_SOURCE=2" >> configparms
make
diff --git a/src/stage4/patches/generic/harfbuzz-breakdeps.patch b/src/stage4/patches/generic/harfbuzz-breakdeps.patch
deleted file mode 100644
index 41d0fe7..0000000
--- a/src/stage4/patches/generic/harfbuzz-breakdeps.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -rupN a/PKGBUILD b/PKGBUILD
---- a/PKGBUILD 2018-04-04 18:00:26.031522863 +0200
-+++ b/PKGBUILD 2018-04-09 12:49:37.357346517 +0200
-@@ -9,7 +9,7 @@ pkgdesc="OpenType text shaping engine"
- url="http://www.freedesktop.org/wiki/Software/HarfBuzz"
- arch=(x86_64)
- license=(MIT)
--makedepends=(glib2 freetype2 graphite cairo icu gobject-introspection gtk-doc ragel git
-+makedepends=(glib2 freetype2 cairo icu gobject-introspection gtk-doc ragel git
- python)
- _commit=ff2f81432bb0484a019a678058595e10217df51d # tags/1.7.6^0
- source=("git+https://anongit.freedesktop.org/git/harfbuzz#commit=$_commit")
-@@ -33,7 +33,6 @@ build() {
- --with-freetype \
- --with-glib \
- --with-gobject \
-- --with-graphite2 \
- --with-icu \
- --enable-gtk-doc
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-@@ -46,7 +45,7 @@ check() {
- }
-
- package_harfbuzz() {
-- depends=(glib2 freetype2 graphite)
-+ depends=(glib2 freetype2)
- optdepends=('cairo: hb-view program')
-
- cd $pkgbase
diff --git a/src/stage4/patches/generic/imagemagick.patch b/src/stage4/patches/generic/imagemagick.patch
new file mode 100644
index 0000000..6c9b16a
--- /dev/null
+++ b/src/stage4/patches/generic/imagemagick.patch
@@ -0,0 +1,15 @@
+diff -rupN a/PKGBUILD b/PKGBUILD
+--- a/PKGBUILD 2018-06-14 10:25:33.826131763 +0200
++++ b/PKGBUILD 2018-06-14 10:38:29.842806173 +0200
+@@ -15,10 +15,9 @@ makedepends=(ghostscript openexr libwmf
+ checkdepends=(gsfonts ttf-dejavu)
+ _relname=ImageMagick-${pkgver%%.*}
+ _tarname=ImageMagick-${pkgver%.*}-${pkgver##*.}
+-source=(https://www.imagemagick.org/download/$_tarname.tar.xz{,.asc}
++source=(https://www.imagemagick.org/download/$_tarname.tar.xz
+ arch-fonts.diff)
+ sha256sums=('db6a88477dc7290a450570d215ae68caf83e0d80c868addefb608109978db17b'
+- 'SKIP'
+ 'a85b744c61b1b563743ecb7c7adad999d7ed9a8af816650e3ab9321b2b102e73')
+ validpgpkeys=(D8272EF51DA223E4D05B466989AB63D48277377A) # Lexie Parsimoniae
+
diff --git a/src/stage4/patches/generic/imagemagick6.patch b/src/stage4/patches/generic/imagemagick6.patch
new file mode 100644
index 0000000..7b4f7cf
--- /dev/null
+++ b/src/stage4/patches/generic/imagemagick6.patch
@@ -0,0 +1,15 @@
+diff -rupN a/PKGBUILD b/PKGBUILD
+--- a/PKGBUILD 2018-06-15 04:55:07.973462698 +0200
++++ b/PKGBUILD 2018-06-15 07:46:16.800231826 +0200
+@@ -15,10 +15,9 @@ makedepends=(ghostscript openexr libwmf
+ checkdepends=(gsfonts ttf-dejavu)
+ _relname=ImageMagick-${pkgver%%.*}
+ _tarname=ImageMagick-${pkgver%.*}-${pkgver##*.}
+-source=(https://www.imagemagick.org/download/$_tarname.tar.xz{,.asc}
++source=(https://www.imagemagick.org/download/$_tarname.tar.xz
+ arch-fonts.diff)
+ sha256sums=('b6a8b6afea4cd0ea87e752a83bc66b13200e219e0a476156a83a259be3760560'
+- 'SKIP'
+ 'a85b744c61b1b563743ecb7c7adad999d7ed9a8af816650e3ab9321b2b102e73')
+ validpgpkeys=(D8272EF51DA223E4D05B466989AB63D48277377A) # Lexie Parsimoniae
+
diff --git a/src/stage4/patches/generic/lash.patch b/src/stage4/patches/generic/lash.patch
index a43fae2..f747696 100644
--- a/src/stage4/patches/generic/lash.patch
+++ b/src/stage4/patches/generic/lash.patch
@@ -1,6 +1,6 @@
diff -rupN a/04_disable_stacktrace.patch b/04_disable_stacktrace.patch
--- a/04_disable_stacktrace.patch 1970-01-01 01:00:00.000000000 +0100
-+++ b/04_disable_stacktrace.patch 2018-04-11 14:28:53.993404436 +0200
++++ b/04_disable_stacktrace.patch 2018-06-15 07:38:56.470227432 +0200
@@ -0,0 +1,29 @@
+Description: Don't print the stacktrace on segfaults.
+ Fixes FTBFS on armel,powerpc,ia64,alpha.
@@ -32,9 +32,14 @@ diff -rupN a/04_disable_stacktrace.patch b/04_disable_stacktrace.patch
+ }
+
diff -rupN a/PKGBUILD b/PKGBUILD
---- a/PKGBUILD 2018-04-11 14:05:43.327536240 +0200
-+++ b/PKGBUILD 2018-04-11 14:28:53.988404437 +0200
-@@ -15,13 +15,16 @@ depends=('jack' 'python2')
+--- a/PKGBUILD 2018-06-14 22:56:46.496581493 +0200
++++ b/PKGBUILD 2018-06-15 07:38:48.970227358 +0200
+@@ -11,17 +11,20 @@ pkgdesc="A session management system for
+ arch=('x86_64')
+ url="http://lash.nongnu.org/"
+ license=('GPL2')
+-depends=('jack' 'python2')
++depends=('jack' 'python2' 'libtirpc')
makedepends=('gtk2')
optdepends=('gtk2: For lash_panel, lash_save_button and lash_synth')
source=("https://download.savannah.gnu.org/releases/lash/${pkgname}-${pkgver}.tar.bz2"
@@ -53,3 +58,13 @@ diff -rupN a/PKGBUILD b/PKGBUILD
# Python2 fixes
export PYTHON="python2"
sed -i "s#env python#&2#" clients/lash_control
+@@ -29,7 +32,8 @@ prepare() {
+
+ build() {
+ cd "${pkgname}-${_relver}"
+- export LDFLAGS="-ldl -lm"
++ export LDFLAGS="-ldl -lm -ltirpc"
++ export CPPFLAGS="$CPPFLAGS -I/usr/include/tirpc"
+ ./configure --prefix=/usr
+ make
+ }
diff --git a/src/stage4/patches/generic/libffado-breakdeps.patch b/src/stage4/patches/generic/libffado-breakdeps.patch
index 6735a11..c7c6ee6 100644
--- a/src/stage4/patches/generic/libffado-breakdeps.patch
+++ b/src/stage4/patches/generic/libffado-breakdeps.patch
@@ -1,7 +1,43 @@
+diff -rupN a/libffado-sconstruct-in-chroot.patch b/libffado-sconstruct-in-chroot.patch
+--- a/libffado-sconstruct-in-chroot.patch 1970-01-01 01:00:00.000000000 +0100
++++ b/libffado-sconstruct-in-chroot.patch 2018-06-13 23:30:20.449072831 +0200
+@@ -0,0 +1,32 @@
++diff -rupN libffado-2.4.1/SConstruct libffado-2.4.1.new/SConstruct
++--- libffado-2.4.1/SConstruct 2018-03-04 07:13:17.000000000 +0100
+++++ libffado-2.4.1.new/SConstruct 2018-06-13 23:29:32.372405685 +0200
++@@ -606,8 +606,7 @@ class CpuInfo (object):
++ # 64-bit (x86_64/AMD64/Intel64)
++ # Long Mode (x86-64: amd64, also known as Intel 64, i.e. 64-bit capable)
++ self.is_64bit = (self.is_x86 and 'lm' in self.x86_flags) or \
++- (self.is_powerpc and \
++- ('970' in self.ppc_type or 'power8' in self.ppc_type.lower()))
+++ (self.is_powerpc and '64' in self.machine)
++
++ # Hardware virtualization capable: vmx (Intel), svm (AMD)
++ self.has_hwvirt = self.is_x86 and (
++@@ -660,6 +659,7 @@ class CpuInfo (object):
++ # 970FX (2004), manufactured at 90 nm, 1.8 - 2.7 GHz
++ # 970GX (2006), manufactured at 90 nm, 1MB L2 cache/core, 1.2 - 2.5 GHz
++ # 970MP (2005), dual core, 1 MB L2 cache/core, 1.6 - 2.5 GHz
+++ self.ppc_type = None
++ for k,v in cpuinfo_kv():
++ if k == 'processor':
++ self.cpu_count += 1
++@@ -811,8 +811,8 @@ if env['DIST_TARGET'] == 'auto':
++ cpuinfo = CpuInfo()
++ if cpuinfo.is_x86:
++ opt_flags.extend(cc_flags_x86(cpuinfo, env['ENABLE_OPTIMIZATIONS']))
++-if cpuinfo.is_powerpc:
++- opt_flags.extend(cc_flags_powerpc(cpuinfo, env['ENABLE_OPTIMIZATIONS']))
+++#if cpuinfo.is_powerpc:
+++# opt_flags.extend(cc_flags_powerpc(cpuinfo, env['ENABLE_OPTIMIZATIONS']))
++ if '-msse' in opt_flags:
++ env['USE_SSE'] = 1
++ if '-msse2' in opt_flags:
diff -rupN a/PKGBUILD b/PKGBUILD
---- a/PKGBUILD 2018-04-04 18:25:29.192380397 +0200
-+++ b/PKGBUILD 2018-04-09 13:53:12.169984960 +0200
-@@ -11,9 +11,8 @@ pkgdesc="Driver for FireWire audio devic
+--- a/PKGBUILD 2018-06-13 23:25:14.575736446 +0200
++++ b/PKGBUILD 2018-06-13 23:30:17.279072800 +0200
+@@ -11,19 +11,21 @@ pkgdesc="Driver for FireWire audio devic
arch=('x86_64')
url="http://www.ffado.org/"
license=('GPL')
@@ -13,3 +49,17 @@ diff -rupN a/PKGBUILD b/PKGBUILD
provides=('ffado')
source=("http://www.ffado.org/files/${pkgname}-${pkgver}.tgz"
"${pkgname}-fix-python3-pyqt5.diff"
++ "libffado-sconstruct-in-chroot.patch"
+ )
+ sha512sums=('0859f17b87c68108bbde726d1cf8ab0b99f6f7f02cbe36acd8b451e112688a4d1edc21134eb4a2edc8c92dcf5f5da52efeabb2ad0dc07804ed1aa664a3b38d74'
+- '39beb2399377d7ee13a43ddd7a80907eb94a2f8f146c5a94a4ba0e1471b3369d2b1519cb8b15c3e2352d9854048882cc037058a1992e6e87270fe9e17fdba91e')
++ '39beb2399377d7ee13a43ddd7a80907eb94a2f8f146c5a94a4ba0e1471b3369d2b1519cb8b15c3e2352d9854048882cc037058a1992e6e87270fe9e17fdba91e'
++ '55b7a30c02ac60ab0dcbc1505ba20e663143cca63eafa7dbf70e81a3724bdbae0b5d72315db35e51dbc51155f052d53b29048fa08e0add44bb72647e78953c3c')
+
+ prepare() {
+ cd "${pkgname}-${pkgver}"
+ patch -Np1 -i "${srcdir}/${pkgname}-fix-python3-pyqt5.diff"
++ patch -Np1 -i "${srcdir}/libffado-sconstruct-in-chroot.patch"
+ }
+
+ build() {
diff --git a/src/stage4/patches/generic/libffado.patch b/src/stage4/patches/generic/libffado.patch
new file mode 100644
index 0000000..80d8c5e
--- /dev/null
+++ b/src/stage4/patches/generic/libffado.patch
@@ -0,0 +1,57 @@
+diff -rupN a/libffado-sconstruct-in-chroot.patch b/libffado-sconstruct-in-chroot.patch
+--- a/libffado-sconstruct-in-chroot.patch 1970-01-01 01:00:00.000000000 +0100
++++ b/libffado-sconstruct-in-chroot.patch 2018-06-13 23:46:26.835749140 +0200
+@@ -0,0 +1,32 @@
++diff -rupN libffado-2.4.1/SConstruct libffado-2.4.1.new/SConstruct
++--- libffado-2.4.1/SConstruct 2018-03-04 07:13:17.000000000 +0100
+++++ libffado-2.4.1.new/SConstruct 2018-06-13 23:29:32.372405685 +0200
++@@ -606,8 +606,7 @@ class CpuInfo (object):
++ # 64-bit (x86_64/AMD64/Intel64)
++ # Long Mode (x86-64: amd64, also known as Intel 64, i.e. 64-bit capable)
++ self.is_64bit = (self.is_x86 and 'lm' in self.x86_flags) or \
++- (self.is_powerpc and \
++- ('970' in self.ppc_type or 'power8' in self.ppc_type.lower()))
+++ (self.is_powerpc and '64' in self.machine)
++
++ # Hardware virtualization capable: vmx (Intel), svm (AMD)
++ self.has_hwvirt = self.is_x86 and (
++@@ -660,6 +659,7 @@ class CpuInfo (object):
++ # 970FX (2004), manufactured at 90 nm, 1.8 - 2.7 GHz
++ # 970GX (2006), manufactured at 90 nm, 1MB L2 cache/core, 1.2 - 2.5 GHz
++ # 970MP (2005), dual core, 1 MB L2 cache/core, 1.6 - 2.5 GHz
+++ self.ppc_type = None
++ for k,v in cpuinfo_kv():
++ if k == 'processor':
++ self.cpu_count += 1
++@@ -811,8 +811,8 @@ if env['DIST_TARGET'] == 'auto':
++ cpuinfo = CpuInfo()
++ if cpuinfo.is_x86:
++ opt_flags.extend(cc_flags_x86(cpuinfo, env['ENABLE_OPTIMIZATIONS']))
++-if cpuinfo.is_powerpc:
++- opt_flags.extend(cc_flags_powerpc(cpuinfo, env['ENABLE_OPTIMIZATIONS']))
+++#if cpuinfo.is_powerpc:
+++# opt_flags.extend(cc_flags_powerpc(cpuinfo, env['ENABLE_OPTIMIZATIONS']))
++ if '-msse' in opt_flags:
++ env['USE_SSE'] = 1
++ if '-msse2' in opt_flags:
+diff -rupN a/PKGBUILD b/PKGBUILD
+--- a/PKGBUILD 2018-06-11 04:14:44.399990158 +0200
++++ b/PKGBUILD 2018-06-13 23:46:22.152415760 +0200
+@@ -17,13 +17,16 @@ optdepends=('python-pyqt5: ffado-mixer')
+ provides=('ffado')
+ source=("http://www.ffado.org/files/${pkgname}-${pkgver}.tgz"
+ "${pkgname}-fix-python3-pyqt5.diff"
++ "libffado-sconstruct-in-chroot.patch"
+ )
+ sha512sums=('0859f17b87c68108bbde726d1cf8ab0b99f6f7f02cbe36acd8b451e112688a4d1edc21134eb4a2edc8c92dcf5f5da52efeabb2ad0dc07804ed1aa664a3b38d74'
+- '39beb2399377d7ee13a43ddd7a80907eb94a2f8f146c5a94a4ba0e1471b3369d2b1519cb8b15c3e2352d9854048882cc037058a1992e6e87270fe9e17fdba91e')
++ '39beb2399377d7ee13a43ddd7a80907eb94a2f8f146c5a94a4ba0e1471b3369d2b1519cb8b15c3e2352d9854048882cc037058a1992e6e87270fe9e17fdba91e'
++ '55b7a30c02ac60ab0dcbc1505ba20e663143cca63eafa7dbf70e81a3724bdbae0b5d72315db35e51dbc51155f052d53b29048fa08e0add44bb72647e78953c3c')
+
+ prepare() {
+ cd "${pkgname}-${pkgver}"
+ patch -Np1 -i "${srcdir}/${pkgname}-fix-python3-pyqt5.diff"
++ patch -Np1 -i "${srcdir}/libffado-sconstruct-in-chroot.patch"
+ }
+
+ build() {
diff --git a/src/stage4/patches/generic/librsvg-breakdeps.patch b/src/stage4/patches/generic/librsvg-breakdeps.patch
index a9be301..457a1fb 100644
--- a/src/stage4/patches/generic/librsvg-breakdeps.patch
+++ b/src/stage4/patches/generic/librsvg-breakdeps.patch
@@ -1,7 +1,7 @@
diff -rupN a/PKGBUILD b/PKGBUILD
---- a/PKGBUILD 2018-06-11 10:51:38.676894440 +0200
-+++ b/PKGBUILD 2018-06-11 22:53:55.783993521 +0200
-@@ -2,43 +2,33 @@
+--- a/PKGBUILD 2018-06-12 06:37:53.950937954 +0200
++++ b/PKGBUILD 2018-06-12 06:44:08.554275025 +0200
+@@ -2,7 +2,7 @@
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=librsvg
@@ -10,12 +10,11 @@ diff -rupN a/PKGBUILD b/PKGBUILD
pkgrel=1
epoch=2
pkgdesc="SVG rendering library"
- url="https://wiki.gnome.org/Projects/LibRsvg"
+@@ -10,35 +10,25 @@ url="https://wiki.gnome.org/Projects/Lib
arch=(x86_64)
license=(LGPL)
--depends=(gdk-pixbuf2 pango libcroco)
+ depends=(gdk-pixbuf2 pango libcroco)
-makedepends=(intltool gobject-introspection vala python2 gtk-doc git rust)
-+depends=(gdk-pixbuf2 libcroco)
+makedepends=(intltool gobject-introspection python2 gtk-doc git)
_commit=497c925593e41c12cec4a55e4365655a29c3fe59 # tags/2.42.5^0
-source=("git+https://gitlab.gnome.org/GNOME/librsvg.git#commit=$_commit")
diff --git a/src/stage4/patches/generic/libsigc++-breakdeps.patch b/src/stage4/patches/generic/libsigc++-breakdeps.libsigc++-docs-breakdeps.patch
index 24635df..15e4e9d 100644
--- a/src/stage4/patches/generic/libsigc++-breakdeps.patch
+++ b/src/stage4/patches/generic/libsigc++-breakdeps.libsigc++-docs-breakdeps.patch
@@ -1,7 +1,7 @@
diff -rupN a/PKGBUILD b/PKGBUILD
---- a/PKGBUILD 2018-04-10 18:33:56.884199699 +0200
-+++ b/PKGBUILD 2018-04-10 18:48:25.109117411 +0200
-@@ -3,13 +3,13 @@
+--- a/PKGBUILD 2018-06-13 08:23:15.461863118 +0200
++++ b/PKGBUILD 2018-06-13 08:25:08.601864248 +0200
+@@ -3,16 +3,16 @@
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgbase=libsigc++
@@ -16,7 +16,11 @@ diff -rupN a/PKGBUILD b/PKGBUILD
+makedepends=('gcc-libs' 'git' 'doxygen' 'libxslt' 'graphviz')
options=('!emptydirs')
_commit=83f1e2fe7855f85af570b9653903d2c426d67e72
- source=("git://git.gnome.org/libsigcplusplus#commit=$_commit")
+-source=("git://git.gnome.org/libsigcplusplus#commit=$_commit")
++source=("git+https://github.com/GNOME/libsigcplusplus.git#commit=$_commit")
+ sha256sums=('SKIP')
+
+ pkgver() {
@@ -20,35 +20,11 @@ pkgver() {
git describe --tags | sed 's/-/+/g'
}
diff --git a/src/stage4/patches/generic/libsigc++.patch b/src/stage4/patches/generic/libsigc++.patch
new file mode 100644
index 0000000..ef0fb79
--- /dev/null
+++ b/src/stage4/patches/generic/libsigc++.patch
@@ -0,0 +1,12 @@
+diff -rupN a/PKGBUILD b/PKGBUILD
+--- a/PKGBUILD 2018-06-11 04:15:24.603323892 +0200
++++ b/PKGBUILD 2018-06-12 16:03:57.157943501 +0200
+@@ -12,7 +12,7 @@ url="http://libsigc.sourceforge.net/"
+ makedepends=('gcc-libs' 'git' 'mm-common' 'doxygen' 'libxslt' 'graphviz')
+ options=('!emptydirs')
+ _commit=83f1e2fe7855f85af570b9653903d2c426d67e72
+-source=("git://git.gnome.org/libsigcplusplus#commit=$_commit")
++source=("git+https://github.com/GNOME/libsigcplusplus.git#commit=$_commit")
+ sha256sums=('SKIP')
+
+ pkgver() {
diff --git a/src/stage4/patches/generic/libxml++.patch b/src/stage4/patches/generic/libxml++.patch
new file mode 100644
index 0000000..ae132ec
--- /dev/null
+++ b/src/stage4/patches/generic/libxml++.patch
@@ -0,0 +1,54 @@
+diff -rupN a/PKGBUILD b/PKGBUILD
+--- a/PKGBUILD 2018-06-13 10:41:19.865279113 +0200
++++ b/PKGBUILD 2018-06-13 11:51:22.678654381 +0200
+@@ -11,21 +11,21 @@ url="http://libxmlplusplus.sourceforge.n
+ makedepends=('pkgconfig' 'glibmm-docs' 'libxml2' 'glibmm' git mm-common)
+ options=('!emptydirs')
+ _commit=2af973ff59b2151e0783bbe4155816ce88d0c8b0 # libxml++-3.0
+-source=("git+https://git.gnome.org/browse/libxml++#commit=$_commit")
++source=("git+https://gitlab.gnome.org/GNOME/libxmlplusplus#commit=$_commit")
+ sha256sums=('SKIP')
+
+ pkgver() {
+- cd $pkgbase
++ cd ${pkgbase//+/plus}
+ git describe --tags | sed 's/-/+/g'
+ }
+
+ prepare() {
+- cd $pkgbase
++ cd ${pkgbase//+/plus}
+ NOCONFIGURE=1 ./autogen.sh
+ }
+
+ build() {
+- cd "${srcdir}/$pkgbase"
++ cd ${pkgbase//+/plus}
+ ./configure --prefix=/usr
+
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+@@ -33,7 +33,7 @@ build() {
+ }
+
+ check() {
+- cd "${srcdir}/$pkgbase"
++ cd ${pkgbase//+/plus}
+ make check
+ }
+
+@@ -41,13 +41,13 @@ package_libxml++() {
+ pkgdesc="C++ bindings to libxml2"
+ depends=('libxml2' 'glibmm')
+
+- cd "${srcdir}/$pkgbase"
++ cd ${pkgbase//+/plus}
+ make DESTDIR="${pkgdir}" install doc_subdirs=
+ }
+
+ package_libxml++-docs() {
+ pkgdesc="Developer documentation for libxml++"
+ depends=('glibmm-docs')
+- cd "${srcdir}/$pkgbase"
++ cd ${pkgbase//+/plus}
+ make DESTDIR="${pkgdir}" -C docs install
+ }
diff --git a/src/stage4/patches/generic/vala-breakdeps.patch b/src/stage4/patches/generic/vala-breakdeps.patch
index b7a4d04..ad2e5c0 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-06-07 14:37:41.456914744 +0200
-+++ b/PKGBUILD 2018-06-07 14:49:30.713588487 +0200
+--- a/PKGBUILD 2018-06-12 14:37:09.191224869 +0200
++++ b/PKGBUILD 2018-06-12 16:00:09.877941233 +0200
@@ -11,37 +11,35 @@ url="https://wiki.gnome.org/Projects/Val
arch=(x86_64)
license=(LGPL)
@@ -14,8 +14,8 @@ diff -rupN a/PKGBUILD b/PKGBUILD
_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"
-+ "git+https://git.gnome.org/browse/vala#commit=$_commit")
++source=("git+https://gitlab.gnome.org/Archive/vala-bootstrap.git"
++ "git+https://gitlab.gnome.org/GNOME/vala.git#commit=$_commit")
+sha256sums=('SKIP'
+ 'SKIP')
diff --git a/src/stage4/patches/generic/vala.patch b/src/stage4/patches/generic/vala.patch
new file mode 100644
index 0000000..4b84107
--- /dev/null
+++ b/src/stage4/patches/generic/vala.patch
@@ -0,0 +1,12 @@
+diff -rupN a/PKGBUILD b/PKGBUILD
+--- a/PKGBUILD 2018-06-12 17:39:35.488000757 +0200
++++ b/PKGBUILD 2018-06-12 18:14:47.968021836 +0200
+@@ -17,7 +17,7 @@ provides=(valadoc)
+ conflicts=(valadoc)
+ replaces=(valadoc)
+ _commit=2efef16d7e6265bc251050d22cfb4d8830706621 # tags/0.40.6^0
+-source=("git+https://git.gnome.org/browse/vala#commit=$_commit")
++source=("git+https://gitlab.gnome.org/GNOME/vala.git#commit=$_commit")
+ sha256sums=('SKIP')
+
+ pkgver() {
diff --git a/src/stage4/patches/generic/webkit2gtk.patch b/src/stage4/patches/generic/webkit2gtk.patch
new file mode 100644
index 0000000..80e0a94
--- /dev/null
+++ b/src/stage4/patches/generic/webkit2gtk.patch
@@ -0,0 +1,11 @@
+diff -rupN a/PKGBUILD b/PKGBUILD
+--- a/PKGBUILD 2018-06-14 08:09:00.766050013 +0200
++++ b/PKGBUILD 2018-06-14 10:41:54.146141544 +0200
+@@ -38,6 +38,7 @@ build() {
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DENABLE_GTKDOC=ON \
++ -DENABLE_JIT=OFF \
+ -DLIBEXEC_INSTALL_DIR=/usr/lib \
+ -DLIB_INSTALL_DIR=/usr/lib \
+ -DPYTHON_EXECUTABLE=/usr/bin/python2 \