[arch-commits] Commit in libfilezilla/trunk (3 files)

[Florian Pritz]

    Date: Wednesday, June 14, 2017 @ 18:00:46
  Author: bluewind
Revision: 236785

upgpkg: libfilezilla 0.9.2-1

upstream update

Added:
  libfilezilla/trunk/cppunit-pkgconfig.patch
  libfilezilla/trunk/random_bytes.patch
Modified:
  libfilezilla/trunk/PKGBUILD

-------------------------+
 PKGBUILD                |   17 ++++++++++++++---
 cppunit-pkgconfig.patch |   27 +++++++++++++++++++++++++++
 random_bytes.patch      |   11 +++++++++++
 3 files changed, 52 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-06-14 17:10:09 UTC (rev 236784)
+++ PKGBUILD	2017-06-14 18:00:46 UTC (rev 236785)
@@ -2,7 +2,7 @@
 # Contributor: Martchus <martchus at gmx.net>
 
 pkgname=libfilezilla
-pkgver=0.9.1
+pkgver=0.9.2
 pkgrel=1
 pkgdesc="Small and modern C++ library, offering some basic functionality to build high-performing, platform-independent programs"
 arch=('i686' 'x86_64')
@@ -10,8 +10,17 @@
 license=('GPL')
 depends=('gcc-libs')
 checkdepends=('cppunit')
-source=("http://download.filezilla-project.org/libfilezilla/libfilezilla-$pkgver.tar.bz2")
+source=("http://download.filezilla-project.org/libfilezilla/libfilezilla-$pkgver.tar.bz2"
+cppunit-pkgconfig.patch random_bytes.patch)
 
+prepare() {
+  cd "${srcdir}/$pkgname-$pkgver"
+
+  patch -p1 -i "$srcdir/cppunit-pkgconfig.patch"
+  patch -p1 -i "$srcdir/random_bytes.patch"
+  autoreconf
+}
+
 build() {
   cd "${srcdir}/$pkgname-$pkgver"
   ./configure \
@@ -30,4 +39,6 @@
   cd "${srcdir}/$pkgname-$pkgver"
   make DESTDIR="${pkgdir}" install
 }
-md5sums=('4676304b048869ab6ac6ae09a1ab29f9')
+md5sums=('d52a0e7229efb3c9fafc8a2b649d665d'
+         '0e3c4b6bfe11f7f9dddbc033c23c8c12'
+         '19beb164bda0f853678629b24865bdce')

Added: cppunit-pkgconfig.patch
===================================================================
--- cppunit-pkgconfig.patch	                        (rev 0)
+++ cppunit-pkgconfig.patch	2017-06-14 18:00:46 UTC (rev 236785)
@@ -0,0 +1,27 @@
+--- libfilezilla-0.9.2/m4/cppunit.m4.ddd	2015-11-02 14:47:31.000000000 +0100
++++ libfilezilla-0.9.2/m4/cppunit.m4	2017-06-06 19:08:00.329550653 +0200
+@@ -29,12 +29,14 @@ AC_ARG_WITH(cppunit-exec-prefix,[  --wit
+   no_cppunit=""
+   if test "$CPPUNIT_CONFIG" = "no" ; then
+     AC_MSG_RESULT(no)
+-    no_cppunit=yes
++    CPPUNIT_CFLAGS=`pkg-config --cflags cppunit`
++    CPPUNIT_LIBS=`pkg-config --libs cppunit`
++    cppunit_version=`pkg-config --modversion cppunit`
+   else
+     CPPUNIT_CFLAGS=`$CPPUNIT_CONFIG --cflags`
+     CPPUNIT_LIBS=`$CPPUNIT_CONFIG --libs`
+     cppunit_version=`$CPPUNIT_CONFIG --version`
+-
++  fi
+     cppunit_major_version=`echo $cppunit_version | \
+            sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+     cppunit_minor_version=`echo $cppunit_version | \
+@@ -74,7 +76,6 @@ AC_ARG_WITH(cppunit-exec-prefix,[  --wit
+       AC_MSG_RESULT(no)
+       no_cppunit=yes
+     fi
+-  fi
+ 
+   if test "x$no_cppunit" = x ; then
+      ifelse([$2], , :, [$2])

Added: random_bytes.patch
===================================================================
--- random_bytes.patch	                        (rev 0)
+++ random_bytes.patch	2017-06-14 18:00:46 UTC (rev 236785)
@@ -0,0 +1,11 @@
+--- libfilezilla-0.9.2/lib/libfilezilla/util.hpp.orig	2017-05-25 20:35:14.000000000 +0200
++++ libfilezilla-0.9.2/lib/libfilezilla/util.hpp	2017-06-06 20:53:40.457650687 +0200
+@@ -28,7 +28,7 @@ int64_t FZ_PUBLIC_SYMBOL random_number(i
+ 
+ /** \brief Get random uniformly distributed bytes
+  */
+-std::vector<uint8_t> random_bytes(size_t size);
++std::vector<uint8_t> FZ_PUBLIC_SYMBOL random_bytes(size_t size);
+ 
+ }
+