[apr] fix CMake config via patch from the stable branch.

[rinrab]

Some of the changes made in patch which fixes CMake config in the apr port were moved to the upstream. I added these changes the port via patch, made from upstream.

• Use patch with changes from the stable branch to fix CMake config instead of the fix-configcmake.patch file; Remove yhis file.
• Take windows part of the portfile.cmake file from stable branch of apr.
• Change CMake namespace from unofficial-apr to just apr, patch is now taken from the stable branch of apr.

[WangWeiLin-MV]

Local attempt to apply upstream-diff, but failed.

vcpkg_download_distfile(PATCH_APR_1917612_FROM_1909837
    URLS "https://svn.apache.org/viewvc/apr/apr/branches/1.7.x/CMakeLists.txt?r1=1917612&r2=1909837&view=patch"
    FILENAME "PATCH_APR_1917612_FROM_1909837.diff"
    SHA512 4bd8943d224bf90ec215c3f09d3c1ca44ba732db245ca2eb65092a71d1ce3b7aa9b444654c155857a8bfd26adb1934af2be1563bd4317518ebdceab0f816709b
)
file(COPY_FILE "${PATCH_APR_1917612_FROM_1909837}" "${CURRENT_BUILDTREES_DIR}/patches/PATCH_APR_1917612_FROM_1909837.diff"}
vcpkg_replace_string("${CURRENT_BUILDTREES_DIR}/patches/PATCH_APR_1917612_FROM_1909837.diff"
    "apr/apr/branches/1.7.x/CMakeLists.txt"
    "CMakeLists.txt"
)

vcpkg_extract_source_archive(SOURCE_PATH
    ARCHIVE "${ARCHIVE}"
    PATCHES
        "${CURRENT_BUILDTREES_DIR}/patches/PATCH_APR_1917612_FROM_1909837.diff"
        unglue.patch
)

@rinrab Could you help apply patches by this method?

[WangWeiLin-MV]

Patch diffs are basically the same, and can be viewed via compare the pull-diff
https://github.com/microsoft/vcpkg/blob/fa826f088dded4b387a503ee6303ced0acbc7363/ports/apr/apr-r1917051%2Br1917283%2Br1917612.patch
and upstream-diff
https://svn.apache.org/viewvc/apr/apr/branches/1.7.x/CMakeLists.txt?r1=1917612&r2=1909837&view=patch

---

Edit: Newer changes, test invalid
The port usage tests pass with the following triplets:

• x64-windows

[rinrab]

@WangWeiLin-MV I checked this problem and I found that the patch works as well.

I did the following:

1. Checkout the tag of the repository from https://svn.apache.org/repos/asf/apr/apr/tags/1.7.4/
2. Apply the patch via svn: svn patch path\to\patch\apr-r1917051+r1917283+r1917612.patch

I also tried to do it via git: cat path\to\patch\apr-r1917051+r1917283+r1917612.patch | git apply and it worked.

Maybe you tried to apply this patch to the stable or trunk branch.

[WangWeiLin-MV]

@rinrab Sorry for not clarify, the patches in this PR can be applied. My local attempt is using the patch downloaded from the link mentioned.

If possible, we prefer patches by downloading upstream patches like this rather than add patches to the port.

[rinrab]

I don't think that this solution is good because:

1. viewvc is not an official apache resource. The only resources that are official are downloads.apache.org, archive.apache.org, dlcdn.apache.org, and svn.apache.org over the Subversion protocols.
2. The diff is being regenerated on every request, so this is not a static content.
3. Diff format which is used could be changed.

For better clarity I separated that patch by each revision.

[rinrab]

Local attempt to apply upstream-diff, but failed.

vcpkg_download_distfile(PATCH_APR_1917612_FROM_1909837
    URLS "https://svn.apache.org/viewvc/apr/apr/branches/1.7.x/CMakeLists.txt?r1=1917612&r2=1909837&view=patch"
    FILENAME "PATCH_APR_1917612_FROM_1909837.diff"
    SHA512 4bd8943d224bf90ec215c3f09d3c1ca44ba732db245ca2eb65092a71d1ce3b7aa9b444654c155857a8bfd26adb1934af2be1563bd4317518ebdceab0f816709b
)
file(COPY_FILE "${PATCH_APR_1917612_FROM_1909837}" "${CURRENT_BUILDTREES_DIR}/patches/PATCH_APR_1917612_FROM_1909837.diff"}
vcpkg_replace_string("${CURRENT_BUILDTREES_DIR}/patches/PATCH_APR_1917612_FROM_1909837.diff"
    "apr/apr/branches/1.7.x/CMakeLists.txt"
    "CMakeLists.txt"
)

vcpkg_extract_source_archive(SOURCE_PATH
    ARCHIVE "${ARCHIVE}"
    PATCHES
        "${CURRENT_BUILDTREES_DIR}/patches/PATCH_APR_1917612_FROM_1909837.diff"
        unglue.patch
)

@rinrab Could you help apply patches by this method?

Your attempt failed because the context in patch was wrong.

When patch is applying, it looks at the lines before and after. However they were changed in the '1.7.x' branch before these changes. It's required to fix them like I did here: f23193d (In github webiu it looks so strange. I don't know why)

[rinrab]

Edit: Newer changes, test invalid

I just checked, in my environment it does work in x64-windows and x64-windows-static.

[WangWeiLin-MV]

@rinrab Therefore, it should change the variable corresponding to feature private-headers to APR_INSTALL_PRIVATE_H. Moreover, FEATURE_OPTIONS clearly pass the options and it is recorded in the features of vcpkg.json.

[rinrab]

@rinrab Therefore, it should change the variable corresponding to feature private-headers to APR_INSTALL_PRIVATE_H. Moreover, FEATURE_OPTIONS clearly pass the options and it is recorded in the features of vcpkg.json.

I committed these suggestions in e0e3454, however I prefer to follow the APR's upstream version of the portfile.

[data-queue]

These are significant patches. Could we vcpkg_download_distfile the patches from the official mirror at https://github.com/apache/apr