From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 00F8A158090 for ; Thu, 5 May 2022 00:11:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 25D36E07A9; Thu, 5 May 2022 00:11:24 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 03841E07A9 for ; Thu, 5 May 2022 00:11:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EF57A340BBE for ; Thu, 5 May 2022 00:11:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 317B944B for ; Thu, 5 May 2022 00:11:21 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1651709472.c9f89fde98fbb42678f1e168be438f99fe651473.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-mathematics/octave/files/octave-7.1.0-omit-qtchooser-qtver.patch X-VCS-Directories: sci-mathematics/octave/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: c9f89fde98fbb42678f1e168be438f99fe651473 X-VCS-Branch: master Date: Thu, 5 May 2022 00:11:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 19d36976-db4c-4704-9226-bea8206b1e85 X-Archives-Hash: e85df870b2796cdd24907ca8f0d52d8d commit: c9f89fde98fbb42678f1e168be438f99fe651473 Author: Sam James gentoo org> AuthorDate: Thu May 5 00:10:45 2022 +0000 Commit: Sam James gentoo org> CommitDate: Thu May 5 00:11:12 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9f89fde sci-mathematics/octave: use configure.ac patch More resilient and doesn't get blown away by subsequent autoreconf. Bug: https://bugs.gentoo.org/839285 Signed-off-by: Sam James gentoo.org> .../files/octave-7.1.0-omit-qtchooser-qtver.patch | 77 +++++----------------- 1 file changed, 18 insertions(+), 59 deletions(-) diff --git a/sci-mathematics/octave/files/octave-7.1.0-omit-qtchooser-qtver.patch b/sci-mathematics/octave/files/octave-7.1.0-omit-qtchooser-qtver.patch index 3dc9c3e1d191..2b16fbf411e1 100644 --- a/sci-mathematics/octave/files/octave-7.1.0-omit-qtchooser-qtver.patch +++ b/sci-mathematics/octave/files/octave-7.1.0-omit-qtchooser-qtver.patch @@ -1,63 +1,22 @@ -diff -urNp octave-6.4.0-orig/configure octave-6.4.0-dwok/configure ---- octave-6.4.0-orig/configure 2022-04-19 20:45:23.112463584 +0200 -+++ octave-6.4.0-dwok/configure 2022-04-19 20:44:19.024774083 +0200 -@@ -77543,9 +77543,6 @@ esac - fi - - if test -n "$MOC"; then -- if test -n "$QTCHOOSER"; then -- MOCFLAGS="-qt=$qt_version" -- fi - QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE moc" - else - QT_TOOLS_MISSING="$QT_TOOLS_MISSING moc" -@@ -77778,9 +77775,6 @@ esac - fi - - if test -n "$UIC"; then -- if test -n "$QTCHOOSER"; then -- UICFLAGS="-qt=$qt_version" -- fi - QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE uic" - else - QT_TOOLS_MISSING="$QT_TOOLS_MISSING uic" -@@ -78013,9 +78007,6 @@ esac - fi - - if test -n "$RCC"; then -- if test -n "$QTCHOOSER"; then -- RCCFLAGS="-qt=$qt_version" -- fi - QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE rcc" - else - QT_TOOLS_MISSING="$QT_TOOLS_MISSING rcc" -@@ -78248,9 +78239,6 @@ esac - fi - - if test -n "$LRELEASE"; then -- if test -n "$QTCHOOSER"; then -- LRELEASEFLAGS="-qt=$qt_version" -- fi - QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE lrelease" - else - QT_TOOLS_MISSING="$QT_TOOLS_MISSING lrelease" -@@ -78483,9 +78471,6 @@ esac - fi - - if test -n "$QCOLLECTIONGENERATOR"; then +https://bugs.gentoo.org/839285 +--- a/m4/acinclude.m4 ++++ b/m4/acinclude.m4 +@@ -2095,9 +2071,6 @@ AC_DEFUN([OCTAVE_CHECK_QT_TOOL], [ + if test -z "$m4_toupper([$1])_QTVER"; then + AC_CHECK_TOOLS(m4_toupper([$1]), [$1]) + if test -n "$m4_toupper([$1])"; then - if test -n "$QTCHOOSER"; then -- QCOLLECTIONGENERATORFLAGS="-qt=$qt_version" +- m4_toupper([$1])FLAGS="-qt=$qt_version" - fi - QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE qcollectiongenerator" + QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE $1" else - QT_TOOLS_MISSING="$QT_TOOLS_MISSING qcollectiongenerator" -@@ -78718,9 +78703,6 @@ esac - fi + QT_TOOLS_MISSING="$QT_TOOLS_MISSING $1" +@@ -2167,8 +2167,6 @@ AC_DEFUN([OCTAVE_CHECK_QT_VERSION], [AC_MSG_CHECKING([Qt version $1]) + QT_TOOLS_MISSING= - if test -n "$QHELPGENERATOR"; then -- if test -n "$QTCHOOSER"; then -- QHELPGENERATORFLAGS="-qt=$qt_version" -- fi - QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE qhelpgenerator" - else - QT_TOOLS_MISSING="$QT_TOOLS_MISSING qhelpgenerator" + if test $build_qt_gui = yes; then +- AC_CHECK_TOOLS(QTCHOOSER, [qtchooser]) +- + OCTAVE_CHECK_QT_TOOL([moc]) + OCTAVE_CHECK_QT_TOOL([uic]) + OCTAVE_CHECK_QT_TOOL([rcc])