summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Palimaka <kensington@gentoo.org>2016-11-18 02:05:15 +1100
committerMichael Palimaka <kensington@gentoo.org>2016-11-18 02:05:25 +1100
commitd6f48839ef09fb0656512d323681705465d676c0 (patch)
treec8886914daece9488cbdd6b4ca457f145841b915 /x11-misc/qlipper
parentx11-drivers/xf86-video-ati: Removed old. (diff)
downloadgentoo-d6f48839ef09fb0656512d323681705465d676c0.tar.gz
gentoo-d6f48839ef09fb0656512d323681705465d676c0.tar.bz2
gentoo-d6f48839ef09fb0656512d323681705465d676c0.zip
x11-misc/qlipper: add patch to resolve build failure
Gentoo-bug: 599164 Package-Manager: portage-2.3.2
Diffstat (limited to 'x11-misc/qlipper')
-rw-r--r--x11-misc/qlipper/files/qlipper-5.0.0-build.patch54
-rw-r--r--x11-misc/qlipper/qlipper-5.0.0.ebuild2
2 files changed, 56 insertions, 0 deletions
diff --git a/x11-misc/qlipper/files/qlipper-5.0.0-build.patch b/x11-misc/qlipper/files/qlipper-5.0.0-build.patch
new file mode 100644
index 00000000000..20f6b35c56a
--- /dev/null
+++ b/x11-misc/qlipper/files/qlipper-5.0.0-build.patch
@@ -0,0 +1,54 @@
+From b3cb6a08c82deacb905459b66f16eda35f0c3779 Mon Sep 17 00:00:00 2001
+From: Michael Palimaka <kensington@gentoo.org>
+Date: Wed, 9 Nov 2016 21:42:08 +1100
+Subject: [PATCH] Fix build with ENABLE_NETWORK_CLIPBOARD_SHARING enabled.
+
+qlippernetwork.cpp expects network-related variables to be available if
+ENABLE_NETWORK_CLIPBOARD_SHARING is defined, but qlippernetwork.h defined those
+variables if ENABLE_NETWORK_CLIPBOARD_SHARING was *un*defined.
+
+This also adds a missing include that is no longer available transitively via
+QtNetwork/QUdpSocket.
+---
+ src/qlippernetwork.h | 4 ++--
+ src/qlippertypes.h | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/qlippernetwork.h b/src/qlippernetwork.h
+index 9163cf8..ce1ac9a 100644
+--- a/src/qlippernetwork.h
++++ b/src/qlippernetwork.h
+@@ -21,7 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
+ #define QLIPPERNETWORK_H
+
+ #include <QtCore/QObject>
+-#ifndef ENABLE_NETWORK_CLIPBOARD_SHARING
++#ifdef ENABLE_NETWORK_CLIPBOARD_SHARING
+ #include <QtNetwork/QUdpSocket>
+ #endif
+ #include "qlippertypes.h"
+@@ -38,7 +38,7 @@ public slots:
+ void sendData(const ClipboardContent &value);
+
+ private:
+-#ifndef ENABLE_NETWORK_CLIPBOARD_SHARING
++#ifdef ENABLE_NETWORK_CLIPBOARD_SHARING
+ QUdpSocket *m_socket;
+ QString m_id;
+ #endif
+diff --git a/src/qlippertypes.h b/src/qlippertypes.h
+index b55f0e1..c97c311 100644
+--- a/src/qlippertypes.h
++++ b/src/qlippertypes.h
+@@ -2,7 +2,7 @@
+ #define QLIPPERTYPES_H
+
+ #include <QMetaType>
+-
++#include <QHashIterator>
+
+ typedef QHash<QString,QByteArray> ClipboardContent;
+ typedef QHashIterator<QString,QByteArray> ClipboardContentIterator;
+--
+2.7.3
+
diff --git a/x11-misc/qlipper/qlipper-5.0.0.ebuild b/x11-misc/qlipper/qlipper-5.0.0.ebuild
index 8b231bb6049..542f3b51257 100644
--- a/x11-misc/qlipper/qlipper-5.0.0.ebuild
+++ b/x11-misc/qlipper/qlipper-5.0.0.ebuild
@@ -26,6 +26,8 @@ DEPEND="${RDEPEND}
dev-qt/linguist-tools:5
"
+PATCHES=( "${FILESDIR}/${P}-build.patch" )
+
pkg_preinst() {
gnome2_icon_savelist
}