Update to new upstream version

2 files changed, 27 insertions, 65 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 571467b1b773..f81f5b7be9a0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,42 +1,32 @@
 # Generated by mksrcinfo v8
-# Wed Jan  4 15:54:31 UTC 2017
+# Mon Feb 27 15:04:23 UTC 2017
 pkgbase = adwaita-qt
-	pkgdesc = A style to bend Qt applications to look like they belong into GNOME Shell.
-	pkgver = 0.97
+	pkgdesc = A style to bend Qt applications to look like they belong into GNOME Shell
+	pkgver = 0.98
 	pkgrel = 1
 	url = https://github.com/MartinBriza/adwaita-qt
-	arch = any
 	arch = i686
 	arch = x86_64
 	groups = adwaita-qt
 	license = GPL
-	license = LGPL
 	makedepends = cmake
 	makedepends = qt4
 	makedepends = qt5-base
-	source = https://github.com/MartinBriza/adwaita-qt/archive/0.97.tar.gz
-	sha512sums = 8e15e9535dbcc1edba5941cbcc2c2e765298824a24ecbedaeb5d461420b713da74a26bd1f8184f0bfa9139022997798a0759d85a2a5269633ed97a7e34e2f77f
+	optdepends = qgnomeplatform: apply GNOME settings to Qt apps
+	conflicts = adwaita-qt-common
+	replaces = adwaita-qt-common
+	source = https://github.com/MartinBriza/adwaita-qt/archive/0.98.tar.gz
+	sha512sums = d2edfded1dfc553699ab9f0a14c3f860ff6bcc24d45fd76b4664fdfd93328bec2955958a77e35937dab2ae61788618c2752876719e45a6b1f062b577f867304a
 
 pkgname = adwaita-qt5
-	pkgdesc = A style to bend Qt applications to look like they belong into GNOME Shell (Qt5).
-	arch = i686
-	arch = x86_64
-	depends = adwaita-qt-common
+	pkgdesc = A style to bend Qt applications to look like they belong into GNOME Shell (Qt5)
 	depends = qt5-base
-	optdepends = adwaita-qt4: Qt4 version
 	optdepends = qgnomeplatform: apply GNOME settings to Qt apps
+	optdepends = adwaita-qt4: Qt4 version
 
 pkgname = adwaita-qt4
-	pkgdesc = A style to bend Qt applications to look like they belong into GNOME Shell (Qt4).
-	arch = i686
-	arch = x86_64
-	depends = adwaita-qt-common
+	pkgdesc = A style to bend Qt applications to look like they belong into GNOME Shell (Qt4)
 	depends = qt4
-	optdepends = adwaita-qt5: Qt5 version
 	optdepends = qgnomeplatform: apply GNOME settings to Qt apps
-
-pkgname = adwaita-qt-common
-	pkgdesc = A style to bend Qt applications to look like they belong into GNOME Shell (common files).
-	arch = any
-	license = GPL
+	optdepends = adwaita-qt5: Qt5 version
 
diff --git a/PKGBUILD b/PKGBUILD
index 80a0fc6cf9fa..47ee04b2eef2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,21 +4,23 @@ pkgbase=adwaita-qt
 pkgname=(
   "${pkgbase}5"
   "${pkgbase}4"
-  "${pkgbase}-common"
 )
-pkgver=0.97
+pkgver=0.98
 pkgrel=1
-pkgdesc='A style to bend Qt applications to look like they belong into GNOME Shell.'
-arch=('any' 'i686' 'x86_64')
+pkgdesc='A style to bend Qt applications to look like they belong into GNOME Shell'
+arch=('i686' 'x86_64')
 url="https://github.com/MartinBriza/$pkgbase"
-license=('GPL' 'LGPL')
+license=('GPL')
 groups=('adwaita-qt')
 makedepends=('cmake' 'qt4' 'qt5-base')
+optdepends=('qgnomeplatform: apply GNOME settings to Qt apps')
+conflicts=('adwaita-qt-common')
+replaces=('adwaita-qt-common')
 source=("https://github.com/MartinBriza/$pkgbase/archive/$pkgver.tar.gz")
-sha512sums=('8e15e9535dbcc1edba5941cbcc2c2e765298824a24ecbedaeb5d461420b713da74a26bd1f8184f0bfa9139022997798a0759d85a2a5269633ed97a7e34e2f77f')
+sha512sums=('d2edfded1dfc553699ab9f0a14c3f860ff6bcc24d45fd76b4664fdfd93328bec2955958a77e35937dab2ae61788618c2752876719e45a6b1f062b577f867304a')
 
 prepare() {
-  mkdir -p $pkgbase-$pkgver/build{-qt5,-qt4,-common}
+  mkdir -p $pkgbase-$pkgver/build{-qt5,-qt4}
 }
 
 build() {
@@ -38,34 +40,14 @@ build() {
     -DQT_ROOT=/usr/lib/qt
   popd
 
-  pushd build-common
-  cmake .. \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  popd
-
-  # We don't want to install assets just yet
-  sed -ie '/(assets)/s/^/#/' CMakeLists.txt
-
   make -C build-qt4
   make -C build-qt5
-
-  # Now we want the assets but we don't want anything else
-  sed -ie '/(assets)/s/^#//' CMakeLists.txt
-  sed -ie '/(src)/s/^/#/' CMakeLists.txt
-
-  make -C build-common
-
-  # Clean up
-  sed -ie '/(src)/s/^#//' CMakeLists.txt
 }
 
 package_adwaita-qt4() {
-  pkgdesc="${pkgdesc::-1} (Qt4)."
-  arch=('i686' 'x86_64')
-  depends=('adwaita-qt-common' 'qt4')
-  optdepends=('adwaita-qt5: Qt5 version'
-              'qgnomeplatform: apply GNOME settings to Qt apps')
+  pkgdesc="${pkgdesc} (Qt4)"
+  depends=('qt4')
+  optdepends+=('adwaita-qt5: Qt5 version')
 
   cd $pkgbase-$pkgver
   make install/fast DESTDIR="$pkgdir" -C build-qt4
@@ -73,21 +55,11 @@ package_adwaita-qt4() {
 }
 
 package_adwaita-qt5() {
-  pkgdesc="${pkgdesc::-1} (Qt5)."
-  arch=('i686' 'x86_64')
-  depends=('adwaita-qt-common' 'qt5-base')
-  optdepends=('adwaita-qt4: Qt4 version'
-              'qgnomeplatform: apply GNOME settings to Qt apps')
+  pkgdesc="${pkgdesc} (Qt5)"
+  depends=('qt5-base')
+  optdepends+=('adwaita-qt4: Qt4 version')
 
   cd $pkgbase-$pkgver
   make install/fast DESTDIR="$pkgdir" -C build-qt5
   install -Dm644 -t "${pkgdir}/usr/share/doc/${pkgname}" README.md
 }
-
-package_adwaita-qt-common() {
-  pkgdesc="${pkgdesc::-1} (common files)."
-  arch=('any')
-  license=('GPL')
-
-  make install/fast DESTDIR="$pkgdir" -C $pkgbase-$pkgver/build-common
-}