* [gentoo-commits] repo/gentoo:master commit in: net-misc/qtm/, net-misc/qtm/files/
@ 2018-08-17 22:04 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2018-08-17 22:04 UTC (permalink / raw
To: gentoo-commits
commit: 0a8d25cbc5a23802d7b21e8d8409e9ad4d018598
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 17 22:00:44 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Aug 17 22:02:03 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a8d25cb
net-misc/qtm: 1.3.19 version bump, fix build with Qt 5.11
Closes: https://bugs.gentoo.org/662480
Package-Manager: Portage-2.3.46, Repoman-2.3.10
net-misc/qtm/Manifest | 1 +
net-misc/qtm/files/qtm-1.3.19-qt-5.11.patch | 23 ++++++++++++
net-misc/qtm/qtm-1.3.19.ebuild | 54 +++++++++++++++++++++++++++++
3 files changed, 78 insertions(+)
diff --git a/net-misc/qtm/Manifest b/net-misc/qtm/Manifest
index d06fa1c3497..ac805dfa9f8 100644
--- a/net-misc/qtm/Manifest
+++ b/net-misc/qtm/Manifest
@@ -1 +1,2 @@
DIST qtm-1.3.18.tar.bz2 186137 BLAKE2B b405bc922246d5c8fe65fc68250b3eb401be3b17dd55cc81bfa70d6ddd72280398df25c850b2d71cc4383b9463e3aff6d641ce4080c100d10ae79f9002793055 SHA512 d4685f22a883e1d7513dcac57a807b0d21c26dfceda547b22889ee980758de1a49c2e898c745bb597efd709823d96da59f7494015c0915edb34e9141fa60e2ca
+DIST qtm-1.3.19.tar.bz2 191559 BLAKE2B e193e75771f04b7ecf772a55305c5a0b923449570933c76716235912223417e1340462893b5c566a22c3d6689eb2fc66b7b41aa3148afcbbc4db65abfcc06545 SHA512 a56a5c1d6098213637806a8a8c3889bbfbd11cb5b1d568520197c6c21e51d99f95975359c18f63961aba945b58a5ce3abf3ff85f552a555b91965414934f9565
diff --git a/net-misc/qtm/files/qtm-1.3.19-qt-5.11.patch b/net-misc/qtm/files/qtm-1.3.19-qt-5.11.patch
new file mode 100644
index 00000000000..76bf75e1128
--- /dev/null
+++ b/net-misc/qtm/files/qtm-1.3.19-qt-5.11.patch
@@ -0,0 +1,23 @@
+Fixes build error due to internal header cleanup in Qt 5.11.
+Gentoo-bug: https://bugs.gentoo.org/662480
+
+--- a/AccountsDialog.cc 2017-06-12 12:27:59.964042017 +0200
++++ b/AccountsDialog.cc 2018-08-17 23:51:40.559225179 +0200
+@@ -21,6 +21,7 @@
+ *************************************************************************************************/
+
+
++#include <QAction>
+ #include <QWidget>
+ #include <QDialog>
+ #include <QListWidget>
+--- a/QuickpostTemplateDialog.cc 2017-06-12 12:28:00.244038449 +0200
++++ b/QuickpostTemplateDialog.cc 2018-08-17 23:55:11.793673907 +0200
+@@ -20,6 +20,7 @@
+ *****************************************************************************/
+
+
++#include <QAction>
+ #include <QWidget>
+ #include <QDialog>
+ #include <QListWidget>
diff --git a/net-misc/qtm/qtm-1.3.19.ebuild b/net-misc/qtm/qtm-1.3.19.ebuild
new file mode 100644
index 00000000000..94d9740b463
--- /dev/null
+++ b/net-misc/qtm/qtm-1.3.19.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# CMAKE_IN_SOURCE_BUILD="1"
+inherit cmake-utils eapi7-ver
+
+DESCRIPTION="Qt blogging client"
+HOMEPAGE="http://qtm.blogistan.co.uk"
+SRC_URI="https://bitbucket.org/IndigoJo/${PN}-$(ver_cut 1-2)/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus debug"
+RESTRICT="strip"
+
+RDEPEND="dev-lang/perl
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ virtual/perl-Digest-MD5
+ dbus? ( dev-qt/qtdbus:5 )"
+DEPEND="${RDEPEND}
+ x11-base/xorg-proto
+ virtual/pkgconfig"
+
+DOCS=( Changelog README )
+
+PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" ) # TODO: upstream
+
+src_prepare() {
+ # bug 463810
+ sed -i -e '/Categories/s/Application;//' qtm-desktop.sh || die 'sed on qtm-desktop.sh failed'
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DQt5=ON
+ -DDONT_USE_PTE=OFF
+ -DINSTALL_MARKDOWN=ON
+ -DNO_SSL=OFF
+ -DUSE_DBUS=$(usex dbus)
+ -DDONT_USE_DBUS=$(usex !dbus)
+ -DQDEBUG=$(usex debug)
+ )
+
+ cmake-utils_src_configure
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/qtm/, net-misc/qtm/files/
@ 2021-02-28 12:26 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2021-02-28 12:26 UTC (permalink / raw
To: gentoo-commits
commit: 87cf4e249479edec0cf8750afb5010f12c1c4c59
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 28 11:50:14 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 28 12:26:15 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87cf4e24
net-misc/qtm: Switch to cmake.eclass, don't install compressed man
Closes: https://bugs.gentoo.org/740784
Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
net-misc/qtm/files/qtm-1.3.19-nomancompress.patch | 34 +++++++++++++
net-misc/qtm/qtm-1.3.19-r1.ebuild | 60 +++++++++++++++++++++++
2 files changed, 94 insertions(+)
diff --git a/net-misc/qtm/files/qtm-1.3.19-nomancompress.patch b/net-misc/qtm/files/qtm-1.3.19-nomancompress.patch
new file mode 100644
index 00000000000..a98ef244600
--- /dev/null
+++ b/net-misc/qtm/files/qtm-1.3.19-nomancompress.patch
@@ -0,0 +1,34 @@
+--- a/CMakeLists.txt 2017-06-12 12:28:32.739628202 +0200
++++ b/CMakeLists.txt 2021-02-28 12:43:44.143779118 +0100
+@@ -123,20 +123,17 @@
+ set( MANPAGE_DIRECTORY ${CMAKE_INSTALL_PREFIX}/share/man/man1 )
+ endif( NOT MANPAGE_DIRECTORY)
+
+- add_custom_command( OUTPUT qtm.1.gz
++ add_custom_command( OUTPUT qtm.1
+ COMMAND touch qtm.1
+ COMMAND sh ${QTM_SOURCE_DIR}/qtm-manpage.sh ${QTM_VERSION} >${QTM_BINARY_DIR}/qtm.1
+- COMMAND gzip -9 ${QTM_BINARY_DIR}/qtm.1
+ DEPENDS qtm-manpage.sh
+ COMMENT "Generating manpage"
+ )
+ add_custom_target( MANPAGE_FILE ALL
+- DEPENDS qtm.1.gz
++ DEPENDS qtm.1
+ )
+
+ set_directory_properties( ADDITIONAL_MAKE_CLEAN_FILES
+- qtm.1
+- qtm.1.gz
+ qtm_version.h
+ qtmico.o )
+
+@@ -367,7 +364,7 @@
+ if(UNIX AND NOT APPLE)
+ install(FILES ${QTM_BINARY_DIR}/${DESKTOP_ENTRY} DESTINATION ${DESKTOP_ENTRY_PATH})
+ install( FILES ${APP_ICON} DESTINATION share/icons )
+- install( FILES ${QTM_BINARY_DIR}/qtm.1.gz DESTINATION ${MANPAGE_DIRECTORY} )
++ install( FILES ${QTM_BINARY_DIR}/qtm.1 DESTINATION ${MANPAGE_DIRECTORY} )
+ if( UNITY_LAUNCHER )
+ install( FILES ${QTM_SOURCE_DIR}/qtm-new.py DESTINATION bin RENAME qtm-new )
+ install( FILES ${QTM_SOURCE_DIR}/qtm-choose.py DESTINATION bin RENAME qtm-choose )
diff --git a/net-misc/qtm/qtm-1.3.19-r1.ebuild b/net-misc/qtm/qtm-1.3.19-r1.ebuild
new file mode 100644
index 00000000000..27e97c211aa
--- /dev/null
+++ b/net-misc/qtm/qtm-1.3.19-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Qt blogging client"
+HOMEPAGE="http://qtm.blogistan.co.uk"
+# FIXME find suitable SRC_URI
+SRC_URI="https://bitbucket-archive.softwareheritage.org/static/3c/3c8ca320-701e-47dc-b0ec-28870df5715b/attachments/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="dbus debug"
+RESTRICT="strip"
+
+RDEPEND="
+ dev-lang/perl
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ virtual/perl-Digest-MD5
+ dbus? ( dev-qt/qtdbus:5 )"
+DEPEND="${RDEPEND}
+ x11-base/xorg-proto
+"
+BDEPEND="
+ virtual/pkgconfig
+"
+
+DOCS=( Changelog README )
+
+PATCHES=(
+ "${FILESDIR}/${P}-qt-5.11.patch" # TODO: upstream
+ "${FILESDIR}/${P}-nomancompress.patch" # bug 740784
+)
+
+src_prepare() {
+ cmake_src_prepare
+
+ # bug 463810
+ sed -i -e '/Categories/s/Application;//' qtm-desktop.sh || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DQt5=ON
+ -DDONT_USE_PTE=OFF
+ -DINSTALL_MARKDOWN=ON
+ -DNO_SSL=OFF
+ -DUSE_DBUS=$(usex dbus)
+ -DDONT_USE_DBUS=$(usex !dbus)
+ -DQDEBUG=$(usex debug)
+ )
+ cmake_src_configure
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-02-28 12:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-08-17 22:04 [gentoo-commits] repo/gentoo:master commit in: net-misc/qtm/, net-misc/qtm/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2021-02-28 12:26 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox