* [gentoo-commits] repo/gentoo:master commit in: x11-misc/kaqaz/files/, x11-misc/kaqaz/
@ 2015-10-29 12:12 Michael Palimaka
0 siblings, 0 replies; 2+ messages in thread
From: Michael Palimaka @ 2015-10-29 12:12 UTC (permalink / raw
To: gentoo-commits
commit: 6a17d15c8e2b78dd3f659c444cce1f35aa2a1ef2
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 29 12:06:31 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Oct 29 12:12:05 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a17d15c
x11-mics/kaqaz: revision bump
* Fix build with Qt 5.5
* Unbundle dev-qt/qtsingleapplication
* Add missing dependencies
Package-Manager: portage-2.2.20.1
x11-misc/kaqaz/files/kaqaz-1.2.0-qt55.patch | 14 ++++++
.../kaqaz-1.2.0-unbundle-qtsingleapplication.patch | 43 ++++++++++++++++++
x11-misc/kaqaz/kaqaz-1.2.0-r1.ebuild | 53 ++++++++++++++++++++++
3 files changed, 110 insertions(+)
diff --git a/x11-misc/kaqaz/files/kaqaz-1.2.0-qt55.patch b/x11-misc/kaqaz/files/kaqaz-1.2.0-qt55.patch
new file mode 100644
index 0000000..f7e13f6
--- /dev/null
+++ b/x11-misc/kaqaz/files/kaqaz-1.2.0-qt55.patch
@@ -0,0 +1,14 @@
+Fix build with Qt 5.5.
+
+Gentoo-bug: 563678
+
+--- databasedatatypes.h
++++ databasedatatypes.h
+@@ -23,6 +23,7 @@
+ #include <QColor>
+ #include <QStringList>
+ #include <QGeoCoordinate>
++#include <QObject>
+
+ class Enums : public QObject
+ {
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
new file mode 100644
index 0000000..0168916
--- /dev/null
+++ b/x11-misc/kaqaz/files/kaqaz-1.2.0-unbundle-qtsingleapplication.patch
@@ -0,0 +1,43 @@
+Use system copy of qtsingleapplication.
+
+--- sialantools/sialantools.pri
++++ sialantools/sialantools.pri
+@@ -1,4 +1,5 @@
+ QT += qml quick
++CONFIG += qtsingleapplication
+
+ android {
+ manifest.source = android-build
+@@ -24,20 +25,10 @@
+
+ HEADERS += \
+ sialantools/sialanmimeapps.h \
+- sialantools/qtsingleapplication/qtsinglecoreapplication.h \
+- sialantools/qtsingleapplication/qtsingleapplication.h \
+- sialantools/qtsingleapplication/qtlockedfile.h \
+- sialantools/qtsingleapplication/qtlocalpeer.h
+
+ SOURCES += \
+ sialantools/sialanmimeapps.cpp \
+- sialantools/qtsingleapplication/qtsinglecoreapplication.cpp \
+- sialantools/qtsingleapplication/qtsingleapplication.cpp \
+- sialantools/qtsingleapplication/qtlockedfile.cpp \
+- sialantools/qtsingleapplication/qtlocalpeer.cpp
+
+- win32: SOURCES += sialantools/qtsingleapplication/qtlockedfile_win.cpp
+- unix: SOURCES += sialantools/qtsingleapplication/qtlockedfile_unix.cpp
+ }
+ }
+ }
+
+--- sialantools/sialanapplication.h
++++ sialantools/sialanapplication.h
+@@ -22,7 +22,7 @@
+ #include "sialan_macros.h"
+
+ #ifdef DESKTOP_DEVICE
+-#include "qtsingleapplication/qtsingleapplication.h"
++#include "qtsingleapplication.h"
+ class INHERIT_QAPP : public QtSingleApplication
+ {
+ public:
diff --git a/x11-misc/kaqaz/kaqaz-1.2.0-r1.ebuild b/x11-misc/kaqaz/kaqaz-1.2.0-r1.ebuild
new file mode 100644
index 0000000..f4a21dd
--- /dev/null
+++ b/x11-misc/kaqaz/kaqaz-1.2.0-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils qmake-utils
+
+DESCRIPTION="Modern note manager"
+HOMEPAGE="http://labs.sialan.org/projects/kaqaz"
+if [[ ${PV} = *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/sialan-labs/kaqaz.git"
+ KEYWORDS=""
+else
+ SRC_URI="https://github.com/sialan-labs/kaqaz/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-qt/qtcore:5
+ dev-qt/qtdeclarative:5
+ dev-qt/qtgraphicaleffects:5
+ dev-qt/qtgui:5
+ dev-qt/qtmultimedia:5[qml]
+ dev-qt/qtnetwork:5
+ dev-qt/qtpositioning:5
+ dev-qt/qtsingleapplication[qt5,X]
+ dev-qt/qtsensors:5
+ dev-qt/qtsql:5[sqlite]
+ dev-qt/qtquick1:5
+ dev-qt/qtquickcontrols:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}/${P}-qt55.patch"
+ epatch "${FILESDIR}/${P}-unbundle-qtsingleapplication.patch"
+
+ rm -r sialantools/qtsingleapplication || die
+}
+
+src_configure() {
+ eqmake5
+}
+
+src_install() {
+ emake install INSTALL_ROOT="${D}"
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/kaqaz/files/, x11-misc/kaqaz/
@ 2018-01-26 0:10 Michael Palimaka
0 siblings, 0 replies; 2+ messages in thread
From: Michael Palimaka @ 2018-01-26 0:10 UTC (permalink / raw
To: gentoo-commits
commit: edc6502c0c953bd5f2d1a0bf770ee19ec08f8abe
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 26 00:10:14 2018 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Jan 26 00:10:28 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edc6502c
x11-misc/kaqaz: add missing USE dependency
Also, port to EAPI 6.
Closes: https://bugs.gentoo.org/645722
Package-Manager: Portage-2.3.19, Repoman-2.3.6
x11-misc/kaqaz/files/kaqaz-1.2.0-qt55.patch | 4 ++--
.../kaqaz-1.2.0-unbundle-qtsingleapplication.patch | 8 ++++----
...kaqaz-1.2.0-r2.ebuild => kaqaz-1.2.0-r3.ebuild} | 22 +++++++++++++---------
3 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/x11-misc/kaqaz/files/kaqaz-1.2.0-qt55.patch b/x11-misc/kaqaz/files/kaqaz-1.2.0-qt55.patch
index f7e13f6b5d4..8d9adc40022 100644
--- a/x11-misc/kaqaz/files/kaqaz-1.2.0-qt55.patch
+++ b/x11-misc/kaqaz/files/kaqaz-1.2.0-qt55.patch
@@ -2,8 +2,8 @@ Fix build with Qt 5.5.
Gentoo-bug: 563678
---- databasedatatypes.h
-+++ databasedatatypes.h
+--- a/databasedatatypes.h
++++ b/databasedatatypes.h
@@ -23,6 +23,7 @@
#include <QColor>
#include <QStringList>
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
index 01689167ecd..31bcc61e11d 100644
--- a/x11-misc/kaqaz/files/kaqaz-1.2.0-unbundle-qtsingleapplication.patch
+++ b/x11-misc/kaqaz/files/kaqaz-1.2.0-unbundle-qtsingleapplication.patch
@@ -1,7 +1,7 @@
Use system copy of qtsingleapplication.
---- sialantools/sialantools.pri
-+++ sialantools/sialantools.pri
+--- a/sialantools/sialantools.pri
++++ b/sialantools/sialantools.pri
@@ -1,4 +1,5 @@
QT += qml quick
+CONFIG += qtsingleapplication
@@ -30,8 +30,8 @@ Use system copy of qtsingleapplication.
}
}
---- sialantools/sialanapplication.h
-+++ sialantools/sialanapplication.h
+--- a/sialantools/sialanapplication.h
++++ b/sialantools/sialanapplication.h
@@ -22,7 +22,7 @@
#include "sialan_macros.h"
diff --git a/x11-misc/kaqaz/kaqaz-1.2.0-r2.ebuild b/x11-misc/kaqaz/kaqaz-1.2.0-r3.ebuild
similarity index 78%
rename from x11-misc/kaqaz/kaqaz-1.2.0-r2.ebuild
rename to x11-misc/kaqaz/kaqaz-1.2.0-r3.ebuild
index 97b38180dce..83bec081ae5 100644
--- a/x11-misc/kaqaz/kaqaz-1.2.0-r2.ebuild
+++ b/x11-misc/kaqaz/kaqaz-1.2.0-r3.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-inherit eutils qmake-utils
+EAPI=6
+
+inherit qmake-utils
DESCRIPTION="Modern note manager"
HOMEPAGE="https://github.com/sialan-labs/kaqaz/"
if [[ ${PV} = *9999* ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/sialan-labs/kaqaz.git"
- KEYWORDS=""
else
SRC_URI="https://github.com/sialan-labs/kaqaz/archive/${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
@@ -19,12 +19,13 @@ LICENSE="GPL-3+"
SLOT="0"
IUSE=""
-RDEPEND="dev-qt/qtcore:5
+RDEPEND="
+ dev-qt/qtcore:5
dev-qt/qtdeclarative:5
dev-qt/qtgraphicaleffects:5
dev-qt/qtgui:5
dev-qt/qtmultimedia:5[qml]
- dev-qt/qtnetwork:5
+ dev-qt/qtnetwork:5[ssl]
dev-qt/qtpositioning:5
dev-qt/qtsingleapplication[qt5,X]
dev-qt/qtsensors:5
@@ -35,10 +36,13 @@ RDEPEND="dev-qt/qtcore:5
"
DEPEND="${RDEPEND}"
-src_prepare() {
- epatch "${FILESDIR}/${P}-qt55.patch"
- epatch "${FILESDIR}/${P}-unbundle-qtsingleapplication.patch"
+PATCHES=(
+ "${FILESDIR}/${P}-qt55.patch"
+ "${FILESDIR}/${P}-unbundle-qtsingleapplication.patch"
+)
+src_prepare() {
+ default
rm -r sialantools/qtsingleapplication || die
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-01-26 0:10 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-29 12:12 [gentoo-commits] repo/gentoo:master commit in: x11-misc/kaqaz/files/, x11-misc/kaqaz/ Michael Palimaka
-- strict thread matches above, loose matches on Subject: below --
2018-01-26 0:10 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox