From 494189c89bd1d36299b871a1d09024639ea35926 Mon Sep 17 00:00:00 2001
From: Mukundan Ragavan <nonamedotc(a)gmail.com>
Date: Sat, 31 Oct 2015 18:57:27 -0400
Subject: Update to version 4.5
---
texmaker-4.3-fedora.patch | 155 ----------------------------------------------
texmaker-4.5-fedora.patch | 82 ++++++++++++++++++++++++
texmaker-fedora.patch | 82 ------------------------
texmaker.spec | 9 ++-
4 files changed, 88 insertions(+), 240 deletions(-)
delete mode 100644 texmaker-4.3-fedora.patch
create mode 100644 texmaker-4.5-fedora.patch
delete mode 100644 texmaker-fedora.patch
diff --git a/texmaker-4.3-fedora.patch b/texmaker-4.3-fedora.patch
deleted file mode 100644
index 3f80343..0000000
--- a/texmaker-4.3-fedora.patch
+++ /dev/null
@@ -1,155 +0,0 @@
---- texmaker.cpp.orig 2014-08-09 17:17:23.115696932 -0500
-+++ texmaker.cpp 2014-08-09 17:21:46.720833849 -0500
-@@ -4292,28 +4292,10 @@
- metapost_command=config->value("Tools/Metapost","mpost --interaction
nonstopmode ").toString();
- // xdvi %.dvi -sourceposition @:%.tex
- // kdvi "file:%.dvi#src:@ %.tex"
--switch (desktop_env)
-- {
-- case 1:
-- {
-- viewdvi_command=config->value("Tools/Dvi","evince
%.dvi").toString();
-- viewps_command=config->value("Tools/Ps","evince
%.ps").toString();
-- viewpdf_command=config->value("Tools/Pdf","evince
%.pdf").toString();
-- }break;
-- case 2:
-- {
-- viewdvi_command=config->value("Tools/Dvi","kdvi
%.dvi").toString();
-- viewps_command=config->value("Tools/Ps","kghostview
%.ps").toString();
-- viewpdf_command=config->value("Tools/Pdf","kpdf
%.pdf").toString();
-- }break;
-- case 3:
-- {
-- viewdvi_command=config->value("Tools/Dvi","okular
%.dvi").toString();
-- viewps_command=config->value("Tools/Ps","okular
%.ps").toString();
-- viewpdf_command=config->value("Tools/Pdf","okular
%.pdf").toString();
-- }break;
-- }
-
-+viewdvi_command=config->value("Tools/Dvi","xdg-open
%.dvi").toString();
-+viewps_command=config->value("Tools/Ps","xdg-open
%.ps").toString();
-+viewpdf_command=config->value("Tools/Pdf","xdg-open
%.pdf").toString();
-
-
-
ghostscript_command=config->value("Tools/Ghostscript","gs").toString();
-@@ -4558,7 +4540,7 @@
- #ifdef DEBIAN_SPELLDIR
- QString dicDir=PREFIX"/share/myspell/dicts/";
- #else
--QString dicDir=PREFIX"/share/texmaker/";
-+QString dicDir=PREFIX"/share/myspell/";
- #endif
- #endif
-
---- texmaker.pro.orig 2014-08-09 17:17:11.812687942 -0500
-+++ texmaker.pro 2014-08-09 17:19:12.207780926 -0500
-@@ -19,11 +19,11 @@
- unix:!macx {
- contains( QT_VERSION, "^5.*" ) {
- CONFIG += link_pkgconfig
--PKGCONFIG = poppler-qt5
-+PKGCONFIG = poppler-qt5 hunspell
- DEFINES += POPPLER24
- } else {
- CONFIG += link_pkgconfig
--PKGCONFIG = poppler-qt4
-+PKGCONFIG = poppler-qt4 hunspell
- DETECTEDPOPPLER=$$system(pkg-config --modversion poppler)
- contains( DETECTEDPOPPLER, "^0.18.*" ){
- DEFINES += OLDPOPPLER
-@@ -96,25 +96,6 @@
- unicodedialog.h \
- unicodeview.h \
- quickbeamerdialog.h \
-- hunspell/affentry.hxx \
-- hunspell/affixmgr.hxx \
-- hunspell/atypes.hxx \
-- hunspell/baseaffix.hxx \
-- hunspell/csutil.hxx \
-- hunspell/dictmgr.hxx \
-- hunspell/hashmgr.hxx \
-- hunspell/htypes.hxx \
-- hunspell/hunspell.hxx \
-- hunspell/hunspell.h \
-- hunspell/langnum.hxx \
-- hunspell/license.hunspell \
-- hunspell/phonet.hxx \
-- hunspell/suggestmgr.hxx \
-- hunspell/license.myspell \
-- hunspell/filemgr.hxx \
-- hunspell/hunzip.hxx \
-- hunspell/replist.hxx \
-- hunspell/w_char.hxx \
- singleapp/qtlocalpeer.h \
- singleapp/qtlockedfile.h \
- singleapp/qtsingleapplication.h \
-@@ -206,18 +187,6 @@
- unicodedialog.cpp \
- unicodeview.cpp \
- quickbeamerdialog.cpp \
-- hunspell/affentry.cxx \
-- hunspell/affixmgr.cxx \
-- hunspell/csutil.cxx \
-- hunspell/dictmgr.cxx \
-- hunspell/hashmgr.cxx \
-- hunspell/hunspell.cxx \
-- hunspell/phonet.cxx \
-- hunspell/suggestmgr.cxx \
-- hunspell/utf_info.cxx \
-- hunspell/filemgr.cxx \
-- hunspell/replist.cxx \
-- hunspell/hunzip.cxx \
- singleapp/qtlocalpeer.cpp \
- singleapp/qtlockedfile.cpp \
- singleapp/qtsingleapplication.cpp \
-@@ -430,39 +399,6 @@
- locale/texmaker_ar.qm \
- locale/texmaker_lv.qm \
- locale/texmaker_uk.qm \
-- dictionaries/nl_NL.aff \
-- dictionaries/nl_NL.dic \
-- dictionaries/de_DE.aff \
-- dictionaries/de_DE.dic \
-- dictionaries/en_GB.aff \
-- dictionaries/en_GB.dic \
-- dictionaries/en_US.aff \
-- dictionaries/en_US.dic \
-- dictionaries/es_ES.aff \
-- dictionaries/es_ES.dic \
-- dictionaries/fr_FR.aff \
-- dictionaries/fr_FR.dic \
-- dictionaries/it_IT.aff \
-- dictionaries/it_IT.dic \
-- dictionaries/it_IT_README.txt \
-- dictionaries/hu_HU.aff \
-- dictionaries/hu_HU.dic \
-- dictionaries/README_hu_HU.txt \
-- dictionaries/cs_CZ.aff \
-- dictionaries/cs_CZ.dic \
-- dictionaries/pl_PL.aff \
-- dictionaries/pl_PL.dic \
-- dictionaries/pt_PT.aff \
-- dictionaries/pt_PT.dic \
-- dictionaries/ca_CA.aff \
-- dictionaries/ca_CA.dic \
-- dictionaries/README_pt_PT.txt \
-- dictionaries/README_pl.txt \
-- dictionaries/README_cs_CZ.txt \
-- dictionaries/README_de_DE_frami.txt \
-- dictionaries/README_DIC_fr_FR.txt \
-- dictionaries/README_es_ES.txt \
-- dictionaries/README_en_US.txt
- INSTALLS += utilities
-
- desktop.files = utilities/texmaker.desktop
---- spellerdialog.h.orig 2014-08-09 17:17:36.312706931 -0500
-+++ spellerdialog.h 2014-08-09 17:20:07.778817495 -0500
-@@ -13,7 +13,7 @@
-
- #include "ui_spellerdialog.h"
- #include "latexeditor.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
-
- #include <QTextCursor>
-
diff --git a/texmaker-4.5-fedora.patch b/texmaker-4.5-fedora.patch
new file mode 100644
index 0000000..4894d05
--- /dev/null
+++ b/texmaker-4.5-fedora.patch
@@ -0,0 +1,82 @@
+--- texmaker.pro.orig 2015-10-31 18:46:29.341291879 -0400
++++ texmaker.pro 2015-10-31 18:49:15.178743971 -0400
+@@ -19,11 +19,14 @@
+ unix:!macx {
+ contains( QT_VERSION, "^5.*" ) {
+ CONFIG += link_pkgconfig
+-PKGCONFIG = poppler-qt5
++PKGCONFIG = poppler-qt5 hunspell
++
++CONFIG += qtsingleapplication
++
+ DEFINES += POPPLER24
+ } else {
+ CONFIG += link_pkgconfig
+-PKGCONFIG = poppler-qt4
++PKGCONFIG = poppler-qt4 hunspell
+ DETECTEDPOPPLER=$$system(pkg-config --modversion poppler)
+ contains( DETECTEDPOPPLER, "^0.18.*" ){
+ DEFINES += OLDPOPPLER
+@@ -98,29 +101,6 @@
+ unicodeview.h \
+ quickbeamerdialog.h \
+ svnhelper.h \
+- hunspell/affentry.hxx \
+- hunspell/affixmgr.hxx \
+- hunspell/atypes.hxx \
+- hunspell/baseaffix.hxx \
+- hunspell/csutil.hxx \
+- hunspell/dictmgr.hxx \
+- hunspell/hashmgr.hxx \
+- hunspell/htypes.hxx \
+- hunspell/hunspell.hxx \
+- hunspell/hunspell.h \
+- hunspell/langnum.hxx \
+- hunspell/license.hunspell \
+- hunspell/phonet.hxx \
+- hunspell/suggestmgr.hxx \
+- hunspell/license.myspell \
+- hunspell/filemgr.hxx \
+- hunspell/hunzip.hxx \
+- hunspell/replist.hxx \
+- hunspell/w_char.hxx \
+- singleapp/qtlocalpeer.h \
+- singleapp/qtlockedfile.h \
+- singleapp/qtsingleapplication.h \
+- singleapp/qtsinglecoreapplication.h \
+ encodingprober/CharDistribution.h \
+ encodingprober/ChineseGroupProber.h \
+ encodingprober/ctype_test_p.h \
+@@ -210,22 +190,6 @@
+ unicodeview.cpp \
+ quickbeamerdialog.cpp \
+ svnhelper.cpp \
+- hunspell/affentry.cxx \
+- hunspell/affixmgr.cxx \
+- hunspell/csutil.cxx \
+- hunspell/dictmgr.cxx \
+- hunspell/hashmgr.cxx \
+- hunspell/hunspell.cxx \
+- hunspell/phonet.cxx \
+- hunspell/suggestmgr.cxx \
+- hunspell/utf_info.cxx \
+- hunspell/filemgr.cxx \
+- hunspell/replist.cxx \
+- hunspell/hunzip.cxx \
+- singleapp/qtlocalpeer.cpp \
+- singleapp/qtlockedfile.cpp \
+- singleapp/qtsingleapplication.cpp \
+- singleapp/qtsinglecoreapplication.cpp \
+ encodingprober/CharDistribution.cpp \
+ encodingprober/ChineseGroupProber.cpp \
+ encodingprober/JapaneseGroupProber.cpp \
+@@ -336,8 +300,7 @@
+
+ INSTALLS = target
+ HEADERS += x11fontdialog.h
+-SOURCES += x11fontdialog.cpp \
+- singleapp/qtlockedfile_unix.cpp
++SOURCES += x11fontdialog.cpp
+ FORMS += x11fontdialog.ui
+
+ utilities.files = doc/doc1.png \
diff --git a/texmaker-fedora.patch b/texmaker-fedora.patch
deleted file mode 100644
index 7ce1e63..0000000
--- a/texmaker-fedora.patch
+++ /dev/null
@@ -1,82 +0,0 @@
---- texmaker.pro.orig 2014-12-06 15:29:22.391001886 -0600
-+++ texmaker.pro 2014-12-06 15:36:57.933482657 -0600
-@@ -19,11 +19,14 @@
- unix:!macx {
- contains( QT_VERSION, "^5.*" ) {
- CONFIG += link_pkgconfig
--PKGCONFIG = poppler-qt5
-+PKGCONFIG = poppler-qt5 hunspell
-+
-+CONFIG += qtsingleapplication
-+
- DEFINES += POPPLER24
- } else {
- CONFIG += link_pkgconfig
--PKGCONFIG = poppler-qt4
-+PKGCONFIG = poppler-qt4 hunspell
- DETECTEDPOPPLER=$$system(pkg-config --modversion poppler)
- contains( DETECTEDPOPPLER, "^0.18.*" ){
- DEFINES += OLDPOPPLER
-@@ -97,29 +100,6 @@
- unicodedialog.h \
- unicodeview.h \
- quickbeamerdialog.h \
-- hunspell/affentry.hxx \
-- hunspell/affixmgr.hxx \
-- hunspell/atypes.hxx \
-- hunspell/baseaffix.hxx \
-- hunspell/csutil.hxx \
-- hunspell/dictmgr.hxx \
-- hunspell/hashmgr.hxx \
-- hunspell/htypes.hxx \
-- hunspell/hunspell.hxx \
-- hunspell/hunspell.h \
-- hunspell/langnum.hxx \
-- hunspell/license.hunspell \
-- hunspell/phonet.hxx \
-- hunspell/suggestmgr.hxx \
-- hunspell/license.myspell \
-- hunspell/filemgr.hxx \
-- hunspell/hunzip.hxx \
-- hunspell/replist.hxx \
-- hunspell/w_char.hxx \
-- singleapp/qtlocalpeer.h \
-- singleapp/qtlockedfile.h \
-- singleapp/qtsingleapplication.h \
-- singleapp/qtsinglecoreapplication.h \
- encodingprober/CharDistribution.h \
- encodingprober/ChineseGroupProber.h \
- encodingprober/ctype_test_p.h \
-@@ -208,22 +188,6 @@
- unicodedialog.cpp \
- unicodeview.cpp \
- quickbeamerdialog.cpp \
-- hunspell/affentry.cxx \
-- hunspell/affixmgr.cxx \
-- hunspell/csutil.cxx \
-- hunspell/dictmgr.cxx \
-- hunspell/hashmgr.cxx \
-- hunspell/hunspell.cxx \
-- hunspell/phonet.cxx \
-- hunspell/suggestmgr.cxx \
-- hunspell/utf_info.cxx \
-- hunspell/filemgr.cxx \
-- hunspell/replist.cxx \
-- hunspell/hunzip.cxx \
-- singleapp/qtlocalpeer.cpp \
-- singleapp/qtlockedfile.cpp \
-- singleapp/qtsingleapplication.cpp \
-- singleapp/qtsinglecoreapplication.cpp \
- encodingprober/CharDistribution.cpp \
- encodingprober/ChineseGroupProber.cpp \
- encodingprober/JapaneseGroupProber.cpp \
-@@ -334,8 +298,7 @@
-
- INSTALLS = target
- HEADERS += x11fontdialog.h
--SOURCES += x11fontdialog.cpp \
-- singleapp/qtlockedfile_unix.cpp
-+SOURCES += x11fontdialog.cpp
- FORMS += x11fontdialog.ui
-
- utilities.files = doc/doc1.png \
diff --git a/texmaker.spec b/texmaker.spec
index ee89436..b4e4814 100644
--- a/texmaker.spec
+++ b/texmaker.spec
@@ -1,7 +1,7 @@
Summary: LaTeX editor
Name: texmaker
-Version: 4.4.1
-Release: 5%{?dist}
+Version: 4.5
+Release: 1%{?dist}
Epoch: 1
License: GPLv2+
Group: Applications/Publishing
@@ -20,7 +20,7 @@ Requires: tetex-latex, tetex-dvipost, tetex-xdvi
# Patches to use default Fedora's document viewer, system's hunspell and
# system qtsingleapplication instead of bundled ones
-Patch0: %{name}-fedora.patch
+Patch0: %{name}-%{version}-fedora.patch
Patch1: unbundle-qtsingleapplication.patch
Patch2: %{name}-viewfiles.patch
@@ -96,6 +96,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/texmaker/
%changelog
+* Sat Oct 31 2015 Mukundan Ragavan <nonamedotc(a)fedoraproject.org> - 1:4.5-1
+- Update to version 4.5
+
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1:4.4.1-5
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
--
cgit v0.11.2
http://pkgs.fedoraproject.org/cgit/texmaker.git/commit/?h=f23&id=4941...