[Git][archlinux/packaging/packages/kcolorpicker][main] upgpkg: 0.3.1-4: Make Qt5 and Qt6 versions coinstallable

[Antonio Rojas (@arojas)]

Antonio Rojas pushed to branch main at Arch Linux / Packaging / Packages / 
kcolorpicker


Commits:
972ad85a by Antonio Rojas at 2024-03-02T09:54:51+01:00
upgpkg: 0.3.1-4: Make Qt5 and Qt6 versions coinstallable

- - - - -


3 changed files:

- .SRCINFO
- PKGBUILD
- + rename-qt5-version.patch


Changes:

=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
 pkgbase = kcolorpicker
        pkgdesc = Qt based Color Picker with popup menu
        pkgver = 0.3.1
-       pkgrel = 3
+       pkgrel = 4
        url = https://github.com/DamirPorobic/kColorPicker
        arch = x86_64
        license = LGPL-3.0-only
@@ -11,13 +11,14 @@ pkgbase = kcolorpicker
        depends = gcc-libs
        depends = glibc
        source = 
https://github.com/ksnip/kColorPicker/archive/v0.3.1/kcolorpicker-0.3.1.tar.gz
+       source = rename-qt5-version.patch
        sha256sums = 
e78c785ec4a8a22a48a91835c97601f5704b5076b154415353b0d2697dc0b4f7
+       sha256sums = 
e514beef54c912a9262ff001f8d93b23ffb469e77cfcd6bb15362a746e66a867
 
 pkgname = kcolorpicker
        depends = gcc-libs
        depends = glibc
        depends = qt6-base
-       conflicts = kcolorpicker-qt5
        conflicts = kcolorpicker-qt6
        replaces = kcolorpicker-qt6
 


=====================================
PKGBUILD
=====================================
@@ -5,7 +5,7 @@ pkgbase=kcolorpicker
 pkgname=(kcolorpicker
          kcolorpicker-qt5)
 pkgver=0.3.1
-pkgrel=3
+pkgrel=4
 pkgdesc='Qt based Color Picker with popup menu'
 arch=(x86_64)
 url='https://github.com/DamirPorobic/kColorPicker'
@@ -15,11 +15,18 @@ depends=(gcc-libs
 makedepends=(cmake
              qt5-base
              qt6-base)
-source=(https://github.com/ksnip/kColorPicker/archive/v$pkgver/$pkgbase-$pkgver.tar.gz)
-sha256sums=('e78c785ec4a8a22a48a91835c97601f5704b5076b154415353b0d2697dc0b4f7')
+source=(https://github.com/ksnip/kColorPicker/archive/v$pkgver/$pkgbase-$pkgver.tar.gz
+        rename-qt5-version.patch)
+sha256sums=('e78c785ec4a8a22a48a91835c97601f5704b5076b154415353b0d2697dc0b4f7'
+            'e514beef54c912a9262ff001f8d93b23ffb469e77cfcd6bb15362a746e66a867')
+
+prepare() {
+  cp -r kColorPicker{,-qt5}-$pkgver
+  patch -d kColorPicker-qt5-$pkgver -p1 < rename-qt5-version.patch # Make Qt5 
and Qt6 versions coinstallable
+}
 
 build() {
-  cmake -B build5 -S kColorPicker-$pkgver \
+  cmake -B build5 -S kColorPicker-qt5-$pkgver \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DBUILD_SHARED_LIBS=ON
   cmake --build build5
@@ -39,8 +46,7 @@ package_kcolorpicker-qt5() {
 
 package_kcolorpicker() {
   depends+=(qt6-base)
-  conflicts=(kcolorpicker-qt5
-             kcolorpicker-qt6)
+  conflicts=(kcolorpicker-qt6)
   replaces=(kcolorpicker-qt6)
 
   DESTDIR="$pkgdir" cmake --install build


=====================================
rename-qt5-version.patch
=====================================
@@ -0,0 +1,12 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1d15048..a96250d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -65,6 +65,7 @@ set_target_properties(kColorPicker
+                                         RUNTIME_OUTPUT_DIRECTORY 
${CMAKE_CURRENT_BINARY_DIR}/bin
+                                         VERSION ${PROJECT_VERSION}
+                                         SOVERSION 0
++                                        OUTPUT_NAME kColorPicker-Qt5
+                                         )
+ 
+ install(TARGETS kColorPicker



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/kcolorpicker/-/commit/972ad85a3122a8ef824442bf755bc74b545682f3

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/kcolorpicker/-/commit/972ad85a3122a8ef824442bf755bc74b545682f3
You're receiving this email because of your account on gitlab.archlinux.org.