summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
authorDavid P <megver83@parabola.nu>2017-06-02 20:02:16 -0400
committerDavid P <megver83@parabola.nu>2017-06-02 20:02:16 -0400
commit578e96fcfc5eafbabc6d63416c6c87eb98c1cc99 (patch)
tree281405312f1cf5f5ba4350d6c5c250151c02c28c /libre
parentac875f38d2e0054701b78a7b84a4505e6ba90545 (diff)
parent862a9b6f6782d59168a3b78ab6c2059a9be5815b (diff)
downloadabslibre-578e96fcfc5eafbabc6d63416c6c87eb98c1cc99.tar.gz
abslibre-578e96fcfc5eafbabc6d63416c6c87eb98c1cc99.tar.bz2
abslibre-578e96fcfc5eafbabc6d63416c6c87eb98c1cc99.zip
Merge branch 'master' of git://git.parabola.nu/abslibre/abslibre
Diffstat (limited to 'libre')
-rw-r--r--libre/cups-filters/PKGBUILD4
-rw-r--r--libre/hplip/PKGBUILD24
-rw-r--r--libre/hplip/fix_tabs.patch17
-rw-r--r--libre/kio-extras/PKGBUILD11
-rw-r--r--libre/kio/PKGBUILD6
-rw-r--r--libre/linux-libre-lts/PKGBUILD25
-rw-r--r--libre/pyqt5/PKGBUILD148
-rw-r--r--libre/pyqt5/pyqt-5.8-segfault.patch62
-rw-r--r--libre/texlive-bin/PKGBUILD6
9 files changed, 144 insertions, 159 deletions
diff --git a/libre/cups-filters/PKGBUILD b/libre/cups-filters/PKGBUILD
index 6a2b7f608..3182cc14a 100644
--- a/libre/cups-filters/PKGBUILD
+++ b/libre/cups-filters/PKGBUILD
@@ -3,12 +3,12 @@
pkgname=cups-filters
pkgver=1.14.0
-pkgrel=1.parabola1
+pkgrel=1.parabola2
pkgdesc="OpenPrinting CUPS Filters, without foomatic-db-nonfree recommendation"
arch=('i686' 'x86_64' 'armv7h')
url="https://wiki.linuxfoundation.org/openprinting/cups-filters"
license=('custom')
-depends=('lcms2' 'poppler=0.54.0' 'qpdf' 'imagemagick' 'liblouis' 'ijs' 'libcups')
+depends=('lcms2' 'poppler=0.55.0' 'qpdf' 'imagemagick' 'liblouis' 'ijs' 'libcups')
makedepends=('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'
'foomatic-db: drivers use Ghostscript to convert PostScript to a printable form directly'
diff --git a/libre/hplip/PKGBUILD b/libre/hplip/PKGBUILD
index 9a65a1339..80902d2a6 100644
--- a/libre/hplip/PKGBUILD
+++ b/libre/hplip/PKGBUILD
@@ -8,8 +8,8 @@
# Contributor: Márcio Silva <coadde@parabola.nu>
pkgname=hplip
-pkgver=3.16.11
-pkgrel=2.parabola1
+pkgver=3.17.4
+pkgrel=1.parabola1
pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet, without printers with nonfree drivers support and hplip-plugin binary blobs recommendation (Parabola rebranded)"
arch=('i686' 'x86_64' 'armv7h')
url="http://hplipopensource.com"
@@ -31,12 +31,10 @@ conflicts=(${pkgname}-libre)
backup=('etc/hp/hplip.conf' 'etc/sane.d/dll.d/hpaio')
source=(https://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc}
disable_upgrade.patch
- fix_tabs.patch
0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch)
-sha1sums=('177252a6c3e508b6d4f9d02663fe3556f37de71e'
+sha1sums=('c8ab39e616964c7342320a0d45f729fe7d7dd402'
'SKIP'
'4ef1b506ff5930ab841945ae9178f28fca1997ad'
- 'bd18428ff1e378aa0a299331607eaed82021e34b'
'2ef86972ab51c0fdcb8bfc653b9f6f69459449a5')
validpgpkeys=('4ABA2F66DBD5A95894910E0673D770CDA59047B9') # HPLIP <hplip@hp.com>
@@ -47,7 +45,7 @@ prepare() {
# based on https://devel.trisquel.info/trisquel/package-helpers/raw/master/helpers/make-hplip
# keep header license
- sed '/\[/,99999d' data/models/models.dat > mktemp
+ sed '/\[/,99999d' data/models/models.dat > mktemp
for model in $(grep '\[' data/models/models.dat | sed 's/\[//; s/\]//'); do
sed -n "/\[$model\]/,/^$/p;" data/models/models.dat > mktemp1
@@ -67,12 +65,10 @@ prepare() {
sed -i 's/\, requires proprietary plugin//' $(grep -rlI '[,] requires proprietary plugin')
echo "Preparing source"
-
+
# disable insecure update - https://bugs.archlinux.org/task/38083
patch -Np0 -i ${srcdir}/disable_upgrade.patch
-
- # fix tabs breaking printing; FS#50588
- patch -Np0 -i ${srcdir}/fix_tabs.patch
+
# add missing 'include <cups/ppd.h>' at various places
patch -Np1 -i ${srcdir}/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
@@ -86,7 +82,7 @@ prepare() {
gzip > ${i}.temp || return 1
mv ${i}.temp ${i}
done
-
+
export AUTOMAKE='automake --foreign'
autoreconf --force --install
}
@@ -111,15 +107,15 @@ build() {
package() {
cd $pkgname-$pkgver
make -j1 rulesdir=/usr/lib/udev/rules.d DESTDIR="$pkgdir/" install
-
+
# remove config provided by sane and autostart of hp-daemon
rm -rf "$pkgdir"/etc/{sane.d,xdg}
install -dm755 ${pkgdir}/etc/sane.d/dll.d
echo hpaio > ${pkgdir}/etc/sane.d/dll.d/hpaio
-
+
# remove HAL .fdi file because HAL is no longer used
rm -vrf "$pkgdir"/usr/share/hal
-
+
# remove rc script
rm -vrf "$pkgdir"/etc/init.d
}
diff --git a/libre/hplip/fix_tabs.patch b/libre/hplip/fix_tabs.patch
deleted file mode 100644
index 1552933df..000000000
--- a/libre/hplip/fix_tabs.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- prnt/filters/hpps 2016-08-26 12:04:29.000000000 +0200
-+++ prnt/filters/hpps.new 2016-08-31 21:19:57.868640372 +0200
-@@ -191,11 +191,11 @@
- msg("Setting Pin to default")
- else:
- szKeyInitials = ['HPFIDigit', 'HPSEDigit', 'HPTHDigit', 'HPFTDigit']
-- for x in szKeyInitials:
-+ for x in szKeyInitials:
- try:
-- secpin += opts[x]
-+ secpin += opts[x]
- except KeyError:
-- secpin += '0'
-+ secpin += '0'
-
- os.write(output_fd, to_bytes_utf8('@PJL SET HOLDKEY="%s"\x0a' % secpin))
-
diff --git a/libre/kio-extras/PKGBUILD b/libre/kio-extras/PKGBUILD
index b5611c246..859a3f167 100644
--- a/libre/kio-extras/PKGBUILD
+++ b/libre/kio-extras/PKGBUILD
@@ -5,19 +5,20 @@
# Maintainer: André Silva <emulatorman@parabola.nu>
pkgname=kio-extras
-pkgver=16.12.3
+pkgver=17.04.1
pkgrel=1.parabola1
pkgdesc="Additional components to increase the functionality of KIO, without nonfree qt5-webengine support"
arch=(i686 x86_64)
url='https://www.kde.org/applications/internet/'
license=(LGPL)
-depends=(kdelibs4support khtml kdnssd libssh smbclient exiv2 openexr openslp libmtp kpty kactivities)
-makedepends=(extra-cmake-modules kdoctools kdesignerplugin)
+depends=(kdelibs4support kdnssd libssh smbclient exiv2 openexr openslp libmtp kpty kactivities)
+makedepends=(extra-cmake-modules kdoctools kdesignerplugin gperf taglib khtml)
optdepends=('qt5-imageformats: thumbnails for additional image formats'
- 'kimageformats: thumbnails for additional image formats')
+ 'kimageformats: thumbnails for additional image formats' 'taglib: audio file thumbnails'
+ 'khtml: man kioslave')
groups=(kde-applications kdenetwork)
source=("https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig})
-sha256sums=('5af7b4dac320ed6d0897c8940e6043ef45a4e1d3a4f9f12e8513215633a5d7d5'
+sha256sums=('b8655413dd49f4b9d6a7ce2c630a113c327b351a3fed262fe2f4b0053337fc91'
'SKIP')
validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7) # Albert Astals Cid <aacid@kde.org>
diff --git a/libre/kio/PKGBUILD b/libre/kio/PKGBUILD
index 020636cbd..80ee667fe 100644
--- a/libre/kio/PKGBUILD
+++ b/libre/kio/PKGBUILD
@@ -4,8 +4,8 @@
# Maintainer: André Silva <emulatorman@parabola.nu>
pkgname=kio
-pkgver=5.32.0
-pkgrel=2.parabola2
+pkgver=5.34.0
+pkgrel=1.parabola1
pkgdesc='Resource and network access abstraction, without non-privacy search engines'
arch=('i686' 'x86_64' 'armv7h')
url='https://community.kde.org/Frameworks'
@@ -18,7 +18,7 @@ groups=('kf5')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig}
'duckduckgo_html.desktop'
'duckduckgo_lite.desktop')
-sha256sums=('364adf30d1df6f52d5960061d4c21e91519dfa8674ae95fa01144805a800aaa5'
+sha256sums=('6acb28de757a0d5eccb1e3e533a1ef22b5f5de92e96c3aba804ebdb44aa343c4'
'SKIP'
'31910ab7393e67609f15e04a57f6406f63e6dae58b01bce0787741bc5958f292'
'40466a9dad7075f2525e9e024720da7d7b49a22892b6fca8b81cc0e6408d2f7d')
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index d4d2da67f..be805d731 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -47,17 +47,16 @@ source=("https://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/l
'0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch'
'0002-fix-Atmel-maXTouch-touchscreen-support.patch'
# armv7h patches
-# "https://repo.parabola.nu/other/rcn-libre/patches/${_pkgver%-*}/rcn-libre-${_pkgver%-*}-${rcnrel}.patch"
-# "https://repo.parabola.nu/other/rcn-libre/patches/${_pkgver%-*}/rcn-libre-${_pkgver%-*}-${rcnrel}.patch.sig"
-# '0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch'
-# '0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch'
-# '0003-SMILE-Plug-device-tree-file.patch'
-# '0004-fix-mvsdio-eMMC-timing.patch'
-# '0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch'
-# '0006-ARM-TLV320AIC23-SoC-Audio-Codec-Fix-errors-reported-.patch'
-# '0007-set-default-cubietruck-led-triggers.patch'
-# '0008-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch')
- )
+ "https://repo.parabola.nu/other/rcn-libre/patches/${_pkgver%-*}/rcn-libre-${_pkgver%-*}-${rcnrel}.patch"
+ "https://repo.parabola.nu/other/rcn-libre/patches/${_pkgver%-*}/rcn-libre-${_pkgver%-*}-${rcnrel}.patch.sig"
+ '0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch'
+ '0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch'
+ '0003-SMILE-Plug-device-tree-file.patch'
+ '0004-fix-mvsdio-eMMC-timing.patch'
+ '0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch'
+ '0006-ARM-TLV320AIC23-SoC-Audio-Codec-Fix-errors-reported-.patch'
+ '0007-set-default-cubietruck-led-triggers.patch'
+ '0008-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch')
sha512sums=('885eb0a7fab45dc749acb4329b4330a43b704df2d5f2f5aac1811503c132ca53ca49452f9b1cc80b0826c7a4962dbe4937aecb697aa823b2543ba2cabc704816'
'SKIP'
'470461abe876c3cd44fcc5c8f9de1937506140e3e7f813e562bc2914d84c741a7201934061fa67063f27990b9f854b1f672a3ee79f862368b048a853470afd39'
@@ -75,7 +74,6 @@ sha512sums=('885eb0a7fab45dc749acb4329b4330a43b704df2d5f2f5aac1811503c132ca53ca4
'2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf'
'd9d28e02e964704ea96645a5107f8b65cae5f4fb4f537e224e5e3d087fd296cb770c29ac76e0ce95d173bc420ea87fb8f187d616672a60a0cae618b0ef15b8c8'
'02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af'
-<<<<<<< HEAD
'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168'
'7c039f0b08103eef8dcdb6a394508ed23b7bddb2f6c3381c301f833db59a9e80418c4fa4c34add08d3056977febde5703cd6282a418b7a11af1c14aef3ddab2d'
'SKIP'
@@ -87,9 +85,6 @@ sha512sums=('885eb0a7fab45dc749acb4329b4330a43b704df2d5f2f5aac1811503c132ca53ca4
'73916b59fd8f269ce2831d9a0710f503b9cd1004d94caf9e061ebff870a115cc8455409040574a609473e48c60b2f0b833c907327dacb085509e615c27dd463f'
'eef5d8161edcc9817832de2000ad30320507a1e16fc321fb2b97dd2d159825b8f924cd29e5a4ffa29c339c8727f106730e6b6858c50d8afe7a5000629507badd'
'b3aad9fd9292122fd3227f05d54742731bf4d6d57aaac680b34eca19597dfb56a7f54c7ad54f37cfc2ec7f622fbd90abe7f288f11f8eb98278ab07df32cf890a')
-=======
- 'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168')
->>>>>>> 54bcad230c7b62f7644814b0113fa5ee9483ee50
validpgpkeys=(
'474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva
'6DB9C4B4F0D8C0DC432CF6E4227CA7C556B2BA78' # David P.
diff --git a/libre/pyqt5/PKGBUILD b/libre/pyqt5/PKGBUILD
index a2ccad1e3..a9519ada5 100644
--- a/libre/pyqt5/PKGBUILD
+++ b/libre/pyqt5/PKGBUILD
@@ -20,46 +20,78 @@
pkgbase=pyqt5
pkgname=('pyqt5-common' 'python-pyqt5' 'python2-pyqt5')
-pkgver=5.8
-_pkgver=$pkgver
-pkgrel=2.parabola2
+pkgver=5.8.2
+pkgrel=2.parabola1
arch=('i686' 'x86_64' 'armv7h')
url="http://riverbankcomputing.co.uk/software/pyqt/intro"
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-webkit' 'qt5-websockets' 'qt5-x11extras')
-source=("http://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-$pkgver/PyQt5_gpl-$pkgver.tar.gz" "pyqt-5.8-segfault.patch")
-md5sums=('ac04c0bfc1f05f5a1c2a1edd2640235c'
- 'de7b2781874ff0c7c0d710f718cfa01a')
-source+=('pyqt5-verbose-configure.patch')
-md5sums+=('741c4b3ed85e4bf306ae2e73826d8a8b')
-source_armv7h=('opengles-hack.patch')
-md5sums_armv7h=('ad09b1c84c26d5e92de192477cb3a2d1')
+ 'qt5-webkit' 'qt5-websockets' 'qt5-x11extras')
+source=("http://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-$pkgver/PyQt5_gpl-$pkgver.tar.gz"
+ 'pyqt5-verbose-configure.patch'
+ 'opengles-hack.patch')
+sha512sums=('8b765b9ae6210b7312a2dc6ed94d2664ae569625fe8a27443bae4230d9d9c00e0cf3b4be6904c66ebceff5cd5bbd19a5a9794a0b3222c8098a55f0b94fc8d89b'
+ '139780a2a105605684e8e13b967b8bf8738e6ea0e7793179600c628a179695e4b05952da6d60e67ffac56857afdb08a976896e0ae25a9dbf40085b7fe39f9283'
+ '6be0458a53dc96919d2dfe7a3e932ac663e6e9ebcc2516809f8c53ad923566bf3f96f622ee52ee8a97bf1bea2fc72f78e60333daa6bb3555ff3ca8371141f2b7')
prepare() {
- pushd PyQt5_gpl-${_pkgver}
- patch -Np1 -i "${srcdir}/pyqt-5.8-segfault.patch"
+ pushd PyQt5_gpl-$pkgver
+
case "$CARCH" in
armv7h) patch -p1 -i ../opengles-hack.patch;;
esac
- patch -Np1 -i "${srcdir}/pyqt5-verbose-configure.patch"
+ patch -p1 -i ../pyqt5-verbose-configure.patch
popd
# The additional include path was removed due to this line, I don't really know why they are doing this...
- sed -i '/target_config.dbus_inc_dirs = \[\]/d' PyQt5_gpl-${_pkgver}/configure.py
+ sed -i '/target_config.dbus_inc_dirs = \[\]/d' PyQt5_gpl-$pkgver/configure.py
- cp -a PyQt5_gpl-${_pkgver}{,-py2}
+ cp -a PyQt5_gpl-$pkgver{,-py2}
}
build() {
- cd "$srcdir"/PyQt5_gpl-${_pkgver}
+ cd "$srcdir"/PyQt5_gpl-$pkgver
python configure.py \
--confirm-license \
--no-sip-files \
--qsci-api \
+ --verbose \
+ --enable QtBluetooth \
+ --enable QtCore \
+ --enable QtDBus \
+ --enable QtDesigner \
+ --enable QtGui \
+ --enable QtHelp \
+ --enable QtLocation \
+ --enable QtMultimedia \
+ --enable QtMultimediaWidgets \
+ --enable QtNetwork \
+ --enable QtNfc \
+ --enable QtOpenGL \
+ --enable QtPositioning \
+ --enable QtPrintSupport \
+ --enable QtQml \
+ --enable QtQuick \
+ --enable QtQuickWidgets \
+ --enable QtSensors \
+ --enable QtSerialPort \
+ --enable QtSql \
+ --enable QtSvg \
+ --enable QtTest \
+ --enable QtWebChannel \
+ --enable QtWebKit \
+ --enable QtWebKitWidgets \
+ --enable QtWebSockets \
+ --enable QtWidgets \
+ --enable QtX11Extras \
+ --enable QtXml \
+ --enable QtXmlPatterns \
+ --enable _QOpenGLFunctions_2_0 \
+ --enable _QOpenGLFunctions_2_1 \
+ --enable _QOpenGLFunctions_4_1_Core \
-q /usr/bin/qmake-qt5
# Thanks Gerardo for the rpath fix
@@ -67,11 +99,45 @@ build() {
make
- cd "$srcdir"/PyQt5_gpl-${_pkgver}-py2
+ cd "$srcdir"/PyQt5_gpl-$pkgver-py2
python2 configure.py \
--confirm-license \
--no-sip-files \
--qsci-api \
+ --verbose \
+ --enable QtBluetooth \
+ --enable QtCore \
+ --enable QtDBus \
+ --enable QtDesigner \
+ --enable QtGui \
+ --enable QtHelp \
+ --enable QtLocation \
+ --enable QtMultimedia \
+ --enable QtMultimediaWidgets \
+ --enable QtNetwork \
+ --enable QtNfc \
+ --enable QtOpenGL \
+ --enable QtPositioning \
+ --enable QtPrintSupport \
+ --enable QtQml \
+ --enable QtQuick \
+ --enable QtQuickWidgets \
+ --enable QtSensors \
+ --enable QtSerialPort \
+ --enable QtSql \
+ --enable QtSvg \
+ --enable QtTest \
+ --enable QtWebChannel \
+ --enable QtWebKit \
+ --enable QtWebKitWidgets \
+ --enable QtWebSockets \
+ --enable QtWidgets \
+ --enable QtX11Extras \
+ --enable QtXml \
+ --enable QtXmlPatterns \
+ --enable _QOpenGLFunctions_2_0 \
+ --enable _QOpenGLFunctions_2_1 \
+ --enable _QOpenGLFunctions_4_1_Core \
-q /usr/bin/qmake-qt5
# Thanks Gerardo for the rpath fix
@@ -81,18 +147,18 @@ build() {
}
package_pyqt5-common(){
- pkgdesc="Common PyQt files shared between python-pyqt5 and python2-pyqt5"
+ pkgdesc="Common PyQt files shared between python-pyqt5 and python2-pyqt5, without nonfree qt5-webengine support"
depends=('qt5-base')
- cd PyQt5_gpl-${_pkgver}
- install -Dm644 PyQt5.api "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt5.api
+ cd PyQt5_gpl-$pkgver
+ install -Dm644 PyQt5.api "$pkgdir"/usr/share/qt/qsci/api/python/PyQt5.api
- install -d "${pkgdir}"/usr/share/sip/PyQt5
- cp -a sip/* "${pkgdir}"/usr/share/sip/PyQt5
+ install -d "$pkgdir"/usr/share/sip/PyQt5
+ cp -a sip/* "$pkgdir"/usr/share/sip/PyQt5
}
package_python-pyqt5(){
- pkgdesc="A set of Python 3.x bindings for the Qt5 toolkit"
+ pkgdesc="A set of Python 3.x bindings for the Qt5 toolkit, without nonfree qt5-webengine support"
depends=('python-sip' 'pyqt5-common')
optdepends=('python-opengl: enable OpenGL 3D graphics in PyQt applications'
'python-dbus: for python-dbus mainloop support'
@@ -102,18 +168,21 @@ package_python-pyqt5(){
'qt5-webkit: QtWebKit, QtWebKitWidgets'
'qt5-xmlpatterns: QtXmlPatterns'
'qt5-declarative: QtQml, qmlplugin'
- 'qt5-serialport: QtSerialPort')
+ 'qt5-serialport: QtSerialPort'
+ 'qt5-websockets: QtWebSockets'
+ 'qt5-connectivity: QtNfc, QtBluetooth'
+ 'qt5-x11extras: QtX11Extras')
- cd PyQt5_gpl-${_pkgver}
+ cd PyQt5_gpl-$pkgver
# INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
- make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+ make DESTDIR="$pkgdir" INSTALL_ROOT="$pkgdir" install
# Provided by pyqt-common
- rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt5.api
+ rm "$pkgdir"/usr/share/qt/qsci/api/python/PyQt5.api
}
package_python2-pyqt5(){
- pkgdesc="A set of Python 2.x bindings for the Qt5 toolkit"
+ pkgdesc="A set of Python 2.x bindings for the Qt5 toolkit, without nonfree qt5-webengine support"
depends=('python2-sip' 'pyqt5-common')
optdepends=('python2-opengl: enable OpenGL 3D graphics in PyQt applications'
'python-dbus: for python-dbus mainloop support'
@@ -123,18 +192,21 @@ package_python2-pyqt5(){
'qt5-webkit: QtWebKit, QtWebKitWidgets'
'qt5-xmlpatterns: QtXmlPatterns'
'qt5-declarative: QtQml, qmlplugin'
- 'qt5-serialport: QtSerialPort')
+ 'qt5-serialport: QtSerialPort'
+ 'qt5-websockets: QtWebSockets'
+ 'qt5-connectivity: QtNfc, QtBluetooth'
+ 'qt5-x11extras: QtX11Extras')
- cd PyQt5_gpl-${_pkgver}-py2
+ cd PyQt5_gpl-$pkgver-py2
# INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
- make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+ make DESTDIR="$pkgdir" INSTALL_ROOT="$pkgdir" install
# Fix conflicts with python-pyqt5
- mv "${pkgdir}"/usr/bin/{,python2-}pyuic5
- mv "${pkgdir}"/usr/bin/{,python2-}pylupdate5
- mv "${pkgdir}"/usr/bin/{,python2-}pyrcc5
+ mv "$pkgdir"/usr/bin/{,python2-}pyuic5
+ mv "$pkgdir"/usr/bin/{,python2-}pylupdate5
+ mv "$pkgdir"/usr/bin/{,python2-}pyrcc5
- rm "${pkgdir}"/usr/lib/qt/plugins/designer/libpyqt5.so
- rm "${pkgdir}"/usr/lib/qt/plugins/PyQt5/libpyqt5qmlplugin.so
- rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt5.api
+ rm "$pkgdir"/usr/lib/qt/plugins/designer/libpyqt5.so
+ rm "$pkgdir"/usr/lib/qt/plugins/PyQt5/libpyqt5qmlplugin.so
+ rm "$pkgdir"/usr/share/qt/qsci/api/python/PyQt5.api
}
diff --git a/libre/pyqt5/pyqt-5.8-segfault.patch b/libre/pyqt5/pyqt-5.8-segfault.patch
deleted file mode 100644
index a8d1564af..000000000
--- a/libre/pyqt5/pyqt-5.8-segfault.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- a/qpy/QtQml/qpyqml_register_type.cpp 2017-02-23 03:32:51.000000000 +0100
-+++ b/qpy/QtQml/qpyqml_register_type.cpp 2017-02-25 03:32:58.000000000 +0100
-@@ -124,13 +124,13 @@
-
- #define QPYQML_TYPE_INIT(n) \
- case n##U: \
-- QPyQmlObject##n::staticMetaObject = *mo; \
-+ QPyQmlObject##n::staticMetaObject = static_mo; \
- QPyQmlObject##n::attachedPyType = attached; \
- rt->typeId = qRegisterNormalizedMetaType<QPyQmlObject##n *>(ptr_name); \
- rt->listId = qRegisterNormalizedMetaType<QQmlListProperty<QPyQmlObject##n> >(list_name); \
- rt->objectSize = ctor ? sizeof(QPyQmlObject##n) : 0; \
- if (ctor) rt->create = QQmlPrivate::createInto<QPyQmlObject##n>; else rt->create = 0; \
-- rt->metaObject = mo; \
-+ rt->metaObject = &QPyQmlObject##n::staticMetaObject; \
- rt->attachedPropertiesFunction = attached_mo ? QPyQmlObject##n::attachedProperties : 0; \
- rt->attachedPropertiesMetaObject = attached_mo; \
- rt->parserStatusCast = is_parser_status ? QQmlPrivate::StaticCastSelector<QPyQmlObject##n,QQmlParserStatus>::cast() : -1; \
-@@ -219,7 +219,33 @@
- return 0;
- }
-
-- const QMetaObject *mo = pyqt5_qtqml_get_qmetaobject(py_type);
-+ const QMetaObject *orig_mo = pyqt5_qtqml_get_qmetaobject(py_type);
-+ QMetaObject static_mo = *orig_mo;
-+
-+#if QT_VERSION >= 0x050800
-+ // Qt v5.8.0 changed the way properties are handled by directly calling a
-+ // class's static meta-call (if there was one) directly. This bypasses the
-+ // proxy and calls the static meta-call with a pointer to the proxy rather
-+ // than a pointer to the real object. To work round this we clone the
-+ // QMetaObject chain and remove the references to the static meta-call
-+ // forcing the earlier behaviour. This approach may also work with earlier
-+ // versions of Qt - but if it ain't broke...
-+ static_mo.d.static_metacall = 0;
-+
-+ QMetaObject *sub_mo = &static_mo;
-+
-+ // By retaining the QObject static meta-object we don't appear to be a
-+ // gadget.
-+ for (const QMetaObject *mo = sub_mo->d.superdata; mo != &QObject::staticMetaObject; mo = mo->d.superdata)
-+ {
-+ QMetaObject *new_mo = new QMetaObject;
-+ *new_mo = *mo;
-+ new_mo->d.static_metacall = 0;
-+
-+ sub_mo->d.superdata = new_mo;
-+ sub_mo = new_mo;
-+ }
-+#endif
-
- // See if the type is a parser status.
- bool is_parser_status = PyType_IsSubtype(py_type,
-@@ -272,7 +298,7 @@
-
- if (qquickitem_register)
- {
-- sipErrorState estate = qquickitem_register(py_type, mo, ptr_name,
-+ sipErrorState estate = qquickitem_register(py_type, orig_mo, ptr_name,
- list_name, &rt);
-
- if (estate == sipErrorFail)
diff --git a/libre/texlive-bin/PKGBUILD b/libre/texlive-bin/PKGBUILD
index 419158efd..6bf71a321 100644
--- a/libre/texlive-bin/PKGBUILD
+++ b/libre/texlive-bin/PKGBUILD
@@ -7,10 +7,10 @@
pkgname=texlive-bin
pkgver=2016.41290
-pkgrel=12.parabola1
+pkgrel=12.parabola2
license=('GPL')
arch=('i686' 'x86_64' 'armv7h')
-makedepends=('cairo' 'pixman' 'graphite' 't1lib' 'gd' 'poppler=0.54.0'
+makedepends=('cairo' 'pixman' 'graphite' 't1lib' 'gd' 'poppler=0.55.0'
'libsigsegv' 'zziplib' 'libpng' 'libjpeg' 'freetype2'
'icu=59.1' 'harfbuzz' 'harfbuzz-icu' 'gmp' 'mpfr' 'potrace' 'libpaper'
'perl' 'clisp' 'ffcall')
@@ -102,7 +102,7 @@ build() {
package() {
pkgdesc="TeX Live binaries (Parabola rebranded)"
- depends=('cairo' 'pixman' 'graphite' 't1lib' 'gd' 'poppler=0.54.0'
+ depends=('cairo' 'pixman' 'graphite' 't1lib' 'gd' 'poppler=0.55.0'
'libsigsegv' 'zziplib' 'libpng' 'libjpeg' 'freetype2'
'icu=59.1' 'harfbuzz' 'harfbuzz-icu' 'gmp' 'mpfr' 'potrace' 'libpaper'
'libsynctex')