From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 45D99138334 for ; Fri, 17 Aug 2018 22:04:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2E4B8E0887; Fri, 17 Aug 2018 22:04:20 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E023EE0887 for ; Fri, 17 Aug 2018 22:04:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0CEBB335DB3 for ; Fri, 17 Aug 2018 22:04:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5E80E3AD for ; Fri, 17 Aug 2018 22:04:16 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1534543323.0a8d25cbc5a23802d7b21e8d8409e9ad4d018598.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/qtm/, net-misc/qtm/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/qtm/Manifest net-misc/qtm/files/qtm-1.3.19-qt-5.11.patch net-misc/qtm/qtm-1.3.19.ebuild X-VCS-Directories: net-misc/qtm/ net-misc/qtm/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 0a8d25cbc5a23802d7b21e8d8409e9ad4d018598 X-VCS-Branch: master Date: Fri, 17 Aug 2018 22:04:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 1d5a652b-fa26-478e-bc65-49a6ae75a8f2 X-Archives-Hash: 5cdd98e686b5379e0c155df1334cc31f commit: 0a8d25cbc5a23802d7b21e8d8409e9ad4d018598 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Aug 17 22:00:44 2018 +0000 Commit: Andreas Sturmlechner gentoo 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 + #include + #include + #include +--- 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 + #include + #include + #include 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 +}