2fd8d4df94
```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
```
31 lines
1.3 KiB
Diff
31 lines
1.3 KiB
Diff
From 14f4c27e7c91f745a1dda9991b5deea3cbef2072 Mon Sep 17 00:00:00 2001
|
|
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
Date: Thu, 7 Jan 2021 14:09:50 +0100
|
|
Subject: [PATCH] Revert "Use INC_DIR for OPENJPEG_INCLUDE_DIRS (fixes
|
|
uclouvain#1174)"
|
|
|
|
This reverts commit 65586374d639cfc0104419992f9022174b412594 which
|
|
breaks cross-compilation of poppler under buildroot (because of
|
|
DESTDIR usage).
|
|
---
|
|
cmake/OpenJPEGConfig.cmake.in | 6 +++++-
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
|
diff --git cmake/OpenJPEGConfig.cmake.in cmake/OpenJPEGConfig.cmake.in
|
|
index 8a726697a..2925108ad 100644
|
|
--- a/cmake/OpenJPEGConfig.cmake.in
|
|
+++ b/cmake/OpenJPEGConfig.cmake.in
|
|
@@ -27,8 +27,12 @@ if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake)
|
|
# This is an install tree
|
|
include(${SELF_DIR}/OpenJPEGTargets.cmake)
|
|
|
|
+ # We find a relative path from the PKG directory to header files.
|
|
+ set(PKG_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_PACKAGE_DIR@")
|
|
set(INC_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_INCLUDE_DIR@")
|
|
- get_filename_component(OPENJPEG_INCLUDE_DIRS "${INC_DIR}" ABSOLUTE)
|
|
+ file(RELATIVE_PATH PKG_TO_INC_RPATH "${PKG_DIR}" "${INC_DIR}")
|
|
+
|
|
+ get_filename_component(OPENJPEG_INCLUDE_DIRS "${SELF_DIR}/${PKG_TO_INC_RPATH}" ABSOLUTE)
|
|
|
|
else()
|
|
if(EXISTS ${SELF_DIR}/OpenJPEGExports.cmake)
|