mingw-w64-double-conversion: update to 3.1.0

3 files changed, 6 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2f8c904f95cb..9c724633c48f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mingw-w64-double-conversion
 	pkgdesc = Binary-decimal and decimal-binary routines for IEEE doubles (mingw-w64)
-	pkgver = 3.0.0
+	pkgver = 3.1.0
 	pkgrel = 1
 	url = https://github.com/google/double-conversion
 	arch = any
@@ -10,10 +10,8 @@ pkgbase = mingw-w64-double-conversion
 	options = !strip
 	options = !buildflags
 	options = staticlibs
-	source = double-conversion-3.0.0.tar.gz::https://github.com/google/double-conversion/archive/v3.0.0.tar.gz
-	source = fix-cmake-directory.patch
-	sha256sums = 152f15355242b6b1fbb4098fcd825bf08527eda0c65e8446939222a13f0b3915
-	sha256sums = a50cc9179d64abf081016b48100cd5dacb01b9fe1fe6b2765d25a8076a203b71
+	source = double-conversion-3.1.0.tar.gz::https://github.com/google/double-conversion/archive/3.1.0.tar.gz
+	sha256sums = aef5f528dab826b269b54766a4c2d179e361866c75717af529f91c56b4034665
 
 pkgname = mingw-w64-double-conversion
 
diff --git a/PKGBUILD b/PKGBUILD
index 06957850f8a4..c19726efccd1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=mingw-w64-double-conversion
 _pkgname=double-conversion
-pkgver=3.0.0
+pkgver=3.1.0
 pkgrel=1
 pkgdesc="Binary-decimal and decimal-binary routines for IEEE doubles (mingw-w64)"
 arch=(any)
@@ -11,18 +11,11 @@ license=(BSD)
 depends=('mingw-w64-crt')
 makedepends=('mingw-w64-cmake')
 options=('!strip' '!buildflags' 'staticlibs')
-source=("double-conversion-${pkgver}.tar.gz::https://github.com/google/double-conversion/archive/v${pkgver}.tar.gz"
-        "fix-cmake-directory.patch")
-sha256sums=('152f15355242b6b1fbb4098fcd825bf08527eda0c65e8446939222a13f0b3915'
-            'a50cc9179d64abf081016b48100cd5dacb01b9fe1fe6b2765d25a8076a203b71')
+source=("double-conversion-${pkgver}.tar.gz::https://github.com/google/double-conversion/archive/${pkgver}.tar.gz")
+sha256sums=('aef5f528dab826b269b54766a4c2d179e361866c75717af529f91c56b4034665')
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
-prepare() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/fix-cmake-directory.patch"
-}
-
 build() {
   cd "${srcdir}/${_pkgname}-${pkgver}"
   for _arch in ${_architectures}; do
diff --git a/fix-cmake-directory.patch b/fix-cmake-directory.patch
deleted file mode 100644
index 9b9196a11e60..000000000000
--- a/fix-cmake-directory.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Naur double-conversion-3.0.0.orig/CMakeLists.txt double-conversion-3.0.0/CMakeLists.txt
---- double-conversion-3.0.0.orig/CMakeLists.txt	2018-08-04 08:56:28.463976434 -0400
-+++ double-conversion-3.0.0/CMakeLists.txt	2018-08-04 08:57:01.667920208 -0400
-@@ -12,11 +12,7 @@
-   ${double-conversion_SOVERSION_MAJOR}.${double-conversion_SOVERSION_MINOR}.${double-conversion_SOVERSION_PATCH})
- 
- # set suffix for CMake files used for packaging
--if(WIN32 AND NOT CYGWIN)
--  set(INSTALL_CMAKE_DIR CMake)
--else()
--  set(INSTALL_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/double-conversion)
--endif()
-+set(INSTALL_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/double-conversion)
- 
- # Add src subdirectory
- add_subdirectory(double-conversion)