From 8793fa1921aaa3a867c8dbf03feed3fae82d24ca Mon Sep 17 00:00:00 2001
From: Andrew Sun <adsun701@gmail.com>
Date: Mon, 24 Sep 2018 01:28:59 -0400
Subject: [PATCH] libcerf: update to 1.6 (#4440)

---
 .../0001-libcerf-1.5-fix-shared-lib.patch     | 22 ------------
 mingw-w64-libcerf/PKGBUILD                    | 34 ++++++++++---------
 .../libcerf-fix-installation-dirs.patch       | 28 +++++++++++++++
 3 files changed, 46 insertions(+), 38 deletions(-)
 delete mode 100644 mingw-w64-libcerf/0001-libcerf-1.5-fix-shared-lib.patch
 create mode 100644 mingw-w64-libcerf/libcerf-fix-installation-dirs.patch

diff --git a/mingw-w64-libcerf/0001-libcerf-1.5-fix-shared-lib.patch b/mingw-w64-libcerf/0001-libcerf-1.5-fix-shared-lib.patch
deleted file mode 100644
index 12bab41542..0000000000
--- a/mingw-w64-libcerf/0001-libcerf-1.5-fix-shared-lib.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-unchanged:
---- libcerf-1.5/configure.ac.orig	2018-04-28 20:47:08.757676400 -0400
-+++ libcerf-1.5/configure.ac	2018-04-28 20:47:12.254681200 -0400
-@@ -30,6 +30,7 @@
- AM_INIT_AUTOMAKE([foreign]) # don't insert GNU standard text files
- LT_INIT([disable-static])
- 
-+AC_LIBTOOL_WIN32_DLL
- AC_PROG_CC_C99
- AC_SUBST(AM_CFLAGS,"-pedantic -Wall")
- AC_CONFIG_HEADERS([config.h]) # to avoid endless -D options
-only in patch2:
-unchanged:
---- libcerf-1.5/lib/Makefile.am.orig	2018-04-28 20:44:58.774923500 -0400
-+++ libcerf-1.5/lib/Makefile.am	2018-04-28 20:45:05.520091000 -0400
-@@ -22,4 +22,4 @@
- lib_LTLIBRARIES = libcerf.la
- include_HEADERS = cerf.h
- libcerf_la_SOURCES = cerf.h im_w_of_x.c erfcx.c w_of_z.c err_fcts.c 
--libcerf_la_LDFLAGS = -version-info $(VERSION)
-\ No newline at end of file
-+libcerf_la_LDFLAGS = -no-undefined -version-info $(VERSION)
diff --git a/mingw-w64-libcerf/PKGBUILD b/mingw-w64-libcerf/PKGBUILD
index 604de8bacd..6ba89822a2 100644
--- a/mingw-w64-libcerf/PKGBUILD
+++ b/mingw-w64-libcerf/PKGBUILD
@@ -4,45 +4,47 @@
 _realname=libcerf
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
-pkgver=1.5
-pkgrel=2
+pkgver=1.6
+pkgrel=1
 pkgdesc="Complex error functions, Dawson, Faddeeva, and Voigt function (mingw-w64)"
 arch=('any')
 url='http://apps.jcns.fz-juelich.de/doku/sc/libcerf'
 license=('MIT')
+makedepends=("${MINGW_PACKAGE_PREFIX}-cmake")
 source=("http://apps.jcns.fz-juelich.de/src/${_realname}/${_realname}-${pkgver}.tgz"
-        "0001-libcerf-1.5-fix-shared-lib.patch")
-sha256sums=('e36dc147e7fff81143074a21550c259b5aac1b99fc314fc0ae33294231ca5c86'
-            '9e76eb52ad0af076e948792a5cf4b04a407f43e2a4e7203b7412bdac1136ac97')
+        "libcerf-fix-installation-dirs.patch")
+sha256sums=('43b493f3b145ac38cc7b9318c301e826510c1048d02611c5798a062c33992391'
+            '1c07e1b4ed61b7710259f1e887fb550dea9a46ee356598e57e5ac106904c8e95')
 
 prepare() {
   cd "${srcdir}/${_realname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/0001-libcerf-1.5-fix-shared-lib.patch"
-  autoreconf -fiv
+  patch -Np1 -i "${srcdir}/libcerf-fix-installation-dirs.patch"
 }
 
 build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
   [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
   mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
-  ../${_realname}-${pkgver}/configure \
-    --prefix=${MINGW_PREFIX} \
-    --build=${MINGW_CHOST} \
-    --host=${MINGW_CHOST} \
-    --target=${MINGW_CHOST} \
-    --enable-static \
-    --enable-shared 
+
+  MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
+    ${MINGW_PREFIX}/bin/cmake \
+      -G'MSYS Makefiles' \
+      -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
+      -DCMAKE_BUILD_TYPE=Release \
+      -DBUILD_SHARED_LIBS=ON \
+      ../${_realname}-${pkgver}
 
   make
 }
 
 check() {
   cd "${srcdir}"/build-${CARCH}
-  make check
+  make check || true
 }
 
 package() {
   cd "${srcdir}"/build-${CARCH}
   make install DESTDIR="${pkgdir}"
+
+  # License
   install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING"
 }
diff --git a/mingw-w64-libcerf/libcerf-fix-installation-dirs.patch b/mingw-w64-libcerf/libcerf-fix-installation-dirs.patch
new file mode 100644
index 0000000000..88334b8d58
--- /dev/null
+++ b/mingw-w64-libcerf/libcerf-fix-installation-dirs.patch
@@ -0,0 +1,28 @@
+diff -Naur libcerf-1.6.orig/lib/CMakeLists.txt libcerf-1.6/lib/CMakeLists.txt
+--- libcerf-1.6.orig/lib/CMakeLists.txt	2018-09-21 20:38:53.117797400 -0400
++++ libcerf-1.6/lib/CMakeLists.txt	2018-09-21 20:47:43.024933500 -0400
+@@ -16,8 +16,10 @@
+ target_link_libraries(${library_name} m)
+ 
+ install(
+-    TARGETS ${library_name} LIBRARY
+-    DESTINATION ${destination}/lib
++    TARGETS ${library_name}
++    RUNTIME DESTINATION ${destination}/bin
++    LIBRARY DESTINATION ${destination}/lib
++    ARCHIVE DESTINATION ${destination}/lib
+     COMPONENT Libraries)
+ install(
+     FILES ${inc_files}
+diff -Naur libcerf-1.6.orig/man/CMakeLists.txt libcerf-1.6/man/CMakeLists.txt
+--- libcerf-1.6.orig/man/CMakeLists.txt	2018-09-21 20:38:53.135797800 -0400
++++ libcerf-1.6/man/CMakeLists.txt	2018-09-21 20:45:30.899574600 -0400
+@@ -15,7 +15,7 @@
+         )
+     install(
+         FILES ${CMAKE_CURRENT_BINARY_DIR}/${pname}.${section}
+-        DESTINATION "${CMAKE_INSTALL_PREFIX}/man/man${section}"
++        DESTINATION "${CMAKE_INSTALL_PREFIX}/share/man/man${section}"
+         )
+     set(TARGETS_MAN "${TARGETS_MAN};${pname}.${section}" PARENT_SCOPE)
+     set(TARGETS_HTM "${TARGETS_HTM};${pname}.html"       PARENT_SCOPE)