From aa594b97fdb2ee6d9a745eea19c9fdf7d9d07700 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 16 Nov 2023 16:48:05 +0000 Subject: gentoo auto-resync : 16:11:2023 - 16:48:05 --- app-backup/Manifest.gz | Bin 7875 -> 7871 bytes app-backup/bacula/Manifest | 3 ++- app-backup/bacula/bacula-13.0.3-r2.ebuild | 5 +++++ app-backup/bacula/files/tray-monitor-pro.patch | 15 +++++++++++++++ 4 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 app-backup/bacula/files/tray-monitor-pro.patch (limited to 'app-backup') diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz index 4acf606ff41e..43e12706f1cc 100644 Binary files a/app-backup/Manifest.gz and b/app-backup/Manifest.gz differ diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest index aa5fdbc64ef2..2f2f5a6523e8 100644 --- a/app-backup/bacula/Manifest +++ b/app-backup/bacula/Manifest @@ -14,6 +14,7 @@ AUX fix_tray_monitor.patch 432 BLAKE2B a4c011e439978c9d767ac3aa82cc7c110ec1f93fd AUX newscripts/bacula-dir.initd 391 BLAKE2B 80cc13d6f946e5faad95774b3cc3f4575c28b826af618bb241a4acfafb01bace37e24dae4e90cabeeb2d0ac32a224ec27a69c6e4ae2502cb34113bd32df5208f SHA512 8364fe26ef042f03ac2e3868e577e28a8b9bc1de0e53391140696d91c5df78df456292ee359e12ddf371452305e1aaffaa391b1cb3482c6c8e17154259b3cc35 AUX newscripts/bacula-fd.initd 324 BLAKE2B cfc134247570538fed3aa1a96e51a45704cd747bda65e5bcdc6461bbcea27634909675a9c46eb3f00607c5ac8afdb481ca8ce1cd80e006bf00b59e78db58c750 SHA512 9c998c0deafe2882edbbd2ddd7e9bdc0f6cae3752a0e0f875d2350cf8eda20fb5bdb6781d1a57303cf4ebf8e719bdd7396fb0fed81726d752d035c82f26cc5cf AUX newscripts/bacula-sd.initd 324 BLAKE2B fe9c1c5893d9e8c80d906e4c31e2645414674b0b26aaca7ec54217ccff90cf2718c5e3fa3dc28079693fb742765178c4d8fd1f7eceac4a205ce4b1995b0f212f SHA512 df6d7b20a8ce8622bf1c4806384a5fae0178e331d5355de2e2d2bfb29204ec627964752a53828cd0aa6a37bd61522638a7267568f86e0b0ebbcdcc12bb176d9a +AUX tray-monitor-pro.patch 651 BLAKE2B 87a75a10fe709ca780ddb721576808b0a5ffe6f489fbe2844e7150586e5a114b4771646ba1b6fd3f1fb0d2a606080e69eff1fadb3fc2eb4a90d3c8fe1d4de2a6 SHA512 0e68e9867307e5fb978f1a54b2efe20a07bebf9d9651cfbf0a0c789751336cf131fd0f07f313b73ed7d0b8f2a26c1fb6c737936a048ad3c0cf8a9e1dd094601b DIST bacula-11.0.6.tar.gz 5986763 BLAKE2B 60b1c1f4de3cef7470f0f33aa9d361393cee176222bb911d93bac108b8e3a6e38d73acdcc8b773a06d8820039d2e12a4216a5773a4fab4a9c35095607bd6b7c6 SHA512 44abc9e3598f3d3beea3e85cca0867e4b9b77c4e7a17cb1902a5e952b049fb2b15f8f6319436fce1dd92ad52d26f04d7225dd052372ecc30aa55fb668a639149 DIST bacula-13.0.2.tar.gz 6229127 BLAKE2B 4ff00d995211e92306ac83889d2afab968cba94a711ba9ea88e2e749c09087b87486ed4233ca62316d020721d60891faa8b8a46d40853d4de3ef144291be2b5b SHA512 5bb6fe935881718879df2ffcfd6bf4a74ee89b224265c44f6e470ec18253f68e93ccc576c374ef9fb9e1755d7f6e60193aee7136d084cedf12d3ffb6a52187bc DIST bacula-13.0.3.tar.gz 6235649 BLAKE2B c1053e784f995aa45f2810a8b1370211a6e42f9512c11e0290f059d0e39489c24d4a7951fa055a00ecd2c4acb44581cc220271952c6d477d15c86e0a7e8680f7 SHA512 59ec616535959bde26b5b03a60355f3f8d80ae7a719a079d354f41c0f103b0e467177b6f813ef3eb4d30866f73c393d766e8337e20bb97f19ffd7eba5e5c59c5 @@ -22,5 +23,5 @@ EBUILD bacula-11.0.6-r5.ebuild 12403 BLAKE2B 7c57abed3f2c581d9d0fd5158644096f095 EBUILD bacula-11.0.6-r6.ebuild 12516 BLAKE2B b66af558175a9d985a28806df4e2cdc4425e4cb27a2ea4b818e7c624064ccd6f3279a94958df5e39f469987e7bd626bd3173935d53359aae98d79d3f86a5ce03 SHA512 32261ea7a73e5825770441cf7451781dab4f7641b7a8d47d6f9f90ea673f32b6a957516c70e1d62a4bb99f0cd23ce267c65b52389e01165149e32b71d0c5b2fa EBUILD bacula-13.0.2-r2.ebuild 12409 BLAKE2B e7908c30254dbb8b6f978a6a667ba5998169c7c26c6b70b59cbc279761e53bfefd6b290e513c0b21a6cf9f6fe081d3d7b4254f921158176bf57902978f8a367f SHA512 42d54f0eddae231319de7b62d1257dde2d154b3fe9117115f6863e3000635d92e8f45d69a8c73adafe8ce09f17385d452b9ed8ed435fa7c8b52c1516f8532aa6 EBUILD bacula-13.0.3-r1.ebuild 12457 BLAKE2B da85f64e6f386cd93240336fede27599b3511ced789d848b32e511e26aecc5068e6755de9e4c34f3de24069228b5de4a19c1b7ea2bc58e4cbc20a1fbdc3468f2 SHA512 d28586b5cd9cbdd5a83a5087b198449eb40049073427ddd2ac62a5c3d8e15215add7f0281173302ec4665103d39e70708e06d7c889cbbe39f47e890e6951f94f -EBUILD bacula-13.0.3-r2.ebuild 12969 BLAKE2B d31d2773665e3e6b5c637fb873f459302c9e5297b823979078bf760c0ffb199a6882fc59c8393367127c556af60bc8e97e49f8dc3754e55ca0bd9e50d9784d52 SHA512 5ebf1286fb11b929a740108cc7f0d27766158d7349eeb4bdb363d1864839875b923a83bd5514fe60a07c59e768d77b25e3a65aaf761f22b8c3a83a0aa157c9c8 +EBUILD bacula-13.0.3-r2.ebuild 13168 BLAKE2B 0c3555c7b863ab52df7f5541222762a07def554400b5d3108b3e3fcb4af1e79e64551ae75cfc660d6ecc3c8b639fc56f465d4da562837e876929a2f3acb98ea4 SHA512 56a85be521ce1dd912ddbcbd238a1e31d0f7b6d3eb22bfbe4f7e7c2e45831582f13e0491a285cb7d650c19e2747c594e3f1cf27245380240f00cb72d2a0d8dc0 MISC metadata.xml 747 BLAKE2B bae193fb0ae5e5e92b0b6e935691f19235a230b0a7e69083aeb344db0e451ca55f16c9f3c163eab390621ab266e0f7f7ee1e75eff69589b2de0c730d2cf0d965 SHA512 df7c2a1296cb7da96928de07347df04f741b8b91de72d39c002dda3e5c9564341a5bc73b60f68752a806175fd5709b35f1eb4ecf00e85e1237c4672c0b948557 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 + -- cgit v1.2.3