aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorptrcnull <git@ptrcnull.me>2023-07-24 23:34:06 +0200
committerpsykose <alice@ayaya.dev>2023-07-25 01:47:40 +0000
commitb4cb2825ed8d22820cef4584fd4a202e9213f9f4 (patch)
tree59f73bb811ff4dbd469eaa8274c7fd3986467f1c
parent2b89aacdb23606a2bc6e50a52cf6394789e9047e (diff)
community/gexiv2: upgrade to 0.14.2
-rw-r--r--community/gexiv2/32.patch39
-rw-r--r--community/gexiv2/APKBUILD15
-rw-r--r--community/gexiv2/float-compare-test.patch36
3 files changed, 4 insertions, 86 deletions
diff --git a/community/gexiv2/32.patch b/community/gexiv2/32.patch
deleted file mode 100644
index 9dc6c6a36f0..00000000000
--- a/community/gexiv2/32.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/gexiv2/gexiv2-metadata.cpp b/gexiv2/gexiv2-metadata.cpp
-index 928b07b..0e41781 100644
---- a/gexiv2/gexiv2-metadata.cpp
-+++ b/gexiv2/gexiv2-metadata.cpp
-@@ -57,7 +57,7 @@ public:
- #if defined(_MSC_VER)
- typedef int64_t seek_offset_t;
- #else
-- typedef long seek_offset_t;
-+ typedef int64_t seek_offset_t;
- #endif
-
- #if EXIV2_TEST_VERSION(0,27,99)
-diff --git a/gexiv2/gexiv2-stream-io.cpp b/gexiv2/gexiv2-stream-io.cpp
-index 5c755c3..d9afa07 100644
---- a/gexiv2/gexiv2-stream-io.cpp
-+++ b/gexiv2/gexiv2-stream-io.cpp
-@@ -119,7 +119,7 @@ int StreamIo::putb (Exiv2::byte data) {
- return EOF;
- }
-
--int StreamIo::seek (long offset, Position position) {
-+int StreamIo::seek (int64_t offset, Position position) {
- // FIXME: handle Error
- switch (position) {
- case (beg):
-diff --git a/gexiv2/gexiv2-stream-io.h b/gexiv2/gexiv2-stream-io.h
-index 02f265f..eae6c61 100644
---- a/gexiv2/gexiv2-stream-io.h
-+++ b/gexiv2/gexiv2-stream-io.h
-@@ -42,7 +42,7 @@ public:
- size_type read (Exiv2::byte* buf, size_type rcount) override;
- int getb () override;
- void transfer (Exiv2::BasicIo& src) override;
-- int seek (long offset, Position pos) override;
-+ int seek (int64_t offset, Position pos) override;
- Exiv2::byte* mmap (bool isWriteable = false) override;
- int munmap () override;
- long tell () const override;
diff --git a/community/gexiv2/APKBUILD b/community/gexiv2/APKBUILD
index 09f94295f22..3aa980d35a2 100644
--- a/community/gexiv2/APKBUILD
+++ b/community/gexiv2/APKBUILD
@@ -2,8 +2,8 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=gexiv2
-pkgver=0.14.1
-pkgrel=2
+pkgver=0.14.2
+pkgrel=0
pkgdesc="GObject-based wrapper around the Exiv2 library"
url="https://wiki.gnome.org/Projects/gexiv2"
arch="all"
@@ -18,11 +18,7 @@ makedepends="
vala
"
subpackages="py3-$pkgname-pyc py3-$pkgname:py3 $pkgname-dev"
-source="https://download.gnome.org/sources/gexiv2/${pkgver%.*}/gexiv2-$pkgver.tar.xz
- $pkgname-exiv2-0.28-2.patch::https://gitlab.gnome.org/GNOME/gexiv2/-/commit/06adc8fb70cb8c77c0cd364195d8251811106ef8.diff
- 32.patch
- float-compare-test.patch
- "
+source="https://download.gnome.org/sources/gexiv2/${pkgver%.*}/gexiv2-$pkgver.tar.xz"
replaces="libgexiv2"
build() {
@@ -49,8 +45,5 @@ py3() {
}
sha512sums="
-f510e49c0b2633bcc370ca21af0822032f04f5d5b57c7f76807797601b0a98b7749fdf68df37a405c9d90734adf75282a3dad59c24830874f64f7bd33152052d gexiv2-0.14.1.tar.xz
-312e13ec0209e614b087790b8dadd596dbc68c8776912258960c09412d1078ccd5f949f22eb5a69ec38e9e1f22c0091672f66186095ec09156eeba87cffe1b2a gexiv2-exiv2-0.28-2.patch
-652d3a62737890a9012ee8f40fa28ad3d85c19c52b996e6bb80ba31a90395ec2650798632caa992c2a62c252936770731732aded1ff0b2d39b8ef00d70ee87ec 32.patch
-d76c32fee2563aa26b6eac6806853bbcde00f205e36dbd9c82b79c6b48eca4e8141898638cffa71982ff69a12e1fe27edf81ffcfa1a4c65816e24786d72af73c float-compare-test.patch
+16536be5180d5f13f549a68f5b701343a1246eca99083e43e6fc700b151614ea80696f931fcbc721b05955173e3206819b593e5b0fcd8ad4fd7d3b287d9c1441 gexiv2-0.14.2.tar.xz
"
diff --git a/community/gexiv2/float-compare-test.patch b/community/gexiv2/float-compare-test.patch
deleted file mode 100644
index e9aa80827f7..00000000000
--- a/community/gexiv2/float-compare-test.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/test/gexiv2-regression.c b/test/gexiv2-regression.c
-index aa1b274..64924d5 100644
---- a/test/gexiv2-regression.c
-+++ b/test/gexiv2-regression.c
-@@ -158,12 +158,12 @@ static void test_bgo_775249(void)
- g_assert_true(result);
- g_assert_true(gexiv2_metadata_get_gps_info(meta, &lon, &lat, &alt));
-
-- g_assert_cmpfloat(lon, ==, -1.508425);
-+ g_assert_cmpfloat_with_epsilon(lon, -1.508425, 0.0001);
-
- /* Just check if it fits in there; The main issue is that it's not 0 */
- g_assert_cmpfloat(lat, >=, 48.631806);
- g_assert_cmpfloat(lat, <=, 48.631807);
-- g_assert_cmpfloat(alt, ==, -0.926000);
-+ g_assert_cmpfloat_with_epsilon(alt, -0.926000, 0.0001);
-
- g_clear_object(&meta);
- }
-diff --git a/test/python/gexiv2.py b/test/python/gexiv2.py
-index fa80f9f..4f2506a 100644
---- a/test/python/gexiv2.py
-+++ b/test/python/gexiv2.py
-@@ -48,9 +48,9 @@ class TestGexiv2(unittest.TestCase):
- md.open_path(self.get_sample_path(sample))
-
- (lo, la, alt) = md.get_gps_info()
-- self.assertEqual(lo, -1.508425)
-- self.assertEqual(la, 48.631806166666664)
-- self.assertEqual(alt, -0.926000)
-+ self.assertAlmostEqual(lo, -1.508425)
-+ self.assertAlmostEqual(la, 48.631806166666664)
-+ self.assertAlmostEqual(alt, -0.926000)
-
- def test_xmp_packet_formatting(self):
- sample = 'CaorVN.jpeg'