git » phonon.git » commit 8247d7d

Revert "upgpkg: 4.11.1.20231012-0: Add qt6 package"

author Antonio Rojas
2023-10-12 08:47:29 UTC
committer Antonio Rojas
2023-10-12 08:47:29 UTC
parent d19a75d7586e14ac7efa746cb4ab090b0941330e

Revert "upgpkg: 4.11.1.20231012-0: Add qt6 package"

This reverts commit d19a75d7586e14ac7efa746cb4ab090b0941330e.

.SRCINFO +0 -39
PKGBUILD +13 -43

diff --git a/.SRCINFO b/.SRCINFO
deleted file mode 100644
index 10fe70c..0000000
--- a/.SRCINFO
+++ /dev/null
@@ -1,39 +0,0 @@
-pkgbase = phonon
-	pkgdesc = The multimedia framework by KDE
-	pkgver = 4.11.1.20231012
-	pkgrel = 0
-	url = https://community.kde.org/Phonon
-	arch = x86_64
-	license = LGPL
-	makedepends = extra-cmake-modules
-	makedepends = qt5-base
-	makedepends = qt5-tools
-	makedepends = qt6-5compat
-	makedepends = qt6-base
-	makedepends = qt6-tools
-	makedepends = git
-	depends = gcc-libs
-	depends = glibc
-	depends = libpulse
-	optdepends = pulseaudio: PulseAudio support
-	source = git+https://invent.kde.org/libraries/phonon#commit=5a84ee4f72f16a66de65c33c2e72b45e45fb82cd
-	validpgpkeys = CB9387521E1EE0127DA804843FDBB55084CC5D84
-	sha256sums = SKIP
-
-pkgname = phonon-qt5
-	depends = gcc-libs
-	depends = glibc
-	depends = libpulse
-	depends = phonon-qt5-backend
-	depends = qt5-base
-	optdepends = pulseaudio: PulseAudio support
-	optdepends = qt5-tools: Designer plugin
-
-pkgname = phonon-qt6
-	depends = gcc-libs
-	depends = glibc
-	depends = libpulse
-	depends = qt6-5compat
-	depends = qt6-base
-	optdepends = pulseaudio: PulseAudio support
-	optdepends = qt6-tools: Designer plugin
diff --git a/PKGBUILD b/PKGBUILD
index e7193e8..64f35b1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,57 +2,27 @@
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 
 pkgbase=phonon
-pkgname=(phonon-qt5 phonon-qt6)
+pkgname=(phonon-qt5)
 pkgdesc='The multimedia framework by KDE'
-pkgver=4.11.1.20231012
-pkgrel=0
+pkgver=4.11.1
+pkgrel=3
 arch=(x86_64)
 url='https://community.kde.org/Phonon'
 license=(LGPL)
-depends=(gcc-libs
-         glibc
-         libpulse)
-makedepends=(extra-cmake-modules
-             qt5-base
-             qt5-tools
-             qt6-5compat
-             qt6-base
-             qt6-tools)
-optdepends=('pulseaudio: PulseAudio support')
-#source=(https://download.kde.org/stable/$pkgbase/$pkgver/$pkgbase-$pkgver.tar.xz{,.sig})
-_commit=5a84ee4f72f16a66de65c33c2e72b45e45fb82cd
-makedepends+=(git)
-source=(git+https://invent.kde.org/libraries/$pkgbase#commit=$_commit)
-sha256sums=('SKIP')
+depends=(libpulse qt5-base)
+optdepends=('pulseaudio: PulseAudio support' 'qt5-tools: Designer plugin')
+makedepends=(extra-cmake-modules qt5-tools)
+source=(https://download.kde.org/stable/$pkgbase/$pkgver/$pkgbase-$pkgver.tar.xz{,.sig})
+sha256sums=('b4431ea2600df8137a717741ad9ebc7f7ec1649fa3e138541d8f42597144de2d'
+            'SKIP')
 validpgpkeys=(CB9387521E1EE0127DA804843FDBB55084CC5D84) # Harald Sitter <sitter@kde.org>
 
 build() {
-  cmake -B build5 -S $pkgbase \
-    -DCMAKE_BUILD_TYPE=None \
-    -DPHONON_BUILD_QT6=OFF
-  cmake --build build5
-
-  cmake -B build6 -S $pkgbase \
-    -DCMAKE_BUILD_TYPE=None \
-    -DPHONON_BUILD_QT5=OFF \
-    -DPHONON_BUILD_SETTINGS=OFF
-  cmake --build build6
+  cmake -B build -S $pkgbase-$pkgver
+  cmake --build build
 }
 
 package_phonon-qt5(){
-  depends+=(phonon-qt5-backend
-            qt5-base)
-  optdepends+=('qt5-tools: Designer plugin')
-
-  DESTDIR="$pkgdir" cmake --install build5
-}
-
-package_phonon-qt6(){
-  depends+=(#phonon-qt6-backend
-            qt6-5compat
-            qt6-base)
-  optdepends+=('qt6-tools: Designer plugin')
-
-  DESTDIR="$pkgdir" cmake --install build6
-  rm -r "$pkgdir"/usr/share/locale
+  depends+=(phonon-qt5-backend)
+  DESTDIR="$pkgdir" cmake --install build
 }