bump

2 files changed, 57 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index aaa691919565..110d901e4f8a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,29 @@
-# Generated by mksrcinfo v8
-# Wed Apr 11 21:13:40 UTC 2018
 pkgbase = danbooru-client-git
 	pkgdesc = Application to access Danbooru-based image boards. (GIT Version)
-	pkgver = v0.6.1.0.g6631e1a
+	pkgver = 0.3.0.r401.0eb9232
 	pkgrel = 1
 	url = http://www.dennogumi.org/projects/danbooru-client
 	arch = x86_64
 	license = GPL3
 	makedepends = extra-cmake-modules
-	makedepends = kdoctools
+	makedepends = kdoctools5
 	makedepends = git
 	makedepends = python
-	depends = kdeclarative
-	depends = kfilemetadata
+	depends = gcc-libs
+	depends = glibc
+	depends = kio5
+	depends = kwallet5
+	depends = kwidgetsaddons5
+	depends = kxmlgui5
+	depends = ktextwidgets5
+	depends = kdeclarative5
+	depends = ki18n5
+	depends = kconfigwidgets5
+	depends = kcompletion5
+	depends = kconfig5
+	depends = kcoreaddons5
+	depends = kfilemetadata5
+	depends = qt5-base
 	depends = qt5-declarative
 	provides = danbooru-client
 	conflicts = danbooru-client
@@ -22,4 +33,3 @@ pkgbase = danbooru-client-git
 	sha256sums = 395a907c61a3450e22a695f6d5e04bf3fbaf3342b02474ba401acbd595609b8b
 
 pkgname = danbooru-client-git
-
diff --git a/PKGBUILD b/PKGBUILD
index dc3f2764ae4c..967838f1f260 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,52 +2,70 @@
 # Contributor: archtux <antonio dot arias99999 at gmail dot com>
 
 pkgname=danbooru-client-git
-pkgver=v0.6.1.0.g6631e1a
+pkgver=0.3.0.r401.0eb9232
 pkgrel=1
 pkgdesc="Application to access Danbooru-based image boards. (GIT Version)"
 arch=('x86_64')
 url='http://www.dennogumi.org/projects/danbooru-client'
 license=('GPL3')
-depends=('kdeclarative'
-         'kfilemetadata'
-         'qt5-declarative'
-         )
-makedepends=('extra-cmake-modules'
-             'kdoctools'
-             'git'
-             'python'
-             )
+depends=(
+  'gcc-libs' # libstdc++.so
+  'glibc' # libc.so
+  'kio5' # libKF5KIOCore.so libKF5KIOFileWidgets.so
+  'kwallet5' # libKF5Wallet.so
+  'kwidgetsaddons5' # libKF5WidgetsAddons.so
+  'kxmlgui5' # libKF5XmlGui.so
+  'ktextwidgets5' # libKF5TextWidgets.so
+  'kdeclarative5' # libKF5Declarative.so
+  'ki18n5' # libKF5I18n.so
+  'kconfigwidgets5' # libKF5ConfigWidgets.so
+  'kcompletion5' # libKF5Completion.so
+  'kconfig5' # libKF5ConfigCore.so libKF5ConfigGui.so
+  'kcoreaddons5' # libKF5CoreAddons.so
+  'kfilemetadata5' # libKF5FileMetaData.so
+  'qt5-base' # libQt5Core.so libQt5Gui.so libQt5Widgets.so
+  'qt5-declarative' # libQt5Qml.so libQt5QuickWidgets.so
+)
+makedepends=(
+  'extra-cmake-modules'
+  'kdoctools5'
+  'git'
+  'python'
+)
 conflicts=('danbooru-client')
 provides=('danbooru-client')
-source=('git+https://git.dennogumi.org/kde/danbooru-client.git'
-        'https://github.com/lbeltrame/danbooru-client/raw/master/danbooru/img/logo.png'
-        )
-sha256sums=('SKIP'
-            '395a907c61a3450e22a695f6d5e04bf3fbaf3342b02474ba401acbd595609b8b'
-            )
+source=(
+  'git+https://git.dennogumi.org/kde/danbooru-client.git'
+  'https://github.com/lbeltrame/danbooru-client/raw/master/danbooru/img/logo.png'
+)
+sha256sums=(
+  'SKIP'
+  '395a907c61a3450e22a695f6d5e04bf3fbaf3342b02474ba401acbd595609b8b'
+)
 
 pkgver() {
   cd danbooru-client
-  echo "$(git describe --long --tags | tr - .)"
+  _ver="$(cat CMakeLists.txt | grep -m3 -e MAJOR -e MINOR -e PATCH | grep -o "[[:digit:]]*" | paste -sd'.')"
+  echo "${_ver}.r$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
 }
 
 prepare() {
-  mkdir -p build
+  sed '/danbooruservice.h/d' -i danbooru-client/src/danbooruconnectwidget.cpp
 }
 
 build() {
-  cd build
-  cmake ../danbooru-client \
+  cmake -S danbooru-client -B build \
+    -DCMAKE_BUILD_TYPE=None \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DKDE_INSTALL_LIBDIR=lib \
     -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
     -DBUILD_TESTING=OFF
 
-  make
+  cmake --build build
 }
 
 package() {
-  make -C build DESTDIR="${pkgdir}" install
+  DESTDIR="${pkgdir}" cmake --install build
   install -Dm644 logo.png "${pkgdir}/usr/share/pixmaps/danbooru.png"
   sed 's|Icon=danbooru_client|Icon=danbooru|g' -i "${pkgdir}/usr/share/applications/"*.desktop
 }