defremov/PKGBUILD

## dng_sdk_1_5_1.diff
diff -Naur dng_sdk_1_5_1/dng_sdk/source/dng_flags.h dng_sdk_1_5_1.patched/dng_sdk/source/dng_flags.h
--- dng_sdk_1_5_1/dng_sdk/source/dng_flags.h	2020-05-06 03:02:02.000000000 +0300
+++ dng_sdk_1_5_1.patched/dng_sdk/source/dng_flags.h	2020-06-14 02:29:03.849183726 +0300
@@ -282,7 +282,7 @@
 /// 1 if dng_validate command line tool is being built, 0 otherwise.

 #ifndef qDNGValidateTarget
-#define qDNGValidateTarget 0
+#define qDNGValidateTarget 1
 #endif

 /*****************************************************************************/
diff -Naur dng_sdk_1_5_1/dng_sdk/source/dng_shared.cpp dng_sdk_1_5_1.patched/dng_sdk/source/dng_shared.cpp
--- dng_sdk_1_5_1/dng_sdk/source/dng_shared.cpp	2019-12-15 08:47:30.000000000 +0300
+++ dng_sdk_1_5_1.patched/dng_sdk/source/dng_shared.cpp	2020-06-14 02:38:01.908684146 +0300
@@ -1079,7 +1079,11 @@

 		uint16 magicNumber = stream.Get_uint16 ();

+#if defined(PCDMAGIC_FIXES)
+		if ((magicNumber != magicExtendedProfile) && (magicNumber != magicTIFF))
+#else
 		if (magicNumber != magicExtendedProfile)
+#endif
 			{
 			return false;
 			}
diff -Naur dng_sdk_1_5_1/dng_sdk/source/dng_string.cpp dng_sdk_1_5_1.patched/dng_sdk/source/dng_string.cpp
--- dng_sdk_1_5_1/dng_sdk/source/dng_string.cpp	2019-12-15 08:47:30.000000000 +0300
+++ dng_sdk_1_5_1.patched/dng_sdk/source/dng_string.cpp	2020-06-14 02:32:49.217033086 +0300
@@ -23,7 +23,7 @@
 #include <windows.h>
 #endif

-#if qiPhone || qAndroid
+#if qiPhone || qAndroid || qLinux
 #include <ctype.h> // for isdigit
 #endif

diff -Naur dng_sdk_1_5_1/dng_sdk/source/RawEnvironment.h dng_sdk_1_5_1.patched/dng_sdk/source/RawEnvironment.h
--- dng_sdk_1_5_1/dng_sdk/source/RawEnvironment.h	1970-01-01 03:00:00.000000000 +0300
+++ dng_sdk_1_5_1.patched/dng_sdk/source/RawEnvironment.h	2020-06-14 02:34:20.154176077 +0300
@@ -0,0 +1,3 @@
+#define qLinux 1
+#define qDNGThreadSafe 1
+#define UNIX_ENV 1

## PKGBUILD
# Maintainer: Dmitry Efremov defremovАТahaDОТru

# In order to build this package you need to manually download
# the Adobe XMP SDK source archive (XMP-Toolkit-SDK-CC201607.zip) from:
#
# https://www.adobe.com/devnet/xmp.html
#
# and the Adobe DNG SDK source archive (dng_sdk_1_5_1.zip) from:
#
# https://www.adobe.com/support/downloads/dng/dng_sdk.html
#
# Place both the archives into the build directory, next to this file
# (PKGBUILD).

_pkgname=dcpTool
pkgname="${_pkgname,,}"
pkgver=1.9.0
_pkguver="${pkgver//./_}"
pkgrel=1
pkgdesc="Command line utility for processing DNG Camera Profiles (.dcp files)"
arch=('x86_64')
url="http://dcptool.sourceforge.net"
license=('GPL2')
makedepends=('cmake' 'unzip')
depends=('libjpeg-turbo' 'libxml2')

_zlib='zlib-1.2.11'
_expatname='expat'
_expatver='2.2.9'
_expatuver="${_expatver//./_}"
_expat="${_expatname}-${_expatver}"
_xmpsdk='XMP-Toolkit-SDK-CC201607'
_dngsdk='dng_sdk_1_5_1'
_dcptool="${_pkgname}_${_pkguver}"
_dngimage='sample.dng'

source=(
	"https://zlib.net/${_zlib}.tar.xz"
	"https://github.com/libexpat/libexpat/releases/download/R_${_expatuver}/${_expat}.tar.xz"
	"file://${_xmpsdk}.zip"
	"file://${_dngsdk}.zip"
	"https://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${_pkgname}%20V${pkgver}/${_dcptool}.zip"
	"${_xmpsdk}.diff"
	"${_xmpsdk}-file-macro.diff"
	"${_dngsdk}.diff"
	)

noextract=(
	"${_xmpsdk}.zip"
	"${_dngsdk}.zip"
	)

sha256sums=(
	'4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066'
	'1ea6965b15c2106b6bbe883397271c80dfa0331cdf821b2c319591b55eadc0a4'
	'c2834de6b02ff6d2f661337630f202042082712162589d9d6d21e2d30d652405'
	'7d50f807770098f9b91175d3637a9f65658193d3b946bc9a7754aca0bd89fd24'
	'd9871b6b322251a3dd22ab777105aba4aadce89e7264dbafca15702b15454d14'
	'SKIP'
	'SKIP'
	'SKIP'
	)

_rundngtest=''
if [[ -f "${_dngimage}" ]] ; then
	source+=("file://${_dngimage}")
	sha256sums+=('SKIP')
	_rundngtest=1
fi

_xmpsdkpath=''
_xmppubpath=''
_xmprelpath=''
_xmpcorelib=''
_xmpfileslib=''
_dngsdkpath=''
_dngsrcpath=''
_dngincpath=''
_dnglib=''
_dcppath=''
_dngapp='dng_validate'

_set_global_vars() {
	_xmpsdkpath="${srcdir}/${_xmpsdk}"
	_xmppubpath="${_xmpsdkpath}/public"
	_xmprelpath="${_xmppubpath}/libraries/i80386linux_x64/release"
	_xmpcorelib="${_xmprelpath}/staticXMPCore.ar"
	_xmpfileslib="${_xmprelpath}/staticXMPFiles.ar"
	_dngsdkpath="${srcdir}/${_dngsdk}"
	_dngsrcpath="${_dngsdkpath}/dng_sdk/source"
	_dngincpath="${_xmppubpath}/include"
	_dnglib="${_dngsrcpath}/libdng_sdk.a"
	_dcppath="${srcdir}/${_dcptool}"
}

