* [gentoo-commits] repo/proj/guru:dev commit in: gui-apps/paperde/files/, gui-apps/paperde/
@ 2021-05-12 17:05 Maciej Barć
0 siblings, 0 replies; 2+ messages in thread
From: Maciej Barć @ 2021-05-12 17:05 UTC (permalink / raw
To: gentoo-commits
commit: 4d7c6e9e247f58f11c239d724d02d836d572380a
Author: Maciej Barć <xgqt <AT> riseup <DOT> net>
AuthorDate: Wed May 12 17:04:44 2021 +0000
Commit: Maciej Barć <xgqt <AT> riseup <DOT> net>
CommitDate: Wed May 12 17:05:00 2021 +0000
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ć <xgqt <AT> 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..000000000
--- 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..000000000
--- 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} == *9999* ]]; 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..000000000
--- 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} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://gitlab.com/cubocore/paper/${PN}"
-else
- COMMIT=65c755306688203ddc32bbc099ba1de03166cde9
- SRC_URI="https://gitlab.com/cubocore/paper/${PN}/-/archive/${COMMIT}/paperde-${COMMIT}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/${PN}-${COMMIT}"
- KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3"
-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
-"
-
-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
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: gui-apps/paperde/files/, gui-apps/paperde/
@ 2024-10-21 14:24 Takuya Wakazono
0 siblings, 0 replies; 2+ messages in thread
From: Takuya Wakazono @ 2024-10-21 14:24 UTC (permalink / raw
To: gentoo-commits
commit: a854f1b7b93e9ec63d2da4d213d765a9569d120c
Author: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Mon Oct 21 14:21:52 2024 +0000
Commit: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
CommitDate: Mon Oct 21 14:24:07 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a854f1b7
gui-apps/paperde: fix BDEPEND and broken includes
Closes: https://bugs.gentoo.org/860003
Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com>
.../files/paperde-0.1.1_p20210426-fix-deps.patch | 63 ++++++++++++++++++++++
gui-apps/paperde/paperde-0.1.1_p20210426.ebuild | 13 ++---
2 files changed, 70 insertions(+), 6 deletions(-)
diff --git a/gui-apps/paperde/files/paperde-0.1.1_p20210426-fix-deps.patch b/gui-apps/paperde/files/paperde-0.1.1_p20210426-fix-deps.patch
new file mode 100644
index 000000000..929ff7577
--- /dev/null
+++ b/gui-apps/paperde/files/paperde-0.1.1_p20210426-fix-deps.patch
@@ -0,0 +1,63 @@
+Explicitly add missing Qt5Netowrk deps.
+Fixes:
+In file included from /var/tmp/portage/gui-apps/paperde-0.1.1_p20210426/work/paperde-15018307192107e2915671d412f3fc900ac5af4b/papershell/main.cpp:34:
+/usr/include/cprime/capplication.h:39:10: fatal error: QLocalServer: No such file or directory
+ 39 | #include <QLocalServer>
+ | ^~~~~~~~~~~~~~
+--- a/papershell/CMakeLists.txt
++++ b/papershell/CMakeLists.txt
+@@ -25,6 +25,7 @@ set( CMAKE_AUTOUIC ON )
+
+ find_package( Qt5Core REQUIRED )
+ find_package( Qt5Gui REQUIRED )
++find_package( Qt5Network REQUIRED )
+ find_package( Qt5Widgets REQUIRED )
+ find_package( Qt5DBus REQUIRED )
+ find_package( dbusmenu-qt5 REQUIRED )
+@@ -121,7 +122,7 @@ set ( RESOURCES
+ add_executable( papershell ${SOURCES} ${HEADERS} ${UIS} ${RESOURCES} )
+ target_link_libraries(
+ papershell
+- Qt5::Core Qt5::Gui Qt5::Widgets Qt5::DBus # Qt5 Libs
++ Qt5::Core Qt5::Gui Qt5::Network Qt5::Widgets Qt5::DBus # Qt5 Libs
+ dbusmenu-qt5 # DBusMenu Qt5 for tray menu
+ cprime-widgets cprime-gui cprime-core # CuboCore Libs
+ paperdegui paperdecore paperdewl # PaperDE Libs
+--- a/sessionmanager/CMakeLists.txt
++++ b/sessionmanager/CMakeLists.txt
+@@ -25,6 +25,7 @@ set( CMAKE_AUTOUIC ON )
+
+ find_package( Qt5Core REQUIRED )
+ find_package( Qt5DBus REQUIRED )
++find_package( Qt5Network REQUIRED )
+
+ set( HEADERS
+ sessionmgr.h
+@@ -38,7 +39,7 @@ set( SOURCES
+ )
+
+ add_executable( papersessionmanager ${SOURCES} ${HEADERS} )
+-target_link_libraries( papersessionmanager Qt5::Core Qt5::DBus cprime-core csys paperdecore )
++target_link_libraries( papersessionmanager Qt5::Core Qt5::DBus Qt5::Network cprime-core csys paperdecore )
+
+ install( TARGETS papersessionmanager DESTINATION bin )
+ install( FILES paperdesktop.desktop DESTINATION share/wayland-sessions/ )
+--- a/settings/CMakeLists.txt
++++ b/settings/CMakeLists.txt
+@@ -25,6 +25,7 @@ set( CMAKE_AUTOUIC ON )
+
+ find_package( Qt5Core REQUIRED )
+ find_package( Qt5Gui REQUIRED )
++find_package( Qt5Network REQUIRED )
+ find_package( Qt5Widgets REQUIRED )
+ find_package( Qt5UiTools REQUIRED )
+
+@@ -50,7 +51,7 @@ set ( RESOURCES
+ add_executable( papersettings ${SOURCES} ${HEADERS} ${UIS} ${RESOURCES} )
+ target_link_libraries(
+ papersettings
+- Qt5::Core Qt5::Gui Qt5::Widgets Qt5::UiTools
++ Qt5::Core Qt5::Gui Qt5::Network Qt5::Widgets Qt5::UiTools
+ cprime-widgets cprime-core
+ paperdegui paperdecore paperdewl
+ )
diff --git a/gui-apps/paperde/paperde-0.1.1_p20210426.ebuild b/gui-apps/paperde/paperde-0.1.1_p20210426.ebuild
index 612f3e01a..498832fd3 100644
--- a/gui-apps/paperde/paperde-0.1.1_p20210426.ebuild
+++ b/gui-apps/paperde/paperde-0.1.1_p20210426.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit cmake xdg
@@ -22,6 +22,7 @@ LICENSE="GPL-3"
SLOT="0"
BDEPEND="
+ dev-qt/qtwaylandscanner:5
kde-frameworks/extra-cmake-modules
"
DEPEND="
@@ -30,6 +31,7 @@ DEPEND="
dev-libs/wayland-protocols
dev-qt/designer:5
dev-qt/qtcore:5
+ dev-qt/qtdbus:5
dev-qt/qtgui:5[wayland,X]
dev-qt/qtnetwork:5
dev-qt/qtsvg:5
@@ -45,10 +47,9 @@ RDEPEND="
x11-misc/qt5ct
"
-src_prepare() {
- cmake_src_prepare
- xdg_src_prepare
-}
+PATCHES=(
+ "${FILESDIR}/${P}-fix-deps.patch"
+)
src_configure() {
local mycmakeargs=(
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-10-21 14:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-10-21 14:24 [gentoo-commits] repo/proj/guru:dev commit in: gui-apps/paperde/files/, gui-apps/paperde/ Takuya Wakazono
-- strict thread matches above, loose matches on Subject: below --
2021-05-12 17:05 Maciej Barć
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox