diff options
author | Andreas Grapentin <andreas@grapentin.org> | 2018-06-09 14:52:47 +0200 |
---|---|---|
committer | Andreas Grapentin <andreas@grapentin.org> | 2018-06-09 14:52:47 +0200 |
commit | 897a1aebab62233e22a979c49ffda0f1ebcbd23c (patch) | |
tree | 9ebd799ac7ec799c9a10b0575c9e2d73bfc8c2c8 /src/stage4 | |
parent | c5cf653508dd71abeebe8a0ebf666a25710884df (diff) |
stage4 patches progress
Diffstat (limited to 'src/stage4')
39 files changed, 457 insertions, 184 deletions
diff --git a/src/stage4/patches/generic/avahi-breakdeps.patch b/src/stage4/patches/generic/avahi-breakdeps.patch index 0e0ec4b..74d0d90 100644 --- a/src/stage4/patches/generic/avahi-breakdeps.patch +++ b/src/stage4/patches/generic/avahi-breakdeps.patch @@ -1,12 +1,12 @@ diff -rupN a/PKGBUILD b/PKGBUILD ---- a/PKGBUILD 2018-04-04 23:14:14.847738317 +0200 -+++ b/PKGBUILD 2018-04-09 13:39:05.411065213 +0200 +--- 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 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' diff --git a/src/stage4/patches/generic/boost.patch b/src/stage4/patches/generic/boost.patch index 6d3c035..7a240a0 100644 --- a/src/stage4/patches/generic/boost.patch +++ b/src/stage4/patches/generic/boost.patch @@ -1,9 +1,9 @@ diff -rupN a/PKGBUILD b/PKGBUILD ---- a/PKGBUILD 2018-06-06 17:17:39.352815084 +0200 -+++ b/PKGBUILD 2018-06-06 17:17:47.479481833 +0200 +--- a/PKGBUILD 2018-06-08 00:17:14.930595049 +0200 ++++ b/PKGBUILD 2018-06-08 08:01:13.110872809 +0200 @@ -38,6 +38,8 @@ build() { -+ _bindir="bin.linux" + _bindir="bin.linuxx86" [[ "${CARCH}" = "x86_64" ]] && _bindir="bin.linuxx86_64" + [[ "${CARCH}" = "riscv64" ]] && _bindir="bin.linux" + [[ "${CARCH}" = "powerpc64le" ]] && _bindir="bin.linuxppc" diff --git a/src/stage4/patches/generic/btrfs-progs.patch b/src/stage4/patches/generic/btrfs-progs.patch deleted file mode 100644 index 1c42396..0000000 --- a/src/stage4/patches/generic/btrfs-progs.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -rupN a/0001-fix-build-with-e2fsprogs-1.44.0.patch b/0001-fix-build-with-e2fsprogs-1.44.0.patch ---- a/0001-fix-build-with-e2fsprogs-1.44.0.patch 1970-01-01 01:00:00.000000000 +0100 -+++ b/0001-fix-build-with-e2fsprogs-1.44.0.patch 2018-04-05 10:05:27.065035156 +0200 -@@ -0,0 +1,14 @@ -+diff --git a/convert/source-ext2.c b/convert/source-ext2.c -+index b1492c78693d..070126ec38ec 100644 -+--- a/convert/source-ext2.c -++++ b/convert/source-ext2.c -+@@ -422,8 +422,7 @@ static int ext2_xattr_check_entry(struct ext2_ext_attr_entry *entry, -+ { -+ size_t value_size = entry->e_value_size; -+ -+- if (entry->e_value_block != 0 || value_size > size || -+- entry->e_value_offs + value_size > size) -++ if (value_size > size || entry->e_value_offs + value_size > size) -+ return -EIO; -+ return 0; -+ } -diff -rupN a/PKGBUILD b/PKGBUILD ---- a/PKGBUILD 2018-04-05 10:05:27.064035156 +0200 -+++ b/PKGBUILD 2018-04-05 10:05:27.065035156 +0200 -@@ -20,7 +20,8 @@ source=("https://www.kernel.org/pub/linu - 'initcpio-install-btrfs' - 'initcpio-hook-btrfs' - 'btrfs-scrub@.service' -- 'btrfs-scrub@.timer') -+ 'btrfs-scrub@.timer' -+ '0001-fix-build-with-e2fsprogs-1.44.0.patch') - install=btrfs-progs.install - options=(!staticlibs) - md5sums=('SKIP' -@@ -28,7 +29,13 @@ md5sums=('SKIP' - '7241ba3a4286d08da0d50b7176941112' - 'b09688a915a0ec8f40e2f5aacbabc9ad' - '917b31f4eb90448d6791e17ea0f386c7' -- '502221c1b47a3bb2c06703d4fb90a0c2') -+ '502221c1b47a3bb2c06703d4fb90a0c2' -+ '66a2b1ec9f0d5e8a34fb9344d6307ee0') -+ -+prepare() { -+ cd $pkgname-v$pkgver -+ patch -Np1 -i ../0001-fix-build-with-e2fsprogs-1.44.0.patch -+} - - build() { - cd $pkgname-v$pkgver diff --git a/src/stage4/patches/generic/cairo-breakdeps.patch b/src/stage4/patches/generic/cairo-breakdeps.patch index 7df0bb6..99adbbe 100644 --- a/src/stage4/patches/generic/cairo-breakdeps.patch +++ b/src/stage4/patches/generic/cairo-breakdeps.patch @@ -1,12 +1,12 @@ diff -rupN a/PKGBUILD b/PKGBUILD ---- a/PKGBUILD 2018-04-08 14:24:55.428993337 +0200 -+++ b/PKGBUILD 2018-04-11 10:26:40.780781856 +0200 +--- a/PKGBUILD 2018-06-08 00:10:38.743924423 +0200 ++++ b/PKGBUILD 2018-06-08 08:03:36.134207570 +0200 @@ -10,7 +10,7 @@ url="https://cairographics.org/" arch=(x86_64) license=(LGPL MPL) depends=(libpng libxrender libxext fontconfig pixman glib2 lzo) -makedepends=(librsvg gtk2 poppler-glib libspectre gtk-doc valgrind git) +makedepends=(librsvg poppler-glib libspectre gtk-doc git) - _commit=1ed124ace201946177eab962d3b07bb2fedf9026 # master + _commit=7149686456ec3c481fa1d3dbe76a0dab1e42b519 # tags/1.15.12^0 source=("git+https://anongit.freedesktop.org/git/cairo#commit=$_commit" utf-8.diff) diff --git a/src/stage4/patches/generic/cups-filters.patch b/src/stage4/patches/generic/cups-filters.patch index 993c373..e632aba 100644 --- a/src/stage4/patches/generic/cups-filters.patch +++ b/src/stage4/patches/generic/cups-filters.patch @@ -1,10 +1,10 @@ diff -rupN a/PKGBUILD b/PKGBUILD ---- a/PKGBUILD 2018-04-11 15:51:13.794936255 +0200 -+++ b/PKGBUILD 2018-04-11 17:14:15.653464088 +0200 +--- a/PKGBUILD 2018-06-08 11:17:40.824323759 +0200 ++++ b/PKGBUILD 2018-06-08 14:21:14.767766988 +0200 @@ -14,7 +14,7 @@ url="https://wiki.linuxfoundation.org/op license=('custom') depends=('lcms2' 'poppler' 'qpdf' 'imagemagick' 'liblouis' 'ijs' 'libcups>=2.2.6-2' 'systemd') - depends+=('poppler=0.63.0') + depends+=('poppler=0.64.0') -makedepends=('ghostscript' 'ttf-dejavu' 'python' 'mupdf-tools') # ttf-dejavu for make check +makedepends=('avahi' 'ghostscript' 'ttf-dejavu' 'python' 'mupdf-tools') # ttf-dejavu for make check optdepends=('ghostscript: for non-PostScript printers to print with CUPS to convert PostScript to raster images' diff --git a/src/stage4/patches/generic/ffmpeg-breakdeps.patch b/src/stage4/patches/generic/ffmpeg-breakdeps.patch index 5375dd8..e2295e0 100644 --- a/src/stage4/patches/generic/ffmpeg-breakdeps.patch +++ b/src/stage4/patches/generic/ffmpeg-breakdeps.patch @@ -1,16 +1,16 @@ diff -rupN a/PKGBUILD b/PKGBUILD ---- a/PKGBUILD 2018-04-04 18:34:55.528326721 +0200 -+++ b/PKGBUILD 2018-04-09 14:07:33.607903315 +0200 +--- a/PKGBUILD 2018-06-09 11:09:28.288514268 +0200 ++++ b/PKGBUILD 2018-06-09 11:26:01.755190846 +0200 @@ -21,7 +21,7 @@ depends=('alsa-lib' 'bzip2' 'fontconfig' - 'libomxil-bellagio' + 'xz' 'zlib' 'libass.so' 'libbluray.so' 'libfreetype.so' 'libva-drm.so' 'libva.so' 'libva-x11.so' 'libvidstab.so' 'libvorbisenc.so' 'libvorbis.so' - 'libvpx.so' 'libx264.so' 'libx265.so' 'libxvidcore.so') + 'libvpx.so' 'libxvidcore.so') - makedepends=('ladspa' 'libvdpau' 'yasm') + makedepends=('ffnvcodec-headers' 'ladspa' 'yasm') optdepends=('ladspa: LADSPA filters') provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so' -@@ -79,8 +79,6 @@ build() { +@@ -69,8 +69,6 @@ build() { --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ diff --git a/src/stage4/patches/generic/freetype2-breakdeps.patch b/src/stage4/patches/generic/freetype2-breakdeps.patch index 82ce5c1..724055c 100644 --- a/src/stage4/patches/generic/freetype2-breakdeps.patch +++ b/src/stage4/patches/generic/freetype2-breakdeps.patch @@ -1,6 +1,6 @@ diff -rupN a/PKGBUILD b/PKGBUILD ---- a/PKGBUILD 2018-04-05 10:50:53.694776733 +0200 -+++ b/PKGBUILD 2018-04-05 10:50:53.695776733 +0200 +--- a/PKGBUILD 2018-06-07 01:06:31.523095788 +0200 ++++ b/PKGBUILD 2018-06-08 16:22:26.947839549 +0200 @@ -11,7 +11,7 @@ license=('GPL') url="https://www.freetype.org/" # adding harfbuzz for improved OpenType features auto-hinting @@ -10,3 +10,12 @@ diff -rupN a/PKGBUILD b/PKGBUILD makedepends=('libx11') source=(https://download-mirror.savannah.gnu.org/releases/freetype/freetype-${pkgver}.tar.bz2{,.sig} https://download-mirror.savannah.gnu.org/releases/freetype/freetype-doc-${pkgver}.tar.bz2{,.sig} +@@ -54,7 +54,7 @@ prepare() { + + build() { + cd freetype2 +- ./configure --prefix=/usr --disable-static ++ ./configure --prefix=/usr --disable-static --enable-freetype-config + make + + # Build demos diff --git a/src/stage4/patches/generic/freetype2.patch b/src/stage4/patches/generic/freetype2.patch new file mode 100644 index 0000000..526f3cb --- /dev/null +++ b/src/stage4/patches/generic/freetype2.patch @@ -0,0 +1,12 @@ +diff -rupN a/PKGBUILD b/PKGBUILD +--- a/PKGBUILD 2018-06-07 01:06:24.206429047 +0200 ++++ b/PKGBUILD 2018-06-08 16:22:09.101172704 +0200 +@@ -54,7 +54,7 @@ prepare() { + + build() { + cd freetype2 +- ./configure --prefix=/usr --disable-static ++ ./configure --prefix=/usr --disable-static --enable-freetype-config + make + + # Build demos diff --git a/src/stage4/patches/generic/gconf.patch b/src/stage4/patches/generic/gconf.patch new file mode 100644 index 0000000..dfb6e56 --- /dev/null +++ b/src/stage4/patches/generic/gconf.patch @@ -0,0 +1,12 @@ +diff -rupN a/PKGBUILD b/PKGBUILD +--- a/PKGBUILD 2018-06-08 10:57:17.527644887 +0200 ++++ b/PKGBUILD 2018-06-08 14:28:36.927771400 +0200 +@@ -12,7 +12,7 @@ depends=(libxml2 polkit libldap dbus-gli + makedepends=(intltool gtk-doc gobject-introspection git gnome-common) + install=gconf.install + _commit=0780809731c8ab1c364202b1900d3df106b28626 # master +-source=("git+https://git.gnome.org/browse/gconf#commit=$_commit" ++source=("git+https://gitlab.gnome.org/Archive/gconf.git#commit=$_commit" + 01_xml-gettext-domain.patch gconf-reload.patch + gconf-merge-schema gconfpkg gconf-{install,remove}.hook) + sha256sums=('SKIP' diff --git a/src/stage4/patches/generic/glu.patch b/src/stage4/patches/generic/glu.patch new file mode 100644 index 0000000..4e9aab0 --- /dev/null +++ b/src/stage4/patches/generic/glu.patch @@ -0,0 +1,11 @@ +diff -rupN a/PKGBUILD b/PKGBUILD +--- a/PKGBUILD 2018-06-09 01:08:54.471488060 +0200 ++++ b/PKGBUILD 2018-06-09 08:52:02.405098657 +0200 +@@ -10,6 +10,7 @@ arch=('x86_64') + url="http://cgit.freedesktop.org/mesa/glu/" + license=('LGPL') + depends=('libgl') ++makedepends=('mesa') + source=(ftp://ftp.freedesktop.org/pub/mesa/$pkgname/$pkgname-$pkgver.tar.bz2) + sha512sums=('ff920e3fbca739794e1432a92fdd8517aa732110fea71ed724185425042f83ce18e9866c16f95c6e10f6993f0814a90fac9636e2b3d8ca2084d1ac0a860f61c8') + diff --git a/src/stage4/patches/generic/kcodecs.patch b/src/stage4/patches/generic/kcodecs.patch new file mode 100644 index 0000000..3513898 --- /dev/null +++ b/src/stage4/patches/generic/kcodecs.patch @@ -0,0 +1,12 @@ +diff -rupN a/PKGBUILD b/PKGBUILD +--- a/PKGBUILD 2018-06-09 14:38:16.411972605 +0200 ++++ b/PKGBUILD 2018-06-09 14:44:55.275309918 +0200 +@@ -11,7 +11,7 @@ arch=(x86_64) + url='https://community.kde.org/Frameworks' + license=(LGPL) + depends=(qt5-base) +-makedepends=(extra-cmake-modules qt5-tools clang python-pyqt5 python2-pyqt5 gperf doxygen) ++makedepends=(extra-cmake-modules qt5-tools python-pyqt5 python2-pyqt5 gperf doxygen) + optdepends=('python-pykf5: to use the Python 3 bindings' 'python2-pykf5: to use the Python 2 bindings') + groups=(kf5) + source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/$pkgname-$pkgver.tar.xz"{,.sig}) diff --git a/src/stage4/patches/generic/kconfig.patch b/src/stage4/patches/generic/kconfig.patch new file mode 100644 index 0000000..5a8cc69 --- /dev/null +++ b/src/stage4/patches/generic/kconfig.patch @@ -0,0 +1,12 @@ +diff -rupN a/PKGBUILD b/PKGBUILD +--- a/PKGBUILD 2018-06-09 13:08:03.711918597 +0200 ++++ b/PKGBUILD 2018-06-09 14:49:11.028645804 +0200 +@@ -11,7 +11,7 @@ arch=(x86_64) + url='https://community.kde.org/Frameworks' + license=(LGPL) + depends=(qt5-base) +-makedepends=(extra-cmake-modules qt5-tools clang python-pyqt5 python2-pyqt5 doxygen) ++makedepends=(extra-cmake-modules qt5-tools python-pyqt5 python2-pyqt5 doxygen) + optdepends=('python-pykf5: to use the Python 3 bindings' 'python2-pykf5: to use the Python 2 bindings') + groups=(kf5) + source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/$pkgname-$pkgver.tar.xz"{,.sig}) diff --git a/src/stage4/patches/generic/kconfigwidgets.patch b/src/stage4/patches/generic/kconfigwidgets.patch new file mode 100644 index 0000000..3caba21 --- /dev/null +++ b/src/stage4/patches/generic/kconfigwidgets.patch @@ -0,0 +1,12 @@ +diff -rupN a/PKGBUILD b/PKGBUILD +--- a/PKGBUILD 2018-06-09 13:07:27.618584904 +0200 ++++ b/PKGBUILD 2018-06-09 14:50:48.851980113 +0200 +@@ -11,7 +11,7 @@ arch=(x86_64) + url='https://community.kde.org/Frameworks' + license=(LGPL) + depends=(kauth kcodecs kconfig kguiaddons ki18n kwidgetsaddons) +-makedepends=(extra-cmake-modules kdoctools clang python-pyqt5 python2-pyqt5 doxygen qt5-tools) ++makedepends=(extra-cmake-modules kdoctools python-pyqt5 python2-pyqt5 doxygen qt5-tools) + optdepends=('python-pykf5: to use the Python 3 bindings' 'python2-pykf5: to use the Python 2 bindings') + groups=(kf5) + source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/$pkgname-$pkgver.tar.xz"{,.sig}) diff --git a/src/stage4/patches/generic/kcoreaddons.patch b/src/stage4/patches/generic/kcoreaddons.patch new file mode 100644 index 0000000..c0c3ecc --- /dev/null +++ b/src/stage4/patches/generic/kcoreaddons.patch @@ -0,0 +1,12 @@ +diff -rupN a/PKGBUILD b/PKGBUILD +--- a/PKGBUILD 2018-06-09 13:07:58.168585209 +0200 ++++ b/PKGBUILD 2018-06-09 14:49:45.735312816 +0200 +@@ -11,7 +11,7 @@ arch=(x86_64) + url='https://community.kde.org/Frameworks' + license=(LGPL) + depends=(qt5-base shared-mime-info) +-makedepends=(extra-cmake-modules qt5-tools clang python-pyqt5 python2-pyqt5 doxygen) ++makedepends=(extra-cmake-modules qt5-tools python-pyqt5 python2-pyqt5 doxygen) + optdepends=('python-pykf5: to use the Python 3 bindings' 'python2-pykf5: to use the Python 2 bindings') + groups=(kf5) + source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/$pkgname-$pkgver.tar.xz"{,.sig}) diff --git a/src/stage4/patches/generic/kdbusaddons.patch b/src/stage4/patches/generic/kdbusaddons.patch new file mode 100644 index 0000000..16c3623 --- /dev/null +++ b/src/stage4/patches/generic/kdbusaddons.patch @@ -0,0 +1,12 @@ +diff -rupN a/PKGBUILD b/PKGBUILD +--- a/PKGBUILD 2018-06-09 13:07:40.318585031 +0200 ++++ b/PKGBUILD 2018-06-09 14:50:13.618646428 +0200 +@@ -11,7 +11,7 @@ arch=(x86_64) + url='https://community.kde.org/Frameworks' + license=(LGPL) + depends=(qt5-x11extras) +-makedepends=(extra-cmake-modules qt5-tools clang python-pyqt5 python2-pyqt5 doxygen) ++makedepends=(extra-cmake-modules qt5-tools python-pyqt5 python2-pyqt5 doxygen) + optdepends=('python-pykf5: to use the Python 3 bindings' 'python2-pykf5: to use the Python 2 bindings') + groups=(kf5) + source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/$pkgname-$pkgver.tar.xz"{,.sig}) diff --git a/src/stage4/patches/generic/ki18n.patch b/src/stage4/patches/generic/ki18n.patch new file mode 100644 index 0000000..6ceba20 --- /dev/null +++ b/src/stage4/patches/generic/ki18n.patch @@ -0,0 +1,12 @@ +diff -rupN a/PKGBUILD b/PKGBUILD +--- a/PKGBUILD 2018-06-09 13:08:09.705251991 +0200 ++++ b/PKGBUILD 2018-06-09 14:48:30.321978730 +0200 +@@ -11,7 +11,7 @@ arch=(x86_64) + url='https://community.kde.org/Frameworks' + license=(LGPL) + depends=(qt5-script) +-makedepends=(extra-cmake-modules qt5-declarative python-pyqt5 python2-pyqt5 clang doxygen qt5-tools) ++makedepends=(extra-cmake-modules qt5-declarative python-pyqt5 python2-pyqt5 doxygen qt5-tools) + optdepends=('python-pykf5: to use the Python 3 bindings' 'python2-pykf5: to use the Python 2 bindings' 'python: to compile .ts files') + groups=(kf5) + source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/$pkgname-$pkgver.tar.xz"{,.sig}) diff --git a/src/stage4/patches/generic/kitemmodels.patch b/src/stage4/patches/generic/kitemmodels.patch new file mode 100644 index 0000000..7de146e --- /dev/null +++ b/src/stage4/patches/generic/kitemmodels.patch @@ -0,0 +1,12 @@ +diff -rupN a/PKGBUILD b/PKGBUILD +--- a/PKGBUILD 2018-06-09 14:37:22.908638738 +0200 ++++ b/PKGBUILD 2018-06-09 14:45:30.538643604 +0200 +@@ -11,7 +11,7 @@ arch=(x86_64) + url='https://community.kde.org/Frameworks' + license=(LGPL) + depends=(qt5-base) +-makedepends=(extra-cmake-modules python2-pyqt5 python-pyqt5 clang doxygen qt5-tools) ++makedepends=(extra-cmake-modules python2-pyqt5 python-pyqt5 doxygen qt5-tools) + optdepends=('python-pykf5: to use the Python 3 bindings' 'python2-pykf5: to use the Python 2 bindings') + groups=(kf5) + source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/$pkgname-$pkgver.tar.xz"{,.sig}) diff --git a/src/stage4/patches/generic/kitemviews.patch b/src/stage4/patches/generic/kitemviews.patch new file mode 100644 index 0000000..be076aa --- /dev/null +++ b/src/stage4/patches/generic/kitemviews.patch @@ -0,0 +1,12 @@ +diff -rupN a/PKGBUILD b/PKGBUILD +--- a/PKGBUILD 2018-06-09 13:07:22.228584850 +0200 ++++ b/PKGBUILD 2018-06-09 14:51:12.831980352 +0200 +@@ -11,7 +11,7 @@ arch=(x86_64) + url='https://community.kde.org/Frameworks' + license=(LGPL) + depends=(qt5-base) +-makedepends=(extra-cmake-modules qt5-tools clang python-pyqt5 python2-pyqt5 doxygen) ++makedepends=(extra-cmake-modules qt5-tools python-pyqt5 python2-pyqt5 doxygen) + optdepends=('python-pykf5: to use the Python 3 bindings' 'python2-pykf5: to use the Python 2 bindings') + groups=(kf5) + source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/$pkgname-$pkgver.tar.xz"{,.sig}) diff --git a/src/stage4/patches/generic/kjobwidgets.patch b/src/stage4/patches/generic/kjobwidgets.patch new file mode 100644 index 0000000..0c7feea --- /dev/null +++ b/src/stage4/patches/generic/kjobwidgets.patch @@ -0,0 +1,12 @@ +diff -rupN a/PKGBUILD b/PKGBUILD +--- a/PKGBUILD 2018-06-09 13:08:59.378585820 +0200 ++++ b/PKGBUILD 2018-06-09 14:47:08.168644577 +0200 +@@ -11,7 +11,7 @@ arch=(x86_64) + url='https://community.kde.org/Frameworks' + license=(LGPL) + depends=(kcoreaddons kwidgetsaddons qt5-x11extras) +-makedepends=(extra-cmake-modules qt5-tools clang python2-pyqt5 python-pyqt5 doxygen) ++makedepends=(extra-cmake-modules qt5-tools python2-pyqt5 python-pyqt5 doxygen) + optdepends=('python-pykf5: to use the Python 3 bindings' 'python2-pykf5: to use the Python 2 bindings') + groups=(kf5) + source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/$pkgname-$pkgver.tar.xz"{,.sig}) diff --git a/src/stage4/patches/generic/libaio.patch b/src/stage4/patches/generic/libaio.patch new file mode 100644 index 0000000..a33daa0 --- /dev/null +++ b/src/stage4/patches/generic/libaio.patch @@ -0,0 +1,12 @@ +diff -rupN a/PKGBUILD b/PKGBUILD +--- a/PKGBUILD 2018-06-09 05:43:01.364985498 +0200 ++++ b/PKGBUILD 2018-06-09 09:04:05.861772543 +0200 +@@ -16,7 +16,7 @@ build() { + cd "$srcdir/$pkgname-$pkgver" + # AIO library is a thin wrapper around kernel syscalls, it does not use stdlib + # and other helpers like stack protection libraries +- CFLAGS="-march=${CARCH/_/-} -mtune=generic -O2 -pipe" ++ CFLAGS=`echo $CFLAGS | sed -e 's/-fstack-protector[^ ]*//'` && CXXFLAGS="$CFLAGS" + make + } + diff --git a/src/stage4/patches/generic/libfbclient.patch b/src/stage4/patches/generic/libfbclient.patch new file mode 100644 index 0000000..4909ce3 --- /dev/null +++ b/src/stage4/patches/generic/libfbclient.patch @@ -0,0 +1,12 @@ +diff -rupN a/PKGBUILD b/PKGBUILD +--- a/PKGBUILD 2018-06-09 05:50:56.764990242 +0200 ++++ b/PKGBUILD 2018-06-09 09:01:01.681770705 +0200 +@@ -9,7 +9,7 @@ pkgdesc="Client library for Firebird." + arch=('x86_64') + url="http://www.firebirdsql.org/" + license=('custom') +-depends=('gcc-libs' 'icu') ++depends=('gcc-libs' 'icu' 'libatomic_ops') + options=('!makeflags') + source=(http://downloads.sourceforge.net/firebird/Firebird-$pkgver-0.tar.bz2 + firebird-c++11.patch diff --git a/src/stage4/patches/generic/librsvg-breakdeps.patch b/src/stage4/patches/generic/librsvg-breakdeps.patch index 4c75214..13366b0 100644 --- a/src/stage4/patches/generic/librsvg-breakdeps.patch +++ b/src/stage4/patches/generic/librsvg-breakdeps.patch @@ -1,22 +1,22 @@ diff -rupN a/PKGBUILD b/PKGBUILD ---- a/PKGBUILD 2018-04-10 14:06:09.643722509 +0200 -+++ b/PKGBUILD 2018-04-10 14:06:54.477718260 +0200 +--- a/PKGBUILD 2018-06-08 14:38:16.277777181 +0200 ++++ b/PKGBUILD 2018-06-08 14:39:55.754444840 +0200 @@ -2,7 +2,7 @@ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=librsvg --pkgver=2.42.3 +-pkgver=2.42.5 +pkgver=2.40.20 pkgrel=1 epoch=2 pkgdesc="SVG rendering library" -@@ -10,34 +10,24 @@ url="https://wiki.gnome.org/Projects/Lib +@@ -10,35 +10,25 @@ url="https://wiki.gnome.org/Projects/Lib arch=(x86_64) license=(LGPL) depends=(gdk-pixbuf2 pango libcroco) -makedepends=(intltool gobject-introspection vala python2 gtk-doc git rust) +makedepends=(intltool gobject-introspection python2 gtk-doc git) - _commit=ca640d1185745665c61689b71c627e1d020a80b7 # tags/2.42.3^0 + _commit=497c925593e41c12cec4a55e4365655a29c3fe59 # tags/2.42.5^0 -source=("git+https://gitlab.gnome.org/GNOME/librsvg.git#commit=$_commit") -sha256sums=('SKIP') - @@ -52,3 +52,4 @@ diff -rupN a/PKGBUILD b/PKGBUILD + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } + diff --git a/src/stage4/patches/generic/librsvg.patch b/src/stage4/patches/generic/librsvg.patch index 03265e2..ab66556 100644 --- a/src/stage4/patches/generic/librsvg.patch +++ b/src/stage4/patches/generic/librsvg.patch @@ -1,22 +1,22 @@ diff -rupN a/PKGBUILD b/PKGBUILD ---- a/PKGBUILD 2018-04-10 13:28:52.668934524 +0200 -+++ b/PKGBUILD 2018-04-10 13:28:52.669934524 +0200 +--- a/PKGBUILD 2018-06-08 11:00:29.240980133 +0200 ++++ b/PKGBUILD 2018-06-08 14:25:33.664436238 +0200 @@ -2,7 +2,7 @@ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=librsvg --pkgver=2.42.3 +-pkgver=2.42.5 +pkgver=2.40.20 pkgrel=1 epoch=2 pkgdesc="SVG rendering library" -@@ -10,34 +10,24 @@ url="https://wiki.gnome.org/Projects/Lib +@@ -10,35 +10,25 @@ url="https://wiki.gnome.org/Projects/Lib arch=(x86_64) license=(LGPL) depends=(gdk-pixbuf2 pango libcroco) -makedepends=(intltool gobject-introspection vala python2 gtk-doc git rust) +makedepends=(intltool gobject-introspection vala python2 gtk-doc git) - _commit=ca640d1185745665c61689b71c627e1d020a80b7 # tags/2.42.3^0 + _commit=497c925593e41c12cec4a55e4365655a29c3fe59 # tags/2.42.5^0 -source=("git+https://gitlab.gnome.org/GNOME/librsvg.git#commit=$_commit") -sha256sums=('SKIP') - @@ -51,3 +51,4 @@ diff -rupN a/PKGBUILD b/PKGBUILD + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } + diff --git a/src/stage4/patches/generic/lm_sensors-breakdeps.patch b/src/stage4/patches/generic/lm_sensors-breakdeps.patch index a09db10..29bcbb9 100644 --- a/src/stage4/patches/generic/lm_sensors-breakdeps.patch +++ b/src/stage4/patches/generic/lm_sensors-breakdeps.patch @@ -1,16 +1,16 @@ diff -rupN a/PKGBUILD b/PKGBUILD ---- a/PKGBUILD 2018-04-09 10:12:50.971238030 +0200 -+++ b/PKGBUILD 2018-04-09 10:12:50.972238030 +0200 -@@ -9,8 +9,6 @@ arch=('i686' 'x86_64') - url="http://www.lm-sensors.org/" +--- a/PKGBUILD 2018-06-07 22:58:48.533881418 +0200 ++++ b/PKGBUILD 2018-06-07 23:00:00.987215473 +0200 +@@ -9,8 +9,6 @@ arch=('x86_64') + url="https://hwmon.wiki.kernel.org/lm_sensors" license=('GPL' 'LGPL') - depends=('perl' 'sysfsutils') + depends=('perl') -makedepends=('rrdtool') -optdepends=('rrdtool: for logging with sensord') backup=('etc/sensors3.conf' 'etc/healthd.conf' 'etc/conf.d/sensord') source=($pkgname-$pkgver::https://github.com/groeck/lm-sensors/archive/V${pkgver//\./-}.tar.gz - healthd healthd.conf healthd.service sensord.conf -@@ -37,7 +35,7 @@ build() { + healthd healthd.conf healthd.service sensord.conf) +@@ -34,7 +32,7 @@ build() { package() { cd ${pkgname/_/-}-${pkgver//\./-} diff --git a/src/stage4/patches/generic/net-snmp.patch b/src/stage4/patches/generic/net-snmp.patch new file mode 100644 index 0000000..c63a9fd --- /dev/null +++ b/src/stage4/patches/generic/net-snmp.patch @@ -0,0 +1,25 @@ +diff -rupN a/PKGBUILD b/PKGBUILD +--- a/PKGBUILD 2018-06-07 18:29:32.163720210 +0200 ++++ b/PKGBUILD 2018-06-07 20:59:37.773810067 +0200 +@@ -50,6 +50,8 @@ build() { + make NETSNMP_DONT_CHECK_VERSION=1 + } + ++perlver() { perl -e '$v = $^V->{version}; print $v->[0].".".($v->[1]+$ARGV[0]);' $1; } ++ + package() { + cd ${pkgname}-${pkgver} + sed -i -e "s:install --basedir=\$\$dir:install --basedir=\$\$dir --root=${pkgdir}:" Makefile +@@ -58,11 +60,7 @@ package() { + install -D -m644 "${srcdir}/snmptrapd.service" "${pkgdir}/usr/lib/systemd/system/snmptrapd.service" + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + +-# 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/perl-xml-parser.patch b/src/stage4/patches/generic/perl-xml-parser.patch new file mode 100644 index 0000000..0370797 --- /dev/null +++ b/src/stage4/patches/generic/perl-xml-parser.patch @@ -0,0 +1,22 @@ +diff -rupN a/PKGBUILD b/PKGBUILD +--- a/PKGBUILD 2018-06-06 05:17:51.495717497 +0200 ++++ b/PKGBUILD 2018-06-06 05:17:51.499050831 +0200 +@@ -24,15 +24,13 @@ check() { + make test + } + ++perlver() { perl -e '$v = $^V->{version}; print $v->[0].".".($v->[1]+$ARGV[0]);' $1; } ++ + package() { + cd XML-Parser-${pkgver} + make DESTDIR="${pkgdir}" install + +-# 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/poppler-breakdeps.patch b/src/stage4/patches/generic/poppler-breakdeps.patch index dbf1fd5..abe62d2 100644 --- a/src/stage4/patches/generic/poppler-breakdeps.patch +++ b/src/stage4/patches/generic/poppler-breakdeps.patch @@ -1,13 +1,13 @@ diff -rupN a/PKGBUILD b/PKGBUILD ---- a/PKGBUILD 2018-04-08 21:19:01.690638474 +0200 -+++ b/PKGBUILD 2018-04-08 21:19:01.691638474 +0200 +--- a/PKGBUILD 2018-06-08 00:17:03.190594926 +0200 ++++ b/PKGBUILD 2018-06-08 08:02:22.654206837 +0200 @@ -3,13 +3,13 @@ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=poppler -pkgname=('poppler' 'poppler-glib' 'poppler-qt5') +pkgname=('poppler' 'poppler-glib') - pkgver=0.63.0 + pkgver=0.64.0 pkgrel=1 arch=(x86_64) license=('GPL') diff --git a/src/stage4/patches/generic/pyqt5.patch b/src/stage4/patches/generic/pyqt5.patch index 3052d38..d14bc71 100644 --- a/src/stage4/patches/generic/pyqt5.patch +++ b/src/stage4/patches/generic/pyqt5.patch @@ -1,15 +1,16 @@ ---- a/PKGBUILD 2018-04-04 11:14:02.585833861 +0200 -+++ b/PKGBUILD 2018-04-04 16:55:29.948892123 +0200 +diff -rupN a/PKGBUILD b/PKGBUILD +--- a/PKGBUILD 2018-06-09 03:43:23.308247210 +0200 ++++ b/PKGBUILD 2018-06-09 09:05:32.711773409 +0200 @@ -15,7 +15,7 @@ license=('GPL') makedepends=('python-sip' 'python2-sip' 'python-opengl' 'python2-opengl' 'python2-dbus' 'python-dbus' 'qt5-connectivity' 'qt5-multimedia' 'qt5-tools' 'qt5-serialport' 'qt5-svg' - 'qt5-webengine' 'qt5-webkit' 'qt5-websockets' 'qt5-x11extras' 'qt5-networkauth') + 'qt5-webkit' 'qt5-websockets' 'qt5-x11extras' 'qt5-networkauth') - source=("http://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-$pkgver/PyQt5_gpl-$pkgver.tar.gz" pyqt-support-new-qt.patch) + source=("http://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-$pkgver/PyQt5_gpl-$pkgver.tar.gz" pyqt-support-new-qt.patch + pyqt5-cura-crash.patch pyqt-qt5.11.patch) sha512sums=('04cd0292f7a088f9c0d088d7c73ec96cfc40253f771dfdf194eb92be7635e6fcaf04863fa24215e9c34a096658549bb2feeb8d8fdca1e39ed87f0256ef0f790b' - '9e4184291c0ece0bf375da3e0cf6e3f22df33eea1ee2b981fe9e2a0ba7d625583dd513c029c49562189986c0145262ac2aa8e5aa85701a981b3ed4061f4acf36') -@@ -83,7 +83,6 @@ package_python-pyqt5(){ +@@ -88,7 +88,6 @@ package_python-pyqt5(){ 'qt5-serialport: QtSerialPort' 'qt5-websockets: QtWebSockets' 'qt5-connectivity: QtNfc, QtBluetooth' @@ -17,7 +18,7 @@ 'qt5-x11extras: QtX11Extras' 'qt5-networkauth: QtNetworkAuth') -@@ -109,7 +108,6 @@ package_python2-pyqt5(){ +@@ -114,7 +113,6 @@ package_python2-pyqt5(){ 'qt5-serialport: QtSerialPort' 'qt5-websockets: QtWebSockets' 'qt5-connectivity: QtNfc, QtBluetooth' diff --git a/src/stage4/patches/generic/python-lxml.patch b/src/stage4/patches/generic/python-lxml.patch deleted file mode 100644 index bd1d890..0000000 --- a/src/stage4/patches/generic/python-lxml.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rupN a/PKGBUILD b/PKGBUILD ---- a/PKGBUILD 2018-04-05 08:15:25.879660799 +0200 -+++ b/PKGBUILD 2018-04-05 08:15:25.879660799 +0200 -@@ -10,7 +10,7 @@ arch=('x86_64') - license=('BSD' 'custom') - url="http://lxml.de/" - makedepends=('libxslt' 'python-setuptools' 'python2-setuptools' 'epydoc' 'python2-pygments' -- 'python2-docutils') -+ 'python2-docutils' 'cython' 'cython2') - checkdepends=('python-cssselect' 'python2-cssselect' 'python-html5lib' 'python2-html5lib' - 'python-beautifulsoup4' 'python2-beautifulsoup4' 'cython' 'cython2') - source=("https://github.com/lxml/lxml/archive/lxml-$pkgver.tar.gz") diff --git a/src/stage4/patches/generic/python.patch b/src/stage4/patches/generic/python.patch index 08ce6da..e6e6222 100644 --- a/src/stage4/patches/generic/python.patch +++ b/src/stage4/patches/generic/python.patch @@ -1,10 +1,10 @@ diff -rupN a/PKGBUILD b/PKGBUILD ---- a/PKGBUILD 2018-04-07 17:13:27.064223747 +0200 -+++ b/PKGBUILD 2018-04-07 17:13:27.064223747 +0200 +--- a/PKGBUILD 2018-06-09 08:44:19.088427369 +0200 ++++ b/PKGBUILD 2018-06-09 08:46:28.728428661 +0200 @@ -14,7 +14,7 @@ arch=('x86_64') license=('custom') url="http://www.python.org/" - depends=('expat' 'bzip2' 'gdbm' 'openssl' 'libffi' 'zlib') + depends=('expat' 'bzip2' 'gdbm' 'openssl' 'libffi' 'zlib' 'libnsl') -makedepends=('tk' 'sqlite' 'valgrind' 'bluez-libs' 'mpdecimal' 'llvm' 'gdb' 'xorg-server-xvfb') +makedepends=('tk' 'sqlite' 'bluez-libs' 'mpdecimal' 'llvm' 'xorg-server-xvfb') optdepends=('python-setuptools' diff --git a/src/stage4/patches/generic/qt5-tools.patch b/src/stage4/patches/generic/qt5-tools.patch new file mode 100644 index 0000000..76dfbd5 --- /dev/null +++ b/src/stage4/patches/generic/qt5-tools.patch @@ -0,0 +1,14 @@ +diff -rupN a/PKGBUILD b/PKGBUILD +--- a/PKGBUILD 2018-06-09 11:08:53.421847253 +0200 ++++ b/PKGBUILD 2018-06-09 11:27:05.441858149 +0200 +@@ -11,8 +11,8 @@ url='http://qt-project.org/' + license=('GPL3' 'LGPL3' 'FDL' 'custom') + pkgdesc='A cross-platform application and UI framework (Development Tools, QtHelp)' + depends=('qt5-base' 'hicolor-icon-theme') +-makedepends=('qt5-declarative' 'qt5-webkit' 'vulkan-headers' 'clang') +-optdepends=('clang: for qdoc' 'qt5-webkit: for Qt Assistant') ++makedepends=('qt5-declarative' 'qt5-webkit' 'vulkan-headers') ++optdepends=('qt5-webkit: for Qt Assistant') + groups=('qt' 'qt5') + conflicts=('qtchooser') + _pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}" diff --git a/src/stage4/patches/generic/quota-tools.patch b/src/stage4/patches/generic/quota-tools.patch new file mode 100644 index 0000000..e4c1a21 --- /dev/null +++ b/src/stage4/patches/generic/quota-tools.patch @@ -0,0 +1,10 @@ +diff -rupN a/PKGBUILD b/PKGBUILD +--- a/PKGBUILD 2018-06-09 08:44:47.235094316 +0200 ++++ b/PKGBUILD 2018-06-09 08:56:00.805101036 +0200 +@@ -28,5 +28,5 @@ package() { + head -33 quota.c > "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + + # remove conflicts with glibc +- rm "${pkgdir}"/usr/include/rpcsvc/rquota.{h,x} ++ rm -f "${pkgdir}"/usr/include/rpcsvc/rquota.{h,x} + } diff --git a/src/stage4/patches/generic/sqlite.patch b/src/stage4/patches/generic/sqlite.patch index 9b8a670..53cde60 100644 --- a/src/stage4/patches/generic/sqlite.patch +++ b/src/stage4/patches/generic/sqlite.patch @@ -1,11 +1,12 @@ ---- a/PKGBUILD 2018-03-31 09:12:38.249279305 +0200 -+++ b/PKGBUILD 2018-03-31 09:28:36.403188494 +0200 +diff -rupN a/PKGBUILD b/PKGBUILD +--- a/PKGBUILD 2018-06-09 05:42:48.761652039 +0200 ++++ b/PKGBUILD 2018-06-09 09:04:44.401772927 +0200 @@ -3,7 +3,7 @@ # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgbase="sqlite" -pkgname=('sqlite' 'sqlite-tcl' 'sqlite-doc' 'sqlite-analyzer') +pkgname=('sqlite' 'sqlite-tcl' 'sqlite-analyzer') - _srcver=3220000 + _srcver=3230100 _docver=${_srcver} #_docver=3080001 diff --git a/src/stage4/patches/generic/subversion-breakdeps.patch b/src/stage4/patches/generic/subversion-breakdeps.patch index c7fa4a0..1fe5efa 100644 --- a/src/stage4/patches/generic/subversion-breakdeps.patch +++ b/src/stage4/patches/generic/subversion-breakdeps.patch @@ -1,23 +1,23 @@ diff -rupN a/PKGBUILD b/PKGBUILD ---- a/PKGBUILD 2018-04-08 10:01:54.988488966 +0200 -+++ b/PKGBUILD 2018-04-08 10:01:54.988488966 +0200 +--- a/PKGBUILD 2018-06-09 12:32:34.855230691 +0200 ++++ b/PKGBUILD 2018-06-09 12:33:12.855231068 +0200 @@ -13,13 +13,12 @@ arch=('x86_64') url="http://subversion.apache.org/" license=('APACHE') - depends=('sqlite' 'file' 'serf' 'systemd') --makedepends=('apache' 'python2' 'perl' 'swig' 'java-environment' -- 'libgnome-keyring' 'kdelibs' 'ruby') + depends=('file' 'libutf8proc' 'serf' 'sqlite' 'systemd') +-makedepends=('apache' 'python2' 'perl' 'swig' 'java-environment<10' +- 'libgnome-keyring' 'kwallet' 'kdelibs4support' 'ruby') +makedepends=('apache' 'python2' 'perl' 'swig' + 'libgnome-keyring') optdepends=('libgnome-keyring: for GNOME Keyring for auth credentials' - 'kdebase-runtime: for KWallet for auth credentials' + 'kwallet: for KWallet for auth credentials' 'bash-completion: for svn bash completion' 'python2: for some hook scripts' - 'java-environment: for Java support' 'ruby: for some hook scripts') + checkdepends=('ruby-test-unit') provides=('svn') - backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve') -@@ -59,21 +58,18 @@ build() { +@@ -61,21 +60,18 @@ build() { ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \ --with-zlib=/usr --with-serf=/usr --with-apxs \ --with-sqlite=/usr \ @@ -41,7 +41,7 @@ diff -rupN a/PKGBUILD b/PKGBUILD } package() { -@@ -83,7 +79,7 @@ package() { +@@ -85,7 +81,7 @@ package() { make DESTDIR="${pkgdir}" INSTALLDIRS=vendor \ swig_pydir=/usr/lib/python2.7/site-packages/libsvn \ swig_pydir_extra=/usr/lib/python2.7/site-packages/svn \ diff --git a/src/stage4/patches/generic/subversion.patch b/src/stage4/patches/generic/subversion.patch index cf13d9c..d7b82ac 100644 --- a/src/stage4/patches/generic/subversion.patch +++ b/src/stage4/patches/generic/subversion.patch @@ -1,21 +1,22 @@ ---- a/PKGBUILD 2018-04-04 12:13:48.830493966 +0200 -+++ b/PKGBUILD 2018-04-04 17:30:25.376693524 +0200 +diff -rupN a/PKGBUILD b/PKGBUILD +--- a/PKGBUILD 2018-06-09 12:06:54.118548654 +0200 ++++ b/PKGBUILD 2018-06-09 12:31:32.528563402 +0200 @@ -13,13 +13,12 @@ arch=('x86_64') url="http://subversion.apache.org/" license=('APACHE') - depends=('sqlite' 'file' 'serf' 'systemd') --makedepends=('apache' 'python2' 'perl' 'swig' 'java-environment' + depends=('file' 'libutf8proc' 'serf' 'sqlite' 'systemd') +-makedepends=('apache' 'python2' 'perl' 'swig' 'java-environment<10' +makedepends=('apache' 'python2' 'perl' 'swig' - 'libgnome-keyring' 'kdelibs' 'ruby') + 'libgnome-keyring' 'kwallet' 'kdelibs4support' 'ruby') optdepends=('libgnome-keyring: for GNOME Keyring for auth credentials' - 'kdebase-runtime: for KWallet for auth credentials' + 'kwallet: for KWallet for auth credentials' 'bash-completion: for svn bash completion' 'python2: for some hook scripts' - 'java-environment: for Java support' 'ruby: for some hook scripts') + checkdepends=('ruby-test-unit') provides=('svn') - backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve') -@@ -59,7 +58,6 @@ build() { +@@ -61,7 +60,6 @@ build() { ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \ --with-zlib=/usr --with-serf=/usr --with-apxs \ --with-sqlite=/usr \ @@ -23,7 +24,7 @@ --with-gnome-keyring --with-kwallet \ --with-apache-libexecdir=/usr/lib/httpd/modules \ --with-ruby-sitedir=/usr/lib/ruby/vendor_ruby \ -@@ -67,7 +65,7 @@ build() { +@@ -69,7 +67,7 @@ build() { make LT_LDFLAGS="-L$Fdestdir/usr/lib" make swig_pydir=/usr/lib/python2.7/site-packages/libsvn \ @@ -32,7 +33,7 @@ } check() { -@@ -83,7 +81,7 @@ package() { +@@ -85,7 +83,7 @@ package() { make DESTDIR="${pkgdir}" INSTALLDIRS=vendor \ swig_pydir=/usr/lib/python2.7/site-packages/libsvn \ swig_pydir_extra=/usr/lib/python2.7/site-packages/svn \ diff --git a/src/stage4/patches/generic/webrtc-audio-processing.patch b/src/stage4/patches/generic/webrtc-audio-processing.patch new file mode 100644 index 0000000..af94a4f --- /dev/null +++ b/src/stage4/patches/generic/webrtc-audio-processing.patch @@ -0,0 +1,52 @@ +diff -rupN a/PKGBUILD b/PKGBUILD +--- a/PKGBUILD 2018-06-09 02:11:32.374858889 +0200 ++++ b/PKGBUILD 2018-06-09 09:09:21.125109022 +0200 +@@ -11,8 +11,10 @@ license=(custom) + depends=(gcc-libs) + makedepends=(git) + _commit=fc0e76139404e08cc5b8024daafa1ddf576a4e21 # tags/v0.3^0 +-source=("git+https://anongit.freedesktop.org/git/pulseaudio/webrtc-audio-processing#commit=$_commit") +-sha256sums=('SKIP') ++source=("git+https://anongit.freedesktop.org/git/pulseaudio/webrtc-audio-processing#commit=$_commit" ++ "webrtc-fix-typedefs-on-other-arches.patch") ++sha256sums=('SKIP' ++ '27d5537c476e6f43a0539f0893ee7e5ad054b1a249b44a5f34e31268db350489') + + pkgver() { + cd $pkgname +@@ -21,6 +23,7 @@ pkgver() { + + prepare() { + cd $pkgname ++ patch -Np1 -i "$srcdir"/webrtc-fix-typedefs-on-other-arches.patch + NOCONFIGURE=1 ./autogen.sh + } + +diff -rupN a/webrtc-fix-typedefs-on-other-arches.patch b/webrtc-fix-typedefs-on-other-arches.patch +--- a/webrtc-fix-typedefs-on-other-arches.patch 1970-01-01 01:00:00.000000000 +0100 ++++ b/webrtc-fix-typedefs-on-other-arches.patch 2018-06-09 09:09:28.735109098 +0200 +@@ -0,0 +1,24 @@ ++diff -up webrtc-audio-processing-0.2/webrtc/typedefs.h.typedef webrtc-audio-processing-0.2/webrtc/typedefs.h ++--- webrtc-audio-processing-0.2/webrtc/typedefs.h.typedef 2016-05-12 09:08:53.885000410 -0500 +++++ webrtc-audio-processing-0.2/webrtc/typedefs.h 2016-05-12 09:12:38.006851953 -0500 ++@@ -48,7 +48,19 @@ ++ #define WEBRTC_ARCH_32_BITS ++ #define WEBRTC_ARCH_LITTLE_ENDIAN ++ #else ++-#error Please add support for your architecture in typedefs.h +++/* instead of failing, use typical unix defines... */ +++#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ +++#define WEBRTC_ARCH_LITTLE_ENDIAN +++#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ +++#define WEBRTC_ARCH_BIG_ENDIAN +++#else +++#error __BYTE_ORDER__ is not defined +++#endif +++#if defined(__LP64__) +++#define WEBRTC_ARCH_64_BITS +++#else +++#define WEBRTC_ARCH_32_BITS +++#endif ++ #endif ++ ++ #if !(defined(WEBRTC_ARCH_LITTLE_ENDIAN) ^ defined(WEBRTC_ARCH_BIG_ENDIAN)) diff --git a/src/stage4/patches/generic/xinetd.patch b/src/stage4/patches/generic/xinetd.patch new file mode 100644 index 0000000..12d3f50 --- /dev/null +++ b/src/stage4/patches/generic/xinetd.patch @@ -0,0 +1,12 @@ +diff -rupN a/PKGBUILD b/PKGBUILD +--- a/PKGBUILD 2018-06-08 14:45:04.531114588 +0200 ++++ b/PKGBUILD 2018-06-08 14:55:15.544454018 +0200 +@@ -34,6 +34,8 @@ prepare() { + + build() { + cd $srcdir/$pkgname-$pkgver ++ CFLAGS="$CFLAGS -I/usr/include/tirpc/" ++ LDFLAGS="$LDGLAGS -ltirpc" + ./configure --prefix=/usr --sbindir=/usr/bin --without-libwrap + make + } diff --git a/src/stage4/patches/generic/xorg-server.patch b/src/stage4/patches/generic/xorg-server.patch index 00bc0aa..6f09922 100644 --- a/src/stage4/patches/generic/xorg-server.patch +++ b/src/stage4/patches/generic/xorg-server.patch @@ -1,74 +1,48 @@ diff -rupN a/PKGBUILD b/PKGBUILD ---- a/PKGBUILD 2018-04-11 07:29:18.352790517 +0200 -+++ b/PKGBUILD 2018-04-11 07:29:18.353790517 +0200 -@@ -16,7 +16,7 @@ makedepends=('pixman' 'libx11' 'mesa' 'm - 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres' - 'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util' 'glproto' 'dri2proto' 'libgcrypt' 'libepoxy' - 'xcb-util' 'xcb-util-image' 'xcb-util-renderutil' 'xcb-util-wm' 'xcb-util-keysyms' 'dri3proto' -- 'libxshmfence' 'libunwind' 'systemd' 'wayland-protocols' 'git') -+ 'libxshmfence' 'systemd' 'wayland-protocols' 'git') - _commit=d0d1a694f967af770fba0d36043fd5218ff20984 # branch 1.19 - #source=(https://xorg.freedesktop.org/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2{,.sig} - source=("git+https://anongit.freedesktop.org/git/xorg/xserver.git#commit=$_commit" -@@ -69,7 +69,6 @@ build() { - --enable-xnest \ - --enable-composite \ - --enable-xcsecurity \ -- --enable-libunwind \ - --enable-xorg \ - --enable-xephyr \ - --enable-glamor \ -@@ -127,7 +126,7 @@ package_xorg-server-common() { +--- a/PKGBUILD 2018-06-09 08:47:08.411762390 +0200 ++++ b/PKGBUILD 2018-06-09 08:55:04.898433812 +0200 +@@ -16,7 +16,7 @@ makedepends=('xorgproto' 'pixman' 'libx1 + 'libxmu' 'libxrender' 'libxi' 'libxaw' 'libdmx' 'libxtst' 'libxres' + 'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util' 'libepoxy' + 'xcb-util' 'xcb-util-image' 'xcb-util-renderutil' 'xcb-util-wm' 'xcb-util-keysyms' +- 'libxshmfence' 'libunwind' 'systemd' 'wayland-protocols' 'egl-wayland' 'meson') # 'git') ++ 'libxshmfence' 'systemd' 'wayland-protocols' 'egl-wayland' 'meson') # 'git') + source=(https://xorg.freedesktop.org/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2{,.sig} + 'xwayland-config.h.meson.in::https://cgit.freedesktop.org/xorg/xserver/plain/include/xwayland-config.h.meson.in?id=xorg-server-1.20.0' + xserver-autobind-hotplug.patch +@@ -116,7 +116,7 @@ package_xorg-server-common() { package_xorg-server() { pkgdesc="Xorg X server" -- depends=(libepoxy libxfont2 pixman xorg-server-common libunwind dbus libgl xf86-input-libinput -+ depends=(libepoxy libxfont2 pixman xorg-server-common dbus libgl xf86-input-libinput +- depends=(libepoxy libxfont2 pixman xorg-server-common libunwind ++ depends=(libepoxy libxfont2 pixman xorg-server-common + dbus libgl xf86-input-libinput nettle libpciaccess libdrm libxshmfence) # FS#52949 - # see xorg-server-*/hw/xfree86/common/xf86Module.h for ABI versions - we provide major numbers that drivers can depend on -@@ -159,7 +158,7 @@ package_xorg-server() { +@@ -145,7 +145,7 @@ package_xorg-server() { package_xorg-server-xephyr() { pkgdesc="A nested X server that runs as an X application" -- depends=(libxfont2 libgl libepoxy libunwind libsystemd libxv pixman xorg-server-common xcb-util-image -+ depends=(libxfont2 libgl libepoxy libsystemd libxv pixman xorg-server-common xcb-util-image - xcb-util-renderutil xcb-util-wm xcb-util-keysyms) +- depends=(libxfont2 libgl libepoxy libunwind libsystemd libxv pixman xorg-server-common ++ depends=(libxfont2 libgl libepoxy libsystemd libxv pixman xorg-server-common + xcb-util-image xcb-util-renderutil xcb-util-wm xcb-util-keysyms + nettle libtirpc) - cd xserver/hw/kdrive -@@ -172,7 +171,7 @@ package_xorg-server-xephyr() { +@@ -158,7 +158,7 @@ package_xorg-server-xephyr() { package_xorg-server-xvfb() { pkgdesc="Virtual framebuffer X server" -- depends=(libxfont2 libunwind libsystemd pixman xorg-server-common xorg-xauth libgl) -+ depends=(libxfont2 libsystemd pixman xorg-server-common xorg-xauth libgl) +- depends=(libxfont2 libunwind pixman xorg-server-common xorg-xauth libgl nettle) ++ depends=(libxfont2 pixman xorg-server-common xorg-xauth libgl nettle) - cd xserver/hw/vfb - #cd "${pkgbase}-${pkgver}/hw/vfb" -@@ -187,7 +186,7 @@ package_xorg-server-xvfb() { - - package_xorg-server-xnest() { - pkgdesc="A nested X server that runs as an X application" -- depends=(libxfont2 libxext libunwind pixman xorg-server-common libsystemd) -+ depends=(libxfont2 libxext pixman xorg-server-common libsystemd) - - cd xserver/hw/xnest - #cd "${pkgbase}-${pkgver}/hw/xnest" -@@ -199,7 +198,7 @@ package_xorg-server-xnest() { - - package_xorg-server-xdmx() { - pkgdesc="Distributed Multihead X Server and utilities" -- depends=(libxfont2 libxi libxaw libxrender libdmx libxfixes libunwind pixman xorg-server-common) -+ depends=(libxfont2 libxi libxaw libxrender libdmx libxfixes pixman xorg-server-common) - - cd xserver/hw/dmx - #cd "${pkgbase}-${pkgver}/hw/dmx" -@@ -211,7 +210,7 @@ package_xorg-server-xdmx() { + _install fakeinstall/usr/bin/Xvfb + _install fakeinstall/usr/share/man/man1/Xvfb.1.gz +@@ -195,7 +195,7 @@ package_xorg-server-xdmx() { package_xorg-server-xwayland() { pkgdesc="run X clients under wayland" -- depends=(libxfont2 libepoxy libunwind libsystemd libgl pixman xorg-server-common) -+ depends=(libxfont2 libepoxy libsystemd libgl pixman xorg-server-common) +- depends=(libxfont2 libepoxy libunwind libsystemd libgl pixman xorg-server-common ++ depends=(libxfont2 libepoxy libsystemd libgl pixman xorg-server-common + nettle libtirpc) - cd xserver/hw/xwayland - #cd "${pkgbase}-${pkgver}/hw/xwayland" + _install fakeinstall/usr/bin/Xwayland diff --git a/src/stage4/patches/powerpc64le/nss.patch b/src/stage4/patches/powerpc64le/nss.patch new file mode 100644 index 0000000..66fa575 --- /dev/null +++ b/src/stage4/patches/powerpc64le/nss.patch @@ -0,0 +1,41 @@ +diff -rupN a/0001-nss-ppc64le-support.patch b/0001-nss-ppc64le-support.patch +--- a/0001-nss-ppc64le-support.patch 1970-01-01 01:00:00.000000000 +0100 ++++ b/0001-nss-ppc64le-support.patch 2018-06-09 12:42:35.998570021 +0200 +@@ -0,0 +1,10 @@ ++--- a/nss/build.sh 2018-03-05 16:58:32.000000000 +0100 +++++ b/nss/build.sh 2018-04-05 07:27:59.516930570 +0200 ++@@ -58,7 +58,7 @@ ninja_params=() ++ ++ # try to guess sensible defaults ++ arch=$(python "$cwd"/coreconf/detect_host_arch.py) ++-if [ "$arch" = "x64" -o "$arch" = "aarch64" ]; then +++if [ "$arch" = "x64" -o "$arch" = "aarch64" -o "$arch" = "ppc64le" ]; then ++ build_64=1 ++ elif [ "$arch" = "arm" ]; then +diff -rupN a/PKGBUILD b/PKGBUILD +--- a/PKGBUILD 2018-06-09 12:41:17.355235903 +0200 ++++ b/PKGBUILD 2018-06-09 12:42:34.908570010 +0200 +@@ -14,10 +14,12 @@ depends=("nspr>=${_nsprver}" sqlite zlib + makedepends=(perl python2 gyp) + options=(!strip !makeflags staticlibs) + source=("https://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/nss-${pkgver}.tar.gz" +- certdata2pem.py bundle.sh) ++ certdata2pem.py bundle.sh ++ 0001-nss-ppc64le-support.patch) + sha256sums=('097b30e436479ad737b3703b25b6198b6513e202731085c6f097d8853dd20405' + '512b12a2f13129be62c008b4df0153f527dd7d71c2c5183de99dfa2a1c49dd8a' +- '3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd') ++ '3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd' ++ 'ec2f6a90dfe168a5070e919d9951da4e20b2898e6f7d975697231dc47ef461a8') + + prepare() { + mkdir certs path +@@ -26,6 +28,8 @@ prepare() { + + cd nss-$pkgver + ++ patch -Np1 -i ../0001-nss-ppc64le-support.patch ++ + ln -sr nss/lib/ckfw/builtins/certdata.txt ../certs/ + ln -sr nss/lib/ckfw/builtins/nssckbi.h ../certs/ + } |