[arch-commits] Commit in lensfun/repos/extra-x86_64 (4 files)

Antonio Rojas arojas at archlinux.org
Sat Nov 11 11:47:08 UTC 2017


    Date: Saturday, November 11, 2017 @ 11:47:07
  Author: arojas
Revision: 309509

archrelease: copy trunk to extra-x86_64

Added:
  lensfun/repos/extra-x86_64/PKGBUILD
    (from rev 309507, lensfun/trunk/PKGBUILD)
  lensfun/repos/extra-x86_64/lensfun-fix-python-install-dir.patch
    (from rev 309507, lensfun/trunk/lensfun-fix-python-install-dir.patch)
Deleted:
  lensfun/repos/extra-x86_64/PKGBUILD
  lensfun/repos/extra-x86_64/lensfun-fix-python-install-dir.patch

--------------------------------------+
 PKGBUILD                             |   77 +++++++++++++++++----------------
 lensfun-fix-python-install-dir.patch |   54 +++++++++++------------
 2 files changed, 68 insertions(+), 63 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2017-11-11 11:47:06 UTC (rev 309508)
+++ PKGBUILD	2017-11-11 11:47:07 UTC (rev 309509)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
-
-pkgname=lensfun
-pkgver=0.3.2
-pkgrel=3
-pkgdesc="Database of photographic lenses and a library that allows advanced access to the database"
-arch=(i686 x86_64)
-url="http://lensfun.sourceforge.net"
-license=('LGPL3')
-depends=('glibc' 'glib2')
-makedepends=('python' 'libpng' 'doxygen' 'cmake')
-source=("http://sourceforge.net/projects/lensfun/files/${pkgver}/${pkgname}-${pkgver}.tar.gz"
-        lensfun-fix-python-install-dir.patch)
-sha1sums=('1d978b15aa7304d66a4931fa37ca9f8f89396c16'
-          '7bf2b17d0fb85800857eaf990541ea9eccca2f77')
-
-prepare() {
-    cd $pkgname-$pkgver
-  # Fix python module install path
-    patch -p1 -i ../lensfun-fix-python-install-dir.patch
-}
-
-build() {
-    cd ${pkgname}-${pkgver}
-    cmake . \
-      -DCMAKE_INSTALL_PREFIX=/usr \
-      -DCMAKE_BUILD_TYPE=Release \
-      -DCMAKE_INSTALL_LIBDIR=lib
-    make all
-}
-
-package() {
-    cd ${pkgname}-${pkgver}
-    make DESTDIR="$pkgdir" install
-}

Copied: lensfun/repos/extra-x86_64/PKGBUILD (from rev 309507, lensfun/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2017-11-11 11:47:07 UTC (rev 309509)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+
+pkgname=lensfun
+pkgver=0.3.2
+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=('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 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() {
+    cd ${pkgname}-${pkgver}
+    cmake . \
+      -DCMAKE_INSTALL_PREFIX=/usr \
+      -DCMAKE_BUILD_TYPE=Release \
+      -DCMAKE_INSTALL_LIBDIR=lib \
+      -DCMAKE_CXX_FLAGS="${CXXFLAGS} -fno-delete-null-pointer-checks"
+    make all
+}
+
+package() {
+    cd ${pkgname}-${pkgver}
+    make DESTDIR="$pkgdir" install
+}

Deleted: lensfun-fix-python-install-dir.patch
===================================================================
--- lensfun-fix-python-install-dir.patch	2017-11-11 11:47:06 UTC (rev 309508)
+++ lensfun-fix-python-install-dir.patch	2017-11-11 11:47:07 UTC (rev 309509)
@@ -1,27 +0,0 @@
-From 3b46bb2a4eada7f29e016d586229782f6d1c35bb Mon Sep 17 00:00:00 2001
-From: Pino Toscano <toscano.pino at tiscali.it>
-Date: Sat, 9 Jan 2016 11:47:37 +0100
-Subject: [PATCH] cmake: fix DESTDIR installation for python
-
-When running `setup.py install`, respect the value of the DESTDIR
-environment variable so staged installs (used by distros, for example)
-work.
----
- apps/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt
-index 70c77fd..2f6f8f1 100644
---- a/apps/CMakeLists.txt
-+++ b/apps/CMakeLists.txt
-@@ -42,5 +42,5 @@ IF(PYTHON)
-     IF(NOT DEFINED SETUP_PY_INSTALL_PREFIX)
-       SET(SETUP_PY_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
-     ENDIF()
--    INSTALL(CODE "execute_process(COMMAND ${PYTHON} ${SETUP_PY} install --prefix=${SETUP_PY_INSTALL_PREFIX})")
-+    INSTALL(CODE "execute_process(COMMAND ${PYTHON} ${SETUP_PY} install --prefix=\$ENV{DESTDIR}${SETUP_PY_INSTALL_PREFIX})")
- ENDIF(PYTHON)
--- 
-2.6.4
-
-

Copied: lensfun/repos/extra-x86_64/lensfun-fix-python-install-dir.patch (from rev 309507, lensfun/trunk/lensfun-fix-python-install-dir.patch)
===================================================================
--- lensfun-fix-python-install-dir.patch	                        (rev 0)
+++ lensfun-fix-python-install-dir.patch	2017-11-11 11:47:07 UTC (rev 309509)
@@ -0,0 +1,27 @@
+From 3b46bb2a4eada7f29e016d586229782f6d1c35bb Mon Sep 17 00:00:00 2001
+From: Pino Toscano <toscano.pino at tiscali.it>
+Date: Sat, 9 Jan 2016 11:47:37 +0100
+Subject: [PATCH] cmake: fix DESTDIR installation for python
+
+When running `setup.py install`, respect the value of the DESTDIR
+environment variable so staged installs (used by distros, for example)
+work.
+---
+ apps/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt
+index 70c77fd..2f6f8f1 100644
+--- a/apps/CMakeLists.txt
++++ b/apps/CMakeLists.txt
+@@ -42,5 +42,5 @@ IF(PYTHON)
+     IF(NOT DEFINED SETUP_PY_INSTALL_PREFIX)
+       SET(SETUP_PY_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
+     ENDIF()
+-    INSTALL(CODE "execute_process(COMMAND ${PYTHON} ${SETUP_PY} install --prefix=${SETUP_PY_INSTALL_PREFIX})")
++    INSTALL(CODE "execute_process(COMMAND ${PYTHON} ${SETUP_PY} install --prefix=\$ENV{DESTDIR}${SETUP_PY_INSTALL_PREFIX})")
+ ENDIF(PYTHON)
+-- 
+2.6.4
+
+


More information about the arch-commits mailing list