forked from void-linux/void-packages
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
2 changed files
with
113 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,99 @@ | ||
From 21ac4c4da266853b336bf79b8176f5fb50777686 Mon Sep 17 00:00:00 2001 | ||
From: mobinmob <[email protected]> | ||
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 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
# 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 <[email protected]>" | ||
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 |