gentoo auto-resync : 13:07:2024 - 12:26:41

8 files changed, 74 insertions, 6 deletions

diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index ed91a1360aff..181dca83d32d 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/swift/Manifest b/net-im/swift/Manifest
index 776be3136275..5777851f56ee 100644
--- a/net-im/swift/Manifest
+++ b/net-im/swift/Manifest
@@ -2,8 +2,9 @@ AUX swift-4.0.2-boost-1.69-compatibility.patch 2986 BLAKE2B e81cdaadaa7fe4972df1
 AUX swift-4.0.2-qt-5.15-compatibility.patch 245 BLAKE2B 77facc560f6cea3dedd7c3095b6e5d7a91ff956b80022dc8a27c93edac72884bfd7f484fc84052a47bccb184f4225eb90fcc3d30f925ee15e18d5c97037a0b16 SHA512 9e8adaec0e7b1e727a2f91a675eaea4f62b7f8a53fdbaaf2adf9e13d57a1df15e921f1aa1b876561c7eecd1a4602763a52b3e875cecebe139d6e338df1001b12
 AUX swift-4.0.3-gcc11-compatibility.patch 388 BLAKE2B a8b9d79d05accc9f07ec9db302bdf5a7757c5872a6dd66abc5765a109f6e69358dafc7e7c67208b6e7a15a88befb07b09d4a8629aceda83acc306c4b33899554 SHA512 27b4372eea344c98aaffe02d55550da62130d66d1abb967f3e6d236d58db33cea525448b3ed195c4397446af43d166ec3555b9f1f23637e3edfd73f9acb339e8
 AUX swift-4.0.3-libxml2-2.12-compatibility.patch 527 BLAKE2B 2e14b6b46ad7e47c2a2edbbb1d362d4c8bea93739670677bb00014cae7fd1aac603c0dffe64183d4c6a2410198f101300faa96692405e1da4cd0008f420be284 SHA512 a090a6d8e80a9e62d8f73a81d4d63e19d3e5b0209ffcdfa0ad19b9a179902013445ac363661eeaef0a484351f472bc9b86de8d0a987b9101a80bb6028a2be3d1
+AUX swift-4.0.3-miniupnpc.patch 756 BLAKE2B e79affa66798bb31ceedc25c8a12bcecef2ccc99e5c554f73678a4d7f018618ad0495870fe1ecdc44731140954516caa40066a0367299e5064fd67825c099f08 SHA512 f9fb87a0dfc366c8281a26f42f46477e250325247b4253292b077cd962edf15e5478785e43571015f365739095dd541038aa4e9a23b3c8ff83977a2828509aec
 AUX swift-4.0.3-reproducible-build.patch 732 BLAKE2B e40c7e9c5e18aec72c6cd6290e89badbb0d57d15bc30fb06baef1050c4be52f795593f43dc9715a0634d19b9c5a0bb2afbb4025de2b6aa8bd0deb074c748ee2c SHA512 4f90dba4ebbd4ae33b40eeeaa100e647a1ae5cd6e32ed21b6bcbdc52104b57d59bdcc7dbb907a1a751a30f91e1e234d695278d999574f1393d3aaf499484270f
 DIST swift-4.0.3-python3-compatibility.patch.gz 14964 BLAKE2B ec98bee12734eb00037433b2791817d24a0a53effa653268a886b59358fb82f8e6c05739165f2518c9c5ad5b7ddfcef90734964eb6de647a24197e69b333ebc9 SHA512 95e1a0c49158cbf1392442103c960e2d458a99b34c3f32cdb47fec2d195b709d6c4b0c2961b4c49d05c19e590f2e2ca836c6f559b960015030bf8375b0604c3f
 DIST swift-4.0.3.tar.bz2 15124142 BLAKE2B 23896b72ffecc5148ade806ec6610c5edfa67ae9000e28383c7cf5a3c8bf275a6fc8208d1d6e7c7715e75bf133869ed404fd35bfb13998849209def3aab46c07 SHA512 59ebf69391f2cbdce538f0ee925f55eec0e8463c2f9b90899cb314f2a036f40ebdc357c4b6a6d3b71ae800ccf6ee6df5ff6011949ea0bb189cdf3e9f231e9733
