Attachment 886663 Details for Bug 1088029 – 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.05 KB, created by Ville Skyttä on 2014-04-15 21:03:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ville Skyttä

Created: 2014-04-15 21:03:32 UTC

Size: 3.05 KB

patch

obsolete

>From f3649c480c2566b279f492e105d6e6965a323b68 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:01:04 +0300
>Subject: [PATCH] Use system qtsingleapplication instead of bundled one
>
>---
> pokerth-1.0.1-system-qtsingleapp.patch | 30 ++++++++++++++++++++++++++++++
> pokerth.spec                           |  9 ++++++++-
> 2 files changed, 38 insertions(+), 1 deletion(-)
> create mode 100644 pokerth-1.0.1-system-qtsingleapp.patch
>
>diff --git a/pokerth-1.0.1-system-qtsingleapp.patch b/pokerth-1.0.1-system-qtsingleapp.patch
>new file mode 100644
>index 0000000..009496a
>--- /dev/null
>+++ b/pokerth-1.0.1-system-qtsingleapp.patch
>@@ -0,0 +1,30 @@
>+diff -up PokerTH-1.0.1-src/pokerth_game.pro~ PokerTH-1.0.1-src/pokerth_game.pro
>+--- PokerTH-1.0.1-src/pokerth_game.pro~	2014-04-15 23:27:44.709027307 +0300
>++++ PokerTH-1.0.1-src/pokerth_game.pro	2014-04-15 23:56:07.524187532 +0300
>+@@ -10,13 +10,13 @@ isEmpty( PREFIX ){
>+ TEMPLATE = app
>+ CODECFORSRC = UTF-8
>+ CONFIG += qt \
>++	qtsingleapplication \
>+ 	thread \
>+ 	embed_manifest_exe \
>+ 	exceptions \
>+ 	rtti \
>+ 	stl \
>+ 	warn_on
>+-include(src/third_party/qtsingleapplication/qtsingleapplication.pri)
>+ QT += sql
>+ UI_DIR = uics
>+ MOC_DIR = mocs
>+diff -up PokerTH-1.0.1-src/src/pokerth.cpp~ PokerTH-1.0.1-src/src/pokerth.cpp
>+--- PokerTH-1.0.1-src/src/pokerth.cpp~	2013-04-07 15:04:27.017209721 +0300
>++++ PokerTH-1.0.1-src/src/pokerth.cpp	2014-04-15 23:56:44.168872338 +0300
>+@@ -49,7 +49,7 @@
>+ #include "startsplash.h"
>+ #include "game_defs.h"
>+ #include <net/socket_startup.h>
>+-#include <third_party/qtsingleapplication/qtsingleapplication.h>
>++#include <QtSingleApplication>
>+ 
>+ #ifdef _MSC_VER
>+ #ifdef _DEBUG
>diff --git a/pokerth.spec b/pokerth.spec
>index 8c58064..ec3de32 100644
>--- a/pokerth.spec
>+++ b/pokerth.spec
>@@ -1,6 +1,6 @@
> Name:           pokerth
> Version:        1.0.1
>-Release:        3%{?dist}
>+Release:        4%{?dist}
> Summary:        A Texas-Holdem poker game
> Group:          Amusements/Games
> # Has a typical OpenSSL linking exception
>@@ -10,9 +10,11 @@ Source0:        http://downloads.sourceforge.net/%{name}/PokerTH-%{version}-src.
> 
> Patch0:         fix-libircclient-include.patch
> Patch1:         pokerth-0.8.3-gnutls-only.patch
>+Patch2:         pokerth-1.0.1-system-qtsingleapp.patch
> 
> BuildRequires:  desktop-file-utils
> BuildRequires:  qt4-devel
>+BuildRequires:  qtsingleapplication-devel
> BuildRequires:  zlib-devel
> BuildRequires:  libcurl-devel
> BuildRequires:  gnutls-devel
>@@ -40,6 +42,8 @@ is available for Linux, Windows, and MacOSX.
> %setup -q -n PokerTH-%{version}-src
> %patch0 -p1
> #%patch1 -p1
>+%patch2 -p1
>+rm -r src/third_party/qtsingleapplication
> 
> # Fix permissions
> chmod 644 ChangeLog
>@@ -85,6 +89,9 @@ rm -rf %{buildroot}
> %{_datadir}/pixmaps/%{name}.png
> 
> %changelog
>+* Tue Apr 15 2014 Ville SkyttÃ¤ <ville.skytta@iki.fi> - 1.0.1-4
>+- Use system qtsingleapplication instead of bundled one
>+
> * Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.1-3
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
> 
>-- 
>1.9.0

Actions: View | Diff

Attachments on bug 1088029: 886663