[arch-commits] Commit in vvave/trunk (PKGBUILD vvave-taglib1.2.patch)

[Antonio Rojas]

    Date: Sunday, May 9, 2021 @ 08:28:36
  Author: arojas
Revision: 928968

Update to 1.2.2

Modified:
  vvave/trunk/PKGBUILD
Deleted:
  vvave/trunk/vvave-taglib1.2.patch

-----------------------+
 PKGBUILD              |   21 +++++++--------------
 vvave-taglib1.2.patch |   15 ---------------
 2 files changed, 7 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-05-09 08:23:58 UTC (rev 928967)
+++ PKGBUILD	2021-05-09 08:28:36 UTC (rev 928968)
@@ -1,28 +1,21 @@
 # Maintainer: Antonio Rojas <arojas at archlinux.org>
 
 pkgname=vvave
-pkgver=1.2.1
+pkgver=1.2.2
 pkgrel=1
-pkgdesc="Multi-platform media player"
-url="https://mauikit.org/"
+pkgdesc='Multi-platform media player'
+url='https://mauikit.org/'
 arch=(x86_64)
 license=(GPL3)
-depends=(mauikit hicolor-icon-theme taglib)
+depends=(mauikit-filebrowsing hicolor-icon-theme taglib)
 makedepends=(extra-cmake-modules)
 groups=(maui)
 conflicts=(babe)
 replaces=(babe)
-source=(https://download.kde.org/stable/maui/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz
-        vvave-taglib1.2.patch)
-sha256sums=('73b04bf3328a350c60fe05a1f8b2b0e86939574e15dc1aab23e153b7c22af4d7'
-            '6e1731c649a0a3411a34f1f2da61a770183d81b44924141ed3e2c473d22a7e96')
+source=(https://download.kde.org/stable/maui/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz)
+sha256sums=('b0f987e83884b103ab668697c9a220144445c4379d8823905d42e319abe2b46f')
 
-prepare() {
-  rm $pkgname-$pkgver/cmake/FindTaglib.cmake # Fix build with taglib 1.2
-  patch -d $pkgname-$pkgver -p1 < vvave-taglib1.2.patch
-}
-
-build() {
+	build() {
   cmake -B build -S $pkgname-$pkgver
   cmake --build build
 }

Deleted: vvave-taglib1.2.patch
===================================================================
--- vvave-taglib1.2.patch	2021-05-09 08:23:58 UTC (rev 928967)
+++ vvave-taglib1.2.patch	2021-05-09 08:28:36 UTC (rev 928968)
@@ -1,15 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a67905f..6c80698 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -128,8 +128,8 @@ endif()
- target_compile_definitions(vvave
-   PRIVATE $<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:QT_QML_DEBUG>)
- 
--target_include_directories(vvave PRIVATE ${TAGLIB_INCLUDE_DIRS})
--target_link_libraries(vvave MauiKit Qt5::Network Qt5::Sql Qt5::Qml Qt5::Xml Qt5::Multimedia Qt5::QuickControls2 KF5::CoreAddons KF5::I18n ${TAGLIB_LIBRARIES})
-+target_include_directories(vvave PRIVATE Taglib:Taglib)
-+target_link_libraries(vvave MauiKit Qt5::Network Qt5::Sql Qt5::Qml Qt5::Xml Qt5::Multimedia Qt5::QuickControls2 KF5::CoreAddons KF5::I18n Taglib::Taglib)
- 
- if(UNIX AND NOT APPLE AND NOT ANDROID)
-     install(TARGETS vvave ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})