[arch-commits] Commit in lensfun/repos (3 files)

[Antonio Rojas]

    Date: Wednesday, February 23, 2022 @ 07:37:25
  Author: arojas
Revision: 437989

archrelease: copy trunk to staging-x86_64

Added:
  lensfun/repos/staging-x86_64/
  lensfun/repos/staging-x86_64/PKGBUILD
    (from rev 437988, lensfun/trunk/PKGBUILD)
  lensfun/repos/staging-x86_64/lensfun-segfault.patch
    (from rev 437988, lensfun/trunk/lensfun-segfault.patch)

------------------------+
 PKGBUILD               |   26 +++++++++++++++++++
 lensfun-segfault.patch |   63 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 89 insertions(+)

Copied: lensfun/repos/staging-x86_64/PKGBUILD (from rev 437988, lensfun/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2022-02-23 07:37:25 UTC (rev 437989)
@@ -0,0 +1,26 @@
+# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+
+pkgname=lensfun
+pkgver=0.3.3
+pkgrel=1
+epoch=1
+pkgdesc='Database of photographic lenses and a library that allows advanced access to the database'
+arch=(x86_64)
+url='https://lensfun.github.io/'
+license=(LGPL3)
+depends=(glib2)
+makedepends=(python libpng doxygen cmake)
+optdepends=('python: for lensfun-update-data and lensfun-add-adapter')
+source=(https://github.com/lensfun/lensfun/archive/v$pkgver/$pkgname-$pkgver.tar.gz)
+sha256sums=('57ba5a0377f24948972339e18be946af12eda22b7c707eb0ddd26586370f6765')
+
+build() {
+  cmake -B build -S $pkgname-$pkgver \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_CXX_FLAGS="$CXXFLAGS -fno-delete-null-pointer-checks"
+  cmake --build build  
+}
+
+package() {
+  DESTDIR="$pkgdir" cmake --install build
+}

Copied: lensfun/repos/staging-x86_64/lensfun-segfault.patch (from rev 437988, lensfun/trunk/lensfun-segfault.patch)
===================================================================
--- staging-x86_64/lensfun-segfault.patch	                        (rev 0)
+++ staging-x86_64/lensfun-segfault.patch	2022-02-23 07:37:25 UTC (rev 437989)
@@ -0,0 +1,63 @@
+diff --git a/libs/lensfun/lens.cpp b/libs/lensfun/lens.cpp
+index 52b76658..b8430609 100644
+--- a/libs/lensfun/lens.cpp
++++ b/libs/lensfun/lens.cpp
+@@ -66,9 +66,10 @@ lfLens::lfLens (const lfLens &other)
+     Mounts = NULL;
+     MountNames.clear();
+     const char* const* otherMounts = other.GetMountNames();
+-    for (int i = 0; otherMounts[i]; i++)
+-        AddMount(otherMounts[i]);
+-
++    if (otherMounts) {
++        for (int i = 0; otherMounts[i]; i++)
++            AddMount(otherMounts[i]);
++    }
+     for (auto *calibset : other.Calibrations)
+         Calibrations.push_back(new lfLensCalibrationSet(*calibset));
+ 
+@@ -96,9 +97,10 @@ lfLens &lfLens::operator = (const lfLens &other)
+     Mounts = NULL;
+     MountNames.clear();
+     const char* const* otherMounts = other.GetMountNames();
+-    for (int i = 0; otherMounts[i]; i++)
+-        AddMount(otherMounts[i]);
+-
++    if (otherMounts) {
++        for (int i = 0; otherMounts[i]; i++)
++            AddMount(otherMounts[i]);
++    }
+     for (auto *calibset : Calibrations)
+         delete calibset;
+     Calibrations.clear();
+diff --git a/libs/lensfun/mount.cpp b/libs/lensfun/mount.cpp
+index bd875baa..86f667cb 100644
+--- a/libs/lensfun/mount.cpp
++++ b/libs/lensfun/mount.cpp
+@@ -28,8 +28,10 @@ lfMount::lfMount (const lfMount &other)
+ 
+     MountCompat.clear();
+     const char* const* otherMounts = other.GetCompats();
+-    for (int i = 0; otherMounts[i]; i++)
+-        AddCompat(otherMounts[i]);
++    if (otherMounts) {
++        for (int i = 0; otherMounts[i]; i++)
++            AddCompat(otherMounts[i]);
++    }
+ }
+ 
+ lfMount &lfMount::operator = (const lfMount &other)
+@@ -40,9 +42,10 @@ lfMount &lfMount::operator = (const lfMount &other)
+ 
+     MountCompat.clear();
+     const char* const* otherMounts = other.GetCompats();
+-    for (int i = 0; otherMounts[i]; i++)
+-        AddCompat(otherMounts[i]);
+-
++    if (otherMounts) {
++        for (int i = 0; otherMounts[i]; i++)
++            AddCompat(otherMounts[i]);
++    }
+     return *this;
+ }
+