updpkg: libre/kile 2.9.93-5

Signed-off-by: David P. <megver83@parabola.nu>

2 files changed, 47 insertions, 58 deletions

diff --git a/libre/kile/PKGBUILD b/libre/kile/PKGBUILD
index 43c7c2eb3..558c66832 100644
--- a/libre/kile/PKGBUILD
+++ b/libre/kile/PKGBUILD
@@ -1,54 +1,65 @@
+# Maintainer (Arch): Ronald van Haren <ronald.archlinux.org>
 # Maintainer: Andreas Grapentin <andreas@grapentin.org>
-# Maintainer (arch): Ronald van Haren <ronald.archlinux.org>
 # Contributor: Michał Masłowski <mtjm@mtjm.eu>
 # Contributor: André Silva <emulatorman@hyperbola.info>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 
 pkgname=kile
-
-pkgver=2.9.91
-pkgrel=3.parabola1
-arch=(i686 x86_64 armv7h)
-
-pkgdesc="A user friendly TeX/LaTeX frontend for KDE, without nonfree Adobe Reader recommendation"
-url="http://kile.sourceforge.net/"
+pkgver=2.9.93
+pkgrel=5
+pkgdesc='A user friendly TeX/LaTeX frontend for KDE'
+pkgdesc+=', without nonfree Adobe Reader recommendation'
+arch=(x86_64)
+arch+=(i686 armv7h)
 license=(GPL2)
-
-makedepends=(extra-cmake-modules kdoctools)
-depends=(ktexteditor kinit okular khtml texlive-core)
-optdepends=('konsole: embedded terminal')
-conflicts=(kile-libre)
-replaces=(kile-libre)
-
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2"
-        "kile-local-url.patch"
-        "libre.patch")
-sha256sums=('08cb54cddc54c851d98b339f386d9aa20b3d71ff98ef078242fd52f684712d93'
-            '2cea79a285fe8b481d64088a87b0e6bccd1091a9ac08c934cdead7dcb7bd1fa3'
+url='https://apps.kde.org/kile/'
+depends=(gcc-libs
+         glibc
+         kcodecs5
+         kcompletion5
+         kconfig5
+         kconfigwidgets5
+         kcoreaddons5
+         kcrash5
+         kdbusaddons5
+         kguiaddons5
+         khtml
+         ki18n5
+         kiconthemes5
+         kinit
+         kio5
+         kjobwidgets5
+         kparts5
+         kservice5
+         ktexteditor5
+         ktextwidgets5
+         kwidgetsaddons5
+         kwindowsystem5
+         kxmlgui5
+         okular
+         perl
+         poppler-qt5
+         qt5-base
+         qt5-script
+         texlive-basic)
+makedepends=(extra-cmake-modules
+             kdoctools5)
+optdepends=('konsole: embedded terminal' 'imagemagick: for some file type conversions')
+source=(https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2)
+source+=(libre.patch)
+sha256sums=('04499212ffcb24fb3a6829149a7cae4c6ad5d795985f080800d6df72f88c5df0'
             '254eb9ef48c53d67eac107c6b99f7a10c69d88327f860543d35c4240cec9a2ed')
 
 prepare() {
-  mkdir build
-
-  cd $pkgname-$pkgver
-
-  # Fix opening local URLs
-  patch -p1 -i $srcdir/kile-local-url.patch
-
   # Remove nonfree Adobe Reader recommendation
-  patch -Np1 -i $srcdir/libre.patch
+  patch -d $pkgname-$pkgver -p1 < libre.patch
 }
 
 build() {
-  cd build
-  cmake ../$pkgname-$pkgver \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=lib
-  make
+  cmake -B build -S $pkgname-$pkgver
+  cmake --build build
 }
 
 package() {
-  cd build
-  make DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" cmake --install build
 }
diff --git a/libre/kile/kile-local-url.patch b/libre/kile/kile-local-url.patch
deleted file mode 100644
index 4d829a640..000000000
--- a/libre/kile/kile-local-url.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/src/main.cpp b/src/main.cpp
-index 0e58cfa1..d3e43d10 100644
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -164,7 +164,7 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
- 				kile->openDocument(readDataFromStdin());
- 			}
- 			else {
--				const QUrl url = QUrl::fromUserInput(argument);
-+				const QUrl url = QUrl::fromUserInput(argument, QDir::currentPath(), QUrl::AssumeLocalFile);
- 
- 				if(isProject(url)) {
- 					kile->openProject(url);
-@@ -190,7 +190,7 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
- 				interface->call("openDocument", readDataFromStdin());
- 			}
- 			else {
--				const QUrl url = QUrl::fromUserInput(argument);
-+				const QUrl url = QUrl::fromUserInput(argument, QDir::currentPath(), QUrl::AssumeLocalFile);
- 
- 				if(isProject(url)) {
- 					interface->call("openProject", url.url());