libre/kile: updated to 2.9.91

3 files changed, 64 insertions, 75 deletions

diff --git a/libre/kile/PKGBUILD b/libre/kile/PKGBUILD
index 46e5cfb0e..36871ae9f 100644
--- a/libre/kile/PKGBUILD
+++ b/libre/kile/PKGBUILD
@@ -1,40 +1,54 @@
-# $Id: PKGBUILD 266881 2016-05-04 20:12:28Z arojas $
+# Maintainer: Andreas Grapentin <andreas@grapentin.org>
 # Maintainer (Arch): Ronald van Haren <ronald.archlinux.org>
-# Contributor (Arch): Damir Perisa <damir.perisa@bluewin.ch>
-# Maintainer: Michał Masłowski <mtjm@mtjm.eu>
+# Contributor: Michał Masłowski <mtjm@mtjm.eu>
 # Contributor: André Silva <emulatorman@hyperbola.info>
+# Contributor (Arch): Damir Perisa <damir.perisa@bluewin.ch>
 
 pkgname=kile
-pkgver=2.1.3
-pkgrel=7.parabola1
+
+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"
-arch=("i686" "x86_64" "armv7h")
-license=('GPL2')
 url="http://kile.sourceforge.net/"
-depends=('kdebase-runtime' 'texlive-core' 'kdebase-katepart')
-makedepends=('cmake' 'automoc4')
-optdepends=('kdebase-konsole: embedded terminal')
-conflicts=('kile-libre')
-replaces=('kile-libre')
+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")
-sha1sums=('1a80748d5f01f359b5e5c28140ec90691f0166c5'
-          '9bbe5d1b0e2a78b13667fcf4e5e21f801447f9d6')
+sha256sums=('08cb54cddc54c851d98b339f386d9aa20b3d71ff98ef078242fd52f684712d93'
+            '2cea79a285fe8b481d64088a87b0e6bccd1091a9ac08c934cdead7dcb7bd1fa3'
+            '254eb9ef48c53d67eac107c6b99f7a10c69d88327f860543d35c4240cec9a2ed')
 
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  # Remove nonfree Adobe Reader recommendation
-  patch -Np1 -i "${srcdir}/libre.patch"
-  cd ..
+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
+}
+
+build() {
   cd build
-  cmake ../${pkgname}-${pkgver} \
+  cmake ../$pkgname-$pkgver \
     -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=lib
   make
 }
 
 package() {
   cd build
-  make DESTDIR="${pkgdir}" install
+  make DESTDIR="$pkgdir" install
 }
diff --git a/libre/kile/kile-local-url.patch b/libre/kile/kile-local-url.patch
new file mode 100644
index 000000000..4d829a640
--- /dev/null
+++ b/libre/kile/kile-local-url.patch
@@ -0,0 +1,22 @@
+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());
diff --git a/libre/kile/libre.patch b/libre/kile/libre.patch
index 7d305a2d0..046ddc6e8 100644
--- a/libre/kile/libre.patch
+++ b/libre/kile/libre.patch
@@ -10,32 +10,17 @@ diff -Nru kile-2.1.orig/README-win.txt kile-2.1/README-win.txt
  Setting your PATH
  -----------------
  At a minimum, latex.exe and friends should be in your PATH.  MikTeX will do this for you during the install process, but if it doesn't work for some reason, you can add it manually by:
