From 2d6dd17171f573fe353110e8695ae8c42a5940e2 Mon Sep 17 00:00:00 2001 From: Oliver Freyermuth Date: Thu, 8 Apr 2021 13:15:16 +0200 Subject: [PATCH 01/12] games-arcade/taisei: Add missing dependency on opus. Closes: https://bugs.gentoo.org/780939 Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Oliver Freyermuth --- games-arcade/taisei/taisei-1.3.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/games-arcade/taisei/taisei-1.3.1.ebuild b/games-arcade/taisei/taisei-1.3.1.ebuild index cbecc2fbc9..26982cbef5 100644 --- 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 ) From 8586f53f8fe28e62cc5dc2d27775ad2a1005f415 Mon Sep 17 00:00:00 2001 From: Oliver Freyermuth Date: Thu, 8 Apr 2021 13:16:40 +0200 Subject: [PATCH 02/12] games-arcade/taisei: Adapt live ebuild to upstream refactoring. Dependency on SDL2-mixer is dropped, media-libs/opusfile and app-arch/zstd added, require newer meson. Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Oliver Freyermuth --- games-arcade/taisei/taisei-9999.ebuild | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/games-arcade/taisei/taisei-9999.ebuild b/games-arcade/taisei/taisei-9999.ebuild index cbecc2fbc9..9213c41242 100644 --- 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 )" From 13600b88e6c0aabc9e3c6e7fd4d4fe912b26a2c2 Mon Sep 17 00:00:00 2001 From: "Ronny (tastytea) Gutbrod" Date: Thu, 8 Apr 2021 16:18:25 +0200 Subject: [PATCH 03/12] games-util/itch-bin: Add dependency: x11-libs/libXtst. Closes: https://bugs.gentoo.org/780978 Signed-off-by: Ronny (tastytea) Gutbrod --- games-util/itch-bin/itch-bin-25.4.0.ebuild | 3 ++- games-util/itch-bin/itch-bin-25.4.1.ebuild | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/games-util/itch-bin/itch-bin-25.4.0.ebuild b/games-util/itch-bin/itch-bin-25.4.0.ebuild index abd7f7d939..290e04f542 100644 --- 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 diff --git a/games-util/itch-bin/itch-bin-25.4.1.ebuild b/games-util/itch-bin/itch-bin-25.4.1.ebuild index 6eee905841..1df8a51fa9 100644 --- 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 From 9f7bd2a1581d8c9684f20cd47c2f5842f9161d31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Bar=C4=87?= Date: Thu, 8 Apr 2021 16:29:29 +0200 Subject: [PATCH 04/12] gui-apps/coretoppings: add missing libdbusmenu-qt dep MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: https://bugs.gentoo.org/781044 Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Maciej Barć --- gui-apps/coretoppings/coretoppings-4.0.0.ebuild | 3 ++- gui-apps/coretoppings/coretoppings-4.1.0-r1.ebuild | 3 ++- gui-apps/coretoppings/coretoppings-4.2.0_alpha.ebuild | 1 + gui-apps/coretoppings/coretoppings-9999.ebuild | 1 + 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gui-apps/coretoppings/coretoppings-4.0.0.ebuild b/gui-apps/coretoppings/coretoppings-4.0.0.ebuild index 0fa865a465..3d79214e02 100644 --- 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 diff --git a/gui-apps/coretoppings/coretoppings-4.1.0-r1.ebuild b/gui-apps/coretoppings/coretoppings-4.1.0-r1.ebuild index 2b7a766907..a3b26de46d 100644 --- 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 diff --git a/gui-apps/coretoppings/coretoppings-4.2.0_alpha.ebuild b/gui-apps/coretoppings/coretoppings-4.2.0_alpha.ebuild index 6f4ab676db..796a3bc4e9 100644 --- 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 diff --git a/gui-apps/coretoppings/coretoppings-9999.ebuild b/gui-apps/coretoppings/coretoppings-9999.ebuild index 6f4ab676db..796a3bc4e9 100644 --- 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 From fe60b004586b5d2c3cffa604c94299381e6915b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Bar=C4=87?= Date: Thu, 8 Apr 2021 16:36:03 +0200 Subject: [PATCH 05/12] gui-apps/corekeyboard: add missing libXtst dep MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes: https://bugs.gentoo.org/780996 Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Maciej Barć --- gui-apps/corekeyboard/corekeyboard-4.0.0.ebuild | 1 + gui-apps/corekeyboard/corekeyboard-4.1.0.ebuild | 1 + gui-apps/corekeyboard/corekeyboard-4.2.0_alpha.ebuild | 1 + gui-apps/corekeyboard/corekeyboard-9999.ebuild | 1 + 4 files changed, 4 insertions(+) diff --git a/gui-apps/corekeyboard/corekeyboard-4.0.0.ebuild b/gui-apps/corekeyboard/corekeyboard-4.0.0.ebuild index b091939925..9173b23b0c 100644 --- 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} diff --git a/gui-apps/corekeyboard/corekeyboard-4.1.0.ebuild b/gui-apps/corekeyboard/corekeyboard-4.1.0.ebuild index b091939925..9173b23b0c 100644 --- 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} diff --git a/gui-apps/corekeyboard/corekeyboard-4.2.0_alpha.ebuild b/gui-apps/corekeyboard/corekeyboard-4.2.0_alpha.ebuild index f5b29d0037..60e84e6b86 100644 --- 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} diff --git a/gui-apps/corekeyboard/corekeyboard-9999.ebuild b/gui-apps/corekeyboard/corekeyboard-9999.ebuild index f5b29d0037..60e84e6b86 100644 --- 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} From 52753be23e837360b4f07e557cb4b9653f4b69ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Bar=C4=87?= Date: Thu, 8 Apr 2021 16:53:48 +0200 Subject: [PATCH 06/12] gui-apps/paperdesktop: add myself (XGQT) to mainatiners MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Maciej Barć --- gui-apps/paperdesktop/metadata.xml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/gui-apps/paperdesktop/metadata.xml b/gui-apps/paperdesktop/metadata.xml index 65ac1f2056..470d0960ea 100644 --- a/gui-apps/paperdesktop/metadata.xml +++ b/gui-apps/paperdesktop/metadata.xml @@ -1,8 +1,15 @@ - - gentoo@aisha.cc - Aisha Tammy - + + gentoo@aisha.cc + Aisha Tammy + + + xgqt@riseup.net + Maciej Barć + + + cubocore/paper/paperde + From b0744f927ec09be5cc4949b9b7b29b73e3b268d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Bar=C4=87?= Date: Thu, 8 Apr 2021 16:58:47 +0200 Subject: [PATCH 07/12] gui-apps/paperdesktop: name change to gui-apps/paperde MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maciej Barć --- gui-apps/paperde/Manifest | 1 + .../files/paperde-0_p20201107-build.patch} | 0 gui-apps/{paperdesktop => paperde}/metadata.xml | 0 .../paperde-0_p20210310.ebuild} | 8 ++++---- .../paperde-9999.ebuild} | 8 ++++---- gui-apps/paperdesktop/Manifest | 1 - 6 files changed, 9 insertions(+), 9 deletions(-) create mode 100644 gui-apps/paperde/Manifest rename gui-apps/{paperdesktop/files/paperdesktop-0_p20201107-build.patch => paperde/files/paperde-0_p20201107-build.patch} (100%) rename gui-apps/{paperdesktop => paperde}/metadata.xml (100%) rename gui-apps/{paperdesktop/paperdesktop-0_p20210310.ebuild => paperde/paperde-0_p20210310.ebuild} (74%) rename gui-apps/{paperdesktop/paperdesktop-9999.ebuild => paperde/paperde-9999.ebuild} (74%) delete mode 100644 gui-apps/paperdesktop/Manifest diff --git a/gui-apps/paperde/Manifest b/gui-apps/paperde/Manifest new file mode 100644 index 0000000000..6ab78b6189 --- /dev/null +++ b/gui-apps/paperde/Manifest @@ -0,0 +1 @@ +DIST paperde-0_p20210310.tar.gz 2239576 BLAKE2B 8aea8e44e845dbdf7c8e01841cd9d8b7897cfed32ddad9e86ef33afc40be19adf76db356fbc59927adf3e2c3fed91c76e8df4a73bffd836db465703f69c9c5dc SHA512 5e5f0ee83ccae6487608446440437e00718027322532afe81b5d173f9385d899686e7e2f008e4ac95ee9f6756d25dbf1b010d35c6e5f84cce198bf9c1c52c6ab diff --git a/gui-apps/paperdesktop/files/paperdesktop-0_p20201107-build.patch b/gui-apps/paperde/files/paperde-0_p20201107-build.patch similarity index 100% rename from gui-apps/paperdesktop/files/paperdesktop-0_p20201107-build.patch rename to gui-apps/paperde/files/paperde-0_p20201107-build.patch diff --git a/gui-apps/paperdesktop/metadata.xml b/gui-apps/paperde/metadata.xml similarity index 100% rename from gui-apps/paperdesktop/metadata.xml rename to gui-apps/paperde/metadata.xml diff --git a/gui-apps/paperdesktop/paperdesktop-0_p20210310.ebuild b/gui-apps/paperde/paperde-0_p20210310.ebuild similarity index 74% rename from gui-apps/paperdesktop/paperdesktop-0_p20210310.ebuild rename to gui-apps/paperde/paperde-0_p20210310.ebuild index e802fe3d04..ba465e435b 100644 --- a/gui-apps/paperdesktop/paperdesktop-0_p20210310.ebuild +++ b/gui-apps/paperde/paperde-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 diff --git a/gui-apps/paperdesktop/paperdesktop-9999.ebuild b/gui-apps/paperde/paperde-9999.ebuild similarity index 74% rename from gui-apps/paperdesktop/paperdesktop-9999.ebuild rename to gui-apps/paperde/paperde-9999.ebuild index e802fe3d04..ba465e435b 100644 --- a/gui-apps/paperdesktop/paperdesktop-9999.ebuild +++ b/gui-apps/paperde/paperde-9999.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 diff --git a/gui-apps/paperdesktop/Manifest b/gui-apps/paperdesktop/Manifest deleted file mode 100644 index 126361b8f6..0000000000 --- a/gui-apps/paperdesktop/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST paperdesktop-0_p20210310.tar.gz 2239536 BLAKE2B c1b5c296d36db9687e8e106d2608da057238e91c607443d4cb28725fc90b6c35e2ae14d178ad79be525d6262574a2d0f0b54ee71f3de02de25d3a3aa31465b03 SHA512 77f26cb61e9cd2d02eb7dfe2eab12d17a10d96007bc8d4dda8b30e9327d3036c9ad3341268df2f5151ed48e96a9facc4d66abc7ae10dcd04e284a20b3e29cea9 From 6e8263ca79ac804a4c4c34eb524c41ea8d71d0c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Bar=C4=87?= Date: Thu, 8 Apr 2021 18:40:09 +0200 Subject: [PATCH 08/12] gui-apps/paperde: update live; add 0.1.0_alpha MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Maciej Barć --- gui-apps/paperde/Manifest | 1 + gui-apps/paperde/paperde-0.1.0_alpha.ebuild | 57 +++++++++++++++++++++ gui-apps/paperde/paperde-9999.ebuild | 20 +++++--- 3 files changed, 70 insertions(+), 8 deletions(-) create mode 100644 gui-apps/paperde/paperde-0.1.0_alpha.ebuild diff --git a/gui-apps/paperde/Manifest b/gui-apps/paperde/Manifest index 6ab78b6189..be3cb3528c 100644 --- a/gui-apps/paperde/Manifest +++ b/gui-apps/paperde/Manifest @@ -1 +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 diff --git a/gui-apps/paperde/paperde-0.1.0_alpha.ebuild b/gui-apps/paperde/paperde-0.1.0_alpha.ebuild new file mode 100644 index 0000000000..0ea5e6bbc2 --- /dev/null +++ b/gui-apps/paperde/paperde-0.1.0_alpha.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 +} diff --git a/gui-apps/paperde/paperde-9999.ebuild b/gui-apps/paperde/paperde-9999.ebuild index ba465e435b..0ea5e6bbc2 100644 --- a/gui-apps/paperde/paperde-9999.ebuild +++ b/gui-apps/paperde/paperde-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/paperde" if [[ ${PV} == 9999 ]]; then inherit git-r3 - EGIT_REPO_URI="https://gitlab.com/cubocore/paper/${PN}" + EGIT_REPO_URI="https://gitlab.com/cubocore/paper/${PN}.git" else - COMMIT=65c755306688203ddc32bbc099ba1de03166cde9 - SRC_URI="https://gitlab.com/cubocore/paper/${PN}/-/archive/${COMMIT}/paperde-${COMMIT}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${PN}-${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 " From 5137c11c0a95dabbf16783fb8608b779a60b75ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Bar=C4=87?= Date: Thu, 8 Apr 2021 18:41:34 +0200 Subject: [PATCH 09/12] dev-vcs/gitahead: add missing linguist-tools dep MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes: https://bugs.gentoo.org/780990 Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Maciej Barć --- dev-vcs/gitahead/gitahead-2.6.3.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dev-vcs/gitahead/gitahead-2.6.3.ebuild b/dev-vcs/gitahead/gitahead-2.6.3.ebuild index 529f56cb2b..4df3015c2c 100644 --- 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 From 455cb9729ca445c1c461cae41e3abc5953a1ceeb Mon Sep 17 00:00:00 2001 From: YOSHIOKA Takuma Date: Fri, 9 Apr 2021 02:15:34 +0900 Subject: [PATCH 10/12] media-sound/loudgain: Respect user-specified {C,CXX}FLAGS Closes: https://bugs.gentoo.org/781170 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: YOSHIOKA Takuma --- media-sound/loudgain/loudgain-0.6.8.ebuild | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/media-sound/loudgain/loudgain-0.6.8.ebuild b/media-sound/loudgain/loudgain-0.6.8.ebuild index e0cc904794..9ad6f1468f 100644 --- 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 From 3151aab8f7cf3eba2a5a5d93189f7695af4c021e Mon Sep 17 00:00:00 2001 From: Kurt Kanzenbach Date: Thu, 8 Apr 2021 19:16:14 +0200 Subject: [PATCH 11/12] dev-libs/open62541: Remove -Werror Closes: https://bugs.gentoo.org/780912 Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Kurt Kanzenbach --- dev-libs/open62541/open62541-1.1.5.ebuild | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dev-libs/open62541/open62541-1.1.5.ebuild b/dev-libs/open62541/open62541-1.1.5.ebuild index bcc47e3c8e..f8658a8359 100644 --- 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 From ee17cfaf051d0046c3f361ae4fa54ddbc6e7ddfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Bar=C4=87?= Date: Thu, 8 Apr 2021 19:24:53 +0200 Subject: [PATCH 12/12] profiles/updates: gui-apps/paperdesktop -> gui-apps/paperde MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maciej Barć --- profiles/updates/1Q-2021 | 1 + 1 file changed, 1 insertion(+) diff --git a/profiles/updates/1Q-2021 b/profiles/updates/1Q-2021 index 365f6fd8b4..f8a2b483e8 100644 --- 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 \ No newline at end of file