From edf5bc661bfcad5044abe7d13b94b1f38e7238a2 Mon Sep 17 00:00:00 2001 From: zenobit Date: Thu, 2 Mar 2023 02:56:45 +0100 Subject: [PATCH 1/9] New package: libcprime-4.4.1 --- common/shlibs | 3 +++ srcpkgs/libcprime-devel | 1 + srcpkgs/libcprime/template | 21 +++++++++++++++++++++ 3 files changed, 25 insertions(+) create mode 120000 srcpkgs/libcprime-devel create mode 100644 srcpkgs/libcprime/template diff --git a/common/shlibs b/common/shlibs index f1e825819fb4..295cd51cd6b5 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4246,3 +4246,6 @@ libayatana-appindicator3.so.1 libayatana-appindicator-0.5.91_1 libplayerctl.so.2 playerctl-2.4.1_1 libwireplumber-0.4.so.0 wireplumber-0.4.14_1 libjodycode.so.2 libjodycode-2.0.1_1 +libcsys.so.4 libcsys-0.1.1_1 +libcprime-core.so.4 libcprime-0.1.1_1 +libcprime-widgets.so.4 libcprime-0.1.1_1 diff --git a/srcpkgs/libcprime-devel b/srcpkgs/libcprime-devel new file mode 120000 index 000000000000..ca97cd2c5505 --- /dev/null +++ b/srcpkgs/libcprime-devel @@ -0,0 +1 @@ +libcprime \ No newline at end of file diff --git a/srcpkgs/libcprime/template b/srcpkgs/libcprime/template new file mode 100644 index 000000000000..5fb77a99bce9 --- /dev/null +++ b/srcpkgs/libcprime/template @@ -0,0 +1,21 @@ +# Template file for 'libcprime' +pkgname=libcprime +version=4.4.1 +revision=1 +build_style=cmake +hostmakedepends="qt5-devel" +short_desc="Library for bookmarking, saving activites and C-Suite settings" +maintainer="zenobit " +license="GPL-3.0-only" +homepage="https://gitlab.com/cubocore/coreapps/libcprime" +distfiles="https://gitlab.com/cubocore/libcprime/-/archive/v${version}/libcprime-v${version}.tar.gz" +checksum=b954275160c8954894b56308995c1aba43b9f698a1cdff07e390e38f3158ac3b + +libcprime-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.so" + } +} From 2732ec932181bbe64e734b5566f705a2217b6be1 Mon Sep 17 00:00:00 2001 From: zenobit Date: Thu, 2 Mar 2023 02:55:55 +0100 Subject: [PATCH 2/9] New package: libcsys-4.4.1 --- srcpkgs/libcsys-devel | 1 + srcpkgs/libcsys/template | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 120000 srcpkgs/libcsys-devel create mode 100644 srcpkgs/libcsys/template diff --git a/srcpkgs/libcsys-devel b/srcpkgs/libcsys-devel new file mode 120000 index 000000000000..26636f3405fc --- /dev/null +++ b/srcpkgs/libcsys-devel @@ -0,0 +1 @@ +libcsys \ No newline at end of file diff --git a/srcpkgs/libcsys/template b/srcpkgs/libcsys/template new file mode 100644 index 000000000000..2be0062bbf7f --- /dev/null +++ b/srcpkgs/libcsys/template @@ -0,0 +1,22 @@ +# Template file for 'libcsys' +pkgname=libcsys +version=4.4.1 +revision=1 +build_style=cmake +hostmakedepends="qt5-devel" +depends="udisks2" +short_desc="For managing drive and getting system resource information" +maintainer="zenobit " +license="GPL-3.0-only" +homepage="https://gitlab.com/cubocore/coreapps/libcsys" +distfiles="https://gitlab.com/cubocore/libcsys/-/archive/v${version}/libcsys-v${version}.tar.gz" +checksum=2d427505a2186cc27407ce78cf903dd124a1912d3b4495066960f3d3fb1f3f98 + +libcsys-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.so" + } +} From cf7e21e20252c6c5a794c448325e41ea4dba019f Mon Sep 17 00:00:00 2001 From: zenobit Date: Thu, 2 Mar 2023 02:47:11 +0100 Subject: [PATCH 3/9] New package: dfl-ipc-0.1.1 --- common/shlibs | 2 ++ srcpkgs/dfl-ipc-devel | 1 + srcpkgs/dfl-ipc/template | 21 +++++++++++++++++++++ 3 files changed, 24 insertions(+) create mode 120000 srcpkgs/dfl-ipc-devel create mode 100644 srcpkgs/dfl-ipc/template diff --git a/common/shlibs b/common/shlibs index 295cd51cd6b5..f44963de0c7b 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4249,3 +4249,5 @@ libjodycode.so.2 libjodycode-2.0.1_1 libcsys.so.4 libcsys-0.1.1_1 libcprime-core.so.4 libcprime-0.1.1_1 libcprime-widgets.so.4 libcprime-0.1.1_1 +libwayqt.so.0 wayqt-0.1.1_1 +libdf5ipc.so.0 dfl-ipc-0.1.1_1 diff --git a/srcpkgs/dfl-ipc-devel b/srcpkgs/dfl-ipc-devel new file mode 120000 index 000000000000..d0cdd1e59f6d --- /dev/null +++ b/srcpkgs/dfl-ipc-devel @@ -0,0 +1 @@ +dfl-ipc \ No newline at end of file diff --git a/srcpkgs/dfl-ipc/template b/srcpkgs/dfl-ipc/template new file mode 100644 index 000000000000..8b90516ccdd5 --- /dev/null +++ b/srcpkgs/dfl-ipc/template @@ -0,0 +1,21 @@ +# Template file for 'dfl-ipc' +pkgname=dfl-ipc +version=0.1.1 +revision=1 +build_style=meson +hostmakedepends="qt5-devel qt6-base-devel cmake qt5-qmake pkg-config" +short_desc="Simple set of IPC classes for inter-process communication" +maintainer="zenobit " +license="GPL-3.0-only" +homepage="https://gitlab.com/desktop-frameworks/ipc" +distfiles="https://gitlab.com/desktop-frameworks/ipc/-/archive/v0.1.1/ipc-v0.1.1.tar.gz" +checksum=53384014cbb032f214e7575fbb484539d823ba71fc2a2efb48e8194a6af4d660 + +dfl-ipc-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.so" + } +} From ced09523d70d508721689b95951540a040a263f6 Mon Sep 17 00:00:00 2001 From: zenobit Date: Tue, 28 Mar 2023 20:43:56 +0200 Subject: [PATCH 4/9] New package: dfl-sni-0.1.1 --- common/shlibs | 4 ++++ srcpkgs/dfl-sni-devel | 1 + srcpkgs/dfl-sni/template | 21 +++++++++++++++++++++ 3 files changed, 26 insertions(+) create mode 120000 srcpkgs/dfl-sni-devel create mode 100644 srcpkgs/dfl-sni/template diff --git a/common/shlibs b/common/shlibs index f44963de0c7b..0e04f644cf69 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4251,3 +4251,7 @@ libcprime-core.so.4 libcprime-0.1.1_1 libcprime-widgets.so.4 libcprime-0.1.1_1 libwayqt.so.0 wayqt-0.1.1_1 libdf5ipc.so.0 dfl-ipc-0.1.1_1 +libdf5login1.so.0 dfl-login1-0.1.1_1 +libdf5application.so.0 dfl-applications-0.1.1_1 +libdf5coreapplication.so.0 dfl-applications-0.1.1_1 +libdf5sni.so.0 dfl-sni-0.1.1_1 diff --git a/srcpkgs/dfl-sni-devel b/srcpkgs/dfl-sni-devel new file mode 120000 index 000000000000..3df214dbbcc2 --- /dev/null +++ b/srcpkgs/dfl-sni-devel @@ -0,0 +1 @@ +dfl-sni \ No newline at end of file diff --git a/srcpkgs/dfl-sni/template b/srcpkgs/dfl-sni/template new file mode 100644 index 000000000000..af9aec1d151a --- /dev/null +++ b/srcpkgs/dfl-sni/template @@ -0,0 +1,21 @@ +# Template file for 'dfl-sni' +pkgname=dfl-sni +version=0.1.1 +revision=1 +build_style=meson +hostmakedepends="qt5-devel qt6-base-devel cmake pkg-config" +short_desc="Implementation of the XDG Status Notification Specifications" +maintainer="zenobit " +license="GPL-3.0-only" +homepage="https://gitlab.com/desktop-frameworks/status-notifier" +distfiles="https://gitlab.com/desktop-frameworks/status-notifier/-/archive/v0.1.1/status-notifier-v0.1.1.tar.gz" +checksum=9fc1b9613e1685b42b525c31a47a0f26754100e910d63a54fd20a1ef0d62c536 + +dfl-sni-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.so" + } +} From 958bc4a9a82616a3d7685ceb957fb70a84537eca Mon Sep 17 00:00:00 2001 From: zenobit Date: Thu, 2 Mar 2023 02:46:19 +0100 Subject: [PATCH 5/9] New package: dfl-login1-0.1.1 --- srcpkgs/dfl-login1/template | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 srcpkgs/dfl-login1/template diff --git a/srcpkgs/dfl-login1/template b/srcpkgs/dfl-login1/template new file mode 100644 index 000000000000..ebb4de1b3459 --- /dev/null +++ b/srcpkgs/dfl-login1/template @@ -0,0 +1,12 @@ +# Template file for 'dfl-login1' +pkgname=dfl-login1 +version=0.1.1 +revision=1 +build_style=meson +hostmakedepends="qt5-devel qt6-base-devel" +short_desc="Implementation of systemd/elogind for DFL" +maintainer="zenobit " +license="GPL-3.0-only" +homepage="https://gitlab.com/desktop-frameworks/login1" +distfiles="https://gitlab.com/desktop-frameworks/login1/-/archive/v0.1.1/login1-v0.1.1.tar.gz" +checksum=eb68e46fb00f51a65d8eb877610b464c4da7565e08f8bab2d0759c592b515ca4 From 3c9d02f1da6fc4adb2ff825c0cea727fbf005201 Mon Sep 17 00:00:00 2001 From: zenobit Date: Thu, 2 Mar 2023 02:48:28 +0100 Subject: [PATCH 6/9] New package: dfl-settings-0.1.1 --- srcpkgs/dfl-settings/template | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 srcpkgs/dfl-settings/template diff --git a/srcpkgs/dfl-settings/template b/srcpkgs/dfl-settings/template new file mode 100644 index 000000000000..98ed6d3055b5 --- /dev/null +++ b/srcpkgs/dfl-settings/template @@ -0,0 +1,12 @@ +# Template file for 'dfl-settings' +pkgname=dfl-settings +version=0.1.1 +revision=1 +build_style=meson +hostmakedepends="qt5-devel cmake pkg-config" +short_desc="Class that extends QSettings" +maintainer="zenobit " +license="GPL-3.0-or-later" +homepage="https://gitlab.com/desktop-frameworks/settings" +distfiles="https://gitlab.com/desktop-frameworks/settings/-/archive/v0.1.1/settings-v0.1.1.tar.gz" +checksum=8f0213530f531fa1f3a34e5f42ec34278be369e542234a68e8247238a7b4c8b0 From 89971b1506e5cbef1bad5957cd804f80af9917ee Mon Sep 17 00:00:00 2001 From: zenobit Date: Thu, 2 Mar 2023 02:49:06 +0100 Subject: [PATCH 7/9] New package: dfl-applications-0.1.1 --- srcpkgs/dfl-applications/template | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 srcpkgs/dfl-applications/template diff --git a/srcpkgs/dfl-applications/template b/srcpkgs/dfl-applications/template new file mode 100644 index 000000000000..487453745aac --- /dev/null +++ b/srcpkgs/dfl-applications/template @@ -0,0 +1,12 @@ +# Template file for 'dfl-applications' +pkgname=dfl-applications +version=0.1.1 +revision=1 +build_style=meson +hostmakedepends="dfl-ipc qt5-devel qt6-base-devel cmake pkg-config" +short_desc="Class that extends QApplications" +maintainer="zenobit " +license="GPL-3.0-only" +homepage="https://gitlab.com/desktop-frameworks/applications" +distfiles="https://gitlab.com/desktop-frameworks/applications/-/archive/v0.1.1/applications-v0.1.1.tar.gz" +checksum=71b1b4c3a3682ffcbf4690b33a180d178bffec9c308400e31315f17da9c9283e From c34dfa0aa977fea0bee906d88ecbaf9a41c51e62 Mon Sep 17 00:00:00 2001 From: zenobit Date: Thu, 2 Mar 2023 02:53:30 +0100 Subject: [PATCH 8/9] New package: wayqt-0.1.1 --- srcpkgs/wayqt-devel | 1 + srcpkgs/wayqt/template | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 120000 srcpkgs/wayqt-devel create mode 100644 srcpkgs/wayqt/template diff --git a/srcpkgs/wayqt-devel b/srcpkgs/wayqt-devel new file mode 120000 index 000000000000..3c9e9b8528fa --- /dev/null +++ b/srcpkgs/wayqt-devel @@ -0,0 +1 @@ +wayqt \ No newline at end of file diff --git a/srcpkgs/wayqt/template b/srcpkgs/wayqt/template new file mode 100644 index 000000000000..39a75ac462cf --- /dev/null +++ b/srcpkgs/wayqt/template @@ -0,0 +1,21 @@ +# Template file for 'wayqt' +pkgname=wayqt +version=0.1.1 +revision=1 +build_style=meson +hostmakedepends="qt5-devel wayland-devel cmake pkg-config" +short_desc="Qt-based wrapper for various wayland protocols" +maintainer="zenobit " +license="GPL-3.0-only" +homepage="https://gitlab.com/desktop-frameworks/wayqt" +distfiles="https://gitlab.com/desktop-frameworks/wayqt/-/archive/v0.1.1/wayqt-v0.1.1.tar.gz" +checksum=b9633d0d85d5b60f8656371f02d1dcb88164a5ea136dd2fa15350eef6b120fac + +wayqt-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.so" + } +} From a4b4ec5858b20d9baffae08e8cd2ab824ec13280 Mon Sep 17 00:00:00 2001 From: zenobit Date: Thu, 2 Mar 2023 02:58:12 +0100 Subject: [PATCH 9/9] New package: paperde-0.2.1 --- srcpkgs/paperde/patches/libexecdir.patch | 99 ++++++++++++++++++++++++ srcpkgs/paperde/template | 13 ++++ 2 files changed, 112 insertions(+) create mode 100644 srcpkgs/paperde/patches/libexecdir.patch create mode 100644 srcpkgs/paperde/template diff --git a/srcpkgs/paperde/patches/libexecdir.patch b/srcpkgs/paperde/patches/libexecdir.patch new file mode 100644 index 000000000000..9dce1aff6895 --- /dev/null +++ b/srcpkgs/paperde/patches/libexecdir.patch @@ -0,0 +1,99 @@ +From 21ac4c4da266853b336bf79b8176f5fb50777686 Mon Sep 17 00:00:00 2001 +From: mobinmob +Date: Sat, 4 Mar 2023 09:28:30 +0200 +Subject: [PATCH] meson.build: fix libexecdir + +--- + meson.build | 2 +- + papershell/bg/meson.build | 2 +- + papershell/dock/meson.build | 2 +- + papershell/logout/meson.build | 2 +- + papershell/menu/meson.build | 2 +- + papershell/meson.build | 3 +-- + papershell/widgets/meson.build | 2 +- + 7 files changed, 7 insertions(+), 8 deletions(-) + +diff --git a/meson.build b/meson.build +index cad138b..a2d725f 100644 +--- a/meson.build ++++ b/meson.build +@@ -53,7 +53,7 @@ conf_data.set( 'version', meson.project_version() ) + conf_data.set( 'INSTALL_PREFIX', get_option( 'prefix' ) ) + conf_data.set( 'SHARED_DATA_PATH', join_paths( get_option( 'prefix' ), get_option( 'datadir' ), 'paperde' ) ) + conf_data.set( 'PLUGIN_PATH', join_paths( get_option( 'prefix' ), get_option( 'libdir' ), 'paperde', 'plugins' ) ) +-conf_data.set( 'UTILS_PATH', join_paths( get_option( 'prefix' ), get_option( 'libdir' ), get_option( 'libexecdir' ), 'paperde' ) ) ++conf_data.set( 'UTILS_PATH', join_paths( get_option( 'prefix' ), get_option( 'libexecdir' ), 'paperde' ) ) + + # Configure this so that the whole project can access it + configure_file( +diff --git a/papershell/bg/meson.build b/papershell/bg/meson.build +index b3159fe..5dc5891 100644 +--- a/papershell/bg/meson.build ++++ b/papershell/bg/meson.build +@@ -26,7 +26,7 @@ paperbg = executable( + dependencies: Deps, + include_directories: [config_inc, ShellInc], + install: true, +- install_dir: join_paths( get_option( 'libdir' ), get_option( 'libexecdir' ), 'paperde' ) ++ install_dir: join_paths( get_option( 'prefix' ), get_option( 'libexecdir' ), 'paperde' ) + ) + + install_data( +diff --git a/papershell/dock/meson.build b/papershell/dock/meson.build +index bf6bca9..d0a78e1 100644 +--- a/papershell/dock/meson.build ++++ b/papershell/dock/meson.build +@@ -34,5 +34,5 @@ paperdock = executable( + include_directories: [Includes, config_inc, ShellInc], + cpp_args : '-DAPPNAME="paperdock"', + install: true, +- install_dir: join_paths( get_option( 'libdir' ), get_option( 'libexecdir' ), 'paperde' ) ++ install_dir: join_paths( get_option( 'prefix' ), get_option( 'libexecdir' ), 'paperde' ) + ) +diff --git a/papershell/logout/meson.build b/papershell/logout/meson.build +index bd1c4b4..95a9cb2 100644 +--- a/papershell/logout/meson.build ++++ b/papershell/logout/meson.build +@@ -21,5 +21,5 @@ paperlogout = executable( + dependencies: Deps, + include_directories: [config_inc, ShellInc], + install: true, +- install_dir: join_paths( get_option( 'libdir' ), get_option( 'libexecdir' ), 'paperde' ) ++ install_dir: join_paths( get_option( 'prefix' ), get_option( 'libexecdir' ), 'paperde' ) + ) +diff --git a/papershell/menu/meson.build b/papershell/menu/meson.build +index 961dece..436d75c 100644 +--- a/papershell/menu/meson.build ++++ b/papershell/menu/meson.build +@@ -29,5 +29,5 @@ papermenu = executable( + include_directories: [config_inc, ShellInc], + cpp_args : '-DAPPNAME="papermenu"', + install: true, +- install_dir: join_paths( get_option( 'libdir' ), get_option( 'libexecdir' ), 'paperde' ) ++ install_dir: join_paths( get_option( 'prefix' ), get_option( 'libexecdir' ), 'paperde' ) + ) +diff --git a/papershell/meson.build b/papershell/meson.build +index 2b5d1a2..e4e2c29 100644 +--- a/papershell/meson.build ++++ b/papershell/meson.build +@@ -21,5 +21,4 @@ papersnwatcher = executable( + 'papersnwatcher', [ 'SNWatcher.cpp' ], + dependencies: [Qt5Core, Qt5DBus, DFSNI], + install: true, +- install_dir: join_paths( get_option( 'libdir' ), get_option( 'libexecdir' ), 'paperde' ) +-) ++ install_dir: join_paths( get_option( 'prefix' ), get_option( 'libexecdir' ), 'paperde' ) ) +diff --git a/papershell/widgets/meson.build b/papershell/widgets/meson.build +index da0c2d1..03d9cb4 100644 +--- a/papershell/widgets/meson.build ++++ b/papershell/widgets/meson.build +@@ -43,5 +43,5 @@ paperwidgets = executable( + include_directories: [Includes, config_inc, ShellInc], + cpp_args : '-DAPPNAME="paperwidgets"', + install: true, +- install_dir: join_paths( get_option( 'libdir' ), get_option( 'libexecdir' ), 'paperde' ) ++ install_dir: join_paths( get_option( 'prefix' ), get_option( 'libexecdir' ), 'paperde' ) + ) +-- +2.39.2 + diff --git a/srcpkgs/paperde/template b/srcpkgs/paperde/template new file mode 100644 index 000000000000..ef91f67aa3c5 --- /dev/null +++ b/srcpkgs/paperde/template @@ -0,0 +1,13 @@ +# Template file for 'paperde' +pkgname=paperde +version=0.2.1 +revision=1 +build_style=meson +hostmakedepends="wayfire pkg-config cmake qt5-qmake qt5 qt5-wayland qt5-svg qt5-tools-devel libdbusmenu-qt5-devel wayland-devel xdg-desktop-portal qt5ct" +makedepends="libcsys-devel libcprime-devel wayqt-devel dfl-ipc-devel dfl-sni-devel dfl-applications dfl-login1 dfl-settings" +short_desc="Desktop Environment using Qt/Wayland and wayfire" +maintainer="zenobit " +license="GPL-3.0-only" +homepage="https://gitlab.com/cubocore/paper/paperde" +distfiles="https://gitlab.com/cubocore/paper/paperde/-/archive/v${version}/paperde-v${version}.tar.gz" +checksum=3e93b0733c92be8e485087d16c7057d0178da81615ad74aa8b74e5870b21c332