Attachment 876136 Details for Bug 1077937 – Use system qtiocompressor instead of bundled one

[patch] Use system qtiocompressor instead of bundled one

Use-system-qtiocompressor-instead-of-bundled-one.patch (text/plain), 7.31 KB, created by Ville Skyttä on 2014-03-18 21:57:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ville Skyttä

Created: 2014-03-18 21:57:22 UTC

Size: 7.31 KB

patch

obsolete

>From ce2c28b38c7764e60710968f00b70d3b2e757fc7 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
>Date: Tue, 18 Mar 2014 23:55:52 +0200
>Subject: [PATCH] Use system qtiocompressor instead of bundled one
>
>https://bugzilla.redhat.com/show_bug.cgi?id=1077937
>---
> cantata-1.2.2-system-qtiocompressor.patch | 123 ++++++++++++++++++++++++++++++
> cantata.spec                              |  11 ++-
> 2 files changed, 132 insertions(+), 2 deletions(-)
> create mode 100644 cantata-1.2.2-system-qtiocompressor.patch
>
>diff --git a/cantata-1.2.2-system-qtiocompressor.patch b/cantata-1.2.2-system-qtiocompressor.patch
>new file mode 100644
>index 0000000..c8799b4
>--- /dev/null
>+++ b/cantata-1.2.2-system-qtiocompressor.patch
>@@ -0,0 +1,123 @@
>+diff -up cantata-1.2.2/CMakeLists.txt~ cantata-1.2.2/CMakeLists.txt
>+--- cantata-1.2.2/CMakeLists.txt~	2014-03-18 22:58:11.867871608 +0200
>++++ cantata-1.2.2/CMakeLists.txt	2014-03-18 23:22:12.290305025 +0200
>+@@ -543,10 +543,9 @@ else (QJSON_FOUND)
>+     target_link_libraries(cantata qjson)
>+ endif (QJSON_FOUND)
>+ 
>+-add_subdirectory(3rdparty/qtiocompressor)
>+ add_subdirectory(icons)
>+ 
>+-target_link_libraries(cantata support qtiocompressor ${QTLIBS} ${ZLIB_LIBRARIES})
>++target_link_libraries(cantata support QtSolutions_IOCompressor-2.3 ${QTLIBS} ${ZLIB_LIBRARIES})
>+ include_directories(${QTINCLUDES} ${ZLIB_INCLUDE_DIRS})
>+ 
>+ if (TAGLIB_FOUND)
>+diff -up cantata-1.2.2/context/albumview.cpp~ cantata-1.2.2/context/albumview.cpp
>+--- cantata-1.2.2/context/albumview.cpp~	2013-12-14 17:57:49.000000000 +0200
>++++ cantata-1.2.2/context/albumview.cpp	2014-03-18 23:17:33.833465344 +0200
>+@@ -27,7 +27,7 @@
>+ #include "covers.h"
>+ #include "networkaccessmanager.h"
>+ #include "utils.h"
>+-#include "qtiocompressor/qtiocompressor.h"
>++#include <QtIOCompressor>
>+ #include "musiclibrarymodel.h"
>+ #include "contextengine.h"
>+ #include "textbrowser.h"
>+diff -up cantata-1.2.2/context/artistview.cpp~ cantata-1.2.2/context/artistview.cpp
>+--- cantata-1.2.2/context/artistview.cpp~	2013-12-14 17:57:49.000000000 +0200
>++++ cantata-1.2.2/context/artistview.cpp	2014-03-18 23:18:20.209441072 +0200
>+@@ -27,7 +27,7 @@
>+ #include "utils.h"
>+ #include "musiclibrarymodel.h"
>+ #include "networkaccessmanager.h"
>+-#include "qtiocompressor/qtiocompressor.h"
>++#include <QtIOCompressor>
>+ #include "textbrowser.h"
>+ #include "contextengine.h"
>+ #include "actioncollection.h"
>+diff -up cantata-1.2.2/context/wikipediasettings.cpp~ cantata-1.2.2/context/wikipediasettings.cpp
>+--- cantata-1.2.2/context/wikipediasettings.cpp~	2013-12-14 17:57:49.000000000 +0200
>++++ cantata-1.2.2/context/wikipediasettings.cpp	2014-03-18 23:17:24.025258756 +0200
>+@@ -28,7 +28,7 @@
>+ #include "icon.h"
>+ #include "spinner.h"
>+ #include "settings.h"
>+-#include "qtiocompressor/qtiocompressor.h"
>++#include <QtIOCompressor>
>+ #include "utils.h"
>+ #include "action.h"
>+ #include "thread.h"
>+diff -up cantata-1.2.2/models/musiclibraryitempodcast.cpp~ cantata-1.2.2/models/musiclibraryitempodcast.cpp
>+--- cantata-1.2.2/models/musiclibraryitempodcast.cpp~	2013-12-23 11:58:18.000000000 +0200
>++++ cantata-1.2.2/models/musiclibraryitempodcast.cpp	2014-03-18 23:18:10.498236891 +0200
>+@@ -30,7 +30,7 @@
>+ #include "onlineservice.h"
>+ #include "song.h"
>+ #include "icons.h"
>+-#include "qtiocompressor/qtiocompressor.h"
>++#include <QtIOCompressor>
>+ #include "utils.h"
>+ #include "covers.h"
>+ #include "rssparser.h"
>+diff -up cantata-1.2.2/models/musiclibraryitemroot.cpp~ cantata-1.2.2/models/musiclibraryitemroot.cpp
>+--- cantata-1.2.2/models/musiclibraryitemroot.cpp~	2013-12-14 17:57:49.000000000 +0200
>++++ cantata-1.2.2/models/musiclibraryitemroot.cpp	2014-03-18 23:17:00.536763662 +0200
>+@@ -32,7 +32,7 @@
>+ #include "mpdconnection.h"
>+ #include "song.h"
>+ #include "localize.h"
>+-#include "qtiocompressor/qtiocompressor.h"
>++#include <QtIOCompressor>
>+ #include "musicmodel.h"
>+ #include <QXmlStreamReader>
>+ #include <QXmlStreamWriter>
>+diff -up cantata-1.2.2/models/musiclibrarymodel.cpp~ cantata-1.2.2/models/musiclibrarymodel.cpp
>+--- cantata-1.2.2/models/musiclibrarymodel.cpp~	2013-12-14 17:57:49.000000000 +0200
>++++ cantata-1.2.2/models/musiclibrarymodel.cpp	2014-03-18 23:18:00.747031799 +0200
>+@@ -41,7 +41,7 @@
>+ #include "utils.h"
>+ #include "icons.h"
>+ #include "stdactions.h"
>+-#include "qtiocompressor/qtiocompressor.h"
>++#include <QtIOCompressor>
>+ #include <QCommonStyle>
>+ #include <QFile>
>+ #include <QTimer>
>+diff -up cantata-1.2.2/models/streamsmodel.cpp~ cantata-1.2.2/models/streamsmodel.cpp
>+--- cantata-1.2.2/models/streamsmodel.cpp~	2013-12-14 17:57:49.000000000 +0200
>++++ cantata-1.2.2/models/streamsmodel.cpp	2014-03-18 23:17:12.507016038 +0200
>+@@ -37,7 +37,7 @@
>+ #include "actioncollection.h"
>+ #include "digitallyimported.h"
>+ #include "qjson/parser.h"
>+-#include "qtiocompressor/qtiocompressor.h"
>++#include <QtIOCompressor>
>+ #include "utils.h"
>+ #include "config.h"
>+ #include <QModelIndex>
>+diff -up cantata-1.2.2/online/onlineservice.cpp~ cantata-1.2.2/online/onlineservice.cpp
>+--- cantata-1.2.2/online/onlineservice.cpp~	2013-12-14 17:57:50.000000000 +0200
>++++ cantata-1.2.2/online/onlineservice.cpp	2014-03-18 23:17:46.033722203 +0200
>+@@ -28,7 +28,7 @@
>+ #include "networkaccessmanager.h"
>+ #include "mpdparseutils.h"
>+ #include "covers.h"
>+-#include "qtiocompressor/qtiocompressor.h"
>++#include <QtIOCompressor>
>+ #include "thread.h"
>+ #include "settings.h"
>+ #include <QFile>
>+diff -up cantata-1.2.2/streams/tar.cpp~ cantata-1.2.2/streams/tar.cpp
>+--- cantata-1.2.2/streams/tar.cpp~	2013-12-14 17:57:50.000000000 +0200
>++++ cantata-1.2.2/streams/tar.cpp	2014-03-18 23:16:50.335548470 +0200
>+@@ -22,7 +22,7 @@
>+  */
>+ 
>+ #include "tar.h"
>+-#include "qtiocompressor/qtiocompressor.h"
>++#include <QtIOCompressor>
>+ 
>+ Tar::Tar(const QString &fileName)
>+     : file(fileName)
>diff --git a/cantata.spec b/cantata.spec
>index a5b88a1..e846e8c 100644
>--- a/cantata.spec
>+++ b/cantata.spec
>@@ -9,12 +9,13 @@
> Summary: Client for the Music Player Daemon (MPD)
> Name:    cantata
> Version: 1.2.2
>-Release: 1%{?dist}
>+Release: 2%{?dist}
> 
> License: GPLv2+
> #URL:    http://kde-apps.org/content/show.php/Cantata?content=147733
> URL:     http://code.google.com/p/cantata/
> Source0: http://cantata.googlecode.com/files/cantata-%{version}.tar.bz2
>+Patch0:  %{name}-1.2.2-system-qtiocompressor.patch
> 
> ## upstreamable patches
> # s|^#!/usr/bin/env perl|#!/usr/bin/perl|
>@@ -39,6 +40,7 @@ BuildRequires: pkgconfig(libmusicbrainz5)
> BuildRequires: pkgconfig(phonon)
> BuildRequires: pkgconfig(QJson)
> BuildRequires: pkgconfig(QtWebKit)
>+BuildRequires: qtiocompressor-devel
> 
> %description
> Cantata is a (yet another!) client for the music player daemon (MPD). 
>@@ -46,15 +48,17 @@ Cantata is a (yet another!) client for the music player daemon (MPD).
> 
> %prep
> %setup -q
>-
>+%patch0 -p1 -b .system-qtiocompressor
> %patch101 -p1 -b .perl_env
> %patch102 -p1 -b .kde4_includes
> %patch103 -p1 -b .libmusicbrainz5_cflags
>+rm -r 3rdparty
> 
> 
> %build
> mkdir -p %{_target_platform}
> pushd %{_target_platform}
>+CXXFLAGS="$RPM_OPT_FLAGS -I/usr/include/QtSolutions" # see bug 1077936
> %{cmake_kde4} \
>   -DENABLE_KDE:BOOL=%{?kde:ON}%{!?kde:OFF} \
>   -DENABLE_FFMPEG:BOOL=OFF \
>@@ -102,6 +106,9 @@ fi
> 
> 
> %changelog
>+* Tue Mar 18 2014 Ville SkyttÃ¤ <ville.skytta@iki.fi> - 1.2.2-2
>+- Use system qtiocompressor instead of bundled one
>+
> * Mon Jan 06 2014 Rex Dieter <rdieter@fedoraproject.org> 1.2.2-1
> - cantata-1.2.2 (#1048750)
> 
>-- 
>1.8.3.1

Actions: View | Diff

Attachments on bug 1077937: 876136