summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /media-sound/tomahawk/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'media-sound/tomahawk/files')
-rw-r--r--media-sound/tomahawk/files/tomahawk-0.8.4-qt55.patch34
1 files changed, 34 insertions, 0 deletions
diff --git a/media-sound/tomahawk/files/tomahawk-0.8.4-qt55.patch b/media-sound/tomahawk/files/tomahawk-0.8.4-qt55.patch
new file mode 100644
index 000000000000..10b71c07c518
--- /dev/null
+++ b/media-sound/tomahawk/files/tomahawk-0.8.4-qt55.patch
@@ -0,0 +1,34 @@
+From 50e77ce0db45e9c876eba3d8cc6491f62a5de882 Mon Sep 17 00:00:00 2001
+From: Takahiro Hashimoto <kenya888@gmail.com>
+Date: Mon, 22 Jun 2015 14:33:23 +0900
+Subject: [PATCH] fix compilation error with Qt 5.5
+
+---
+ src/libtomahawk/network/acl/AclRegistry.cpp | 1 +
+ src/libtomahawk/utils/TomahawkCache.h | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/src/libtomahawk/network/acl/AclRegistry.cpp b/src/libtomahawk/network/acl/AclRegistry.cpp
+index b177d19..3bc5056 100644
+--- a/src/libtomahawk/network/acl/AclRegistry.cpp
++++ b/src/libtomahawk/network/acl/AclRegistry.cpp
+@@ -21,6 +21,7 @@
+
+ #include <QThread>
+ #include <QVariant>
++#include <QDataStream>
+
+ #include "utils/Logger.h"
+
+diff --git a/src/libtomahawk/utils/TomahawkCache.h b/src/libtomahawk/utils/TomahawkCache.h
+index b7c3245..6a4aadd 100644
+--- a/src/libtomahawk/utils/TomahawkCache.h
++++ b/src/libtomahawk/utils/TomahawkCache.h
+@@ -27,6 +27,7 @@
+ #include <QObject>
+ #include <QTimer>
+ #include <QDir>
++#include <QDataStream>
+
+ namespace TomahawkUtils
+ {