<pre style='margin:0'>
Zhenfu Shi (i0ntempest) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/62928321324593dfd9980ea29038cfff9263a000">https://github.com/macports/macports-ports/commit/62928321324593dfd9980ea29038cfff9263a000</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 62928321324 ldid: Use CMake build system instead
</span>62928321324 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 62928321324593dfd9980ea29038cfff9263a000
</span>Author: Keto <therealketo@gmail.com>
AuthorDate: Thu Sep 14 23:23:00 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> ldid: Use CMake build system instead
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> sbingner's fork has a CMake build system, so let's
</span><span style='display:block; white-space:pre;color:#404040;'> use it. Let's also make the Portfile more modern,
</span><span style='display:block; white-space:pre;color:#404040;'> using the correct PortGroups to configure the
</span><span style='display:block; white-space:pre;color:#404040;'> environment before building.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Finally, ldid should conflict with ldid-procursus,
</span><span style='display:block; white-space:pre;color:#404040;'> since the latter installs a conflicting ldid binary.
</span>---
devel/ldid/Portfile | 40 +++++++-----
.../ldid/files/dont-use-git-for-ldid-version.diff | 40 ++++++++++++
devel/ldid/files/patch-Makefile.diff | 13 ----
devel/ldid/files/patch-make.sh.diff | 74 ----------------------
devel/ldid/files/patch-nullbuf.diff | 8 +--
5 files changed, 68 insertions(+), 107 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ldid/Portfile b/devel/ldid/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 501da32313e..37d9903fdd9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ldid/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/ldid/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,19 +1,22 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span> PortGroup github 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup openssl 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name ldid
</span> github.setup sbingner ldid 5b8581c
version 2.1.5
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts ${name}-procursus
</span> maintainers {i0ntempest @i0ntempest} openmaintainer
license AGPL-3
description Link Identity Editor
<span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description Link Identity Editor lets you manipulate the signature block in a Mach-O binary. This is Sam Bingner's fork of ldid, originally by Jay Freeman (saurik).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description {*}${description}. ${name} lets you manipulate the signature block \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ in a Mach-O binary. This is Sam Bingner's fork of ldid, originally \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ by Jay Freeman (saurik).
</span>
homepage https://cydia.saurik.com/info/ldid/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,18 +24,25 @@ checksums rmd160 c98fee4cab68cee697f91836b4faf1d214749b1b \
</span> sha256 555167499675cbe5a6b1ea305c9ef3097fa1536c2e7388898937c426b64412c2 \
size 45716
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.cxx_standard \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -DLDID_VERSION=${version}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append path:lib/libplist-2.0.dylib:libplist \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/libssl.dylib:openssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append path:lib/libplist-2.0.dylib:libplist
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_configure no
</span> universal_variant no
use_xcode yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append CC=${configure.cc} CXX=${configure.cxx}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.env-append PREFIX=${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-Makefile.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-nullbuf.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-nullbuf.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dont-use-git-for-ldid-version.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Force CMake to use libplist-2.0 when building
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|libplist|libplist-2.0|" ${worksrcpath}/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ldid ${destroot}${prefix}/bin/ldid2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${destroot}${prefix}/share/doc/ldid
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 ${worksrcpath}/COPYING ${destroot}${prefix}/share/doc/ldid
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ldid/files/dont-use-git-for-ldid-version.diff b/devel/ldid/files/dont-use-git-for-ldid-version.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..1495d9e14ad
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/ldid/files/dont-use-git-for-ldid-version.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,40 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#==========================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Name: ldid - Don't use Git to set LDID_VERSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Date: 2023-09-14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Summary:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Using Git to set LDID_VERSION fails, as Git fails to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# fetch tags from a Github archive. Even when passing
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -DLDID_VERSION, this snippet makes the build fail.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# It's best to just remove it.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#==========================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/CMakeLists.txt 2023-09-14 22:53:24.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/CMakeLists.txt 2023-09-14 22:52:50.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21,24 +21,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(LDID_LIBS ${PLIST_LIBRARIES} ${CRYPTO_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-find_package(Git)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if (!Git_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- message(FATAL_ERROR "Git not found!")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-execute_process(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- COMMAND "${GIT_EXECUTABLE}" describe --tags --match=v*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- COMMAND_ERROR_IS_FATAL ANY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ERROR_QUIET
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- RESULT_VARIABLE res
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- OUTPUT_VARIABLE LDID_VERSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- OUTPUT_STRIP_TRAILING_WHITESPACE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-string(REGEX REPLACE "-([^-]*)-([^-]*)$" "+\\1.\\2" LDID_VERSION ${LDID_VERSION})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-string(REGEX REPLACE "^v" "" LDID_VERSION ${LDID_VERSION})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-string(REGEX REPLACE "%" "~" LDID_VERSION ${LDID_VERSION})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_executable(ldid ldid.cpp lookup2.c)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_property(SOURCE ldid.cpp APPEND
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ldid/files/patch-Makefile.diff b/devel/ldid/files/patch-Makefile.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 1e7cee02b63..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ldid/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.orig 2019-12-06 20:27:58.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile 2020-09-06 01:28:58.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Makefile 2021-04-17 12:35:09.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2,8 +2,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PREFIX ?= /usr/local
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OPENSSL_LDFLAGS := $(shell pkg-config --libs libcrypto)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OPENSSL_CFLAGS := $(shell pkg-config --cflags libcrypto)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--PLIST_LDFLAGS := $(shell pkg-config --libs libplist)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--PLIST_CFLAGS := $(shell pkg-config --cflags libplist)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PLIST_LDFLAGS := $(shell pkg-config --libs libplist-2.0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PLIST_CFLAGS := $(shell pkg-config --cflags libplist-2.0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS := $(OPENSSL_CFLAGS) $(PLIST_CFLAGS) -O2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS := $(OPENSSL_LDFLAGS) $(PLIST_LDFLAGS)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ldid/files/patch-make.sh.diff b/devel/ldid/files/patch-make.sh.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 66b0f7a8f54..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ldid/files/patch-make.sh.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,74 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- make.sh.orig 2020-05-04 13:08:18.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ make.sh 2020-05-04 13:08:06.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3,43 +3,17 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set -e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- shopt -s extglob
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if [[ $# == 0 ]]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ios=false
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ios=$1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- shift
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--export DEVELOPER_DIR=/Applications/Xcode-5.1.1.app
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- os=()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if "${ios}"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--out=ios
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--flags=(cycc -- -miphoneos-version-min=2.0 -arch armv6 -arch arm64)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--flags+=(-Xarch_armv6 -Isysroot32/usr/include)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--flags+=(-Xarch_arm64 -Isysroot64/usr/include)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--flags+=(-Xarch_armv6 -Lsysroot32/usr/lib)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--flags+=(-Xarch_arm64 -Lsysroot64/usr/lib)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--static=false
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--flags+=(-framework CoreFoundation)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--flags+=(-lplist)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--flags+=(-lcrypto)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- out=out
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if which xcrun &>/dev/null; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- flags=(xcrun -sdk macosx g++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- flags+=(-mmacosx-version-min=10.4)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ flags+=(-mmacosx-version-min="$os_ver")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ flags+=(-I"$PREFIX"/include)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ flags+=(-L"$PREFIX"/lib)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for arch in i386 x86_64; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for arch in x86_64; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- flags+=(-arch "${arch}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -54,8 +28,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- flags+=(-lcrypto)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #flags+=(-Wl,/usr/lib/libcrypto.42.dylib)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sdk=$(xcodebuild -sdk iphoneos -version Path)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- flags+=(-I.)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -77,14 +49,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--flags+=("$@")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mkdir -p "${out}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set -x
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${flags[@]}" -O3 -g0 -c -std=c++11 -o "${out}"/ldid.o ldid.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${flags[@]}" -O3 -g0 -o "${out}"/ldid "${out}"/ldid.o "${os[@]}" -x c lookup2.c -lxml2 -framework Security
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if ! "${ios}"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ln -sf out/ldid .
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--fi
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ldid/files/patch-nullbuf.diff b/devel/ldid/files/patch-nullbuf.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index fb1ff351800..120c95b82d6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ldid/files/patch-nullbuf.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/ldid/files/patch-nullbuf.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,9 +1,7 @@
</span> diff --git a/ldid.cpp b/ldid.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 3411e59..0d4cb73 100644 (file)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ldid.cpp.old
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ldid.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3411e59..0d4cb73 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/ldid.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ldid.cpp
</span> @@ -2503,8 +2503,7 @@ void DiskFolder::Find(const std::string &root, const std::string &base, const Fu
void DiskFolder::Save(const std::string &path, bool edit, const void *flag, const Functor<void (std::streambuf &)> &code) {
</pre><pre style='margin:0'>
</pre>