diff options
-rw-r--r-- | .SRCINFO | 14 | ||||
-rw-r--r-- | PKGBUILD | 13 | ||||
-rw-r--r-- | fix-32bit-compat.patch | 59 |
3 files changed, 10 insertions, 76 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Thu Jul 13 15:52:32 UTC 2023 +# Fri Aug 18 16:33:36 UTC 2023 pkgbase = lib32-libgexiv2 pkgdesc = GObject-based wrapper around the Exiv2 library (32-bit) - pkgver = 0.14.1 - pkgrel = 3 + pkgver = 0.14.2 + pkgrel = 1 url = https://wiki.gnome.org/Projects/gexiv2 arch = x86_64 license = GPL2 @@ -12,13 +12,11 @@ pkgbase = lib32-libgexiv2 depends = lib32-exiv2 depends = lib32-glib2 depends = libgexiv2 - source = https://gitlab.gnome.org/GNOME/gexiv2/-/archive/gexiv2-0.14.1/gexiv2-gexiv2-0.14.1.tar.gz - source = https://gitlab.gnome.org/GNOME/gexiv2/-/commit/06adc8fb.patch + source = https://gitlab.gnome.org/GNOME/gexiv2/-/archive/gexiv2-0.14.2/gexiv2-gexiv2-0.14.2.tar.gz source = fix-32bit-compat.patch source = x86-linux-gnu - sha512sums = fbaf69681e031323ccc5233dbcf44e1fd66c23be29c4c731bec74417c3f4a01a3ac7af64cbd2e3ccfd8e2509d616eaa42d0a6a0eee8eab938db966ff0967afa2 - sha512sums = 8e8fbdfbf13bb95a63b1e39b56a5c3de217fa4a743b4dd59f9cd53e07d92fbf60adbb964f7765d1635ea957aae4796870d87d78e0f313be4a3d42e0b34f05f02 - sha512sums = 17145efdd464e196b92c9922920b73ff3bb1b7341c6c19c6443b6fcebce64c21e6e3ce4c425f7b76ad1d570d2104f48f6ec765762f6e64881b518a862c77e0e4 + sha512sums = 2657e72773afe74dd59268a03f74ed4d24bfa051e9ca405c13fa2cca75dd1482f92b4300ca5e1f033aba358a05582fe664922eaa319fa2b66cda8ef0e6dff8d3 + sha512sums = 6208952fd6babbf58f057764ba6e5beb97bc8c0a4495b6937374177fb53d4274192376548b35d9ff70beabc565c45dafa5ab9e5b246401b3ff461159bee7faec sha512sums = 23afdfc444563455a7a7ebccbc5e92e39bb2726d7785cd33ddbe856ea479a139778e5b816267025d5e183094fae040b0aaf6be5a166693879a102d5e6e859c3c pkgname = lib32-libgexiv2 @@ -4,8 +4,8 @@ pkgname=lib32-libgexiv2 _pkgbase=gexiv2 -pkgver=0.14.1 -pkgrel=3 +pkgver=0.14.2 +pkgrel=1 pkgdesc="GObject-based wrapper around the Exiv2 library (32-bit)" url="https://wiki.gnome.org/Projects/gexiv2" arch=('x86_64') @@ -13,17 +13,13 @@ license=('GPL2') depends=('lib32-exiv2' 'lib32-glib2' 'libgexiv2') makedepends=('meson' 'python-gobject') source=("https://gitlab.gnome.org/GNOME/${_pkgbase}/-/archive/${_pkgbase}-${pkgver}/${_pkgbase}-${_pkgbase}-${pkgver}.tar.gz" - "https://gitlab.gnome.org/GNOME/${_pkgbase}/-/commit/06adc8fb.patch" "fix-32bit-compat.patch" "x86-linux-gnu") -sha512sums=('fbaf69681e031323ccc5233dbcf44e1fd66c23be29c4c731bec74417c3f4a01a3ac7af64cbd2e3ccfd8e2509d616eaa42d0a6a0eee8eab938db966ff0967afa2' - '8e8fbdfbf13bb95a63b1e39b56a5c3de217fa4a743b4dd59f9cd53e07d92fbf60adbb964f7765d1635ea957aae4796870d87d78e0f313be4a3d42e0b34f05f02' - '17145efdd464e196b92c9922920b73ff3bb1b7341c6c19c6443b6fcebce64c21e6e3ce4c425f7b76ad1d570d2104f48f6ec765762f6e64881b518a862c77e0e4' +sha512sums=('2657e72773afe74dd59268a03f74ed4d24bfa051e9ca405c13fa2cca75dd1482f92b4300ca5e1f033aba358a05582fe664922eaa319fa2b66cda8ef0e6dff8d3' + '6208952fd6babbf58f057764ba6e5beb97bc8c0a4495b6937374177fb53d4274192376548b35d9ff70beabc565c45dafa5ab9e5b246401b3ff461159bee7faec' '23afdfc444563455a7a7ebccbc5e92e39bb2726d7785cd33ddbe856ea479a139778e5b816267025d5e183094fae040b0aaf6be5a166693879a102d5e6e859c3c') prepare() { - # Fix build with exiv2 0.28 - patch -d "${_pkgbase}-${_pkgbase}-${pkgver}" -p1 < 06adc8fb.patch patch -d "${_pkgbase}-${_pkgbase}-${pkgver}" -p1 < fix-32bit-compat.patch } @@ -41,4 +37,3 @@ package() { meson install -C "build" --destdir "$pkgdir" rm -r "$pkgdir/usr/include" } - diff --git a/fix-32bit-compat.patch b/fix-32bit-compat.patch index 491fc5ccf771..04a151e0bd85 100644 --- a/fix-32bit-compat.patch +++ b/fix-32bit-compat.patch @@ -22,64 +22,5 @@ index c67529e..53535d1 100644 #endif #if EXIV2_TEST_VERSION(0,27,99) -diff --git a/gexiv2/gexiv2-stream-io.cpp b/gexiv2/gexiv2-stream-io.cpp -index 9749edb..98952a2 100644 ---- a/gexiv2/gexiv2-stream-io.cpp -+++ b/gexiv2/gexiv2-stream-io.cpp -@@ -120,7 +120,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 56a03e5..e25df5c 100644 ---- a/gexiv2/gexiv2-stream-io.h -+++ b/gexiv2/gexiv2-stream-io.h -@@ -46,7 +46,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; - size_type tell() const override; --- -GitLab - - -From 45b0763a1e7bee1614542f31be7d6fa4f7ceb019 Mon Sep 17 00:00:00 2001 -From: psykose <alice@ayaya.dev> -Date: Thu, 15 Jun 2023 07:45:47 +0000 -Subject: [PATCH 2/2] fix floating point comparisons in tests - -asserting perfect float equality is not guaranteed to pass. in this case, it fails on x86 32-bit - -the correct way is to use 'almost' equal which takes epsilon into account. ---- - test/python/gexiv2.py | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -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' -- GitLab |