Merge updates from master

2026-07-18 03:23:20 -04:00 · 2021-04-08 17:34:54 +00:00
parent 80a32b6576 ee17cfaf05
commit 6b5c04c430
24 changed files with 129 additions and 31 deletions
--- a/dev-libs/open62541/open62541-1.1.5.ebuild
+++ b/dev-libs/open62541/open62541-1.1.5.ebuild
@@ -57,6 +57,13 @@ PATCHES=(
 	"${FILESDIR}/${P}-tests.patch"
 )

+src_prepare() {
+	# bug 780912
+	sed -i -e 's/check_add_cc_flag("-Werror")//g' CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=ON
--- a/dev-vcs/gitahead/gitahead-2.6.3.ebuild
+++ b/dev-vcs/gitahead/gitahead-2.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@@ -24,6 +24,7 @@ RESTRICT="test"
 IUSE="gnome-keyring"

 RDEPEND="
+	dev-qt/linguist-tools:5
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
--- a/games-arcade/taisei/taisei-1.3.1.ebuild
+++ b/games-arcade/taisei/taisei-1.3.1.ebuild
@@ -27,7 +27,7 @@ DEPEND="
 	media-libs/freetype:2
 	>=media-libs/libpng-1.5
 	media-libs/libsdl2
-	media-libs/sdl2-mixer
+	media-libs/sdl2-mixer[opus]
 	media-libs/libwebp
 	sys-libs/zlib
 	zip? ( dev-libs/libzip )
--- a/games-arcade/taisei/taisei-9999.ebuild
+++ b/games-arcade/taisei/taisei-9999.ebuild
@@ -27,13 +27,14 @@ DEPEND="
 	media-libs/freetype:2
 	>=media-libs/libpng-1.5
 	media-libs/libsdl2
-	media-libs/sdl2-mixer
+	media-libs/opusfile
 	media-libs/libwebp
+	app-arch/zstd
 	sys-libs/zlib
 	zip? ( dev-libs/libzip )
 "
 BDEPEND="
-	>=dev-util/meson-0.49
+	>=dev-util/meson-0.53
 	${PYTHON_DEPS}
 	doc? ( dev-python/docutils )"

--- a/games-util/itch-bin/itch-bin-25.4.0.ebuild
+++ b/games-util/itch-bin/itch-bin-25.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@@ -16,6 +16,7 @@ SLOT="0"
 BDEPEND="|| ( app-arch/zip app-arch/unzip )"
 RDEPEND="
 	x11-libs/gtk+:3[X,cups]
+	x11-libs/libXtst
 	gnome-base/gconf
 	dev-libs/nss
 	media-libs/alsa-lib
--- a/games-util/itch-bin/itch-bin-25.4.1.ebuild
+++ b/games-util/itch-bin/itch-bin-25.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@@ -16,6 +16,7 @@ SLOT="0"
 BDEPEND="|| ( app-arch/zip app-arch/unzip )"
 RDEPEND="
 	x11-libs/gtk+:3[X,cups]
+	x11-libs/libXtst
 	gnome-base/gconf
 	dev-libs/nss
 	media-libs/alsa-lib
--- a/gui-apps/corekeyboard/corekeyboard-4.0.0.ebuild
+++ b/gui-apps/corekeyboard/corekeyboard-4.0.0.ebuild
@@ -27,6 +27,7 @@ DEPEND="
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
 	gui-libs/libcprime
+	x11-libs/libXtst
 "
 RDEPEND="
 	${DEPEND}
--- a/gui-apps/corekeyboard/corekeyboard-4.1.0.ebuild
+++ b/gui-apps/corekeyboard/corekeyboard-4.1.0.ebuild
@@ -27,6 +27,7 @@ DEPEND="
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
 	gui-libs/libcprime
+	x11-libs/libXtst
 "
 RDEPEND="
 	${DEPEND}
--- a/gui-apps/corekeyboard/corekeyboard-4.2.0_alpha.ebuild
+++ b/gui-apps/corekeyboard/corekeyboard-4.2.0_alpha.ebuild
@@ -29,6 +29,7 @@ DEPEND="
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
 	gui-libs/libcprime
+	x11-libs/libXtst
 "
 RDEPEND="
 	${DEPEND}
--- a/gui-apps/corekeyboard/corekeyboard-9999.ebuild
+++ b/gui-apps/corekeyboard/corekeyboard-9999.ebuild
@@ -29,6 +29,7 @@ DEPEND="
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
 	gui-libs/libcprime
+	x11-libs/libXtst
 "
 RDEPEND="
 	${DEPEND}
--- a/gui-apps/coretoppings/coretoppings-4.0.0.ebuild
+++ b/gui-apps/coretoppings/coretoppings-4.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@@ -23,6 +23,7 @@ SLOT="0"
 IUSE="location pulseaudio"

 DEPEND="
+	dev-libs/libdbusmenu-qt
 	dev-qt/qtbluetooth:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
--- a/gui-apps/coretoppings/coretoppings-4.1.0-r1.ebuild
+++ b/gui-apps/coretoppings/coretoppings-4.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@@ -23,6 +23,7 @@ SLOT="0"
 IUSE="location pulseaudio"

 DEPEND="
+	dev-libs/libdbusmenu-qt
 	dev-qt/qtbluetooth:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
--- a/gui-apps/coretoppings/coretoppings-4.2.0_alpha.ebuild
+++ b/gui-apps/coretoppings/coretoppings-4.2.0_alpha.ebuild
@@ -25,6 +25,7 @@ SLOT="0"
 IUSE="location pulseaudio"

 DEPEND="
+	dev-libs/libdbusmenu-qt
 	dev-qt/qtbluetooth:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
--- a/gui-apps/coretoppings/coretoppings-9999.ebuild
+++ b/gui-apps/coretoppings/coretoppings-9999.ebuild
@@ -25,6 +25,7 @@ SLOT="0"
 IUSE="location pulseaudio"

 DEPEND="
+	dev-libs/libdbusmenu-qt
 	dev-qt/qtbluetooth:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
--- a/gui-apps/paperde/Manifest
+++ b/gui-apps/paperde/Manifest
@@ -0,0 +1,2 @@
+DIST paperde-0.1.0_alpha.tar.gz 2238045 BLAKE2B 90fa2948484e53c6c30e2b8258da037043e5e71915c77cbe5bf959b85aea87bbde6d9bdf0afa1d398a617f1062027a37c62d78b98429ffcc88ec61f819c26907 SHA512 85affe98ba697e7d79fcf9356ad485ed29c8a099bff773ebc01637ae34c9101ca82e63370b2298801173903bc1d7a257614ce82f58c2ea669b6f0496f3cc1400
+DIST paperde-0_p20210310.tar.gz 2239576 BLAKE2B 8aea8e44e845dbdf7c8e01841cd9d8b7897cfed32ddad9e86ef33afc40be19adf76db356fbc59927adf3e2c3fed91c76e8df4a73bffd836db465703f69c9c5dc SHA512 5e5f0ee83ccae6487608446440437e00718027322532afe81b5d173f9385d899686e7e2f008e4ac95ee9f6756d25dbf1b010d35c6e5f84cce198bf9c1c52c6ab
--- a/gui-apps/paperdesktop/files/paperdesktop-0_p20201107-build.patch
+++ b/gui-apps/paperdesktop/files/paperdesktop-0_p20201107-build.patch
--- a/gui-apps/paperde/metadata.xml
+++ b/gui-apps/paperde/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="person">
+        <email>gentoo@aisha.cc</email>
+        <name>Aisha Tammy</name>
+    </maintainer>
+    <maintainer type="person">
+        <email>xgqt@riseup.net</email>
+        <name>Maciej Barć</name>
+    </maintainer>
+    <upstream>
+        <remote-id type="gitlab">cubocore/paper/paperde</remote-id>
+    </upstream>
+</pkgmetadata>
--- a/gui-apps/paperdesktop/paperdesktop-9999.ebuild
+++ b/gui-apps/paperdesktop/paperdesktop-9999.ebuild
@@ -3,20 +3,21 @@

 EAPI=7

+# _alpha -> -alpha
+MY_PV="${PV/_/-}"
+
 inherit cmake xdg

 DESCRIPTION="Simple, sleek QT based DE for wayland using wayfire"
-
-HOMEPAGE="https://gitlab.com/cubocore/paper/paperdesktop"
+HOMEPAGE="https://gitlab.com/cubocore/paper/paperde"

 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/cubocore/paper/paperdesktop"
+	EGIT_REPO_URI="https://gitlab.com/cubocore/paper/${PN}.git"
 else
-	COMMIT=65c755306688203ddc32bbc099ba1de03166cde9
-	SRC_URI="https://gitlab.com/cubocore/paper/paperdesktop/-/archive/${COMMIT}/paperdesktop-${COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}"/paperdesktop-${COMMIT}
+	SRC_URI="https://gitlab.com/cubocore/paper/${PN}/-/archive/v${MY_PV}/${PN}-v${MY_PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
+	S="${WORKDIR}/${PN}-v${MY_PV}"
 fi

 LICENSE="GPL-3"
@@ -25,17 +26,20 @@ SLOT="0"
 DEPEND="
 	dev-libs/libdbusmenu-qt
 	dev-libs/wayland
+	dev-libs/wayland-protocols
 	dev-qt/designer:5
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5[wayland,X]
 	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5[X]
 	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5[X]
 	gui-libs/libcprime
 	gui-libs/libcsys
 "
-RDEPEND="${DEPEND}
-	gui-wm/wayfire[X]
+RDEPEND="
+	${DEPEND}
+	>=gui-wm/wayfire-0.7.0[X]
+	sys-apps/xdg-desktop-portal
 	x11-misc/qt5ct
 "

--- a/gui-apps/paperdesktop/paperdesktop-0_p20210310.ebuild
+++ b/gui-apps/paperdesktop/paperdesktop-0_p20210310.ebuild
@@ -7,15 +7,15 @@ inherit cmake xdg

 DESCRIPTION="Simple, sleek QT based DE for wayland using wayfire"

-HOMEPAGE="https://gitlab.com/cubocore/paper/paperdesktop"
+HOMEPAGE="https://gitlab.com/cubocore/paper/paperde"

 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/cubocore/paper/paperdesktop"
+	EGIT_REPO_URI="https://gitlab.com/cubocore/paper/${PN}"
 else
 	COMMIT=65c755306688203ddc32bbc099ba1de03166cde9
-	SRC_URI="https://gitlab.com/cubocore/paper/paperdesktop/-/archive/${COMMIT}/paperdesktop-${COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}"/paperdesktop-${COMMIT}
+	SRC_URI="https://gitlab.com/cubocore/paper/${PN}/-/archive/${COMMIT}/paperde-${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
 	KEYWORDS="~amd64"
 fi

--- a/gui-apps/paperde/paperde-9999.ebuild
+++ b/gui-apps/paperde/paperde-9999.ebuild
@@ -0,0 +1,57 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# _alpha -> -alpha
+MY_PV="${PV/_/-}"
+
+inherit cmake xdg
+
+DESCRIPTION="Simple, sleek QT based DE for wayland using wayfire"
+HOMEPAGE="https://gitlab.com/cubocore/paper/paperde"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/cubocore/paper/${PN}.git"
+else
+	SRC_URI="https://gitlab.com/cubocore/paper/${PN}/-/archive/v${MY_PV}/${PN}-v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/${PN}-v${MY_PV}"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+DEPEND="
+	dev-libs/libdbusmenu-qt
+	dev-libs/wayland
+	dev-libs/wayland-protocols
+	dev-qt/designer:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5[wayland,X]
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5[X]
+	gui-libs/libcprime
+	gui-libs/libcsys
+"
+RDEPEND="
+	${DEPEND}
+	>=gui-wm/wayfire-0.7.0[X]
+	sys-apps/xdg-desktop-portal
+	x11-misc/qt5ct
+"
+
+src_prepare() {
+	cmake_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DPKGSHAREDPATH="${EPREFIX}/usr/share/paperde"
+		-DPKGCONFPATH="${EPREFIX}/etc/xdg/paperde"
+	)
+	cmake_src_configure
+}
--- a/gui-apps/paperdesktop/Manifest
+++ b/gui-apps/paperdesktop/Manifest
@@ -1 +0,0 @@
-DIST paperdesktop-0_p20210310.tar.gz 2239536 BLAKE2B c1b5c296d36db9687e8e106d2608da057238e91c607443d4cb28725fc90b6c35e2ae14d178ad79be525d6262574a2d0f0b54ee71f3de02de25d3a3aa31465b03 SHA512 77f26cb61e9cd2d02eb7dfe2eab12d17a10d96007bc8d4dda8b30e9327d3036c9ad3341268df2f5151ed48e96a9facc4d66abc7ae10dcd04e284a20b3e29cea9
--- a/gui-apps/paperdesktop/metadata.xml
+++ b/gui-apps/paperdesktop/metadata.xml
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>gentoo@aisha.cc</email>
-		<name>Aisha Tammy</name>
-	</maintainer>
-</pkgmetadata>
--- a/media-sound/loudgain/loudgain-0.6.8.ebuild
+++ b/media-sound/loudgain/loudgain-0.6.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@@ -23,6 +23,15 @@ COMMON_DEPEND="
 RDEPEND="${COMMON_DEPEND}"
 DEPEND="${COMMON_DEPEND}"

+src_prepare() {
+	sed -e 's/^SET(CMAKE_C_FLAGS "/SET(CMAKE_C_FLAGS "${CMAKE_C_CFLAGS} /' \
+		-e 's/^SET(CMAKE_CXX_FLAGS "/SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /' \
+		-i CMakeLists.txt || die "cannot patch CMakeLists.txt"
+	cat CMakeLists.txt
+
+	cmake_src_prepare
+}
+
 src_install() {
 	cmake_src_install
 	dodoc README.md
--- a/profiles/updates/1Q-2021
+++ b/profiles/updates/1Q-2021
@@ -3,3 +3,4 @@ move sci-geosciences/geographiclib sci-geosciences/GeographicLib
 move x11-libs/kimageannotator media-libs/kimageannotator
 move x11-libs/kcolorpicker media-libs/kcolorpicker
 move media-video/jellyfin-mpv-shim media-video/jellyfin-desktop
+move gui-apps/paperdesktop gui-apps/paperde
				`@@ -1 +0,0 @@`
				`DIST paperdesktop-0_p20210310.tar.gz 2239536 BLAKE2B c1b5c296d36db9687e8e106d2608da057238e91c607443d4cb28725fc90b6c35e2ae14d178ad79be525d6262574a2d0f0b54ee71f3de02de25d3a3aa31465b03 SHA512 77f26cb61e9cd2d02eb7dfe2eab12d17a10d96007bc8d4dda8b30e9327d3036c9ad3341268df2f5151ed48e96a9facc4d66abc7ae10dcd04e284a20b3e29cea9`