[texmaker] 04/07: Adapt patches
Andreas Tille
tille at debian.org
Sun Sep 10 18:33:52 UTC 2017
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository texmaker.
commit 92c34238a4a3d1198e974c16107da1dc3e2e0e02
Author: Andreas Tille <tille at debian.org>
Date: Sun Sep 10 19:52:13 2017 +0200
Adapt patches
---
debian/patches/10_spelling_dict.patch | 6 +--
debian/patches/30-fix-spelling-errors.patch | 84 ++++++++++++++---------------
debian/patches/use-system-synctex.patch | 46 ++++++----------
3 files changed, 61 insertions(+), 75 deletions(-)
diff --git a/debian/patches/10_spelling_dict.patch b/debian/patches/10_spelling_dict.patch
index eb2fc7c..8c5ed08 100644
--- a/debian/patches/10_spelling_dict.patch
+++ b/debian/patches/10_spelling_dict.patch
@@ -3,9 +3,9 @@ Purpose: Adapt default search directory for spelling dictionaries to Debian defa
Closes: #591340
--- a/texmaker.pro
+++ b/texmaker.pro
-@@ -334,6 +334,8 @@
- desktop.path = $${DESKTOPDIR}
- icon.path = $${ICONDIR}
+@@ -1071,6 +1071,8 @@ icon.path = $${ICONDIR}
+ metainfo.path = $${METAINFODIR}
+
+DEFINES += DEBIAN_SPELLDIR
+
diff --git a/debian/patches/30-fix-spelling-errors.patch b/debian/patches/30-fix-spelling-errors.patch
index 0250deb..cbfd7d9 100644
--- a/debian/patches/30-fix-spelling-errors.patch
+++ b/debian/patches/30-fix-spelling-errors.patch
@@ -4,7 +4,7 @@ Last-Update: 2016-09-27
Author: Julián Moreno Patiño <julian at debian.org>
--- a/icondelegate.cpp
+++ b/icondelegate.cpp
-@@ -271,7 +271,7 @@
+@@ -271,7 +271,7 @@ void IconDelegate::doLayout(const QStyle
display.setRect(x, y, w, h);
break; }
default:
@@ -15,7 +15,7 @@ Author: Julián Moreno Patiño <julian at debian.org>
}
--- a/hunspell/affixmgr.cxx
+++ b/hunspell/affixmgr.cxx
-@@ -1259,7 +1259,7 @@ int AffixMgr::cpdrep_check(const char * word, int wl)
+@@ -1259,7 +1259,7 @@ int AffixMgr::cpdrep_check(const char *
r = word;
lenr = strlen(reptable[i].pattern2);
lenp = strlen(reptable[i].pattern);
@@ -26,7 +26,7 @@ Author: Julián Moreno Patiño <julian at debian.org>
if (r-word + lenr + strlen(r+lenp) >= MAXLNLEN) break;
--- a/hunspell/suggestmgr.cxx
+++ b/hunspell/suggestmgr.cxx
-@@ -449,7 +449,7 @@ int SuggestMgr::replchars(char** wlst, const char * word, int ns, int cpdsuggest
+@@ -449,7 +449,7 @@ int SuggestMgr::replchars(char** wlst, c
r = word;
lenr = strlen(reptable[i].pattern2);
lenp = strlen(reptable[i].pattern);
@@ -57,7 +57,7 @@ Author: Julián Moreno Patiño <julian at debian.org>
editor->replace(ui.comboReplace->currentText(),ui.checkRegExp->isChecked(),ui.comboFind->currentText() );
--- a/trans/texmaker_ar.ts
+++ b/trans/texmaker_ar.ts
-@@ -1707,7 +1707,7 @@ with the default encoding setting</source>
+@@ -1661,7 +1661,7 @@ with the default encoding setting</sourc
<message>
<location filename="../replacewidget.cpp" line="73"/>
<location filename="../replacewidget.cpp" line="96"/>
@@ -68,7 +68,7 @@ Author: Julián Moreno Patiño <julian at debian.org>
<message>
--- a/trans/texmaker_ca.ts
+++ b/trans/texmaker_ca.ts
-@@ -1701,7 +1701,7 @@ amb la codificació de caràcters predeterminada</translation>
+@@ -1655,7 +1655,7 @@ amb la codificació de caràcters predet
<message>
<location filename="../replacewidget.cpp" line="73"/>
<location filename="../replacewidget.cpp" line="96"/>
@@ -79,7 +79,7 @@ Author: Julián Moreno Patiño <julian at debian.org>
<message>
--- a/trans/texmaker_cs.ts
+++ b/trans/texmaker_cs.ts
-@@ -1829,7 +1829,7 @@ zakódování správně rozšifrovat</translation>
+@@ -1783,7 +1783,7 @@ zakódování správně rozšifrovat</tr
<context>
<name>ReplaceDialog</name>
<message>
@@ -88,7 +88,7 @@ Author: Julián Moreno Patiño <julian at debian.org>
<translation type="obsolete">Nahradit tento výskyt?</translation>
</message>
<message>
-@@ -1985,7 +1985,7 @@ zakódování správně rozšifrovat</translation>
+@@ -1939,7 +1939,7 @@ zakódování správně rozšifrovat</tr
<message>
<location filename="../replacewidget.cpp" line="73"/>
<location filename="../replacewidget.cpp" line="96"/>
@@ -99,7 +99,7 @@ Author: Julián Moreno Patiño <julian at debian.org>
<message>
--- a/trans/texmaker_da.ts
+++ b/trans/texmaker_da.ts
-@@ -1700,7 +1700,7 @@ with the default encoding setting</source>
+@@ -1583,7 +1583,7 @@ with the default encoding setting</sourc
<message>
<location filename="../replacewidget.cpp" line="73"/>
<location filename="../replacewidget.cpp" line="96"/>
@@ -110,7 +110,7 @@ Author: Julián Moreno Patiño <julian at debian.org>
<message>
--- a/trans/texmaker_de.ts
+++ b/trans/texmaker_de.ts
-@@ -1934,7 +1934,7 @@ with the default encoding setting</source>
+@@ -1840,7 +1840,7 @@ with the default encoding setting</sourc
<translation type="obsolete">Rückwärts</translation>
</message>
<message>
@@ -119,7 +119,7 @@ Author: Julián Moreno Patiño <julian at debian.org>
<translation type="obsolete">Dieses Auftreten ersetzen?</translation>
</message>
<message>
-@@ -2038,7 +2038,7 @@ with the default encoding setting</source>
+@@ -1944,7 +1944,7 @@ with the default encoding setting</sourc
<message>
<location filename="../replacewidget.cpp" line="73"/>
<location filename="../replacewidget.cpp" line="96"/>
@@ -130,7 +130,7 @@ Author: Julián Moreno Patiño <julian at debian.org>
<message>
--- a/trans/texmaker_el.ts
+++ b/trans/texmaker_el.ts
-@@ -1796,7 +1796,7 @@ with the default encoding setting</source>
+@@ -1750,7 +1750,7 @@ with the default encoding setting</sourc
<message>
<location filename="../replacewidget.cpp" line="73"/>
<location filename="../replacewidget.cpp" line="96"/>
@@ -141,7 +141,7 @@ Author: Julián Moreno Patiño <julian at debian.org>
<message>
--- a/trans/texmaker_es.ts
+++ b/trans/texmaker_es.ts
-@@ -1819,7 +1819,7 @@ correctamente con la codificación por defecto</translation>
+@@ -1773,7 +1773,7 @@ correctamente con la codificación por d
<context>
<name>ReplaceDialog</name>
<message>
@@ -150,7 +150,7 @@ Author: Julián Moreno Patiño <julian at debian.org>
<translation type="obsolete">¿Reemplazar esta ocurrencia?</translation>
</message>
<message>
-@@ -1971,7 +1971,7 @@ correctamente con la codificación por defecto</translation>
+@@ -1925,7 +1925,7 @@ correctamente con la codificación por d
<message>
<location filename="../replacewidget.cpp" line="73"/>
<location filename="../replacewidget.cpp" line="96"/>
@@ -161,7 +161,7 @@ Author: Julián Moreno Patiño <julian at debian.org>
</message>
--- a/trans/texmaker_fa.ts
+++ b/trans/texmaker_fa.ts
-@@ -2091,7 +2091,7 @@ with the default encoding setting</source>
+@@ -1974,7 +1974,7 @@ with the default encoding setting</sourc
<translation type="obsolete">به عقب</translation>
</message>
<message>
@@ -170,7 +170,7 @@ Author: Julián Moreno Patiño <julian at debian.org>
<translation type="obsolete">مورد پیدا شده جایگزین شود؟</translation>
</message>
<message>
-@@ -2195,7 +2195,7 @@ with the default encoding setting</source>
+@@ -2078,7 +2078,7 @@ with the default encoding setting</sourc
<message>
<location filename="../replacewidget.cpp" line="73"/>
<location filename="../replacewidget.cpp" line="96"/>
@@ -181,7 +181,7 @@ Author: Julián Moreno Patiño <julian at debian.org>
<message>
--- a/trans/texmaker_fr.ts
+++ b/trans/texmaker_fr.ts
-@@ -1963,8 +1963,8 @@ avec l'encodage défini par défaut</translation>
+@@ -1862,8 +1862,8 @@ avec l'encodage défini par défaut
<translation type="obsolete">En arrière</translation>
</message>
<message>
@@ -192,7 +192,7 @@ Author: Julián Moreno Patiño <julian at debian.org>
</message>
<message>
<source>Yes</source>
-@@ -2071,8 +2071,8 @@ avec l'encodage défini par défaut</translation>
+@@ -1970,8 +1970,8 @@ avec l'encodage défini par défaut
<message>
<location filename="../replacewidget.cpp" line="73"/>
<location filename="../replacewidget.cpp" line="96"/>
@@ -205,7 +205,7 @@ Author: Julián Moreno Patiño <julian at debian.org>
<location filename="../replacewidget.cpp" line="73"/>
--- a/trans/texmaker_gl.ts
+++ b/trans/texmaker_gl.ts
-@@ -1781,7 +1781,7 @@ with the default encoding setting</source>
+@@ -1664,7 +1664,7 @@ with the default encoding setting</sourc
<context>
<name>ReplaceDialog</name>
<message>
@@ -214,7 +214,7 @@ Author: Julián Moreno Patiño <julian at debian.org>
<translation type="obsolete">¿Reemprazar esta coincidencia?</translation>
</message>
<message>
-@@ -1929,7 +1929,7 @@ with the default encoding setting</source>
+@@ -1812,7 +1812,7 @@ with the default encoding setting</sourc
<message>
<location filename="../replacewidget.cpp" line="73"/>
<location filename="../replacewidget.cpp" line="96"/>
@@ -225,7 +225,7 @@ Author: Julián Moreno Patiño <julian at debian.org>
<message>
--- a/trans/texmaker_hu.ts
+++ b/trans/texmaker_hu.ts
-@@ -1775,7 +1775,7 @@ az alapértelmezett kódolási beállítással</translation>
+@@ -1729,7 +1729,7 @@ az alapértelmezett kódolási beállít
<message>
<location filename="../replacewidget.cpp" line="73"/>
<location filename="../replacewidget.cpp" line="96"/>
@@ -236,7 +236,7 @@ Author: Julián Moreno Patiño <julian at debian.org>
<message>
--- a/trans/texmaker_it.ts
+++ b/trans/texmaker_it.ts
-@@ -1946,7 +1946,7 @@ con le impostazioni di codifica di default</translation>
+@@ -1900,7 +1900,7 @@ con le impostazioni di codifica di defau
<translation type="obsolete">Indietro</translation>
</message>
<message>
@@ -245,7 +245,7 @@ Author: Julián Moreno Patiño <julian at debian.org>
<translation type="obsolete">Sostituisci questa volta?</translation>
</message>
<message>
-@@ -2050,7 +2050,7 @@ con le impostazioni di codifica di default</translation>
+@@ -2004,7 +2004,7 @@ con le impostazioni di codifica di defau
<message>
<location filename="../replacewidget.cpp" line="73"/>
<location filename="../replacewidget.cpp" line="96"/>
@@ -256,7 +256,7 @@ Author: Julián Moreno Patiño <julian at debian.org>
<message>
--- a/trans/texmaker_lv.ts
+++ b/trans/texmaker_lv.ts
-@@ -1712,7 +1712,7 @@ with the default encoding setting</source>
+@@ -1666,7 +1666,7 @@ with the default encoding setting</sourc
<message>
<location filename="../replacewidget.cpp" line="73"/>
<location filename="../replacewidget.cpp" line="96"/>
@@ -267,7 +267,7 @@ Author: Julián Moreno Patiño <julian at debian.org>
<message>
--- a/trans/texmaker_nl.ts
+++ b/trans/texmaker_nl.ts
-@@ -1945,7 +1945,7 @@ worden met de standaard encodeer instellingen</translation>
+@@ -1899,7 +1899,7 @@ worden met de standaard encodeer instell
<translation type="obsolete">Achterwaarts</translation>
</message>
<message>
@@ -276,7 +276,7 @@ Author: Julián Moreno Patiño <julian at debian.org>
<translation type="obsolete">Dit voorval vervangen ?</translation>
</message>
<message>
-@@ -2049,7 +2049,7 @@ worden met de standaard encodeer instellingen</translation>
+@@ -2003,7 +2003,7 @@ worden met de standaard encodeer instell
<message>
<location filename="../replacewidget.cpp" line="73"/>
<location filename="../replacewidget.cpp" line="96"/>
@@ -287,7 +287,7 @@ Author: Julián Moreno Patiño <julian at debian.org>
<message>
--- a/trans/texmaker_pl.ts
+++ b/trans/texmaker_pl.ts
-@@ -1955,7 +1955,7 @@ with the default encoding setting</source>
+@@ -1909,7 +1909,7 @@ with the default encoding setting</sourc
<translation type="obsolete">Wstecz</translation>
</message>
<message>
@@ -296,7 +296,7 @@ Author: Julián Moreno Patiño <julian at debian.org>
<translation type="obsolete">Zastąpić bieżące dopasowanie?</translation>
</message>
<message>
-@@ -2063,7 +2063,7 @@ with the default encoding setting</source>
+@@ -2017,7 +2017,7 @@ with the default encoding setting</sourc
<message>
<location filename="../replacewidget.cpp" line="73"/>
<location filename="../replacewidget.cpp" line="96"/>
@@ -307,7 +307,7 @@ Author: Julián Moreno Patiño <julian at debian.org>
<message>
--- a/trans/texmaker_pt.ts
+++ b/trans/texmaker_pt.ts
-@@ -1934,7 +1934,7 @@ com as configurações de descodificação padrão</translation>
+@@ -1872,7 +1872,7 @@ com as configurações de descodificaç�
<translation type="obsolete">Voltar</translation>
</message>
<message>
@@ -316,7 +316,7 @@ Author: Julián Moreno Patiño <julian at debian.org>
<translation type="obsolete">Substituir ocorrência?</translation>
</message>
<message>
-@@ -2038,7 +2038,7 @@ com as configurações de descodificação padrão</translation>
+@@ -1976,7 +1976,7 @@ com as configurações de descodificaç�
<message>
<location filename="../replacewidget.cpp" line="73"/>
<location filename="../replacewidget.cpp" line="96"/>
@@ -327,7 +327,7 @@ Author: Julián Moreno Patiño <julian at debian.org>
<message>
--- a/trans/texmaker_pt_BR.ts
+++ b/trans/texmaker_pt_BR.ts
-@@ -1938,7 +1938,7 @@ com as configurações de decodificação padrão</translation>
+@@ -1888,7 +1888,7 @@ com as configurações de decodificaçã
<translation type="obsolete">Voltar</translation>
</message>
<message>
@@ -336,7 +336,7 @@ Author: Julián Moreno Patiño <julian at debian.org>
<translation type="obsolete">Substituir ocorrência?</translation>
</message>
<message>
-@@ -2042,7 +2042,7 @@ com as configurações de decodificação padrão</translation>
+@@ -1992,7 +1992,7 @@ com as configurações de decodificaçã
<message>
<location filename="../replacewidget.cpp" line="73"/>
<location filename="../replacewidget.cpp" line="96"/>
@@ -347,7 +347,7 @@ Author: Julián Moreno Patiño <julian at debian.org>
<message>
--- a/trans/texmaker_ru.ts
+++ b/trans/texmaker_ru.ts
-@@ -1891,7 +1891,7 @@ with the default encoding setting</source>
+@@ -1790,7 +1790,7 @@ with the default encoding setting</sourc
<translation type="obsolete">Назад</translation>
</message>
<message>
@@ -356,7 +356,7 @@ Author: Julián Moreno Patiño <julian at debian.org>
<translation type="obsolete">Заменить это вхождение? </translation>
</message>
<message>
-@@ -1995,7 +1995,7 @@ with the default encoding setting</source>
+@@ -1894,7 +1894,7 @@ with the default encoding setting</sourc
<message>
<location filename="../replacewidget.cpp" line="73"/>
<location filename="../replacewidget.cpp" line="96"/>
@@ -367,7 +367,7 @@ Author: Julián Moreno Patiño <julian at debian.org>
<message>
--- a/trans/texmaker_se.ts
+++ b/trans/texmaker_se.ts
-@@ -1775,7 +1775,7 @@ med standardinställningarna för kodning</translation>
+@@ -1729,7 +1729,7 @@ med standardinställningarna för kodnin
<message>
<location filename="../replacewidget.cpp" line="73"/>
<location filename="../replacewidget.cpp" line="96"/>
@@ -378,7 +378,7 @@ Author: Julián Moreno Patiño <julian at debian.org>
<message>
--- a/trans/texmaker_sr.ts
+++ b/trans/texmaker_sr.ts
-@@ -1791,7 +1791,7 @@ with the default encoding setting</source>
+@@ -1685,7 +1685,7 @@ with the default encoding setting</sourc
<message>
<location filename="../replacewidget.cpp" line="73"/>
<location filename="../replacewidget.cpp" line="96"/>
@@ -389,7 +389,7 @@ Author: Julián Moreno Patiño <julian at debian.org>
<message>
--- a/trans/texmaker_uk.ts
+++ b/trans/texmaker_uk.ts
-@@ -1704,7 +1704,7 @@ with the default encoding setting</source>
+@@ -1658,7 +1658,7 @@ with the default encoding setting</sourc
<message>
<location filename="../replacewidget.cpp" line="73"/>
<location filename="../replacewidget.cpp" line="96"/>
@@ -400,7 +400,7 @@ Author: Julián Moreno Patiño <julian at debian.org>
<message>
--- a/trans/texmaker_vi_VN.ts
+++ b/trans/texmaker_vi_VN.ts
-@@ -1700,7 +1700,7 @@ with the default encoding setting</source>
+@@ -1583,7 +1583,7 @@ with the default encoding setting</sourc
<message>
<location filename="../replacewidget.cpp" line="73"/>
<location filename="../replacewidget.cpp" line="96"/>
@@ -411,7 +411,7 @@ Author: Julián Moreno Patiño <julian at debian.org>
<message>
--- a/trans/texmaker_zh_CN.ts
+++ b/trans/texmaker_zh_CN.ts
-@@ -1781,7 +1781,7 @@ with the default encoding setting</source>
+@@ -1735,7 +1735,7 @@ with the default encoding setting</sourc
<context>
<name>ReplaceDialog</name>
<message>
@@ -420,18 +420,18 @@ Author: Julián Moreno Patiño <julian at debian.org>
<translation type="obsolete">替换这个 ? </translation>
</message>
<message>
-@@ -1933,7 +1933,7 @@ with the default encoding setting</source>
+@@ -1887,7 +1887,7 @@ with the default encoding setting</sourc
<message>
<location filename="../replacewidget.cpp" line="73"/>
<location filename="../replacewidget.cpp" line="96"/>
- <source>Replace this occurence ? </source>
+ <source>Replace this occurrence ? </source>
- <translation>替换这个 ? </translation>
+ <translation>是否替换?</translation>
</message>
<message>
--- a/trans/texmaker_zh_TW.ts
+++ b/trans/texmaker_zh_TW.ts
-@@ -2055,7 +2055,7 @@ with the default encoding setting</source>
+@@ -1938,7 +1938,7 @@ with the default encoding setting</sourc
<translation type="obsolete">向後</translation>
</message>
<message>
@@ -440,7 +440,7 @@ Author: Julián Moreno Patiño <julian at debian.org>
<translation type="obsolete">替換這個事件？</translation>
</message>
<message>
-@@ -2159,7 +2159,7 @@ with the default encoding setting</source>
+@@ -2042,7 +2042,7 @@ with the default encoding setting</sourc
<message>
<location filename="../replacewidget.cpp" line="73"/>
<location filename="../replacewidget.cpp" line="96"/>
diff --git a/debian/patches/use-system-synctex.patch b/debian/patches/use-system-synctex.patch
index 14533cc..8ad99bf 100644
--- a/debian/patches/use-system-synctex.patch
+++ b/debian/patches/use-system-synctex.patch
@@ -2,45 +2,20 @@ Description: Use synctex provided by libsynctex-dev
Author: Sebastian Ramacher <sramacher at debian.org>
Last-Update: 2014-07-05
---- a/pdfviewer.h
-+++ b/pdfviewer.h
-@@ -39,7 +39,7 @@
- #include <QKeySequence>
-
- #include "documentview.h"
--#include "synctex_parser.h"
-+#include <synctex_parser.h>
- #include "browser.h"
-
-
--- a/pdfviewerwidget.h
+++ b/pdfviewerwidget.h
-@@ -40,7 +40,7 @@
- #include <QSplitter>
+@@ -38,7 +38,7 @@
+ #include "qpdfdocument.h"
#include "documentview.h"
-#include "synctex_parser.h"
+#include <synctex_parser.h>
#include "minisplitter.h"
- #include "browser.h"
+
--- a/texmaker.pro
+++ b/texmaker.pro
-@@ -19,11 +19,11 @@
- unix:!macx {
- contains( QT_VERSION, "^5.*" ) {
- CONFIG += link_pkgconfig
--PKGCONFIG = poppler-qt5
-+PKGCONFIG = poppler-qt5 synctex
- DEFINES += POPPLER24
- } else {
- CONFIG += link_pkgconfig
--PKGCONFIG = poppler-qt4
-+PKGCONFIG = poppler-qt4 synctex
- DETECTEDPOPPLER=$$system(pkg-config --modversion poppler)
- contains( DETECTEDPOPPLER, "^0.18.*" ){
- DEFINES += OLDPOPPLER
-@@ -89,8 +89,6 @@
+@@ -108,8 +108,6 @@ HEADERS += texmaker.h \
textblockselection.h \
scandialog.h \
exportdialog.h \
@@ -49,7 +24,7 @@ Last-Update: 2014-07-05
usertagslistwidget.h \
addtagdialog.h \
versiondialog.h \
-@@ -201,8 +199,6 @@
+@@ -493,8 +491,6 @@ SOURCES += main.cpp \
texdocdialog.cpp \
scandialog.cpp \
exportdialog.cpp \
@@ -58,3 +33,14 @@ Last-Update: 2014-07-05
usertagslistwidget.cpp \
addtagdialog.cpp \
versiondialog.cpp \
+--- a/pdfviewer.h
++++ b/pdfviewer.h
+@@ -37,7 +37,7 @@
+
+ #include "qpdfdocument.h"
+ #include "documentview.h"
+-#include "synctex_parser.h"
++#include <synctex_parser.h>
+
+
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/texmaker.git
More information about the debian-science-commits
mailing list