-EBUILD swift-4.0.3-r2.ebuild 4696 BLAKE2B d1b0951b1f1f10b54a39505355e18d3c3d62c4c8c1578962cfa626f6bd975bee269b01d50e18e7de47fdd681fd6bad117ba2f7c27a87727252fed6f3a56a16e8 SHA512 3f7299feb5eca49d783bf27aac00b3bd08c1d1696de23bcb5b2d904c99d6a75cc654e64deab59e9f623999da5164b0293d3a1bdbc857266a143e0ee9bd11ae93
+EBUILD swift-4.0.3-r2.ebuild 4824 BLAKE2B d53c4d705052ef7c43eab7b496900170bec153540acb49f7552e9005865219994ed560b788859c3c3f3d4215502cc93cd2143e11217daaa3898c26e8becf33a2 SHA512 e88634d96ed14989d4b416e8791ba0182d88040364a5368eb873c90a0d17fa67f6c991e10f7463e88bbe9bd5184d768a109bd4db52295e47d178abf89c2f3279
 MISC metadata.xml 572 BLAKE2B 844c5b114051f7e2292b7857c991d4c6ea9c52a7e697f5d7f93296f4047179da836519701425c3ac6e9fd9fae99d77565258e08f2493682b8f2629cac493344b SHA512 4ed15787f531624392d9e8489634094c99f32b2c077c1330d79713a662bb22c79bd808aa8c1616b21fb5824ec03908aa54ea1d1cf13aa3f011235ef3756a32c5
diff --git a/net-im/swift/files/swift-4.0.3-miniupnpc.patch b/net-im/swift/files/swift-4.0.3-miniupnpc.patch
new file mode 100644
index 000000000000..db717ff1213b
--- /dev/null
+++ b/net-im/swift/files/swift-4.0.3-miniupnpc.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/934054
+
+From: Bill Prendergast <dek.devel@baisenvar.info>
+
+Fix build with newer net-libs/miniupnpc (API 18)
+--- a/Swiften/Network/MiniUPnPInterface.cpp
++++ b/Swiften/Network/MiniUPnPInterface.cpp
+@@ -45,9 +45,16 @@ MiniUPnPInterface::MiniUPnPInterface() : p(new Private()) {
+     }
+ 
+     char lanAddress[64];
++#if MINIUPNPC_API_VERSION > 17
++    char wanAddress[64];
++    if (!UPNP_GetValidIGD(p->deviceList, &p->urls, &p->data, lanAddress, sizeof(lanAddress), wanAddress, sizeof(wanAddress))) {
++        return;
++    }
++#else
+     if (!UPNP_GetValidIGD(p->deviceList, &p->urls, &p->data, lanAddress, sizeof(lanAddress))) {
+         return;
+     }
++#endif
+     p->localAddress = std::string(lanAddress);
+     p->isValid = true;
+ }
diff --git a/net-im/swift/swift-4.0.3-r2.ebuild b/net-im/swift/swift-4.0.3-r2.ebuild
index 792b487871ed..8a2cbafdea9e 100644
--- a/net-im/swift/swift-4.0.3-r2.ebuild
+++ b/net-im/swift/swift-4.0.3-r2.ebuild
@@ -61,6 +61,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.0.3-libxml2-2.12-compatibility.patch
 	"${WORKDIR}"/${PN}-4.0.3-python3-compatibility.patch
 	"${FILESDIR}"/${PN}-4.0.3-reproducible-build.patch
+	"${FILESDIR}"/${PN}-4.0.3-miniupnpc.patch
 )
 
 pkg_setup() {
@@ -77,6 +78,9 @@ src_prepare() {
 	# Use correct LIBDIR for Lua
 	sed -e "s/lib/$(get_libdir)/g" -i Sluift/SConscript.variant || die
 
+	# bug #933871
+	sed -i -e 's:c++11:c++17:g' BuildTools/SCons/SConscript.boot || die
+
 	# Hack for finding Qt system libs
 	mkdir "${T}"/qt || die
 	ln -s "${EPREFIX}"/usr/$(get_libdir)/qt5/bin "${T}"/qt/bin || die
diff --git a/net-im/tokodon/Manifest b/net-im/tokodon/Manifest
index fda594760a8e..d295e00c07f2 100644
--- a/net-im/tokodon/Manifest
+++ b/net-im/tokodon/Manifest
@@ -1,5 +1,6 @@
+AUX tokodon-24.05.2-enable-exceptions.patch 1178 BLAKE2B 416b142c790f9d1bd6c5e29344543c49c259fcc9f5e112b3799b80cfa96ac77c626eef3c8f95710cd8d21f2461acd3786bdea326f856f57f7986ac225320020e SHA512 394258fcc8c741937721ea9e0555e45aa471cdd9bb91d7125d2a0efff88201458b4a2247f1ac15bc0e764f95e9549709af5c8c336a473724b9498eae3783e6f5
 DIST tokodon-23.08.5.tar.xz 335920 BLAKE2B 620de13602a8f846c980fc0e57a3c13c73725fca16c2ca7cbcd362d9339a531466f496aa8d4dd0e3f310fd2d87399b34f0c78f74bd9312d2a49190897f92ffd7 SHA512 1f21df479ebe31d2bc891b01fc465f5711445fb1bfefba7a90aec7d9eef304618487f1992cad82f4207928bb7398642db97038817b2aa602e9d77135c216f404
 DIST tokodon-24.05.2.tar.xz 539764 BLAKE2B 96acd0a25942922734b92528d5569890f07e7f9e8bc4440421b91e0f625a78c8e4d0ce185d554887d72d5a3aa27e15cddcaad6622331180e0e551f1c17090138 SHA512 85b5a4837075bf00830015cc022219fc1bfb9a83c03649917bcabe79a21405c6d3937a1fc16199a75f7ecca71c190ac82aada130ada83e6920a1fac267239733
 EBUILD tokodon-23.08.5-r1.ebuild 1350 BLAKE2B 6475f0eb1e6facd825bc2e2c56089b215a95c6742221ae47011c789b240e4c8f1e11bee731c54a0008617117737038207d11eba81a7311eab05fb9f8162bf2bc SHA512 990f49c37dd54c38a4877d09c98f55b1564171b826e285b67bc3059d34f6a29e825ab30ca5e940ab98dba2adf337aa27a6745fbab8630fdcfc57a72337eb5e10
-EBUILD tokodon-24.05.2-r1.ebuild 1632 BLAKE2B 514836d5683d806e10f1041bc36d85d88ebf04964e1564aa313397296ec334d107b1dbf2d3be05de6023f1da93133e66ba63ef32eb093889592d036b760ee70a SHA512 60589c7dd87fd346b961c830524449a71c2b7ba72b3eb8a4450df6c4a305d9cf9bd02dc26720c825a74695ee72d17c96796be8ed5bade06113dfd88647897dce
-MISC metadata.xml 521 BLAKE2B 8c587496e73c1ee496d2ac2527cbb9c20577ec64c536a48f4e4635478cdb4063b9228f5a24c6dfec8742ea0811a864b352f21541d1cd5d971c6e8140325cbf85 SHA512 ca40368c654d248f77dbead5c97ca8b49432c85826eae380087718b9c7aa359e50df6186f015b26ab2181f5c51660032810a98c132e8d897517c44dbce46897d
+EBUILD tokodon-24.05.2-r2.ebuild 1760 BLAKE2B f697d26d50920b1a9479fb64239cf6d0b49dd6f585ae5eb24cf79638d0f0e03616cd4833ffb068bd2f78621f8528f4a9e32198a81eaf9df311cff3d14f76c94f SHA512 29b66113aaef332780af6e9c67c5cdfe0916fb278273a6e502ca6d91127c92cbc0baf6fd47e3edc02abee24e7c38b118427d98144736c1900b233a1d96195222
+MISC metadata.xml 650 BLAKE2B 09307d4f8ef2813b31f884fd04cfbd7cae96784fe2be624a417a60f369554ccee56324f590e2c9bf807849fecf7741c79fad585755e1080233f3884428fdaa98 SHA512 43245fca0e7fee093f8c41672b87593867ad8045547b11f963c2f28d12467b5885418db628c7a50317df97fcb6d1a6f9e8ab88e275a9bac9f3eaa6dbe2848ecc
diff --git a/net-im/tokodon/files/tokodon-24.05.2-enable-exceptions.patch b/net-im/tokodon/files/tokodon-24.05.2-enable-exceptions.patch
new file mode 100644
index 000000000000..bc48595b2838
--- /dev/null
+++ b/net-im/tokodon/files/tokodon-24.05.2-enable-exceptions.patch
@@ -0,0 +1,34 @@
+From e55359ddc139c2a6296b67990dee47478a4fadc8 Mon Sep 17 00:00:00 2001
+From: Joshua Goins <josh@redstrate.com>
+Date: Fri, 12 Jul 2024 12:00:43 -0400
+Subject: [PATCH] Enable C++ exceptions even when building with QtMultimedia
+
+This is also needed in blurhash.cpp, which breaks in certain system
+configurations that don't enable exceptions by default. Now it's turned
+on regardless of the USE_QTMULTIMEDIA CMake option.
+
+I also added a note for future people to discover why this is turned on.
+---
+ src/CMakeLists.txt | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index bca2cc094..73a8345ed 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -361,9 +361,11 @@ else()
+             utils/mpvplayer.h
+     )
+     target_link_libraries(tokodon_static PUBLIC MpvQt::MpvQt)
+-    target_compile_options(tokodon_static PRIVATE -fexceptions)
+ endif()
+ 
++# NOTE: Needed for MPV, but also for blurhash.cpp. We can look into making this more selective lter.
++target_compile_options(tokodon_static PRIVATE -fexceptions)
++
+ if (USE_QTWEBVIEW)
+     qt_target_qml_sources(tokodon_static
+             QML_FILES
+-- 
+GitLab
+
diff --git a/net-im/tokodon/metadata.xml b/net-im/tokodon/metadata.xml
index 3eddf8899b4b..0f8aab73a8f4 100644
--- a/net-im/tokodon/metadata.xml
+++ b/net-im/tokodon/metadata.xml
@@ -10,6 +10,7 @@
 		<remote-id type="kde-invent">network/tokodon</remote-id>
 	</upstream>
 	<use>
+		<flag name="mpv">Use <pkg>media-libs/mpvqt</pkg> instead of <pkg>dev-qt/qtmultimedia</pkg> for video playback (default)</flag>
 		<flag name="webengine">Use <pkg>dev-qt/qtwebengine</pkg> for built-in authentication page (default is external browser)</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-im/tokodon/tokodon-24.05.2-r1.ebuild b/net-im/tokodon/tokodon-24.05.2-r2.ebuild
index b4c6bd8d52d9..2bb862164ec8 100644
--- a/net-im/tokodon/tokodon-24.05.2-r1.ebuild
+++ b/net-im/tokodon/tokodon-24.05.2-r2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/tokodon/"
 LICENSE="CC-BY-SA-4.0 GPL-2+ GPL-3+ || ( LGPL-2.1+ LGPL-3+ ) MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64"
-IUSE="webengine"
+IUSE="+mpv webengine"
 
 # TODO: Add kunifiedpush support once packaged (cd01eb31d1ec298d4c1e10d25a0781d799161bfc)
 DEPEND="
@@ -37,7 +37,8 @@ DEPEND="
 	>=kde-frameworks/kwindowsystem-${KFMIN}:6
 	>=kde-frameworks/purpose-${KFMIN}:6
 	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:6
-	media-libs/mpvqt
+	mpv? ( media-libs/mpvqt )
+	!mpv? ( >=dev-qt/qtmultimedia-${QTMIN}:6[qml] )
 	webengine? ( >=dev-qt/qtwebview-${QTMIN}:6 )
 "
 RDEPEND="${DEPEND}
@@ -46,9 +47,11 @@ RDEPEND="${DEPEND}
 "
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}/${P}-enable-exceptions.patch" ) # bug 935363
+
 src_configure() {
 	local mycmakeargs=(
-		-DUSE_QTMULTIMEDIA=OFF # bug 935363
+		-DUSE_QTMULTIMEDIA=$(usex !mpv)
 		$(cmake_use_find_package webengine Qt6WebView) # "only makes sense on mobile"
 	)