diff options
| -rw-r--r-- | patches/alsa_lib-1.1.4.1.local.patch (renamed from patches/alsa-lib-1.1.4.1.local.patch) | 0 | ||||
| -rw-r--r-- | patches/apr_util-1.6.0.local.patch (renamed from patches/apr-util-1.6.0.local.patch) | 0 | ||||
| -rw-r--r-- | patches/gdk-2.36.10.local.patch (renamed from patches/gdk-pixbuf-2.36.10.local.patch) | 0 | ||||
| -rw-r--r-- | patches/geoip_pre.local.patch (renamed from patches/geoip-api-c_pre.local.patch) | 0 | ||||
| -rw-r--r-- | patches/gtk2-2.24.31.local.patch (renamed from patches/gtk+-2.24.31.local.patch) | 0 | ||||
| -rw-r--r-- | patches/libgpg_error-1.25.local.patch (renamed from patches/libgpg-error-1.25.local.patch) | 0 | ||||
| -rw-r--r-- | patches/lynx-2.8.8rel.2.local.patch (renamed from patches/lynx.local.patch) | 0 | ||||
| -rw-r--r-- | patches/man_db-2.7.6.1.local.patch (renamed from patches/man-db-2.7.6.1.local.patch) | 0 | ||||
| l--------- | patches/ncursestw-6.0.local.patch | 1 | ||||
| l--------- | patches/ncursesw-6.0.local.patch | 1 | ||||
| -rw-r--r-- | patches/pkg_cron.local.patch (renamed from patches/pkg-cron.git.local.patch) | 0 | ||||
| -rw-r--r-- | patches/python3-3.5.1.local.patch (renamed from patches/Python-3.5.1.local.patch) | 0 | ||||
| -rw-r--r-- | patches/xcb_proto-1.12.local.patch (renamed from patches/xcb-proto-1.12.local.patch) | 0 | ||||
| -rw-r--r-- | subr/ex_pkg_env.subr | 2 | ||||
| -rw-r--r-- | subr/pkg_configure_patch.subr | 18 | ||||
| -rw-r--r-- | subr/pkg_configure_patch_pre.subr | 8 |
16 files changed, 11 insertions, 19 deletions
diff --git a/patches/alsa-lib-1.1.4.1.local.patch b/patches/alsa_lib-1.1.4.1.local.patch index 3171801d..3171801d 100644 --- a/patches/alsa-lib-1.1.4.1.local.patch +++ b/patches/alsa_lib-1.1.4.1.local.patch diff --git a/patches/apr-util-1.6.0.local.patch b/patches/apr_util-1.6.0.local.patch index 0326dfdc..0326dfdc 100644 --- a/patches/apr-util-1.6.0.local.patch +++ b/patches/apr_util-1.6.0.local.patch diff --git a/patches/gdk-pixbuf-2.36.10.local.patch b/patches/gdk-2.36.10.local.patch index 3c19f614..3c19f614 100644 --- a/patches/gdk-pixbuf-2.36.10.local.patch +++ b/patches/gdk-2.36.10.local.patch diff --git a/patches/geoip-api-c_pre.local.patch b/patches/geoip_pre.local.patch index c2319bf6..c2319bf6 100644 --- a/patches/geoip-api-c_pre.local.patch +++ b/patches/geoip_pre.local.patch diff --git a/patches/gtk+-2.24.31.local.patch b/patches/gtk2-2.24.31.local.patch index 050f26cd..050f26cd 100644 --- a/patches/gtk+-2.24.31.local.patch +++ b/patches/gtk2-2.24.31.local.patch diff --git a/patches/libgpg-error-1.25.local.patch b/patches/libgpg_error-1.25.local.patch index 5da8699e..5da8699e 100644 --- a/patches/libgpg-error-1.25.local.patch +++ b/patches/libgpg_error-1.25.local.patch diff --git a/patches/lynx.local.patch b/patches/lynx-2.8.8rel.2.local.patch index 89b964d7..89b964d7 100644 --- a/patches/lynx.local.patch +++ b/patches/lynx-2.8.8rel.2.local.patch diff --git a/patches/man-db-2.7.6.1.local.patch b/patches/man_db-2.7.6.1.local.patch index 8f762e78..8f762e78 100644 --- a/patches/man-db-2.7.6.1.local.patch +++ b/patches/man_db-2.7.6.1.local.patch diff --git a/patches/ncursestw-6.0.local.patch b/patches/ncursestw-6.0.local.patch new file mode 120000 index 00000000..59cdfd8c --- /dev/null +++ b/patches/ncursestw-6.0.local.patch @@ -0,0 +1 @@ +ncurses-6.0.local.patch
\ No newline at end of file diff --git a/patches/ncursesw-6.0.local.patch b/patches/ncursesw-6.0.local.patch new file mode 120000 index 00000000..59cdfd8c --- /dev/null +++ b/patches/ncursesw-6.0.local.patch @@ -0,0 +1 @@ +ncurses-6.0.local.patch
\ No newline at end of file diff --git a/patches/pkg-cron.git.local.patch b/patches/pkg_cron.local.patch index 4d6bc53e..4d6bc53e 100644 --- a/patches/pkg-cron.git.local.patch +++ b/patches/pkg_cron.local.patch diff --git a/patches/Python-3.5.1.local.patch b/patches/python3-3.5.1.local.patch index b96f19e7..b96f19e7 100644 --- a/patches/Python-3.5.1.local.patch +++ b/patches/python3-3.5.1.local.patch diff --git a/patches/xcb-proto-1.12.local.patch b/patches/xcb_proto-1.12.local.patch index 9930c12b..9930c12b 100644 --- a/patches/xcb-proto-1.12.local.patch +++ b/patches/xcb_proto-1.12.local.patch diff --git a/subr/ex_pkg_env.subr b/subr/ex_pkg_env.subr index 240c6289..25b00537 100644 --- a/subr/ex_pkg_env.subr +++ b/subr/ex_pkg_env.subr @@ -7,7 +7,7 @@ ex_pkg_env() { if [ -z "${PKG_URL}" ]\ && [ -z "${PKG_URLS_GIT}" ]\ && [ -z "${PKG_VERSION}" ]\ - && ! test_cmd "pkg_${PKG_NAME}_all"; then + && ! ex_test_cmd "pkg_${PKG_NAME}_all"; then ex_log_msg failexit "Error: package \`${PKG_NAME}' missing in build.vars."; elif [ "${PKG_DISABLED:-0}" -eq 1 ]; then ex_log_msg vnfo "Skipping disabled package \`${PKG_NAME}.'"; diff --git a/subr/pkg_configure_patch.subr b/subr/pkg_configure_patch.subr index 5dfda784..d15dc0d2 100644 --- a/subr/pkg_configure_patch.subr +++ b/subr/pkg_configure_patch.subr @@ -5,19 +5,11 @@ pkg_configure_patch() { local _patch_fname _patches_done; set +o noglob; - for _patch_fname in \ - ${WORKDIR}/chainport-host-invariants/chainport/${PKG_NAME}.midipix.patch \ - ${WORKDIR}/chainport-host-invariants/chainport/${PKG_SUBDIR}.midipix.patch \ - ${WORKDIR}/chainport-host-invariants/chainport/${PKG_SUBDIR%-*}.midipix.patch \ - ${MIDIPIX_BUILD_PWD}/patches/${PKG_NAME}/*.patch \ - ${MIDIPIX_BUILD_PWD}/patches/${PKG_SUBDIR}/*.patch \ - ${MIDIPIX_BUILD_PWD}/patches/${PKG_SUBDIR%-*}/*.patch \ - ${MIDIPIX_BUILD_PWD}/patches/${PKG_NAME}.local.patch \ - ${MIDIPIX_BUILD_PWD}/patches/${PKG_SUBDIR}.local.patch \ - ${MIDIPIX_BUILD_PWD}/patches/${PKG_SUBDIR%-*}.local.patch \ - ${MIDIPIX_BUILD_PWD}/patches/${PKG_NAME}.local@${BUILD_HNAME}.patch \ - ${MIDIPIX_BUILD_PWD}/patches/${PKG_SUBDIR}.local@${BUILD_HNAME}.patch \ - ${MIDIPIX_BUILD_PWD}/patches/${PKG_SUBDIR%-*}.local@${BUILD_HNAME}.patch; do + for _patch_fname in \ + ${WORKDIR}/chainport-host-invariants/chainport/${PKG_NAME%_host}${PKG_VERSION:+-${PKG_VERSION}}.midipix.patch \ + ${MIDIPIX_BUILD_PWD}/patches/${PKG_NAME}/*.patch \ + ${MIDIPIX_BUILD_PWD}/patches/${PKG_NAME}${PKG_VERSION:+-${PKG_VERSION}}.local.patch \ + ${MIDIPIX_BUILD_PWD}/patches/${PKG_NAME}${PKG_VERSION:+-${PKG_VERSION}}.local@${BUILD_HNAME}.patch; do if ! ex_lmatch "${_patches_done}" " " "${_patch_fname}"\ && [ -r "${_patch_fname}" ]; then patch -b -d "${PKG_BASE_DIR}/${PKG_SUBDIR}" -p1 < "${_patch_fname}"; diff --git a/subr/pkg_configure_patch_pre.subr b/subr/pkg_configure_patch_pre.subr index d228bd83..6843a784 100644 --- a/subr/pkg_configure_patch_pre.subr +++ b/subr/pkg_configure_patch_pre.subr @@ -4,11 +4,9 @@ pkg_configure_patch_pre() { local _patch_path; - for _patch_path in \ - ${MIDIPIX_BUILD_PWD}/../${PKG_SUBDIR}_pre.local.patch \ - ${MIDIPIX_BUILD_PWD}/../${PKG_SUBDIR}_pre.local@${BUILD_HNAME}.patch \ - ${MIDIPIX_BUILD_PWD}/patches/${PKG_SUBDIR}_pre.local.patch \ - ${MIDIPIX_BUILD_PWD}/patches/${PKG_SUBDIR}_pre.local@${BUILD_HNAME}.patch; do + for _patch_path in \ + ${MIDIPIX_BUILD_PWD}/patches/${PKG_NAME}${PKG_VERSION:+-${PKG_VERSION}}_pre.local.patch \ + ${MIDIPIX_BUILD_PWD}/patches/${PKG_NAME}${PKG_VERSION:+-${PKG_VERSION}}_pre.local@${BUILD_HNAME}.patch; do if [ -r "${_patch_path}" ]; then patch -b -d "${PKG_BASE_DIR}/${PKG_SUBDIR}" -p1 < "${_patch_path}"; fi; |