| author | Antonio Rojas
<arojas@archlinux.org> 2024-03-01 17:37:30 UTC |
| committer | Antonio Rojas
<arojas@archlinux.org> 2024-03-01 17:37:30 UTC |
| parent | 2880cb4d20f5f6202b80e40bc573f002fc5e3f28 |
| .SRCINFO | +10 | -25 |
| PKGBUILD | +16 | -42 |
diff --git a/.SRCINFO b/.SRCINFO index 1b6d5ac..d0efbe5 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,37 +1,22 @@ pkgbase = kimageannotator pkgdesc = Tool for annotating images - pkgver = 0.7.0 - pkgrel = 3 + pkgver = 0.7.1 + pkgrel = 1 url = https://github.com/ksnip/kImageAnnotator arch = x86_64 license = LGPL-3.0-only makedepends = cmake - makedepends = kcolorpicker-qt5 - makedepends = kcolorpicker-qt6 - 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.0/kimageannotator-0.7.0.tar.gz - sha256sums = 66e6ff5de1f8f808834143130a0a06d203aa01fb8f02e65af73042e61342163a - -pkgname = kimageannotator-qt5 - depends = gcc-libs - depends = glibc - depends = libx11 - depends = kcolorpicker-qt5 - depends = qt5-base - depends = qt5-svg - conflicts = kimageannotator - replaces = kimageannotator - -pkgname = kimageannotator-qt6 - depends = gcc-libs - depends = glibc - depends = libx11 - depends = kcolorpicker-qt6 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 diff --git a/PKGBUILD b/PKGBUILD index ebb7499..a5f656b 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,61 +1,35 @@ # Maintainer: Antonio Rojas <arojas@archlinux.org> # Contributor: dracorp aka Piotr Rogoza <piotr.r.public at gmail.com> -pkgbase=kimageannotator -pkgname=(kimageannotator-qt5 - kimageannotator-qt6) -pkgver=0.7.0 -pkgrel=3 +pkgname=kimageannotator +pkgver=0.7.1 +pkgrel=1 pkgdesc='Tool for annotating images' arch=(x86_64) url='https://github.com/ksnip/kImageAnnotator' license=(LGPL-3.0-only) depends=(gcc-libs glibc - libx11) + kcolorpicker + libx11 + qt6-base + qt6-svg) makedepends=(cmake - kcolorpicker-qt5 - kcolorpicker-qt6 - qt5-svg - qt5-tools - qt6-svg qt6-tools) -source=(https://github.com/ksnip/kImageAnnotator/archive/v$pkgver/$pkgbase-$pkgver.tar.gz) -sha256sums=('66e6ff5de1f8f808834143130a0a06d203aa01fb8f02e65af73042e61342163a') +conflicts=(kimageannotator-qt5 + kimageannotator-qt6) +replaces=(kimageannotator-qt6) +source=(https://github.com/ksnip/kImageAnnotator/archive/v$pkgver/$pkgname-$pkgver.tar.gz) +sha256sums=('79802e79074611599d5fd42be55c35832b6cb8178dcb6a6c5dec10efe38d1d7c') build() { - cmake -B build5 -S kImageAnnotator-$pkgver \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DBUILD_SHARED_LIBS=ON - cmake --build build5 - - cmake -B build6 -S kImageAnnotator-$pkgver \ + cmake -B build -S kImageAnnotator-$pkgver \ -DCMAKE_INSTALL_PREFIX=/usr \ -DBUILD_SHARED_LIBS=ON \ -DBUILD_WITH_QT6=ON - cmake --build build6 -} - -package_kimageannotator-qt5() { - depends+=(kcolorpicker-qt5 - qt5-base - qt5-svg) - conflicts=(kimageannotator) - replaces=(kimageannotator) - - DESTDIR="$pkgdir" cmake --install build5 -# Symlinks for backwards compatibility - mkdir -p "$pkgdir"/usr/lib/cmake/kImageAnnotator - ln -sr "$pkgdir"/usr/lib/cmake/kImageAnnotator-Qt5/kImageAnnotator-Qt5Config.cmake "$pkgdir"/usr/lib/cmake/kImageAnnotator/kImageAnnotatorConfig.cmake - ln -sr "$pkgdir"/usr/lib/cmake/kImageAnnotator-Qt5/kImageAnnotator-Qt5Config-version.cmake "$pkgdir"/usr/lib/cmake/kImageAnnotator/kImageAnnotatorConfig-version.cmake - ln -sr "$pkgdir"/usr/lib/cmake/kImageAnnotator-Qt5/kImageAnnotator-targets* "$pkgdir"/usr/lib/cmake/kImageAnnotator/ + cmake --build build } -package_kimageannotator-qt6() { - depends+=(kcolorpicker-qt6 - qt6-base - qt6-svg) - - DESTDIR="$pkgdir" cmake --install build6 - rm -r "$pkgdir"/usr/share # Remove translations, conflict with Qt5 +package() { + DESTDIR="$pkgdir" cmake --install build }