From nobody Mon Dec 04 11:49:07 2023 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 4SkMQC5X3qz53H6J; Mon, 4 Dec 2023 11:49:07 +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 4SkMQC4vZFz4Y9F; Mon, 4 Dec 2023 11:49:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701690547; 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=0q3z/mWOQ2SPaUqqASYiR1uOenFL5V7uRInw75Wvqpg=; b=wB0DEHaue459XXuKExYfIVMv3mv/uUGg8HSMm79uZaXd2rY86BcTOi/cQn90eutl3+YG6b BIWmrR9YVyBXN81lGzoFdLtLz1pFKZpoBjiT8m5Mnw9XAJvENKOtoeOtOvVAqDDbfZKnec Cet3iFUOxTIqH8TElMhkoPQnXLe91tNgqOVoWw8FLJqAKbllQcZmRkHRz2qYszZQtV3vnc ht+tghqJcnvRqIgqrXagBcewuuuGHoGYjJEiiWLN8a/3vSZqar8yoD1KFBUsK9CrggQkLZ vudbPnr+HAdDiew7Gc/F4WbWBFtMBQdtzpobjvEqVFjmNxBsYMWW9NFtHFZX7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701690547; 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=0q3z/mWOQ2SPaUqqASYiR1uOenFL5V7uRInw75Wvqpg=; b=vNE+XqnxWsskfbrDQfFKiEWti6mRI1a83jS7krbsOv9YQEcH9utXUbf9xzFCUbnOPkILsf Lg9IZnsFZ76nJz6GMmVZGEB2jNuW/WWSRyu0JMSP7ewtQcpemHrCBy+RvlAhQqPEjlgOx+ DvE50XjjDmnM14lE+UWSbTI8YTp+UxC3iVnL9IuJY2HxRYSbNWpfGRQdAlrkggSfbh8Afc B0SfbF0fNLbWZqpuyNO5RCtcUEjs6dDDVS80YK7zepzU3Em4n43WTORdHonqS89jRqrY6b afS3YeoUFfdAw+NLzbbXJFfSeAOIoR2oUwr9f1isPQKCz4sC6orOWEaSlXoxAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701690547; a=rsa-sha256; cv=none; b=cAz9P2sqNfWlxoFxZ3wv1UfgVviwLywb+wt9L7W36eMINeNdyKBh9BBN8TOwxk1fU7vD3Y xrWu1kSFwbw52LW/O/tY6CXFiIpYPJqamQ4vH627lLginBg868i9xaeHrEqXjOaiRyJmYl 7zd7fMtnDEQOb1/nSPJqC7vGVPezdaQNJZGK0c6KnVSvTguAf5Inwc5ZqhVScMNOky6OOG PhCW5+949MxDkI8qU+hoVpXtu0nyHXQCPJ5bAu5sJemYWnpWIkSrRk14sYmzVjGMGcT3W1 cCcst5N+InU/OJpXYqHzdxlpfWm8eaygQcokvgBmOVIoxV2U9wmCSoIfySCB6Q== 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 4SkMQC3ydqz99V; Mon, 4 Dec 2023 11:49:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B4Bn75r027766; Mon, 4 Dec 2023 11:49:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4Bn77U027763; Mon, 4 Dec 2023 11:49:07 GMT (envelope-from git) Date: Mon, 4 Dec 2023 11:49:07 GMT Message-Id: <202312041149.3B4Bn77U027763@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Lorenzo Salvadore Subject: git: 83f9c8601b1d - main - converters/wkhtmltopdf: Always build with default GCC 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: salvadore X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 83f9c8601b1dfcfc6025ac27c26ea95cd3c47737 Auto-Submitted: auto-generated The branch main has been updated by salvadore: URL: https://cgit.FreeBSD.org/ports/commit/?id=83f9c8601b1dfcfc6025ac27c26ea95cd3c47737 commit 83f9c8601b1dfcfc6025ac27c26ea95cd3c47737 Author: Lorenzo Salvadore AuthorDate: 2023-11-23 15:45:25 +0000 Commit: Lorenzo Salvadore CommitDate: 2023-12-04 11:48:58 +0000 converters/wkhtmltopdf: Always build with default GCC - Building with the default GCC version (12) always works. - GCC 13, soon to become the default GCC version, also works. - It simplifies the port. - The port will not build with llvm 16. PR: 269313 Approved by: pi (maintainer) --- converters/wkhtmltopdf/Makefile | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/converters/wkhtmltopdf/Makefile b/converters/wkhtmltopdf/Makefile index bbff58274f82..97a70a82afad 100644 --- a/converters/wkhtmltopdf/Makefile +++ b/converters/wkhtmltopdf/Makefile @@ -1,6 +1,6 @@ PORTNAME= wkhtmltopdf PORTVERSION= 0.12.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= converters MAINTAINER= pi@FreeBSD.org @@ -20,7 +20,8 @@ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libpng.so:graphics/png -USES= compiler gmake iconv jpeg perl5 pkgconfig ssl xorg +USES= gmake iconv jpeg perl5 pkgconfig ssl xorg +USE_GCC= yes USE_XORG= x11 xext xrender USE_PERL5= build USE_LDCONFIG= yes @@ -56,10 +57,6 @@ MAKE_ARGS= INSTALL_ROOT="${STAGEDIR}${PREFIX}" .include -.if ${ARCH} == "i386" || ${ARCH} == "powerpc" || ${CHOSEN_COMPILER_TYPE} == gcc -USE_GCC= 10 -.endif - pre-patch: ${RMDIR} ${WRKSRC}/qt ${LN} -s ../qt-${WKQT_TAGNAME} ${WRKSRC}/qt