From 8f3273bea4b852e8dd65e682a9d0710586ff6521 Mon Sep 17 00:00:00 2001 From: zenobit Date: Wed, 27 Sep 2023 08:27:04 +0200 Subject: [PATCH 01/17] New package: libcsys-4.5.0 --- common/shlibs | 1 + srcpkgs/libcsys-devel | 1 + srcpkgs/libcsys/template | 22 ++++++++++++++++++++++ 3 files changed, 24 insertions(+) create mode 120000 srcpkgs/libcsys-devel create mode 100644 srcpkgs/libcsys/template diff --git a/common/shlibs b/common/shlibs index 93fb4b2608729..db45fd2ff42c4 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4273,3 +4273,4 @@ libunicode.so.0.4 libunicode-0.4.0_1 libunicode_ucd.so.0.4 libunicode-0.4.0_1 libunicode_loader.so.0.4 libunicode-0.4.0_1 force-stage.so.0.1 void-force-stage-0.1_1 +libcsys.so.4 libcsys-4.5.0_1 diff --git a/srcpkgs/libcsys-devel b/srcpkgs/libcsys-devel new file mode 120000 index 0000000000000..26636f3405fcc --- /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 0000000000000..2a3a2c2fe9757 --- /dev/null +++ b/srcpkgs/libcsys/template @@ -0,0 +1,22 @@ +# Template file for 'libcsys' +pkgname=libcsys +version=4.5.0 +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=4fd57d729b9e8d056ce03c7fe965434bcad4f1a4601e3a1df7086a7170057829 + +libcsys-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.so" + } +} From c24ab7c85f556147277a94e5a2fec1f8dec03dae Mon Sep 17 00:00:00 2001 From: zenobit Date: Wed, 27 Sep 2023 08:29:03 +0200 Subject: [PATCH 02/17] New package: libcprime-4.5.0 --- common/shlibs | 2 ++ srcpkgs/libcprime-devel | 1 + srcpkgs/libcprime/template | 21 +++++++++++++++++++++ 3 files changed, 24 insertions(+) create mode 120000 srcpkgs/libcprime-devel create mode 100644 srcpkgs/libcprime/template diff --git a/common/shlibs b/common/shlibs index db45fd2ff42c4..8c0839b2ab083 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4274,3 +4274,5 @@ libunicode_ucd.so.0.4 libunicode-0.4.0_1 libunicode_loader.so.0.4 libunicode-0.4.0_1 force-stage.so.0.1 void-force-stage-0.1_1 libcsys.so.4 libcsys-4.5.0_1 +libcprime-core.so.4 libcprime-4.5.0_1 +libcprime-widgets.so.4 libcprime-4.5.0_1 diff --git a/srcpkgs/libcprime-devel b/srcpkgs/libcprime-devel new file mode 120000 index 0000000000000..ca97cd2c55055 --- /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 0000000000000..566392fd6559d --- /dev/null +++ b/srcpkgs/libcprime/template @@ -0,0 +1,21 @@ +# Template file for 'libcprime' +pkgname=libcprime +version=4.5.0 +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=0ea4ac3a8de364ec9e73c2b84685a95e872242e4dd3abef923efae0826f289fe + +libcprime-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.so" + } +} From d3e7dc906a59223931b9999bddf29f14d8d201b1 Mon Sep 17 00:00:00 2001 From: zenobit Date: Wed, 27 Sep 2023 08:30:55 +0200 Subject: [PATCH 03/17] New package: wayqt-0.1.99 --- common/shlibs | 1 + srcpkgs/wayqt-devel | 1 + srcpkgs/wayqt/template | 21 +++++++++++++++++++++ 3 files changed, 23 insertions(+) create mode 120000 srcpkgs/wayqt-devel create mode 100644 srcpkgs/wayqt/template diff --git a/common/shlibs b/common/shlibs index 8c0839b2ab083..89912cd991d60 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4276,3 +4276,4 @@ force-stage.so.0.1 void-force-stage-0.1_1 libcsys.so.4 libcsys-4.5.0_1 libcprime-core.so.4 libcprime-4.5.0_1 libcprime-widgets.so.4 libcprime-4.5.0_1 +libwayqt.so.0 wayqt-0.1.99_1 diff --git a/srcpkgs/wayqt-devel b/srcpkgs/wayqt-devel new file mode 120000 index 0000000000000..3c9e9b8528fad --- /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 0000000000000..7b82152eeb5e5 --- /dev/null +++ b/srcpkgs/wayqt/template @@ -0,0 +1,21 @@ +# Template file for 'wayqt' +pkgname=wayqt +version=0.1.99 +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/v${version}/wayqt-v${version}.tar.gz" +checksum=393936097099dcb1f9ffbface433e1c92aa0694ee6cfb90f3697c54a16b4c1a6 + +wayqt-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.so" + } +} From 651d9e4dfa4673d9aa99eae811455abf5575e7d2 Mon Sep 17 00:00:00 2001 From: zenobit Date: Wed, 27 Sep 2023 08:32:12 +0200 Subject: [PATCH 04/17] New package: dfl-sni-0.1.99 --- common/shlibs | 1 + srcpkgs/dfl-sni-devel | 1 + srcpkgs/dfl-sni/template | 21 +++++++++++++++++++++ 3 files changed, 23 insertions(+) create mode 120000 srcpkgs/dfl-sni-devel create mode 100644 srcpkgs/dfl-sni/template diff --git a/common/shlibs b/common/shlibs index 89912cd991d60..8f77fe776ad3d 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4277,3 +4277,4 @@ libcsys.so.4 libcsys-4.5.0_1 libcprime-core.so.4 libcprime-4.5.0_1 libcprime-widgets.so.4 libcprime-4.5.0_1 libwayqt.so.0 wayqt-0.1.99_1 +libdf5sni.so.0 dfl-sni-0.1.99_1 diff --git a/srcpkgs/dfl-sni-devel b/srcpkgs/dfl-sni-devel new file mode 120000 index 0000000000000..3df214dbbcc22 --- /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 0000000000000..3692cbab87f1c --- /dev/null +++ b/srcpkgs/dfl-sni/template @@ -0,0 +1,21 @@ +# Template file for 'dfl-sni' +pkgname=dfl-sni +version=0.1.99 +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/v${version}/status-notifier-v${version}.tar.gz" +checksum=6c61c5538b208f2ce47a82957d06082b21f8af255260ca3348e17256c70326f7 + +dfl-sni-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.so" + } +} From 40b566d8bfa54cc0cadc315d42bde1ed62c2208d Mon Sep 17 00:00:00 2001 From: zenobit Date: Wed, 27 Sep 2023 08:32:51 +0200 Subject: [PATCH 05/17] New package: dfl-ipc-0.1.99 --- common/shlibs | 1 + srcpkgs/dfl-ipc-devel | 1 + srcpkgs/dfl-ipc/template | 21 +++++++++++++++++++++ 3 files changed, 23 insertions(+) create mode 120000 srcpkgs/dfl-ipc-devel create mode 100644 srcpkgs/dfl-ipc/template diff --git a/common/shlibs b/common/shlibs index 8f77fe776ad3d..6b19791e7821d 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4278,3 +4278,4 @@ libcprime-core.so.4 libcprime-4.5.0_1 libcprime-widgets.so.4 libcprime-4.5.0_1 libwayqt.so.0 wayqt-0.1.99_1 libdf5sni.so.0 dfl-sni-0.1.99_1 +libdf5ipc.so.0 dfl-ipc-0.1.99_1 diff --git a/srcpkgs/dfl-ipc-devel b/srcpkgs/dfl-ipc-devel new file mode 120000 index 0000000000000..d0cdd1e59f6d8 --- /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 0000000000000..5c3012c626697 --- /dev/null +++ b/srcpkgs/dfl-ipc/template @@ -0,0 +1,21 @@ +# Template file for 'dfl-ipc' +pkgname=dfl-ipc +version=0.1.99 +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/v${version}/ipc-v${version}.tar.gz" +checksum=c6cdf7f6b36927f55e3ef030a391267bfc063b20c3848dbecc0443e73d7c9801 + +dfl-ipc-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.so" + } +} From 4368214a66d84e58d03188be376335fa550f9dbc Mon Sep 17 00:00:00 2001 From: zenobit Date: Wed, 27 Sep 2023 08:33:43 +0200 Subject: [PATCH 06/17] New package: dfl-login1-0.1.99 --- common/shlibs | 1 + srcpkgs/dfl-login1-devel | 1 + srcpkgs/dfl-login1/template | 21 +++++++++++++++++++++ 3 files changed, 23 insertions(+) create mode 120000 srcpkgs/dfl-login1-devel create mode 100644 srcpkgs/dfl-login1/template diff --git a/common/shlibs b/common/shlibs index 6b19791e7821d..4e4578d901f3a 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4279,3 +4279,4 @@ libcprime-widgets.so.4 libcprime-4.5.0_1 libwayqt.so.0 wayqt-0.1.99_1 libdf5sni.so.0 dfl-sni-0.1.99_1 libdf5ipc.so.0 dfl-ipc-0.1.99_1 +libdf5login1.so.0 dfl-login1-0.1.99_1 diff --git a/srcpkgs/dfl-login1-devel b/srcpkgs/dfl-login1-devel new file mode 120000 index 0000000000000..bb932be6b8e05 --- /dev/null +++ b/srcpkgs/dfl-login1-devel @@ -0,0 +1 @@ +dfl-login1 \ No newline at end of file diff --git a/srcpkgs/dfl-login1/template b/srcpkgs/dfl-login1/template new file mode 100644 index 0000000000000..f067d1745b55f --- /dev/null +++ b/srcpkgs/dfl-login1/template @@ -0,0 +1,21 @@ +# Template file for 'dfl-login1' +pkgname=dfl-login1 +version=0.1.99 +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/v${version}/login1-v${version}.tar.gz" +checksum=285417313390d19961f59393e4b7415f23506845b4c5f7db1325e608aca3da5b + +dfl-login1-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.so" + } +} From e72f4aab4b0ebdf2184b2f1055a065b83b613d8c Mon Sep 17 00:00:00 2001 From: zenobit Date: Wed, 27 Sep 2023 09:00:50 +0200 Subject: [PATCH 07/17] New package: dfl-settings-0.1.99 --- common/shlibs | 1 + srcpkgs/dfl-settings-devel | 1 + srcpkgs/dfl-settings/template | 21 +++++++++++++++++++++ 3 files changed, 23 insertions(+) create mode 120000 srcpkgs/dfl-settings-devel create mode 100644 srcpkgs/dfl-settings/template diff --git a/common/shlibs b/common/shlibs index 4e4578d901f3a..4254b13f67316 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4280,3 +4280,4 @@ libwayqt.so.0 wayqt-0.1.99_1 libdf5sni.so.0 dfl-sni-0.1.99_1 libdf5ipc.so.0 dfl-ipc-0.1.99_1 libdf5login1.so.0 dfl-login1-0.1.99_1 +libdf5settings.so.0 dfl-settings-0.1.99_1 diff --git a/srcpkgs/dfl-settings-devel b/srcpkgs/dfl-settings-devel new file mode 120000 index 0000000000000..369deb8924668 --- /dev/null +++ b/srcpkgs/dfl-settings-devel @@ -0,0 +1 @@ +dfl-settings \ No newline at end of file diff --git a/srcpkgs/dfl-settings/template b/srcpkgs/dfl-settings/template new file mode 100644 index 0000000000000..b1d563cba33b4 --- /dev/null +++ b/srcpkgs/dfl-settings/template @@ -0,0 +1,21 @@ +# Template file for 'dfl-settings' +pkgname=dfl-settings +version=0.1.99 +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/v${version}/settings-v${version}.tar.gz" +checksum=99f15cd07a2f64f2f3c3dd0926e481d212ba55054c80c914ef7d61588695ea7b + +dfl-settings-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.so" + } +} From 2038cb15e7ef9a796d66a1984fc0912c50e262a1 Mon Sep 17 00:00:00 2001 From: zenobit Date: Wed, 27 Sep 2023 09:01:45 +0200 Subject: [PATCH 08/17] New package: dfl-applications-0.1.99 --- common/shlibs | 2 ++ srcpkgs/dfl-applications-devel | 1 + srcpkgs/dfl-applications/template | 22 ++++++++++++++++++++++ 3 files changed, 25 insertions(+) create mode 120000 srcpkgs/dfl-applications-devel create mode 100644 srcpkgs/dfl-applications/template diff --git a/common/shlibs b/common/shlibs index 4254b13f67316..9d5760d2d7fb0 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4281,3 +4281,5 @@ libdf5sni.so.0 dfl-sni-0.1.99_1 libdf5ipc.so.0 dfl-ipc-0.1.99_1 libdf5login1.so.0 dfl-login1-0.1.99_1 libdf5settings.so.0 dfl-settings-0.1.99_1 +libdf5application.so.0 dfl-applications-0.1.99_1 +libdf5coreapplication.so.0 dfl-applications-0.1.99_1 diff --git a/srcpkgs/dfl-applications-devel b/srcpkgs/dfl-applications-devel new file mode 120000 index 0000000000000..15dacd564377b --- /dev/null +++ b/srcpkgs/dfl-applications-devel @@ -0,0 +1 @@ +dfl-applications \ No newline at end of file diff --git a/srcpkgs/dfl-applications/template b/srcpkgs/dfl-applications/template new file mode 100644 index 0000000000000..34083dd238047 --- /dev/null +++ b/srcpkgs/dfl-applications/template @@ -0,0 +1,22 @@ +# Template file for 'dfl-applications' +pkgname=dfl-applications +version=0.1.99 +revision=1 +build_style=meson +hostmakedepends="qt5-devel qt6-base-devel cmake pkg-config" +makedepends="dfl-ipc-devel" +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/v${version}/applications-v${version}.tar.gz" +checksum=f4090b19d1f87f6d95744b41abccc82dc4812485b77d56240a02b424916ee2cf + +dfl-applications-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.so" + } +} From b52176b8cafb6960844eb5d4b276e02054333d65 Mon Sep 17 00:00:00 2001 From: zenobit Date: Wed, 27 Sep 2023 09:02:42 +0200 Subject: [PATCH 09/17] New package: paperde-0.2.1 --- srcpkgs/paperde/patches/libexecdir.patch | 99 ++++++++++++++++++++++++ srcpkgs/paperde/template | 23 ++++++ 2 files changed, 122 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 0000000000000..9dce1aff68953 --- /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 0000000000000..fc9ed78f012b3 --- /dev/null +++ b/srcpkgs/paperde/template @@ -0,0 +1,23 @@ +# Template file for 'paperde' +pkgname=paperde +version=0.2.1 +revision=1 +build_style=meson +hostmakedepends="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-devel dfl-login1-devel dfl-settings-devel" +depends="wayfire" +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=40a1ca455869f6e55592579359530f5ce0031694d6f87b28c2956fb00d6bd8e5 + +do_build() { + meson .build --prefix=/usr --buildtype=release + ninja -C .build +} + +do_install() { + ninja -C .build install +} From 24ac92cf689452b43787161ada2ba3989b3a031d Mon Sep 17 00:00:00 2001 From: zenobit Date: Sun, 8 Oct 2023 13:23:48 +0200 Subject: [PATCH 10/17] wayfire: Update to 0.8.0 --- srcpkgs/wayfire/patches/fix-man-path.patch | 13 +++++++++++++ srcpkgs/wayfire/template | 21 +++++++++++++++------ 2 files changed, 28 insertions(+), 6 deletions(-) create mode 100644 srcpkgs/wayfire/patches/fix-man-path.patch diff --git a/srcpkgs/wayfire/patches/fix-man-path.patch b/srcpkgs/wayfire/patches/fix-man-path.patch new file mode 100644 index 0000000000000..c88eb1875525e --- /dev/null +++ b/srcpkgs/wayfire/patches/fix-man-path.patch @@ -0,0 +1,13 @@ +/usr/man is forbidden, use /usr/share/man + +--- man/meson.build ++++ man/meson.build +@@ -1,7 +1,7 @@ + configure_file(input: 'wayfire.1.in', + output: 'wayfire.1', + install: true, +- install_dir: 'man', ++ install_dir: '/usr/share/man', + configuration: conf_data) + + install_man(join_paths(meson.project_build_root(), 'man', 'wayfire.1')) diff --git a/srcpkgs/wayfire/template b/srcpkgs/wayfire/template index 42caa0af15b16..6f535a522414c 100644 --- a/srcpkgs/wayfire/template +++ b/srcpkgs/wayfire/template @@ -1,15 +1,15 @@ # Template file for 'wayfire' pkgname=wayfire -version=0.7.5 -revision=2 +version=0.8.0 +revision=1 _utils_commit=889fdafa7b09fc6ce70313fd3f067cfc8c21a2ac _touch_commit=8974eb0f6a65464b63dd03b842795cb441fb6403 create_wrksrc=yes build_wrksrc="${pkgname}-${version}" build_style=meson -configure_args="-Dprint_trace=false" -hostmakedepends="pkg-config wayland-devel" -makedepends="wf-config-devel wlroots0.16-devel cairo-devel pango-devel +configure_args="$PREFIX="/usr" -Dprint_trace=false" +hostmakedepends="ninja pkg-config wayland-devel" +makedepends="wf-config-devel wlroots-devel cairo-devel pango-devel json-c++ $(vopt_if image 'libjpeg-turbo-devel libpng-devel')" depends="xorg-server-xwayland" short_desc="3D wayland compositor" @@ -19,7 +19,7 @@ homepage="https://wayfire.org" distfiles="https://github.com/WayfireWM/wayfire/archive/refs/tags/v${version}.tar.gz https://github.com/WayfireWM/wf-utils/archive/${_utils_commit}.tar.gz https://github.com/WayfireWM/wf-touch/archive/${_touch_commit}.tar.gz" -checksum="ae9a44d3ddcdf97b2dbe2baeeaf880f24f95bfb18e11e1dd5ad7443c26c5e19e +checksum="3b67dd03a9370a0c0a2d9b98d77d9184d62b25ca13844cfdbb0cac788cb9d4b6 bbde37e1a8b5ecb322096b32891593c14264800291be8773f7f0708fc110ed2f 09061c8a4d3d964e8dcfd1a7b97f7dc43d0fc30743b0993585439c6923ce422f" @@ -42,6 +42,15 @@ post_extract() { mv wf-touch-${_touch_commit} ${build_wrksrc}/subprojects/wf-touch } +do_build() { + ninja -C build + ninja -C man +} + +do_install() { + ninja install -C build +} + post_install() { vlicense LICENSE vsconf wayfire.ini From b1a713fe347844a47ece26e80a2ccb7294bd5f22 Mon Sep 17 00:00:00 2001 From: zenobit Date: Thu, 21 Dec 2023 15:45:21 +0100 Subject: [PATCH 11/17] wf-shell: Update to 0.8.0 --- srcpkgs/wf-shell/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/wf-shell/template b/srcpkgs/wf-shell/template index a5d9cfa809413..111f56655c0d1 100644 --- a/srcpkgs/wf-shell/template +++ b/srcpkgs/wf-shell/template @@ -1,7 +1,7 @@ # Template file for 'wf-shell' pkgname=wf-shell -version=0.7.0 -revision=2 +version=0.8.0 +revision=1 build_style=meson build_helper="gir" configure_args="-Dwayland-logout:implementation=c" @@ -13,7 +13,7 @@ maintainer="Young Jin Park " license="MIT" homepage="https://wayfire.org" distfiles="https://github.com/WayfireWM/wf-shell/releases/download/v${version}/wf-shell-${version}.tar.xz" -checksum=7495c690a1c021e0c82ba304513b3e7870cb329f7f0bf88df3bc5f46535d5ec7 +checksum=d74b744194f91d9181699107072c006399b8b38696d68bad91bd812c7f73ee1d post_install() { vlicense LICENSE From 879164dc0c6425dd8ce7bb2a3faf452eb237d528 Mon Sep 17 00:00:00 2001 From: zenobit Date: Thu, 21 Dec 2023 15:45:55 +0100 Subject: [PATCH 12/17] wf-config: Update to 0.8.0 --- srcpkgs/wf-config/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/wf-config/template b/srcpkgs/wf-config/template index 49271c8d7729d..911c99b3c858d 100644 --- a/srcpkgs/wf-config/template +++ b/srcpkgs/wf-config/template @@ -1,6 +1,6 @@ # Template file for 'wf-config' pkgname=wf-config -version=0.7.1 +version=0.8.0 revision=1 build_style=meson hostmakedepends="pkg-config" @@ -10,7 +10,7 @@ maintainer="Young Jin Park " license="MIT" homepage="https://wayfire.org" distfiles="https://github.com/WayfireWM/wf-config/archive/v${version}.tar.gz" -checksum=9c212f85bfb26d135610f45865b4401e0c33a0ab3577ac65042eb23ebfe91bdb +checksum=5b69ab8886e2b0e9c5bffa65c5c676c2848fbcc0e67201886a5f2fdd354e25fb post_install() { vlicense LICENSE From 5bebf4d413885e04a82d929b84494b21d0c52f0a Mon Sep 17 00:00:00 2001 From: zenobit Date: Thu, 21 Dec 2023 15:50:02 +0100 Subject: [PATCH 13/17] wcm: Update to 0.8.0 --- srcpkgs/wcm/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/wcm/template b/srcpkgs/wcm/template index a6ae7daa8a380..3b52d7d280fed 100644 --- a/srcpkgs/wcm/template +++ b/srcpkgs/wcm/template @@ -1,6 +1,6 @@ # Template file for 'wcm' pkgname=wcm -version=0.7.5 +version=0.8.0 revision=1 build_style=meson configure_args="-Denable_wdisplays=false" @@ -11,7 +11,7 @@ maintainer="Érico Nogueira " license="MIT" homepage="https://wayfire.org/" distfiles="https://github.com/WayfireWM/wcm/archive/v${version}.tar.gz" -checksum=39dd349a925295bb743b7c1318807ec2ce6675bfa482fc9b420da71c7b798515 +checksum=24000f5d037dc03eed9eaf2803987db5e02c1776bbe7c56b9c95c5942f65938f post_install() { vlicense LICENSE From 8158e57b696435271829c8d0e4cfa1b02ebfaf6d Mon Sep 17 00:00:00 2001 From: zenobit Date: Thu, 21 Dec 2023 15:50:57 +0100 Subject: [PATCH 14/17] wayfire-plugins-extra: Update to 0.8.0 --- srcpkgs/wayfire-plugins-extra/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/wayfire-plugins-extra/template b/srcpkgs/wayfire-plugins-extra/template index 97170bfcdf980..4ece0743c4798 100644 --- a/srcpkgs/wayfire-plugins-extra/template +++ b/srcpkgs/wayfire-plugins-extra/template @@ -1,6 +1,6 @@ # Template file for 'wayfire-plugins-extra' pkgname=wayfire-plugins-extra -version=0.7.5 +version=0.8.0 revision=1 build_style=meson hostmakedepends="pkg-config wayland-devel" @@ -11,7 +11,7 @@ maintainer="Érico Nogueira " license="MIT" homepage="https://wayfire.org/" distfiles="https://github.com/WayfireWM/wayfire-plugins-extra/archive/refs/tags/v${version}.tar.gz" -checksum=70418f29ecf9e3cb9c5313302ded125048d1493d57e4e5146f30363c5c954840 +checksum=6871f19c79dc9d9c965229f958da79eebbc7ff54ebc8ba0b97c514aaaf36cd3b post_install() { vlicense LICENSE From 06dc9562232903e5eef5964eba7cfa7f84c50fb8 Mon Sep 17 00:00:00 2001 From: zenobit Date: Sat, 23 Dec 2023 01:26:03 +0100 Subject: [PATCH 15/17] test2 --- srcpkgs/wayfire/template | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/srcpkgs/wayfire/template b/srcpkgs/wayfire/template index 6f535a522414c..2eaadceb6e965 100644 --- a/srcpkgs/wayfire/template +++ b/srcpkgs/wayfire/template @@ -7,11 +7,11 @@ _touch_commit=8974eb0f6a65464b63dd03b842795cb441fb6403 create_wrksrc=yes build_wrksrc="${pkgname}-${version}" build_style=meson -configure_args="$PREFIX="/usr" -Dprint_trace=false" +configure_args="-Dprint_trace=false" hostmakedepends="ninja pkg-config wayland-devel" -makedepends="wf-config-devel wlroots-devel cairo-devel pango-devel json-c++ +makedepends="wf-config-devel wlroots-devel cairo-devel pango-devel json-c++ cmake bzip2-devel $(vopt_if image 'libjpeg-turbo-devel libpng-devel')" -depends="xorg-server-xwayland" +depends="xorg-server-xwayland cairo" short_desc="3D wayland compositor" maintainer="Érico Nogueira " license="MIT" @@ -42,13 +42,18 @@ post_extract() { mv wf-touch-${_touch_commit} ${build_wrksrc}/subprojects/wf-touch } +pre_build() { + meson build + meson man +} + do_build() { ninja -C build - ninja -C man } do_install() { ninja install -C build + ninja install -C man PREFIX=/usr/share DESTDIR="DESTDIR" } post_install() { From d4747769a582061eb1c5c739a5a2d99898d63c5c Mon Sep 17 00:00:00 2001 From: zenobit Date: Sat, 23 Dec 2023 01:26:13 +0100 Subject: [PATCH 16/17] patch test --- srcpkgs/wayfire/patches/fix-man-path.patch | 39 ++++++++++++++-------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/srcpkgs/wayfire/patches/fix-man-path.patch b/srcpkgs/wayfire/patches/fix-man-path.patch index c88eb1875525e..b7317d0f84fe4 100644 --- a/srcpkgs/wayfire/patches/fix-man-path.patch +++ b/srcpkgs/wayfire/patches/fix-man-path.patch @@ -1,13 +1,26 @@ -/usr/man is forbidden, use /usr/share/man - ---- man/meson.build -+++ man/meson.build -@@ -1,7 +1,7 @@ - configure_file(input: 'wayfire.1.in', - output: 'wayfire.1', - install: true, -- install_dir: 'man', -+ install_dir: '/usr/share/man', - configuration: conf_data) - - install_man(join_paths(meson.project_build_root(), 'man', 'wayfire.1')) +From fbd5c7a78d2fe2c56795d05193c5d22b3a2863cd Mon Sep 17 00:00:00 2001 +From: Your Name +Date: [Current Date] +Subject: [PATCH] Change man page installation directory + +* meson.build (configure_file): Update install directory for man pages. + +Fixes: [Reference to the issue or reason for the change, if applicable] +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index abcdef1..1234567 100644 +--- a/meson.build ++++ b/meson.build +@@ -123,7 +123,7 @@ configure_file( + output: 'wayfire.1', + install: true, +- install_dir: 'man', # Change this line to install in /usr/share/man ++ install_dir: 'share/man', + configuration: conf_data + ) + +-- +2.20.1 From 474cc8389c85dd85b6cbc82b0b428c713ba7fca6 Mon Sep 17 00:00:00 2001 From: zenobit Date: Wed, 10 Jan 2024 23:53:00 +0100 Subject: [PATCH 17/17] test wayfire --- srcpkgs/wayfire/patches/fix-man-path.patch | 4 ++-- srcpkgs/wayfire/template | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/wayfire/patches/fix-man-path.patch b/srcpkgs/wayfire/patches/fix-man-path.patch index b7317d0f84fe4..c2e2a10d1b860 100644 --- a/srcpkgs/wayfire/patches/fix-man-path.patch +++ b/srcpkgs/wayfire/patches/fix-man-path.patch @@ -1,6 +1,6 @@ From fbd5c7a78d2fe2c56795d05193c5d22b3a2863cd Mon Sep 17 00:00:00 2001 -From: Your Name -Date: [Current Date] +From: Your Name +Date: [20240110] Subject: [PATCH] Change man page installation directory * meson.build (configure_file): Update install directory for man pages. diff --git a/srcpkgs/wayfire/template b/srcpkgs/wayfire/template index 2eaadceb6e965..bf44af960447a 100644 --- a/srcpkgs/wayfire/template +++ b/srcpkgs/wayfire/template @@ -9,9 +9,9 @@ build_wrksrc="${pkgname}-${version}" build_style=meson configure_args="-Dprint_trace=false" hostmakedepends="ninja pkg-config wayland-devel" -makedepends="wf-config-devel wlroots-devel cairo-devel pango-devel json-c++ cmake bzip2-devel +makedepends="wf-config-devel wlroots0.16-devel cairo-devel pango-devel json-c++ cmake bzip2-devel doctest-devel git doxygen ldc bzip2-devel inotify-tools-devel glib-devel $(vopt_if image 'libjpeg-turbo-devel libpng-devel')" -depends="xorg-server-xwayland cairo" +depends="xorg-server-xwayland cairo libinotify-tools" short_desc="3D wayland compositor" maintainer="Érico Nogueira " license="MIT"