[gentoo-commits] repo/gentoo:master commit in: x11-misc/kaqaz/
commit: 6387d94c8a581c455160f7161070093b389ae156 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed May 20 16:00:21 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed May 20 17:42:41 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6387d94c x11-misc/kaqaz: EAPI-7 bump Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> x11-misc/kaqaz/kaqaz-1.2.0-r4.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x11-misc/kaqaz/kaqaz-1.2.0-r4.ebuild b/x11-misc/kaqaz/kaqaz-1.2.0-r4.ebuild index 68d849e0285..41c0d7e246e 100644 --- a/x11-misc/kaqaz/kaqaz-1.2.0-r4.ebuild +++ b/x11-misc/kaqaz/kaqaz-1.2.0-r4.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit qmake-utils
[gentoo-commits] repo/gentoo:master commit in: x11-misc/kaqaz/
commit: 9889b1c35344521c9bed1dbdc7d86a217dfe337b
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Feb 19 20:17:24 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Feb 22 10:47:40 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9889b1c3
x11-misc/kaqaz: Prepare for qtsingleapplication dropping qt5
Package-Manager: Portage-2.3.24, Repoman-2.3.6
x11-misc/kaqaz/{kaqaz-1.2.0-r3.ebuild => kaqaz-1.2.0-r4.ebuild} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/kaqaz/kaqaz-1.2.0-r3.ebuild
b/x11-misc/kaqaz/kaqaz-1.2.0-r4.ebuild
similarity index 96%
rename from x11-misc/kaqaz/kaqaz-1.2.0-r3.ebuild
rename to x11-misc/kaqaz/kaqaz-1.2.0-r4.ebuild
index 83bec081ae5..68d849e0285 100644
--- a/x11-misc/kaqaz/kaqaz-1.2.0-r3.ebuild
+++ b/x11-misc/kaqaz/kaqaz-1.2.0-r4.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
dev-qt/qtmultimedia:5[qml]
dev-qt/qtnetwork:5[ssl]
dev-qt/qtpositioning:5
- dev-qt/qtsingleapplication[qt5,X]
+ dev-qt/qtsingleapplication[qt5(+),X]
dev-qt/qtsensors:5
dev-qt/qtsql:5[sqlite]
dev-qt/qtquickcontrols:5
[gentoo-commits] repo/gentoo:master commit in: x11-misc/kaqaz/files/, x11-misc/kaqaz/
commit: edc6502c0c953bd5f2d1a0bf770ee19ec08f8abe
Author: Michael Palimaka gentoo org>
AuthorDate: Fri Jan 26 00:10:14 2018 +
Commit: Michael Palimaka gentoo org>
CommitDate: Fri Jan 26 00:10:28 2018 +
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
#include
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} = ** ]]; 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
}
[gentoo-commits] repo/gentoo:master commit in: x11-misc/kaqaz/
commit: bab4239c7b5fcc218961677308c4d60d0cab172c
Author: Michael Palimaka gentoo org>
AuthorDate: Sun Jun 18 08:53:03 2017 +
Commit: Michael Palimaka gentoo org>
CommitDate: Sun Jun 18 08:58:26 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bab4239c
x11-misc/kaqaz: update HOMEPAGE
Package-Manager: Portage-2.3.5, Repoman-2.3.2
x11-misc/kaqaz/kaqaz-1.2.0-r2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/x11-misc/kaqaz/kaqaz-1.2.0-r2.ebuild
b/x11-misc/kaqaz/kaqaz-1.2.0-r2.ebuild
index efe2db40817..97b38180dce 100644
--- a/x11-misc/kaqaz/kaqaz-1.2.0-r2.ebuild
+++ b/x11-misc/kaqaz/kaqaz-1.2.0-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
inherit eutils qmake-utils
DESCRIPTION="Modern note manager"
-HOMEPAGE="http://labs.sialan.org/projects/kaqaz;
+HOMEPAGE="https://github.com/sialan-labs/kaqaz/;
if [[ ${PV} = ** ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/sialan-labs/kaqaz.git;
[gentoo-commits] repo/gentoo:master commit in: x11-misc/kaqaz/
commit: a5eee750ad0ee78eb8ce0e5615e085faa5b502fc Author: Pacho Ramos gentoo org> AuthorDate: Sat May 28 10:46:40 2016 + Commit: Pacho Ramos gentoo org> CommitDate: Sat May 28 10:46:40 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5eee750 x11-misc/kaqaz: Cleanup due to #175274 Package-Manager: portage-2.3.0_rc1 x11-misc/kaqaz/metadata.xml | 4 1 file changed, 4 deletions(-) diff --git a/x11-misc/kaqaz/metadata.xml b/x11-misc/kaqaz/metadata.xml index fc62d74..add3788 100644 --- a/x11-misc/kaqaz/metadata.xml +++ b/x11-misc/kaqaz/metadata.xml @@ -1,10 +1,6 @@ http://www.gentoo.org/dtd/metadata.dtd;> - - yng...@gentoo.org - Ben de Groot - q...@gentoo.org Gentoo Qt Project
[gentoo-commits] repo/gentoo:master commit in: x11-misc/kaqaz/
commit: e88327aa32a7f23648418d7ebaf9b43e89ecf567
Author: Davide Pesavento gentoo org>
AuthorDate: Sun Apr 10 17:59:13 2016 +
Commit: Davide Pesavento gentoo org>
CommitDate: Sun Apr 10 17:59:13 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e88327aa
x11-misc/kaqaz: drop bogus dep on qtquick1
Package-Manager: portage-2.2.28
x11-misc/kaqaz/{kaqaz-1.2.0-r1.ebuild => kaqaz-1.2.0-r2.ebuild} | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/x11-misc/kaqaz/kaqaz-1.2.0-r1.ebuild
b/x11-misc/kaqaz/kaqaz-1.2.0-r2.ebuild
similarity index 94%
rename from x11-misc/kaqaz/kaqaz-1.2.0-r1.ebuild
rename to x11-misc/kaqaz/kaqaz-1.2.0-r2.ebuild
index f4a21dd..684de8e 100644
--- a/x11-misc/kaqaz/kaqaz-1.2.0-r1.ebuild
+++ b/x11-misc/kaqaz/kaqaz-1.2.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -30,7 +30,6 @@ RDEPEND="dev-qt/qtcore: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
[gentoo-commits] repo/gentoo:master commit in: x11-misc/kaqaz/
commit: 630cb2afe5072dc238000879aa4b1743df6c0e3b
Author: Michael Palimaka gentoo org>
AuthorDate: Fri Feb 19 14:20:25 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Fri Feb 19 14:21:00 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=630cb2af
x11-misc/kaqaz: remove old
Package-Manager: portage-2.2.27
x11-misc/kaqaz/kaqaz-1.2.0.ebuild | 40 ---
1 file changed, 40 deletions(-)
diff --git a/x11-misc/kaqaz/kaqaz-1.2.0.ebuild
b/x11-misc/kaqaz/kaqaz-1.2.0.ebuild
deleted file mode 100644
index 5ef7ef0..000
--- a/x11-misc/kaqaz/kaqaz-1.2.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit qmake-utils
-
-DESCRIPTION="Modern note manager"
-HOMEPAGE="http://labs.sialan.org/projects/kaqaz;
-if [[ ${PV} = ** ]]; 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/qtdeclarative:5
- dev-qt/qtquick1:5
- dev-qt/qtmultimedia:5
- dev-qt/qtsql:5
- dev-qt/qtsensors:5
- dev-qt/qtpositioning:5
- dev-qt/qtwidgets:5
- dev-qt/qtgui:5
- dev-qt/qtcore:5"
-DEPEND="${RDEPEND}"
-
-src_configure() {
- eqmake5
-}
-
-src_install() {
- emake install INSTALL_ROOT="${D}"
-}
[gentoo-commits] repo/gentoo:master commit in: x11-misc/kaqaz/
commit: c2658c2153e7c29cef6235b54cefa408e7f791d9 Author: Michael Palimaka gentoo org> AuthorDate: Fri Feb 19 14:20:55 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Fri Feb 19 14:21:00 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2658c21 x11-misc/kaqaz: whitespace Package-Manager: portage-2.2.27 x11-misc/kaqaz/metadata.xml | 22 +++--- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/x11-misc/kaqaz/metadata.xml b/x11-misc/kaqaz/metadata.xml index b10e735..fc62d74 100644 --- a/x11-misc/kaqaz/metadata.xml +++ b/x11-misc/kaqaz/metadata.xml @@ -1,15 +1,15 @@ http://www.gentoo.org/dtd/metadata.dtd;> - -yng...@gentoo.org -Ben de Groot - - -q...@gentoo.org -Gentoo Qt Project - - -sialan-labs/kaqaz - + + yng...@gentoo.org + Ben de Groot + + + q...@gentoo.org + Gentoo Qt Project + + + sialan-labs/kaqaz +
[gentoo-commits] repo/gentoo:master commit in: x11-misc/kaqaz/files/, x11-misc/kaqaz/
commit: 6a17d15c8e2b78dd3f659c444cce1f35aa2a1ef2
Author: Michael Palimaka gentoo org>
AuthorDate: Thu Oct 29 12:06:31 2015 +
Commit: Michael Palimaka gentoo org>
CommitDate: Thu Oct 29 12:12:05 2015 +
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 000..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
+ #include
+ #include
++#include
+
+ 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 000..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 000..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} = ** ]]; 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}"
+}
