From nobody Tue Sep 06 17:44:36 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MMXnw5vBjz4cJ9P; Tue, 6 Sep 2022 17:44:36 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MMXnw5JvPz3WQn; Tue, 6 Sep 2022 17:44:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662486276; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=icp7IV7MyvuPrztLnPIQxQAQhdexoRYv81nB+lv8g4c=; b=tagT1RQCGYcpkVDgMwNCRzmDkTJvpA4AsPhqdLEj3py0cErUxYrFE4zur/xqvZ7xoxCzRv La1iGGcZvqlme+IpkgOLY/tTalJMWXvLgHNTwKQw0GrUupsa+z9DIs5ab1AxuJQVhJDhUV XlX+cbbWoE5d3ER/OAyp0VHeOm2Cch802pxFAQVJpqMB2s4HNukfT/cw6olO1hMi0f6GSI lgsC4YWtg986/TnIjohHkcZYwo0CNOnwt1Ngo8O8Iv5VjRtwzNMqL8grMsS+udr43mR+6L 0RF+YLG/lQ00JL2ATHMrSj3lUA2UcYt1DFfsZvN6h1gGMdecCH3bWofQqBAJrQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MMXnw49BRzFw3; Tue, 6 Sep 2022 17:44:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 286Hia6R008739; Tue, 6 Sep 2022 17:44:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 286HiaU8008738; Tue, 6 Sep 2022 17:44:36 GMT (envelope-from git) Date: Tue, 6 Sep 2022 17:44:36 GMT Message-Id: <202209061744.286HiaU8008738@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Michael Reifenberger Subject: git: a025e9ce23e0 - main - cad/openscad-devel: Fix build List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mr X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a025e9ce23e0b36a27d3675a5ce3158e07ab181d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662486276; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=icp7IV7MyvuPrztLnPIQxQAQhdexoRYv81nB+lv8g4c=; b=Ke4hI4cCZOiKBouuBR5MlZAU5jzvwlX0ZbuV64Q1Omaz+jHYq7+NcHIgObCAeh5yZ3eF/c muWxTLYM8Y6gtaDCAUyg7zhnUAG5fbQfBUF8AehXkHbfYmR2Zk2LqWl+dc76xgJ6ATaP6p KaLpy6S8+GOsVN2L7DOEVzouCEhbfEpIeaa2aqYromIGVQxANFNCSEyYOynIhswSKQ7lJk k65T6FIZqOWOVgnTHg5mZdQMtfKOPVmXHC41RSRIyvYpTHy7MD1Wxyixt8WjL7+POrS1p4 E+0PBpsb4krPrApJvhx6qk3DNwEUELut+Af9zAR/rTphzS/mYwJ3vnY4BZ3zOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662486276; a=rsa-sha256; cv=none; b=keHXbYG0cuI3v1GdAfTDRy2P1Y1rimMhL+UeTiSzbuNHDR+0JYao8sfipRcLs8lED1V/wN 4a70oZT49dRtoimrLoO5/0xXb/YZsk2yryn9OdwOFz5ivKfmWCp9FrtzWLth49cPNpVGjL 0W/8lvFt2ChzOt/IeUSMWyoH4+iElwyeLXgMqaWOpRP0AuV67yoye+CLRUw+hxpBmqZV2n yZJON9PDPTsCLadfaC5F66g+dDebRfi2k9YcYilgdw43xRrvjW0VocREK9HF3pmQxjewSI XX9HPZq5HOaJg/uGWGqGe+ar8v+aWDailZq4km+C1LZ2uAhgLMuPvoeBJhngTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mr: URL: https://cgit.FreeBSD.org/ports/commit/?id=a025e9ce23e0b36a27d3675a5ce3158e07ab181d commit a025e9ce23e0b36a27d3675a5ce3158e07ab181d Author: Michael Reifenberger AuthorDate: 2022-09-06 17:39:13 +0000 Commit: Michael Reifenberger CommitDate: 2022-09-06 17:44:05 +0000 cad/openscad-devel: Fix build Remove qmake from USES. Remove buildtools, add qmake_build to USE_QT. Add two patches which got missed previously. This should satisfy the build. --- cad/openscad-devel/Makefile | 6 +++--- .../files/patch-cmake_Modules_FindQt5QScintilla.cmake | 10 ++++++++++ cad/openscad-devel/files/patch-src_handle__dep.cc | 8 ++++++++ 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/cad/openscad-devel/Makefile b/cad/openscad-devel/Makefile index 790240f858bf..0ee27c803d9c 100644 --- a/cad/openscad-devel/Makefile +++ b/cad/openscad-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= openscad PORTVERSION= 2022.09.03 -#PORTREVISION= 1 +PORTREVISION= 1 CATEGORIES= cad PKGNAMESUFFIX= -devel @@ -30,11 +30,11 @@ LIB_DEPENDS= libzip.so:archivers/libzip \ CONFLICTS= openscad USES= bison cmake compiler:c++14-lang cpe desktop-file-utils eigen:3 gettext \ - gl gnome pkgconfig qmake qt:5 shared-mime-info xorg + gl gnome pkgconfig qt:5 shared-mime-info xorg USE_GITHUB= yes USE_GL= gl glu glew USE_GNOME= cairo glib20 libxml2 -USE_QT= buildtools buildtools_build core concurrent_build dbus gui multimedia svg widgets +USE_QT= buildtools_build core concurrent_build dbus gui multimedia qmake_build svg widgets USE_XORG= x11 GH_ACCOUNT= microsoft:mimalloc GH_PROJECT= MCAD:mcad mimalloc:mimalloc diff --git a/cad/openscad-devel/files/patch-cmake_Modules_FindQt5QScintilla.cmake b/cad/openscad-devel/files/patch-cmake_Modules_FindQt5QScintilla.cmake new file mode 100644 index 000000000000..e9b1a9fac601 --- /dev/null +++ b/cad/openscad-devel/files/patch-cmake_Modules_FindQt5QScintilla.cmake @@ -0,0 +1,10 @@ +--- cmake/Modules/FindQt5QScintilla.cmake.orig 2021-10-23 02:33:13 UTC ++++ cmake/Modules/FindQt5QScintilla.cmake +@@ -50,6 +50,7 @@ find_path ( QT5QSCINTILLA_INCLUDE_DIR + ) + + set ( QT5QSCINTILLA_INCLUDE_DIRS ${QT5QSCINTILLA_INCLUDE_DIR} ) ++set (Qt5Widgets_LIBRARIES /usr/local/lib/qt5 /usr/local/lib /usr/lib ) + + # version + set ( _VERSION_FILE ${QT5QSCINTILLA_INCLUDE_DIR}/qsciglobal.h ) diff --git a/cad/openscad-devel/files/patch-src_handle__dep.cc b/cad/openscad-devel/files/patch-src_handle__dep.cc new file mode 100644 index 000000000000..6c23311f11e6 --- /dev/null +++ b/cad/openscad-devel/files/patch-src_handle__dep.cc @@ -0,0 +1,8 @@ +--- src/handle_dep.cc.orig 2021-10-23 10:18:49 UTC ++++ src/handle_dep.cc +@@ -1,3 +1,5 @@ ++#include ++#include + #include "handle_dep.h" + #include "printutils.h" + #include