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 504F0158089 for ; Thu, 16 Nov 2023 15:39:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8C7052BC013; Thu, 16 Nov 2023 15:39:17 +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 6314F2BC013 for ; Thu, 16 Nov 2023 15:39:17 +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 68E51335D2E for ; Thu, 16 Nov 2023 15:39:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C8937AAB for ; Thu, 16 Nov 2023 15:39:14 +0000 (UTC) From: "Thomas Beierlein" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Beierlein" Message-ID: <1700149127.a6598606a52d943e65e673eac4bdc10fd0447123.tomjbe@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/files/, app-backup/bacula/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-backup/bacula/bacula-13.0.3-r2.ebuild app-backup/bacula/files/tray-monitor-pro.patch X-VCS-Directories: app-backup/bacula/files/ app-backup/bacula/ X-VCS-Committer: tomjbe X-VCS-Committer-Name: Thomas Beierlein X-VCS-Revision: a6598606a52d943e65e673eac4bdc10fd0447123 X-VCS-Branch: master Date: Thu, 16 Nov 2023 15:39:14 +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: aefbe96f-4d79-469e-aaa0-f744d6d21e4a X-Archives-Hash: 0d1acacccd8f00bc1e080a92f2b75eb3 commit: a6598606a52d943e65e673eac4bdc10fd0447123 Author: Thomas Beierlein gentoo org> AuthorDate: Thu Nov 16 15:35:36 2023 +0000 Commit: Thomas Beierlein gentoo org> CommitDate: Thu Nov 16 15:38:47 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6598606 app-backup/bacula: further fixes for tray-monitor build * Do not strip binary * respect C/CXX/LDFLAGS Signed-off-by: Thomas Beierlein gentoo.org> app-backup/bacula/bacula-13.0.3-r2.ebuild | 5 +++++ app-backup/bacula/files/tray-monitor-pro.patch | 15 +++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/app-backup/bacula/bacula-13.0.3-r2.ebuild b/app-backup/bacula/bacula-13.0.3-r2.ebuild index 024d64df49ea..1c404587935e 100644 --- a/app-backup/bacula/bacula-13.0.3-r2.ebuild +++ b/app-backup/bacula/bacula-13.0.3-r2.ebuild @@ -126,6 +126,9 @@ src_prepare() { # bat needs to respect LDFLAGS and CFLAGS eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-bat-pro.patch + # tray-monitor needs to respect LDFLAGS and CFLAGS + eapply -p0 "${FILESDIR}"/tray-monitor-pro.patch + # bug #328701 eapply -p0 "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch @@ -140,6 +143,8 @@ src_prepare() { # do not strip binaries sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die sed -i -e "s/strip /# strip /" src/console/Makefile.in || die + sed -i -e "s/+= qt$/+= qt nostrip/" \ + src/qt-console/tray-monitor/tray-monitor.pro.in || die eapply_user diff --git a/app-backup/bacula/files/tray-monitor-pro.patch b/app-backup/bacula/files/tray-monitor-pro.patch new file mode 100644 index 000000000000..2781903cbb9f --- /dev/null +++ b/app-backup/bacula/files/tray-monitor-pro.patch @@ -0,0 +1,15 @@ +# Build of tray-monitor should respect LDFLAGS and CFLAGS +--- src/qt-console/tray-monitor/tray-monitor.pro.in.orig 2023-11-16 16:25:31.840100695 +0100 ++++ src/qt-console/tray-monitor/tray-monitor.pro.in 2023-11-16 16:26:26.453913247 +0100 +@@ -41,8 +41,9 @@ + QMAKE_LINK = $${LIBTOOL_LINK} $(CXX) + QMAKE_INSTALL_PROGRAM = $${LIBTOOL_INSTALL} install -m @SBINPERM@ -p + QMAKE_CLEAN += obj/* .libs/* bacula-tray-monitor release/bacula-tray-monitor +-QMAKE_CXXFLAGS += -DTRAY_MONITOR +-QMAKE_CFLAGS += -DTRAY_MONITOR ++QMAKE_CXXFLAGS += @CXXFLAGS@ -DTRAY_MONITOR ++QMAKE_CFLAGS += @CFLAGS@ -DTRAY_MONITOR ++QMAKE_LFLAGS += @LDFLAGS@ + + INSTALLS = bins confs +