Attachment 876572 Details for Bug 1078502 – Use system qxt instead of bundled one

[patch] Use system qxt instead of bundled one

Use-system-qxt-instead-of-bundled-one.patch (text/plain), 3.47 KB, created by Ville Skyttä on 2014-03-19 19:25:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ville Skyttä

Created: 2014-03-19 19:25:00 UTC

Size: 3.47 KB

patch

obsolete

>From 5f17e47e7dd2a7e926473e603e8397da90108162 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
>Date: Wed, 19 Mar 2014 21:23:45 +0200
>Subject: [PATCH] Use system qxt instead of bundled one
>
>https://bugzilla.redhat.com/show_bug.cgi?id=1078502
>---
> tomahawk-0.7.0-system-qxt.patch | 34 ++++++++++++++++++++++++++++++++++
> tomahawk.spec                   |  9 ++++++++-
> 2 files changed, 42 insertions(+), 1 deletion(-)
> create mode 100644 tomahawk-0.7.0-system-qxt.patch
>
>diff --git a/tomahawk-0.7.0-system-qxt.patch b/tomahawk-0.7.0-system-qxt.patch
>new file mode 100644
>index 0000000..db81b56
>--- /dev/null
>+++ b/tomahawk-0.7.0-system-qxt.patch
>@@ -0,0 +1,34 @@
>+diff -up tomahawk-0.7.0/CMakeLists.txt~ tomahawk-0.7.0/CMakeLists.txt
>+--- tomahawk-0.7.0/CMakeLists.txt~	2013-05-01 22:26:27.000000000 +0300
>++++ tomahawk-0.7.0/CMakeLists.txt	2014-03-19 21:16:49.670242533 +0200
>+@@ -240,8 +240,8 @@ ENDIF( WIN32 )
>+ 
>+ #TODO: support external qxt
>+ set(QXTWEB_FOUND TRUE)
>+-set(QXTWEB_LIBRARIES qxtweb-standalone)
>+-set(QXTWEB_INCLUDE_DIRS ${THIRDPARTY_DIR}/qxt/qxtweb-standalone/web ${THIRDPARTY_DIR}/qxt/qxtweb-standalone/network ${THIRDPARTY_DIR}/qxt/qxtweb-standalone/core ${CMAKE_CURRENT_BINARY_DIR})
>++set(QXTWEB_LIBRARIES QxtWeb)
>++set(QXTWEB_INCLUDE_DIRS /usr/include/QxtCore ${CMAKE_CURRENT_BINARY_DIR})
>+ 
>+ ### libportfwd
>+ set(LIBPORTFWD_INCLUDE_DIR ${THIRDPARTY_DIR}/libportfwd/include)
>+diff -up tomahawk-0.7.0/src/TomahawkApp.h~ tomahawk-0.7.0/src/TomahawkApp.h
>+--- tomahawk-0.7.0/src/TomahawkApp.h~	2013-05-01 22:26:27.000000000 +0300
>++++ tomahawk-0.7.0/src/TomahawkApp.h	2014-03-19 21:13:15.527701327 +0200
>+@@ -32,7 +32,7 @@
>+ #include "config.h"
>+ 
>+ #include <QxtWeb/QxtHttpServerConnector>
>+-#include <QxtWeb/HttpSessionManager>
>++#include <QxtWeb/QxtHttpSessionManager>
>+ 
>+ #include <QRegExp>
>+ #include <QFile>
>+diff -up tomahawk-0.7.0/thirdparty/CMakeLists.txt~ tomahawk-0.7.0/thirdparty/CMakeLists.txt
>+--- tomahawk-0.7.0/thirdparty/CMakeLists.txt~	2013-05-01 22:26:27.000000000 +0300
>++++ tomahawk-0.7.0/thirdparty/CMakeLists.txt	2014-03-19 20:59:57.105134408 +0200
>+@@ -1,4 +1,3 @@
>+-ADD_SUBDIRECTORY( qxt )
>+ IF( WITH_BREAKPAD )
>+     ADD_SUBDIRECTORY( breakpad )
>+ ENDIF()
>diff --git a/tomahawk.spec b/tomahawk.spec
>index 5030d1c..07e4c39 100644
>--- a/tomahawk.spec
>+++ b/tomahawk.spec
>@@ -5,12 +5,13 @@
> 
> Name:    tomahawk
> Version: 0.7.0
>-Release: 5%{?dist}
>+Release: 6%{?dist}
> Summary: The Social Media Player
> 
> License: GPLv2+
> URL:     http://tomahawk-player.org/
> Source0: http://download.tomahawk-player.org/tomahawk-%{version}%{?pre}.tar.bz2
>+Patch0:  %{name}-0.7.0-system-qxt.patch
> 
> BuildRequires: boost-devel
> BuildRequires: kdelibs4-devel
>@@ -27,6 +28,7 @@ BuildRequires: pkgconfig(QJson) >= 0.8.1
> BuildRequires: pkgconfig(taglib)
> BuildRequires: quazip-devel
> BuildRequires: qtweetlib-devel >= 0.4
>+BuildRequires: libqxt-devel
> 
> Requires: %{name}-libs%{?_isa} = %{version}-%{release}
> %global libechonest_version %(pkg-config --modversion libechonest 2>/dev/null || echo 1.1.7)
>@@ -65,6 +67,8 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release}
> 
> %prep
> %setup -q -n tomahawk-%{version}%{?pre}
>+%patch0 -p1
>+rm -r thirdparty/qxt
> 
> 
> %build
>@@ -133,6 +137,9 @@ fi
> 
> 
> %changelog
>+* Wed Mar 19 2014 Ville SkyttÃ¤ <ville.skytta@iki.fi> - 0.7.0-6
>+- Use system qxt instead of bundled one
>+
> * Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7.0-5
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
> 
>-- 
>1.8.3.1

Actions: View | Diff

Attachments on bug 1078502: 876572