Merged with official ABS kmenuedit PKGBUILD

3 files changed, 27 insertions, 49 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4340de1c5212..ff9838cc8aed 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,20 @@
 pkgbase = kmenuedit-git
 	pkgdesc = KDE menu editor
-	pkgver = r929.4289215
+	pkgver = 5.21.80_r949.g0a5e703
 	pkgrel = 1
-	url = https://projects.kde.org/projects/kde/kde-workspace
-	install = kmenuedit-git.install
-	arch = i686
+	url = https://kde.org/plasma-desktop/
 	arch = x86_64
-	groups = plasma
+	groups = plasma-git
 	license = LGPL
-	makedepends = extra-cmake-modules-git
 	makedepends = git
+	makedepends = extra-cmake-modules-git
 	makedepends = kdoctools-git
-	depends = khotkeys-git
+	depends = kio-git
+	depends = hicolor-icon-theme
 	provides = kmenuedit
 	conflicts = kmenuedit
-	conflicts = kdebase-workspace
 	source = git+https://github.com/KDE/kmenuedit.git
-	md5sums = SKIP
+	sha256sums = SKIP
 
 pkgname = kmenuedit-git
 
diff --git a/PKGBUILD b/PKGBUILD
index ae0867259b7f..7137e2c68131 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,42 +1,34 @@
-# Maintainer: João Figueiredo <jf dot mundox at gmail dot com>
+# Merged with official ABS kmenuedit PKGBUILD by João, 2021/02/01 (all respective contributors apply herein)
+# Maintainer: João Figueiredo <jf.mundox@gmail.com>
 # Contributor: Antonio Rojas <arojas@archlinux.org>
 
 pkgname=kmenuedit-git
-pkgver=r929.4289215
+pkgver=5.21.80_r949.g0a5e703
 pkgrel=1
 pkgdesc='KDE menu editor'
-arch=('i686' 'x86_64')
-url='https://projects.kde.org/projects/kde/kde-workspace'
-license=('LGPL')
-depends=('khotkeys-git')
-makedepends=('extra-cmake-modules-git' 'git' 'kdoctools-git')
-conflicts=('kmenuedit' 'kdebase-workspace')
-provides=('kmenuedit')
-install=$pkgname.install
-source=('git+https://github.com/KDE/kmenuedit.git')
-groups=('plasma')
-md5sums=('SKIP')
+arch=($CARCH)
+url='https://kde.org/plasma-desktop/'
+license=(LGPL)
+depends=(kio-git hicolor-icon-theme)
+makedepends=(git extra-cmake-modules-git kdoctools-git)
+conflicts=(${pkgname%-git})
+provides=(${pkgname%-git})
+groups=(plasma-git)
+source=("git+https://github.com/KDE/${pkgname%-git}.git")
+sha256sums=('SKIP')
 
 pkgver() {
-  cd kmenuedit
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-}
-
-prepare() {
-  mkdir -p build
+  cd ${pkgname%-git}
+  _ver="$(grep -m1 'set(PROJECT_VERSION' CMakeLists.txt | cut -d '"' -f2 | tr - .)"
+  echo "${_ver}_r$(git rev-list --count HEAD).g$(git rev-parse --short HEAD)"
 }
 
 build() {
-  cd build
-  cmake ../kmenuedit \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLIB_INSTALL_DIR=lib \
-    -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
-  make
+  cmake -B build -S ${pkgname%-git} \
+    -DBUILD_TESTING=OFF
+  cmake --build build
 }
 
 package() {
-  cd build
-  make DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" cmake --install build
 }
diff --git a/kmenuedit-git.install b/kmenuedit-git.install
deleted file mode 100644
index f32ae9d179f2..000000000000
--- a/kmenuedit-git.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
-