1 |
commit: 2116b43fac2e1c0813ad053bcab6ad7c15ddf520 |
2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Nov 1 20:54:00 2016 +0000 |
4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Nov 1 20:54:00 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=2116b43f |
7 |
|
8 |
net-libs/jreen: Remove upstreamed patch |
9 |
|
10 |
Package-Manager: portage-2.3.2 |
11 |
|
12 |
net-libs/jreen/files/jreen-qt5.6.patch | 15 --------------- |
13 |
net-libs/jreen/jreen-9999.ebuild | 2 -- |
14 |
2 files changed, 17 deletions(-) |
15 |
|
16 |
diff --git a/net-libs/jreen/files/jreen-qt5.6.patch b/net-libs/jreen/files/jreen-qt5.6.patch |
17 |
deleted file mode 100644 |
18 |
index da6f085..0000000 |
19 |
--- a/net-libs/jreen/files/jreen-qt5.6.patch |
20 |
+++ /dev/null |
21 |
@@ -1,15 +0,0 @@ |
22 |
-Fix build with Qt 5.6 |
23 |
- |
24 |
-Gentoo-bug: 578912 |
25 |
- |
26 |
---- a/src/stanzaextension.h |
27 |
-+++ b/src/stanzaextension.h |
28 |
-@@ -28,7 +28,7 @@ |
29 |
- |
30 |
- #include <QObject> |
31 |
- #include <QSharedPointer> |
32 |
--#include <QMetaTypeId> |
33 |
-+#include <QMetaType> |
34 |
- #include "jreen.h" |
35 |
- |
36 |
- class QXmlStreamWriter; |
37 |
|
38 |
diff --git a/net-libs/jreen/jreen-9999.ebuild b/net-libs/jreen/jreen-9999.ebuild |
39 |
index 7f5a934..c3e0ec1 100644 |
40 |
--- a/net-libs/jreen/jreen-9999.ebuild |
41 |
+++ b/net-libs/jreen/jreen-9999.ebuild |
42 |
@@ -10,7 +10,6 @@ if [[ ${PV} != *9999* ]]; then |
43 |
else |
44 |
GIT_ECLASS="git-r3" |
45 |
EGIT_REPO_URI=( "https://github.com/euroelessar/${PN}" ) |
46 |
- KEYWORDS="" |
47 |
fi |
48 |
|
49 |
inherit cmake-utils multibuild ${GIT_ECLASS} |
50 |
@@ -40,7 +39,6 @@ DEPEND=" |
51 |
RDEPEND="${DEPEND}" |
52 |
|
53 |
DOCS=( AUTHORS ChangeLog README.md ) |
54 |
-PATCHES=( "${FILESDIR}/${PN}-qt5.6.patch" ) |
55 |
|
56 |
pkg_setup() { |
57 |
MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) ) |