From owner-svn-ports-all@freebsd.org Thu Jun 4 21:02:13 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5A49E331FDD; Thu, 4 Jun 2020 21:02:13 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49dJBF1nZwz3fZX; Thu, 4 Jun 2020 21:02:13 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3573025A42; Thu, 4 Jun 2020 21:02:13 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 054L2DXc092104; Thu, 4 Jun 2020 21:02:13 GMT (envelope-from adridg@FreeBSD.org) Received: (from adridg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 054L2Cea092100; Thu, 4 Jun 2020 21:02:12 GMT (envelope-from adridg@FreeBSD.org) Message-Id: <202006042102.054L2Cea092100@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adridg set sender to adridg@FreeBSD.org using -f From: Adriaan de Groot Date: Thu, 4 Jun 2020 21:02:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r537960 - in head/textproc/kreport: . files X-SVN-Group: ports-head X-SVN-Commit-Author: adridg X-SVN-Commit-Paths: in head/textproc/kreport: . files X-SVN-Commit-Revision: 537960 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2020 21:02:13 -0000 Author: adridg Date: Thu Jun 4 21:02:12 2020 New Revision: 537960 URL: https://svnweb.freebsd.org/changeset/ports/537960 Log: Pre Qt 5.15 housekeeping: textproc/kreport This is probably a conflagration of CMake, Qt and other updates all happening at once. In poudriere, build of databases/kexi fails with ld: error: undefined symbol: KReportGroupTracker::qt_metacast(char const*) >>> referenced by mocs_compilation.cpp >>> src/plugins/reports/CMakeFiles/kexi_reportplugin.dir/kexi_reportplugin_autogen/mocs_compilation.cpp.o:(KRScriptFunctions::qt_metacast(char const*)) The problem lies in textproc/kreport, which has a QObject-derived class with no out-of-line virtual methods, and no clear path to have moc called on it. This patch splits out the virtual destructor, adds a .cpp file containing it, and causes automoc to run normally on the class. This makes all the QObject machinery appear in the shared library, and kexi can use it. Added: head/textproc/kreport/files/ head/textproc/kreport/files/KReportGroupTracker.cpp (contents, props changed) head/textproc/kreport/files/patch-src_CMakeLists.txt (contents, props changed) head/textproc/kreport/files/patch-src_renderer_scripting_KReportGroupTracker.h (contents, props changed) Modified: head/textproc/kreport/Makefile Modified: head/textproc/kreport/Makefile ============================================================================== --- head/textproc/kreport/Makefile Thu Jun 4 21:01:37 2020 (r537959) +++ head/textproc/kreport/Makefile Thu Jun 4 21:02:12 2020 (r537960) @@ -2,7 +2,7 @@ PORTNAME= kreport DISTVERSION= 3.2.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc kde MASTER_SITES= KDE/stable/${PORTNAME}/src DIST_SUBDIR= KDE/${PORTNAME} @@ -19,5 +19,8 @@ USE_QT= core declarative gui network webkit widgets buildtools_build printsupport qmake_build CONFLICTS_INSTALL= calligra-2* + +post-extract: + ${CP} ${FILESDIR}/KReportGroupTracker.cpp ${WRKSRC}/src/renderer/scripting/KReportGroupTracker.cpp .include Added: head/textproc/kreport/files/KReportGroupTracker.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/kreport/files/KReportGroupTracker.cpp Thu Jun 4 21:02:12 2020 (r537960) @@ -0,0 +1,2 @@ +#include "KReportGroupTracker.h" +KReportGroupTracker::~KReportGroupTracker() {} Added: head/textproc/kreport/files/patch-src_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/kreport/files/patch-src_CMakeLists.txt Thu Jun 4 21:02:12 2020 (r537960) @@ -0,0 +1,21 @@ +--- src/CMakeLists.txt.orig 2020-06-04 20:16:17 UTC ++++ src/CMakeLists.txt +@@ -106,6 +106,7 @@ set(kreport_TARGET_INCLUDE_DIRS + + if(KREPORT_SCRIPTING) + list(APPEND kreport_LIB_SRCS ++ renderer/scripting/KReportGroupTracker.cpp + renderer/scripting/KReportScriptHandler.cpp + renderer/scripting/KReportScriptConstants.cpp + renderer/scripting/KReportScriptDebug.cpp +@@ -131,10 +132,6 @@ if(KREPORT_SCRIPTING) + items/field/KReportScriptField.cpp + items/image/KReportScriptImage.cpp + items/text/KReportScriptText.cpp +- ) +- +- qt_wrap_cpp(KReport kreport_LIB_SRCS +- renderer/scripting/KReportGroupTracker.h + ) + + list(APPEND kreport_INCLUDE_DIRS Added: head/textproc/kreport/files/patch-src_renderer_scripting_KReportGroupTracker.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/kreport/files/patch-src_renderer_scripting_KReportGroupTracker.h Thu Jun 4 21:02:12 2020 (r537960) @@ -0,0 +1,11 @@ +--- src/renderer/scripting/KReportGroupTracker.h.orig 2020-06-04 20:15:12 UTC ++++ src/renderer/scripting/KReportGroupTracker.h +@@ -12,7 +12,7 @@ class KREPORT_EXPORT KReportGroupTracker : public QObj + + protected: + KReportGroupTracker() {} +- ~KReportGroupTracker() override{} ++ ~KReportGroupTracker() override; + + public: + Q_SLOT virtual void setGroupData(const QMap &groupData) = 0;