void-packages/srcpkgs/pekwm/patches/sysconfdir.patch
Đoàn Trần Công Danh 49cb564d14 srcpkgs/p*: convert patches to -Np1
* par is kept at -Np0

```sh
git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" |
while read template; do
	for p in ${template%/template}/patches/*; do
		sed -i '
			\,^[+-][+-][+-] /dev/null,b
			/^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b
			s,^[*][*][*] ,&a/,
			/^--- /{
				s,\(^--- \)\(./\)*,\1a/,
				s,[.-][Oo][Rr][Ii][Gg]\([	/]\),\1,
				s/[.-][Oo][Rr][Ii][Gg]$//
				s/[.]patched[.]\([^.]\)/.\1/
				h
			}
			/^+++ -/{
				g
				s/^--- a/+++ b/
				b
			}
			s,\(^+++ \)\(./\)*,\1b/,
		' "$p"
	done
	sed -i '/^patch_args=/d' $template
done
```
2021-06-20 13:17:29 +07:00

29 lines
990 B
Diff

--- a/CMakeLists.txt 2021-03-01 07:37:20.447294425 -0500
+++ b/CMakeLists.txt 2021-03-01 07:39:40.222030571 -0500
@@ -10,6 +10,9 @@
set(pekwm_VERSION_PATCH 18)
set(pekwm_VERSION "${pekwm_VERSION_MAJOR}.${pekwm_VERSION_MINOR}.${pekwm_VERSION_PATCH}")
+set(PEKWM_CONF_DIR "${CMAKE_INSTALL_PREFIX}/etc/pekwm"
+ CACHE STRING "Path to pekwm system configuration files")
+
# Check for C++11
check_cxx_compiler_flag(-std=c++11 HAS_CXX11)
if (HAS_CXX11)
@@ -94,7 +97,7 @@
add_definitions(-DVERSION="${pekwm_VERSION}"
-DFEATURES="${pekwm_FEATURES}"
-DDATADIR="${CMAKE_INSTALL_PREFIX}/share"
- -DSYSCONFDIR="${CMAKE_INSTALL_PREFIX}/etc/pekwm")
+ -DSYSCONFDIR="${PEKWM_CONF_DIR}")
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH True)
# Subdirectories
--- a/data/CMakeLists.txt 2021-03-01 07:39:48.323015276 -0500
+++ b/data/CMakeLists.txt 2021-03-01 07:40:19.475956467 -0500
@@ -16,4 +16,4 @@
mouse_sloppy
start
vars
- DESTINATION etc/pekwm/)
+ DESTINATION "${PEKWM_CONF_DIR}")