Date: Thursday, December 2, 2021 @ 19:18:26 Author: foutrelis Revision: 430359
archrelease: copy trunk to staging-x86_64 Added: lensfun/repos/staging-x86_64/PKGBUILD (from rev 430358, lensfun/trunk/PKGBUILD) lensfun/repos/staging-x86_64/lensfun-segfault.patch (from rev 430358, lensfun/trunk/lensfun-segfault.patch) Deleted: lensfun/repos/staging-x86_64/PKGBUILD lensfun/repos/staging-x86_64/lensfun-segfault.patch ------------------------+ PKGBUILD | 68 ++++++++++++------------- lensfun-segfault.patch | 126 +++++++++++++++++++++++------------------------ 2 files changed, 97 insertions(+), 97 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2021-12-02 19:18:22 UTC (rev 430358) +++ PKGBUILD 2021-12-02 19:18:26 UTC (rev 430359) @@ -1,34 +0,0 @@ -# Maintainer: Tobias Powalowski <tp...@archlinux.org> - -pkgname=lensfun -pkgver=0.3.95 -pkgrel=5 -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://sourceforge.net/projects/lensfun/files/${pkgver}/${pkgname}-${pkgver}.tar.gz" - lensfun-segfault.patch) -sha256sums=('82c29c833c1604c48ca3ab8a35e86b7189b8effac1b1476095c0529afb702808' - '090804382c134b813693770383d21289a74f2b7e221127f2634abf3d24b003da') - -prepare() { - cd $pkgname-$pkgver - patch -p1 -i ../lensfun-segfault.patch # Fix null pointer dereference # https://github.com/lensfun/lensfun/issues/1132 -} - -build() { - cd $pkgname-$pkgver - cmake . \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_CXX_FLAGS="${CXXFLAGS} -fno-delete-null-pointer-checks" - make all -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install -} Copied: lensfun/repos/staging-x86_64/PKGBUILD (from rev 430358, lensfun/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2021-12-02 19:18:26 UTC (rev 430359) @@ -0,0 +1,34 @@ +# Maintainer: Tobias Powalowski <tp...@archlinux.org> + +pkgname=lensfun +pkgver=0.3.95 +pkgrel=6 +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://sourceforge.net/projects/lensfun/files/${pkgver}/${pkgname}-${pkgver}.tar.gz" + lensfun-segfault.patch) +sha256sums=('82c29c833c1604c48ca3ab8a35e86b7189b8effac1b1476095c0529afb702808' + '090804382c134b813693770383d21289a74f2b7e221127f2634abf3d24b003da') + +prepare() { + cd $pkgname-$pkgver + patch -p1 -i ../lensfun-segfault.patch # Fix null pointer dereference # https://github.com/lensfun/lensfun/issues/1132 +} + +build() { + cd $pkgname-$pkgver + cmake . \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_CXX_FLAGS="${CXXFLAGS} -fno-delete-null-pointer-checks" + make all +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} Deleted: lensfun-segfault.patch =================================================================== --- lensfun-segfault.patch 2021-12-02 19:18:22 UTC (rev 430358) +++ lensfun-segfault.patch 2021-12-02 19:18:26 UTC (rev 430359) @@ -1,63 +0,0 @@ -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; - } - Copied: lensfun/repos/staging-x86_64/lensfun-segfault.patch (from rev 430358, lensfun/trunk/lensfun-segfault.patch) =================================================================== --- lensfun-segfault.patch (rev 0) +++ lensfun-segfault.patch 2021-12-02 19:18:26 UTC (rev 430359) @@ -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; + } +