prepare() {
	_set_global_vars

	cd "${srcdir}"
	unzip ${_xmpsdk}.zip
	unzip ${_dngsdk}.zip

	# Prepare XMP Toolkit SDK source
	cd "${_xmpsdkpath}"
	ln -rs ../${_expat}/lib third-party/expat/
	ln -rs ../${_zlib}/*.{c,h} third-party/zlib/
	patch -p1 -i "../${_xmpsdk}.diff"
	patch -p1 -i "../${_xmpsdk}-file-macro.diff"

	# Prepare DNG SDK source
	cd "${_dngsrcpath}"
	chmod 644 *.{cpp,h}
	if [[ "$(file -b dng_flags.h)" =~ 'with CRLF' ]] ; then
		sed 's/\r*$/\r/g' "../../../${_dngsdk}.diff" \
			| patch --binary -p3
	else
		patch -p3 -i "../../../${_dngsdk}.diff"
	fi

	# Prepare dcpTool application source
	cd "${_dcppath}"
	# dng_shared_cpp.diff from the original
	# ${_dcptool}/dnk_sdk/source directory
	# has already been included in ${_dngsdk}.diff
	mv dng_sdk dng_sdk.orig
	ln -rs "${_dngsdkpath}/dng_sdk"
	ln -rs "${_xmpsdkpath}" XMP-SDK
}

build() {
	_set_global_vars

	# Build XMP Toolkit SDK
	cd "${_xmpsdkpath}"
	cd build
	make StaticRelease64

	# Build DNG SDK
	cd "${_dngsrcpath}"
	make -f - << EOF
%.o: %.cpp ; g++ \$(CXXFLAGS) -c -I "${_dngincpath}" \$<
${_dnglib}: \$(patsubst %.cpp,%.o,\$(patsubst ${_dngapp}.%,,\$(wildcard *.cpp))) ; \
ar rcs \$@ \$^
EOF

	# Build dcpTool application
	cd "${_dcppath}"
	make -f - << EOF
%.o: %.cpp ; g++ \$(CXXFLAGS) -c -I "${_dngsrcpath}" \
-I /usr/include/libxml2 \$<
${pkgname}: \$(patsubst %.cpp,%.o,\$(wildcard *.cpp)) ; \
g++ -ldl -lpthread -lz -ljpeg -lxml2 \$(LDFLAGS) \
\$^ "${_dnglib}" "${_xmpcorelib}" "${_xmpfileslib}" -o \$@
EOF
}

check() {
	_set_global_vars

	if [[ -n "${_rundngtest}" ]] ; then
		cd "${_dngsrcpath}"

		# Build test dng application
		make -f - << EOF
%.o: %.cpp ; g++ \$(CXXFLAGS) -c -I "${_dngincpath}" \$<
${_dngapp}: ${_dngapp}.o ${_dnglib} ; g++ -ldl -lpthread -lz -ljpeg \
\$(LDFLAGS) \$^ "${_xmpcorelib}" "${_xmpfileslib}" -o \$@
${_dnglib}: \$(patsubst %.cpp,%.o,\$(patsubst ${_dngapp}.%,,\$(wildcard *.cpp))) ; \
ar rcs \$@ \$^
EOF

		# Run test dng application
		./${_dngapp} "${srcdir}/${_dngimage}"
	else
		>&2 printf 'No sample dng image found. Skipping test.\n'
	fi
}

package() {
	_set_global_vars

	cd "${_dcppath}"

	# Install the binary
	local _bindir="${pkgdir}/usr/bin"
	install --directory "${_bindir}"
	install --mode 755 --target-directory "${_bindir}" "${pkgname}"

	# Install the documentation
	local _docdir="${pkgdir}/usr/share/doc/${_pkgname}"
	install --directory "${_docdir}"
	install --mode 644 --target-directory "${_docdir}" \
		ReadMe.txt Release.txt gpl.txt
}

## XMP-Toolkit-SDK-CC201607-file-macro.diff
diff -Naru0 XMP-Toolkit-SDK-CC201607/samples/source/common/DumpFile.cpp XMP-Toolkit-SDK-CC201607.patched/samples/source/common/DumpFile.cpp
--- XMP-Toolkit-SDK-CC201607/samples/source/common/DumpFile.cpp	2016-08-02 05:34:42.000000000 +0300
+++ XMP-Toolkit-SDK-CC201607.patched/samples/source/common/DumpFile.cpp	2019-11-03 18:22:03.323612367 +0300
@@ -0,0 +1 @@
+#define PKGBUILD02 "samples/source/common/DumpFile.cpp"
@@ -208 +209 @@
-	throw DumpFileException( "- assert:   %s\n- message:  %s\n- location: " __FILE__ ":%u", \
+	throw DumpFileException( "- assert:   %s\n- message:  %s\n- location: " PKGBUILD02 ":%u", \
@@ -214 +215 @@
-	throw DumpFileException( "- assert:   %s\n- message:  %s\n- location: " __FILE__ ":%u", #c, std::string( msg ).c_str(), __LINE__ );		\
+	throw DumpFileException( "- assert:   %s\n- message:  %s\n- location: " PKGBUILD02 ":%u", #c, std::string( msg ).c_str(), __LINE__ );		\
@@ -219 +220 @@
-	throw DumpFileException( "- assert:   %s\n- location: " __FILE__ ":%u", #c, __LINE__ );		\
+	throw DumpFileException( "- assert:   %s\n- location: " PKGBUILD02 ":%u", #c, __LINE__ );		\
@@ -224 +225 @@
-	throw DumpFileException( "- assert:   feof(file)\n- message:  end of file not reached, still at 0x%X\n- location: " __FILE__ ":%u", LFA_Tell (file), __LINE__ );		\
+	throw DumpFileException( "- assert:   feof(file)\n- message:  end of file not reached, still at 0x%X\n- location: " PKGBUILD02 ":%u", LFA_Tell (file), __LINE__ );		\
@@ -228 +229 @@
-	throw DumpFileException( "- failure\n- message:  %s\n- location: " __FILE__ ":%u", std::string( msg ).c_str(), __LINE__ );
+	throw DumpFileException( "- failure\n- message:  %s\n- location: " PKGBUILD02 ":%u", std::string( msg ).c_str(), __LINE__ );
diff -Naru0 XMP-Toolkit-SDK-CC201607/samples/source/common/Log.h XMP-Toolkit-SDK-CC201607.patched/samples/source/common/Log.h
--- XMP-Toolkit-SDK-CC201607/samples/source/common/Log.h	2016-08-02 05:34:42.000000000 +0300
+++ XMP-Toolkit-SDK-CC201607.patched/samples/source/common/Log.h	2019-11-03 18:22:03.306952293 +0300
@@ -0,0 +1 @@
+#define PKGBUILD01 "samples/source/common/Log.h"
@@ -24 +25 @@
-	//	Log::error ( "- assert that failed: %s\n- message: %s\n- " __FILE__ ":%u", #c, std::string( msg ).c_str(), __LINE__ );		\
+	//	Log::error ( "- assert that failed: %s\n- message: %s\n- " PKGBUILD01 ":%u", #c, std::string( msg ).c_str(), __LINE__ );		\
diff -Naru0 XMP-Toolkit-SDK-CC201607/source/XMP_LibUtils.hpp XMP-Toolkit-SDK-CC201607.patched/source/XMP_LibUtils.hpp
--- XMP-Toolkit-SDK-CC201607/source/XMP_LibUtils.hpp	2016-08-02 05:34:42.000000000 +0300
+++ XMP-Toolkit-SDK-CC201607.patched/source/XMP_LibUtils.hpp	2019-11-03 18:22:03.753442278 +0300
@@ -0,0 +1 @@
+#define PKGBUILD35 "source/XMP_LibUtils.hpp"
@@ -177 +178 @@
-			const char * assert_msg = _NotifyMsg ( XMP_Enforce, (c), __FILE__, __LINE__ );	\
+			const char * assert_msg = _NotifyMsg ( XMP_Enforce, (c), PKGBUILD35, __LINE__ );	\
diff -Naru0 XMP-Toolkit-SDK-CC201607/XMPCommon/Interfaces/IError_I.h XMP-Toolkit-SDK-CC201607.patched/XMPCommon/Interfaces/IError_I.h
--- XMP-Toolkit-SDK-CC201607/XMPCommon/Interfaces/IError_I.h	2016-08-02 05:34:36.000000000 +0300
+++ XMP-Toolkit-SDK-CC201607.patched/XMPCommon/Interfaces/IError_I.h	2019-11-03 18:22:03.763438323 +0300
@@ -0,0 +1 @@
+#define PKGBUILD36 "XMPCommon/Interfaces/IError_I.h"
@@ -80 +81 @@
-	warn->SetLocation( __FILE__, __LINE__ );																	\
+	warn->SetLocation( PKGBUILD36, __LINE__ );																	\
@@ -106 +107 @@
-	err->SetLocation( __FILE__, __LINE__ );																		\
+	err->SetLocation( PKGBUILD36, __LINE__ );																		\
@@ -138 +139 @@
-	error->SetLocation( __FILE__, __LINE__ );																\
+	error->SetLocation( PKGBUILD36, __LINE__ );																\
diff -Naru0 XMP-Toolkit-SDK-CC201607/XMPCommon/source/ConfigurationManagerImpl.cpp XMP-Toolkit-SDK-CC201607.patched/XMPCommon/source/ConfigurationManagerImpl.cpp
--- XMP-Toolkit-SDK-CC201607/XMPCommon/source/ConfigurationManagerImpl.cpp	2016-08-02 05:34:36.000000000 +0300
+++ XMP-Toolkit-SDK-CC201607.patched/XMPCommon/source/ConfigurationManagerImpl.cpp	2019-11-03 18:22:03.826746605 +0300
@@ -0,0 +1 @@
+#define PKGBUILD41 "XMPCommon/source/ConfigurationManagerImpl.cpp"
@@ -50 +51 @@
-		return XMP_COMPONENT_INT_NAMESPACE::MakeUncheckedSharedPointer( p, __FILE__, __LINE__, true );
+		return XMP_COMPONENT_INT_NAMESPACE::MakeUncheckedSharedPointer( p, PKGBUILD41, __LINE__, true );
diff -Naru0 XMP-Toolkit-SDK-CC201607/XMPCommon/source/ErrorImpl.cpp XMP-Toolkit-SDK-CC201607.patched/XMPCommon/source/ErrorImpl.cpp
--- XMP-Toolkit-SDK-CC201607/XMPCommon/source/ErrorImpl.cpp	2016-08-02 05:34:36.000000000 +0300
+++ XMP-Toolkit-SDK-CC201607.patched/XMPCommon/source/ErrorImpl.cpp	2019-11-03 18:22:03.776766382 +0300
@@ -0,0 +1 @@
+#define PKGBUILD37 "XMPCommon/source/ErrorImpl.cpp"
@@ -189 +190 @@
-		return MakeUncheckedSharedPointer( new ErrorImpl( errDomain, errCode, errSeverity ), __FILE__, __LINE__, true );
+		return MakeUncheckedSharedPointer( new ErrorImpl( errDomain, errCode, errSeverity ), PKGBUILD37, __LINE__, true );
@@ -208 +209 @@
-		return MakeUncheckedSharedPointer( p, __FILE__, __LINE__, false );
+		return MakeUncheckedSharedPointer( p, PKGBUILD37, __LINE__, false );
diff -Naru0 XMP-Toolkit-SDK-CC201607/XMPCommon/source/IConfigurable_I.cpp XMP-Toolkit-SDK-CC201607.patched/XMPCommon/source/IConfigurable_I.cpp
--- XMP-Toolkit-SDK-CC201607/XMPCommon/source/IConfigurable_I.cpp	2016-08-02 05:34:36.000000000 +0300
+++ XMP-Toolkit-SDK-CC201607.patched/XMPCommon/source/IConfigurable_I.cpp	2019-11-03 18:22:03.840074664 +0300
@@ -0,0 +1 @@
+#define PKGBUILD42 "XMPCommon/source/IConfigurable_I.cpp"
@@ -63 +64 @@
-			error, this, &IConfigurable_I::SetParameter, __FILE__, __LINE__, key, static_cast< eDataType >( dataType ), dataValue );
+			error, this, &IConfigurable_I::SetParameter, PKGBUILD42, __LINE__, key, static_cast< eDataType >( dataType ), dataValue );
@@ -117 +118 @@
-			error, this, false, &IConfigurable_I::GetParameter, __FILE__, __LINE__, key, static_cast< eDataType >( dataType ), value );
+			error, this, false, &IConfigurable_I::GetParameter, PKGBUILD42, __LINE__, key, static_cast< eDataType >( dataType ), value );
@@ -125 +126 @@
-			error, this, false, &IConfigurable::RemoveParameter, __FILE__, __LINE__, key );
+			error, this, false, &IConfigurable::RemoveParameter, PKGBUILD42, __LINE__, key );
@@ -138 +139 @@
-			error, this, kDTNone, &IConfigurable::GetDataType, __FILE__, __LINE__, key );
+			error, this, kDTNone, &IConfigurable::GetDataType, PKGBUILD42, __LINE__, key );
diff -Naru0 XMP-Toolkit-SDK-CC201607/XMPCommon/source/IConfigurationManager_I.cpp XMP-Toolkit-SDK-CC201607.patched/XMPCommon/source/IConfigurationManager_I.cpp
--- XMP-Toolkit-SDK-CC201607/XMPCommon/source/IConfigurationManager_I.cpp	2016-08-02 05:34:36.000000000 +0300
+++ XMP-Toolkit-SDK-CC201607.patched/XMPCommon/source/IConfigurationManager_I.cpp	2019-11-03 18:22:03.800090486 +0300
@@ -0,0 +1 @@
+#define PKGBUILD39 "XMPCommon/source/IConfigurationManager_I.cpp"
@@ -21 +22 @@
-			error, this, 0, &IConfigurationManager_v1::RegisterMemoryAllocator, __FILE__, __LINE__, memoryAllocator );
+			error, this, 0, &IConfigurationManager_v1::RegisterMemoryAllocator, PKGBUILD39, __LINE__, memoryAllocator );
@@ -27 +28 @@
-			error, this, 0, &IConfigurationManager_v1::RegisterErrorNotifier, __FILE__, __LINE__, ptr );
+			error, this, 0, &IConfigurationManager_v1::RegisterErrorNotifier, PKGBUILD39, __LINE__, ptr );
@@ -32 +33 @@
-			error, this, 0, &IConfigurationManager_v1::DisableMultiThreading, __FILE__, __LINE__ );
+			error, this, 0, &IConfigurationManager_v1::DisableMultiThreading, PKGBUILD39, __LINE__ );
@@ -37 +38 @@
-			error, this, 0, &IConfigurationManager_v1::IsMultiThreaded, __FILE__, __LINE__ );
+			error, this, 0, &IConfigurationManager_v1::IsMultiThreaded, PKGBUILD39, __LINE__ );
@@ -48 +49 @@
-			error, this, NULL, fnPtr, __FILE__, __LINE__, interfaceID, interfaceVersion );
+			error, this, NULL, fnPtr, PKGBUILD39, __LINE__, interfaceID, interfaceVersion );
@@ -64 +65 @@
-					IError_v1::kESOperationFatal, interfaceID, interfaceVersion, __FILE__, __LINE__ );
+					IError_v1::kESOperationFatal, interfaceID, interfaceVersion, PKGBUILD39, __LINE__ );
@@ -70 +71 @@
-			IError_v1::kESOperationFatal, kIConfigurationManagerID, interfaceID, __FILE__, __LINE__ );
+			IError_v1::kESOperationFatal, kIConfigurationManagerID, interfaceID, PKGBUILD39, __LINE__ );
diff -Naru0 XMP-Toolkit-SDK-CC201607/XMPCommon/source/IError_I.cpp XMP-Toolkit-SDK-CC201607.patched/XMPCommon/source/IError_I.cpp
--- XMP-Toolkit-SDK-CC201607/XMPCommon/source/IError_I.cpp	2016-08-02 05:34:36.000000000 +0300
+++ XMP-Toolkit-SDK-CC201607.patched/XMPCommon/source/IError_I.cpp	2019-11-03 18:22:03.863398768 +0300
@@ -0,0 +1 @@
+#define PKGBUILD44 "XMPCommon/source/IError_I.cpp"
@@ -23 +24 @@
-			error, this, 0, &IError_v1::GetCode, __FILE__, __LINE__ );
+			error, this, 0, &IError_v1::GetCode, PKGBUILD44, __LINE__ );
@@ -28 +29 @@
-			error, this, 0, &IError_v1::GetDomain, __FILE__, __LINE__ );
+			error, this, 0, &IError_v1::GetDomain, PKGBUILD44, __LINE__ );
@@ -33 +34 @@
-			error, this, 0, &IError_v1::GetSeverity, __FILE__, __LINE__ );
+			error, this, 0, &IError_v1::GetSeverity, PKGBUILD44, __LINE__ );
@@ -38 +39 @@
-			error, this, &IError_v1::GetMessage, __FILE__, __LINE__ );
+			error, this, &IError_v1::GetMessage, PKGBUILD44, __LINE__ );
@@ -43 +44 @@
-			error, this, &IError_v1::GetLocation, __FILE__, __LINE__ );
+			error, this, &IError_v1::GetLocation, PKGBUILD44, __LINE__ );
@@ -49 +50 @@
-			error, this, &IError_v1::GetParameter, __FILE__, __LINE__, index );
+			error, this, &IError_v1::GetParameter, PKGBUILD44, __LINE__, index );
@@ -55 +56 @@
-			error, this, &IError_v1::GetNextError, __FILE__, __LINE__ );
+			error, this, &IError_v1::GetNextError, PKGBUILD44, __LINE__ );
@@ -60 +61 @@
-			error, this, &IError_v1::SetNextError, __FILE__, __LINE__, IError_v1::MakeShared( nextError ) );
+			error, this, &IError_v1::SetNextError, PKGBUILD44, __LINE__, IError_v1::MakeShared( nextError ) );
@@ -69 +70 @@
-			error, this, NULL, &IError_I::GetInterfacePointer, __FILE__, __LINE__, interfaceID, interfaceVersion );
+			error, this, NULL, &IError_I::GetInterfacePointer, PKGBUILD44, __LINE__, interfaceID, interfaceVersion );
@@ -85 +86 @@
-					IError_v1::kESOperationFatal, interfaceID, interfaceVersion, __FILE__, __LINE__ );
+					IError_v1::kESOperationFatal, interfaceID, interfaceVersion, PKGBUILD44, __LINE__ );
@@ -91 +92 @@
-			IError_v1::kESOperationFatal, kIErrorID, interfaceID, __FILE__, __LINE__ );
+			IError_v1::kESOperationFatal, kIErrorID, interfaceID, PKGBUILD44, __LINE__ );
@@ -138 +139 @@
-			error = IError_I::CreateClientCodeExceptionError( static_cast< IError::eErrorSeverity >( errorSeverity ), __FILE__, __LINE__ ).get();
+			error = IError_I::CreateClientCodeExceptionError( static_cast< IError::eErrorSeverity >( errorSeverity ), PKGBUILD44, __LINE__ ).get();
diff -Naru0 XMP-Toolkit-SDK-CC201607/XMPCommon/source/IUTF8String_I.cpp XMP-Toolkit-SDK-CC201607.patched/XMPCommon/source/IUTF8String_I.cpp
--- XMP-Toolkit-SDK-CC201607/XMPCommon/source/IUTF8String_I.cpp	2016-08-02 05:34:36.000000000 +0300
+++ XMP-Toolkit-SDK-CC201607.patched/XMPCommon/source/IUTF8String_I.cpp	2019-11-03 18:22:03.813418545 +0300
@@ -0,0 +1 @@
+#define PKGBUILD40 "XMPCommon/source/IUTF8String_I.cpp"
@@ -17 +18 @@
-			error, this, &IUTF8String_v1::assign, __FILE__, __LINE__, buffer, count );
+			error, this, &IUTF8String_v1::assign, PKGBUILD40, __LINE__, buffer, count );
@@ -22 +23 @@
-			error, this, &IUTF8String_v1::assign, __FILE__, __LINE__, IUTF8String::MakeShared( str ), srcPos, count );
+			error, this, &IUTF8String_v1::assign, PKGBUILD40, __LINE__, IUTF8String::MakeShared( str ), srcPos, count );
@@ -27 +28 @@
-			error, this, &IUTF8String_v1::append, __FILE__, __LINE__, buffer, count );
+			error, this, &IUTF8String_v1::append, PKGBUILD40, __LINE__, buffer, count );
@@ -32 +33 @@
-			error, this, &IUTF8String_v1::append, __FILE__, __LINE__, IUTF8String::MakeShared( str ), srcPos, count );
+			error, this, &IUTF8String_v1::append, PKGBUILD40, __LINE__, IUTF8String::MakeShared( str ), srcPos, count );
@@ -37 +38 @@
-			error, this, &IUTF8String_v1::insert, __FILE__, __LINE__, pos, buf, count );
+			error, this, &IUTF8String_v1::insert, PKGBUILD40, __LINE__, pos, buf, count );
@@ -42 +43 @@
-			error, this, &IUTF8String_v1::insert, __FILE__, __LINE__, pos, IUTF8String::MakeShared( src ), srcPos, count );
+			error, this, &IUTF8String_v1::insert, PKGBUILD40, __LINE__, pos, IUTF8String::MakeShared( src ), srcPos, count );
@@ -47 +48 @@
-			error, this, &IUTF8String_v1::erase, __FILE__, __LINE__, pos, count );
+			error, this, &IUTF8String_v1::erase, PKGBUILD40, __LINE__, pos, count );
@@ -54 +55 @@
-			error, this, fnPtr, __FILE__, __LINE__, n );
+			error, this, fnPtr, PKGBUILD40, __LINE__, n );
@@ -59 +60 @@
-			error, this, &IUTF8String_v1::replace, __FILE__, __LINE__, pos, count, buf, count );
+			error, this, &IUTF8String_v1::replace, PKGBUILD40, __LINE__, pos, count, buf, count );
@@ -64 +65 @@
-			error, this, &IUTF8String_v1::replace, __FILE__, __LINE__, pos, count, IUTF8String::MakeShared( src ), srcPos, srcCount );
+			error, this, &IUTF8String_v1::replace, PKGBUILD40, __LINE__, pos, count, IUTF8String::MakeShared( src ), srcPos, srcCount );
@@ -71 +72 @@
-			error, this, 0, fnPtr, __FILE__, __LINE__, buf, len, pos );
+			error, this, 0, fnPtr, PKGBUILD40, __LINE__, buf, len, pos );
@@ -78 +79 @@
-			error, this, 0, fnPtr, __FILE__, __LINE__, buf, pos, count );
+			error, this, 0, fnPtr, PKGBUILD40, __LINE__, buf, pos, count );
@@ -85 +86 @@
-			error, this, 0, fnPtr, __FILE__, __LINE__, IUTF8String::MakeShared( src ), pos, count );
+			error, this, 0, fnPtr, PKGBUILD40, __LINE__, IUTF8String::MakeShared( src ), pos, count );
@@ -92 +93 @@
-			error, this, 0, fnPtr, __FILE__, __LINE__, buf, pos, count );
+			error, this, 0, fnPtr, PKGBUILD40, __LINE__, buf, pos, count );
@@ -99 +100 @@
-			error, this, 0, fnPtr, __FILE__, __LINE__, IUTF8String::MakeShared( src ), pos, count );
+			error, this, 0, fnPtr, PKGBUILD40, __LINE__, IUTF8String::MakeShared( src ), pos, count );
@@ -106 +107 @@
-			error, this, 0, fnPtr, __FILE__, __LINE__, pos, len, buf, count );
+			error, this, 0, fnPtr, PKGBUILD40, __LINE__, pos, len, buf, count );
@@ -113 +114 @@
-			error, this, 0, fnPtr, __FILE__, __LINE__, pos, len, IUTF8String_I::MakeShared( str), strPos, strLen );
+			error, this, 0, fnPtr, PKGBUILD40, __LINE__, pos, len, IUTF8String_I::MakeShared( str), strPos, strLen );
@@ -118 +119 @@
-			error, this, &IUTF8String_v1::substr, __FILE__, __LINE__, pos, count );
+			error, this, &IUTF8String_v1::substr, PKGBUILD40, __LINE__, pos, count );
@@ -123 +124 @@
-			error, this, 0, &IUTF8String_v1::empty, __FILE__, __LINE__ );
+			error, this, 0, &IUTF8String_v1::empty, PKGBUILD40, __LINE__ );
@@ -134 +135 @@
-			error, this, NULL, fnPtr, __FILE__, __LINE__, interfaceID, interfaceVersion );
+			error, this, NULL, fnPtr, PKGBUILD40, __LINE__, interfaceID, interfaceVersion );
@@ -150 +151 @@
-					IError_v1::kESOperationFatal, interfaceID, interfaceVersion, __FILE__, __LINE__ );
+					IError_v1::kESOperationFatal, interfaceID, interfaceVersion, PKGBUILD40, __LINE__ );
@@ -156 +157 @@
-			IError_v1::kESOperationFatal, kIUTF8StringID, interfaceID, __FILE__, __LINE__ );
+			IError_v1::kESOperationFatal, kIUTF8StringID, interfaceID, PKGBUILD40, __LINE__ );
diff -Naru0 XMP-Toolkit-SDK-CC201607/XMPCommon/source/SharedMutexImpl.cpp XMP-Toolkit-SDK-CC201607.patched/XMPCommon/source/SharedMutexImpl.cpp
--- XMP-Toolkit-SDK-CC201607/XMPCommon/source/SharedMutexImpl.cpp	2016-08-02 05:34:36.000000000 +0300
+++ XMP-Toolkit-SDK-CC201607.patched/XMPCommon/source/SharedMutexImpl.cpp	2019-11-03 18:22:03.850070708 +0300
@@ -0,0 +1 @@
+#define PKGBUILD43 "XMPCommon/source/SharedMutexImpl.cpp"
@@ -43 +44 @@
-		return MakeUncheckedSharedPointer( new SharedMutexImpl(), __FILE__, __LINE__ );
+		return MakeUncheckedSharedPointer( new SharedMutexImpl(), PKGBUILD43, __LINE__ );
diff -Naru0 XMP-Toolkit-SDK-CC201607/XMPCommon/source/UTF8StringImpl.cpp XMP-Toolkit-SDK-CC201607.patched/XMPCommon/source/UTF8StringImpl.cpp
--- XMP-Toolkit-SDK-CC201607/XMPCommon/source/UTF8StringImpl.cpp	2016-08-02 05:34:36.000000000 +0300
+++ XMP-Toolkit-SDK-CC201607.patched/XMPCommon/source/UTF8StringImpl.cpp	2019-11-03 18:22:03.786762427 +0300
@@ -0,0 +1 @@
+#define PKGBUILD38 "XMPCommon/source/UTF8StringImpl.cpp"
@@ -236 +237 @@
-		auto sp = MakeUncheckedSharedPointer( new UTF8StringImpl(), __FILE__, __LINE__, true );
+		auto sp = MakeUncheckedSharedPointer( new UTF8StringImpl(), PKGBUILD38, __LINE__, true );
@@ -250 +251 @@
-		return XMP_COMPONENT_INT_NAMESPACE::MakeUncheckedSharedPointer( p, __FILE__, __LINE__, true );
+		return XMP_COMPONENT_INT_NAMESPACE::MakeUncheckedSharedPointer( p, PKGBUILD38, __LINE__, true );
diff -Naru0 XMP-Toolkit-SDK-CC201607/XMPCore/ImplHeaders/TNodeIteratorImpl.h XMP-Toolkit-SDK-CC201607.patched/XMPCore/ImplHeaders/TNodeIteratorImpl.h
--- XMP-Toolkit-SDK-CC201607/XMPCore/ImplHeaders/TNodeIteratorImpl.h	2016-08-02 05:34:36.000000000 +0300
+++ XMP-Toolkit-SDK-CC201607.patched/XMPCore/ImplHeaders/TNodeIteratorImpl.h	2019-11-03 18:22:03.333608412 +0300
@@ -0,0 +1 @@
+#define PKGBUILD03 "XMPCore/ImplHeaders/TNodeIteratorImpl.h"
@@ -59 +60 @@
-				return MakeUncheckedSharedPointer( this, __FILE__, __LINE__, false );
+				return MakeUncheckedSharedPointer( this, PKGBUILD03, __LINE__, false );
diff -Naru0 XMP-Toolkit-SDK-CC201607/XMPCore/source/ArrayNodeImpl.cpp XMP-Toolkit-SDK-CC201607.patched/XMPCore/source/ArrayNodeImpl.cpp
--- XMP-Toolkit-SDK-CC201607/XMPCore/source/ArrayNodeImpl.cpp	2016-08-02 05:34:36.000000000 +0300
+++ XMP-Toolkit-SDK-CC201607.patched/XMPCore/source/ArrayNodeImpl.cpp	2019-11-03 18:22:03.623493701 +0300
@@ -0,0 +1 @@
+#define PKGBUILD25 "XMPCore/source/ArrayNodeImpl.cpp"
@@ -47 +48 @@
-			return MakeUncheckedSharedPointer( mChildren.at( actualIndex ).get(), __FILE__, __LINE__ );
+			return MakeUncheckedSharedPointer( mChildren.at( actualIndex ).get(), PKGBUILD25, __LINE__ );
@@ -67 +68 @@
-			it = mChildren.insert( it, MakeUncheckedSharedPointer( node.get(), __FILE__, __LINE__ ) );
+			it = mChildren.insert( it, MakeUncheckedSharedPointer( node.get(), PKGBUILD25, __LINE__ ) );
@@ -117 +118 @@
-			return MakeUncheckedSharedPointer( new TNodeIteratorImpl< NodeVector::iterator >( beginIt, endIt ), __FILE__, __LINE__, true );
+			return MakeUncheckedSharedPointer( new TNodeIteratorImpl< NodeVector::iterator >( beginIt, endIt ), PKGBUILD25, __LINE__, true );
@@ -126 +127 @@
-		return MakeUncheckedSharedPointer( this, __FILE__, __LINE__ );
+		return MakeUncheckedSharedPointer( this, PKGBUILD25, __LINE__ );
@@ -196 +197 @@
-			name ? name->c_str() : NULL, name ? name->size() : 0, arrayForm ), __FILE__, __LINE__, true );
+			name ? name->c_str() : NULL, name ? name->size() : 0, arrayForm ), PKGBUILD25, __LINE__, true );
@@ -201 +202 @@
-		return MakeUncheckedSharedPointer( it->get(), __FILE__, __LINE__, false );
+		return MakeUncheckedSharedPointer( it->get(), PKGBUILD25, __LINE__, false );
@@ -211 +212 @@
-		return MakeUncheckedSharedPointer( p, __FILE__, __LINE__, false );
+		return MakeUncheckedSharedPointer( p, PKGBUILD25, __LINE__, false );
@@ -215 +216 @@
-		return MakeUncheckedSharedPointer( new ArrayNodeImpl( nameSpace, nameSpaceLength, name, nameLength, IArrayNode::kAFUnordered ), __FILE__, __LINE__, true );
+		return MakeUncheckedSharedPointer( new ArrayNodeImpl( nameSpace, nameSpaceLength, name, nameLength, IArrayNode::kAFUnordered ), PKGBUILD25, __LINE__, true );
@@ -219 +220 @@
-		return MakeUncheckedSharedPointer( new ArrayNodeImpl( nameSpace, nameSpaceLength, name, nameLength, IArrayNode::kAFOrdered ), __FILE__, __LINE__, true );
+		return MakeUncheckedSharedPointer( new ArrayNodeImpl( nameSpace, nameSpaceLength, name, nameLength, IArrayNode::kAFOrdered ), PKGBUILD25, __LINE__, true );
@@ -223 +224 @@
-		return MakeUncheckedSharedPointer( new ArrayNodeImpl( nameSpace, nameSpaceLength, name, nameLength, IArrayNode::kAFAlternative ), __FILE__, __LINE__, true );
+		return MakeUncheckedSharedPointer( new ArrayNodeImpl( nameSpace, nameSpaceLength, name, nameLength, IArrayNode::kAFAlternative ), PKGBUILD25, __LINE__, true );
diff -Naru0 XMP-Toolkit-SDK-CC201607/XMPCore/source/ClientDOMParserWrapperImpl.cpp XMP-Toolkit-SDK-CC201607.patched/XMPCore/source/ClientDOMParserWrapperImpl.cpp
--- XMP-Toolkit-SDK-CC201607/XMPCore/source/ClientDOMParserWrapperImpl.cpp	2016-08-02 05:34:36.000000000 +0300
+++ XMP-Toolkit-SDK-CC201607.patched/XMPCore/source/ClientDOMParserWrapperImpl.cpp	2019-11-03 18:22:03.346936471 +0300
@@ -0,0 +1 @@
+#define PKGBUILD04 "XMPCore/source/ClientDOMParserWrapperImpl.cpp"
@@ -59 +60 @@
-		return MakeUncheckedSharedPointer( pnode, __FILE__, __LINE__, false );
+		return MakeUncheckedSharedPointer( pnode, PKGBUILD04, __LINE__, false );
diff -Naru0 XMP-Toolkit-SDK-CC201607/XMPCore/source/CompositeNodeImpl.cpp XMP-Toolkit-SDK-CC201607.patched/XMPCore/source/CompositeNodeImpl.cpp
--- XMP-Toolkit-SDK-CC201607/XMPCore/source/CompositeNodeImpl.cpp	2016-08-02 05:34:36.000000000 +0300
+++ XMP-Toolkit-SDK-CC201607.patched/XMPCore/source/CompositeNodeImpl.cpp	2019-11-03 18:22:03.503541167 +0300
@@ -0,0 +1 @@
+#define PKGBUILD16 "XMPCore/source/CompositeNodeImpl.cpp"
@@ -53 +54 @@
-		spINode current = MakeUncheckedSharedPointer( this, __FILE__, __LINE__ );
+		spINode current = MakeUncheckedSharedPointer( this, PKGBUILD16, __LINE__ );
diff -Naru0 XMP-Toolkit-SDK-CC201607/XMPCore/source/CoreConfigurationManagerImpl.cpp XMP-Toolkit-SDK-CC201607.patched/XMPCore/source/CoreConfigurationManagerImpl.cpp
--- XMP-Toolkit-SDK-CC201607/XMPCore/source/CoreConfigurationManagerImpl.cpp	2016-08-02 05:34:36.000000000 +0300
+++ XMP-Toolkit-SDK-CC201607.patched/XMPCore/source/CoreConfigurationManagerImpl.cpp	2019-11-03 18:22:03.533529301 +0300
@@ -0,0 +1 @@
+#define PKGBUILD18 "XMPCore/source/CoreConfigurationManagerImpl.cpp"
@@ -28 +29 @@
-				sCoreConfigurationManager = MakeUncheckedSharedPointer( new CoreConfigurationManagerImpl(), __FILE__, __LINE__, true );
+				sCoreConfigurationManager = MakeUncheckedSharedPointer( new CoreConfigurationManagerImpl(), PKGBUILD18, __LINE__, true );
@@ -49 +50 @@
-		return MakeUncheckedSharedPointer( p, __FILE__, __LINE__, false );
+		return MakeUncheckedSharedPointer( p, PKGBUILD18, __LINE__, false );
diff -Naru0 XMP-Toolkit-SDK-CC201607/XMPCore/source/CoreObjectFactoryImpl.cpp XMP-Toolkit-SDK-CC201607.patched/XMPCore/source/CoreObjectFactoryImpl.cpp
--- XMP-Toolkit-SDK-CC201607/XMPCore/source/CoreObjectFactoryImpl.cpp	2016-08-02 05:34:36.000000000 +0300
+++ XMP-Toolkit-SDK-CC201607.patched/XMPCore/source/CoreObjectFactoryImpl.cpp	2019-11-03 18:22:03.676805938 +0300
@@ -0,0 +1 @@
+#define PKGBUILD29 "XMPCore/source/CoreObjectFactoryImpl.cpp"
@@ -36 +37 @@
-			&IPathSegment::CreateArrayIndexPathSegment, error, __FILE__, __LINE__, nameSpace, nameSpaceLength, index );
+			&IPathSegment::CreateArrayIndexPathSegment, error, PKGBUILD29, __LINE__, nameSpace, nameSpaceLength, index );
@@ -43 +44 @@
-				&IArrayNode::CreateOrderedArrayNode, error, __FILE__, __LINE__, nameSpace, nameSpaceLength, name, nameLength );
+				&IArrayNode::CreateOrderedArrayNode, error, PKGBUILD29, __LINE__, nameSpace, nameSpaceLength, name, nameLength );
@@ -48 +49 @@
-				&IArrayNode::CreateUnorderedArrayNode, error, __FILE__, __LINE__, nameSpace, nameSpaceLength, name, nameLength );
+				&IArrayNode::CreateUnorderedArrayNode, error, PKGBUILD29, __LINE__, nameSpace, nameSpaceLength, name, nameLength );
@@ -53 +54 @@
-				&IArrayNode::CreateAlternativeArrayNode, error, __FILE__, __LINE__, nameSpace, nameSpaceLength, name, nameLength );
+				&IArrayNode::CreateAlternativeArrayNode, error, PKGBUILD29, __LINE__, nameSpace, nameSpaceLength, name, nameLength );
@@ -62 +63 @@
-			&IMetadata::CreateMetadata, error, __FILE__, __LINE__ );
+			&IMetadata::CreateMetadata, error, PKGBUILD29, __LINE__ );
@@ -67 +68 @@
-			&INameSpacePrefixMap::CreateNameSpacePrefixMap, error, __FILE__, __LINE__ );
+			&INameSpacePrefixMap::CreateNameSpacePrefixMap, error, PKGBUILD29, __LINE__ );
@@ -72 +73 @@
-			&IPath::CreatePath, error, __FILE__, __LINE__ );
+			&IPath::CreatePath, error, PKGBUILD29, __LINE__ );
@@ -77 +78 @@
-			&IPathSegment::CreatePropertyPathSegment, error, __FILE__, __LINE__, nameSpace, nameSpaceLength, name, nameLength );
+			&IPathSegment::CreatePropertyPathSegment, error, PKGBUILD29, __LINE__, nameSpace, nameSpaceLength, name, nameLength );
@@ -82 +83 @@
-			&IPathSegment::CreateQualifierPathSegment, error, __FILE__, __LINE__, nameSpace, nameSpaceLength, name, nameLength );
+			&IPathSegment::CreateQualifierPathSegment, error, PKGBUILD29, __LINE__, nameSpace, nameSpaceLength, name, nameLength );
@@ -87 +88 @@
-			&IPathSegment::CreateQualifierSelectorPathSegment, error, __FILE__, __LINE__, nameSpace, nameSpaceLength, name, nameLength, value, valueLength );
+			&IPathSegment::CreateQualifierSelectorPathSegment, error, PKGBUILD29, __LINE__, nameSpace, nameSpaceLength, name, nameLength, value, valueLength );
@@ -92 +93 @@
-			&ISimpleNode::CreateSimpleNode, error, __FILE__, __LINE__, nameSpace, nameSpaceLength, name, nameLength, value, valueLength );
+			&ISimpleNode::CreateSimpleNode, error, PKGBUILD29, __LINE__, nameSpace, nameSpaceLength, name, nameLength, value, valueLength );
@@ -97 +98 @@
-			&IStructureNode::CreateStructureNode, error, __FILE__, __LINE__, nameSpace, nameSpaceLength, name, nameLength );
+			&IStructureNode::CreateStructureNode, error, PKGBUILD29, __LINE__, nameSpace, nameSpaceLength, name, nameLength );
@@ -102 +103 @@
-			&ICoreConfigurationManager::GetCoreConfigurationManager, error, __FILE__, __LINE__ );
+			&ICoreConfigurationManager::GetCoreConfigurationManager, error, PKGBUILD29, __LINE__ );
@@ -107 +108 @@
-			&IDOMImplementationRegistry::GetDOMImplementationRegistry, error, __FILE__, __LINE__ );
+			&IDOMImplementationRegistry::GetDOMImplementationRegistry, error, PKGBUILD29, __LINE__ );
@@ -112 +113 @@
-			&INameSpacePrefixMap::GetDefaultNameSpacePrefixMap, error, __FILE__, __LINE__ );
+			&INameSpacePrefixMap::GetDefaultNameSpacePrefixMap, error, PKGBUILD29, __LINE__ );
@@ -117 +118 @@
-			&IPath::ParsePath, error, __FILE__, __LINE__, path, pathLength, INameSpacePrefixMap::MakeShared( map ) );
+			&IPath::ParsePath, error, PKGBUILD29, __LINE__, path, pathLength, INameSpacePrefixMap::MakeShared( map ) );
@@ -122 +123 @@
-			&IError_I::CreateError, error, __FILE__, __LINE__, static_cast< IError::eErrorDomain >( domain ), static_cast< IError::eErrorCode >( code ), static_cast< IError::eErrorSeverity >( severity ) );
+			&IError_I::CreateError, error, PKGBUILD29, __LINE__, static_cast< IError::eErrorDomain >( domain ), static_cast< IError::eErrorCode >( code ), static_cast< IError::eErrorSeverity >( severity ) );
@@ -127 +128 @@
-			&IUTF8String_I::CreateUTF8String, error, __FILE__, (sizet) __LINE__, buf, count );
+			&IUTF8String_I::CreateUTF8String, error, PKGBUILD29, (sizet) __LINE__, buf, count );
diff -Naru0 XMP-Toolkit-SDK-CC201607/XMPCore/source/DOMImplementationRegistryImpl.cpp XMP-Toolkit-SDK-CC201607.patched/XMPCore/source/DOMImplementationRegistryImpl.cpp
--- XMP-Toolkit-SDK-CC201607/XMPCore/source/DOMImplementationRegistryImpl.cpp	2016-08-02 05:34:36.000000000 +0300
+++ XMP-Toolkit-SDK-CC201607.patched/XMPCore/source/DOMImplementationRegistryImpl.cpp	2019-11-03 18:22:03.493545123 +0300
@@ -0,0 +1 @@
+#define PKGBUILD15 "XMPCore/source/DOMImplementationRegistryImpl.cpp"
@@ -66,3 +67,3 @@
-			ptr->RegisterParser( "rdf", MakeUncheckedSharedPointer( new RDFDOMParserImpl(), __FILE__, __LINE__, true ) );
-			ptr->RegisterSerializer( "rdf", MakeUncheckedSharedPointer( new RDFDOMSerializerImpl(), __FILE__, __LINE__, true ) );
-			sDOMImplementationRegistry = MakeUncheckedSharedPointer( ptr, __FILE__, __LINE__, true );
+			ptr->RegisterParser( "rdf", MakeUncheckedSharedPointer( new RDFDOMParserImpl(), PKGBUILD15, __LINE__, true ) );
+			ptr->RegisterSerializer( "rdf", MakeUncheckedSharedPointer( new RDFDOMSerializerImpl(), PKGBUILD15, __LINE__, true ) );
+			sDOMImplementationRegistry = MakeUncheckedSharedPointer( ptr, PKGBUILD15, __LINE__, true );
@@ -89 +90 @@
-		return MakeUncheckedSharedPointer( p, __FILE__, __LINE__, false );
+		return MakeUncheckedSharedPointer( p, PKGBUILD15, __LINE__, false );
diff -Naru0 XMP-Toolkit-SDK-CC201607/XMPCore/source/DOMParserImpl.cpp XMP-Toolkit-SDK-CC201607.patched/XMPCore/source/DOMParserImpl.cpp
--- XMP-Toolkit-SDK-CC201607/XMPCore/source/DOMParserImpl.cpp	2016-08-02 05:34:36.000000000 +0300
+++ XMP-Toolkit-SDK-CC201607.patched/XMPCore/source/DOMParserImpl.cpp	2019-11-03 18:22:03.610165642 +0300
@@ -0,0 +1 @@
+#define PKGBUILD24 "XMPCore/source/DOMParserImpl.cpp"
@@ -45 +46 @@
-		return MakeUncheckedSharedPointer( cloned, __FILE__, __LINE__, true );
+		return MakeUncheckedSharedPointer( cloned, PKGBUILD24, __LINE__, true );
@@ -70 +71 @@
-						return MakeUncheckedSharedPointer( meta, __FILE__, __LINE__ );
+						return MakeUncheckedSharedPointer( meta, PKGBUILD24, __LINE__ );
@@ -318 +319 @@
-		return MakeUncheckedSharedPointer( new ClientDOMParserWrapperImpl( clientDOMParser ), __FILE__, __LINE__, true );
+		return MakeUncheckedSharedPointer( new ClientDOMParserWrapperImpl( clientDOMParser ), PKGBUILD24, __LINE__, true );
diff -Naru0 XMP-Toolkit-SDK-CC201607/XMPCore/source/DOMSerializerImpl.cpp XMP-Toolkit-SDK-CC201607.patched/XMPCore/source/DOMSerializerImpl.cpp
--- XMP-Toolkit-SDK-CC201607/XMPCore/source/DOMSerializerImpl.cpp	2016-08-02 05:34:36.000000000 +0300
+++ XMP-Toolkit-SDK-CC201607.patched/XMPCore/source/DOMSerializerImpl.cpp	2019-11-03 18:22:03.480217064 +0300
@@ -0,0 +1 @@
+#define PKGBUILD14 "XMPCore/source/DOMSerializerImpl.cpp"
@@ -46 +47 @@
-		return MakeUncheckedSharedPointer( cloned, __FILE__, __LINE__, true );
+		return MakeUncheckedSharedPointer( cloned, PKGBUILD14, __LINE__, true );
@@ -50 +51 @@
-		return MakeUncheckedSharedPointer( new ClientDOMSerializerWrapperImpl( clientDOMSerializer ), __FILE__, __LINE__, true );
+		return MakeUncheckedSharedPointer( new ClientDOMSerializerWrapperImpl( clientDOMSerializer ), PKGBUILD14, __LINE__, true );
diff -Naru0 XMP-Toolkit-SDK-CC201607/XMPCore/source/IArrayNode_I.cpp XMP-Toolkit-SDK-CC201607.patched/XMPCore/source/IArrayNode_I.cpp
--- XMP-Toolkit-SDK-CC201607/XMPCore/source/IArrayNode_I.cpp	2016-08-02 05:34:36.000000000 +0300
+++ XMP-Toolkit-SDK-CC201607.patched/XMPCore/source/IArrayNode_I.cpp	2019-11-03 18:22:03.583509523 +0300
@@ -0,0 +1 @@
+#define PKGBUILD22 "XMPCore/source/IArrayNode_I.cpp"
@@ -23 +24 @@
-			error, this, NULL, &IArrayNode_I::GetInterfacePointer, __FILE__, __LINE__, interfaceID, interfaceVersion );
+			error, this, NULL, &IArrayNode_I::GetInterfacePointer, PKGBUILD22, __LINE__, interfaceID, interfaceVersion );
@@ -39 +40 @@
-					IError_v1::kESOperationFatal, interfaceID, interfaceVersion, __FILE__, __LINE__ );
+					IError_v1::kESOperationFatal, interfaceID, interfaceVersion, PKGBUILD22, __LINE__ );
@@ -49 +50 @@
-				IError_v1::kESOperationFatal, kIArrayNodeID, interfaceID, __FILE__, __LINE__ );
+				IError_v1::kESOperationFatal, kIArrayNodeID, interfaceID, PKGBUILD22, __LINE__ );
@@ -55 +56 @@
-			error, this, 0, &IArrayNode_v1::GetArrayForm, __FILE__, __LINE__ );
+			error, this, 0, &IArrayNode_v1::GetArrayForm, PKGBUILD22, __LINE__ );
@@ -60 +61 @@
-			error, this, 0, &IArrayNode_v1::GetChildNodeType, __FILE__, __LINE__ );
+			error, this, 0, &IArrayNode_v1::GetChildNodeType, PKGBUILD22, __LINE__ );
@@ -67 +68 @@
-			error, this, fnPtr, __FILE__, __LINE__, index );
+			error, this, fnPtr, PKGBUILD22, __LINE__, index );
@@ -72 +73 @@
-			error, this, &IArrayNode_v1::InsertNodeAtIndex, __FILE__, __LINE__, INode::MakeShared( node ), index );
+			error, this, &IArrayNode_v1::InsertNodeAtIndex, PKGBUILD22, __LINE__, INode::MakeShared( node ), index );
@@ -77 +78 @@
-			error, this, &IArrayNode_v1::RemoveNodeAtIndex, __FILE__, __LINE__, index );
+			error, this, &IArrayNode_v1::RemoveNodeAtIndex, PKGBUILD22, __LINE__, index );
@@ -82 +83 @@
-			error, this, &IArrayNode_v1::ReplaceNodeAtIndex, __FILE__, __LINE__, INode::MakeShared( node ), index );
+			error, this, &IArrayNode_v1::ReplaceNodeAtIndex, PKGBUILD22, __LINE__, INode::MakeShared( node ), index );
diff -Naru0 XMP-Toolkit-SDK-CC201607/XMPCore/source/ICompositeNode_I.cpp XMP-Toolkit-SDK-CC201607.patched/XMPCore/source/ICompositeNode_I.cpp
--- XMP-Toolkit-SDK-CC201607/XMPCore/source/ICompositeNode_I.cpp	2016-08-02 05:34:36.000000000 +0300
+++ XMP-Toolkit-SDK-CC201607.patched/XMPCore/source/ICompositeNode_I.cpp	2019-11-03 18:22:03.403580723 +0300
@@ -0,0 +1 @@
+#define PKGBUILD08 "XMPCore/source/ICompositeNode_I.cpp"
@@ -25 +26 @@
-			error, this, NULL, &ICompositeNode_I::GetInterfacePointer, __FILE__, __LINE__, interfaceID, interfaceVersion );
+			error, this, NULL, &ICompositeNode_I::GetInterfacePointer, PKGBUILD08, __LINE__, interfaceID, interfaceVersion );
@@ -41 +42 @@
-					IError_v1::kESOperationFatal, interfaceID, interfaceVersion, __FILE__, __LINE__ );
+					IError_v1::kESOperationFatal, interfaceID, interfaceVersion, PKGBUILD08, __LINE__ );
@@ -51 +52 @@
-				IError_v1::kESOperationFatal, kICompositeNodeID, interfaceID, __FILE__, __LINE__ );
+				IError_v1::kESOperationFatal, kICompositeNodeID, interfaceID, PKGBUILD08, __LINE__ );
@@ -57 +58 @@
-			error, this, 0, &ICompositeNode_v1::GetNodeTypeAtPath, __FILE__, __LINE__, IPath_v1::MakeShared( path ) );
+			error, this, 0, &ICompositeNode_v1::GetNodeTypeAtPath, PKGBUILD08, __LINE__, IPath_v1::MakeShared( path ) );
@@ -64 +65 @@
-			error, this, fnPtr, __FILE__, __LINE__, IPath_v1::MakeShared( path ) );
+			error, this, fnPtr, PKGBUILD08, __LINE__, IPath_v1::MakeShared( path ) );
@@ -69 +70 @@
-			error, this, &ICompositeNode_v1::AppendNode, __FILE__, __LINE__, INode::MakeShared( node ) );
+			error, this, &ICompositeNode_v1::AppendNode, PKGBUILD08, __LINE__, INode::MakeShared( node ) );
@@ -74 +75 @@
-			error, this, &ICompositeNode_v1::InsertNodeAtPath, __FILE__, __LINE__, INode::MakeShared( node ), IPath::MakeShared( path ) );
+			error, this, &ICompositeNode_v1::InsertNodeAtPath, PKGBUILD08, __LINE__, INode::MakeShared( node ), IPath::MakeShared( path ) );
@@ -79 +80 @@
-			error, this, &ICompositeNode_v1::ReplaceNodeAtPath, __FILE__, __LINE__, INode_v1::MakeShared( node ), IPath_v1::MakeShared( path ) );
+			error, this, &ICompositeNode_v1::ReplaceNodeAtPath, PKGBUILD08, __LINE__, INode_v1::MakeShared( node ), IPath_v1::MakeShared( path ) );
@@ -84 +85 @@
-			error, this, &ICompositeNode_v1::RemoveNodeAtPath, __FILE__, __LINE__, IPath_v1::MakeShared( path ) );
+			error, this, &ICompositeNode_v1::RemoveNodeAtPath, PKGBUILD08, __LINE__, IPath_v1::MakeShared( path ) );
@@ -89 +90 @@
-			error, this, &ICompositeNode_v1::Iterator, __FILE__, __LINE__ );
+			error, this, &ICompositeNode_v1::Iterator, PKGBUILD08, __LINE__ );
diff -Naru0 XMP-Toolkit-SDK-CC201607/XMPCore/source/ICoreConfigurationManager_I.cpp XMP-Toolkit-SDK-CC201607.patched/XMPCore/source/ICoreConfigurationManager_I.cpp
--- XMP-Toolkit-SDK-CC201607/XMPCore/source/ICoreConfigurationManager_I.cpp	2016-08-02 05:34:36.000000000 +0300
+++ XMP-Toolkit-SDK-CC201607.patched/XMPCore/source/ICoreConfigurationManager_I.cpp	2019-11-03 18:22:03.456892960 +0300
@@ -0,0 +1 @@
+#define PKGBUILD12 "XMPCore/source/ICoreConfigurationManager_I.cpp"
@@ -23 +24 @@
-			error, this, NULL, &ICoreConfigurationManager_I::GetInterfacePointer, __FILE__, __LINE__, interfaceID, interfaceVersion );
+			error, this, NULL, &ICoreConfigurationManager_I::GetInterfacePointer, PKGBUILD12, __LINE__, interfaceID, interfaceVersion );
@@ -39 +40 @@
-					IError_v1::kESOperationFatal, interfaceID, interfaceVersion, __FILE__, __LINE__ );
+					IError_v1::kESOperationFatal, interfaceID, interfaceVersion, PKGBUILD12, __LINE__ );
@@ -50 +51 @@
-				IError_v1::kESOperationFatal, kICoreConfigurationManagerID, interfaceID, __FILE__, __LINE__ );
+				IError_v1::kESOperationFatal, kICoreConfigurationManagerID, interfaceID, PKGBUILD12, __LINE__ );
diff -Naru0 XMP-Toolkit-SDK-CC201607/XMPCore/source/ICoreObjectFactory_I.cpp XMP-Toolkit-SDK-CC201607.patched/XMPCore/source/ICoreObjectFactory_I.cpp
--- XMP-Toolkit-SDK-CC201607/XMPCore/source/ICoreObjectFactory_I.cpp	2016-08-02 05:34:36.000000000 +0300
+++ XMP-Toolkit-SDK-CC201607.patched/XMPCore/source/ICoreObjectFactory_I.cpp	2019-11-03 18:22:03.556853405 +0300
@@ -0,0 +1 @@
+#define PKGBUILD20 "XMPCore/source/ICoreObjectFactory_I.cpp"
@@ -23 +24 @@
-			error, this, NULL, &ICoreObjectFactory_I::GetInterfacePointer, __FILE__, __LINE__, interfaceID, interfaceVersion );
+			error, this, NULL, &ICoreObjectFactory_I::GetInterfacePointer, PKGBUILD20, __LINE__, interfaceID, interfaceVersion );
@@ -39 +40 @@
-					IError_v1::kESOperationFatal, interfaceID, interfaceVersion, __FILE__, __LINE__ );
+					IError_v1::kESOperationFatal, interfaceID, interfaceVersion, PKGBUILD20, __LINE__ );
@@ -50 +51 @@
-					IError_v1::kESOperationFatal, interfaceID, interfaceVersion, __FILE__, __LINE__ );
+					IError_v1::kESOperationFatal, interfaceID, interfaceVersion, PKGBUILD20, __LINE__ );
@@ -58 +59 @@
-				IError_v1::kESOperationFatal, kICoreObjectFactoryID, interfaceID, __FILE__, __LINE__ );
+				IError_v1::kESOperationFatal, kICoreObjectFactoryID, interfaceID, PKGBUILD20, __LINE__ );
diff -Naru0 XMP-Toolkit-SDK-CC201607/XMPCore/source/IDOMImplementationRegistry_I.cpp XMP-Toolkit-SDK-CC201607.patched/XMPCore/source/IDOMImplementationRegistry_I.cpp
--- XMP-Toolkit-SDK-CC201607/XMPCore/source/IDOMImplementationRegistry_I.cpp	2016-08-02 05:34:36.000000000 +0300
+++ XMP-Toolkit-SDK-CC201607.patched/XMPCore/source/IDOMImplementationRegistry_I.cpp	2019-11-03 18:22:03.360264530 +0300
@@ -0,0 +1 @@
+#define PKGBUILD05 "XMPCore/source/IDOMImplementationRegistry_I.cpp"
@@ -26 +27 @@
-			error, this, NULL, &IDOMImplementationRegistry_I::GetInterfacePointer, __FILE__, __LINE__, interfaceID, interfaceVersion );
+			error, this, NULL, &IDOMImplementationRegistry_I::GetInterfacePointer, PKGBUILD05, __LINE__, interfaceID, interfaceVersion );
@@ -42 +43 @@
-					IError_v1::kESOperationFatal, interfaceID, interfaceVersion, __FILE__, __LINE__ );
+					IError_v1::kESOperationFatal, interfaceID, interfaceVersion, PKGBUILD05, __LINE__ );
@@ -48 +49 @@
-				IError_v1::kESOperationFatal, kIDOMImplementationRegistryID, interfaceID, __FILE__, __LINE__ );
+				IError_v1::kESOperationFatal, kIDOMImplementationRegistryID, interfaceID, PKGBUILD05, __LINE__ );
@@ -54 +55 @@
-			error, this, &IDOMImplementationRegistry_v1::GetParser, __FILE__, __LINE__, key );
+			error, this, &IDOMImplementationRegistry_v1::GetParser, PKGBUILD05, __LINE__, key );
@@ -59 +60 @@
-			error, this, &IDOMImplementationRegistry_v1::GetSerializer, __FILE__, __LINE__, key );
+			error, this, &IDOMImplementationRegistry_v1::GetSerializer, PKGBUILD05, __LINE__, key );
@@ -64 +65 @@
-			error, this, 0, &IDOMImplementationRegistry_I::RegisterParser, __FILE__, __LINE__, key, IDOMParser_I::CreateDOMParser( parser ) );
+			error, this, 0, &IDOMImplementationRegistry_I::RegisterParser, PKGBUILD05, __LINE__, key, IDOMParser_I::CreateDOMParser( parser ) );
@@ -69 +70 @@
-			error, this, 0, &IDOMImplementationRegistry_I::RegisterSerializer, __FILE__, __LINE__, key, IDOMSerializer_I::CreateDOMSerializer( serializer ) );
+			error, this, 0, &IDOMImplementationRegistry_I::RegisterSerializer, PKGBUILD05, __LINE__, key, IDOMSerializer_I::CreateDOMSerializer( serializer ) );
diff -Naru0 XMP-Toolkit-SDK-CC201607/XMPCore/source/IDOMParser_I.cpp XMP-Toolkit-SDK-CC201607.patched/XMPCore/source/IDOMParser_I.cpp
--- XMP-Toolkit-SDK-CC201607/XMPCore/source/IDOMParser_I.cpp	2016-08-02 05:34:36.000000000 +0300
+++ XMP-Toolkit-SDK-CC201607.patched/XMPCore/source/IDOMParser_I.cpp	2019-11-03 18:22:03.723454145 +0300
@@ -0,0 +1 @@
+#define PKGBUILD33 "XMPCore/source/IDOMParser_I.cpp"
@@ -24 +25 @@
-			error, this, NULL, &IDOMParser_I::GetInterfacePointer, __FILE__, __LINE__, interfaceID, interfaceVersion );
+			error, this, NULL, &IDOMParser_I::GetInterfacePointer, PKGBUILD33, __LINE__, interfaceID, interfaceVersion );
@@ -40 +41 @@
-					IError_v1::kESOperationFatal, interfaceID, interfaceVersion, __FILE__, __LINE__ );
+					IError_v1::kESOperationFatal, interfaceID, interfaceVersion, PKGBUILD33, __LINE__ );
@@ -46 +47 @@
-				IError_v1::kESOperationFatal, kIDOMParserID, interfaceID, __FILE__, __LINE__ );
+				IError_v1::kESOperationFatal, kIDOMParserID, interfaceID, PKGBUILD33, __LINE__ );
@@ -52 +53 @@
-			error, this, &IDOMParser_v1::Clone, __FILE__, __LINE__ );
+			error, this, &IDOMParser_v1::Clone, PKGBUILD33, __LINE__ );
@@ -57 +58 @@
-			error, this, &IDOMParser_v1::Parse, __FILE__, __LINE__, buffer, bufferLength );
+			error, this, &IDOMParser_v1::Parse, PKGBUILD33, __LINE__, buffer, bufferLength );
@@ -63 +64 @@
-			error, this, &IDOMParser_v1::ParseWithSpecificAction, __FILE__, __LINE__, buffer, bufferLength, static_cast< eActionType >( actionType ), spNode );
+			error, this, &IDOMParser_v1::ParseWithSpecificAction, PKGBUILD33, __LINE__, buffer, bufferLength, static_cast< eActionType >( actionType ), spNode );
diff -Naru0 XMP-Toolkit-SDK-CC201607/XMPCore/source/IDOMSerializer_I.cpp XMP-Toolkit-SDK-CC201607.patched/XMPCore/source/IDOMSerializer_I.cpp
--- XMP-Toolkit-SDK-CC201607/XMPCore/source/IDOMSerializer_I.cpp	2016-08-02 05:34:36.000000000 +0300
+++ XMP-Toolkit-SDK-CC201607.patched/XMPCore/source/IDOMSerializer_I.cpp	2019-11-03 18:22:03.600169597 +0300
@@ -0,0 +1 @@
+#define PKGBUILD23 "XMPCore/source/IDOMSerializer_I.cpp"
@@ -26 +27 @@
-			error, this, NULL, &IDOMSerializer_I::GetInterfacePointer, __FILE__, __LINE__, interfaceID, interfaceVersion );
+			error, this, NULL, &IDOMSerializer_I::GetInterfacePointer, PKGBUILD23, __LINE__, interfaceID, interfaceVersion );
@@ -42 +43 @@
-					IError_v1::kESOperationFatal, interfaceID, interfaceVersion, __FILE__, __LINE__ );
+					IError_v1::kESOperationFatal, interfaceID, interfaceVersion, PKGBUILD23, __LINE__ );
@@ -48 +49 @@
-				IError_v1::kESOperationFatal, kIDOMSerializerID, interfaceID, __FILE__, __LINE__ );
+				IError_v1::kESOperationFatal, kIDOMSerializerID, interfaceID, PKGBUILD23, __LINE__ );
@@ -54 +55 @@
-			error, this, &IDOMSerializer_v1::Clone, __FILE__, __LINE__ );
+			error, this, &IDOMSerializer_v1::Clone, PKGBUILD23, __LINE__ );
@@ -59 +60 @@
-			error, this, &IDOMSerializer_v1::Serialize, __FILE__, __LINE__, INode::MakeShared( node ), INameSpacePrefixMap::MakeShared( map ) );
+			error, this, &IDOMSerializer_v1::Serialize, PKGBUILD23, __LINE__, INode::MakeShared( node ), INameSpacePrefixMap::MakeShared( map ) );
diff -Naru0 XMP-Toolkit-SDK-CC201607/XMPCore/source/IMetadata_I.cpp XMP-Toolkit-SDK-CC201607.patched/XMPCore/source/IMetadata_I.cpp
--- XMP-Toolkit-SDK-CC201607/XMPCore/source/IMetadata_I.cpp	2016-08-02 05:34:36.000000000 +0300
+++ XMP-Toolkit-SDK-CC201607.patched/XMPCore/source/IMetadata_I.cpp	2019-11-03 18:22:03.373592590 +0300
@@ -0,0 +1 @@
+#define PKGBUILD06 "XMPCore/source/IMetadata_I.cpp"
@@ -24 +25 @@
-			error, this, NULL, &IMetadata_I::GetInterfacePointer, __FILE__, __LINE__, interfaceID, interfaceVersion );
+			error, this, NULL, &IMetadata_I::GetInterfacePointer, PKGBUILD06, __LINE__, interfaceID, interfaceVersion );
@@ -40 +41 @@
-					IError_v1::kESOperationFatal, interfaceID, interfaceVersion, __FILE__, __LINE__ );
+					IError_v1::kESOperationFatal, interfaceID, interfaceVersion, PKGBUILD06, __LINE__ );
@@ -50 +51 @@
-				IError_v1::kESOperationFatal, kIMetadataID, interfaceID, __FILE__, __LINE__ );
+				IError_v1::kESOperationFatal, kIMetadataID, interfaceID, PKGBUILD06, __LINE__ );
@@ -56 +57 @@
-			error, this, &IMetadata_v1::GetAboutURI, __FILE__, __LINE__ );
+			error, this, &IMetadata_v1::GetAboutURI, PKGBUILD06, __LINE__ );
diff -Naru0 XMP-Toolkit-SDK-CC201607/XMPCore/source/INameSpacePrefixMap_I.cpp XMP-Toolkit-SDK-CC201607.patched/XMPCore/source/INameSpacePrefixMap_I.cpp
--- XMP-Toolkit-SDK-CC201607/XMPCore/source/INameSpacePrefixMap_I.cpp	2016-08-02 05:34:36.000000000 +0300
+++ XMP-Toolkit-SDK-CC201607.patched/XMPCore/source/INameSpacePrefixMap_I.cpp	2019-11-03 18:22:03.686801982 +0300
@@ -0,0 +1 @@
+#define PKGBUILD30 "XMPCore/source/INameSpacePrefixMap_I.cpp"
@@ -24 +25 @@
-			error, this, NULL, &INameSpacePrefixMap_I::GetInterfacePointer, __FILE__, __LINE__, interfaceID, interfaceVersion );
+			error, this, NULL, &INameSpacePrefixMap_I::GetInterfacePointer, PKGBUILD30, __LINE__, interfaceID, interfaceVersion );
@@ -40 +41 @@
-					IError_v1::kESOperationFatal, interfaceID, interfaceVersion, __FILE__, __LINE__ );
+					IError_v1::kESOperationFatal, interfaceID, interfaceVersion, PKGBUILD30, __LINE__ );
@@ -46 +47 @@
-				IError_v1::kESOperationFatal, kINameSpacePrefixMapID, interfaceID, __FILE__, __LINE__ );
+				IError_v1::kESOperationFatal, kINameSpacePrefixMapID, interfaceID, PKGBUILD30, __LINE__ );
@@ -52 +53 @@
-			error, this, 0, &INameSpacePrefixMap_v1::Insert, __FILE__, __LINE__, prefix, prefixLength, nameSpace, nameSpaceLength );
+			error, this, 0, &INameSpacePrefixMap_v1::Insert, PKGBUILD30, __LINE__, prefix, prefixLength, nameSpace, nameSpaceLength );
@@ -60 +61 @@
-			error, this, 0, fnPtr, __FILE__, __LINE__, key, keyLength );
+			error, this, 0, fnPtr, PKGBUILD30, __LINE__, key, keyLength );
@@ -68 +69 @@
-			error, this, 0, fnPtr, __FILE__, __LINE__, key, keyLength );
+			error, this, 0, fnPtr, PKGBUILD30, __LINE__, key, keyLength );
@@ -76 +77 @@
-			error, this, fnPtr, __FILE__, __LINE__, key, keyLength );
+			error, this, fnPtr, PKGBUILD30, __LINE__, key, keyLength );
@@ -81 +82 @@
-			error, this, &INameSpacePrefixMap_v1::Clone, __FILE__, __LINE__ );
+			error, this, &INameSpacePrefixMap_v1::Clone, PKGBUILD30, __LINE__ );
diff -Naru0 XMP-Toolkit-SDK-CC201607/XMPCore/source/INode_I.cpp XMP-Toolkit-SDK-CC201607.patched/XMPCore/source/INode_I.cpp
--- XMP-Toolkit-SDK-CC201607/XMPCore/source/INode_I.cpp	2016-08-02 05:34:36.000000000 +0300
+++ XMP-Toolkit-SDK-CC201607.patched/XMPCore/source/INode_I.cpp	2019-11-03 18:22:03.443564901 +0300
@@ -0,0 +1 @@
+#define PKGBUILD11 "XMPCore/source/INode_I.cpp"
@@ -29 +30 @@
-			error, this, NULL, &INode_I::GetInterfacePointer, __FILE__, __LINE__, interfaceID, interfaceVersion );
+			error, this, NULL, &INode_I::GetInterfacePointer, PKGBUILD11, __LINE__, interfaceID, interfaceVersion );
@@ -45 +46 @@
-					IError_v1::kESOperationFatal, interfaceID, interfaceVersion, __FILE__, __LINE__ );
+					IError_v1::kESOperationFatal, interfaceID, interfaceVersion, PKGBUILD11, __LINE__ );
@@ -51 +52 @@
-				IError_v1::kESOperationFatal, kINodeID, interfaceID, __FILE__, __LINE__ );
+				IError_v1::kESOperationFatal, kINodeID, interfaceID, PKGBUILD11, __LINE__ );
@@ -57 +58 @@
-			error, this, &INode_v1::GetParent, __FILE__, __LINE__ );
+			error, this, &INode_v1::GetParent, PKGBUILD11, __LINE__ );
@@ -62 +63 @@
-			error, this, 0, &INode_v1::GetParentNodeType, __FILE__, __LINE__ );
+			error, this, 0, &INode_v1::GetParentNodeType, PKGBUILD11, __LINE__ );
@@ -67 +68 @@
-			error, this, &INode_v1::SetName, __FILE__, __LINE__, name, nameLength );
+			error, this, &INode_v1::SetName, PKGBUILD11, __LINE__, name, nameLength );
@@ -72 +73 @@
-			error, this, &INode_v1::GetName, __FILE__, __LINE__ );
+			error, this, &INode_v1::GetName, PKGBUILD11, __LINE__ );
@@ -77 +78 @@
-			error, this, &INode_v1::SetNameSpace, __FILE__, __LINE__, nameSpace, nameSpaceLength );
+			error, this, &INode_v1::SetNameSpace, PKGBUILD11, __LINE__, nameSpace, nameSpaceLength );
@@ -83 +84 @@
-			error, this, &INode_v1::GetNameSpace, __FILE__, __LINE__ );
+			error, this, &INode_v1::GetNameSpace, PKGBUILD11, __LINE__ );
@@ -88 +89 @@
-			error, this, &INode_v1::GetPath, __FILE__, __LINE__ );
+			error, this, &INode_v1::GetPath, PKGBUILD11, __LINE__ );
@@ -93 +94 @@
-			error, this, &INode_v1::QualifiersIterator, __FILE__, __LINE__ );
+			error, this, &INode_v1::QualifiersIterator, PKGBUILD11, __LINE__ );
@@ -98 +99 @@
-			error, this, 0, &INode_v1::GetQualifierNodeType, __FILE__, __LINE__, nameSpace, nameSpaceLength, name, nameLength );
+			error, this, 0, &INode_v1::GetQualifierNodeType, PKGBUILD11, __LINE__, nameSpace, nameSpaceLength, name, nameLength );
@@ -105 +106 @@
-			error, this, fnPtr, __FILE__, __LINE__, nameSpace, nameSpaceLength, name, nameLength );
+			error, this, fnPtr, PKGBUILD11, __LINE__, nameSpace, nameSpaceLength, name, nameLength );
@@ -109 +110 @@
-		CallUnSafeFunctionReturningVoid< INode_v1, const spINode & >( error, this, &INode_v1::InsertQualifier, __FILE__, __LINE__, INode_v1::MakeShared( base ) );
+		CallUnSafeFunctionReturningVoid< INode_v1, const spINode & >( error, this, &INode_v1::InsertQualifier, PKGBUILD11, __LINE__, INode_v1::MakeShared( base ) );
@@ -114 +115 @@
-			error, this, &INode_v1::ReplaceQualifier, __FILE__, __LINE__, INode_v1::MakeShared( node ) );
+			error, this, &INode_v1::ReplaceQualifier, PKGBUILD11, __LINE__, INode_v1::MakeShared( node ) );
@@ -119 +120 @@
-			error, this, &INode_v1::RemoveQualifier, __FILE__, __LINE__, nameSpace, nameSpaceLength, name, nameLength );
+			error, this, &INode_v1::RemoveQualifier, PKGBUILD11, __LINE__, nameSpace, nameSpaceLength, name, nameLength );
@@ -123 +124 @@
-		return CallConstUnSafeFunction< INode_v1, uint32, eNodeType >( error, this, 0, &INode_v1::GetNodeType, __FILE__, __LINE__ );
+		return CallConstUnSafeFunction< INode_v1, uint32, eNodeType >( error, this, 0, &INode_v1::GetNodeType, PKGBUILD11, __LINE__ );
@@ -127 +128 @@
-		return CallConstUnSafeFunction< INode_v1, uint32, bool>( error, this, 0, &INode_v1::IsArrayItem, __FILE__, __LINE__ );
+		return CallConstUnSafeFunction< INode_v1, uint32, bool>( error, this, 0, &INode_v1::IsArrayItem, PKGBUILD11, __LINE__ );
@@ -131 +132 @@
-		return CallConstUnSafeFunction< INode_v1, uint32, bool >( error, this, 0, &INode_v1::IsQualifierNode, __FILE__, __LINE__ );
+		return CallConstUnSafeFunction< INode_v1, uint32, bool >( error, this, 0, &INode_v1::IsQualifierNode, PKGBUILD11, __LINE__ );
@@ -135 +136 @@
-		return CallConstUnSafeFunction< INode_v1, sizet, sizet >( error, this, 0, &INode_v1::GetIndex, __FILE__, __LINE__ );
+		return CallConstUnSafeFunction< INode_v1, sizet, sizet >( error, this, 0, &INode_v1::GetIndex, PKGBUILD11, __LINE__ );
@@ -139 +140 @@
-		return CallConstUnSafeFunction< INode_v1, uint32, bool>( error, this, 0, &INode_v1::HasQualifiers, __FILE__, __LINE__ );
+		return CallConstUnSafeFunction< INode_v1, uint32, bool>( error, this, 0, &INode_v1::HasQualifiers, PKGBUILD11, __LINE__ );
@@ -143 +144 @@
-		return CallConstUnSafeFunction< INode_v1, uint32, bool>( error, this, 0, &INode_v1::HasContent, __FILE__, __LINE__ );
+		return CallConstUnSafeFunction< INode_v1, uint32, bool>( error, this, 0, &INode_v1::HasContent, PKGBUILD11, __LINE__ );
@@ -147 +148 @@
-		return CallConstUnSafeFunction< INode_v1, uint32, bool>( error, this, 0, &INode_v1::IsEmpty, __FILE__, __LINE__ );
+		return CallConstUnSafeFunction< INode_v1, uint32, bool>( error, this, 0, &INode_v1::IsEmpty, PKGBUILD11, __LINE__ );
@@ -151 +152 @@
-		return CallConstUnSafeFunction< INode_v1, uint32, bool>( error, this, 0, &INode_v1::HasChanged, __FILE__, __LINE__ );
+		return CallConstUnSafeFunction< INode_v1, uint32, bool>( error, this, 0, &INode_v1::HasChanged, PKGBUILD11, __LINE__ );
@@ -155 +156 @@
-		return CallUnSafeFunctionReturningVoid< INode_v1, bool, bool >( error, this, &INode_v1::Clear, __FILE__, __LINE__, contents != 0, qualifiers != 0 );
+		return CallUnSafeFunctionReturningVoid< INode_v1, bool, bool >( error, this, &INode_v1::Clear, PKGBUILD11, __LINE__, contents != 0, qualifiers != 0 );
@@ -160 +161 @@
-			error, this, &INode_v1::Clone, __FILE__, __LINE__, igoreEmptyNodes != 0, ignoreNodesWithOnlyQualifiers != 0 );
+			error, this, &INode_v1::Clone, PKGBUILD11, __LINE__, igoreEmptyNodes != 0, ignoreNodesWithOnlyQualifiers != 0 );
@@ -165 +166 @@
-			error, this, &INode_v1::ConvertToSimpleNode, __FILE__, __LINE__ );
+			error, this, &INode_v1::ConvertToSimpleNode, PKGBUILD11, __LINE__ );
@@ -170 +171 @@
-			error, this, &INode_v1::ConvertToStructureNode, __FILE__, __LINE__ );
+			error, this, &INode_v1::ConvertToStructureNode, PKGBUILD11, __LINE__ );
@@ -175 +176 @@
-			error, this, &INode_v1::ConvertToArrayNode, __FILE__, __LINE__ );
+			error, this, &INode_v1::ConvertToArrayNode, PKGBUILD11, __LINE__ );
@@ -180 +181 @@
-			error, this, &INode_v1::ConvertToMetadata, __FILE__, __LINE__ );
+			error, this, &INode_v1::ConvertToMetadata, PKGBUILD11, __LINE__ );
diff -Naru0 XMP-Toolkit-SDK-CC201607/XMPCore/source/INodeIterator_I.cpp XMP-Toolkit-SDK-CC201607.patched/XMPCore/source/INodeIterator_I.cpp
--- XMP-Toolkit-SDK-CC201607/XMPCore/source/INodeIterator_I.cpp	2016-08-02 05:34:36.000000000 +0300
+++ XMP-Toolkit-SDK-CC201607.patched/XMPCore/source/INodeIterator_I.cpp	2019-11-03 18:22:03.573513479 +0300
@@ -0,0 +1 @@
+#define PKGBUILD21 "XMPCore/source/INodeIterator_I.cpp"
@@ -24 +25 @@
-		error, this, NULL, &INodeIterator_I::GetInterfacePointer, __FILE__, __LINE__, interfaceID, interfaceVersion);
+		error, this, NULL, &INodeIterator_I::GetInterfacePointer, PKGBUILD21, __LINE__, interfaceID, interfaceVersion);
@@ -40 +41 @@
-					IError_v1::kESOperationFatal, interfaceID, interfaceVersion, __FILE__, __LINE__);
+					IError_v1::kESOperationFatal, interfaceID, interfaceVersion, PKGBUILD21, __LINE__);
@@ -46 +47 @@
-			IError_v1::kESOperationFatal, kINodeIteratorID, interfaceID, __FILE__, __LINE__);
+			IError_v1::kESOperationFatal, kINodeIteratorID, interfaceID, PKGBUILD21, __LINE__);
@@ -53 +54 @@
-			error, this, &INodeIterator_v1::GetNode, __FILE__, __LINE__ );
+			error, this, &INodeIterator_v1::GetNode, PKGBUILD21, __LINE__ );
@@ -58 +59 @@
-			error, this, 0, &INodeIterator_v1::GetNodeType, __FILE__, __LINE__ );
+			error, this, 0, &INodeIterator_v1::GetNodeType, PKGBUILD21, __LINE__ );
@@ -63 +64 @@
-			error, this, &INodeIterator_v1::Next, __FILE__, __LINE__ );
+			error, this, &INodeIterator_v1::Next, PKGBUILD21, __LINE__ );
@@ -74 +75 @@
-		return MakeUncheckedSharedPointer( p, __FILE__, __LINE__, false );
+		return MakeUncheckedSharedPointer( p, PKGBUILD21, __LINE__, false );
diff -Naru0 XMP-Toolkit-SDK-CC201607/XMPCore/source/IPath_I.cpp XMP-Toolkit-SDK-CC201607.patched/XMPCore/source/IPath_I.cpp
--- XMP-Toolkit-SDK-CC201607/XMPCore/source/IPath_I.cpp	2016-08-02 05:34:36.000000000 +0300
+++ XMP-Toolkit-SDK-CC201607.patched/XMPCore/source/IPath_I.cpp	2019-11-03 18:22:03.650149819 +0300
@@ -0,0 +1 @@
+#define PKGBUILD27 "XMPCore/source/IPath_I.cpp"
@@ -26 +27 @@
-			error, this, NULL, &IPath_I::GetInterfacePointer, __FILE__, __LINE__, interfaceID, interfaceVersion );
+			error, this, NULL, &IPath_I::GetInterfacePointer, PKGBUILD27, __LINE__, interfaceID, interfaceVersion );
@@ -42 +43 @@
-					IError_v1::kESOperationFatal, interfaceID, interfaceVersion, __FILE__, __LINE__ );
+					IError_v1::kESOperationFatal, interfaceID, interfaceVersion, PKGBUILD27, __LINE__ );
@@ -48 +49 @@
-				IError_v1::kESOperationFatal, kIPathID, interfaceID, __FILE__, __LINE__ );
+				IError_v1::kESOperationFatal, kIPathID, interfaceID, PKGBUILD27, __LINE__ );
@@ -54 +55 @@
-			error, this, &IPath_v1::RegisterNameSpacePrefixMap, __FILE__, __LINE__, INameSpacePrefixMap::MakeShared( map ) );
+			error, this, &IPath_v1::RegisterNameSpacePrefixMap, PKGBUILD27, __LINE__, INameSpacePrefixMap::MakeShared( map ) );
@@ -59 +60 @@
-			error, this, &IPath_v1::Serialize, __FILE__, __LINE__, INameSpacePrefixMap::MakeShared( map ) );
+			error, this, &IPath_v1::Serialize, PKGBUILD27, __LINE__, INameSpacePrefixMap::MakeShared( map ) );
@@ -64 +65 @@
-			error, this, &IPath_v1::AppendPathSegment, __FILE__, __LINE__, IPathSegment::MakeShared( segment ) );
+			error, this, &IPath_v1::AppendPathSegment, PKGBUILD27, __LINE__, IPathSegment::MakeShared( segment ) );
@@ -69 +70 @@
-			error, this, &IPath_v1::RemovePathSegment, __FILE__, __LINE__, index );
+			error, this, &IPath_v1::RemovePathSegment, PKGBUILD27, __LINE__, index );
@@ -74 +75 @@
-			error, this, &IPath_v1::GetPathSegment, __FILE__, __LINE__, index );
+			error, this, &IPath_v1::GetPathSegment, PKGBUILD27, __LINE__, index );
@@ -79 +80 @@
-			error, this, &IPath_v1::Clone, __FILE__, __LINE__, startingIndex, countOfSegemetns );
+			error, this, &IPath_v1::Clone, PKGBUILD27, __LINE__, startingIndex, countOfSegemetns );
diff -Naru0 XMP-Toolkit-SDK-CC201607/XMPCore/source/IPathSegment_I.cpp XMP-Toolkit-SDK-CC201607.patched/XMPCore/source/IPathSegment_I.cpp
--- XMP-Toolkit-SDK-CC201607/XMPCore/source/IPathSegment_I.cpp	2016-08-02 05:34:36.000000000 +0300
+++ XMP-Toolkit-SDK-CC201607.patched/XMPCore/source/IPathSegment_I.cpp	2019-11-03 18:22:03.740114219 +0300
@@ -0,0 +1 @@
+#define PKGBUILD34 "XMPCore/source/IPathSegment_I.cpp"
@@ -24 +25 @@
-			error, this, NULL, &IPathSegment_I::GetInterfacePointer, __FILE__, __LINE__, interfaceID, interfaceVersion );
+			error, this, NULL, &IPathSegment_I::GetInterfacePointer, PKGBUILD34, __LINE__, interfaceID, interfaceVersion );
@@ -40 +41 @@
-					IError_v1::kESOperationFatal, interfaceID, interfaceVersion, __FILE__, __LINE__ );
+					IError_v1::kESOperationFatal, interfaceID, interfaceVersion, PKGBUILD34, __LINE__ );
@@ -46 +47 @@
-				IError_v1::kESOperationFatal, kIPathSegmentID, interfaceID, __FILE__, __LINE__ );
+				IError_v1::kESOperationFatal, kIPathSegmentID, interfaceID, PKGBUILD34, __LINE__ );
@@ -52 +53 @@
-			error, this, &IPathSegment_v1::GetNameSpace, __FILE__, __LINE__ );
+			error, this, &IPathSegment_v1::GetNameSpace, PKGBUILD34, __LINE__ );
@@ -57 +58 @@
-			error, this, &IPathSegment_v1::GetName, __FILE__, __LINE__ );
+			error, this, &IPathSegment_v1::GetName, PKGBUILD34, __LINE__ );
@@ -62 +63 @@
-			error, this, 0, &IPathSegment_v1::GetType, __FILE__, __LINE__ );
+			error, this, 0, &IPathSegment_v1::GetType, PKGBUILD34, __LINE__ );
@@ -67 +68 @@
-			error, this, &IPathSegment_v1::GetValue, __FILE__, __LINE__ );
+			error, this, &IPathSegment_v1::GetValue, PKGBUILD34, __LINE__ );
diff -Naru0 XMP-Toolkit-SDK-CC201607/XMPCore/source/ISimpleNode_I.cpp XMP-Toolkit-SDK-CC201607.patched/XMPCore/source/ISimpleNode_I.cpp
--- XMP-Toolkit-SDK-CC201607/XMPCore/source/ISimpleNode_I.cpp	2016-08-02 05:34:36.000000000 +0300
+++ XMP-Toolkit-SDK-CC201607.patched/XMPCore/source/ISimpleNode_I.cpp	2019-11-03 18:22:03.700130041 +0300
@@ -0,0 +1 @@
+#define PKGBUILD31 "XMPCore/source/ISimpleNode_I.cpp"
@@ -24 +25 @@
-			error, this, NULL, &ISimpleNode_I::GetInterfacePointer, __FILE__, __LINE__, interfaceID, interfaceVersion );
+			error, this, NULL, &ISimpleNode_I::GetInterfacePointer, PKGBUILD31, __LINE__, interfaceID, interfaceVersion );
@@ -41 +42 @@
-					IError_v1::kESOperationFatal, interfaceID, interfaceVersion, __FILE__, __LINE__ );
+					IError_v1::kESOperationFatal, interfaceID, interfaceVersion, PKGBUILD31, __LINE__ );
@@ -50 +51 @@
-				IError_v1::kESOperationFatal, kISimpleNodeID, interfaceID, __FILE__, __LINE__ );
+				IError_v1::kESOperationFatal, kISimpleNodeID, interfaceID, PKGBUILD31, __LINE__ );
@@ -56 +57 @@
-			error, this, &ISimpleNode_v1::GetValue, __FILE__, __LINE__ );
+			error, this, &ISimpleNode_v1::GetValue, PKGBUILD31, __LINE__ );
@@ -61 +62 @@
-			error, this, &ISimpleNode_v1::SetValue, __FILE__, __LINE__, value, valueLength );
+			error, this, &ISimpleNode_v1::SetValue, PKGBUILD31, __LINE__, value, valueLength );
@@ -66 +67 @@
-			error, this, 0, &ISimpleNode_v1::IsURIType, __FILE__, __LINE__ );
+			error, this, 0, &ISimpleNode_v1::IsURIType, PKGBUILD31, __LINE__ );
@@ -71 +72 @@
-			error, this, &ISimpleNode_v1::SetURIType, __FILE__, __LINE__, isURI != 0 );
+			error, this, &ISimpleNode_v1::SetURIType, PKGBUILD31, __LINE__, isURI != 0 );
diff -Naru0 XMP-Toolkit-SDK-CC201607/XMPCore/source/IStructureNode_I.cpp XMP-Toolkit-SDK-CC201607.patched/XMPCore/source/IStructureNode_I.cpp
--- XMP-Toolkit-SDK-CC201607/XMPCore/source/IStructureNode_I.cpp	2016-08-02 05:34:36.000000000 +0300
+++ XMP-Toolkit-SDK-CC201607.patched/XMPCore/source/IStructureNode_I.cpp	2019-11-03 18:22:03.663477879 +0300
@@ -0,0 +1 @@
+#define PKGBUILD28 "XMPCore/source/IStructureNode_I.cpp"
@@ -23 +24 @@
-			error, this, NULL, &IStructureNode_I::GetInterfacePointer, __FILE__, __LINE__, interfaceID, interfaceVersion );
+			error, this, NULL, &IStructureNode_I::GetInterfacePointer, PKGBUILD28, __LINE__, interfaceID, interfaceVersion );
@@ -39 +40 @@
-					IError_v1::kESOperationFatal, interfaceID, interfaceVersion, __FILE__, __LINE__ );
+					IError_v1::kESOperationFatal, interfaceID, interfaceVersion, PKGBUILD28, __LINE__ );
@@ -49 +50 @@
-				IError_v1::kESOperationFatal, kIStructureNodeID, interfaceID, __FILE__, __LINE__ );
+				IError_v1::kESOperationFatal, kIStructureNodeID, interfaceID, PKGBUILD28, __LINE__ );
@@ -55 +56 @@
-			error, this, &IStructureNode_v1::GetNode, __FILE__, __LINE__, nameSpace, nameSpaceLength, name, nameLength );
+			error, this, &IStructureNode_v1::GetNode, PKGBUILD28, __LINE__, nameSpace, nameSpaceLength, name, nameLength );
@@ -60 +61 @@
-			error, this, 0, &IStructureNode_v1::GetChildNodeType, __FILE__, __LINE__, nameSpace, nameSpaceLength, name, nameLength );
+			error, this, 0, &IStructureNode_v1::GetChildNodeType, PKGBUILD28, __LINE__, nameSpace, nameSpaceLength, name, nameLength );
@@ -65 +66 @@
-			error, this, &IStructureNode_v1::InsertNode, __FILE__, __LINE__, INode::MakeShared( node ) );
+			error, this, &IStructureNode_v1::InsertNode, PKGBUILD28, __LINE__, INode::MakeShared( node ) );
@@ -70 +71 @@
-			error, this, &IStructureNode_v1::RemoveNode, __FILE__, __LINE__, nameSpace, nameSpaceLength, name, nameLength );
+			error, this, &IStructureNode_v1::RemoveNode, PKGBUILD28, __LINE__, nameSpace, nameSpaceLength, name, nameLength );
@@ -75 +76 @@
-			error, this, &IStructureNode_v1::ReplaceNode, __FILE__, __LINE__, INode::MakeShared( node ) );
+			error, this, &IStructureNode_v1::ReplaceNode, PKGBUILD28, __LINE__, INode::MakeShared( node ) );
diff -Naru0 XMP-Toolkit-SDK-CC201607/XMPCore/source/MetadataImpl.cpp XMP-Toolkit-SDK-CC201607.patched/XMPCore/source/MetadataImpl.cpp
--- XMP-Toolkit-SDK-CC201607/XMPCore/source/MetadataImpl.cpp	2016-08-02 05:34:36.000000000 +0300
+++ XMP-Toolkit-SDK-CC201607.patched/XMPCore/source/MetadataImpl.cpp	2019-11-03 18:22:03.466889004 +0300
@@ -0,0 +1 @@
+#define PKGBUILD13 "XMPCore/source/MetadataImpl.cpp"
@@ -97 +98 @@
-		return MakeUncheckedSharedPointer( this, __FILE__, __LINE__ );
+		return MakeUncheckedSharedPointer( this, PKGBUILD13, __LINE__ );
@@ -318 +319 @@
-				auto spSelf = MakeUncheckedSharedPointer( this, __FILE__, __LINE__, false );
+				auto spSelf = MakeUncheckedSharedPointer( this, PKGBUILD13, __LINE__, false );
@@ -329 +330 @@
-					auto spSelf = MakeUncheckedSharedPointer( this, __FILE__, __LINE__, false );
+					auto spSelf = MakeUncheckedSharedPointer( this, PKGBUILD13, __LINE__, false );
@@ -357 +358 @@
-				auto spSelf = MakeUncheckedSharedPointer(this, __FILE__, __LINE__, false);
+				auto spSelf = MakeUncheckedSharedPointer(this, PKGBUILD13, __LINE__, false);
@@ -377 +378 @@
-				auto spSelf = MakeUncheckedSharedPointer(this, __FILE__, __LINE__, false);
+				auto spSelf = MakeUncheckedSharedPointer(this, PKGBUILD13, __LINE__, false);
@@ -412 +413 @@
-				auto spSelf = MakeUncheckedSharedPointer(this, __FILE__, __LINE__, false);
+				auto spSelf = MakeUncheckedSharedPointer(this, PKGBUILD13, __LINE__, false);
@@ -435 +436 @@
-		return MakeUncheckedSharedPointer( new MetadataImpl(), __FILE__, __LINE__, true );
+		return MakeUncheckedSharedPointer( new MetadataImpl(), PKGBUILD13, __LINE__, true );
@@ -441 +442 @@
-		return XMP_COMPONENT_INT_NAMESPACE::MakeUncheckedSharedPointer( p, __FILE__, __LINE__, true );
+		return XMP_COMPONENT_INT_NAMESPACE::MakeUncheckedSharedPointer( p, PKGBUILD13, __LINE__, true );
diff -Naru0 XMP-Toolkit-SDK-CC201607/XMPCore/source/NameSpacePrefixMapImpl.cpp XMP-Toolkit-SDK-CC201607.patched/XMPCore/source/NameSpacePrefixMapImpl.cpp
--- XMP-Toolkit-SDK-CC201607/XMPCore/source/NameSpacePrefixMapImpl.cpp	2016-08-02 05:34:36.000000000 +0300
+++ XMP-Toolkit-SDK-CC201607.patched/XMPCore/source/NameSpacePrefixMapImpl.cpp	2019-11-03 18:22:03.543525345 +0300
@@ -0,0 +1 @@
+#define PKGBUILD19 "XMPCore/source/NameSpacePrefixMapImpl.cpp"
@@ -250 +251 @@
-		return MakeUncheckedSharedPointer( ptr, __FILE__, __LINE__ );
+		return MakeUncheckedSharedPointer( ptr, PKGBUILD19, __LINE__ );
@@ -296 +297 @@
-		return MakeUncheckedSharedPointer( new AdobeXMPCore_Int::NameSpacePrefixMapImpl(), __FILE__, __LINE__, true );
+		return MakeUncheckedSharedPointer( new AdobeXMPCore_Int::NameSpacePrefixMapImpl(), PKGBUILD19, __LINE__, true );
@@ -306 +307 @@
-		return MakeUncheckedSharedPointer( p, __FILE__, __LINE__, false );
+		return MakeUncheckedSharedPointer( p, PKGBUILD19, __LINE__, false );
diff -Naru0 XMP-Toolkit-SDK-CC201607/XMPCore/source/NodeImpl.cpp XMP-Toolkit-SDK-CC201607.patched/XMPCore/source/NodeImpl.cpp
--- XMP-Toolkit-SDK-CC201607/XMPCore/source/NodeImpl.cpp	2016-08-02 05:34:36.000000000 +0300
+++ XMP-Toolkit-SDK-CC201607.patched/XMPCore/source/NodeImpl.cpp	2019-11-03 18:22:03.413576767 +0300
@@ -0,0 +1 @@
+#define PKGBUILD09 "XMPCore/source/NodeImpl.cpp"
@@ -128 +129 @@
-				return MakeUncheckedSharedPointer( mpParent->GetINode_I()->GetRawParentPointer(), __FILE__, __LINE__ );
+				return MakeUncheckedSharedPointer( mpParent->GetINode_I()->GetRawParentPointer(), PKGBUILD09, __LINE__ );
@@ -130 +131 @@
-				return MakeUncheckedSharedPointer( mpParent, __FILE__, __LINE__ );
+				return MakeUncheckedSharedPointer( mpParent, PKGBUILD09, __LINE__ );
@@ -349 +350 @@
-				mspParent = MakeUncheckedSharedPointer( mpParent, __FILE__, __LINE__, true );
+				mspParent = MakeUncheckedSharedPointer( mpParent, PKGBUILD09, __LINE__, true );
@@ -476 +477 @@
-		return MakeUncheckedSharedPointer( p, __FILE__, __LINE__, false );
+		return MakeUncheckedSharedPointer( p, PKGBUILD09, __LINE__, false );
diff -Naru0 XMP-Toolkit-SDK-CC201607/XMPCore/source/PathImpl.cpp XMP-Toolkit-SDK-CC201607.patched/XMPCore/source/PathImpl.cpp
--- XMP-Toolkit-SDK-CC201607/XMPCore/source/PathImpl.cpp	2016-08-02 05:34:36.000000000 +0300
+++ XMP-Toolkit-SDK-CC201607.patched/XMPCore/source/PathImpl.cpp	2019-11-03 18:22:03.430236841 +0300
@@ -0,0 +1 @@
+#define PKGBUILD10 "XMPCore/source/PathImpl.cpp"
@@ -153 +154 @@
-		spIPath newPath = MakeUncheckedSharedPointer( new PathImpl(), __FILE__, __LINE__, true );
+		spIPath newPath = MakeUncheckedSharedPointer( new PathImpl(), PKGBUILD10, __LINE__, true );
@@ -174 +175 @@
-		return MakeUncheckedSharedPointer( p, __FILE__, __LINE__, false );
+		return MakeUncheckedSharedPointer( p, PKGBUILD10, __LINE__, false );
@@ -178 +179 @@
-		return MakeUncheckedSharedPointer( new PathImpl(), __FILE__, __LINE__, true );
+		return MakeUncheckedSharedPointer( new PathImpl(), PKGBUILD10, __LINE__, true );
diff -Naru0 XMP-Toolkit-SDK-CC201607/XMPCore/source/PathSegmentImpl.cpp XMP-Toolkit-SDK-CC201607.patched/XMPCore/source/PathSegmentImpl.cpp
--- XMP-Toolkit-SDK-CC201607/XMPCore/source/PathSegmentImpl.cpp	2016-08-02 05:34:36.000000000 +0300
+++ XMP-Toolkit-SDK-CC201607.patched/XMPCore/source/PathSegmentImpl.cpp	2019-11-03 18:22:03.713458101 +0300
@@ -0,0 +1 @@
+#define PKGBUILD32 "XMPCore/source/PathSegmentImpl.cpp"
@@ -55 +56 @@
-			this->mName->c_str(), this->mName->size(), this->mValue->c_str(), this->mValue->size(), mType, mIndex ), __FILE__, __LINE__, true );
+			this->mName->c_str(), this->mName->size(), this->mValue->c_str(), this->mValue->size(), mType, mIndex ), PKGBUILD32, __LINE__, true );
@@ -60 +61 @@
-			new PathSegmentImpl( nameSpace->c_str(), nameSpace->size(), name->c_str(), name->size(), NULL, AdobeXMPCommon::npos, kPSTProperty, kMaxSize ), __FILE__, __LINE__, true );
+			new PathSegmentImpl( nameSpace->c_str(), nameSpace->size(), name->c_str(), name->size(), NULL, AdobeXMPCommon::npos, kPSTProperty, kMaxSize ), PKGBUILD32, __LINE__, true );
@@ -65 +66 @@
-			new PathSegmentImpl( nameSpace->c_str(), nameSpace->size() , NULL, AdobeXMPCommon::npos, NULL, AdobeXMPCommon::npos, kPSTArrayIndex, index ), __FILE__, __LINE__, true );
+			new PathSegmentImpl( nameSpace->c_str(), nameSpace->size() , NULL, AdobeXMPCommon::npos, NULL, AdobeXMPCommon::npos, kPSTArrayIndex, index ), PKGBUILD32, __LINE__, true );
@@ -70 +71 @@
-			new PathSegmentImpl( nameSpace->c_str(), nameSpace->size(), name->c_str(), name->size(), NULL, AdobeXMPCommon::npos, kPSTQualifier, kMaxSize ), __FILE__, __LINE__, true );
+			new PathSegmentImpl( nameSpace->c_str(), nameSpace->size(), name->c_str(), name->size(), NULL, AdobeXMPCommon::npos, kPSTQualifier, kMaxSize ), PKGBUILD32, __LINE__, true );
@@ -75 +76 @@
-			new PathSegmentImpl( nameSpace->c_str(), nameSpace->size(), name->c_str(), name->size(), value->c_str(), value->size(), kPSTQualifierSelector, kMaxSize ), __FILE__, __LINE__, true );
+			new PathSegmentImpl( nameSpace->c_str(), nameSpace->size(), name->c_str(), name->size(), value->c_str(), value->size(), kPSTQualifierSelector, kMaxSize ), PKGBUILD32, __LINE__, true );
@@ -94 +95 @@
-			new PathSegmentImpl( nameSpace, nameSpaceLength, name, nameLength, NULL, AdobeXMPCommon::npos, kPSTProperty, kMaxSize ), __FILE__, __LINE__, true );
+			new PathSegmentImpl( nameSpace, nameSpaceLength, name, nameLength, NULL, AdobeXMPCommon::npos, kPSTProperty, kMaxSize ), PKGBUILD32, __LINE__, true );
@@ -104 +105 @@
-			new PathSegmentImpl( nameSpace, nameSpaceLength, NULL, AdobeXMPCommon::npos, NULL, AdobeXMPCommon::npos, kPSTArrayIndex, index ), __FILE__, __LINE__, true );
+			new PathSegmentImpl( nameSpace, nameSpaceLength, NULL, AdobeXMPCommon::npos, NULL, AdobeXMPCommon::npos, kPSTArrayIndex, index ), PKGBUILD32, __LINE__, true );
@@ -117 +118 @@
-			new PathSegmentImpl( nameSpace, nameSpaceLength, name, nameLength, NULL, AdobeXMPCommon::npos, kPSTQualifier, kMaxSize ), __FILE__, __LINE__, true );
+			new PathSegmentImpl( nameSpace, nameSpaceLength, name, nameLength, NULL, AdobeXMPCommon::npos, kPSTQualifier, kMaxSize ), PKGBUILD32, __LINE__, true );
@@ -135 +136 @@
-			new PathSegmentImpl( nameSpace, nameSpaceLength, name, nameLength, value, valueLength, kPSTQualifierSelector, kMaxSize ), __FILE__, __LINE__, true );
+			new PathSegmentImpl( nameSpace, nameSpaceLength, name, nameLength, value, valueLength, kPSTQualifierSelector, kMaxSize ), PKGBUILD32, __LINE__, true );
@@ -141 +142 @@
-		return MakeUncheckedSharedPointer( p, __FILE__, __LINE__, false );
+		return MakeUncheckedSharedPointer( p, PKGBUILD32, __LINE__, false );
diff -Naru0 XMP-Toolkit-SDK-CC201607/XMPCore/source/RDFDOMSerializerImpl.cpp XMP-Toolkit-SDK-CC201607.patched/XMPCore/source/RDFDOMSerializerImpl.cpp
--- XMP-Toolkit-SDK-CC201607/XMPCore/source/RDFDOMSerializerImpl.cpp	2016-08-02 05:34:36.000000000 +0300
+++ XMP-Toolkit-SDK-CC201607.patched/XMPCore/source/RDFDOMSerializerImpl.cpp	2019-11-03 18:22:03.636821760 +0300
@@ -0,0 +1 @@
+#define PKGBUILD26 "XMPCore/source/RDFDOMSerializerImpl.cpp"
@@ -93 +94 @@
-			generatedMap = MakeUncheckedSharedPointer( INameSpacePrefixMap_I::CreateNameSpacePrefixMap()->GetINameSpacePrefixMap_I(), __FILE__, __LINE__, true );
+			generatedMap = MakeUncheckedSharedPointer( INameSpacePrefixMap_I::CreateNameSpacePrefixMap()->GetINameSpacePrefixMap_I(), PKGBUILD26, __LINE__, true );
@@ -410 +411 @@
-		spINameSpacePrefixMap_I userSuppliedMap( MakeUncheckedSharedPointer( const_pointer_cast< INameSpacePrefixMap >( mergedMap )->GetINameSpacePrefixMap_I(), __FILE__, __LINE__, true ) );
+		spINameSpacePrefixMap_I userSuppliedMap( MakeUncheckedSharedPointer( const_pointer_cast< INameSpacePrefixMap >( mergedMap )->GetINameSpacePrefixMap_I(), PKGBUILD26, __LINE__, true ) );
@@ -480 +481 @@
-		spINameSpacePrefixMap_I userSuppliedMap(MakeUncheckedSharedPointer(const_pointer_cast<INameSpacePrefixMap>(mergedMap)->GetINameSpacePrefixMap_I(), __FILE__, __LINE__, true));
+		spINameSpacePrefixMap_I userSuppliedMap(MakeUncheckedSharedPointer(const_pointer_cast<INameSpacePrefixMap>(mergedMap)->GetINameSpacePrefixMap_I(), PKGBUILD26, __LINE__, true));
diff -Naru0 XMP-Toolkit-SDK-CC201607/XMPCore/source/SimpleNodeImpl.cpp XMP-Toolkit-SDK-CC201607.patched/XMPCore/source/SimpleNodeImpl.cpp
--- XMP-Toolkit-SDK-CC201607/XMPCore/source/SimpleNodeImpl.cpp	2016-08-02 05:34:36.000000000 +0300
+++ XMP-Toolkit-SDK-CC201607.patched/XMPCore/source/SimpleNodeImpl.cpp	2019-11-03 18:22:03.386920649 +0300
@@ -0,0 +1 @@
+#define PKGBUILD07 "XMPCore/source/SimpleNodeImpl.cpp"
@@ -82 +83 @@
-		return MakeUncheckedSharedPointer( this, __FILE__, __LINE__ );
+		return MakeUncheckedSharedPointer( this, PKGBUILD07, __LINE__ );
@@ -88 +89 @@
-				value ? value->c_str() : NULL, value ? value->size() : AdobeXMPCommon::npos ), __FILE__, __LINE__, true );
+				value ? value->c_str() : NULL, value ? value->size() : AdobeXMPCommon::npos ), PKGBUILD07, __LINE__, true );
@@ -96 +97 @@
-		return MakeUncheckedSharedPointer( new SimpleNodeImpl( nameSpace, nameSpaceLength, name, nameLength, value, valueLength ), __FILE__, __LINE__, true );
+		return MakeUncheckedSharedPointer( new SimpleNodeImpl( nameSpace, nameSpaceLength, name, nameLength, value, valueLength ), PKGBUILD07, __LINE__, true );
@@ -102 +103 @@
-		return MakeUncheckedSharedPointer( p, __FILE__, __LINE__, false );
+		return MakeUncheckedSharedPointer( p, PKGBUILD07, __LINE__, false );
diff -Naru0 XMP-Toolkit-SDK-CC201607/XMPCore/source/StructureNodeImpl.cpp XMP-Toolkit-SDK-CC201607.patched/XMPCore/source/StructureNodeImpl.cpp
--- XMP-Toolkit-SDK-CC201607/XMPCore/source/StructureNodeImpl.cpp	2016-08-02 05:34:36.000000000 +0300
+++ XMP-Toolkit-SDK-CC201607.patched/XMPCore/source/StructureNodeImpl.cpp	2019-11-03 18:22:03.516869227 +0300
@@ -0,0 +1 @@
+#define PKGBUILD17 "XMPCore/source/StructureNodeImpl.cpp"
@@ -36 +37 @@
-			return MakeUncheckedSharedPointer( it->second.get(), __FILE__, __LINE__ );
+			return MakeUncheckedSharedPointer( it->second.get(), PKGBUILD17, __LINE__ );
@@ -86 +87 @@
-			mChildrenMap[ qName ] = MakeUncheckedSharedPointer( node.get(), __FILE__, __LINE__ );
+			mChildrenMap[ qName ] = MakeUncheckedSharedPointer( node.get(), PKGBUILD17, __LINE__ );
@@ -118 +119 @@
-			return MakeUncheckedSharedPointer( new TNodeIteratorImpl< QualifiedNameNodeMap::iterator >( beginIt, endIt ), __FILE__, __LINE__, true );
+			return MakeUncheckedSharedPointer( new TNodeIteratorImpl< QualifiedNameNodeMap::iterator >( beginIt, endIt ), PKGBUILD17, __LINE__, true );
@@ -127 +128 @@
-		return MakeUncheckedSharedPointer( this, __FILE__, __LINE__ );
+		return MakeUncheckedSharedPointer( this, PKGBUILD17, __LINE__ );
@@ -208 +209 @@
-			name ? name->c_str() : NULL, name ? name->size(): 0 ), __FILE__, __LINE__ );
+			name ? name->c_str() : NULL, name ? name->size(): 0 ), PKGBUILD17, __LINE__ );
@@ -213 +214 @@
-		return MakeUncheckedSharedPointer( it->second.get(), __FILE__, __LINE__, false );
+		return MakeUncheckedSharedPointer( it->second.get(), PKGBUILD17, __LINE__, false );
@@ -224 +225 @@
-		return MakeUncheckedSharedPointer( p, __FILE__, __LINE__, false );
+		return MakeUncheckedSharedPointer( p, PKGBUILD17, __LINE__, false );
@@ -228 +229 @@
-		return MakeUncheckedSharedPointer( new StructureNodeImpl( nameSpace, nameSpaceLength, name, nameLength ), __FILE__, __LINE__, true );
+		return MakeUncheckedSharedPointer( new StructureNodeImpl( nameSpace, nameSpaceLength, name, nameLength ), PKGBUILD17, __LINE__, true );

## XMP-Toolkit-SDK-CC201607.diff
diff -Naru XMP-Toolkit-SDK-CC201607/build/ProductConfig.cmake XMP-Toolkit-SDK-CC201607.patched/build/ProductConfig.cmake
--- XMP-Toolkit-SDK-CC201607/build/ProductConfig.cmake	2016-08-02 05:34:42.000000000 +0300
+++ XMP-Toolkit-SDK-CC201607.patched/build/ProductConfig.cmake	2019-09-29 18:39:23.042897190 +0300
@@ -159,7 +159,7 @@
 endif()


-		set(XMP_PLATFORM_LINK "-z defs -Xlinker -Bsymbolic -Wl,--no-undefined  ${XMPCORE_UUIDLIB_PATH} ${XMP_EXTRA_LINK_FLAGS} ${XMP_TOOLCHAIN_LINK_FLAGS} -lrt -ldl -luuid -lpthread ${XMP_GCC_LIBPATH}/libssp.a")
+		set(XMP_PLATFORM_LINK "-z defs -Xlinker -Bsymbolic -Wl,--no-undefined  ${XMPCORE_UUIDLIB_PATH} ${XMP_EXTRA_LINK_FLAGS} ${XMP_TOOLCHAIN_LINK_FLAGS} -lrt -ldl -luuid -lpthread")
 		set(XMP_SHARED_COMPILE_FLAGS "-Wno-multichar -D_FILE_OFFSET_BITS=64 -funsigned-char  ${XMP_EXTRA_COMPILE_FLAGS} ${XMP_TOOLCHAIN_COMPILE_FLAGS}")
 		set(XMP_SHARED_COMPILE_DEBUG_FLAGS " ")
 		set(XMP_SHARED_COMPILE_RELEASE_FLAGS "-fwrapv ")
diff -Naru XMP-Toolkit-SDK-CC201607/build/XMP_Config.cmake XMP-Toolkit-SDK-CC201607.patched/build/XMP_Config.cmake
--- XMP-Toolkit-SDK-CC201607/build/XMP_Config.cmake	2016-08-02 05:34:42.000000000 +0300
+++ XMP-Toolkit-SDK-CC201607.patched/build/XMP_Config.cmake	2019-09-29 18:42:20.912610555 +0300
@@ -21,7 +21,7 @@
 	set(COMMON_BUILD_SHARED_DIR ${XMP_ROOT}/build/shared)
 endif()

-set(INCLUDE_CPP_DOM_SOURCE TRUE)
+set(INCLUDE_CPP_DOM_SOURCE FALSE)

 if (INCLUDE_CPP_DOM_SOURCE)
 	add_definitions(-DENABLE_CPP_DOM_MODEL=1)
diff -Naru XMP-Toolkit-SDK-CC201607/build/XMP_ConfigCommon.cmake XMP-Toolkit-SDK-CC201607.patched/build/XMP_ConfigCommon.cmake
--- XMP-Toolkit-SDK-CC201607/build/XMP_ConfigCommon.cmake	2016-08-02 05:34:42.000000000 +0300
+++ XMP-Toolkit-SDK-CC201607.patched/build/XMP_ConfigCommon.cmake	2019-09-29 18:39:23.042897190 +0300
@@ -12,7 +12,7 @@
 cmake_minimum_required(VERSION 3.5.2)

 #add definition specific to XMP and shared by all projects
-add_definitions(-DXML_STATIC=1 -DHAVE_EXPAT_CONFIG_H=1 )
+add_definitions(-DXML_STATIC=1 -DHAVE_EXPAT_CONFIG_H=1 -DHAVE_GETRANDOM=1)
 if(XMP_BUILD_STATIC)
 	add_definitions(-DXMP_StaticBuild=1)
 else()
diff -Naru XMP-Toolkit-SDK-CC201607/XMPCommon/Interfaces/BaseInterfaces/IConfigurable_I.h XMP-Toolkit-SDK-CC201607.patched/XMPCommon/Interfaces/BaseInterfaces/IConfigurable_I.h
--- XMP-Toolkit-SDK-CC201607/XMPCommon/Interfaces/BaseInterfaces/IConfigurable_I.h	2016-08-02 05:34:36.000000000 +0300
+++ XMP-Toolkit-SDK-CC201607.patched/XMPCommon/Interfaces/BaseInterfaces/IConfigurable_I.h	2019-09-29 18:39:23.039565173 +0300
@@ -23,8 +23,8 @@
 	public:

 		typedef struct std::pair< eDataType, CombinedDataValue > TypeValuePair;
-		typedef std::pair< uint64, TypeValuePair >	KeyValuePair;
-		typedef std::pair< uint64, eDataType > KeyValueTypePair;
+		typedef std::pair< const uint64, TypeValuePair >	KeyValuePair;
+		typedef std::pair< const uint64, eDataType > KeyValueTypePair;

 		//!
 		//! Function to validate a key.
diff -Naru XMP-Toolkit-SDK-CC201607/XMPCore/ImplHeaders/DOMImplementationRegistryImpl.h XMP-Toolkit-SDK-CC201607.patched/XMPCore/ImplHeaders/DOMImplementationRegistryImpl.h
--- XMP-Toolkit-SDK-CC201607/XMPCore/ImplHeaders/DOMImplementationRegistryImpl.h	2016-08-02 05:34:36.000000000 +0300
+++ XMP-Toolkit-SDK-CC201607.patched/XMPCore/ImplHeaders/DOMImplementationRegistryImpl.h	2019-09-29 18:39:23.039565173 +0300
@@ -35,8 +35,8 @@
 		, public virtual MemoryManagedObject
 	{
 	public:
-		typedef std::map< spcIUTF8String, spcIDOMParser, IUTF8StringComparator, TAllocator< spcIUTF8String > > ParserMap;
-		typedef std::map< spcIUTF8String, spcIDOMSerializer, IUTF8StringComparator, TAllocator< spcIUTF8String > > SerializerMap;
+		typedef std::map< spcIUTF8String, spcIDOMParser, IUTF8StringComparator, TAllocator< std::pair< const spcIUTF8String, spcIDOMParser > > > ParserMap;
+		typedef std::map< spcIUTF8String, spcIDOMSerializer, IUTF8StringComparator, TAllocator< std::pair< const spcIUTF8String, spcIDOMSerializer > > > SerializerMap;

 		DOMImplementationRegistryImpl() {}

@@ -59,4 +59,4 @@
 	};
 }

-#endif // DOMImplementationRegistryImpl_h__
\ No newline at end of file
+#endif // DOMImplementationRegistryImpl_h__
diff -Naru XMP-Toolkit-SDK-CC201607/XMPCore/ImplHeaders/NameSpacePrefixMapImpl.h XMP-Toolkit-SDK-CC201607.patched/XMPCore/ImplHeaders/NameSpacePrefixMapImpl.h
--- XMP-Toolkit-SDK-CC201607/XMPCore/ImplHeaders/NameSpacePrefixMapImpl.h	2016-08-02 05:34:36.000000000 +0300
+++ XMP-Toolkit-SDK-CC201607.patched/XMPCore/ImplHeaders/NameSpacePrefixMapImpl.h	2019-09-29 18:39:23.042897190 +0300
@@ -40,7 +40,7 @@
 	{
 	public:
 		typedef std::pair< spcIUTF8String, spcIUTF8String > NameSpacePrefixPair;
-		typedef std::map< spcIUTF8String, spcIUTF8String, IUTF8StringComparator, TAllocator< spcIUTF8String > > NameSpacePrefixMap;
+		typedef std::map< spcIUTF8String, spcIUTF8String, IUTF8StringComparator, TAllocator< std::pair< const spcIUTF8String, spcIUTF8String > > > NameSpacePrefixMap;

 		NameSpacePrefixMapImpl();

diff -Naru XMP-Toolkit-SDK-CC201607/XMPCore/ImplHeaders/StructureNodeImpl.h XMP-Toolkit-SDK-CC201607.patched/XMPCore/ImplHeaders/StructureNodeImpl.h
--- XMP-Toolkit-SDK-CC201607/XMPCore/ImplHeaders/StructureNodeImpl.h	2016-08-02 05:34:36.000000000 +0300
+++ XMP-Toolkit-SDK-CC201607.patched/XMPCore/ImplHeaders/StructureNodeImpl.h	2019-09-29 18:39:23.042897190 +0300
@@ -46,7 +46,7 @@
 			bool operator()( const QualifiedName & key1, const QualifiedName & key2 ) const;
 		};

-		typedef std::map< QualifiedName, spINode, CompareQualifiedName, TAllocator< spINode > > QualifiedNameNodeMap;
+		typedef std::map< QualifiedName, spINode, CompareQualifiedName, TAllocator< std::pair< const QualifiedName, spINode > > > QualifiedNameNodeMap;

 		StructureNodeImpl( const char * nameSpace, sizet nameSpaceLength, const char * name, sizet nameLength );
 		using IStructureNode_I::GetNode;
	diff -Naur dng_sdk_1_5_1/dng_sdk/source/dng_flags.h dng_sdk_1_5_1.patched/dng_sdk/source/dng_flags.h
	--- dng_sdk_1_5_1/dng_sdk/source/dng_flags.h 2020-05-06 03:02:02.000000000 +0300
	+++ dng_sdk_1_5_1.patched/dng_sdk/source/dng_flags.h 2020-06-14 02:29:03.849183726 +0300
	@@ -282,7 +282,7 @@
	/// 1 if dng_validate command line tool is being built, 0 otherwise.

	#ifndef qDNGValidateTarget
	-#define qDNGValidateTarget 0
	+#define qDNGValidateTarget 1
	#endif

	/*****************************************************************************/
	diff -Naur dng_sdk_1_5_1/dng_sdk/source/dng_shared.cpp dng_sdk_1_5_1.patched/dng_sdk/source/dng_shared.cpp
	--- dng_sdk_1_5_1/dng_sdk/source/dng_shared.cpp 2019-12-15 08:47:30.000000000 +0300
	+++ dng_sdk_1_5_1.patched/dng_sdk/source/dng_shared.cpp 2020-06-14 02:38:01.908684146 +0300
	@@ -1079,7 +1079,11 @@

	uint16 magicNumber = stream.Get_uint16 ();

	+#if defined(PCDMAGIC_FIXES)
	+ if ((magicNumber != magicExtendedProfile) && (magicNumber != magicTIFF))
	+#else
	if (magicNumber != magicExtendedProfile)
	+#endif
	{
	return false;
	}
	diff -Naur dng_sdk_1_5_1/dng_sdk/source/dng_string.cpp dng_sdk_1_5_1.patched/dng_sdk/source/dng_string.cpp
	--- dng_sdk_1_5_1/dng_sdk/source/dng_string.cpp 2019-12-15 08:47:30.000000000 +0300
	+++ dng_sdk_1_5_1.patched/dng_sdk/source/dng_string.cpp 2020-06-14 02:32:49.217033086 +0300
	@@ -23,7 +23,7 @@
	#include <windows.h>
	#endif

	-#if qiPhone \|\| qAndroid
	+#if qiPhone \|\| qAndroid \|\| qLinux
	#include <ctype.h> // for isdigit
	#endif

	diff -Naur dng_sdk_1_5_1/dng_sdk/source/RawEnvironment.h dng_sdk_1_5_1.patched/dng_sdk/source/RawEnvironment.h
	--- dng_sdk_1_5_1/dng_sdk/source/RawEnvironment.h 1970-01-01 03:00:00.000000000 +0300
	+++ dng_sdk_1_5_1.patched/dng_sdk/source/RawEnvironment.h 2020-06-14 02:34:20.154176077 +0300
	@@ -0,0 +1,3 @@
	+#define qLinux 1
	+#define qDNGThreadSafe 1
	+#define UNIX_ENV 1
	# Maintainer: Dmitry Efremov defremovАТahaDОТru

	# In order to build this package you need to manually download
	# the Adobe XMP SDK source archive (XMP-Toolkit-SDK-CC201607.zip) from:
	#
	# https://www.adobe.com/devnet/xmp.html
	#
	# and the Adobe DNG SDK source archive (dng_sdk_1_5_1.zip) from:
	#
	# https://www.adobe.com/support/downloads/dng/dng_sdk.html
	#
	# Place both the archives into the build directory, next to this file
	# (PKGBUILD).

	_pkgname=dcpTool
	pkgname="${_pkgname,,}"
	pkgver=1.9.0
	_pkguver="${pkgver//./_}"
	pkgrel=1
	pkgdesc="Command line utility for processing DNG Camera Profiles (.dcp files)"
	arch=('x86_64')
	url="http://dcptool.sourceforge.net"
	license=('GPL2')
	makedepends=('cmake' 'unzip')
	depends=('libjpeg-turbo' 'libxml2')

	_zlib='zlib-1.2.11'
	_expatname='expat'
	_expatver='2.2.9'
	_expatuver="${_expatver//./_}"
	_expat="${_expatname}-${_expatver}"
	_xmpsdk='XMP-Toolkit-SDK-CC201607'
	_dngsdk='dng_sdk_1_5_1'
	_dcptool="${_pkgname}_${_pkguver}"
	_dngimage='sample.dng'

	source=(
	"https://zlib.net/${_zlib}.tar.xz"
	"https://github.com/libexpat/libexpat/releases/download/R_${_expatuver}/${_expat}.tar.xz"
	"file://${_xmpsdk}.zip"
	"file://${_dngsdk}.zip"
	"https://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${_pkgname}%20V${pkgver}/${_dcptool}.zip"
	"${_xmpsdk}.diff"
	"${_xmpsdk}-file-macro.diff"
	"${_dngsdk}.diff"
	)

	noextract=(
	"${_xmpsdk}.zip"
	"${_dngsdk}.zip"
	)

	sha256sums=(
	'4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066'
	'1ea6965b15c2106b6bbe883397271c80dfa0331cdf821b2c319591b55eadc0a4'
	'c2834de6b02ff6d2f661337630f202042082712162589d9d6d21e2d30d652405'
	'7d50f807770098f9b91175d3637a9f65658193d3b946bc9a7754aca0bd89fd24'
	'd9871b6b322251a3dd22ab777105aba4aadce89e7264dbafca15702b15454d14'
	'SKIP'
	'SKIP'
	'SKIP'
	)

	_rundngtest=''
	if [[ -f "${_dngimage}" ]] ; then
	source+=("file://${_dngimage}")
	sha256sums+=('SKIP')
	_rundngtest=1
	fi

	_xmpsdkpath=''
	_xmppubpath=''
	_xmprelpath=''
	_xmpcorelib=''
	_xmpfileslib=''
	_dngsdkpath=''
	_dngsrcpath=''
	_dngincpath=''
	_dnglib=''
	_dcppath=''
	_dngapp='dng_validate'

	_set_global_vars() {
	_xmpsdkpath="${srcdir}/${_xmpsdk}"
	_xmppubpath="${_xmpsdkpath}/public"
	_xmprelpath="${_xmppubpath}/libraries/i80386linux_x64/release"
	_xmpcorelib="${_xmprelpath}/staticXMPCore.ar"
	_xmpfileslib="${_xmprelpath}/staticXMPFiles.ar"
	_dngsdkpath="${srcdir}/${_dngsdk}"
	_dngsrcpath="${_dngsdkpath}/dng_sdk/source"
	_dngincpath="${_xmppubpath}/include"
	_dnglib="${_dngsrcpath}/libdng_sdk.a"
	_dcppath="${srcdir}/${_dcptool}"
	}

	prepare() {
	_set_global_vars

	cd "${srcdir}"
	unzip ${_xmpsdk}.zip
	unzip ${_dngsdk}.zip

	# Prepare XMP Toolkit SDK source
	cd "${_xmpsdkpath}"
	ln -rs ../${_expat}/lib third-party/expat/
	ln -rs ../${_zlib}/*.{c,h} third-party/zlib/
	patch -p1 -i "../${_xmpsdk}.diff"
	patch -p1 -i "../${_xmpsdk}-file-macro.diff"

	# Prepare DNG SDK source
	cd "${_dngsrcpath}"
	chmod 644 *.{cpp,h}
	if [[ "$(file -b dng_flags.h)" =~ 'with CRLF' ]] ; then
	sed 's/\r*$/\r/g' "../../../${_dngsdk}.diff" \
	\| patch --binary -p3
	else
	patch -p3 -i "../../../${_dngsdk}.diff"
	fi

	# Prepare dcpTool application source
	cd "${_dcppath}"
	# dng_shared_cpp.diff from the original
	# ${_dcptool}/dnk_sdk/source directory
	# has already been included in ${_dngsdk}.diff
	mv dng_sdk dng_sdk.orig
	ln -rs "${_dngsdkpath}/dng_sdk"
	ln -rs "${_xmpsdkpath}" XMP-SDK
	}

	build() {
	_set_global_vars

	# Build XMP Toolkit SDK
	cd "${_xmpsdkpath}"
	cd build
	make StaticRelease64

	# Build DNG SDK
	cd "${_dngsrcpath}"
	make -f - << EOF
	%.o: %.cpp ; g++ \$(CXXFLAGS) -c -I "${_dngincpath}" \$<
	${_dnglib}: \$(patsubst %.cpp,%.o,\$(patsubst ${_dngapp}.%,,\$(wildcard *.cpp))) ; \
	ar rcs \$@ \$^
	EOF

	# Build dcpTool application
	cd "${_dcppath}"
	make -f - << EOF
	%.o: %.cpp ; g++ \$(CXXFLAGS) -c -I "${_dngsrcpath}" \
	-I /usr/include/libxml2 \$<
	${pkgname}: \$(patsubst %.cpp,%.o,\$(wildcard *.cpp)) ; \
	g++ -ldl -lpthread -lz -ljpeg -lxml2 \$(LDFLAGS) \
	\$^ "${_dnglib}" "${_xmpcorelib}" "${_xmpfileslib}" -o \$@
	EOF
	}

	check() {
	_set_global_vars

	if [[ -n "${_rundngtest}" ]] ; then
	cd "${_dngsrcpath}"

	# Build test dng application
	make -f - << EOF
	%.o: %.cpp ; g++ \$(CXXFLAGS) -c -I "${_dngincpath}" \$<
	${_dngapp}: ${_dngapp}.o ${_dnglib} ; g++ -ldl -lpthread -lz -ljpeg \
	\$(LDFLAGS) \$^ "${_xmpcorelib}" "${_xmpfileslib}" -o \$@
	${_dnglib}: \$(patsubst %.cpp,%.o,\$(patsubst ${_dngapp}.%,,\$(wildcard *.cpp))) ; \
	ar rcs \$@ \$^
	EOF

	# Run test dng application
	./${_dngapp} "${srcdir}/${_dngimage}"
	else
	>&2 printf 'No sample dng image found. Skipping test.\n'
	fi
	}

	package() {
	_set_global_vars

	cd "${_dcppath}"

	# Install the binary
	local _bindir="${pkgdir}/usr/bin"
	install --directory "${_bindir}"
	install --mode 755 --target-directory "${_bindir}" "${pkgname}"

	# Install the documentation
	local _docdir="${pkgdir}/usr/share/doc/${_pkgname}"
	install --directory "${_docdir}"
	install --mode 644 --target-directory "${_docdir}" \
	ReadMe.txt Release.txt gpl.txt
	}
	diff -Naru XMP-Toolkit-SDK-CC201607/build/ProductConfig.cmake XMP-Toolkit-SDK-CC201607.patched/build/ProductConfig.cmake
	--- XMP-Toolkit-SDK-CC201607/build/ProductConfig.cmake 2016-08-02 05:34:42.000000000 +0300
	+++ XMP-Toolkit-SDK-CC201607.patched/build/ProductConfig.cmake 2019-09-29 18:39:23.042897190 +0300
	@@ -159,7 +159,7 @@
	endif()


	- set(XMP_PLATFORM_LINK "-z defs -Xlinker -Bsymbolic -Wl,--no-undefined ${XMPCORE_UUIDLIB_PATH} ${XMP_EXTRA_LINK_FLAGS} ${XMP_TOOLCHAIN_LINK_FLAGS} -lrt -ldl -luuid -lpthread ${XMP_GCC_LIBPATH}/libssp.a")
	+ set(XMP_PLATFORM_LINK "-z defs -Xlinker -Bsymbolic -Wl,--no-undefined ${XMPCORE_UUIDLIB_PATH} ${XMP_EXTRA_LINK_FLAGS} ${XMP_TOOLCHAIN_LINK_FLAGS} -lrt -ldl -luuid -lpthread")
	set(XMP_SHARED_COMPILE_FLAGS "-Wno-multichar -D_FILE_OFFSET_BITS=64 -funsigned-char ${XMP_EXTRA_COMPILE_FLAGS} ${XMP_TOOLCHAIN_COMPILE_FLAGS}")
	set(XMP_SHARED_COMPILE_DEBUG_FLAGS " ")
	set(XMP_SHARED_COMPILE_RELEASE_FLAGS "-fwrapv ")
	diff -Naru XMP-Toolkit-SDK-CC201607/build/XMP_Config.cmake XMP-Toolkit-SDK-CC201607.patched/build/XMP_Config.cmake
	--- XMP-Toolkit-SDK-CC201607/build/XMP_Config.cmake 2016-08-02 05:34:42.000000000 +0300
	+++ XMP-Toolkit-SDK-CC201607.patched/build/XMP_Config.cmake 2019-09-29 18:42:20.912610555 +0300
	@@ -21,7 +21,7 @@
	set(COMMON_BUILD_SHARED_DIR ${XMP_ROOT}/build/shared)
	endif()

	-set(INCLUDE_CPP_DOM_SOURCE TRUE)
	+set(INCLUDE_CPP_DOM_SOURCE FALSE)

	if (INCLUDE_CPP_DOM_SOURCE)
	add_definitions(-DENABLE_CPP_DOM_MODEL=1)
	diff -Naru XMP-Toolkit-SDK-CC201607/build/XMP_ConfigCommon.cmake XMP-Toolkit-SDK-CC201607.patched/build/XMP_ConfigCommon.cmake
	--- XMP-Toolkit-SDK-CC201607/build/XMP_ConfigCommon.cmake 2016-08-02 05:34:42.000000000 +0300
	+++ XMP-Toolkit-SDK-CC201607.patched/build/XMP_ConfigCommon.cmake 2019-09-29 18:39:23.042897190 +0300
	@@ -12,7 +12,7 @@
	cmake_minimum_required(VERSION 3.5.2)

	#add definition specific to XMP and shared by all projects
	-add_definitions(-DXML_STATIC=1 -DHAVE_EXPAT_CONFIG_H=1 )
	+add_definitions(-DXML_STATIC=1 -DHAVE_EXPAT_CONFIG_H=1 -DHAVE_GETRANDOM=1)
	if(XMP_BUILD_STATIC)
	add_definitions(-DXMP_StaticBuild=1)
	else()
	diff -Naru XMP-Toolkit-SDK-CC201607/XMPCommon/Interfaces/BaseInterfaces/IConfigurable_I.h XMP-Toolkit-SDK-CC201607.patched/XMPCommon/Interfaces/BaseInterfaces/IConfigurable_I.h
	--- XMP-Toolkit-SDK-CC201607/XMPCommon/Interfaces/BaseInterfaces/IConfigurable_I.h 2016-08-02 05:34:36.000000000 +0300
	+++ XMP-Toolkit-SDK-CC201607.patched/XMPCommon/Interfaces/BaseInterfaces/IConfigurable_I.h 2019-09-29 18:39:23.039565173 +0300
	@@ -23,8 +23,8 @@
	public:

	typedef struct std::pair< eDataType, CombinedDataValue > TypeValuePair;
	- typedef std::pair< uint64, TypeValuePair > KeyValuePair;
	- typedef std::pair< uint64, eDataType > KeyValueTypePair;
	+ typedef std::pair< const uint64, TypeValuePair > KeyValuePair;
	+ typedef std::pair< const uint64, eDataType > KeyValueTypePair;

	//!
	//! Function to validate a key.
	diff -Naru XMP-Toolkit-SDK-CC201607/XMPCore/ImplHeaders/DOMImplementationRegistryImpl.h XMP-Toolkit-SDK-CC201607.patched/XMPCore/ImplHeaders/DOMImplementationRegistryImpl.h
	--- XMP-Toolkit-SDK-CC201607/XMPCore/ImplHeaders/DOMImplementationRegistryImpl.h 2016-08-02 05:34:36.000000000 +0300
	+++ XMP-Toolkit-SDK-CC201607.patched/XMPCore/ImplHeaders/DOMImplementationRegistryImpl.h 2019-09-29 18:39:23.039565173 +0300
	@@ -35,8 +35,8 @@
	, public virtual MemoryManagedObject
	{
	public:
	- typedef std::map< spcIUTF8String, spcIDOMParser, IUTF8StringComparator, TAllocator< spcIUTF8String > > ParserMap;
	- typedef std::map< spcIUTF8String, spcIDOMSerializer, IUTF8StringComparator, TAllocator< spcIUTF8String > > SerializerMap;
	+ typedef std::map< spcIUTF8String, spcIDOMParser, IUTF8StringComparator, TAllocator< std::pair< const spcIUTF8String, spcIDOMParser > > > ParserMap;
	+ typedef std::map< spcIUTF8String, spcIDOMSerializer, IUTF8StringComparator, TAllocator< std::pair< const spcIUTF8String, spcIDOMSerializer > > > SerializerMap;

	DOMImplementationRegistryImpl() {}

	@@ -59,4 +59,4 @@
	};
	}

	-#endif // DOMImplementationRegistryImpl_h__
	\ No newline at end of file
	+#endif // DOMImplementationRegistryImpl_h__
	diff -Naru XMP-Toolkit-SDK-CC201607/XMPCore/ImplHeaders/NameSpacePrefixMapImpl.h XMP-Toolkit-SDK-CC201607.patched/XMPCore/ImplHeaders/NameSpacePrefixMapImpl.h
	--- XMP-Toolkit-SDK-CC201607/XMPCore/ImplHeaders/NameSpacePrefixMapImpl.h 2016-08-02 05:34:36.000000000 +0300
	+++ XMP-Toolkit-SDK-CC201607.patched/XMPCore/ImplHeaders/NameSpacePrefixMapImpl.h 2019-09-29 18:39:23.042897190 +0300
	@@ -40,7 +40,7 @@
	{
	public:
	typedef std::pair< spcIUTF8String, spcIUTF8String > NameSpacePrefixPair;
	- typedef std::map< spcIUTF8String, spcIUTF8String, IUTF8StringComparator, TAllocator< spcIUTF8String > > NameSpacePrefixMap;
	+ typedef std::map< spcIUTF8String, spcIUTF8String, IUTF8StringComparator, TAllocator< std::pair< const spcIUTF8String, spcIUTF8String > > > NameSpacePrefixMap;

	NameSpacePrefixMapImpl();

	diff -Naru XMP-Toolkit-SDK-CC201607/XMPCore/ImplHeaders/StructureNodeImpl.h XMP-Toolkit-SDK-CC201607.patched/XMPCore/ImplHeaders/StructureNodeImpl.h
	--- XMP-Toolkit-SDK-CC201607/XMPCore/ImplHeaders/StructureNodeImpl.h 2016-08-02 05:34:36.000000000 +0300
	+++ XMP-Toolkit-SDK-CC201607.patched/XMPCore/ImplHeaders/StructureNodeImpl.h 2019-09-29 18:39:23.042897190 +0300
	@@ -46,7 +46,7 @@
	bool operator()( const QualifiedName & key1, const QualifiedName & key2 ) const;
	};

	- typedef std::map< QualifiedName, spINode, CompareQualifiedName, TAllocator< spINode > > QualifiedNameNodeMap;
	+ typedef std::map< QualifiedName, spINode, CompareQualifiedName, TAllocator< std::pair< const QualifiedName, spINode > > > QualifiedNameNodeMap;

	StructureNodeImpl( const char * nameSpace, sizet nameSpaceLength, const char * name, sizet nameLength );
	using IStructureNode_I::GetNode;