From 013bc42884f763cdd0d5d1fa9062a6e33a816785 Mon Sep 17 00:00:00 2001
From: nfnty <git@nfnty.se>
Date: Sat, 29 Oct 2016 22:49:58 +0200
Subject: [PATCH] Updated to latest commit

---
 .SRCINFO    |  6 ++----
 PKGBUILD    | 19 ++++---------------
 gconf.patch | 12 ------------
 install.sh  |  3 +++
 4 files changed, 9 insertions(+), 31 deletions(-)
 delete mode 100644 gconf.patch

diff --git a/.SRCINFO b/.SRCINFO
index 429c455..3f0f0f2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = qt5-styleplugins
 	pkgdesc = Additional style plugins for Qt5
 	pkgver = 5.0.0
-	pkgrel = 2
+	pkgrel = 3
 	url = https://code.qt.io/cgit/qt/qtstyleplugins
 	install = install.sh
 	arch = i686
@@ -13,9 +13,7 @@ pkgbase = qt5-styleplugins
 	depends = libx11
 	provides = qt5-styleplugins
 	conflicts = qt5-styleplugins
-	source = qtstyleplugins::git+https://code.qt.io/cgit/qt/qtstyleplugins.git#commit=7b11d50ac5eb0f9f069d0c73ada5796eac584217
-	source = gconf.patch
-	sha512sums = SKIP
+	source = qtstyleplugins::git+https://code.qt.io/cgit/qt/qtstyleplugins.git#commit=695d8d5793e86f7ad06b931e2418e02fefc74c09
 	sha512sums = SKIP
 
 pkgname = qt5-styleplugins
diff --git a/PKGBUILD b/PKGBUILD
index 31fcb49..2dd9ff6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,9 @@
+# shellcheck disable=SC2034,SC2154,SC2164
 pkgname=('qt5-styleplugins')
 _srcname='qtstyleplugins'
 pkgdesc='Additional style plugins for Qt5'
 pkgver='5.0.0'
-pkgrel='2'
+pkgrel='3'
 arch=('i686' 'x86_64')
 url="https://code.qt.io/cgit/qt/${_srcname}"
 license=('LGPL')
@@ -12,23 +13,11 @@ makedepends=('git')
 provides=("${pkgname[0]%-git}")
 conflicts=("${pkgname[0]%-git}")
 
-source=(
-    "${_srcname}::git+${url}.git#commit=7b11d50ac5eb0f9f069d0c73ada5796eac584217"
-    'gconf.patch'
-)
-sha512sums=(
-    'SKIP'
-    'SKIP'
-)
+source=("${_srcname}::git+${url}.git#commit=695d8d5793e86f7ad06b931e2418e02fefc74c09")
+sha512sums=('SKIP')
 
 install='install.sh'
 
-prepare() {
-    cd "${srcdir}/${_srcname}"
-
-    git apply "${srcdir}/gconf.patch"
-}
-
 build() {
     cd "${srcdir}/${_srcname}"
 
diff --git a/gconf.patch b/gconf.patch
deleted file mode 100644
index 572c36b..0000000
--- a/gconf.patch
+++ /dev/null
@@ -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
- }
diff --git a/install.sh b/install.sh
index 613bc7a..dc88cad 100644
--- a/install.sh
+++ b/install.sh
@@ -1,6 +1,8 @@
 _5_0_0_2_changes() {
     echo ':: Upstream added a gtk2 platform theme'
+    # shellcheck disable=SC2016
     echo '   unexport `QT_STYLE_OVERRIDE`'
+    # shellcheck disable=SC2016
     echo '   export `QT_QPA_PLATFORMTHEME=gtk2`'
 }
 
@@ -11,6 +13,7 @@ post_upgrade() {
     local version
     for version in "${versions[@]}"; do
         if [[ "$( vercmp "${version}" "${2}" )" -eq 1 ]]; then
+            # shellcheck disable=SC2091
             "$( printf '_%s_changes' "${version}" | perl -p -e 's/\.|-/_/g' )"
         fi
     done