[gentoo-commits] repo/gentoo:master commit in: x11-misc/qterm/files/, x11-misc/qterm/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: x11-misc/qterm/files/, x11-misc/qterm/
@ 2018-08-18  2:09 Akinori Hattori
  0 siblings, 0 replies; 5+ messages in thread
From: Akinori Hattori @ 2018-08-18  2:09 UTC (permalink / raw
  To: gentoo-commits

commit:     3996b4a6d01bf9f5025bbeaf77c382c1f8b6be06
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 18 02:04:25 2018 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Aug 18 02:04:25 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3996b4a6

x11-misc/qterm: fix build with libressl

Closes: https://bugs.gentoo.org/645390
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 x11-misc/qterm/files/qterm-libressl.patch | 60 +++++++++++++++++++++++++++++++
 x11-misc/qterm/qterm-0.7.1.ebuild         |  5 ++-
 2 files changed, 64 insertions(+), 1 deletion(-)

diff --git a/x11-misc/qterm/files/qterm-libressl.patch b/x11-misc/qterm/files/qterm-libressl.patch
new file mode 100644
index 00000000000..d0e0ae1f9cb
--- /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 <string.h>
+ #include <openssl/engine.h>
+ 
+--- a/src/ssh/libcrypto-compat.h
++++ b/src/ssh/libcrypto-compat.h
+@@ -9,7 +9,7 @@
+ #include <openssl/evp.h>
+ #include <openssl/hmac.h>
+ 
+-#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/qterm-0.7.1.ebuild b/x11-misc/qterm/qterm-0.7.1.ebuild
index daf1248d0cb..d1116333ae8 100644
--- a/x11-misc/qterm/qterm-0.7.1.ebuild
+++ b/x11-misc/qterm/qterm-0.7.1.ebuild
@@ -30,7 +30,10 @@ DEPEND="${RDEPEND}
 	dev-qt/qthelp:5
 	x11-base/xorg-proto"
 
-PATCHES=( "${FILESDIR}"/${P}-headers.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-libressl.patch
+	"${FILESDIR}"/${P}-headers.patch
+)
 DOCS=( README.rst RELEASE_NOTES TODO )
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: x11-misc/qterm/files/, x11-misc/qterm/
@ 2021-04-19 20:54 Sam James
  0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2021-04-19 20:54 UTC (permalink / raw
  To: gentoo-commits

commit:     ebfbe10cedebe2a04a093a61bf69891f995b62b9
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 19 20:07:33 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Apr 19 20:53:46 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebfbe10c

x11-misc/qterm: drop 0.7.1

Signed-off-by: Sam James <sam <AT> gentoo.org>

 x11-misc/qterm/Manifest                        |  1 -
 x11-misc/qterm/files/qterm-0.7.1-headers.patch | 40 -----------------
 x11-misc/qterm/qterm-0.7.1.ebuild              | 61 --------------------------
 3 files changed, 102 deletions(-)

diff --git a/x11-misc/qterm/Manifest b/x11-misc/qterm/Manifest
index acd52ff6e70..030eacc9a25 100644
--- a/x11-misc/qterm/Manifest
+++ b/x11-misc/qterm/Manifest
@@ -1,2 +1 @@
-DIST qterm-0.7.1.tar.gz 901169 BLAKE2B ab5337680f49e5f5f0d173585a9b9bc9a8606f086faf03405e2eb7efbf73cc3d9808fa6868deae3fe82e00d0ed2c0ec2d461d3085303b51ee1026bda672d8ddc SHA512 94f4c3f7974572c29eabf98c45e962b9232a4b0fbd6710c7725e0d23e6ecc91456f52a8c112779cd3b4732cb2e4302629419f7365b2d359ccbf39578e6e67cdd
 DIST qterm-0.7.3.tar.gz 901423 BLAKE2B e3f799946bfff4531e77d04fe535d53ef92093d1435aca32b06fa43c444c55798ab1c8408847dde81d1d24b5fda0c4a4f58fb563369f2c4669ba43929695cbd8 SHA512 93fdd24d79a81853654a4702ff55b2fad80c1cc734ec3230a297b3a2613cf24d41f4c645eadc5f34b6025f548e7c8cd5d291d4c29fc919f8966eeb8b44f5c046

diff --git a/x11-misc/qterm/files/qterm-0.7.1-headers.patch b/x11-misc/qterm/files/qterm-0.7.1-headers.patch
deleted file mode 100644
index c442c0ac8b3..00000000000
--- a/x11-misc/qterm/files/qterm-0.7.1-headers.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/src/keydialog.h
-+++ b/src/keydialog.h
-@@ -10,6 +10,7 @@
- #ifndef KEYDIALOG_H
- #define KEYDIALOG_H
- 
-+#include <QButtonGroup>
- #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 <QButtonGroup>
- #include "ui_soundconf.h"
- namespace QTerm
- {
---- a/src/shortcutsdialog.cpp
-+++ b/src/shortcutsdialog.cpp
-@@ -3,6 +3,7 @@
- #include <QKeyEvent>
- #include <QMessageBox>
- #include <QShortcut>
-+#include <QAction>
-
- 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/qterm-0.7.1.ebuild b/x11-misc/qterm/qterm-0.7.1.ebuild
deleted file mode 100644
index d1116333ae8..00000000000
--- a/x11-misc/qterm/qterm-0.7.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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
-	"${FILESDIR}"/${P}-headers.patch
-)
-DOCS=( README.rst RELEASE_NOTES TODO )
-
-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
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: x11-misc/qterm/files/, x11-misc/qterm/
@ 2018-08-18  2:09 Akinori Hattori
  0 siblings, 0 replies; 5+ messages in thread
From: Akinori Hattori @ 2018-08-18  2:09 UTC (permalink / raw
  To: gentoo-commits

commit:     7b26a5c5481d595475afb5df897f9057e6df71dc
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 18 02:01:16 2018 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Aug 18 02:01:16 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b26a5c5

x11-misc/qterm: fix build with Qt 5.11

Closes: https://bugs.gentoo.org/663352
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 x11-misc/qterm/files/qterm-0.7.1-headers.patch | 40 ++++++++++++++++++++++++++
 x11-misc/qterm/qterm-0.7.1.ebuild              |  1 +
 2 files changed, 41 insertions(+)

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 00000000000..c442c0ac8b3
--- /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 <QButtonGroup>
+ #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 <QButtonGroup>
+ #include "ui_soundconf.h"
+ namespace QTerm
+ {
+--- a/src/shortcutsdialog.cpp
++++ b/src/shortcutsdialog.cpp
+@@ -3,6 +3,7 @@
+ #include <QKeyEvent>
+ #include <QMessageBox>
+ #include <QShortcut>
++#include <QAction>
+
+ 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/qterm-0.7.1.ebuild b/x11-misc/qterm/qterm-0.7.1.ebuild
index 2273e5d3069..daf1248d0cb 100644
--- a/x11-misc/qterm/qterm-0.7.1.ebuild
+++ b/x11-misc/qterm/qterm-0.7.1.ebuild
@@ -30,6 +30,7 @@ DEPEND="${RDEPEND}
 	dev-qt/qthelp:5
 	x11-base/xorg-proto"
 
+PATCHES=( "${FILESDIR}"/${P}-headers.patch )
 DOCS=( README.rst RELEASE_NOTES TODO )
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: x11-misc/qterm/files/, x11-misc/qterm/
@ 2017-06-04  5:25 Michael Palimaka
  0 siblings, 0 replies; 5+ messages in thread
From: Michael Palimaka @ 2017-06-04  5:25 UTC (permalink / raw
  To: gentoo-commits

commit:     02d12d39e8b6c16fbeed6f4defd96a986720de43
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  4 05:24:43 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jun  4 05:25:28 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02d12d39

x11-misc/qterm: remove old

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 x11-misc/qterm/Manifest                            |  1 -
 x11-misc/qterm/files/qterm-0.5.11-gentoo.patch     | 11 ------
 .../qterm/files/qterm-0.5.12-duplicatetarget.patch | 17 ---------
 x11-misc/qterm/files/qterm-0.5.12-glibc216.patch   | 12 ------
 x11-misc/qterm/files/qterm-0.5.12-qt4.patch        | 11 ------
 x11-misc/qterm/files/qterm-0.5.12-qtbindir.patch   | 16 --------
 x11-misc/qterm/qterm-0.5.12-r1.ebuild              | 43 ----------------------
 7 files changed, 111 deletions(-)

diff --git a/x11-misc/qterm/Manifest b/x11-misc/qterm/Manifest
index 999682e94bd..9d31f6d00ff 100644
--- a/x11-misc/qterm/Manifest
+++ b/x11-misc/qterm/Manifest
@@ -1,2 +1 @@
-DIST qterm-0.5.12.tar.bz2 749254 SHA256 bd31051a6c117b05fef3ea163480143837c57632a84eab43e8e142860bcab22a SHA512 43f302f28edfb7fe4332d054390011e3eba37863be57191a13cedf2fa76d7b5db53d32947b7acd5e7585f2b0c8afe9b4b43334d86040f1f9249e9e767dd715e8 WHIRLPOOL 77b3fb09ea28901a151f8e0707a107677260a52d38a24427155dfa4e36d208bfc08be4016205d4c4f0c7fd374b967ccfed46271644e6dca2aa6e27ac637a991a
 DIST qterm-0.7.1.tar.gz 901169 SHA256 7e760dc18afa8c6e20c7d5f0148c41b9a9273667c6ee7716f7cc87ee5eaa0d63 SHA512 94f4c3f7974572c29eabf98c45e962b9232a4b0fbd6710c7725e0d23e6ecc91456f52a8c112779cd3b4732cb2e4302629419f7365b2d359ccbf39578e6e67cdd WHIRLPOOL fd9cd74ec010e4d63b7e7ef6c3f756f7e67db58f96a932ef426136fbee1565199ed13c27d27586ef7f81fb89d79b7cde7a2d090903bc3c3e64fecf30e0188d52

diff --git a/x11-misc/qterm/files/qterm-0.5.11-gentoo.patch b/x11-misc/qterm/files/qterm-0.5.11-gentoo.patch
deleted file mode 100644
index 08a2c90dc39..00000000000
--- a/x11-misc/qterm/files/qterm-0.5.11-gentoo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/qterm.desktop	2009-01-07 03:11:15.000000000 +0900
-+++ src/qterm.desktop	2009-10-03 01:30:27.000000000 +0900
-@@ -3,7 +3,7 @@
- Encoding=UTF-8
- Type=Application
- Name=QTerm
--Exec=qterm -caption "%c" %i %m %u
-+Exec=QTerm -caption "%c" %i %m %u
- GenericName=BBS Client
- GenericName[zh_CN]=BBS 客户端程序
- GenericName[zh_TW]=BBS 客戶端程式

diff --git a/x11-misc/qterm/files/qterm-0.5.12-duplicatetarget.patch b/x11-misc/qterm/files/qterm-0.5.12-duplicatetarget.patch
deleted file mode 100644
index f35625c6d02..00000000000
--- a/x11-misc/qterm/files/qterm-0.5.12-duplicatetarget.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Remove duplicate target that was already created by FindKDE4Internal.
-
-Gentoo-bug: 559042
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -19,10 +19,3 @@
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
- 
- include("package.cmake")
--
--configure_file(
--  "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
--  "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
--  IMMEDIATE @ONLY)
--add_custom_target(uninstall
--  "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")

diff --git a/x11-misc/qterm/files/qterm-0.5.12-glibc216.patch b/x11-misc/qterm/files/qterm-0.5.12-glibc216.patch
deleted file mode 100644
index a2f7c3b625c..00000000000
--- a/x11-misc/qterm/files/qterm-0.5.12-glibc216.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/main.cpp b/src/main.cpp
-index 6c39d4a..859de70 100644
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -41,6 +41,7 @@ AUTHOR:        kingson fiasco
- #include <fcntl.h>
- #include <execinfo.h>
- #include <signal.h>
-+#include <unistd.h>
- 
- #define QTERM_SIG_MAX_RETS 50
- #define QTERM_SIG_LOG_DIR "/var/tmp"

diff --git a/x11-misc/qterm/files/qterm-0.5.12-qt4.patch b/x11-misc/qterm/files/qterm-0.5.12-qt4.patch
deleted file mode 100644
index 87005546112..00000000000
--- a/x11-misc/qterm/files/qterm-0.5.12-qt4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- CMakeLists.txt~	2011-08-18 11:34:04.197046828 +0900
-+++ CMakeLists.txt	2011-08-18 11:34:09.557046770 +0900
-@@ -7,7 +7,7 @@
- set(QTERM_VERSION_RELEASE 12)
- set(QTERM_VERSION "${QTERM_VERSION_MAJOR}.${QTERM_VERSION_MINOR}.${QTERM_VERSION_RELEASE}" )
- set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
--find_package(Qt4 REQUIRED)
-+# find_package(Qt4 REQUIRED)
- find_package(KDE4)
- 
- IF(WIN32 AND MSVC)

diff --git a/x11-misc/qterm/files/qterm-0.5.12-qtbindir.patch b/x11-misc/qterm/files/qterm-0.5.12-qtbindir.patch
deleted file mode 100644
index f23af67c201..00000000000
--- a/x11-misc/qterm/files/qterm-0.5.12-qtbindir.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Ensure that qcollectiongenerator is called from the correct directory.
-
-Even though QT_BINARY_DIR is specified, cmake will try PATH first.
-
-Gentoo-bug: 544108
-
---- a/src/doc/CMakeLists.txt
-+++ b/src/doc/CMakeLists.txt
-@@ -9,6 +9,7 @@
- FIND_PROGRAM(QT_HELP_COLLECTION_GENERATOR
-   qcollectiongenerator
-   PATHS "${QT_BINARY_DIR}"
-+  NO_DEFAULT_PATH
-   DOC "qcollectiongenerator used to compile Qt help collection project files")
- 
- ADD_CUSTOM_COMMAND(

diff --git a/x11-misc/qterm/qterm-0.5.12-r1.ebuild b/x11-misc/qterm/qterm-0.5.12-r1.ebuild
deleted file mode 100644
index 61ba755c243..00000000000
--- a/x11-misc/qterm/qterm-0.5.12-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="A BBS client for Linux"
-HOMEPAGE="http://qterm.sourceforge.net"
-SRC_URI="mirror://sourceforge/qterm/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="libressl"
-
-RDEPEND="
-	>=dev-qt/qtcore-4.5:4
-	>=dev-qt/qtdbus-4.5:4
-	>=dev-qt/qtgui-4.5:4[qt3support]
-	>=dev-qt/qtscript-4.5:4
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl )
-	x11-libs/libX11
-"
-DEPEND="${RDEPEND}
-	kde-frameworks/kdelibs:4
-	dev-qt/qthelp:4
-	dev-qt/qtwebkit:4"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.5.11-gentoo.patch"
-	"${FILESDIR}/${P}-qt4.patch"
-	"${FILESDIR}/${P}-glibc216.patch"
-	"${FILESDIR}/${P}-duplicatetarget.patch"
-	"${FILESDIR}/${P}-qtbindir.patch"
-)
-
-src_install() {
-	cmake-utils_src_install
-	mv "${D}"/usr/bin/qterm "${D}"/usr/bin/QTerm || die
-	dodoc README TODO
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: x11-misc/qterm/files/, x11-misc/qterm/
@ 2016-01-22 15:05 Michael Palimaka
  0 siblings, 0 replies; 5+ messages in thread
From: Michael Palimaka @ 2016-01-22 15:05 UTC (permalink / raw
  To: gentoo-commits

commit:     fdd400178a776fe4bc93b32f48d8eb7bf10a3acb
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 22 15:04:31 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Jan 22 15:05:31 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdd40017

x11-misc/qterm: ensure that qcollectiongenerator is called from the correct directory

Gentoo-bug: 544108

Package-Manager: portage-2.2.27

 x11-misc/qterm/files/qterm-0.5.12-qtbindir.patch | 16 ++++++++++++++++
 x11-misc/qterm/qterm-0.5.12-r1.ebuild            |  1 +
 2 files changed, 17 insertions(+)

diff --git a/x11-misc/qterm/files/qterm-0.5.12-qtbindir.patch b/x11-misc/qterm/files/qterm-0.5.12-qtbindir.patch
new file mode 100644
index 0000000..f23af67
--- /dev/null
+++ b/x11-misc/qterm/files/qterm-0.5.12-qtbindir.patch
@@ -0,0 +1,16 @@
+Ensure that qcollectiongenerator is called from the correct directory.
+
+Even though QT_BINARY_DIR is specified, cmake will try PATH first.
+
+Gentoo-bug: 544108
+
+--- a/src/doc/CMakeLists.txt
++++ b/src/doc/CMakeLists.txt
+@@ -9,6 +9,7 @@
+ FIND_PROGRAM(QT_HELP_COLLECTION_GENERATOR
+   qcollectiongenerator
+   PATHS "${QT_BINARY_DIR}"
++  NO_DEFAULT_PATH
+   DOC "qcollectiongenerator used to compile Qt help collection project files")
+ 
+ ADD_CUSTOM_COMMAND(

diff --git a/x11-misc/qterm/qterm-0.5.12-r1.ebuild b/x11-misc/qterm/qterm-0.5.12-r1.ebuild
index ba00130..5c0a75f 100644
--- a/x11-misc/qterm/qterm-0.5.12-r1.ebuild
+++ b/x11-misc/qterm/qterm-0.5.12-r1.ebuild
@@ -34,6 +34,7 @@ PATCHES=(
 	"${FILESDIR}/${P}-qt4.patch"
 	"${FILESDIR}/${P}-glibc216.patch"
 	"${FILESDIR}/${P}-duplicatetarget.patch"
+	"${FILESDIR}/${P}-qtbindir.patch"
 )
 
 src_install() {


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2021-04-19 20:54 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-08-18  2:09 [gentoo-commits] repo/gentoo:master commit in: x11-misc/qterm/files/, x11-misc/qterm/ Akinori Hattori
  -- strict thread matches above, loose matches on Subject: below --
2021-04-19 20:54 Sam James
2018-08-18  2:09 Akinori Hattori
2017-06-04  5:25 Michael Palimaka
2016-01-22 15:05 Michael Palimaka

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox