Attachment 890225 Details for Bug 1091709 – 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.01 KB, created by Ville Skyttä on 2014-04-27 13:23:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ville Skyttä

Created: 2014-04-27 13:23:06 UTC

Size: 3.01 KB

patch

obsolete

>From 90a70c6867437e7e3a65ddf2218b65e4212b517b Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
>Date: Sun, 27 Apr 2014 16:10:51 +0300
>Subject: [PATCH] Use system qtsingleapplication instead of bundled one
>
>---
> focuswriter-1.4.4-system-qtsingleapp.patch | 31 ++++++++++++++++++++++++++++++
> focuswriter.spec                           | 10 ++++++++--
> 2 files changed, 39 insertions(+), 2 deletions(-)
> create mode 100644 focuswriter-1.4.4-system-qtsingleapp.patch
>
>diff --git a/focuswriter-1.4.4-system-qtsingleapp.patch b/focuswriter-1.4.4-system-qtsingleapp.patch
>new file mode 100644
>index 0000000..f6c3008
>--- /dev/null
>+++ b/focuswriter-1.4.4-system-qtsingleapp.patch
>@@ -0,0 +1,31 @@
>+diff --git a/focuswriter.pro b/focuswriter.pro
>+index 506b428..c29175a 100644
>+--- a/focuswriter.pro
>++++ b/focuswriter.pro
>+@@ -75,7 +75,7 @@ macx {
>+ 		src/sdl/sound.cpp
>+ }
>+ 
>+-INCLUDEPATH += src/qtsingleapplication
>++CONFIG += qtsingleapplication
>+ 
>+ HEADERS += src/action_manager.h \
>+ 	src/alert.h \
>+@@ -119,8 +119,6 @@ HEADERS += src/action_manager.h \
>+ 	src/timer_display.h \
>+ 	src/timer_manager.h \
>+ 	src/window.h \
>+-	src/qtsingleapplication/qtsingleapplication.h \
>+-	src/qtsingleapplication/qtlocalpeer.h \
>+ 	src/rtf/reader.h \
>+ 	src/rtf/tokenizer.h \
>+ 	src/rtf/writer.h
>+@@ -166,8 +164,6 @@ SOURCES += src/action_manager.cpp \
>+ 	src/timer_display.cpp \
>+ 	src/timer_manager.cpp \
>+ 	src/window.cpp \
>+-	src/qtsingleapplication/qtsingleapplication.cpp \
>+-	src/qtsingleapplication/qtlocalpeer.cpp \
>+ 	src/rtf/reader.cpp \
>+ 	src/rtf/tokenizer.cpp \
>+ 	src/rtf/writer.cpp
>diff --git a/focuswriter.spec b/focuswriter.spec
>index 523b0ad..3d73248 100644
>--- a/focuswriter.spec
>+++ b/focuswriter.spec
>@@ -1,16 +1,17 @@
> Name:           focuswriter
> Version:        1.4.4
>-Release:        1%{?dist}
>+Release:        2%{?dist}
> Summary:        A fullscreen, distraction-free writing program
> Group:          Applications/Editors
> License:        GPLv3+
> URL:            http://gottcode.org/%{name}/
> Source0:        http://gottcode.org/%{name}/%{name}-%{version}-src.tar.bz2
>+Patch0:         %{name}-1.4.4-system-qtsingleapp.patch
> BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
> Requires:       enchant
> BuildRequires:  libao-devel libzip-devel
> BuildRequires:  enchant-devel desktop-file-utils
>-BuildRequires:  qt-devel
>+BuildRequires:  qt-devel qtsingleapplication-devel
> 
> %description
> A fullscreen, distraction-free writing program. You can customize your
>@@ -23,6 +24,8 @@ document, so that you can immediately jump back in.
> 
> %prep
> %setup -q
>+%patch0 -p1
>+rm -r src/qtsingleapplication
> 
> %build
> qmake-qt4 PREFIX=%{_prefix}
>@@ -74,6 +77,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
> %{_datadir}/pixmaps/%{name}.xpm
> 
> %changelog
>+* Sun Apr 27 2014 Ville SkyttÃ¤ <ville.skytta@iki.fi> - 1.4.4-2
>+- Use system qtsingleapplication instead of bundled one
>+
> * Thu Jan  9 2014 Jean-Francois Saucier <jsaucier@gmail.com> - 1.4.4-1
> - Update to the new upstream version
> 
>-- 
>1.9.0

Actions: View | Diff

Attachments on bug 1091709: 890225