[texmaker] Disbale system qtsingleapplication, for now

[Deji Akingunola]

commit ae7b2e9a4b3f90acecdf6310c7de42389a8884d2
Author: Deji Akingunola <dakingun at gmail.com>
Date:   Mon May 19 23:28:34 2014 -0400

    Disbale system qtsingleapplication, for now

 texmaker-fedora.patch |   56 +++++++-----------------------------------------
 texmaker.spec         |    9 ++++++-
 2 files changed, 16 insertions(+), 49 deletions(-)
---
diff --git a/texmaker-fedora.patch b/texmaker-fedora.patch
index 15394e7..f0f61be 100644
--- a/texmaker-fedora.patch
+++ b/texmaker-fedora.patch
@@ -49,15 +49,6 @@
 +}
 --- 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.*" ) {
@@ -72,7 +63,7 @@
  DETECTEDPOPPLER=$$system(pkg-config --modversion poppler)
  contains( DETECTEDPOPPLER, "^0.18.*" ){
  DEFINES += OLDPOPPLER
-@@ -96,29 +96,6 @@
+@@ -96,25 +96,6 @@
  	unicodedialog.h \
  	unicodeview.h \
  	quickbeamerdialog.h \
@@ -95,14 +86,10 @@
 -	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 \
-@@ -206,22 +183,6 @@
+ 	singleapp/qtlocalpeer.h \
+ 	singleapp/qtlockedfile.h \
+ 	singleapp/qtsingleapplication.h \
+@@ -206,18 +187,6 @@
  	unicodedialog.cpp \
  	unicodeview.cpp \
  	quickbeamerdialog.cpp \
@@ -118,24 +105,10 @@
 -	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 \
-@@ -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 @@
+	singleapp/qtlocalpeer.cpp \
+	singleapp/qtlockedfile.cpp \
+	singleapp/qtsingleapplication.cpp \
+@@ -429,40 +398,7 @@
  	locale/texmaker_se.qm \
  	locale/texmaker_ar.qm \
  	locale/texmaker_lv.qm \
@@ -177,17 +150,6 @@
  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-05-19 21:17:38.642291054 -0400
 @@ -13,7 +13,7 @@
diff --git a/texmaker.spec b/texmaker.spec
index fbdef22..fdff937 100644
--- a/texmaker.spec
+++ b/texmaker.spec
@@ -9,7 +9,8 @@ URL:		http://www.xm1math.net/texmaker/
 Source:		http://www.xm1math.net/texmaker/texmaker-%{version}.tar.bz2
 BuildRequires:	qt5-qtbase-devel, qt5-qtwebkit-devel, qt5-qtscript-devel
 BuildRequires:	hunspell-devel, poppler-qt5-devel
-BuildRequires:	desktop-file-utils, qtsingleapplication-devel
+BuildRequires:	desktop-file-utils
+#BuildRequires:	qtsingleapplication-devel
 Requires:	tetex-latex, tetex-dvipost, tetex-xdvi
 # Patch to use default Fedora's document viewer, system's hunspell and 
 # system qtsingleapplication instead of bundled ones
@@ -24,7 +25,8 @@ license
 %prep
 %setup -q
 %patch0 -p0 -b .fedora
-rm -r hunspell singleapp
+rm -r hunspell
+#rm -r singleapp
  
 %build
 export QTDIR=%{_libdir}/qt5
@@ -80,6 +82,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %changelog
 * Mon May 19 2014 Deji Akingunola <dakingun at gmail.com> - 4.2-1
+- Disable system qtsingleapplication for now, as it doesn't support Qt5
+
+* 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)