From 43793fab84041cfc5c60c0151d1591b8a69fb24a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 25 Aug 2018 07:36:27 +0100 Subject: gentoo resync : 25.08.2018 --- x11-misc/qterm/Manifest | 8 +++- x11-misc/qterm/files/qterm-0.7.1-headers.patch | 40 +++++++++++++++++ x11-misc/qterm/files/qterm-libressl.patch | 60 ++++++++++++++++++++++++++ x11-misc/qterm/metadata.xml | 2 +- x11-misc/qterm/qterm-0.7.1.ebuild | 38 +++++++--------- x11-misc/qterm/qterm-0.7.3.ebuild | 58 +++++++++++++++++++++++++ 6 files changed, 180 insertions(+), 26 deletions(-) create mode 100644 x11-misc/qterm/files/qterm-0.7.1-headers.patch create mode 100644 x11-misc/qterm/files/qterm-libressl.patch create mode 100644 x11-misc/qterm/qterm-0.7.3.ebuild (limited to 'x11-misc/qterm') diff --git a/x11-misc/qterm/Manifest b/x11-misc/qterm/Manifest index 44eae4529091..1df4f4deab97 100644 --- a/x11-misc/qterm/Manifest +++ b/x11-misc/qterm/Manifest @@ -1,3 +1,7 @@ +AUX qterm-0.7.1-headers.patch 699 BLAKE2B 277e0c28c6ab55e522b76c8595df16c43cc2653e40023ce9845540e4c7e60bce591a6ae07a7a77985a05c9563cf0fda5ad7e01c8eb00c6443788f3b49ae3c77a SHA512 e6d07ebf7ae8913214cd893f00dbcb7871f17bdea4336db56e18958781804255837c176d4c6febe960ceb1f3741da797c8fd2934246961915934d86675967a0e +AUX qterm-libressl.patch 1838 BLAKE2B 806757d7a8d63cbdffd2b6eb99bcb9333cdbcbe8e74ea5f5d73d53e1fca0fdc6c8aa25337f144aca0398606e771024fd52d96eb320a7d0f8f85c114850a29557 SHA512 927c2753d205c1d047f2c289ea170da65d9db1eb5713334a947e1aebe0a3c67e630d06a2607b0656e286e27813dca781e0e6f8215dfa483fc804b4dfdb19c171 DIST qterm-0.7.1.tar.gz 901169 BLAKE2B ab5337680f49e5f5f0d173585a9b9bc9a8606f086faf03405e2eb7efbf73cc3d9808fa6868deae3fe82e00d0ed2c0ec2d461d3085303b51ee1026bda672d8ddc SHA512 94f4c3f7974572c29eabf98c45e962b9232a4b0fbd6710c7725e0d23e6ecc91456f52a8c112779cd3b4732cb2e4302629419f7365b2d359ccbf39578e6e67cdd -EBUILD qterm-0.7.1.ebuild 1217 BLAKE2B 13349e94221931887261b341881bde0f7cd07a109224d12c4e5ec8242473a262a7c4f16c3838b92e13cd8a2601b4030f4d0ad956e9cd82e3c813332389f06c5c SHA512 724404d1803f734d5bfa6ccdf4ce825751a89d3b363dcd2eaafc4089942bc7d9fa389b41513e3594caaf6aa08cc57787f84e95a3765b3a3e7b2f77679bfcbc53 -MISC metadata.xml 360 BLAKE2B cba279bdcffd2c960f7dded51892476b2f087b5ff54eb1f39b2e1251e1e2accf41b42185efa57b03a357a6d2ac5ae84673f77ad78504290741b9000f58d129e9 SHA512 ccdcf09d604e38d3059829a1cab9415900bc39ef126bb5d5825781713512eff75e99046a8133ad74bfe2407fae51ab4013ea5600efa0a65a70666ef98a1013ac +DIST qterm-0.7.3.tar.gz 901423 BLAKE2B e3f799946bfff4531e77d04fe535d53ef92093d1435aca32b06fa43c444c55798ab1c8408847dde81d1d24b5fda0c4a4f58fb563369f2c4669ba43929695cbd8 SHA512 93fdd24d79a81853654a4702ff55b2fad80c1cc734ec3230a297b3a2613cf24d41f4c645eadc5f34b6025f548e7c8cd5d291d4c29fc919f8966eeb8b44f5c046 +EBUILD qterm-0.7.1.ebuild 1255 BLAKE2B fedc1e24a115cac7d30f74520d28de368dfbf243d855789dda433f772d9992f8e2b96e371a8fbf4844d59ab46c837d5e1aa6848199962126bc16bbbe471cac8e SHA512 7b34ad4108b4091f329fa47e1f0c9da56fb43e2515d4669e472370c8556279bf35af0ce01815099ca486ef9e716e1d096728e03a0a2554ab416f0c25c207278f +EBUILD qterm-0.7.3.ebuild 1237 BLAKE2B d696f608cfe373a1aa9902a3651fe7917a1708f185a6023484f53eec09c1b42a63e8332f46e48c7e2d2d73df7580839e7e82910ccb2fb887b960a792e47a083e SHA512 72fa5023b531217f53aa7dc0e3f11b9256f86402358c45037c1fa7a9ec363da90d9d84a6d6d23249f46a1b52375b713afe17288404baf94c6a7946282af97266 +MISC metadata.xml 360 BLAKE2B 8d292a4705a58ce03c68c3b7933414a5a1e5399258b8d6e4346098c948261d8dbfc2ebe5012c0e2c5a445cd93e4061c0322152d71ba73d8b6ebfc00a6b1935aa SHA512 e93913eefab59f5e1fb1478b5ac530c689b92bc27230d44dd98e233d75c2b8cd8a9e3f3f123dca0f6dbef1ceacb1fbdcfd13c34a0f8f96b09d348ce323334f62 diff --git a/x11-misc/qterm/files/qterm-0.7.1-headers.patch b/x11-misc/qterm/files/qterm-0.7.1-headers.patch new file mode 100644 index 000000000000..c442c0ac8b30 --- /dev/null +++ b/x11-misc/qterm/files/qterm-0.7.1-headers.patch @@ -0,0 +1,40 @@ +--- a/src/keydialog.h ++++ b/src/keydialog.h +@@ -10,6 +10,7 @@ + #ifndef KEYDIALOG_H + #define KEYDIALOG_H + ++#include + #include "ui_keydialog.h" + namespace QTerm + { +--- a/src/soundconf.h ++++ b/src/soundconf.h +@@ -1,6 +1,7 @@ + #ifndef SOUNDCONF_H + #define SOUNDCONF_H + ++#include + #include "ui_soundconf.h" + namespace QTerm + { +--- a/src/shortcutsdialog.cpp ++++ b/src/shortcutsdialog.cpp +@@ -3,6 +3,7 @@ + #include + #include + #include ++#include + + namespace QTerm { + +--- a/src/shortcutsdialog.h ++++ b/src/shortcutsdialog.h +@@ -3,6 +3,7 @@ + + #include "ui_shortcutsdialog.h" + class QShortcut; ++class QAction; + + namespace QTerm{ + diff --git a/x11-misc/qterm/files/qterm-libressl.patch b/x11-misc/qterm/files/qterm-libressl.patch new file mode 100644 index 000000000000..d0e0ae1f9cb5 --- /dev/null +++ b/x11-misc/qterm/files/qterm-libressl.patch @@ -0,0 +1,60 @@ +--- a/src/ssh/libcrypto-compat.c ++++ b/src/ssh/libcrypto-compat.c +@@ -8,7 +8,7 @@ + */ + + #include "libcrypto-compat.h" +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + #include + #include + +--- a/src/ssh/libcrypto-compat.h ++++ b/src/ssh/libcrypto-compat.h +@@ -9,7 +9,7 @@ + #include + #include + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + + int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d); + int RSA_set0_factors(RSA *r, BIGNUM *p, BIGNUM *q); +--- a/src/ssh/socket.cpp ++++ b/src/ssh/socket.cpp +@@ -36,7 +36,7 @@ + SSH2SocketPriv::SSH2SocketPriv(SocketPrivate * plainSocket, QByteArray & banner, QObject * parent) + : SSHSocketPriv(parent), m_banner(banner), m_status(Init), m_sessionID(), m_channelList() + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + OpenSSL_add_all_ciphers(); + #endif + m_sessionID = NULL; +@@ -56,7 +56,7 @@ + + SSH2SocketPriv::~SSH2SocketPriv() + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + EVP_cleanup(); + #endif + } +@@ -133,7 +133,7 @@ + #ifdef SSH_DEBUG + qDebug() << "init ssh1 session"; + #endif +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + OpenSSL_add_all_ciphers(); + #endif + m_inPacket = new SSH1InBuffer(plainSocket, this); +@@ -148,7 +148,7 @@ + + SSH1SocketPriv::~SSH1SocketPriv() + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + EVP_cleanup(); + #endif + } diff --git a/x11-misc/qterm/metadata.xml b/x11-misc/qterm/metadata.xml index d9de788cca8b..59fe2d65e616 100644 --- a/x11-misc/qterm/metadata.xml +++ b/x11-misc/qterm/metadata.xml @@ -6,7 +6,7 @@ Cjk - qterm qterm/qterm + qterm diff --git a/x11-misc/qterm/qterm-0.7.1.ebuild b/x11-misc/qterm/qterm-0.7.1.ebuild index 9196ecbc57cb..d1116333ae8f 100644 --- a/x11-misc/qterm/qterm-0.7.1.ebuild +++ b/x11-misc/qterm/qterm-0.7.1.ebuild @@ -1,21 +1,20 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI="6" inherit cmake-utils gnome2-utils xdg-utils -DESCRIPTION="A BBS client for Linux" +DESCRIPTION="A BBS client based on Qt" HOMEPAGE="https://github.com/qterm/qterm" -SRC_URI="https://github.com/qterm/qterm/archive/0.7.1.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" SLOT="0" KEYWORDS="amd64 x86" IUSE="libressl" -RDEPEND=" - dev-qt/qtcore:5 +RDEPEND="dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 @@ -25,41 +24,34 @@ RDEPEND=" dev-qt/qtxml:5 x11-libs/libX11 !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) -" + libressl? ( dev-libs/libressl:= )" DEPEND="${RDEPEND} dev-qt/linguist-tools:5 dev-qt/qthelp:5 - x11-base/xorg-proto -" + x11-base/xorg-proto" +PATCHES=( + "${FILESDIR}"/${PN}-libressl.patch + "${FILESDIR}"/${P}-headers.patch +) DOCS=( README.rst RELEASE_NOTES TODO ) src_prepare() { - cmake-utils_src_prepare + # file collision with sys-cluster/torque, bug #176533 + sed -i "/PROGRAME /s/qterm/QTerm/" CMakeLists.txt + sed -i "s/Exec=qterm/Exec=QTerm/" src/${PN}.desktop - sed -i -e "s/Exec=qterm/Exec=QTerm/" src/${PN}.desktop || die + cmake-utils_src_prepare + xdg_environment_reset } src_configure() { - xdg_environment_reset - local mycmakeargs=( -DQT5=ON ) - cmake-utils_src_configure } -src_install() { - cmake-utils_src_install - mv "${D}"/usr/bin/qterm "${D}"/usr/bin/QTerm || die -} - -pkg_preinst() { - gnome2_icon_savelist -} - pkg_postinst() { gnome2_icon_cache_update } diff --git a/x11-misc/qterm/qterm-0.7.3.ebuild b/x11-misc/qterm/qterm-0.7.3.ebuild new file mode 100644 index 000000000000..8297a404681e --- /dev/null +++ b/x11-misc/qterm/qterm-0.7.3.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +inherit cmake-utils gnome2-utils xdg-utils + +DESCRIPTION="A BBS client based on Qt" +HOMEPAGE="https://github.com/qterm/qterm" +SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="libressl" + +RDEPEND="dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtmultimedia:5 + dev-qt/qtnetwork:5 + dev-qt/qtprintsupport:5 + dev-qt/qtscript:5[scripttools] + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + x11-libs/libX11 + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:= )" +DEPEND="${RDEPEND} + dev-qt/linguist-tools:5 + dev-qt/qthelp:5 + x11-base/xorg-proto" + +PATCHES=( "${FILESDIR}"/${PN}-libressl.patch ) +DOCS=( README.rst RELEASE_NOTES TODO doc/script.txt ) + +src_prepare() { + # file collision with sys-cluster/torque, bug #176533 + sed -i "/PROGRAME /s/qterm/QTerm/" CMakeLists.txt + sed -i "s/Exec=qterm/Exec=QTerm/" src/${PN}.desktop + + cmake-utils_src_prepare + xdg_environment_reset +} + +src_configure() { + local mycmakeargs=( + -DQT5=ON + ) + cmake-utils_src_configure +} + +pkg_postinst() { + gnome2_icon_cache_update +} + +pkg_postrm() { + gnome2_icon_cache_update +} -- cgit v1.2.3