git » kimageannotator.git » commit 188c2b7

upgpkg: 0.7.1-2: Make Qt5 and Qt6 versions coinstallable

author Antonio Rojas
2024-03-02 09:07:33 UTC
committer Antonio Rojas
2024-03-02 09:07:33 UTC
parent e6bb7ae4ba065f4288118472d531dfff4ecd136d

upgpkg: 0.7.1-2: Make Qt5 and Qt6 versions coinstallable

.SRCINFO +23 -6
PKGBUILD +39 -12
rename-qt5-version.patch +21 -0

diff --git a/.SRCINFO b/.SRCINFO
index d0efbe5..f507cea 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,39 @@
 pkgbase = kimageannotator
 	pkgdesc = Tool for annotating images
 	pkgver = 0.7.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/ksnip/kImageAnnotator
 	arch = x86_64
 	license = LGPL-3.0-only
 	makedepends = cmake
+	makedepends = kcolorpicker
+	makedepends = kcolorpicker-qt5
+	makedepends = qt5-svg
+	makedepends = qt5-tools
+	makedepends = qt6-svg
 	makedepends = qt6-tools
 	depends = gcc-libs
 	depends = glibc
-	depends = kcolorpicker
 	depends = libx11
+	source = https://github.com/ksnip/kImageAnnotator/archive/v0.7.1/kimageannotator-0.7.1.tar.gz
+	source = rename-qt5-version.patch
+	sha256sums = 79802e79074611599d5fd42be55c35832b6cb8178dcb6a6c5dec10efe38d1d7c
+	sha256sums = 6e50870d20b6a9fd7ae8f36fd2f2e8156f98cbf6b5c572cd138e837f83464f35
+
+pkgname = kimageannotator
+	depends = gcc-libs
+	depends = glibc
+	depends = libx11
+	depends = kcolorpicker
 	depends = qt6-base
 	depends = qt6-svg
-	conflicts = kimageannotator-qt5
 	conflicts = kimageannotator-qt6
 	replaces = kimageannotator-qt6
-	source = https://github.com/ksnip/kImageAnnotator/archive/v0.7.1/kimageannotator-0.7.1.tar.gz
-	sha256sums = 79802e79074611599d5fd42be55c35832b6cb8178dcb6a6c5dec10efe38d1d7c
 
-pkgname = kimageannotator
+pkgname = kimageannotator-qt5
+	depends = gcc-libs
+	depends = glibc
+	depends = libx11
+	depends = kcolorpicker-qt5
+	depends = qt5-base
+	depends = qt5-svg
diff --git a/PKGBUILD b/PKGBUILD
index a5f656b..e3b8617 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,34 @@
 # Maintainer: Antonio Rojas <arojas@archlinux.org>
 # Contributor: dracorp aka Piotr Rogoza <piotr.r.public at gmail.com>
 
-pkgname=kimageannotator
+pkgbase=kimageannotator
+pkgname=(kimageannotator
+         kimageannotator-qt5)
 pkgver=0.7.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Tool for annotating images'
 arch=(x86_64)
 url='https://github.com/ksnip/kImageAnnotator'
 license=(LGPL-3.0-only)
 depends=(gcc-libs
          glibc
-         kcolorpicker
-         libx11
-         qt6-base
-         qt6-svg)
+         libx11)
 makedepends=(cmake
+             kcolorpicker
+             kcolorpicker-qt5
+             qt5-svg
+             qt5-tools
+             qt6-svg
              qt6-tools)
-conflicts=(kimageannotator-qt5
-           kimageannotator-qt6)
-replaces=(kimageannotator-qt6)
-source=(https://github.com/ksnip/kImageAnnotator/archive/v$pkgver/$pkgname-$pkgver.tar.gz)
-sha256sums=('79802e79074611599d5fd42be55c35832b6cb8178dcb6a6c5dec10efe38d1d7c')
+source=(https://github.com/ksnip/kImageAnnotator/archive/v$pkgver/$pkgname-$pkgver.tar.gz
+        rename-qt5-version.patch)
+sha256sums=('79802e79074611599d5fd42be55c35832b6cb8178dcb6a6c5dec10efe38d1d7c'
+            '6e50870d20b6a9fd7ae8f36fd2f2e8156f98cbf6b5c572cd138e837f83464f35')
+
+prepare() {
+  cp -r kImageAnnotator{,-qt5}-$pkgver
+  patch -d kImageAnnotator-qt5-$pkgver -p1 < rename-qt5-version.patch # Make Qt5 and Qt6 versions coinstallable
+}
 
 build() {
   cmake -B build -S kImageAnnotator-$pkgver \
@@ -28,8 +36,27 @@ build() {
     -DBUILD_SHARED_LIBS=ON \
     -DBUILD_WITH_QT6=ON
   cmake --build build
+
+  cmake -B build5 -S kImageAnnotator-qt5-$pkgver \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DBUILD_SHARED_LIBS=ON
+  cmake --build build5
 }
 
-package() {
+package_kimageannotator() {
+  depends+=(kcolorpicker
+            qt6-base
+            qt6-svg)
+  conflicts=(kimageannotator-qt6)
+  replaces=(kimageannotator-qt6)
+
   DESTDIR="$pkgdir" cmake --install build
 }
+
+package_kimageannotator-qt5() {
+  depends+=(kcolorpicker-qt5
+            qt5-base
+            qt5-svg)
+ 
+  DESTDIR="$pkgdir" cmake --install build5
+}
diff --git a/rename-qt5-version.patch b/rename-qt5-version.patch
new file mode 100644
index 0000000..f33bbaf
--- /dev/null
+++ b/rename-qt5-version.patch
@@ -0,0 +1,21 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8f3516e..7e1960f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -21,7 +21,7 @@ if (WIN32)
+ elseif (APPLE)
+ 	set(KIMAGEANNOTATOR_LANG_INSTALL_DIR "../Resources")
+ elseif (UNIX)
+-	set(KIMAGEANNOTATOR_LANG_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/kImageAnnotator/translations")
++	set(KIMAGEANNOTATOR_LANG_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/kImageAnnotator-Qt5/translations")
+ 	string(REGEX REPLACE "//" "/" KIMAGEANNOTATOR_LANG_INSTALL_DIR "${KIMAGEANNOTATOR_LANG_INSTALL_DIR}")
+ endif ()
+ 
+@@ -97,6 +97,7 @@ set_target_properties(kImageAnnotator
+ 					  RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin
+ 					  VERSION ${PROJECT_VERSION}
+ 					  SOVERSION 0
++					  OUTPUT_NAME kImageAnnotator-Qt5
+ 					  )
+ 
+ install(TARGETS kImageAnnotator