summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD19
-rw-r--r--gconf.patch12
3 files changed, 5 insertions, 30 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1e65addeec6..d09c466ce7b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = qt5-styleplugins-git
pkgdesc = Additional style plugins for Qt5
- pkgver = r22
+ pkgver = r28
pkgrel = 1
url = https://code.qt.io/cgit/qt/qtstyleplugins
arch = i686
@@ -13,8 +13,6 @@ pkgbase = qt5-styleplugins-git
provides = qt5-styleplugins
conflicts = qt5-styleplugins
source = qtstyleplugins::git+https://code.qt.io/cgit/qt/qtstyleplugins.git
- source = gconf.patch
- sha512sums = SKIP
sha512sums = SKIP
pkgname = qt5-styleplugins-git
diff --git a/PKGBUILD b/PKGBUILD
index 0a663f5ff95..1697e8c55c3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,8 @@
+# shellcheck disable=SC2034,SC2154,SC2164
pkgname=('qt5-styleplugins-git')
_srcname='qtstyleplugins'
pkgdesc='Additional style plugins for Qt5'
-pkgver='r22'
+pkgver='r28'
pkgrel='1'
arch=('i686' 'x86_64')
url="https://code.qt.io/cgit/qt/${_srcname}"
@@ -12,14 +13,8 @@ makedepends=('git')
provides=("${pkgname[0]%-git}")
conflicts=("${pkgname[0]%-git}")
-source=(
- "${_srcname}::git+${url}.git"
- 'gconf.patch'
-)
-sha512sums=(
- 'SKIP'
- 'SKIP'
-)
+source=("${_srcname}::git+${url}.git")
+sha512sums=('SKIP')
pkgver() {
cd "${srcdir}/${_srcname}"
@@ -30,12 +25,6 @@ pkgver() {
"$( git rev-parse --short 'HEAD' )"
}
-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 572c36b6912..00000000000
--- 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
- }