git » okular.git » commit f95ed34

Revert "upgpkg: 24.01.90-2"

author Antonio Rojas
2024-01-12 10:41:43 UTC
committer Antonio Rojas
2024-01-12 10:41:43 UTC
parent 4fe8f0c91d469fc72d8700ba52f31048149b77ff

Revert "upgpkg: 24.01.90-2"

This reverts commit 4fe8f0c91d469fc72d8700ba52f31048149b77ff.

.SRCINFO +25 -46
PKGBUILD +13 -59

diff --git a/.SRCINFO b/.SRCINFO
index 684e27f..4c3a393 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = okular
 	pkgdesc = Document Viewer
-	pkgver = 24.01.90
-	pkgrel = 2
+	pkgver = 23.08.4
+	pkgrel = 1
 	url = https://apps.kde.org/okular/
 	arch = x86_64
 	groups = kde-applications
@@ -9,61 +9,40 @@ pkgbase = okular
 	license = GPL
 	license = LGPL
 	license = FDL
-	makedepends = ebook-tools
 	makedepends = extra-cmake-modules
+	makedepends = ebook-tools
 	makedepends = kdegraphics-mobipocket
-	makedepends = kdoctools
-	depends = discount
+	makedepends = kdoctools5
+	makedepends = khtml
+	makedepends = chmlib
 	depends = djvulibre
-	depends = freetype2
-	depends = gcc-libs
-	depends = glibc
-	depends = plasma-activities
-	depends = karchive
-	depends = kbookmarks
-	depends = kcolorscheme
-	depends = kcompletion
-	depends = kconfig
-	depends = kconfigwidgets
-	depends = kcoreaddons
-	depends = kcrash
-	depends = ki18n
-	depends = kio
-	depends = kitemviews
-	depends = kparts
-	depends = kpty
-	depends = ktextwidgets
-	depends = kwallet
-	depends = kwidgetsaddons
-	depends = kwindowsystem
-	depends = kxmlgui
-	depends = libjpeg-turbo
-	depends = libkexiv2
 	depends = libspectre
-	depends = libtiff
-	depends = phonon-qt6
-	depends = poppler-qt6
-	depends = purpose
-	depends = qt6-base
-	depends = qt6-declarative
-	depends = qt6-speech
-	depends = qt6-svg
-	depends = threadweaver
-	depends = zlib
-	optdepends = calligra: ODT and ODP support
+	depends = libkexiv2
+	depends = poppler-qt5
+	depends = kpty5
+	depends = kactivities5
+	depends = threadweaver5
+	depends = kparts5
+	depends = purpose5
+	depends = discount
+	depends = phonon-qt5
 	optdepends = ebook-tools: mobi and epub support
 	optdepends = kdegraphics-mobipocket: mobi support
-	optdepends = unarchiver: Comic Book Archive support (alternative)
+	optdepends = libzip: CHM support
+	optdepends = khtml: CHM support
+	optdepends = chmlib: CHM support
+	optdepends = calligra: ODT and ODP support
 	optdepends = unrar: Comic Book Archive support
+	optdepends = unarchiver: Comic Book Archive support (alternative)
+	optdepends = kde-cli-tools: to configure web shortcuts
+	optdepends = plasma-workspace: to configure web shortcuts
 	options = !zipman
-	source = https://download.kde.org/unstable/release-service/24.01.90/src/okular-24.01.90.tar.xz
-	source = https://download.kde.org/unstable/release-service/24.01.90/src/okular-24.01.90.tar.xz.sig
-	source = https://invent.kde.org/graphics/okular/-/commit/f23a2448.patch
+	source = https://download.kde.org/stable/release-service/23.08.4/src/okular-23.08.4.tar.xz
+	source = https://download.kde.org/stable/release-service/23.08.4/src/okular-23.08.4.tar.xz.sig
 	validpgpkeys = CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7
 	validpgpkeys = F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87
 	validpgpkeys = D81C0CB38EB725EF6691C385BB463350D6EF31EF
