[gentoo-commits] repo/proj/guru:dev commit in: gui-apps/paperde/, x11-misc/ksnip/
commit: 182b1586ccac22ea3632459f16d2f1f57d7d0a28 Author: Anna (cybertailor) Vyalkova sysrq in> AuthorDate: Sun Nov 26 08:27:45 2023 + Commit: Anna Vyalkova sysrq in> CommitDate: Sun Nov 26 08:27:45 2023 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=182b1586 */*: kde-frameworks/extra-cmake-modules slotmove Signed-off-by: Anna (cybertailor) Vyalkova sysrq.in> gui-apps/paperde/paperde-0.1.1_p20210426.ebuild | 2 +- gui-apps/paperde/paperde-.ebuild| 2 +- x11-misc/ksnip/ksnip-1.10.0-r1.ebuild | 2 +- x11-misc/ksnip/ksnip-1.10.1.ebuild | 2 +- x11-misc/ksnip/ksnip-1.9.2.ebuild | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gui-apps/paperde/paperde-0.1.1_p20210426.ebuild b/gui-apps/paperde/paperde-0.1.1_p20210426.ebuild index 95dfd31e3a..612f3e01a2 100644 --- a/gui-apps/paperde/paperde-0.1.1_p20210426.ebuild +++ b/gui-apps/paperde/paperde-0.1.1_p20210426.ebuild @@ -22,7 +22,7 @@ LICENSE="GPL-3" SLOT="0" BDEPEND=" - kde-frameworks/extra-cmake-modules:5 + kde-frameworks/extra-cmake-modules " DEPEND=" dev-libs/libdbusmenu-qt diff --git a/gui-apps/paperde/paperde-.ebuild b/gui-apps/paperde/paperde-.ebuild index bc22f9a509..7df837787e 100644 --- a/gui-apps/paperde/paperde-.ebuild +++ b/gui-apps/paperde/paperde-.ebuild @@ -23,7 +23,7 @@ LICENSE="GPL-3" SLOT="0" BDEPEND=" - kde-frameworks/extra-cmake-modules:5 + kde-frameworks/extra-cmake-modules " DEPEND=" dev-libs/libdbusmenu-qt diff --git a/x11-misc/ksnip/ksnip-1.10.0-r1.ebuild b/x11-misc/ksnip/ksnip-1.10.0-r1.ebuild index dc39b04f65..14edfa91ad 100644 --- a/x11-misc/ksnip/ksnip-1.10.0-r1.ebuild +++ b/x11-misc/ksnip/ksnip-1.10.0-r1.ebuild @@ -29,7 +29,7 @@ RDEPEND=" x11-libs/libxcb" DEPEND="${RDEPEND} dev-qt/qtconcurrent:5 - kde-frameworks/extra-cmake-modules:5 + kde-frameworks/extra-cmake-modules " BDEPEND=" dev-qt/linguist-tools:5 diff --git a/x11-misc/ksnip/ksnip-1.10.1.ebuild b/x11-misc/ksnip/ksnip-1.10.1.ebuild index 883633fc54..5c5cef1188 100644 --- a/x11-misc/ksnip/ksnip-1.10.1.ebuild +++ b/x11-misc/ksnip/ksnip-1.10.1.ebuild @@ -29,7 +29,7 @@ RDEPEND=" x11-libs/libxcb" DEPEND="${RDEPEND} dev-qt/qtconcurrent:5 - kde-frameworks/extra-cmake-modules:5 + kde-frameworks/extra-cmake-modules " BDEPEND=" dev-qt/linguist-tools:5 diff --git a/x11-misc/ksnip/ksnip-1.9.2.ebuild b/x11-misc/ksnip/ksnip-1.9.2.ebuild index b6bbae765e..070e0c7c0d 100644 --- a/x11-misc/ksnip/ksnip-1.9.2.ebuild +++ b/x11-misc/ksnip/ksnip-1.9.2.ebuild @@ -30,7 +30,7 @@ RDEPEND=" x11-libs/libxcb" DEPEND="${RDEPEND} dev-qt/qtconcurrent:5 - kde-frameworks/extra-cmake-modules:5 + kde-frameworks/extra-cmake-modules " BDEPEND=" dev-qt/linguist-tools:5
[gentoo-commits] repo/proj/guru:dev commit in: gui-apps/paperde/
commit: fd868e2230b2b5b9e5d745b8ebe87cc49fe36624 Author: Maciej Barć gentoo org> AuthorDate: Sun Nov 28 17:09:45 2021 + Commit: Maciej Barć gentoo org> CommitDate: Sun Nov 28 17:10:50 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fd868e22 gui-apps/paperde: remove myself from maintainers Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Maciej Barć gentoo.org> gui-apps/paperde/metadata.xml | 4 1 file changed, 4 deletions(-) diff --git a/gui-apps/paperde/metadata.xml b/gui-apps/paperde/metadata.xml index 470d0960e..ada6c24dc 100644 --- a/gui-apps/paperde/metadata.xml +++ b/gui-apps/paperde/metadata.xml @@ -5,10 +5,6 @@ gen...@aisha.cc Aisha Tammy - -x...@riseup.net -Maciej Barć - cubocore/paper/paperde
[gentoo-commits] repo/proj/guru:dev commit in: gui-apps/paperde/
commit: 70d78463181d6fc38af6e8b7a8d74de96c3e0b7d Author: Maciej Barć riseup net> AuthorDate: Tue Jun 15 10:06:41 2021 + Commit: Maciej Barć riseup net> CommitDate: Tue Jun 15 10:06:41 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=70d78463 gui-apps/paperde: paperde -> PN Package-Manager: Portage-3.0.18, Repoman-3.0.2 Signed-off-by: Maciej Barć riseup.net> gui-apps/paperde/paperde-0.1.1_p20210426.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui-apps/paperde/paperde-0.1.1_p20210426.ebuild b/gui-apps/paperde/paperde-0.1.1_p20210426.ebuild index e1ae834fa..95dfd31e3 100644 --- a/gui-apps/paperde/paperde-0.1.1_p20210426.ebuild +++ b/gui-apps/paperde/paperde-0.1.1_p20210426.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == ** ]]; then EGIT_REPO_URI="https://gitlab.com/cubocore/paper/${PN}.git"; else COMMIT="15018307192107e2915671d412f3fc900ac5af4b" - SRC_URI="https://gitlab.com/cubocore/paper/${PN}/-/archive/${COMMIT}/paperde-${COMMIT}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://gitlab.com/cubocore/paper/${PN}/-/archive/${COMMIT}/${PN}-${COMMIT}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64" S="${WORKDIR}/${PN}-${COMMIT}" fi
[gentoo-commits] repo/proj/guru:dev commit in: gui-apps/paperde/
commit: 64f839c20afb6454e09e079c93e1fc755343782c Author: Maciej Barć riseup net> AuthorDate: Tue Jun 15 10:05:58 2021 + Commit: Maciej Barć riseup net> CommitDate: Tue Jun 15 10:05:58 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=64f839c2 gui-apps/paperde: clean DEPEND spacing Package-Manager: Portage-3.0.18, Repoman-3.0.2 Signed-off-by: Maciej Barć riseup.net> gui-apps/paperde/paperde-0.1.1_p20210426.ebuild | 1 - gui-apps/paperde/paperde-.ebuild| 1 - 2 files changed, 2 deletions(-) diff --git a/gui-apps/paperde/paperde-0.1.1_p20210426.ebuild b/gui-apps/paperde/paperde-0.1.1_p20210426.ebuild index 81ddf8bf4..e1ae834fa 100644 --- a/gui-apps/paperde/paperde-0.1.1_p20210426.ebuild +++ b/gui-apps/paperde/paperde-0.1.1_p20210426.ebuild @@ -37,7 +37,6 @@ DEPEND=" gui-libs/libcprime gui-libs/libcsys " - RDEPEND=" ${DEPEND} gui-libs/wlroots diff --git a/gui-apps/paperde/paperde-.ebuild b/gui-apps/paperde/paperde-.ebuild index 01d7a69a4..bc22f9a50 100644 --- a/gui-apps/paperde/paperde-.ebuild +++ b/gui-apps/paperde/paperde-.ebuild @@ -38,7 +38,6 @@ DEPEND=" gui-libs/libcprime gui-libs/libcsys " - RDEPEND=" ${DEPEND} gui-libs/wlroots
[gentoo-commits] repo/proj/guru:dev commit in: gui-apps/paperde/
commit: e44ac8d60892156185885445fd19a8db35faf83a Author: Maciej Barć riseup net> AuthorDate: Tue Jun 15 10:03:14 2021 + Commit: Maciej Barć riseup net> CommitDate: Tue Jun 15 10:03:20 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e44ac8d6 gui-apps/paperde: bump to 0.1.1_p20210426 Package-Manager: Portage-3.0.18, Repoman-3.0.2 Signed-off-by: Maciej Barć riseup.net> gui-apps/paperde/Manifest | 1 + gui-apps/paperde/paperde-0.1.1_p20210426.ebuild | 60 + 2 files changed, 61 insertions(+) diff --git a/gui-apps/paperde/Manifest b/gui-apps/paperde/Manifest new file mode 100644 index 0..ceffa6da6 --- /dev/null +++ b/gui-apps/paperde/Manifest @@ -0,0 +1 @@ +DIST paperde-0.1.1_p20210426.tar.gz 2238328 BLAKE2B 268cd6171cba04e24a872fe1e604c907edc274dc7c6e35f08d84afb4cb4cfef43a8e2d0cf1e2dfefd926172e4146c9228609a00c872f954e77b6a47ef944b375 SHA512 df27178d17e5938076acfdb588f298fbba549a626c8279ea28ab531c311be237dcec8ed4711bdcbe53dd34419b597e4f85441e2800f04f806ea275f2beb922aa diff --git a/gui-apps/paperde/paperde-0.1.1_p20210426.ebuild b/gui-apps/paperde/paperde-0.1.1_p20210426.ebuild new file mode 100644 index 0..81ddf8bf4 --- /dev/null +++ b/gui-apps/paperde/paperde-0.1.1_p20210426.ebuild @@ -0,0 +1,60 @@ +# Copyright 2020-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake xdg + +DESCRIPTION="Simple, sleek QT based DE for wayland using wayfire" +HOMEPAGE="https://gitlab.com/cubocore/paper/paperde"; + +if [[ ${PV} == ** ]]; then + inherit git-r3 + EGIT_REPO_URI="https://gitlab.com/cubocore/paper/${PN}.git"; +else + COMMIT="15018307192107e2915671d412f3fc900ac5af4b" + SRC_URI="https://gitlab.com/cubocore/paper/${PN}/-/archive/${COMMIT}/paperde-${COMMIT}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" + S="${WORKDIR}/${PN}-${COMMIT}" +fi + +LICENSE="GPL-3" +SLOT="0" + +BDEPEND=" + kde-frameworks/extra-cmake-modules:5 +" +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-libs/wlroots + gui-wm/wayfire[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 +}
[gentoo-commits] repo/proj/guru:dev commit in: gui-apps/paperde/
commit: 53ef6ac31c17aebe10757780d2bde8a14f9ca99a Author: Maciej Barć riseup net> AuthorDate: Tue Jun 15 00:21:57 2021 + Commit: Maciej Barć riseup net> CommitDate: Tue Jun 15 00:22:32 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=53ef6ac3 gui-apps/paperde: drop broken 0.1.1 version Closes: https://bugs.gentoo.org/796008 Package-Manager: Portage-3.0.18, Repoman-3.0.2 Signed-off-by: Maciej Barć riseup.net> gui-apps/paperde/Manifest | 1 - gui-apps/paperde/paperde-0.1.1.ebuild | 62 --- 2 files changed, 63 deletions(-) diff --git a/gui-apps/paperde/Manifest b/gui-apps/paperde/Manifest deleted file mode 100644 index b20bb0575..0 --- a/gui-apps/paperde/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST paperde-0.1.1.tar.gz 2238206 BLAKE2B 7d2ed32bc1c8f0914a39ee564565a4f9956e01d2cb4f6c11190792325c1a64ba2ca7006d8b263abb3be80b58734a798423406fd2b411a344f714988906e44c48 SHA512 45b1fcd8bc03ae34be7560fe8f369d1bde98da764870298a6f31b8465fd0fc24ace556bf7fadeab756dc4d86115aefc7c8d22eb84602472eeb2c60dc1539b85c diff --git a/gui-apps/paperde/paperde-0.1.1.ebuild b/gui-apps/paperde/paperde-0.1.1.ebuild deleted file mode 100644 index 18b6d99fc..0 --- a/gui-apps/paperde/paperde-0.1.1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 2020-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake xdg - -DESCRIPTION="Simple, sleek QT based DE for wayland using wayfire" -HOMEPAGE="https://gitlab.com/cubocore/paper/paperde"; - -if [[ ${PV} == ** ]]; then - inherit git-r3 - EGIT_REPO_URI="https://gitlab.com/cubocore/paper/${PN}.git"; -else - # _alpha -> -alpha - MY_PV="${PV/_/-}" - 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" - -BDEPEND=" - kde-frameworks/extra-cmake-modules:5 -" -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 -" -# Because of gui-wm/wayfire build failure, also add requirement constraints here -# wlroots found: NO found 0.13.0 but need: '<0.12.0' ; matched: '>=0.11.0' -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 -}
[gentoo-commits] repo/proj/guru:dev commit in: gui-apps/paperde/
commit: c04ca108eb463813b81fb6e16edc4b629bc024d5 Author: Maciej Barć riseup net> AuthorDate: Mon Jun 7 09:36:21 2021 + Commit: Maciej Barć riseup net> CommitDate: Mon Jun 7 09:36:21 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c04ca108 gui-apps/paperde: remove version limits Package-Manager: Portage-3.0.18, Repoman-3.0.2 Signed-off-by: Maciej Barć riseup.net> gui-apps/paperde/paperde-.ebuild | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gui-apps/paperde/paperde-.ebuild b/gui-apps/paperde/paperde-.ebuild index 18b6d99fc..01d7a69a4 100644 --- a/gui-apps/paperde/paperde-.ebuild +++ b/gui-apps/paperde/paperde-.ebuild @@ -38,12 +38,11 @@ DEPEND=" gui-libs/libcprime gui-libs/libcsys " -# Because of gui-wm/wayfire build failure, also add requirement constraints here -# wlroots found: NO found 0.13.0 but need: '<0.12.0' ; matched: '>=0.11.0' + RDEPEND=" ${DEPEND} - =gui-wm/wayfire-0.7.0[X] + gui-libs/wlroots + gui-wm/wayfire[X] sys-apps/xdg-desktop-portal x11-misc/qt5ct "
[gentoo-commits] repo/proj/guru:dev commit in: gui-apps/paperde/files/, gui-apps/paperde/
commit: 4d7c6e9e247f58f11c239d724d02d836d572380a Author: Maciej Barć riseup net> AuthorDate: Wed May 12 17:04:44 2021 + Commit: Maciej Barć riseup net> CommitDate: Wed May 12 17:05:00 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4d7c6e9e gui-apps/paperde: drop old 0_p20210310 Package-Manager: Portage-3.0.18, Repoman-3.0.2 Signed-off-by: Maciej Barć riseup.net> gui-apps/paperde/Manifest | 2 - .../paperde/files/paperde-0_p20201107-build.patch | 14 - gui-apps/paperde/paperde-0.1.0_alpha.ebuild| 59 -- gui-apps/paperde/paperde-0_p20210310.ebuild| 53 --- 4 files changed, 128 deletions(-) diff --git a/gui-apps/paperde/Manifest b/gui-apps/paperde/Manifest index 7ac1bb1b4..b20bb0575 100644 --- a/gui-apps/paperde/Manifest +++ b/gui-apps/paperde/Manifest @@ -1,3 +1 @@ -DIST paperde-0.1.0_alpha.tar.gz 2238045 BLAKE2B 90fa2948484e53c6c30e2b8258da037043e5e71915c77cbe5bf959b85aea87bbde6d9bdf0afa1d398a617f1062027a37c62d78b98429ffcc88ec61f819c26907 SHA512 85affe98ba697e7d79fcf9356ad485ed29c8a099bff773ebc01637ae34c9101ca82e63370b2298801173903bc1d7a257614ce82f58c2ea669b6f0496f3cc1400 DIST paperde-0.1.1.tar.gz 2238206 BLAKE2B 7d2ed32bc1c8f0914a39ee564565a4f9956e01d2cb4f6c11190792325c1a64ba2ca7006d8b263abb3be80b58734a798423406fd2b411a344f714988906e44c48 SHA512 45b1fcd8bc03ae34be7560fe8f369d1bde98da764870298a6f31b8465fd0fc24ace556bf7fadeab756dc4d86115aefc7c8d22eb84602472eeb2c60dc1539b85c -DIST paperde-0_p20210310.tar.gz 2239576 BLAKE2B 8aea8e44e845dbdf7c8e01841cd9d8b7897cfed32ddad9e86ef33afc40be19adf76db356fbc59927adf3e2c3fed91c76e8df4a73bffd836db465703f69c9c5dc SHA512 5e5f0ee83ccae6487608446440437e00718027322532afe81b5d173f9385d899686e7e2f008e4ac95ee9f6756d25dbf1b010d35c6e5f84cce198bf9c1c52c6ab diff --git a/gui-apps/paperde/files/paperde-0_p20201107-build.patch b/gui-apps/paperde/files/paperde-0_p20201107-build.patch deleted file mode 100644 index b3d4eea97..0 --- a/gui-apps/paperde/files/paperde-0_p20201107-build.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/libpaperprime/libpaperprime.pro b/libpaperprime/libpaperprime.pro -index 7ee9ec2..d5b89a2 100644 a/libpaperprime/libpaperprime.pro -+++ b/libpaperprime/libpaperprime.pro -@@ -71,8 +71,7 @@ unix { - - INSTALLS += target includes themefiles - --contains(DEFINES, LIB64): target.path = $$PREFIX/lib64 --else: target.path = $$PREFIX/lib -+target.path = $$PREFIX/lib/ - - includes.files= paperprime/*.h - includes.path = $$PREFIX/include/paperprime/ diff --git a/gui-apps/paperde/paperde-0.1.0_alpha.ebuild b/gui-apps/paperde/paperde-0.1.0_alpha.ebuild deleted file mode 100644 index 7a7482b76..0 --- a/gui-apps/paperde/paperde-0.1.0_alpha.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 2020-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake xdg - -DESCRIPTION="Simple, sleek QT based DE for wayland using wayfire" -HOMEPAGE="https://gitlab.com/cubocore/paper/paperde"; - -if [[ ${PV} == ** ]]; then - inherit git-r3 - EGIT_REPO_URI="https://gitlab.com/cubocore/paper/${PN}.git"; -else - # _alpha -> -alpha - MY_PV="${PV/_/-}" - 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" - -BDEPEND=" - kde-frameworks/extra-cmake-modules:5 -" -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-0_p20210310.ebuild b/gui-apps/paperde/paperde-0_p20210310.ebuild deleted file mode 100644 index ba465e435..0 --- a/gui-apps/paperde/paperde-0_p20210310.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 2020-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake xdg - -DESCRIPTION="Simple, sleek QT based DE for wayland using wayfire" - -HOMEPAGE="https://gitlab.com/cubocore/paper/paperde"; - -if [[ ${PV} == ]]; then - inherit git-r3 - EGIT_REPO_URI="https://gitlab.com/cubocore/paper/${PN}"; -else - COMMIT=
[gentoo-commits] repo/proj/guru:dev commit in: gui-apps/paperde/
commit: f6aa2dafa440157712e44494696feba910333f77 Author: Maciej Barć riseup net> AuthorDate: Wed May 12 17:03:28 2021 + Commit: Maciej Barć riseup net> CommitDate: Wed May 12 17:04:59 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f6aa2daf gui-apps/paperde: requirement constraints - riseup.net> gui-apps/paperde/paperde-0.1.1.ebuild | 3 +++ gui-apps/paperde/paperde-.ebuild | 3 +++ 2 files changed, 6 insertions(+) diff --git a/gui-apps/paperde/paperde-0.1.1.ebuild b/gui-apps/paperde/paperde-0.1.1.ebuild index 7a7482b76..18b6d99fc 100644 --- a/gui-apps/paperde/paperde-0.1.1.ebuild +++ b/gui-apps/paperde/paperde-0.1.1.ebuild @@ -38,8 +38,11 @@ DEPEND=" gui-libs/libcprime gui-libs/libcsys " +# Because of gui-wm/wayfire build failure, also add requirement constraints here +# wlroots found: NO found 0.13.0 but need: '<0.12.0' ; matched: '>=0.11.0' RDEPEND=" ${DEPEND} + =gui-wm/wayfire-0.7.0[X] sys-apps/xdg-desktop-portal x11-misc/qt5ct diff --git a/gui-apps/paperde/paperde-.ebuild b/gui-apps/paperde/paperde-.ebuild index 7a7482b76..18b6d99fc 100644 --- a/gui-apps/paperde/paperde-.ebuild +++ b/gui-apps/paperde/paperde-.ebuild @@ -38,8 +38,11 @@ DEPEND=" gui-libs/libcprime gui-libs/libcsys " +# Because of gui-wm/wayfire build failure, also add requirement constraints here +# wlroots found: NO found 0.13.0 but need: '<0.12.0' ; matched: '>=0.11.0' RDEPEND=" ${DEPEND} + =gui-wm/wayfire-0.7.0[X] sys-apps/xdg-desktop-portal x11-misc/qt5ct
[gentoo-commits] repo/proj/guru:dev commit in: gui-apps/paperde/
commit: f405028bfbbd32859d3359f3654a3752145b6345 Author: Maciej Barć riseup net> AuthorDate: Sat Apr 24 12:22:48 2021 + Commit: Maciej Barć riseup net> CommitDate: Sat Apr 24 12:22:48 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f405028b gui-apps/paperde: add missing extra-cmake-modules dep; mv MY_PV Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Maciej Barć riseup.net> gui-apps/paperde/paperde-0.1.0_alpha.ebuild | 10 ++ gui-apps/paperde/paperde-0.1.1.ebuild | 10 ++ gui-apps/paperde/paperde-.ebuild| 10 ++ 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/gui-apps/paperde/paperde-0.1.0_alpha.ebuild b/gui-apps/paperde/paperde-0.1.0_alpha.ebuild index 0ea5e6bbc..7a7482b76 100644 --- a/gui-apps/paperde/paperde-0.1.0_alpha.ebuild +++ b/gui-apps/paperde/paperde-0.1.0_alpha.ebuild @@ -3,18 +3,17 @@ 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} == ]]; then +if [[ ${PV} == ** ]]; then inherit git-r3 EGIT_REPO_URI="https://gitlab.com/cubocore/paper/${PN}.git"; else + # _alpha -> -alpha + MY_PV="${PV/_/-}" 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}" @@ -23,6 +22,9 @@ fi LICENSE="GPL-3" SLOT="0" +BDEPEND=" + kde-frameworks/extra-cmake-modules:5 +" DEPEND=" dev-libs/libdbusmenu-qt dev-libs/wayland diff --git a/gui-apps/paperde/paperde-0.1.1.ebuild b/gui-apps/paperde/paperde-0.1.1.ebuild index 0ea5e6bbc..7a7482b76 100644 --- a/gui-apps/paperde/paperde-0.1.1.ebuild +++ b/gui-apps/paperde/paperde-0.1.1.ebuild @@ -3,18 +3,17 @@ 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} == ]]; then +if [[ ${PV} == ** ]]; then inherit git-r3 EGIT_REPO_URI="https://gitlab.com/cubocore/paper/${PN}.git"; else + # _alpha -> -alpha + MY_PV="${PV/_/-}" 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}" @@ -23,6 +22,9 @@ fi LICENSE="GPL-3" SLOT="0" +BDEPEND=" + kde-frameworks/extra-cmake-modules:5 +" DEPEND=" dev-libs/libdbusmenu-qt dev-libs/wayland diff --git a/gui-apps/paperde/paperde-.ebuild b/gui-apps/paperde/paperde-.ebuild index 0ea5e6bbc..7a7482b76 100644 --- a/gui-apps/paperde/paperde-.ebuild +++ b/gui-apps/paperde/paperde-.ebuild @@ -3,18 +3,17 @@ 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} == ]]; then +if [[ ${PV} == ** ]]; then inherit git-r3 EGIT_REPO_URI="https://gitlab.com/cubocore/paper/${PN}.git"; else + # _alpha -> -alpha + MY_PV="${PV/_/-}" 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}" @@ -23,6 +22,9 @@ fi LICENSE="GPL-3" SLOT="0" +BDEPEND=" + kde-frameworks/extra-cmake-modules:5 +" DEPEND=" dev-libs/libdbusmenu-qt dev-libs/wayland
[gentoo-commits] repo/proj/guru:dev commit in: gui-apps/paperde/
commit: a2bc3bbf0a9d4fd22f2ff360bbc0a084039550dc Author: Aisha Tammy aisha cc> AuthorDate: Thu Apr 22 12:43:06 2021 + Commit: Aisha Tammy aisha cc> CommitDate: Thu Apr 22 12:43:06 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a2bc3bbf gui-apps/paperde: version bump to 0.1.1 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Aisha Tammy aisha.cc> gui-apps/paperde/Manifest | 1 + gui-apps/paperde/paperde-0.1.1.ebuild | 57 +++ 2 files changed, 58 insertions(+) diff --git a/gui-apps/paperde/Manifest b/gui-apps/paperde/Manifest index be3cb3528..7ac1bb1b4 100644 --- a/gui-apps/paperde/Manifest +++ b/gui-apps/paperde/Manifest @@ -1,2 +1,3 @@ DIST paperde-0.1.0_alpha.tar.gz 2238045 BLAKE2B 90fa2948484e53c6c30e2b8258da037043e5e71915c77cbe5bf959b85aea87bbde6d9bdf0afa1d398a617f1062027a37c62d78b98429ffcc88ec61f819c26907 SHA512 85affe98ba697e7d79fcf9356ad485ed29c8a099bff773ebc01637ae34c9101ca82e63370b2298801173903bc1d7a257614ce82f58c2ea669b6f0496f3cc1400 +DIST paperde-0.1.1.tar.gz 2238206 BLAKE2B 7d2ed32bc1c8f0914a39ee564565a4f9956e01d2cb4f6c11190792325c1a64ba2ca7006d8b263abb3be80b58734a798423406fd2b411a344f714988906e44c48 SHA512 45b1fcd8bc03ae34be7560fe8f369d1bde98da764870298a6f31b8465fd0fc24ace556bf7fadeab756dc4d86115aefc7c8d22eb84602472eeb2c60dc1539b85c DIST paperde-0_p20210310.tar.gz 2239576 BLAKE2B 8aea8e44e845dbdf7c8e01841cd9d8b7897cfed32ddad9e86ef33afc40be19adf76db356fbc59927adf3e2c3fed91c76e8df4a73bffd836db465703f69c9c5dc SHA512 5e5f0ee83ccae6487608446440437e00718027322532afe81b5d173f9385d899686e7e2f008e4ac95ee9f6756d25dbf1b010d35c6e5f84cce198bf9c1c52c6ab diff --git a/gui-apps/paperde/paperde-0.1.1.ebuild b/gui-apps/paperde/paperde-0.1.1.ebuild new file mode 100644 index 0..0ea5e6bbc --- /dev/null +++ b/gui-apps/paperde/paperde-0.1.1.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} == ]]; 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 +}
[gentoo-commits] repo/proj/guru:dev commit in: gui-apps/paperde/
commit: 6e8263ca79ac804a4c4c34eb524c41ea8d71d0c3 Author: Maciej Barć riseup net> AuthorDate: Thu Apr 8 16:40:09 2021 + Commit: Maciej Barć riseup net> CommitDate: Thu Apr 8 16:40:09 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6e8263ca gui-apps/paperde: update live; add 0.1.0_alpha Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Maciej Barć riseup.net> gui-apps/paperde/Manifest| 1 + ...aperde-.ebuild => paperde-0.1.0_alpha.ebuild} | 20 gui-apps/paperde/paperde-.ebuild | 20 3 files changed, 25 insertions(+), 16 deletions(-) diff --git a/gui-apps/paperde/Manifest b/gui-apps/paperde/Manifest index 6ab78b618..be3cb3528 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-.ebuild b/gui-apps/paperde/paperde-0.1.0_alpha.ebuild similarity index 69% copy from gui-apps/paperde/paperde-.ebuild copy to gui-apps/paperde/paperde-0.1.0_alpha.ebuild index ba465e435..0ea5e6bbc 100644 --- a/gui-apps/paperde/paperde-.ebuild +++ b/gui-apps/paperde/paperde-0.1.0_alpha.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} == ]]; 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 " diff --git a/gui-apps/paperde/paperde-.ebuild b/gui-apps/paperde/paperde-.ebuild index ba465e435..0ea5e6bbc 100644 --- a/gui-apps/paperde/paperde-.ebuild +++ b/gui-apps/paperde/paperde-.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} == ]]; 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 "
[gentoo-commits] repo/proj/guru:dev commit in: gui-apps/paperde/, gui-apps/paperdesktop/files/, gui-apps/paperde/files/, ...
commit: b0744f927ec09be5cc4949b9b7b29b73e3b268d9 Author: Maciej Barć riseup net> AuthorDate: Thu Apr 8 14:58:47 2021 + Commit: Maciej Barć riseup net> CommitDate: Thu Apr 8 14:58:47 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b0744f92 gui-apps/paperdesktop: name change to gui-apps/paperde Signed-off-by: Maciej Barć riseup.net> 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-.ebuild} | 8 gui-apps/paperdesktop/Manifest| 1 - 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gui-apps/paperde/Manifest b/gui-apps/paperde/Manifest new file mode 100644 index 0..6ab78b618 --- /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-.ebuild b/gui-apps/paperde/paperde-0_p20210310.ebuild similarity index 74% rename from gui-apps/paperdesktop/paperdesktop-.ebuild rename to gui-apps/paperde/paperde-0_p20210310.ebuild index e802fe3d0..ba465e435 100644 --- a/gui-apps/paperdesktop/paperdesktop-.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} == ]]; 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-0_p20210310.ebuild b/gui-apps/paperde/paperde-.ebuild similarity index 74% rename from gui-apps/paperdesktop/paperdesktop-0_p20210310.ebuild rename to gui-apps/paperde/paperde-.ebuild index e802fe3d0..ba465e435 100644 --- a/gui-apps/paperdesktop/paperdesktop-0_p20210310.ebuild +++ b/gui-apps/paperde/paperde-.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} == ]]; 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 126361b8f..0 --- a/gui-apps/paperdesktop/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST paperdesktop-0_p20210310.tar.gz 2239536 BLAKE2B c1b5c296d36db9687e8e106d2608da057238e91c607443d4cb28725fc90b6c35e2ae14d178ad79be525d6262574a2d0f0b54ee71f3de02de25d3a3aa31465b03 SHA512 77f26cb61e9cd2d02eb7dfe2eab12d17a10d96007bc8d4dda8b30e9327d3036c9ad3341268df2f5151ed48e96a9facc4d66abc7ae10dcd04e284a20b3e29cea9