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

Maximiliano Curia maxy at moszumanska.debian.org
Thu Jul 13 17:45:44 UTC 2017


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

The following commit has been merged in the master branch:
commit a37b84383997e95b5d2eeac5b18f849003387971
Author: Robin Mills <robin at clanmills.com>
Date:   Mon Sep 14 15:47:48 2015 +0000

    Correction to r3941 to fix mac build-breaker in src/image.cpp (and odd linux bb in samples/exiv2json.cpp)
---
 samples/exiv2json.cpp | 1 +
 src/image_int.hpp     | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/samples/exiv2json.cpp b/samples/exiv2json.cpp
index 505268d..4527145 100644
--- a/samples/exiv2json.cpp
+++ b/samples/exiv2json.cpp
@@ -3,6 +3,7 @@
 // Sample program to print metadata in JSON format
 
 #include <exiv2/exiv2.hpp>
+#include <exiv2/datasets.hpp>
 #include "Jzon.h"
 
 #include <iostream>
diff --git a/src/image_int.hpp b/src/image_int.hpp
index 888034f..00f1a30 100644
--- a/src/image_int.hpp
+++ b/src/image_int.hpp
@@ -38,6 +38,8 @@
 
 #if (defined(__GNUG__) || defined(__GNUC__)) && ! defined(__clang__)
 #define ATTRIBUTE_FORMAT_PRINTF __attribute__((format(printf, 1, 0)))
+#else
+#define ATTRIBUTE_FORMAT_PRINTF
 #endif
 
 // *****************************************************************************

-- 
exiv2 packaging



More information about the pkg-kde-commits mailing list