-diff -Nru kile-2.1.orig/src/configtester.cpp kile-2.1/src/configtester.cpp
---- kile-2.1.orig/src/configtester.cpp	2011-12-18 14:44:55.697674394 +0100
-+++ kile-2.1/src/configtester.cpp	2011-12-18 14:46:52.644940609 +0100
-@@ -159,11 +159,6 @@
- 	// which are not needed, but probably useful for the work with kile
- 	ConfigTest::addFailureMessage("dvipng", i18n("You cannot use the png preview for mathgroups in the bottom bar."));
- 	ConfigTest::addFailureMessage("convert", i18n("You cannot use the png previews with conversions 'dvi->ps->png' and 'pdf->png'."));
--#ifdef Q_WS_WIN
--	ConfigTest::addFailureMessage("acrord32", i18n("You cannot open pdf documents with Adobe Reader because acroread could not be found in your path.  <br>If Adobe Reader is your default pdf viewer, try setting ViewPDF to System Default.  Alternatively, you could use Okular."));
--#else
--	ConfigTest::addFailureMessage("acroread", i18n("You cannot open pdf documents with Adobe Reader, but you could use Okular."));
--#endif
- 
- 	ConfigTest::addPrettyName("okular", i18n("ForwardDVI"));
- 	ConfigTest::addSuccessMessage("okular", i18n("Supported."));
 diff -Nru kile-2.1.orig/src/data/kilestdtools.rc kile-2.1/src/data/kilestdtools.rc
 --- kile-2.1.orig/src/data/kilestdtools.rc	2011-12-18 14:44:55.787674856 +0100
 +++ kile-2.1/src/data/kilestdtools.rc	2011-12-18 14:47:50.381903415 +0100
 @@ -747,15 +747,6 @@
- state=Viewer
- type=Part
+ to=pdf
+ type=DocumentViewer
  
 -[Tool/ViewPDF/Acroread]
 -class=View
 -command=acroread
--options='%target'
+-options=%target
 -state=Viewer
 -from=pdf
 -to=pdf
@@ -48,13 +33,13 @@ diff -Nru kile-2.1.orig/src/data/kilestdtools-win.rc kile-2.1/src/data/kilestdto
 --- kile-2.1.orig/src/data/kilestdtools-win.rc	2011-12-18 14:44:55.741007951 +0100
 +++ kile-2.1/src/data/kilestdtools-win.rc	2011-12-18 14:47:59.695284518 +0100
 @@ -740,15 +740,6 @@
- state=Viewer
- type=Part
+ to=pdf
+ type=DocumentViewer
  
 -[Tool/ViewPDF/Acroread]
 -class=View
 -command=acroread
--options="%target"
+-options=%target
 -state=Viewer
 -from=pdf
 -to=pdf
@@ -63,35 +48,3 @@ diff -Nru kile-2.1.orig/src/data/kilestdtools-win.rc kile-2.1/src/data/kilestdto
  [Tool/ViewPDF/SystemDefault]
  class=View
  command=cmd
-diff -Nru kile-2.1.orig/src/test/runTests.bat kile-2.1/src/test/runTests.bat
---- kile-2.1.orig/src/test/runTests.bat	2011-12-18 14:44:55.697674394 +0100
-+++ kile-2.1/src/test/runTests.bat	2011-12-18 14:45:37.097886600 +0100
-@@ -185,12 +185,6 @@
- call :setKey executable okular
- call :findAndSetWhere okular
- 
--echo starting test: Acroread
--call :setTool Acroread
--call :setKey mustpass ""
--call :setKey executable acrord32
--call :findAndSetWhere acrord32
--
- echo starting test: DVItoPNG
- call :setTool DVItoPNG
- call :setKey mustpass ""
-diff -Nru kile-2.1.orig/src/test/runTests.sh kile-2.1/src/test/runTests.sh
---- kile-2.1.orig/src/test/runTests.sh	2011-12-18 14:44:55.697674394 +0100
-+++ kile-2.1/src/test/runTests.sh	2011-12-18 14:45:26.427831910 +0100
-@@ -210,12 +210,6 @@
- performTest okular "isTheOkularVersionRecentEnough"
- setKey where `which okular`
- 
--echo "starting test: Acroread"
--setTool Acroread
--setKey mustpass ""
--setKey executable acroread
--setKey where `which acroread`
--
- echo "starting test: DVItoPNG"
- setTool DVItoPNG
- setKey mustpass ""