Updated to latest commit

This commit is contained in:
nfnty 2016-10-29 22:49:58 +02:00
parent 7fd304eb3e
commit 013bc42884
No known key found for this signature in database
GPG Key ID: 32DD96A5D0370907
4 changed files with 9 additions and 31 deletions

View File

@ -1,7 +1,7 @@
pkgbase = qt5-styleplugins pkgbase = qt5-styleplugins
pkgdesc = Additional style plugins for Qt5 pkgdesc = Additional style plugins for Qt5
pkgver = 5.0.0 pkgver = 5.0.0
pkgrel = 2 pkgrel = 3
url = https://code.qt.io/cgit/qt/qtstyleplugins url = https://code.qt.io/cgit/qt/qtstyleplugins
install = install.sh install = install.sh
arch = i686 arch = i686
@ -13,9 +13,7 @@ pkgbase = qt5-styleplugins
depends = libx11 depends = libx11
provides = qt5-styleplugins provides = qt5-styleplugins
conflicts = qt5-styleplugins conflicts = qt5-styleplugins
source = qtstyleplugins::git+https://code.qt.io/cgit/qt/qtstyleplugins.git#commit=7b11d50ac5eb0f9f069d0c73ada5796eac584217 source = qtstyleplugins::git+https://code.qt.io/cgit/qt/qtstyleplugins.git#commit=695d8d5793e86f7ad06b931e2418e02fefc74c09
source = gconf.patch
sha512sums = SKIP
sha512sums = SKIP sha512sums = SKIP
pkgname = qt5-styleplugins pkgname = qt5-styleplugins

View File

@ -1,8 +1,9 @@
# shellcheck disable=SC2034,SC2154,SC2164
pkgname=('qt5-styleplugins') pkgname=('qt5-styleplugins')
_srcname='qtstyleplugins' _srcname='qtstyleplugins'
pkgdesc='Additional style plugins for Qt5' pkgdesc='Additional style plugins for Qt5'
pkgver='5.0.0' pkgver='5.0.0'
pkgrel='2' pkgrel='3'
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
url="https://code.qt.io/cgit/qt/${_srcname}" url="https://code.qt.io/cgit/qt/${_srcname}"
license=('LGPL') license=('LGPL')
@ -12,23 +13,11 @@ makedepends=('git')
provides=("${pkgname[0]%-git}") provides=("${pkgname[0]%-git}")
conflicts=("${pkgname[0]%-git}") conflicts=("${pkgname[0]%-git}")
source=( source=("${_srcname}::git+${url}.git#commit=695d8d5793e86f7ad06b931e2418e02fefc74c09")
"${_srcname}::git+${url}.git#commit=7b11d50ac5eb0f9f069d0c73ada5796eac584217" sha512sums=('SKIP')
'gconf.patch'
)
sha512sums=(
'SKIP'
'SKIP'
)
install='install.sh' install='install.sh'
prepare() {
cd "${srcdir}/${_srcname}"
git apply "${srcdir}/gconf.patch"
}
build() { build() {
cd "${srcdir}/${_srcname}" cd "${srcdir}/${_srcname}"

View File

@ -1,12 +0,0 @@
diff --git a/src/plugins/styles/styles.pro b/src/plugins/styles/styles.pro
index 25d68d0..adcf8e4 100644
--- a/src/plugins/styles/styles.pro
+++ b/src/plugins/styles/styles.pro
@@ -5,6 +5,6 @@ SUBDIRS = \
plastique \
bb10style
-packagesExist(gconf-2.0 gtk+-2.0 x11) {
+packagesExist(gtk+-2.0 x11) {
SUBDIRS += gtk2
}

View File

@ -1,6 +1,8 @@
_5_0_0_2_changes() { _5_0_0_2_changes() {
echo ':: Upstream added a gtk2 platform theme' echo ':: Upstream added a gtk2 platform theme'
# shellcheck disable=SC2016
echo ' unexport `QT_STYLE_OVERRIDE`' echo ' unexport `QT_STYLE_OVERRIDE`'
# shellcheck disable=SC2016
echo ' export `QT_QPA_PLATFORMTHEME=gtk2`' echo ' export `QT_QPA_PLATFORMTHEME=gtk2`'
} }
@ -11,6 +13,7 @@ post_upgrade() {
local version local version
for version in "${versions[@]}"; do for version in "${versions[@]}"; do
if [[ "$( vercmp "${version}" "${2}" )" -eq 1 ]]; then if [[ "$( vercmp "${version}" "${2}" )" -eq 1 ]]; then
# shellcheck disable=SC2091
"$( printf '_%s_changes' "${version}" | perl -p -e 's/\.|-/_/g' )" "$( printf '_%s_changes' "${version}" | perl -p -e 's/\.|-/_/g' )"
fi fi
done done