* [gentoo-commits] repo/gentoo:master commit in: dev-libs/qtcompress/files/, dev-libs/qtcompress/
@ 2020-10-10 7:22 Joonas Niilola
0 siblings, 0 replies; 2+ messages in thread
From: Joonas Niilola @ 2020-10-10 7:22 UTC (permalink / raw
To: gentoo-commits
commit: 32fa1fd73e5f62c262c5dcb076cbcd9b9ae81409
Author: Alexey Sokolov <sokolov <AT> google <DOT> com>
AuthorDate: Mon Sep 28 08:52:49 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Oct 10 07:22:32 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32fa1fd7
dev-libs/qtcompress: new package
Unbundled dependency of sci-astronomy/stellarium
Bug: https://bugs.gentoo.org/745234
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
dev-libs/qtcompress/Manifest | 1 +
.../files/qtcompress-0_p20180513-remove-zlib.patch | 10 ++++
.../qtcompress-0_p20180513-test-include.patch | 13 +++++
dev-libs/qtcompress/metadata.xml | 15 +++++
dev-libs/qtcompress/qtcompress-0_p20180513.ebuild | 64 ++++++++++++++++++++++
5 files changed, 103 insertions(+)
diff --git a/dev-libs/qtcompress/Manifest b/dev-libs/qtcompress/Manifest
new file mode 100644
index 00000000000..dba886d100d
--- /dev/null
+++ b/dev-libs/qtcompress/Manifest
@@ -0,0 +1 @@
+DIST qtcompress-0_p20180513.tar.gz 251845 BLAKE2B eab320403b2b853fd12b9c10146bbdbbaad6053e57e7b72e7d80448c3913a6e4dbe898496dcec49631b8d0b371a9c7af20e30324dc960d91180cdf2fb4865121 SHA512 6a1d980f94d689063cbb8322e154d618de0002b956460303fe76cd0b6d14d6f9ea6925fe347aa91831eaa0364ea1c5ba50bdcbf5006b1651a23d93bb8867e336
diff --git a/dev-libs/qtcompress/files/qtcompress-0_p20180513-remove-zlib.patch b/dev-libs/qtcompress/files/qtcompress-0_p20180513-remove-zlib.patch
new file mode 100644
index 00000000000..de89e7ac2ae
--- /dev/null
+++ b/dev-libs/qtcompress/files/qtcompress-0_p20180513-remove-zlib.patch
@@ -0,0 +1,10 @@
+diff --git a/src/compress/compress.pro b/src/compress/compress.pro
+index 14ec502..3105a7f 100644
+--- a/src/compress/compress.pro
++++ b/src/compress/compress.pro
+@@ -11,5 +11,3 @@ HEADERS += \
+ qtcompressglobal.h
+
+ SOURCES += qzip.cpp
+-
+-include(../3rdparty/zlib.pri)
diff --git a/dev-libs/qtcompress/files/qtcompress-0_p20180513-test-include.patch b/dev-libs/qtcompress/files/qtcompress-0_p20180513-test-include.patch
new file mode 100644
index 00000000000..cc7bec4ed1e
--- /dev/null
+++ b/dev-libs/qtcompress/files/qtcompress-0_p20180513-test-include.patch
@@ -0,0 +1,13 @@
+--- a/tests/auto/unit/qzip/tst_qzip.cpp 2018-05-13 09:44:01.000000000 +0100
++++ b/tests/auto/unit/qzip/tst_qzip.cpp 2020-09-28 09:40:14.493025102 +0100
+@@ -41,8 +41,8 @@
+
+ #include <QtTest/QtTest>
+ #include <QDebug>
+-#include <QtCompress/qzipwriter.h>
+-#include <QtCompress/qzipreader.h>
++#include <qzipwriter.h>
++#include <qzipreader.h>
+
+ class tst_QZip : public QObject
+ {
diff --git a/dev-libs/qtcompress/metadata.xml b/dev-libs/qtcompress/metadata.xml
new file mode 100644
index 00000000000..a07b3622f7d
--- /dev/null
+++ b/dev-libs/qtcompress/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>alexey+gentoo@asokolov.org</email>
+ <name>Alexey Sokolov</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">nezticle/qtcompress</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-libs/qtcompress/qtcompress-0_p20180513.ebuild b/dev-libs/qtcompress/qtcompress-0_p20180513.ebuild
new file mode 100644
index 00000000000..1d0b1471137
--- /dev/null
+++ b/dev-libs/qtcompress/qtcompress-0_p20180513.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils toolchain-funcs virtualx
+
+DESCRIPTION="A public API for QZip in an easy to use module"
+
+HOMEPAGE="https://github.com/nezticle/qtcompress"
+MY_COMMIT="23f8831826cd72aedf99fc3699148b6c994fd677"
+SRC_URI="https://github.com/nezticle/qtcompress/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( LGPL-2.1 GPL-3 ) FDL-1.3"
+SLOT="0/5.11.0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+S="${WORKDIR}/qtcompress-${MY_COMMIT}"
+
+RDEPEND="
+ dev-qt/qtcore:5
+ sys-libs/zlib
+"
+DEPEND="
+ ${RDEPEND}
+ test? ( dev-qt/qttest:5 )
+"
+BDEPEND="
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}/${P}-remove-zlib.patch"
+ "${FILESDIR}/${P}-test-include.patch"
+)
+
+src_prepare() {
+ default
+ # qtcompress is bundling its own zlib, remove it
+ rm -r src/3rdparty/ || die
+}
+
+src_configure() {
+ local pkg_config="$(tc-getPKG_CONFIG)"
+ eqmake5 \
+ "INCLUDEPATH+=$("${pkg_config}" --cflags zlib)" \
+ "LIBS+=$("${pkg_config}" --libs zlib)"
+}
+
+src_test() {
+ cd tests/auto/unit || die
+ eqmake5 \
+ "INCLUDEPATH+=${S}/src/compress"
+ emake
+ virtx qzip/target_wrapper.sh qzip/tst_qzip
+}
+
+src_install() {
+ emake INSTALL_ROOT="${D}" install
+ rm "${ED}/usr/$(get_libdir)/libQt5Compress.la" || die
+ insinto /usr/include/qt5/QtCompress
+ doins src/compress/{qzipreader.h,qzipwriter.h,qtcompressglobal.h}
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/qtcompress/files/, dev-libs/qtcompress/
@ 2020-10-12 9:06 Joonas Niilola
0 siblings, 0 replies; 2+ messages in thread
From: Joonas Niilola @ 2020-10-12 9:06 UTC (permalink / raw
To: gentoo-commits
commit: 5bb67dfc238e40fe2eee8813f111d6a4b31f6655
Author: Alexey Sokolov <sokolov <AT> google <DOT> com>
AuthorDate: Sat Oct 10 14:36:36 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Oct 12 09:06:00 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bb67dfc
dev-libs/qtcompress: fix test
Closes: https://bugs.gentoo.org/747565
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Closes: https://github.com/gentoo/gentoo/pull/17875
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
dev-libs/qtcompress/files/qtcompress-0_p20180513-nogui.patch | 10 ++++++++++
dev-libs/qtcompress/qtcompress-0_p20180513.ebuild | 3 ++-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/dev-libs/qtcompress/files/qtcompress-0_p20180513-nogui.patch b/dev-libs/qtcompress/files/qtcompress-0_p20180513-nogui.patch
new file mode 100644
index 00000000000..1dd5f4f1ed8
--- /dev/null
+++ b/dev-libs/qtcompress/files/qtcompress-0_p20180513-nogui.patch
@@ -0,0 +1,10 @@
+--- a/tests/auto/unit/qzip/qzip.pro 2018-05-13 08:44:01.000000000 -0000
++++ b/tests/auto/unit/qzip/qzip.pro 2020-10-10 14:23:34.377528668 -0000
+@@ -1,6 +1,7 @@
+ CONFIG += testcase
+ TARGET = tst_qzip
+ QT += compress testlib
++QT -= gui
+ SOURCES += tst_qzip.cpp
+
+ wince* {
diff --git a/dev-libs/qtcompress/qtcompress-0_p20180513.ebuild b/dev-libs/qtcompress/qtcompress-0_p20180513.ebuild
index 1d0b1471137..6a17ad98057 100644
--- a/dev-libs/qtcompress/qtcompress-0_p20180513.ebuild
+++ b/dev-libs/qtcompress/qtcompress-0_p20180513.ebuild
@@ -10,13 +10,13 @@ DESCRIPTION="A public API for QZip in an easy to use module"
HOMEPAGE="https://github.com/nezticle/qtcompress"
MY_COMMIT="23f8831826cd72aedf99fc3699148b6c994fd677"
SRC_URI="https://github.com/nezticle/qtcompress/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/qtcompress-${MY_COMMIT}"
LICENSE="|| ( LGPL-2.1 GPL-3 ) FDL-1.3"
SLOT="0/5.11.0"
KEYWORDS="~amd64 ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
-S="${WORKDIR}/qtcompress-${MY_COMMIT}"
RDEPEND="
dev-qt/qtcore:5
@@ -33,6 +33,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}/${P}-remove-zlib.patch"
"${FILESDIR}/${P}-test-include.patch"
+ "${FILESDIR}/${P}-nogui.patch"
)
src_prepare() {
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-10-12 9:06 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-10-10 7:22 [gentoo-commits] repo/gentoo:master commit in: dev-libs/qtcompress/files/, dev-libs/qtcompress/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2020-10-12 9:06 Joonas Niilola
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox