gentoo auto-resync : 10:06:2024 - 00:08:04

6 files changed, 117 insertions, 2 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index eac08d8f0431..f5f418bbe4c1 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/librecad/Manifest b/media-gfx/librecad/Manifest
index ff414f9046dc..75d293957324 100644
--- a/media-gfx/librecad/Manifest
+++ b/media-gfx/librecad/Manifest
@@ -2,10 +2,11 @@ AUX librecad-2.1.3-boost-1.76.patch 1032 BLAKE2B 9c8893627fd43cb831d48e9f86472c0
 AUX librecad-2.1.3-gcc-9.patch 8494 BLAKE2B 85f7cfd7822d27c4b76b6cc9b71f9667b912ef80229e2a70110155d4b52f0e203b186ffb6a0be160d6d2aadcaf241994d7f78d81a096d7540c46b946ed7cb892 SHA512 5adb8086244ec18e78f503b7522ea79213b629d297bb07fad0c21ae1e205731fd544aff7e979f1cc5709542a23311c771d61f13f4ba09f34baff9a24deae5eed
 AUX librecad-2.1.3-qt-5.11.patch 1396 BLAKE2B 80e637b724df81dce60c17354bed56a2329dd4c3f445b40ea18a4a49614f2ee34114e1b6cc008b29e2dbd7b65c53340aaa447173f6f4d23d80e1a8809131aae7 SHA512 5e4ae43ac89fc8acf779fec9e062cac3896f0e41b0bf7fdab91ef128ab1a20a4ecda71ef332d9af7403f11a813323cc509e0682e5ffdf97786599271a2711f25
 AUX librecad-2.1.3-qt-5.15.patch 1270 BLAKE2B 0947b13ff328e4f1c3ac04d846e7ed372d76d4858cecff5fe4ff8fc8c3c1558cd0e9ac53354e1f0b5b1d137db09c8205f034df9356b9b9e3206a611608fb8166 SHA512 b1a5afe1d22b7725c7d10a10bed5e52495cda7699ff20bd0f75bbfe28f7131a3d9cd5ec0a1ae7fd329196d2f88bb4b8336301fdb6efa073d773f31340a062ba0
+AUX librecad-2.2.0-fix-missing-header.patch 872 BLAKE2B cfa4d3908b6a1edd46ed9d624b5b6e4ee84c7935d5b047d10e85e319ace6748a27b6b9b93ccfd2f8c9e27ce72449a00ac27ffeb88e478422d1fac82fd20ff8d1 SHA512 3487425bc33eb706a68998369194c8005c7a50f244806d68555c706268e6d10bcab99abab90b5c86fb3615e344aa1f690eb4d1f40d44564e67555025c3bdf26e
 DIST librecad-2.1.3.tar.gz 22415288 BLAKE2B fb920113a7e4b2e9e7e3425f77364c36f6be676a3cd109798786b06d31698fd11437bc7f50cb843ca02d761730e83db7fde475d1bce6a65336a845b5b0114918 SHA512 246cffcc1ea3389997b4a738ab5e3d78e8c1096817ecb1ca28f38d601bc5d1a95f60798ac82308914a34da7b5dbc302b8363cf8b58a97221fdc8ee63010adc6c
 DIST librecad-2.2.0.tar.gz 13837301 BLAKE2B ede9181b6805455d10773b70a8262ffb5a1c48f353dbfd1b80f705ba3194be700e9a486cdf528c4e8015b327a75a29c81b832186024d48229a6cc5fd9ca2dc12 SHA512 df33eac311b5232d6fc0480be1b1c9d257a33ba22f9b7897af4c1761978c87c07a962ae3ea37e8728661a788152157fc621aae65d60d44ae37b2028919cc96a2
 DIST librecad-gentoo-CVE-patches-2.1.3.tar.gz 11687 BLAKE2B 4676fa60033e6d0ace35bbebfae569366a50ec46c2dc5b90bace9564e1f6c2020f733f63981788b6f5288fb0c57760215e7b35f294656c21787ebdefa8447fa0 SHA512 b485b41ab1d6eb61750c11a9b327fc70d28cd0cf689b3cd815b4982d3d800737f402522d9c3d416f1e43422166e7de4f97055de238cc2fe80cc45f11fa3377e6
 EBUILD librecad-2.1.3-r7.ebuild 2879 BLAKE2B 4b9da167e4db48da0c8a41bf43c3d5fcadabea9f57a82270fec85b18da2dd6823d60be0eea3bd4bad7f4324599c47fd4b020276f3a4a28f7be5a2d13004a5f8a SHA512 3ed191982b167c0cabdd28e5ab7702784e0da508f358a066507bde711cb5917c885de435985ea0636e96d1f94586f76c007607a7ec1e1f90cb14646724988546
-EBUILD librecad-2.2.0.ebuild 2355 BLAKE2B 4ab2a2186e504a9427aa85c9461c1bdccf48328009656a0068bd73f29509ceceaf979d820efa8051d5198c9b8c84717edda742bd60defcf0dc2e1e7214094378 SHA512 60dc6c491886bba2b5a9e58d971ecf79b4a06015eccefeceb4c4fdce64229b967da6166744ba4a2213a7272257509e2744b4fbb07c95dd8084374ea2c251982e
+EBUILD librecad-2.2.0.ebuild 2413 BLAKE2B 96ede5e05dda79f883dd89b2cd759e56400b2474b3609e135e0faa34904121694e396f34cd121a9b4df84afe57d818a1bb7ca253f6a894d96aff41a093dd89b2 SHA512 84d0f89d8f9f35ddb21a18537bcbc02cad1f665009e5f0c251fd78bc73baeb1f0273244e4e7b353bd97f4484a21542953e45042d8c53ab210677e6a49396990b
 EBUILD librecad-9999.ebuild 2357 BLAKE2B f1b84cd8486d81b2a11216448be1e7c36d8d4347bfe09297a472b31278fa9e7aeeb4d9f325ed234ac05a0ae6065280efd159b7847195bd868d0991f6101f6c04 SHA512 ca46b07e00004e93ff1fcc2be9ea55049fa92154ce26eca11d033476d66b401653106dfe0fd835e07421d67d651a9af27a9cc505a440f85b43d3ba0c76d17d40
 MISC metadata.xml 333 BLAKE2B 2790ea3fb043f1d8393fd715b4669edab3229e1de59e27cc70f3fd3cc13f83964ad1dc6a5534af981111b4ba1a2c7d29501015459e300905574fbc59fce88ee2 SHA512 bf932b64f53780d10e7e64845f4d50f1726f9d57e4625cb94ed2dcc761a0d7f409731b9e9cd1475880b283b43d7b0b979493b984cb243f09954a38f39baac5b9
diff --git a/media-gfx/librecad/files/librecad-2.2.0-fix-missing-header.patch b/media-gfx/librecad/files/librecad-2.2.0-fix-missing-header.patch
new file mode 100644
index 000000000000..3caec03b011a
--- /dev/null
+++ b/media-gfx/librecad/files/librecad-2.2.0-fix-missing-header.patch
@@ -0,0 +1,29 @@
+The patch is borrowed from upstream https://github.com/LibreCAD/LibreCAD
+
+https://github.com/LibreCAD/LibreCAD/commit/6e0f1556bbd554e528295f92597a80a109344607
+
+https://bugs.gentoo.org/919822
+
+commit 6e0f1556bbd554e528295f92597a80a109344607
+Author: Denis Pronin <dannftk@yandex.ru>
+Date:   Sun Jun 2 22:23:11 2024 +0300
+
+    fix compilation with clang and llvm's libcxx
+    
+    librecad/src/lib/debug/rs_debug.h requires cstdio to be included because of FILE
+     type being used
+    
+    Signed-off-by: Denis Pronin <dannftk@yandex.ru>
+
+diff --git a/librecad/src/lib/debug/rs_debug.h b/librecad/src/lib/debug/rs_debug.h
+index 23918574..8950efcc 100644
+--- a/librecad/src/lib/debug/rs_debug.h
++++ b/librecad/src/lib/debug/rs_debug.h
+@@ -28,6 +28,7 @@
+ #ifndef RS_DEBUG_H
+ #define RS_DEBUG_H
+ 
++#include <cstdio>
+ #include <iosfwd>
+ #ifdef __hpux
+ #include <sys/_size_t.h>
diff --git a/media-gfx/librecad/librecad-2.2.0.ebuild b/media-gfx/librecad/librecad-2.2.0.ebuild
index 092799ec110b..f86b8253e177 100644
--- a/media-gfx/librecad/librecad-2.2.0.ebuild
+++ b/media-gfx/librecad/librecad-2.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -40,6 +40,10 @@ BDEPEND="
 	dev-qt/linguist-tools:5
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix-missing-header.patch"
+)
+
 src_prepare() {
 	default
 
diff --git a/media-gfx/ueberzugpp/Manifest b/media-gfx/ueberzugpp/Manifest
index 97180c36b3a5..16a6e9d81949 100644
--- a/media-gfx/ueberzugpp/Manifest
+++ b/media-gfx/ueberzugpp/Manifest
@@ -1,3 +1,5 @@
 DIST ueberzugpp-2.9.5.tar.gz 69268 BLAKE2B 9a31c7d5135ca0c5b85e250f9cbb5fb10e22344a7c6bf5393a04ec928580844470b24b0471aa609a83a0f1cbfed17944aabdec9ee5d6ddffe90720fa46bf80ad SHA512 43576ba504ec66a909c170122db808a8ae55535d54cad09172590af2790c981b1bfba6ba0f749a5ca9881a15cfdcdb0c34fbb2533f72011a786fd1413d1f91c4
+DIST ueberzugpp-2.9.6.tar.gz 69379 BLAKE2B 86d29724ff768536bef2385d456d61509db58c8e83fe0c9711684f86b70e1e45d1d1bb7b970a036c408f575e8d31659b336111cfcc0dc39f7867010e56d9e79b SHA512 bb70933cbc887cc3967c6011f0616d056f5723f333f6cfd70e7a3dd785791b83b9855c0b3d0c901efc59d65ba113462946bc0f08d57cf845ec6c59ec861da874
 EBUILD ueberzugpp-2.9.5.ebuild 1940 BLAKE2B c13df15fd695f5d762ffdad4dccd95871e8e021b05cd6e128b0336957dbeb39e86478987f7062abbce382dffd45a408677f137261b58057a682e0991f42efafe SHA512 655e20ee8bf4354a4524abcd0be618a99f50241010304a00cc97601866065570fb7d91f930ce7ff16e21fd453236fcdadadb4d7136999f0ae17242d8f655423c
+EBUILD ueberzugpp-2.9.6.ebuild 1941 BLAKE2B 6f49e44bd5fb49730f7dc28d61855c28fd28ed48720fe22052ad92feb5c1123f7e090e709571e87064b508342d547b5719187201c68fd17de43187f10525795e SHA512 82f5055ab6f007c146d9db022c9f17b4a5700cba3f47f38bf30ef2eb8c5cafbd5dc32a20a95ee7492b1ec52d894370dcf6148af6f4d8082558fc946adb6378cf
 MISC metadata.xml 694 BLAKE2B e39b88b981e8c6d55a41714197b03c014a6ffd95522eb0ff92559a178b193419bd587903c75271167fba097593ac15ecacdba3b0f23e7859c3f1fd9569b4f6c2 SHA512 e86e8942c84ec38c198b513b0eaf63d522017665d559a1843c08030ec6bc6a32d7f32651d5b283e3d82784b81ea15b7d81889ab0c68850f88733ae90add17060
diff --git a/media-gfx/ueberzugpp/ueberzugpp-2.9.6.ebuild b/media-gfx/ueberzugpp/ueberzugpp-2.9.6.ebuild
new file mode 100644
index 000000000000..d3d4f397c2d9
--- /dev/null
+++ b/media-gfx/ueberzugpp/ueberzugpp-2.9.6.ebuild
@@ -0,0 +1,79 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic toolchain-funcs
+
+DESCRIPTION="Drop in replacement for ueberzug written in C++"
+HOMEPAGE="https://github.com/jstkdng/ueberzugpp/"
+SRC_URI="
+	https://github.com/jstkdng/ueberzugpp/archive/refs/tags/v${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="X dbus opencv opengl wayland xcb-errors"
+REQUIRED_USE="xcb-errors? ( X )"
+
+RDEPEND="
+	dev-cpp/tbb:=
+	dev-libs/glib:2
+	dev-libs/libfmt:=
+	dev-libs/openssl:=
+	dev-libs/spdlog:=
+	media-gfx/chafa
+	media-libs/libsixel
+	media-libs/vips:=
+	X? (
+		x11-libs/libxcb:=
+		x11-libs/xcb-util-image
+		xcb-errors? ( x11-libs/xcb-util-errors )
+	)
+	dbus? ( sys-apps/dbus )
+	opencv? ( media-libs/opencv:= )
+	opengl? ( media-libs/libglvnd )
+	wayland? ( dev-libs/wayland )
+	!media-gfx/ueberzug
+"
+DEPEND="
+	${RDEPEND}
+	dev-cpp/cli11
+	dev-cpp/nlohmann_json
+	dev-cpp/range-v3
+	X? ( x11-base/xorg-proto )
+	wayland? ( dev-libs/wayland-protocols )
+"
+BDEPEND="
+	wayland? (
+		dev-util/wayland-scanner
+		kde-frameworks/extra-cmake-modules
+	)
+"
+
+src_configure() {
+	if use X && tc-is-clang && has_version sys-libs/libcxx; then
+		# X support makes use of C++20's std::jthread which is currently
+		# marked experimental (at least) in <=libcxx-18 (should limit
+		# version in above libcxx check whenever this becomes unnecessary)
+		append-cxxflags $(test-flags-CXX -fexperimental-library)
+	fi
+
+	# TODO?: wayfire plugin is skipped for now (needs wlroots which is
+	# likely to be messier), but could be handled if there is a demand
+
+	local mycmakeargs=(
+		-DENABLE_DBUS=$(usex dbus)
+		-DENABLE_OPENCV=$(usex opencv)
+		-DENABLE_OPENGL=$(usex opengl)
+		-DENABLE_TURBOBASE64=no # not packaged
+		-DENABLE_WAYLAND=$(usex wayland)
+		-DENABLE_X11=$(usex X)
+		-DENABLE_XCB_ERRORS=$(usex xcb-errors)
+		-DFETCHCONTENT_FULLY_DISCONNECTED=yes
+	)
+
+	cmake_src_configure
+}