[arch-commits] Commit in lensfun/trunk (PKGBUILD)

[Antonio Rojas]

    Date: Saturday, November 11, 2017 @ 11:46:47
  Author: arojas
Revision: 309507

Workaroung GCC6 null pointer check optimizations (FS#56180)

Modified:
  lensfun/trunk/PKGBUILD

----------+
 PKGBUILD |   16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-11-11 11:46:36 UTC (rev 309506)
+++ PKGBUILD	2017-11-11 11:46:47 UTC (rev 309507)
@@ -3,23 +3,26 @@
 
 pkgname=lensfun
 pkgver=0.3.2
-pkgrel=3
+pkgrel=5
 pkgdesc="Database of photographic lenses and a library that allows advanced access to the database"
 arch=(i686 x86_64)
 url="https://lensfun.sourceforge.net"
 license=('LGPL3')
-depends=('glibc' 'glib2')
+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-fix-python-install-dir.patch)
-sha1sums=('1d978b15aa7304d66a4931fa37ca9f8f89396c16'
-          '7bf2b17d0fb85800857eaf990541ea9eccca2f77')
+        lensfun-fix-python-install-dir.patch lensfun-crash-destructor.patch)
+sha256sums=('ae8bcad46614ca47f5bda65b00af4a257a9564a61725df9c74cb260da544d331'
+            '11e0f9ce2d5c5fef4373ce6adbb19dbcbcd8a10efa02447db9c92b03798d5654'
+            'ee09a0f781f7ba502c5b904ad54fb10bb655b85a1ac49274f1dd7bfee1e4aabf')
 
 prepare() {
     cd $pkgname-$pkgver
   # Fix python module install path
     patch -p1 -i ../lensfun-fix-python-install-dir.patch
+  # Fix crash on lfModifier destructor https://sourceforge.net/p/lensfun/mailman/message/35956131/
+    patch -p1 -i ../lensfun-crash-destructor.patch
 }
 
 build() {
@@ -27,7 +30,8 @@
     cmake . \
       -DCMAKE_INSTALL_PREFIX=/usr \
       -DCMAKE_BUILD_TYPE=Release \
-      -DCMAKE_INSTALL_LIBDIR=lib
+      -DCMAKE_INSTALL_LIBDIR=lib \
+      -DCMAKE_CXX_FLAGS="${CXXFLAGS} -fno-delete-null-pointer-checks"
     make all
 }