Fix dependencies (Qt6/KF6)

3 files changed, 75 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 45d7aa261804..801e70a3f5eb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,29 @@
 pkgbase = baloo-widgets-git
 	pkgdesc = Widgets for Baloo (Git)
-	pkgver = 22.12.0.r96.g827bd7d
-	pkgrel = 1
-	url = https://community.kde.org/Baloo
+	pkgver = 24.01.75.r5.gd46693c
+	pkgrel = 2
+	url = https://invent.kde.org/libraries/baloo-widgets
 	arch = i686
 	arch = x86_64
 	license = LGPL
-	makedepends = extra-cmake-modules
+	makedepends = extra-cmake-modules-git
 	makedepends = git
 	makedepends = kdoctools
-	depends = baloo-git
-	provides = baloo-widgets
+	depends = gcc-libs
+	depends = glibc
+	depends = baloo
+	depends = kconfig
+	depends = kcoreaddons
+	depends = kfilemetadata
+	depends = ki18n
+	depends = kio
+	depends = kservice
+	depends = kwidgetsaddons
+	depends = qt6-base
+	provides = baloo-widgets=24.01.75
 	conflicts = baloo-widgets
+	conflicts = kf5-transition-dummy
 	source = git+https://invent.kde.org/libraries/baloo-widgets.git
-	md5sums = SKIP
+	b2sums = SKIP
 
 pkgname = baloo-widgets-git
diff --git a/.gitignore b/.gitignore
index bfc93b39e72f..e1cc0116832e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,17 @@
-/baloo-widgets
-/src
-/pkg
-/*.tar
+# based on https://github.com/github/gitignore/blob/master/ArchLinuxPackages.gitignore
+*.tar
+*.tar.*
+*.rpm
+*.jar
+*.exe
+*.msi
+*.zip
+*.tgz
+*.log
+*.log.*
 
+*/
+*.orig
+*.bak
+*.backup
+*.kate-swp
diff --git a/PKGBUILD b/PKGBUILD
index c30e639501ba..d6c3d5b527a5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,33 +1,54 @@
-# Maintainer: katt <magunasu.b97@gmail.com>
+# Contributor: Marcell Meszaros < marcell.meszaros AT runbox.eu >
+# Contributor: katt <magunasu.b97@gmail.com>
 # Contributor: Felix Golatofski <contact@xdfr.de>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 
-pkgname=baloo-widgets-git
-pkgver=22.12.0.r96.g827bd7d
-pkgrel=1
+_pkgname='baloo-widgets'
+pkgname="${_pkgname}-git"
+pkgver=24.01.75.r5.gd46693c
+pkgrel=2
 pkgdesc='Widgets for Baloo (Git)'
-arch=(i686 x86_64)
-url='https://community.kde.org/Baloo'
-license=(LGPL)
-depends=(baloo-git)
-makedepends=(extra-cmake-modules git kdoctools)
-provides=("${pkgname%-git}")
-conflicts=("${pkgname%-git}")
-source=(git+https://invent.kde.org/libraries/baloo-widgets.git)
-md5sums=('SKIP')
+arch=('i686' 'x86_64')
+url="https://invent.kde.org/libraries/${_pkgname}"
+license=('LGPL')
+depends=(
+  'gcc-libs'
+  'glibc'
+  'baloo'
+  'kconfig'
+  'kcoreaddons'
+  'kfilemetadata'
+  'ki18n'
+  'kio'
+  'kservice'
+  'kwidgetsaddons'
+  'qt6-base'
+)
+makedepends=(
+  'extra-cmake-modules-git'
+  'git'
+  'kdoctools'
+)
+provides=("${_pkgname}=${pkgver%.r*}")
+conflicts=("${_pkgname}"
+  'kf5-transition-dummy'    # needs to avoid pulling in this fake package
+)
+source=("${_pkgname}::git+${url}.git")
+b2sums=('SKIP')
 
 pkgver() {
-    git -C "${pkgname%-git}" describe --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+  git -C "${_pkgname}" describe --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {
-    cd "$srcdir"
-    cmake -B build -S "${pkgname%-git}" \
-          -DQT_MAJOR_VERSION=6 \
-          -DBUILD_TESTING=OFF
-    cmake --build build
+  cd "$srcdir"
+  cmake -B build -S "${_pkgname}" \
+      -DBUILD_TESTING=OFF \
+      -DBUILD_WITH_QT6=ON \
+      -DQT_MAJOR_VERSION=6
+  cmake --build build
 }
 
 package() {
-    DESTDIR="${pkgdir}" cmake --install build
+  DESTDIR="${pkgdir}" cmake --install build
 }