Attachment 889409 Details for Bug 1091069 – Use system qtsingleapplication instead of bundled one

[patch] Use system qtsingleapplication instead of bundled one

Use-system-qtsingleapplication-instead-of-bundled-.patch (text/plain), 3.94 KB, created by Ville Skyttä on 2014-04-24 19:01:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ville Skyttä

Created: 2014-04-24 19:01:13 UTC

Size: 3.94 KB

patch

obsolete

>From 5ad6bdc09fb3e4f3c2a2621d349c4a52a46d151f Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
>Date: Thu, 24 Apr 2014 21:59:35 +0300
>Subject: [PATCH] Use system qtsingleapplication instead of bundled one
>
>---
> texmaker-4.1.1-system-qtsingleapp.patch | 56 +++++++++++++++++++++++++++++++++
> texmaker.spec                           | 10 ++++--
> 2 files changed, 64 insertions(+), 2 deletions(-)
> create mode 100644 texmaker-4.1.1-system-qtsingleapp.patch
>
>diff --git a/texmaker-4.1.1-system-qtsingleapp.patch b/texmaker-4.1.1-system-qtsingleapp.patch
>new file mode 100644
>index 0000000..770efc5
>--- /dev/null
>+++ b/texmaker-4.1.1-system-qtsingleapp.patch
>@@ -0,0 +1,56 @@
>+diff -up texmaker-4.1.1/texmaker.pro~ texmaker-4.1.1/texmaker.pro
>+--- texmaker-4.1.1/texmaker.pro~	2014-04-24 20:45:50.700879166 +0300
>++++ texmaker-4.1.1/texmaker.pro	2014-04-24 20:49:43.332532127 +0300
>+@@ -9,7 +9,7 @@ QT += xml webkitwidgets network widgets
>+ QT += xml webkit network
>+ }
>+ 
>+-CONFIG	+= qt warn_off release
>++CONFIG	+= qt warn_off release qtsingleapplication
>+ TEXMAKERVERSION=4.1.1
>+ DEFINES += TEXMAKERVERSION=\\\"$${TEXMAKERVERSION}\\\"
>+ DEFINES += HAVE_SPLASH
>+@@ -96,10 +96,6 @@ HEADERS	+= texmaker.h \
>+ 	unicodedialog.h \
>+ 	unicodeview.h \
>+ 	quickbeamerdialog.h \
>+-	singleapp/qtlocalpeer.h \
>+-	singleapp/qtlockedfile.h \
>+-	singleapp/qtsingleapplication.h \
>+-	singleapp/qtsinglecoreapplication.h \
>+ 	encodingprober/CharDistribution.h \
>+ 	encodingprober/ChineseGroupProber.h \
>+ 	encodingprober/ctype_test_p.h \
>+@@ -187,10 +183,6 @@ SOURCES	+= main.cpp \
>+ 	unicodedialog.cpp \
>+ 	unicodeview.cpp \
>+ 	quickbeamerdialog.cpp \
>+-	singleapp/qtlocalpeer.cpp \
>+-	singleapp/qtlockedfile.cpp \
>+-	singleapp/qtsingleapplication.cpp \
>+-	singleapp/qtsinglecoreapplication.cpp \
>+ 	encodingprober/CharDistribution.cpp \
>+ 	encodingprober/ChineseGroupProber.cpp \
>+ 	encodingprober/JapaneseGroupProber.cpp \
>+@@ -300,8 +292,7 @@ icon.path = $${ICONDIR}
>+ 
>+ INSTALLS = target
>+ HEADERS	+= x11fontdialog.h 
>+-SOURCES	+= x11fontdialog.cpp \
>+-	  singleapp/qtlockedfile_unix.cpp
>++SOURCES	+= x11fontdialog.cpp
>+ FORMS += x11fontdialog.ui
>+ 
>+ utilities.files = doc/doc1.png \
>+diff -up texmaker-4.1.1/texmakerapp.h~ texmaker-4.1.1/texmakerapp.h
>+--- texmaker-4.1.1/texmakerapp.h~	2014-01-01 12:00:58.000000000 +0200
>++++ texmaker-4.1.1/texmakerapp.h	2014-04-24 21:56:17.228237116 +0300
>+@@ -15,7 +15,7 @@
>+ 
>+ #include <QTranslator>
>+ #include "texmaker.h"
>+-#include "singleapp/qtsingleapplication.h"
>++#include <QtSingleApplication>
>+ 
>+ class TexmakerApp : public QtSingleApplication
>+ {
>diff --git a/texmaker.spec b/texmaker.spec
>index 3303280..ff1267a 100644
>--- a/texmaker.spec
>+++ b/texmaker.spec
>@@ -1,17 +1,18 @@
> Summary:	LaTeX editor
> Name:		texmaker
> Version:	4.1.1
>-Release:	2%{?dist}
>+Release:	3%{?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:	desktop-file-utils, qtsingleapplication-devel
> Requires:	tetex-latex, tetex-dvipost, tetex-xdvi
> # Patch to use default Fedora's document viewer and system's hunspell
> Patch0:		%{name}-fedora.patch
>+Patch1:		%{name}-4.1.1-system-qtsingleapp.patch
> 
> %description
> Texmaker is a program, that integrates many tools needed to develop 
>@@ -22,6 +23,8 @@ license
> %prep
> %setup -q
> %patch0 -p0 -b .tools
>+%patch1 -p1 -b .system-qtsingleapp
>+rm -r singleapp
>  
> %build
> export QTDIR=%{_libdir}/qt4
>@@ -76,6 +79,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
> %{_datadir}/pixmaps/texmaker.png
> 
> %changelog
>+* Thu Apr 24 2014 Ville SkyttÃ¤ <ville.skytta@iki.fi> - 1:4.1.1-3
>+- Use system qtsingleapplication instead of bundled one
>+
> * Sat Mar 08 2014 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.1.1-2
> - Rebuild against fixed qt to fix -debuginfo (#1074041)
> 
>-- 
>1.9.0

Actions: View | Diff

Attachments on bug 1091069: 889409