[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [emerge] portage/win32libs/exiv2: fix exiv2 on msvc debug
From:       Patrick Spendrin <ps_ml () gmx ! de>
Date:       2015-12-17 11:43:10
Message-ID: E1a9Wxi-00026C-9o () scm ! kde ! org
[Download RAW message or body]

Git commit d72bc24337bc0fe1e58be32051f5f8a018710850 by Patrick Spendrin.
Committed on 17/12/2015 at 11:41.
Pushed by sengels into branch 'master'.

fix exiv2 on msvc debug

M  +19   -3    portage/win32libs/exiv2/exiv2-0.25-20150826.diff

http://commits.kde.org/emerge/d72bc24337bc0fe1e58be32051f5f8a018710850

diff --git a/portage/win32libs/exiv2/exiv2-0.25-20150826.diff b/portage/win=
32libs/exiv2/exiv2-0.25-20150826.diff
index 5f1b2ca..a4d78ab 100644
--- a/portage/win32libs/exiv2/exiv2-0.25-20150826.diff
+++ b/portage/win32libs/exiv2/exiv2-0.25-20150826.diff
@@ -1,6 +1,6 @@
 diff -Nrub -x '*~' -x '*\.orig' -x'*\.o' exiv2-0.25.orig/include/exiv2/exv=
_msvc.h exiv2-0.25/include/exiv2/exv_msvc.h
 --- exiv2-0.25.orig/include/exiv2/exv_msvc.h	2015-06-15 17:32:21.000000000=
 +0200
-+++ exiv2-0.25/include/exiv2/exv_msvc.h	2015-09-09 11:08:09.687643600 +0200
++++ exiv2-0.25/include/exiv2/exv_msvc.h	2015-12-17 11:03:47.993488200 +0100
 @@ -113,9 +113,6 @@
  #define CURL_STATICLIB
  #endif
@@ -13,7 +13,7 @@ diff -Nrub -x '*~' -x '*\.orig' -x'*\.o' exiv2-0.25.orig/=
include/exiv2/exv_msvc.
  #define EXV_SEPARATOR_CHR '\\'
 diff -Nrub -x '*~' -x '*\.orig' -x'*\.o' exiv2-0.25.orig/src/CMakeLists.tx=
t exiv2-0.25/src/CMakeLists.txt
 --- exiv2-0.25.orig/src/CMakeLists.txt	2015-06-14 11:12:19.000000000 +0200
-+++ exiv2-0.25/src/CMakeLists.txt	2015-09-09 11:08:04.896101500 +0200
++++ exiv2-0.25/src/CMakeLists.txt	2015-12-17 11:44:54.490563700 +0100
 @@ -257,6 +257,10 @@
      endif()
  endif()
@@ -25,9 +25,18 @@ diff -Nrub -x '*~' -x '*\.orig' -x'*\.o' exiv2-0.25.orig=
/src/CMakeLists.txt exiv
  if( EXIV2_ENABLE_LIBXMP )
      ADD_DEPENDENCIES( exiv2lib xmp )
      if  ( MSVC )
+@@ -269,7 +273,7 @@
+     IF( ZLIB_FOUND )
+         IF( MSVC )
+             if ( EXIV2_ENABLE_SHARED )
+-                TARGET_LINK_LIBRARIES( exiv2lib optimized ${ZLIB_LIBRARIE=
S} debug ${ZLIB_LIBRARIES}d )
++                TARGET_LINK_LIBRARIES( exiv2lib optimized ${ZLIB_LIBRARIE=
S} debug ${ZLIB_LIBRARIES} )
+             else()
+                 TARGET_LINK_LIBRARIES( exiv2lib optimized zlibstatic.lib =
debug zlibstaticd.lib )
+             endif()
 diff -Nrub -x '*~' -x '*\.orig' -x'*\.o' exiv2-0.25.orig/src/localtime.c e=
xiv2-0.25/src/localtime.c
 --- exiv2-0.25.orig/src/localtime.c	2014-12-25 14:55:57.000000000 +0100
-+++ exiv2-0.25/src/localtime.c	2015-09-09 11:05:51.042738900 +0200
++++ exiv2-0.25/src/localtime.c	2015-12-17 11:03:48.006488900 +0100
 @@ -105,6 +105,13 @@
  #define MY_TZNAME_MAX	255
  #endif /* !defined TZNAME_MAX */
@@ -42,3 +51,10 @@ diff -Nrub -x '*~' -x '*\.orig' -x'*\.o' exiv2-0.25.orig=
/src/localtime.c exiv2-0
  struct state {
  	int		leapcnt;
  	int		timecnt;
+diff -Nrub -x '*~' -x '*\.orig' -x'*\.o' exiv2-0.25.orig/src/svn_version.h=
 exiv2-0.25/src/svn_version.h
+--- exiv2-0.25.orig/src/svn_version.h	1970-01-01 01:00:00.000000000 +0100
++++ exiv2-0.25/src/svn_version.h	2015-12-17 11:04:12.635897600 +0100
+@@ -0,0 +1,3 @@
++#ifndef SVN_VERSION
++#define SVN_VERSION 0
++#endif
[prev in list] [next in list] [prev in thread] [next in thread]