-	sha256sums = 67ea6fd08e07b96a562038c65068c78762631deb96037106508c4ae3318dbfc0
+	sha256sums = 37fd73178ae287dcdcc2b2bc61aee2aa30a64765f862230315f521a94b50af11
 	sha256sums = SKIP
-	sha256sums = 7c7d34b35338f054c03a9fd5782c9657ec4a2c731b968e84b2f9202cab8cf33d
 
 pkgname = okular
diff --git a/PKGBUILD b/PKGBUILD
index 16be3d4..100767a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,74 +3,28 @@
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=okular
-pkgver=24.01.90
-pkgrel=2
+pkgver=23.08.4
+pkgrel=1
 pkgdesc='Document Viewer'
 arch=(x86_64)
 url='https://apps.kde.org/okular/'
 license=(GPL LGPL FDL)
-depends=(discount
-         djvulibre
-         freetype2
-         gcc-libs
-         glibc
-         plasma-activities
-         karchive
-         kbookmarks
-         kcolorscheme
-         kcompletion
-         kconfig
-         kconfigwidgets
-         kcoreaddons
-         kcrash
-         ki18n
-         kio
-         kitemviews
-         kparts
-         kpty
-         ktextwidgets
-         kwallet
-         kwidgetsaddons
-         kwindowsystem
-         kxmlgui
-         libjpeg-turbo
-         libkexiv2
-         libspectre
-         libtiff
-         phonon-qt6
-         poppler-qt6
-         purpose
-         qt6-base
-         qt6-declarative
-         qt6-speech
-         qt6-svg
-         threadweaver
-         zlib)
-makedepends=(ebook-tools
-             extra-cmake-modules
-             kdegraphics-mobipocket
-             kdoctools)
-optdepends=('calligra: ODT and ODP support'
-            'ebook-tools: mobi and epub support'
-            'kdegraphics-mobipocket: mobi support'
-            'unarchiver: Comic Book Archive support (alternative)'
-            'unrar: Comic Book Archive support')
-groups=(kde-applications
-        kde-graphics)
-source=(https://download.kde.org/unstable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz{,.sig}
-        https://invent.kde.org/graphics/okular/-/commit/f23a2448.patch)
-sha256sums=('67ea6fd08e07b96a562038c65068c78762631deb96037106508c4ae3318dbfc0'
-            'SKIP'
-            '7c7d34b35338f054c03a9fd5782c9657ec4a2c731b968e84b2f9202cab8cf33d')
+groups=(kde-applications kde-graphics)
+depends=(djvulibre libspectre libkexiv2 poppler-qt5 kpty5 kactivities5 threadweaver5 kparts5 purpose5 discount phonon-qt5)
+makedepends=(extra-cmake-modules ebook-tools kdegraphics-mobipocket kdoctools5 khtml chmlib)
+optdepends=('ebook-tools: mobi and epub support'
+            'kdegraphics-mobipocket: mobi support' 'libzip: CHM support'
+            'khtml: CHM support' 'chmlib: CHM support' 'calligra: ODT and ODP support'
+            'unrar: Comic Book Archive support' 'unarchiver: Comic Book Archive support (alternative)'
+            'kde-cli-tools: to configure web shortcuts' 'plasma-workspace: to configure web shortcuts')
+source=(https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz{,.sig})
+sha256sums=('37fd73178ae287dcdcc2b2bc61aee2aa30a64765f862230315f521a94b50af11'
+            'SKIP')
 validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid@kde.org>
               F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87  # Christoph Feck <cfeck@kde.org>
               D81C0CB38EB725EF6691C385BB463350D6EF31EF) # Heiko Becker <heiko.becker@kde.org>
 options=(!zipman)
 
-prepare() {
-  patch -d $pkgname-$pkgver -p1 < f23a2448.patch # Fix loading part
-}
-
 build() {
   cmake -B build -S $pkgname-$pkgver \
     -DBUILD_TESTING=OFF