From 1bf994a390b7e79c6a3e7b58d5234768e86b135a Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Thu, 3 Jul 2014 09:13:31 -0300 Subject: kile-libre-2.1.3-3: mtree rebuild --- libre/kile-libre/PKGBUILD | 12 ++--- libre/kile-libre/libre.patch | 97 ++++++++++++++++++++++++++++++++++++++ libre/kile-libre/no-acroread.patch | 97 -------------------------------------- 3 files changed, 103 insertions(+), 103 deletions(-) create mode 100644 libre/kile-libre/libre.patch delete mode 100644 libre/kile-libre/no-acroread.patch diff --git a/libre/kile-libre/PKGBUILD b/libre/kile-libre/PKGBUILD index f746bce87..97f242d3a 100644 --- a/libre/kile-libre/PKGBUILD +++ b/libre/kile-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 171256 2012-11-16 22:51:16Z allan $ +# $Id: PKGBUILD 216381 2014-07-03 06:23:23Z fyan $ # Maintainer (Arch): Ronald van Haren # Contributor (Arch): Damir Perisa # Maintainer: Michał Masłowski @@ -7,8 +7,8 @@ _pkgname=kile pkgname=kile-libre pkgver=2.1.3 -pkgrel=2 -pkgdesc="A user friendly TeX/LaTeX frontend for KDE" +pkgrel=3 +pkgdesc="A user friendly TeX/LaTeX frontend for KDE, without nonfree Adobe Reader recommendation" arch=("i686" "x86_64") license=('GPL2') url="http://kile.sourceforge.net/" @@ -20,14 +20,14 @@ replaces=('kile') provides=('kile') install=${_pkgname}.install source=("http://downloads.sourceforge.net/$_pkgname/$_pkgname-$pkgver.tar.bz2" - "no-acroread.patch") + "libre.patch") sha1sums=('1a80748d5f01f359b5e5c28140ec90691f0166c5' '9bbe5d1b0e2a78b13667fcf4e5e21f801447f9d6') build() { cd "${srcdir}/${_pkgname}-${pkgver}" - # Don't recommend a nonfree PDF viewer. - patch -Np1 -i "${srcdir}/no-acroread.patch" + # Remove nonfree Adobe Reader recommendation + patch -Np1 -i "${srcdir}/libre.patch" cd .. mkdir build cd build diff --git a/libre/kile-libre/libre.patch b/libre/kile-libre/libre.patch new file mode 100644 index 000000000..7d305a2d0 --- /dev/null +++ b/libre/kile-libre/libre.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.
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/kile-libre/no-acroread.patch b/libre/kile-libre/no-acroread.patch deleted file mode 100644 index 7d305a2d0..000000000 --- a/libre/kile-libre/no-acroread.patch +++ /dev/null @@ -1,97 +0,0 @@ -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.
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 "" -- cgit v1.2.3-54-g00ecf