From nobody Wed Oct 4 20:04:42 2023 X-Original-To: dev-commits-ports-all@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 4S15JC44wrz4w4fX; Wed, 4 Oct 2023 20:04:43 +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 4S15JC3Hvxz4Hrh; Wed, 4 Oct 2023 20:04:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696449883; 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=4VGHtr1YdrCAykHXm1Ua0/gvTWf557lBQTycJqeS7RQ=; b=nIobVG9NljbKCnNE5gLLPYHDEKEB3RR1IU8L74M52P86ATsE6IPbomOXZRleECZ9pN6Z5P t1yiYBrzGTmwmGjoO01haW+tl4xrC7ebDEzDwLe9ToXiTvk8tEE5ASMIyScs6cItHLkyXr FQRAgv+mXIUoUUJQZ44oaP0HKHZADUURFbF0g4TelaLFdkQDFsNHIwZq1ss7ICao8qUw3v ARw1o/NeO9sd7YaYpOV5ee/vJy7aPEA1hr3Wu50r9QYEkByGOfLl/imrZ1Rx9wbTOi2Os3 W1FC0xpLy2SkTf8m6wbA9dNFiBt32MRaHwHhEdanunUeVK2EMNO5UAhdSuMk8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696449883; a=rsa-sha256; cv=none; b=mrwz/0gUb7Pbp1H5aqCCJeeZnVvgktXORcnaFhv/s8mxEMeC5rNzBX8r9qqyvoUHZN0Rt7 OiWSi/BvIqnlRPvP+F3gLFzcM6NuKnSJjxyEB6xi89kgFpGz0bcmOhwSjZampdv9VhA1/A NWwmBFJqxNjFeCeUNPdhYzZsA12Bc3HANFuXJji7IZ5Io1BR2ASqqDrPnaReR0TmGgOHPk yVn1elgLX8Nt8SJmX9oERYwe8Fnw3IGEvmgj9ee7gIhIyyouqQTBy9ovNvEKl2c6Ih1iOJ ceS5jNCsUATo7qkAv/qH1Xgb7i+uksSDAajItu94z7Bepss4MudHgjI5C0/klw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696449883; 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=4VGHtr1YdrCAykHXm1Ua0/gvTWf557lBQTycJqeS7RQ=; b=yMxbczEtNsJYqj5PAeXtnXN23cGEwEgv2P1R8MjJA7KVke7x2zs5cviEH2rYmHwUQP/kBX /kDz/BVIMg2kKKjvQByabo5c+YwWpBQowAUxHhHXXEFSfXbnMQyvJcxQqUC0h2jfz8jg2M 0m5gxtXBEqUmPZpwjEOUym4UDJ7cuZ66ezU37tviTXarhCcPJO+zkv3tv+BNxjkf/5qaM5 owfPMILNvH1G53CT29cD5aGAvmBwAWltlz5Rfhib4ed9MPXVXj2ABtYK0V1mLcun/njx+y 9WCC5p8qNw4OLtacbF/FM2m/6vBkKyi+5ItBJvl1PQ4q97dXnd7ZhGblBpXZCg== 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 4S15JC0CBBzrbp; Wed, 4 Oct 2023 20:04:43 +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 394K4gt9057740; Wed, 4 Oct 2023 20:04:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 394K4gVZ057737; Wed, 4 Oct 2023 20:04:42 GMT (envelope-from git) Date: Wed, 4 Oct 2023 20:04:42 GMT Message-Id: <202310042004.394K4gVZ057737@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Robert Clausecker Subject: git: 434952705a2c - 2023Q4 - converters/wkhtmltopdf: fix build on armv7 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q4 X-Git-Reftype: branch X-Git-Commit: 434952705a2c7ef48cd884b72bb6f23fb8ed4d28 Auto-Submitted: auto-generated The branch 2023Q4 has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=434952705a2c7ef48cd884b72bb6f23fb8ed4d28 commit 434952705a2c7ef48cd884b72bb6f23fb8ed4d28 Author: Robert Clausecker AuthorDate: 2023-10-03 23:40:18 +0000 Commit: Robert Clausecker CommitDate: 2023-10-04 20:04:14 +0000 converters/wkhtmltopdf: fix build on armv7 Import an old QT4 patch to fix the build. Obtained from: b0d780b0342270fef8bd26b4ae301d18467f5d04 MFH: 2023Q4 (cherry picked from commit 6e1435185574836bea45bf9dab35b81b64fc158f) --- converters/wkhtmltopdf/Makefile | 1 - ...orm_graphics_filters_arm_FEGaussianBlurNEON.cpp | 11 ++++++++ ...latform_graphics_filters_arm_FELightingNEON.cpp | 16 ++++++++++++ .../files/patch-src_gui_kernel_qx11embed__x11.cpp | 29 ++++++++++++++++++++++ 4 files changed, 56 insertions(+), 1 deletion(-) diff --git a/converters/wkhtmltopdf/Makefile b/converters/wkhtmltopdf/Makefile index 95a2d2c62c0f..1fcd2ec5c1fc 100644 --- a/converters/wkhtmltopdf/Makefile +++ b/converters/wkhtmltopdf/Makefile @@ -13,7 +13,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE DEPRECATED= Upstream abandoned the project EXPIRATION_DATE= 2024-06-30 BROKEN_armv6= fails to build: error: Not supported ARM architecture -BROKEN_armv7= fails to build: error: invalid operand for instruction BROKEN_mips64= fails to link: undefined reference to __sync_add_and_fetch_4 RUN_DEPENDS= webfonts>=0:x11-fonts/webfonts diff --git a/converters/wkhtmltopdf/files/patch-src_3rdparty_webkit_Source_WebCore_platform_graphics_filters_arm_FEGaussianBlurNEON.cpp b/converters/wkhtmltopdf/files/patch-src_3rdparty_webkit_Source_WebCore_platform_graphics_filters_arm_FEGaussianBlurNEON.cpp new file mode 100644 index 000000000000..ded07e4bb198 --- /dev/null +++ b/converters/wkhtmltopdf/files/patch-src_3rdparty_webkit_Source_WebCore_platform_graphics_filters_arm_FEGaussianBlurNEON.cpp @@ -0,0 +1,11 @@ +--- src/3rdparty/webkit/Source/WebCore/platform/graphics/filters/arm/FEGaussianBlurNEON.cpp.orig 2023-10-03 22:33:30 UTC ++++ src/3rdparty/webkit/Source/WebCore/platform/graphics/filters/arm/FEGaussianBlurNEON.cpp +@@ -285,7 +285,7 @@ TOSTRING(neonDrawAlphaChannelGaussianBlur) ":" NL + "vmov.u32 " REMAINING_STRIDES_R ", " REMAINING_STRIDES_S0 NL + // Early return for 0 strides. + "cmp " REMAINING_STRIDES_R ", #0" NL +- "ldmeqia sp!, {r4-r8, r10, r11, pc}" NL ++ "ldmiaeq sp!, {r4-r8, r10, r11, pc}" NL + + // Initialize the sum variable. + "vmov.u32 " SUM_Q ", #0" NL diff --git a/converters/wkhtmltopdf/files/patch-src_3rdparty_webkit_Source_WebCore_platform_graphics_filters_arm_FELightingNEON.cpp b/converters/wkhtmltopdf/files/patch-src_3rdparty_webkit_Source_WebCore_platform_graphics_filters_arm_FELightingNEON.cpp new file mode 100644 index 000000000000..4397f3ac2e80 --- /dev/null +++ b/converters/wkhtmltopdf/files/patch-src_3rdparty_webkit_Source_WebCore_platform_graphics_filters_arm_FELightingNEON.cpp @@ -0,0 +1,16 @@ +--- src/3rdparty/webkit/Source/WebCore/platform/graphics/filters/arm/FELightingNEON.cpp.orig 2023-10-03 22:30:40 UTC ++++ src/3rdparty/webkit/Source/WebCore/platform/graphics/filters/arm/FELightingNEON.cpp +@@ -398,11 +398,11 @@ TOSTRING(neonDrawLighting) ":" NL + "vmin.f32 " TMP2_D0 ", " TMP2_D0 ", " CONST_ONE_HI_D NL + "vmul.f32 " TMP3_Q ", " COLOR_Q ", " TMP2_D0 "[1]" NL + "vcvt.u32.f32 " TMP3_Q ", " TMP3_Q NL +- "vmov.u32 r2, r3, " TMP3_S0 ", " TMP3_S1 NL ++ "vmov r2, r3, " TMP3_S0 ", " TMP3_S1 NL + // The color values are stored in-place. + "strb r2, [" PIXELS_R ", #-11]" NL + "strb r3, [" PIXELS_R ", #-10]" NL +- "vmov.u32 r2, " TMP3_S2 NL ++ "vmov r2, " TMP3_S2 NL + "strb r2, [" PIXELS_R ", #-9]" NL + + // Continue to the next pixel. diff --git a/converters/wkhtmltopdf/files/patch-src_gui_kernel_qx11embed__x11.cpp b/converters/wkhtmltopdf/files/patch-src_gui_kernel_qx11embed__x11.cpp new file mode 100644 index 000000000000..7091bedefde3 --- /dev/null +++ b/converters/wkhtmltopdf/files/patch-src_gui_kernel_qx11embed__x11.cpp @@ -0,0 +1,29 @@ +--- src/gui/kernel/qx11embed_x11.cpp.orig 2023-10-03 21:02:05 UTC ++++ src/gui/kernel/qx11embed_x11.cpp +@@ -483,7 +483,7 @@ QX11EmbedWidget::QX11EmbedWidget(QWidget *parent) + | ExposureMask | StructureNotifyMask + | SubstructureNotifyMask | PropertyChangeMask); + +- long data[] = {XEMBED_VERSION, XEMBED_MAPPED}; ++ long data[] = {static_cast(XEMBED_VERSION), XEMBED_MAPPED}; + XChangeProperty(x11Info().display(), internalWinId(), ATOM(_XEMBED_INFO), + ATOM(_XEMBED_INFO), 32, PropModeReplace, + (unsigned char*) data, 2); +@@ -1578,7 +1578,7 @@ void QX11EmbedContainer::showEvent(QShowEvent *) + { + Q_D(QX11EmbedContainer); + if (d->client) { +- long data[] = {XEMBED_VERSION, XEMBED_MAPPED}; ++ long data[] = {static_cast(XEMBED_VERSION), XEMBED_MAPPED}; + XChangeProperty(x11Info().display(), d->client, ATOM(_XEMBED_INFO), ATOM(_XEMBED_INFO), 32, + PropModeReplace, (unsigned char *) data, 2); + } +@@ -1594,7 +1594,7 @@ void QX11EmbedContainer::hideEvent(QHideEvent *) + { + Q_D(QX11EmbedContainer); + if (d->client) { +- long data[] = {XEMBED_VERSION, XEMBED_MAPPED}; ++ long data[] = {static_cast(XEMBED_VERSION), XEMBED_MAPPED}; + XChangeProperty(x11Info().display(), d->client, ATOM(_XEMBED_INFO), ATOM(_XEMBED_INFO), 32, + PropModeReplace, (unsigned char *) data, 2); + }