[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=1b536bd

The following commit has been merged in the master branch:
commit 1b536bd0ed0ce6bd83dd3bf8cf660e31b2ef8284
Author: Robin Mills <robin at clanmills.com>
Date:   Thu Sep 29 17:06:02 2016 +0000

    #2130 Don't build conntest.  Build is broken when --enable-webready.  Fixed issue with samples/geotag.cpp on Linux.
---
 samples/Makefile   | 1 -
 samples/geotag.cpp | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/samples/Makefile b/samples/Makefile
index 3ddeb8b..407f55b 100644
--- a/samples/Makefile
+++ b/samples/Makefile
@@ -55,7 +55,6 @@ include $(top_srcdir)/config/config.mk
 
 # Add source files of sample programs to this list
 BINSRC = addmoddel.cpp        \
-         conntest.cpp         \
          convert-test.cpp     \
          easyaccess-test.cpp  \
          exifcomment.cpp      \
diff --git a/samples/geotag.cpp b/samples/geotag.cpp
index af58145..062c596 100644
--- a/samples/geotag.cpp
+++ b/samples/geotag.cpp
@@ -808,7 +808,11 @@ int main(int argc,const char* argv[])
                 if ( type == typeImage ) {
                     time_t t    = readImageTime(std::string(arg)) ;
                     char   buffer[1024];
+#ifdef __APPLE__
                     char*  path = realpath(arg,buffer);
+#else
+                    char*  path = realpath(arg,NULL);
+#endif
                     if  ( t && path ) {
                         if ( options.verbose) printf("%s %ld %s",path,(long int)t,asctime(localtime(&t)));
                         gFiles.push_back(path);

-- 
exiv2 packaging