1 |
commit: 6a17d15c8e2b78dd3f659c444cce1f35aa2a1ef2 |
2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Oct 29 12:06:31 2015 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Oct 29 12:12:05 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a17d15c |
7 |
|
8 |
x11-mics/kaqaz: revision bump |
9 |
|
10 |
* Fix build with Qt 5.5 |
11 |
* Unbundle dev-qt/qtsingleapplication |
12 |
* Add missing dependencies |
13 |
|
14 |
Package-Manager: portage-2.2.20.1 |
15 |
|
16 |
x11-misc/kaqaz/files/kaqaz-1.2.0-qt55.patch | 14 ++++++ |
17 |
.../kaqaz-1.2.0-unbundle-qtsingleapplication.patch | 43 ++++++++++++++++++ |
18 |
x11-misc/kaqaz/kaqaz-1.2.0-r1.ebuild | 53 ++++++++++++++++++++++ |
19 |
3 files changed, 110 insertions(+) |
20 |
|
21 |
diff --git a/x11-misc/kaqaz/files/kaqaz-1.2.0-qt55.patch b/x11-misc/kaqaz/files/kaqaz-1.2.0-qt55.patch |
22 |
new file mode 100644 |
23 |
index 0000000..f7e13f6 |
24 |
--- /dev/null |
25 |
+++ b/x11-misc/kaqaz/files/kaqaz-1.2.0-qt55.patch |
26 |
@@ -0,0 +1,14 @@ |
27 |
+Fix build with Qt 5.5. |
28 |
+ |
29 |
+Gentoo-bug: 563678 |
30 |
+ |
31 |
+--- databasedatatypes.h |
32 |
++++ databasedatatypes.h |
33 |
+@@ -23,6 +23,7 @@ |
34 |
+ #include <QColor> |
35 |
+ #include <QStringList> |
36 |
+ #include <QGeoCoordinate> |
37 |
++#include <QObject> |
38 |
+ |
39 |
+ class Enums : public QObject |
40 |
+ { |
41 |
|
42 |
diff --git a/x11-misc/kaqaz/files/kaqaz-1.2.0-unbundle-qtsingleapplication.patch b/x11-misc/kaqaz/files/kaqaz-1.2.0-unbundle-qtsingleapplication.patch |
43 |
new file mode 100644 |
44 |
index 0000000..0168916 |
45 |
--- /dev/null |
46 |
+++ b/x11-misc/kaqaz/files/kaqaz-1.2.0-unbundle-qtsingleapplication.patch |
47 |
@@ -0,0 +1,43 @@ |
48 |
+Use system copy of qtsingleapplication. |
49 |
+ |
50 |
+--- sialantools/sialantools.pri |
51 |
++++ sialantools/sialantools.pri |
52 |
+@@ -1,4 +1,5 @@ |
53 |
+ QT += qml quick |
54 |
++CONFIG += qtsingleapplication |
55 |
+ |
56 |
+ android { |
57 |
+ manifest.source = android-build |
58 |
+@@ -24,20 +25,10 @@ |
59 |
+ |
60 |
+ HEADERS += \ |
61 |
+ sialantools/sialanmimeapps.h \ |
62 |
+- sialantools/qtsingleapplication/qtsinglecoreapplication.h \ |
63 |
+- sialantools/qtsingleapplication/qtsingleapplication.h \ |
64 |
+- sialantools/qtsingleapplication/qtlockedfile.h \ |
65 |
+- sialantools/qtsingleapplication/qtlocalpeer.h |
66 |
+ |
67 |
+ SOURCES += \ |
68 |
+ sialantools/sialanmimeapps.cpp \ |
69 |
+- sialantools/qtsingleapplication/qtsinglecoreapplication.cpp \ |
70 |
+- sialantools/qtsingleapplication/qtsingleapplication.cpp \ |
71 |
+- sialantools/qtsingleapplication/qtlockedfile.cpp \ |
72 |
+- sialantools/qtsingleapplication/qtlocalpeer.cpp |
73 |
+ |
74 |
+- win32: SOURCES += sialantools/qtsingleapplication/qtlockedfile_win.cpp |
75 |
+- unix: SOURCES += sialantools/qtsingleapplication/qtlockedfile_unix.cpp |
76 |
+ } |
77 |
+ } |
78 |
+ } |
79 |
+ |
80 |
+--- sialantools/sialanapplication.h |
81 |
++++ sialantools/sialanapplication.h |
82 |
+@@ -22,7 +22,7 @@ |
83 |
+ #include "sialan_macros.h" |
84 |
+ |
85 |
+ #ifdef DESKTOP_DEVICE |
86 |
+-#include "qtsingleapplication/qtsingleapplication.h" |
87 |
++#include "qtsingleapplication.h" |
88 |
+ class INHERIT_QAPP : public QtSingleApplication |
89 |
+ { |
90 |
+ public: |
91 |
|
92 |
diff --git a/x11-misc/kaqaz/kaqaz-1.2.0-r1.ebuild b/x11-misc/kaqaz/kaqaz-1.2.0-r1.ebuild |
93 |
new file mode 100644 |
94 |
index 0000000..f4a21dd |
95 |
--- /dev/null |
96 |
+++ b/x11-misc/kaqaz/kaqaz-1.2.0-r1.ebuild |
97 |
@@ -0,0 +1,53 @@ |
98 |
+# Copyright 1999-2015 Gentoo Foundation |
99 |
+# Distributed under the terms of the GNU General Public License v2 |
100 |
+# $Id$ |
101 |
+ |
102 |
+EAPI=5 |
103 |
+inherit eutils qmake-utils |
104 |
+ |
105 |
+DESCRIPTION="Modern note manager" |
106 |
+HOMEPAGE="http://labs.sialan.org/projects/kaqaz" |
107 |
+if [[ ${PV} = *9999* ]]; then |
108 |
+ inherit git-r3 |
109 |
+ EGIT_REPO_URI="https://github.com/sialan-labs/kaqaz.git" |
110 |
+ KEYWORDS="" |
111 |
+else |
112 |
+ SRC_URI="https://github.com/sialan-labs/kaqaz/archive/${PV}.tar.gz -> ${P}.tar.gz" |
113 |
+ KEYWORDS="~amd64 ~x86" |
114 |
+fi |
115 |
+ |
116 |
+LICENSE="GPL-3+" |
117 |
+SLOT="0" |
118 |
+IUSE="" |
119 |
+ |
120 |
+RDEPEND="dev-qt/qtcore:5 |
121 |
+ dev-qt/qtdeclarative:5 |
122 |
+ dev-qt/qtgraphicaleffects:5 |
123 |
+ dev-qt/qtgui:5 |
124 |
+ dev-qt/qtmultimedia:5[qml] |
125 |
+ dev-qt/qtnetwork:5 |
126 |
+ dev-qt/qtpositioning:5 |
127 |
+ dev-qt/qtsingleapplication[qt5,X] |
128 |
+ dev-qt/qtsensors:5 |
129 |
+ dev-qt/qtsql:5[sqlite] |
130 |
+ dev-qt/qtquick1:5 |
131 |
+ dev-qt/qtquickcontrols:5 |
132 |
+ dev-qt/qtwidgets:5 |
133 |
+ dev-qt/qtxml:5 |
134 |
+" |
135 |
+DEPEND="${RDEPEND}" |
136 |
+ |
137 |
+src_prepare() { |
138 |
+ epatch "${FILESDIR}/${P}-qt55.patch" |
139 |
+ epatch "${FILESDIR}/${P}-unbundle-qtsingleapplication.patch" |
140 |
+ |
141 |
+ rm -r sialantools/qtsingleapplication || die |
142 |
+} |
143 |
+ |
144 |
+src_configure() { |
145 |
+ eqmake5 |
146 |
+} |
147 |
+ |
148 |
+src_install() { |
149 |
+ emake install INSTALL_ROOT="${D}" |
150 |
+} |