Attachment 886665 Details for Bug 1088035 – Use system qtsingleapplication instead of bundled one

[patch] Use system qtsingleapplication instead of bundled one

Use-system-qtsingleapplication-instead-of-bundled-.patch (text/plain), 2.73 KB, created by Ville Skyttä on 2014-04-15 21:18:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ville Skyttä

Created: 2014-04-15 21:18:27 UTC

Size: 2.73 KB

patch

obsolete

>From 472f417136b73623129a74c18286d71ce39d42bb Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
>Date: Wed, 16 Apr 2014 00:17:28 +0300
>Subject: [PATCH] Use system qtsingleapplication instead of bundled one
>
>---
> goldendict-system-qtsingleapp.patch | 17 +++++++++++++++++
> goldendict.spec                     |  9 ++++++++-
> 2 files changed, 25 insertions(+), 1 deletion(-)
> create mode 100644 goldendict-system-qtsingleapp.patch
>
>diff --git a/goldendict-system-qtsingleapp.patch b/goldendict-system-qtsingleapp.patch
>new file mode 100644
>index 0000000..a6b46bf
>--- /dev/null
>+++ b/goldendict-system-qtsingleapp.patch
>@@ -0,0 +1,17 @@
>+diff -up goldendict-3bd078debb7ae506e91e5d47f88f34ab847167c3/goldendict.pro~ goldendict-3bd078debb7ae506e91e5d47f88f34ab847167c3/goldendict.pro
>+--- goldendict-3bd078debb7ae506e91e5d47f88f34ab847167c3/goldendict.pro~	2014-01-13 15:32:58.000000000 +0200
>++++ goldendict-3bd078debb7ae506e91e5d47f88f34ab847167c3/goldendict.pro	2014-04-16 00:12:33.539849300 +0300
>+@@ -21,6 +21,7 @@ QT += xml
>+ QT += network
>+ QT += svg
>+ CONFIG += exceptions \
>++    qtsingleapplication \
>+     rtti \
>+     stl
>+ OBJECTS_DIR = build
>+@@ -503,5 +504,4 @@ TS_OUT = $$TRANSLATIONS
>+ TS_OUT ~= s/.ts/.qm/g
>+ PRE_TARGETDEPS += $$TS_OUT
>+ 
>+-include( qtsingleapplication/src/qtsingleapplication.pri )
>+ 
>diff --git a/goldendict.spec b/goldendict.spec
>index 6b6349e..a8bca9f 100644
>--- a/goldendict.spec
>+++ b/goldendict.spec
>@@ -3,12 +3,13 @@
> 
> Name:		goldendict
> Version:	1.5
>-Release:	0.2.RC1%{?dist}
>+Release:	0.3.RC1%{?dist}
> Summary:	A feature-rich dictionary lookup program
> Group:		Applications/System
> License:	GPLv3+
> URL:		http://goldendict.org
> Source0:	https://github.com/%{owner}/%{name}/archive/%{commit}/%{name}-%{commit}.tar.gz
>+Patch0:		goldendict-system-qtsingleapp.patch
> 
> BuildRequires:	qt-devel
> BuildRequires:	libXtst-devel
>@@ -19,6 +20,7 @@ BuildRequires:	phonon-devel
> BuildRequires:  qt-webkit-devel
> BuildRequires:  bzip2-devel
> BuildRequires:  lzo-devel
>+BuildRequires:  qtsingleapplication-devel
> 
> %description
> Goldendict is a feature-rich dictionary lookup program.
>@@ -30,6 +32,8 @@ Scan popup functionality.
> 
> %prep
> %setup -q -n %{name}-%{commit}
>+%patch0 -p1
>+rm -r qtsingleapplication
> 
> %build
> %qmake_qt4 PREFIX=%{_prefix} DISABLE_INTERNAL_PLAYER=1
>@@ -50,6 +54,9 @@ desktop-file-install %{buildroot}%{_datadir}/applications/%{name}.desktop
> %{_datadir}/goldendict/locale/*.qm
> 
> %changelog
>+* Tue Apr 15 2014 Ville SkyttÃ¤ <ville.skytta@iki.fi> - 1.5-0.3.RC1
>+- Use system qtsingleapplication instead of bundled one
>+
> * Fri Jan 17 2014 Mosaab Alzoubi <moceap@hotmail.com> - 1.5-0.2.RC1
> - Use %%qmake_qt4 as suggestion by Christopheâr Mengâ (âcickumqt/gmail.comâ)
> - Remove repeated BR.
>-- 
>1.9.0

Actions: View | Diff

Attachments on bug 1088035: 886665