Sun Dec 18 23:14:50 UTC 2011

5 files changed, 154 insertions, 3 deletions

diff --git a/libre/kile-libre/PKGBUILD b/libre/kile-libre/PKGBUILD
new file mode 100644
index 000000000..dee7e1dd1
--- /dev/null
+++ b/libre/kile-libre/PKGBUILD
@@ -0,0 +1,41 @@
+# Parabola maintainer: Michał Masłowski <mtjm@mtjm.eu>
+# $Id: PKGBUILD 135613 2011-08-16 16:22:12Z andrea $
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
+
+_pkgname=kile
+pkgname=kile-libre
+pkgver=2.1
+pkgrel=2
+pkgdesc="A user friendly TeX/LaTeX frontend for KDE"
+arch=("i686" "x86_64")
+license=('GPL2')
+url="http://kile.sourceforge.net/"
+depends=('kdebase-runtime' 'texlive-core' 'kdebase-kwrite')
+makedepends=('cmake' 'automoc4')
+conflicts=('kile')
+replaces=('kile')
+provides=('kile')
+install=${_pkgname}.install
+source=("http://downloads.sourceforge.net/$_pkgname/$_pkgname-$pkgver.tar.bz2"
+        "no-acroread.patch")
+sha1sums=('860ac96b68b6026f48b8a9c401c6024ba78e3cdf'
+          '9bbe5d1b0e2a78b13667fcf4e5e21f801447f9d6')
+
+build() {
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+  # Don't recommend a nonfree PDF viewer.
+  patch -Np1 -i "${srcdir}/no-acroread.patch"
+  cd ..
+  mkdir build
+  cd build
+  cmake ../${_pkgname}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/libre/kile-libre/kile.install b/libre/kile-libre/kile.install
new file mode 100644
index 000000000..9fe93eeac
--- /dev/null
+++ b/libre/kile-libre/kile.install
@@ -0,0 +1,13 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+        update-mime-database usr/share/mime &> /dev/null
+        update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/libre/kile-libre/no-acroread.patch b/libre/kile-libre/no-acroread.patch
new file mode 100644
index 000000000..7d305a2d0
--- /dev/null
+++ b/libre/kile-libre/no-acroread.patch
@@ -0,0 +1,97 @@
+diff -Nru kile-2.1.orig/README-win.txt kile-2.1/README-win.txt
+--- kile-2.1.orig/README-win.txt	2011-12-18 14:44:55.824341708 +0100
++++ kile-2.1/README-win.txt	2011-12-18 14:49:23.722382332 +0100
+@@ -10,8 +10,6 @@
+ -----------------------------
+ The most common problem you'll prbably encounter when trying to use Kile on Windows is Kile not being able to find all the supporting applications it depends on (latex, dvips, etc).  If this happens, the easiest solution is to just add the directories containing these programs to your PATH variable (details below).  To see which programs Kile is able to find, run the system checker (Settings -> System Checker) and see what you get.  
+ 
+-Note: acroread does not by default add itself to your PATH so you probably won't be able to use it directly.  However, if you have Adobe Reader setup as your default PDF viewer, setting Kile to System Default for ViewPDF should still work.  You could also just add C:\Program Files\Adobe\path\to\acrord32.exe to your path but it isn't really necessary.
+-
+ 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
+ 
+-[Tool/ViewPDF/Acroread]
+-class=View
+-command=acroread
+-options='%target'
+-state=Viewer
+-from=pdf
+-to=pdf
+-type=Process
+-
+ [Tool/Lilypond/PDF]
+ class=Compile
+ command=lilypond
+diff -Nru kile-2.1.orig/src/data/kilestdtools-win.rc kile-2.1/src/data/kilestdtools-win.rc
+--- 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
+ 
+-[Tool/ViewPDF/Acroread]
+-class=View
+-command=acroread
+-options="%target"
+-state=Viewer
+-from=pdf
+-to=pdf
+-type=Process
+-
+ [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 ""
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 86fb882e6..4e10d29a0 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=('linux-libre' 'linux-libre-headers' 'linux-libre-docs') # Build stock -
 # pkgname=linux-custom       # Build kernel with a different name
 _kernelname=${pkgname#linux-libre}
 _basekernel=3.1
-pkgver=${_basekernel}.4
+pkgver=${_basekernel}.5
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://linux-libre.fsfla.org/"
@@ -292,7 +292,7 @@ package_linux-libre-docs() {
   rm -f "${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile"
 }
 md5sums=('d73df15ab1d36fe3c102755d8f42117f'
-         'ad965eeb168f19c536722ede6e22983b'
+         '06b461d4db995ddcbecbf345ae3b8987'
          '7d8fac41f4c4c2d14d8c65645fb676bd'
          '2a0302eda795903d3b01e41ba807c91e'
          'a8a3843046926eb7ab81312cd438c5c5'
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index 146d349d1..d75b48c8f 100644
--- a/libre/linux-libre/linux-libre.install
+++ b/libre/linux-libre/linux-libre.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=
-KERNEL_VERSION=3.1.4-1-LIBRE
+KERNEL_VERSION=3.1.5-1-LIBRE
 
 post_install () {
   # updating module dependencies