summaryrefslogtreecommitdiffstats
path: root/media-gfx/exiv2/files
diff options
context:
space:
mode:
Diffstat (limited to 'media-gfx/exiv2/files')
-rw-r--r--media-gfx/exiv2/files/exiv2-0.19-syntax-fix.patch19
-rw-r--r--media-gfx/exiv2/files/exiv2-0.21-xmp-fix.patch15
-rw-r--r--media-gfx/exiv2/files/exiv2-0.21.1-offby1time-fix.patch64
3 files changed, 0 insertions, 98 deletions
diff --git a/media-gfx/exiv2/files/exiv2-0.19-syntax-fix.patch b/media-gfx/exiv2/files/exiv2-0.19-syntax-fix.patch
deleted file mode 100644
index 9f217fd..0000000
--- a/media-gfx/exiv2/files/exiv2-0.19-syntax-fix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-------------------------------------------------------------------------
-r1990 | ahuggel | 2010-01-02 02:15:28 +0100 (Sat, 02 Jan 2010) | 1 line
-
-Minor fix. (Fulvio Senore)
-------------------------------------------------------------------------
-
-Index: exiv2/src/value.cpp
-===================================================================
---- exiv2/src/value.cpp (revision 1989)
-+++ exiv2/src/value.cpp (revision 1990)
-@@ -160,7 +160,7 @@
- DataBuf Value::dataArea() const
- {
- return DataBuf(0, 0);
-- };
-+ }
-
- DataValue::DataValue(TypeId typeId) : Value(typeId)
- {
diff --git a/media-gfx/exiv2/files/exiv2-0.21-xmp-fix.patch b/media-gfx/exiv2/files/exiv2-0.21-xmp-fix.patch
deleted file mode 100644
index 5f67cc9..0000000
--- a/media-gfx/exiv2/files/exiv2-0.21-xmp-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- exiv2-0.21.orig/src/xmp.cpp 2010-11-06 13:53:15.000000000 +0000
-+++ exiv2-0.21/src/xmp.cpp 2010-12-20 12:35:34.931520681 +0000
-@@ -420,11 +420,10 @@ namespace Exiv2 {
- }
- } // XmpParser::registerNs
- #else
-- bool XmpParser::registerNs(const std::string& /*ns*/,
-+ void XmpParser::registerNs(const std::string& /*ns*/,
- const std::string& /*prefix*/)
- {
- initialize();
-- return true;
- } // XmpParser::registerNs
- #endif
-
diff --git a/media-gfx/exiv2/files/exiv2-0.21.1-offby1time-fix.patch b/media-gfx/exiv2/files/exiv2-0.21.1-offby1time-fix.patch
deleted file mode 100644
index c90298a..0000000
--- a/media-gfx/exiv2/files/exiv2-0.21.1-offby1time-fix.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-Index: trunk/src/actions.cpp
-===================================================================
---- trunk/src/actions.cpp (revision 2474)
-+++ trunk/src/actions.cpp (revision 2475)
-@@ -104,11 +104,11 @@
- */
- int str2Tm(const std::string& timeStr, struct tm* tm);
-
-- //! Convert a UTC time to a string "YYYY:MM:DD HH:MI:SS", "" on error
-+ //! Convert a localtime to a string "YYYY:MM:DD HH:MI:SS", "" on error
- std::string time2Str(time_t time);
-
- //! Convert a tm structure to a string "YYYY:MM:DD HH:MI:SS", "" on error
-- std::string tm2Str(struct tm* tm);
-+ std::string tm2Str(const struct tm* tm);
-
- /*!
- @brief Copy metadata from source to target according to Params::copyXyz
-@@ -1565,7 +1565,7 @@
- << " " << _("years") << "\n";
- return 1;
- }
-- time_t time = timegm(&tm);
-+ time_t time = mktime(&tm);
- time += adjustment_ + dayAdjustment_ * 86400;
- timeStr = time2Str(time);
- if (Params::instance().verbose_) {
-@@ -1739,7 +1739,7 @@
- int Timestamp::read(struct tm* tm)
- {
- int rc = 1;
-- time_t t = mktime(tm);
-+ time_t t = mktime(tm); // interpret tm according to current timezone settings
- if (t != (time_t)-1) {
- rc = 0;
- actime_ = t;
-@@ -1783,22 +1783,18 @@
- tm->tm_sec = tmp;
-
- // Conversions to set remaining fields of the tm structure
-- time_t time = timegm(tm);
--#ifdef EXV_HAVE_GMTIME_R
-- if (time == (time_t)-1 || gmtime_r(&time, tm) == 0) return 11;
--#else
-- if (time == (time_t)-1 || std::gmtime(&time) == 0) return 11;
--#endif
-+ if (mktime(tm) == (time_t)-1) return 11;
-+
- return 0;
- } // str2Tm
-
- std::string time2Str(time_t time)
- {
-- struct tm* tm = gmtime(&time);
-+ struct tm* tm = localtime(&time);
- return tm2Str(tm);
- } // time2Str
-
-- std::string tm2Str(struct tm* tm)
-+ std::string tm2Str(const struct tm* tm)
- {
- if (0 == tm) return "";
-
-