[texmaker] Update to version 4.2
Deji Akingunola
deji at fedoraproject.org
Tue May 20 01:49:19 UTC 2014
commit 079766e9fa5d0ff949611edcd034227bbd7957d3
Author: Deji Akingunola <dakingun at gmail.com>
Date: Mon May 19 21:49:18 2014 -0400
Update to version 4.2
- Use system qtsingleapplication instead of bundled one (Patch by Ville Skyttä,BZ #1091069)
.gitignore | 1 +
sources | 2 +-
texmaker-fedora.patch | 75 ++++++++++++++++++++++++++++++++++++------------
texmaker.spec | 20 +++++++++----
4 files changed, 72 insertions(+), 26 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e31bdca..ff0054c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ texmaker-2.0.tar.bz2
/texmaker-4.0.2.tar.bz2
/texmaker-4.0.3.tar.bz2
/texmaker-4.1.1.tar.bz2
+/texmaker-4.2.tar.bz2
diff --git a/sources b/sources
index ea19010..1be19ea 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0b26fe9e29b37eeaf98e568a096d2dad texmaker-4.1.1.tar.bz2
+9297da00423e341b76295f208a91096c texmaker-4.2.tar.bz2
diff --git a/texmaker-fedora.patch b/texmaker-fedora.patch
index b37ccb0..15394e7 100644
--- a/texmaker-fedora.patch
+++ b/texmaker-fedora.patch
@@ -1,6 +1,6 @@
---- texmaker.cpp 2014-01-01 11:32:50.000000000 -0500
-+++ texmaker.cpp.new 2014-03-04 10:41:14.411617385 -0500
-@@ -4247,28 +4247,9 @@
+--- texmaker.cpp 2014-04-26 11:28:43.000000000 -0400
++++ texmaker.cpp.new 2014-05-19 21:21:35.222967218 -0400
+@@ -4267,27 +4267,9 @@
metapost_command=config->value("Tools/Metapost","mpost --interaction nonstopmode ").toString();
// xdvi %.dvi -sourceposition @:%.tex
// kdvi "file:%.dvi#src:@ %.tex"
@@ -25,14 +25,13 @@
- 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();
-@@ -4497,7 +4478,7 @@
+
+@@ -4533,7 +4515,7 @@
#ifdef DEBIAN_SPELLDIR
QString dicDir=PREFIX"/share/myspell/dicts/";
#else
@@ -41,15 +40,24 @@
#endif
#endif
-@@ -11369,4 +11350,4 @@
+@@ -11405,4 +11387,4 @@
UpdateBibliography();
}
}
-}
\ No newline at end of file
+}
---- texmaker.pro 2014-01-02 09:38:49.000000000 -0500
-+++ texmaker.pro.new 2014-03-04 10:46:12.155450902 -0500
+--- texmaker.pro 2014-04-24 10:15:57.000000000 -0400
++++ texmaker.pro.new 2014-05-19 21:10:57.758514263 -0400
+@@ -9,7 +9,7 @@
+ QT += xml webkit network script
+ }
+
+-CONFIG += qt warn_off release
++CONFIG += qt warn_off release qtsingleapplication
+ TEXMAKERVERSION=4.2
+ DEFINES += TEXMAKERVERSION=\\\"$${TEXMAKERVERSION}\\\"
+ DEFINES += HAVE_SPLASH
@@ -19,11 +19,11 @@
unix:!macx {
contains( QT_VERSION, "^5.*" ) {
@@ -64,7 +72,7 @@
DETECTEDPOPPLER=$$system(pkg-config --modversion poppler)
contains( DETECTEDPOPPLER, "^0.18.*" ){
DEFINES += OLDPOPPLER
-@@ -96,25 +96,6 @@
+@@ -96,29 +96,6 @@
unicodedialog.h \
unicodeview.h \
quickbeamerdialog.h \
@@ -87,10 +95,14 @@
- hunspell/hunzip.hxx \
- hunspell/replist.hxx \
- hunspell/w_char.hxx \
- singleapp/qtlocalpeer.h \
- singleapp/qtlockedfile.h \
- singleapp/qtsingleapplication.h \
-@@ -206,18 +187,6 @@
+- singleapp/qtlocalpeer.h \
+- singleapp/qtlockedfile.h \
+- singleapp/qtsingleapplication.h \
+- singleapp/qtsinglecoreapplication.h \
+ encodingprober/CharDistribution.h \
+ encodingprober/ChineseGroupProber.h \
+ encodingprober/ctype_test_p.h \
+@@ -206,22 +183,6 @@
unicodedialog.cpp \
unicodeview.cpp \
quickbeamerdialog.cpp \
@@ -106,10 +118,24 @@
- hunspell/filemgr.cxx \
- hunspell/replist.cxx \
- hunspell/hunzip.cxx \
- singleapp/qtlocalpeer.cpp \
- singleapp/qtlockedfile.cpp \
- singleapp/qtsingleapplication.cpp \
-@@ -428,40 +397,7 @@
+- singleapp/qtlocalpeer.cpp \
+- singleapp/qtlockedfile.cpp \
+- singleapp/qtsingleapplication.cpp \
+- singleapp/qtsinglecoreapplication.cpp \
+ encodingprober/CharDistribution.cpp \
+ encodingprober/ChineseGroupProber.cpp \
+ encodingprober/JapaneseGroupProber.cpp \
+@@ -331,8 +292,7 @@
+
+ INSTALLS = target
+ HEADERS += x11fontdialog.h
+-SOURCES += x11fontdialog.cpp \
+- singleapp/qtlockedfile_unix.cpp
++SOURCES += x11fontdialog.cpp
+ FORMS += x11fontdialog.ui
+
+ utilities.files = doc/doc1.png \
+@@ -429,40 +389,7 @@
locale/texmaker_se.qm \
locale/texmaker_ar.qm \
locale/texmaker_lv.qm \
@@ -151,8 +177,19 @@
INSTALLS += utilities
desktop.files = utilities/texmaker.desktop
+--- texmakerapp.h 2014-01-01 05:00:58.000000000 -0500
++++ texmakerapp.h.new 2014-05-19 21:13:44.420669002 -0400
+@@ -15,7 +15,7 @@
+
+ #include <QTranslator>
+ #include "texmaker.h"
+-#include "singleapp/qtsingleapplication.h"
++#include <QtSingleApplication>
+
+ class TexmakerApp : public QtSingleApplication
+ {
--- spellerdialog.h 2011-02-25 14:19:34.000000000 -0500
-+++ spellerdialog.h.new 2014-03-04 10:47:47.469036006 -0500
++++ spellerdialog.h.new 2014-05-19 21:17:38.642291054 -0400
@@ -13,7 +13,7 @@
#include "ui_spellerdialog.h"
diff --git a/texmaker.spec b/texmaker.spec
index 3303280..76da667 100644
--- a/texmaker.spec
+++ b/texmaker.spec
@@ -1,16 +1,18 @@
Summary: LaTeX editor
Name: texmaker
-Version: 4.1.1
-Release: 2%{?dist}
+Version: 4.2
+Release: 1%{?dist}
Epoch: 1
License: GPLv2+
Group: Applications/Publishing
URL: http://www.xm1math.net/texmaker/
Source: http://www.xm1math.net/texmaker/texmaker-%{version}.tar.bz2
-BuildRequires: qt4-devel, qt4-webkit-devel, hunspell-devel, poppler-qt4-devel
-BuildRequires: desktop-file-utils
+BuildRequires: qt5-qtbase-devel, qt5-qtwebkit-devel
+BuildRequires: hunspell-devel, poppler-qt5-devel
+BuildRequires: desktop-file-utils, qtsingleapplication-devel
Requires: tetex-latex, tetex-dvipost, tetex-xdvi
-# Patch to use default Fedora's document viewer and system's hunspell
+# Patch to use default Fedora's document viewer, system's hunspell and
+# system qtsingleapplication instead of bundled ones
Patch0: %{name}-fedora.patch
%description
@@ -21,7 +23,8 @@ license
%prep
%setup -q
-%patch0 -p0 -b .tools
+%patch0 -p0 -b .fedora
+rm -r hunspell singleapp
%build
export QTDIR=%{_libdir}/qt4
@@ -76,6 +79,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/pixmaps/texmaker.png
%changelog
+* Mon May 19 2014 Deji Akingunola <dakingun at gmail.com> - 4.2-1
+- Update to version 4.2
+- Switch to building with Qt5
+- Use system qtsingleapplication instead of bundled one (Patch by Ville Skyttä,BZ #1091069)
+
* Sat Mar 08 2014 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.1.1-2
- Rebuild against fixed qt to fix -debuginfo (#1074041)
More information about the scm-commits
mailing list