diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2014-08-10 05:17:06 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2014-08-10 05:17:06 +0000 |
commit | 4f63d5629e35b932244bad4facf8d983f18d67e8 (patch) | |
tree | e1720eee05cf56c77fb38939e04a0bb07490e213 /net-p2p/transmission/files | |
parent | Detect & skip shell scripts (e.g. coreutils built w/USE=multicall), and add a... (diff) | |
download | gentoo-2-4f63d5629e35b932244bad4facf8d983f18d67e8.tar.gz gentoo-2-4f63d5629e35b932244bad4facf8d983f18d67e8.tar.bz2 gentoo-2-4f63d5629e35b932244bad4facf8d983f18d67e8.zip |
old
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'net-p2p/transmission/files')
-rw-r--r-- | net-p2p/transmission/files/transmission-2.82-qt4.patch | 70 |
1 files changed, 0 insertions, 70 deletions
diff --git a/net-p2p/transmission/files/transmission-2.82-qt4.patch b/net-p2p/transmission/files/transmission-2.82-qt4.patch deleted file mode 100644 index 5754b36874bd..000000000000 --- a/net-p2p/transmission/files/transmission-2.82-qt4.patch +++ /dev/null @@ -1,70 +0,0 @@ -Restore Qt 4.x support because Qt 5.x is not in Portage yet and 2.82 is a good stabilization target, see: - -http://bugs.gentoo.org/485038 - ---- qt/qtr.pro -+++ qt/qtr.pro -@@ -12,9 +12,13 @@ - man.files = transmission-qt.1 - - CONFIG += qt thread debug link_pkgconfig --QT += network dbus widgets -+QT += network dbus - PKGCONFIG = fontconfig libcurl openssl libevent - -+greaterThan(QT_MAJOR_VERSION, 4) { -+ QT += widgets -+} -+ - TRANSMISSION_TOP = .. - - include(config.pri) ---- qt/favicon.cc -+++ qt/favicon.cc -@@ -14,8 +14,13 @@ - #include <QNetworkAccessManager> - #include <QNetworkReply> - #include <QNetworkRequest> --#include <QStandardPaths> - -+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) -+ #include <QDesktopServices> -+#else -+ #include <QStandardPaths> -+#endif -+ - #include "favicon.h" - - /*** -@@ -40,7 +45,13 @@ - QString - Favicons :: getCacheDir( ) - { -- const QString base = QStandardPaths::writableLocation (QStandardPaths::CacheLocation); -+ const QString base = -+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) -+ QDesktopServices::storageLocation( QDesktopServices::CacheLocation ); -+#else -+ QStandardPaths::writableLocation( QStandardPaths::CacheLocation ); -+#endif -+ - return QDir( base ).absoluteFilePath( "favicons" ); - } - ---- qt/file-tree.cc -+++ qt/file-tree.cc -@@ -885,7 +885,12 @@ - for (int i=0; i<NUM_COLUMNS; ++i) - { - setColumnHidden (i, (i<FIRST_VISIBLE_COLUMN) || (LAST_VISIBLE_COLUMN<i)); -+ -+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) -+ header()->setResizeMode(i, QHeaderView::Interactive); -+#else - header()->setSectionResizeMode(i, QHeaderView::Interactive); -+#endif - } - - connect (this, SIGNAL(clicked(const QModelIndex&)), - ------------------------------------------------------------------------- |