git » kcolorpicker.git » commit a30461f

upgpkg: 0.3.1-1: Update to 0.3.1

author Antonio Rojas
2024-03-01 17:30:10 UTC
committer Antonio Rojas
2024-03-01 17:30:10 UTC
parent 30df056d66492e86285d79b3d49a78700e7ff49e

upgpkg: 0.3.1-1: Update to 0.3.1

.SRCINFO +8 -17
PKGBUILD +14 -35

diff --git a/.SRCINFO b/.SRCINFO
index 146415a..510027e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,17 @@
 pkgbase = kcolorpicker
 	pkgdesc = Qt based Color Picker with popup menu
-	pkgver = 0.3.0
-	pkgrel = 3
+	pkgver = 0.3.1
+	pkgrel = 1
 	url = https://github.com/DamirPorobic/kColorPicker
 	arch = x86_64
 	license = LGPL-3.0-only
 	makedepends = cmake
-	makedepends = qt5-base
-	makedepends = qt6-base
-	depends = gcc-libs
-	depends = glibc
-	source = https://github.com/ksnip/kColorPicker/archive/v0.3.0/kcolorpicker-0.3.0.tar.gz
-	sha256sums = cab1efae1ca345a831dc6975b81c344da5c9425d934d73584dd7d0d512af3946
-
-pkgname = kcolorpicker-qt5
-	depends = gcc-libs
-	depends = glibc
-	depends = qt5-base
-	conflicts = kcolorpicker
-	replaces = kcolorpicker
-
-pkgname = kcolorpicker-qt6
 	depends = gcc-libs
 	depends = glibc
 	depends = qt6-base
+	conflicts = kcolorpicker-qt6
+	replaces = kcolorpicker-qt6
+	source = https://github.com/ksnip/kColorPicker/archive/v0.3.1/kcolorpicker-0.3.1.tar.gz
+	sha256sums = e78c785ec4a8a22a48a91835c97601f5704b5076b154415353b0d2697dc0b4f7
+
+pkgname = kcolorpicker
diff --git a/PKGBUILD b/PKGBUILD
index 8eb77cf..d957928 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,51 +1,30 @@
 # Maintainer: Antonio Rojas <arojas@archlinux.org>
 # Contributor: dracorp aka Piotr Rogoza <piotr.r.public at gmail.com>
 
-pkgbase=kcolorpicker
-pkgname=(kcolorpicker-qt5
-         kcolorpicker-qt6)
-pkgver=0.3.0
-pkgrel=3
+pkgname=kcolorpicker
+pkgver=0.3.1
+pkgrel=1
 pkgdesc='Qt based Color Picker with popup menu'
 arch=(x86_64)
 url='https://github.com/DamirPorobic/kColorPicker'
 license=(LGPL-3.0-only)
 depends=(gcc-libs
-         glibc)
-makedepends=(cmake
-             qt5-base
-             qt6-base)
-source=(https://github.com/ksnip/kColorPicker/archive/v$pkgver/$pkgbase-$pkgver.tar.gz)
-sha256sums=('cab1efae1ca345a831dc6975b81c344da5c9425d934d73584dd7d0d512af3946')
+         glibc
+         qt6-base)
+makedepends=(cmake)
+conflicts=(kcolorpicker-qt6)
+replaces=(kcolorpicker-qt6)
+source=(https://github.com/ksnip/kColorPicker/archive/v$pkgver/$pkgname-$pkgver.tar.gz)
+sha256sums=('e78c785ec4a8a22a48a91835c97601f5704b5076b154415353b0d2697dc0b4f7')
 
 build() {
-  cmake -B build5 -S kColorPicker-$pkgver \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DBUILD_SHARED_LIBS=ON
-  cmake --build build5
-
-  cmake -B build6 -S kColorPicker-$pkgver \
+  cmake -B build -S kColorPicker-$pkgver \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DBUILD_SHARED_LIBS=ON \
     -DBUILD_WITH_QT6=ON
-  cmake --build build6
-}
-
-package_kcolorpicker-qt5() {
-  depends+=(qt5-base)
-  conflicts=(kcolorpicker)
-  replaces=(kcolorpicker)
-
-  DESTDIR="$pkgdir" cmake --install build5
-
-# Symlinks for backwards compatibility
-  mkdir -p "$pkgdir"/usr/lib/cmake/kColorPicker
-  ln -sr "$pkgdir"/usr/lib/cmake/kColorPicker-Qt5/kColorPicker-Qt5Config.cmake "$pkgdir"/usr/lib/cmake/kColorPicker/kColorPickerConfig.cmake
-  ln -sr "$pkgdir"/usr/lib/cmake/kColorPicker-Qt5/kColorPicker-Qt5Config-version.cmake "$pkgdir"/usr/lib/cmake/kColorPicker/kColorPickerConfig-version.cmake
-  ln -sr "$pkgdir"/usr/lib/cmake/kColorPicker-Qt5/kColorPicker-Qt5-targets* "$pkgdir"/usr/lib/cmake/kColorPicker/
+  cmake --build build
 }
 
-package_kcolorpicker-qt6() {
-  depends+=(qt6-base)
-  DESTDIR="$pkgdir" cmake --install build6
+package() {
+  DESTDIR="$pkgdir" cmake --install build
 }