* [gentoo-commits] repo/proj/guru:master commit in: gui-apps/paperdesktop/
@ 2021-03-11 13:16 Andrew Ammerlaan
0 siblings, 0 replies; 3+ messages in thread
From: Andrew Ammerlaan @ 2021-03-11 13:16 UTC (permalink / raw
To: gentoo-commits
commit: 3c234d9a445005beeb577dd21bf0154ef955d935
Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Thu Mar 11 04:36:56 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Thu Mar 11 04:37:05 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3c234d9a
gui-apps/paperdesktop: drop old version
Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>
gui-apps/paperdesktop/Manifest | 1 -
.../paperdesktop/paperdesktop-0_p20201107.ebuild | 60 ----------------------
2 files changed, 61 deletions(-)
diff --git a/gui-apps/paperdesktop/Manifest b/gui-apps/paperdesktop/Manifest
index 05351da2..126361b8 100644
--- a/gui-apps/paperdesktop/Manifest
+++ b/gui-apps/paperdesktop/Manifest
@@ -1,2 +1 @@
-DIST paperdesktop-0_p20201107.tar.gz 200672 BLAKE2B d2c7807cd23294521ada75bfbae2f841e72a399a8bfc94e2f507c15eeda00d5fef90826225ae3d531d0b33f82ce2e0aa06b5081778e8354e87ccea30daf310c6 SHA512 940f0aba34fc8d03a3dc716ca921991ce3aa22eb0afcb601c23f3dd8ada2f15e22c5f0dbc83e58c003a3c43a0955e0b3634824d34fea1b2ce97bc3c2dfd28475
DIST paperdesktop-0_p20210310.tar.gz 2239536 BLAKE2B c1b5c296d36db9687e8e106d2608da057238e91c607443d4cb28725fc90b6c35e2ae14d178ad79be525d6262574a2d0f0b54ee71f3de02de25d3a3aa31465b03 SHA512 77f26cb61e9cd2d02eb7dfe2eab12d17a10d96007bc8d4dda8b30e9327d3036c9ad3341268df2f5151ed48e96a9facc4d66abc7ae10dcd04e284a20b3e29cea9
diff --git a/gui-apps/paperdesktop/paperdesktop-0_p20201107.ebuild b/gui-apps/paperdesktop/paperdesktop-0_p20201107.ebuild
deleted file mode 100644
index ee7ec14c..00000000
--- a/gui-apps/paperdesktop/paperdesktop-0_p20201107.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils
-
-DESCRIPTION="simple, sleek QT based DE for wayland using wayfire"
-
-HOMEPAGE="https://gitlab.com/cubocore/paper/paperdesktop"
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://gitlab.com/cubocore/paper/paperdesktop"
-else
- COMMIT=960ff1e31a48e96e10afa0459183e52fbea8f2de
- SRC_URI="https://gitlab.com/cubocore/paper/paperdesktop/-/archive/${COMMIT}/paperdesktop-${COMMIT}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}"/paperdesktop-${COMMIT}
- KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-
-DEPEND="
- dev-libs/libdbusmenu-qt
- dev-libs/wayland
- dev-qt/qtcore:5
- dev-qt/qtgui:5[wayland,X]
- dev-qt/qtnetwork:5
- dev-qt/qtwidgets:5[X]
- dev-qt/qtsvg:5
-"
-RDEPEND="${DEPEND}
- gui-wm/wayfire[X]
- x11-misc/qt5ct
-"
-BDEPEND="
- virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-0_p20201107-build.patch )
-
-src_prepare() {
- default
- sed -e "s:/lib/:/$(get_libdir)/:" \
- -i libpaperdesktop/core/core.pro \
- -i libpaperdesktop/gui/gui.pro \
- -i libpapershell-wl/libpapershell-wl.pro \
- -i libpaperprime/libpaperprime.pro || die
-}
-
-src_compile() {
- eqmake5 paperdesktop.pro
- emake
-}
-
-src_install() {
- emake INSTALL_ROOT="${ED}" install
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: gui-apps/paperdesktop/
@ 2021-03-11 13:16 Andrew Ammerlaan
0 siblings, 0 replies; 3+ messages in thread
From: Andrew Ammerlaan @ 2021-03-11 13:16 UTC (permalink / raw
To: gentoo-commits
commit: 41b505beb2afd78bf5c271a447a4e195d431ca49
Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Thu Mar 11 04:36:40 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Thu Mar 11 04:37:05 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=41b505be
gui-apps/paperdesktop: move live ebuild to cmake
also add dated ebuild
Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>
gui-apps/paperdesktop/Manifest | 1 +
...9999.ebuild => paperdesktop-0_p20210310.ebuild} | 39 +++++++++-------------
gui-apps/paperdesktop/paperdesktop-9999.ebuild | 39 +++++++++-------------
3 files changed, 33 insertions(+), 46 deletions(-)
diff --git a/gui-apps/paperdesktop/Manifest b/gui-apps/paperdesktop/Manifest
index 423304b5..05351da2 100644
--- a/gui-apps/paperdesktop/Manifest
+++ b/gui-apps/paperdesktop/Manifest
@@ -1 +1,2 @@
DIST paperdesktop-0_p20201107.tar.gz 200672 BLAKE2B d2c7807cd23294521ada75bfbae2f841e72a399a8bfc94e2f507c15eeda00d5fef90826225ae3d531d0b33f82ce2e0aa06b5081778e8354e87ccea30daf310c6 SHA512 940f0aba34fc8d03a3dc716ca921991ce3aa22eb0afcb601c23f3dd8ada2f15e22c5f0dbc83e58c003a3c43a0955e0b3634824d34fea1b2ce97bc3c2dfd28475
+DIST paperdesktop-0_p20210310.tar.gz 2239536 BLAKE2B c1b5c296d36db9687e8e106d2608da057238e91c607443d4cb28725fc90b6c35e2ae14d178ad79be525d6262574a2d0f0b54ee71f3de02de25d3a3aa31465b03 SHA512 77f26cb61e9cd2d02eb7dfe2eab12d17a10d96007bc8d4dda8b30e9327d3036c9ad3341268df2f5151ed48e96a9facc4d66abc7ae10dcd04e284a20b3e29cea9
diff --git a/gui-apps/paperdesktop/paperdesktop-9999.ebuild b/gui-apps/paperdesktop/paperdesktop-0_p20210310.ebuild
similarity index 53%
copy from gui-apps/paperdesktop/paperdesktop-9999.ebuild
copy to gui-apps/paperdesktop/paperdesktop-0_p20210310.ebuild
index ee7ec14c..e802fe3d 100644
--- a/gui-apps/paperdesktop/paperdesktop-9999.ebuild
+++ b/gui-apps/paperdesktop/paperdesktop-0_p20210310.ebuild
@@ -1,11 +1,11 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit qmake-utils
+inherit cmake xdg
-DESCRIPTION="simple, sleek QT based DE for wayland using wayfire"
+DESCRIPTION="Simple, sleek QT based DE for wayland using wayfire"
HOMEPAGE="https://gitlab.com/cubocore/paper/paperdesktop"
@@ -13,10 +13,10 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://gitlab.com/cubocore/paper/paperdesktop"
else
- COMMIT=960ff1e31a48e96e10afa0459183e52fbea8f2de
+ COMMIT=65c755306688203ddc32bbc099ba1de03166cde9
SRC_URI="https://gitlab.com/cubocore/paper/paperdesktop/-/archive/${COMMIT}/paperdesktop-${COMMIT}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}"/paperdesktop-${COMMIT}
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="~amd64"
fi
LICENSE="GPL-3"
@@ -25,36 +25,29 @@ SLOT="0"
DEPEND="
dev-libs/libdbusmenu-qt
dev-libs/wayland
+ 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
+ gui-libs/libcprime
+ gui-libs/libcsys
"
RDEPEND="${DEPEND}
gui-wm/wayfire[X]
x11-misc/qt5ct
"
-BDEPEND="
- virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-0_p20201107-build.patch )
src_prepare() {
- default
- sed -e "s:/lib/:/$(get_libdir)/:" \
- -i libpaperdesktop/core/core.pro \
- -i libpaperdesktop/gui/gui.pro \
- -i libpapershell-wl/libpapershell-wl.pro \
- -i libpaperprime/libpaperprime.pro || die
-}
-
-src_compile() {
- eqmake5 paperdesktop.pro
- emake
+ cmake_src_prepare
+ xdg_src_prepare
}
-src_install() {
- emake INSTALL_ROOT="${ED}" install
+src_configure() {
+ local mycmakeargs=(
+ -DPKGSHAREDPATH="${EPREFIX}/usr/share/paperde"
+ -DPKGCONFPATH="${EPREFIX}/etc/xdg/paperde"
+ )
+ cmake_src_configure
}
diff --git a/gui-apps/paperdesktop/paperdesktop-9999.ebuild b/gui-apps/paperdesktop/paperdesktop-9999.ebuild
index ee7ec14c..e802fe3d 100644
--- a/gui-apps/paperdesktop/paperdesktop-9999.ebuild
+++ b/gui-apps/paperdesktop/paperdesktop-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit qmake-utils
+inherit cmake xdg
-DESCRIPTION="simple, sleek QT based DE for wayland using wayfire"
+DESCRIPTION="Simple, sleek QT based DE for wayland using wayfire"
HOMEPAGE="https://gitlab.com/cubocore/paper/paperdesktop"
@@ -13,10 +13,10 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://gitlab.com/cubocore/paper/paperdesktop"
else
- COMMIT=960ff1e31a48e96e10afa0459183e52fbea8f2de
+ COMMIT=65c755306688203ddc32bbc099ba1de03166cde9
SRC_URI="https://gitlab.com/cubocore/paper/paperdesktop/-/archive/${COMMIT}/paperdesktop-${COMMIT}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}"/paperdesktop-${COMMIT}
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="~amd64"
fi
LICENSE="GPL-3"
@@ -25,36 +25,29 @@ SLOT="0"
DEPEND="
dev-libs/libdbusmenu-qt
dev-libs/wayland
+ 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
+ gui-libs/libcprime
+ gui-libs/libcsys
"
RDEPEND="${DEPEND}
gui-wm/wayfire[X]
x11-misc/qt5ct
"
-BDEPEND="
- virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-0_p20201107-build.patch )
src_prepare() {
- default
- sed -e "s:/lib/:/$(get_libdir)/:" \
- -i libpaperdesktop/core/core.pro \
- -i libpaperdesktop/gui/gui.pro \
- -i libpapershell-wl/libpapershell-wl.pro \
- -i libpaperprime/libpaperprime.pro || die
-}
-
-src_compile() {
- eqmake5 paperdesktop.pro
- emake
+ cmake_src_prepare
+ xdg_src_prepare
}
-src_install() {
- emake INSTALL_ROOT="${ED}" install
+src_configure() {
+ local mycmakeargs=(
+ -DPKGSHAREDPATH="${EPREFIX}/usr/share/paperde"
+ -DPKGCONFPATH="${EPREFIX}/etc/xdg/paperde"
+ )
+ cmake_src_configure
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: gui-apps/paperdesktop/
@ 2021-04-08 17:21 Andrew Ammerlaan
0 siblings, 0 replies; 3+ messages in thread
From: Andrew Ammerlaan @ 2021-04-08 17:21 UTC (permalink / raw
To: gentoo-commits
commit: 52753be23e837360b4f07e557cb4b9653f4b69ba
Author: Maciej Barć <xgqt <AT> riseup <DOT> net>
AuthorDate: Thu Apr 8 14:53:48 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Thu Apr 8 14:53:48 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=52753be2
gui-apps/paperdesktop: add myself (XGQT) to mainatiners
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Maciej Barć <xgqt <AT> riseup.net>
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 65ac1f205..470d0960e 100644
--- a/gui-apps/paperdesktop/metadata.xml
+++ b/gui-apps/paperdesktop/metadata.xml
@@ -1,8 +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>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>
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-04-08 17:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-03-11 13:16 [gentoo-commits] repo/proj/guru:master commit in: gui-apps/paperdesktop/ Andrew Ammerlaan
-- strict thread matches above, loose matches on Subject: below --
2021-04-08 17:21 Andrew Ammerlaan
2021-03-11 13:16 Andrew Ammerlaan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox