49cb564d14
* 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
```
27 lines
1 KiB
Diff
27 lines
1 KiB
Diff
--- a/CMakeLists.txt 2018-07-31 15:01:17.000000000 +0200
|
|
+++ b/CMakeLists.txt 2018-07-31 15:01:17.000000000 +0200
|
|
@@ -49,6 +49,12 @@
|
|
|
|
find_package(PolkitQt5-1 REQUIRED 0.103.0)
|
|
|
|
+if (NOT IS_ABSOLUTE "${POLKITQT-1_INCLUDE_DIR}")
|
|
+ set(POLKITQT-1_INCLUDE_DIR "${POLKITQT-1_INSTALL_DIR}/${POLKITQT-1_INCLUDE_DIR}")
|
|
+ set(POLKITQT-1_AGENT_LIBRARY "${POLKITQT-1_INSTALL_DIR}/${POLKITQT-1_AGENT_LIBRARY}")
|
|
+ set(POLKITQT-1_CORE_LIBRARY "${POLKITQT-1_INSTALL_DIR}/${POLKITQT-1_CORE_LIBRARY}")
|
|
+endif()
|
|
+
|
|
include_directories(
|
|
${POLKITQT-1_INCLUDE_DIR}
|
|
${CMAKE_CURRENT_SOURCE_DIR}
|
|
--- a/CMakeLists.txt 2018-08-27 14:58:54.560731243 +0200
|
|
+++ b/CMakeLists.txt 2018-08-27 14:58:54.560731243 +0200
|
|
@@ -82,7 +81,8 @@
|
|
KF5::I18n
|
|
KF5::Crash
|
|
KF5::IconThemes
|
|
- ${POLKITQT-1_LIBRARIES}
|
|
+ ${POLKITQT-1_AGENT_LIBRARY}
|
|
+ ${POLKITQT-1_CORE_LIBRARY}
|
|
)
|
|
|
|
configure_file(polkit-kde-authentication-agent-1.desktop.cmake ${CMAKE_BINARY_DIR}/polkit-kde-authentication-agent-1.desktop)
|