[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:47:28 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=73572aa
The following commit has been merged in the master branch:
commit 73572aa54d709bf3304e431c8e793dae5d51df7a
Author: Robin Mills <robin at clanmills.com>
Date: Sun Apr 23 11:57:05 2017 +0000
#1291 Fix submitted. Thank You to T Modes for reporting this issue.
---
include/exiv2/config.h | 8 +-
msvc/libexiv2/libexiv2.vcproj | 1464 +++++++++++++++++++++++++++++++++--------
src/http.cpp | 5 +
3 files changed, 1200 insertions(+), 277 deletions(-)
diff --git a/include/exiv2/config.h b/include/exiv2/config.h
index 15e0e23..844f3cc 100644
--- a/include/exiv2/config.h
+++ b/include/exiv2/config.h
@@ -6,7 +6,7 @@
///// Start of Visual Studio Support /////
#ifdef _MSC_VER
-#include <winsock2.h>
+#include <windows.h>
#define _MSC_VER_2015 1900
#define _MSC_VER_2013 1800
@@ -43,12 +43,6 @@
# endif
#endif
-#include <windows.h>
-#include <shlobj.h>
-
-#pragma comment(lib, "ws2_32.lib")
-#pragma comment(lib, "wldap32.lib")
-
#if _MSC_VER >= _MSC_VER_2010
# define EXV_HAVE_STDINT_H 1
#else
diff --git a/msvc/libexiv2/libexiv2.vcproj b/msvc/libexiv2/libexiv2.vcproj
index 03a0817..e5a83c6 100644
--- a/msvc/libexiv2/libexiv2.vcproj
+++ b/msvc/libexiv2/libexiv2.vcproj
@@ -1,271 +1,1195 @@
-<VisualStudioProject ProjectType="Visual C++" Version="8.00" Name="libexiv2" ProjectGUID="{831EF580-92C8-4CA8-B0CE-3D906280A54D}" RootNamespace="libexiv2" Keyword="Win32Proj">
- <Platforms>
- <Platform Name="Win32"/>
- <Platform Name="x64"/>
- </Platforms>
- <Configurations>
- <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="4" CharacterSet="2">
- <Tool Name="VCPreBuildEventTool" CommandLine=""/>
- <Tool Name="VCCustomBuildTool"/>
- <Tool Name="VCXMLDataGeneratorTool"/>
- <Tool Name="VCWebServiceProxyGeneratorTool"/>
- <Tool Name="VCMIDLTool"/>
- <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;" PreprocessorDefinitions="WIN32;_DEBUG;LIBSSH_STATIC" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" BufferSecurityCheck="true" RuntimeTypeInfo="true" UsePrecompiledHeader="0" BrowseInformation="1" WarningLevel="3" WarnAsError="true" DebugInformationFormat="3"/>
- <Tool Name="VCManagedResourceCompilerTool"/>
- <Tool Name="VCResourceCompilerTool"/>
- <Tool Name="VCPreLinkEventTool"/>
- <Tool Name="VCLibrarianTool" AdditionalLibraryDirectories="..\xmpsdk\$(PlatformName)\$(ConfigurationName);..\expat\(PlatformName)\$(ConfigurationName)" IgnoreDefaultLibraryNames="msvcrtd"/>
- <Tool Name="VCALinkTool"/>
- <Tool Name="VCXDCMakeTool"/>
- <Tool Name="VCBscMakeTool"/>
- <Tool Name="VCFxCopTool"/>
- <Tool Name="VCPostBuildEventTool"/>
- </Configuration>
- <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="4" CharacterSet="2">
- <Tool Name="VCPreBuildEventTool" CommandLine=""/>
- <Tool Name="VCCustomBuildTool"/>
- <Tool Name="VCXMLDataGeneratorTool"/>
- <Tool Name="VCWebServiceProxyGeneratorTool"/>
- <Tool Name="VCMIDLTool" TargetEnvironment="3"/>
- <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;" PreprocessorDefinitions="WIN32;_DEBUG;LIBSSH_STATIC" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" BufferSecurityCheck="true" RuntimeTypeInfo="true" UsePrecompiledHeader="0" BrowseInformation="1" WarningLevel="3" WarnAsError="true" DebugInformationFormat="3"/>
- <Tool Name="VCManagedResourceCompilerTool"/>
- <Tool Name="VCResourceCompilerTool"/>
- <Tool Name="VCPreLinkEventTool"/>
- <Tool Name="VCLibrarianTool" AdditionalLibraryDirectories="..\xmpsdk\$(PlatformName)\$(ConfigurationName);..\expat\(PlatformName)\$(ConfigurationName)" IgnoreDefaultLibraryNames="msvcrtd"/>
- <Tool Name="VCALinkTool"/>
- <Tool Name="VCXDCMakeTool"/>
- <Tool Name="VCBscMakeTool"/>
- <Tool Name="VCFxCopTool"/>
- <Tool Name="VCPostBuildEventTool"/>
- </Configuration>
- <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="4" CharacterSet="2">
- <Tool Name="VCPreBuildEventTool" Description="copy expat and zlib binaries" CommandLine=""/>
- <Tool Name="VCCustomBuildTool"/>
- <Tool Name="VCXMLDataGeneratorTool"/>
- <Tool Name="VCWebServiceProxyGeneratorTool"/>
- <Tool Name="VCMIDLTool"/>
- <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;" PreprocessorDefinitions="WIN32;_NDEBUG;LIBSSH_STATIC" RuntimeLibrary="0" RuntimeTypeInfo="true" UsePrecompiledHeader="0" BrowseInformation="1" WarningLevel="3" WarnAsError="true" DebugInformationFormat="3"/>
- <Tool Name="VCManagedResourceCompilerTool"/>
- <Tool Name="VCResourceCompilerTool"/>
- <Tool Name="VCPreLinkEventTool"/>
- <Tool Name="VCLibrarianTool" AdditionalLibraryDirectories=""$(OutDir)";"..\xmpsdk\$(PlatformName)\$(ConfigurationName)";"..\expat\(PlatformName)\$(ConfigurationName)"" IgnoreDefaultLibraryNames="msvcrt"/>
- <Tool Name="VCALinkTool"/>
- <Tool Name="VCXDCMakeTool"/>
- <Tool Name="VCBscMakeTool"/>
- <Tool Name="VCFxCopTool"/>
- <Tool Name="VCPostBuildEventTool"/>
- </Configuration>
- <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="4" CharacterSet="2">
- <Tool Name="VCPreBuildEventTool" Description="copy expat and zlib binaries" CommandLine=""/>
- <Tool Name="VCCustomBuildTool"/>
- <Tool Name="VCXMLDataGeneratorTool"/>
- <Tool Name="VCWebServiceProxyGeneratorTool"/>
- <Tool Name="VCMIDLTool" TargetEnvironment="3"/>
- <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;" PreprocessorDefinitions="WIN32;_NDEBUG;LIBSSH_STATIC" RuntimeLibrary="0" RuntimeTypeInfo="true" UsePrecompiledHeader="0" BrowseInformation="1" WarningLevel="3" WarnAsError="true" DebugInformationFormat="3"/>
- <Tool Name="VCManagedResourceCompilerTool"/>
- <Tool Name="VCResourceCompilerTool"/>
- <Tool Name="VCPreLinkEventTool"/>
- <Tool Name="VCLibrarianTool" AdditionalLibraryDirectories=""$(OutDir)";"..\xmpsdk\$(PlatformName)\$(ConfigurationName)";"..\expat\(PlatformName)\$(ConfigurationName)"" IgnoreDefaultLibraryNames="msvcrt"/>
- <Tool Name="VCALinkTool"/>
- <Tool Name="VCXDCMakeTool"/>
- <Tool Name="VCBscMakeTool"/>
- <Tool Name="VCFxCopTool"/>
- <Tool Name="VCPostBuildEventTool"/>
- </Configuration>
- <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="2" CharacterSet="2">
- <Tool Name="VCPreBuildEventTool"/>
- <Tool Name="VCCustomBuildTool"/>
- <Tool Name="VCXMLDataGeneratorTool"/>
- <Tool Name="VCWebServiceProxyGeneratorTool"/>
- <Tool Name="VCMIDLTool"/>
- <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;" PreprocessorDefinitions="WIN32;_DEBUG;EXV_HAVE_DLL;EXV_BUILDING_LIB" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" BufferSecurityCheck="true" RuntimeTypeInfo="true" UsePrecompiledHeader="0" BrowseInformation="1" WarningLevel="3" WarnAsError="true" DebugInformationFormat="3"/>
- <Tool Name="VCManagedResourceCompilerTool"/>
- <Tool Name="VCResourceCompilerTool"/>
- <Tool Name="VCPreLinkEventTool"/>
- <Tool Name="VCLinkerTool" AdditionalOptions="/NODEFAULTLIB:LIBMTD" AdditionalLibraryDirectories="$(OutDir)" GenerateDebugInformation="true" TargetMachine="1"/>
- <Tool Name="VCALinkTool"/>
- <Tool Name="VCManifestTool"/>
- <Tool Name="VCXDCMakeTool"/>
- <Tool Name="VCBscMakeTool"/>
- <Tool Name="VCFxCopTool"/>
- <Tool Name="VCAppVerifierTool"/>
- <Tool Name="VCWebDeploymentTool"/>
- <Tool Name="VCPostBuildEventTool"/>
- </Configuration>
- <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="2" CharacterSet="2">
- <Tool Name="VCPreBuildEventTool"/>
- <Tool Name="VCCustomBuildTool"/>
- <Tool Name="VCXMLDataGeneratorTool"/>
- <Tool Name="VCWebServiceProxyGeneratorTool"/>
- <Tool Name="VCMIDLTool" TargetEnvironment="3"/>
- <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;" PreprocessorDefinitions="WIN32;_DEBUG;EXV_HAVE_DLL;EXV_BUILDING_LIB" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" BufferSecurityCheck="true" RuntimeTypeInfo="true" UsePrecompiledHeader="0" BrowseInformation="1" WarningLevel="3" WarnAsError="true" DebugInformationFormat="3"/>
- <Tool Name="VCManagedResourceCompilerTool"/>
- <Tool Name="VCResourceCompilerTool"/>
- <Tool Name="VCPreLinkEventTool"/>
- <Tool Name="VCLinkerTool" AdditionalOptions="/NODEFAULTLIB:LIBMTD" AdditionalLibraryDirectories="$(OutDir)" GenerateDebugInformation="true" TargetMachine="17"/>
- <Tool Name="VCALinkTool"/>
- <Tool Name="VCManifestTool"/>
- <Tool Name="VCXDCMakeTool"/>
- <Tool Name="VCBscMakeTool"/>
- <Tool Name="VCFxCopTool"/>
- <Tool Name="VCAppVerifierTool"/>
- <Tool Name="VCWebDeploymentTool"/>
- <Tool Name="VCPostBuildEventTool"/>
- </Configuration>
- <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="2" CharacterSet="2">
- <Tool Name="VCPreBuildEventTool"/>
- <Tool Name="VCCustomBuildTool"/>
- <Tool Name="VCXMLDataGeneratorTool"/>
- <Tool Name="VCWebServiceProxyGeneratorTool"/>
- <Tool Name="VCMIDLTool"/>
- <Tool Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;" PreprocessorDefinitions="WIN32;_NDEBUG;EXV_HAVE_DLL;EXV_BUILDING_LIB" MinimalRebuild="true" BasicRuntimeChecks="0" RuntimeLibrary="2" BufferSecurityCheck="true" RuntimeTypeInfo="true" UsePrecompiledHeader="0" BrowseInformation="1" WarningLevel="3" WarnAsError="true" DebugInformationFormat="3"/>
- <Tool Name="VCManagedResourceCompilerTool"/>
- <Tool Name="VCResourceCompilerTool"/>
- <Tool Name="VCPreLinkEventTool"/>
- <Tool Name="VCLinkerTool" AdditionalLibraryDirectories="$(OutDir)" GenerateDebugInformation="false" TargetMachine="1"/>
- <Tool Name="VCALinkTool"/>
- <Tool Name="VCManifestTool"/>
- <Tool Name="VCXDCMakeTool"/>
- <Tool Name="VCBscMakeTool"/>
- <Tool Name="VCFxCopTool"/>
- <Tool Name="VCAppVerifierTool"/>
- <Tool Name="VCWebDeploymentTool"/>
- <Tool Name="VCPostBuildEventTool"/>
- </Configuration>
- <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="2" CharacterSet="2">
- <Tool Name="VCPreBuildEventTool"/>
- <Tool Name="VCCustomBuildTool"/>
- <Tool Name="VCXMLDataGeneratorTool"/>
- <Tool Name="VCWebServiceProxyGeneratorTool"/>
- <Tool Name="VCMIDLTool" TargetEnvironment="3"/>
- <Tool Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;" PreprocessorDefinitions="WIN32;_NDEBUG;EXV_HAVE_DLL;EXV_BUILDING_LIB" MinimalRebuild="true" BasicRuntimeChecks="0" RuntimeLibrary="2" BufferSecurityCheck="true" RuntimeTypeInfo="true" UsePrecompiledHeader="0" BrowseInformation="1" WarningLevel="3" WarnAsError="true" DebugInformationFormat="3"/>
- <Tool Name="VCManagedResourceCompilerTool"/>
- <Tool Name="VCResourceCompilerTool"/>
- <Tool Name="VCPreLinkEventTool"/>
- <Tool Name="VCLinkerTool" AdditionalLibraryDirectories="$(OutDir)" GenerateDebugInformation="false" ImportLibrary="$(TargetDir)$(TargetName).lib" TargetMachine="17"/>
- <Tool Name="VCALinkTool"/>
- <Tool Name="VCManifestTool"/>
- <Tool Name="VCXDCMakeTool"/>
- <Tool Name="VCBscMakeTool"/>
- <Tool Name="VCFxCopTool"/>
- <Tool Name="VCAppVerifierTool"/>
- <Tool Name="VCWebDeploymentTool"/>
- <Tool Name="VCPostBuildEventTool"/>
- </Configuration>
- </Configurations>
- <Files>
- <Filter Name="Source Files" Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
- <File RelativePath="..\..\srcsfvideo.cpp"/>
- <File RelativePath="..\..\srcasicio.cpp"/>
- <File RelativePath="..\..\srcmpimage.cpp"/>
- <File RelativePath="..\..\src
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list