From nobody Sat Mar 26 12:22:11 2022 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 613261A3337F; Sat, 26 Mar 2022 12:22:11 +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 4KQdPb2Dzbz4qbh; Sat, 26 Mar 2022 12:22:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648297331; 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=+Yh1gpnZTuRS5JE+tYlhcU3X6+LWXcjk/r3xJ8wXg6I=; b=QlrQgpHoXpfqvaALPTsKIb+DjRcpxpeUmJ8tBGTCK1Gjhp6PWO9fbltzUsrlTM+cx0Kji8 t5QuSjSBFy5vJDC6//U3/RqgRIcvcUhK7Y3Rnb4MG7+MfVzcwkKO5m3q2QGGDyH/wQ2qbN GV3qFMIlN7+hoVIOJLbz1brS4+ar5XXqfdgI1E8VY1N+UWxtpscNANsD6xAnLrBcQOc8aE af9JJykaBPjNOkUYyWn3oAlu3E9yk/8RxsNXirX/S49N+dDKj0upGw/uz0MAESb26zuYKy 0fXdHvSTu9Ngh9qUyjshL3P17OGagWg5xpF9UKRA2Yj5RbQJkJUyncu0IGrSYg== 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 2D79720D8A; Sat, 26 Mar 2022 12:22:11 +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 22QCMBVm066494; Sat, 26 Mar 2022 12:22:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22QCMBks066493; Sat, 26 Mar 2022 12:22:11 GMT (envelope-from git) Date: Sat, 26 Mar 2022 12:22:11 GMT Message-Id: <202203261222.22QCMBks066493@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dimitry Andric Subject: git: 14bd6052d998 - main - converters/wkhtmltopdf: future-proof compiler version check 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: dim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 14bd6052d9987e3205672fc3f2874afd16279c30 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648297331; 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=+Yh1gpnZTuRS5JE+tYlhcU3X6+LWXcjk/r3xJ8wXg6I=; b=pRECDGjwskVt/hdAsTqdlsBXt85syyghAsNJ/G6RfcFTnwrzds8U0ZmdwttR/vOMS/Oh4P Pt5r7nNGhqsZgxPPzlxbC7kEJ4RaYE5s1QGwYrM6pz9s8botozSqW+JjX1zmJ2Fhl4Xj/3 3H+9z+cG9oI6Qr0GkhxRN0BqUD1CAYU5whc4sLJ+gnTDiIUDhIebq3Pb3S+duAtudkE4/B TqOyDMY28KqF3aMkhl85DWpkDN6nnxKVKdL3MSmRFAdSwMljFNtjVnqELAJ36Ppv0lxm9V B+sq83ZnTXta9RoABMezcuCmkWID+KBx/Wcz03N4qoApu+M+GCiJ2iAIwShnrg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648297331; a=rsa-sha256; cv=none; b=Y0f4Jc2xLGkgaDCcEC9aXSLswDcN9OKyijYDQvQffSVQWsYiVo7VL3/enj3axRrkIjlTCT lM62aAmOAEZo69lGtQO6zy1U3VdXAVpoyha96964iyG8cvQjl+7lmTDsDFu0PUQWmB37iB pnL8DiEI7OYGYZooDzZPuWczsZ0ir7h5XVOryetokgBIYJF9H0uCaXJEBBriyh1ezebHfg oUCzHttbJj/tZW2ErJts9oa/zkHoVbMGy7Q7q6I/bB2nDvp5pauNqPYCz0fFToZCvE5SOD oAb0XiC0NXPYxSFi0XwTJ1gLLP0PeYzTlInqTdWquyqRs+bH1c9OdufMvDO2UQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim (src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=14bd6052d9987e3205672fc3f2874afd16279c30 commit 14bd6052d9987e3205672fc3f2874afd16279c30 Author: Dimitry Andric AuthorDate: 2021-05-27 21:02:06 +0000 Commit: Dimitry Andric CommitDate: 2022-03-26 12:21:08 +0000 converters/wkhtmltopdf: future-proof compiler version check During an exp-run for llvm 14 (see bug 261742), it turned out that converters/wkhtmltopdf fails to build with clang 14: c++ -Wl,-rpath=/usr/local/lib/gcc8 -Wl,-O1 -pthread -shared -Wl,-soname,libwkhtmltox.so.0 -o libwkhtmltox.so.0.12.6 loadsettings.o logging.o multipageloader.o tempfile.o converter.o websettings.o reflect.o utilities.o pdfsettings.o pdfconverter.o outline.o tocstylesheet.o imagesettings.o imageconverter.o pdf_c_bindings.o image_c_bindings.o moc_multipageloader_p.o moc_converter_p.o moc_pdfconverter_p.o moc_imageconverter_p.o moc_pdf_c_bindings_p.o moc_image_c_bindings_p.o moc_converter.o moc_multipageloader.o moc_utilities.o moc_pdfconverter.o moc_imageconverter.o qrc_wkhtmltopdf.o -L/usr/local/lib -L/wrkdirs/usr/ports/converters/wkhtmltopdf/work/wkhtmltopdf-0.12.6/build/qt/lib -L/wrkdirs/usr/ports/converters/wkhtmltopdf/work/wkhtmltopdf-0.12.6/build/qt/plugins/codecs -lqcncodecs -L/wrkdirs/usr/ports/converters/wkhtmltopdf/work/wkhtmltopdf-0.12.6/build/qt/lib -L/usr/local/lib -lqjpcodecs -lqkrcodecs -lqtwcodecs -lQtWebKit -lQtSvg -lQtXmlPatterns -lQtGui -ljpeg -lpng -lXrender -l fontconfig -lfreetype -lXext -lX11 -lQtNetwork -lssl -lcrypto -lQtCore -lz -lm ld: error: unable to find library -lQtWebKit c++: error: linker command failed with exit code 1 (use -v to see invocation) gmake[2]: *** [Makefile:164: ../../bin/libwkhtmltox.so.0.12.6] Error 1 Ultimately this is caused by incorrect compiler version detection in wkhtmltopdf's configure script. Something similar was fixed for clang 12 in ports commit 1049d80399ac327964eca41e4188f988430c5f7c, and later for clang 13 in ports commit ad5fedf36832fd7e2447d8c4cb6b54128a2fcb20. To fix this, future-proof the compiler version check, at least until it goes higher than 99.x. PR: 262814 Approved by: pi (maintainer) MFH: 2022Q1 --- converters/wkhtmltopdf/files/patch-configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/converters/wkhtmltopdf/files/patch-configure b/converters/wkhtmltopdf/files/patch-configure index e891e62e62a9..167565dc496d 100644 --- a/converters/wkhtmltopdf/files/patch-configure +++ b/converters/wkhtmltopdf/files/patch-configure @@ -5,7 +5,7 @@ # Check gcc's version case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in - 8*|7*|6*|5*|4*|3.4*) -+ 13*|12*|11*|10*|9*|8*|7*|6*|5*|4*|3.4*) ++ [1-9][0-9]*|[4-9]*|3.4*) ;; 3.3*) canBuildWebKit="no"