summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libraries/double-conversion/double-conversion.SlackBuild7
-rw-r--r--libraries/double-conversion/double-conversion.info6
-rw-r--r--libraries/double-conversion/double-conversion.patch29
3 files changed, 5 insertions, 37 deletions
diff --git a/libraries/double-conversion/double-conversion.SlackBuild b/libraries/double-conversion/double-conversion.SlackBuild
index d7b288668a..a27d8514ab 100644
--- a/libraries/double-conversion/double-conversion.SlackBuild
+++ b/libraries/double-conversion/double-conversion.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=double-conversion
-VERSION=${VERSION:-1.1.5}
+VERSION=${VERSION:-3.0.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -69,15 +69,12 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-patch -p1 < $CWD/double-conversion.patch
-
mkdir -p build
cd build
cmake \
-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-DCMAKE_INSTALL_PREFIX=/usr \
- -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-DINSTALL_CMAKE_DIR=/usr/lib${LIBDIRSUFFIX}/cmake \
-DCMAKE_BUILD_TYPE=Release ..
make
@@ -88,7 +85,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -ra AUTHORS COPYING LICENSE README Changelog test $PKG/usr/doc/$PRGNAM-$VERSION
+cp -ra AUTHORS BUILD COPYING Changelog LICENSE README.md WORKSPACE $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/libraries/double-conversion/double-conversion.info b/libraries/double-conversion/double-conversion.info
index b726b031e9..abc95f0c75 100644
--- a/libraries/double-conversion/double-conversion.info
+++ b/libraries/double-conversion/double-conversion.info
@@ -1,8 +1,8 @@
PRGNAM="double-conversion"
-VERSION="1.1.5"
+VERSION="3.0.0"
HOMEPAGE="https://github.com/google/double-conversion/"
-DOWNLOAD="https://github.com/google/double-conversion/archive/v1.1.5/double-conversion-1.1.5.tar.gz"
-MD5SUM="f7c62594d7ecfbc4421da32bc341a919"
+DOWNLOAD="https://github.com/google/double-conversion/archive/v3.0.0/double-conversion-3.0.0.tar.gz"
+MD5SUM="7c8e8bcaae6c9def83b7ee7396f18e5e"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/libraries/double-conversion/double-conversion.patch b/libraries/double-conversion/double-conversion.patch
deleted file mode 100644
index 5c57bcb814..0000000000
--- a/libraries/double-conversion/double-conversion.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -ur double-conversion-1.1.5.old/CMakeLists.txt double-conversion-1.1.5/CMakeLists.txt
---- double-conversion-1.1.5.old/CMakeLists.txt 2016-12-12 20:35:31.150277793 -0200
-+++ double-conversion-1.1.5/CMakeLists.txt 2016-12-12 20:55:00.341337905 -0200
-@@ -10,12 +10,6 @@
- set(INSTALL_BIN_DIR CACHE PATH "Installation directory for libraries")
- set(INSTALL_LIB_DIR CACHE PATH "Installation directory for libraries")
- set(INSTALL_INCLUDE_DIR CACHE PATH "Installation directory for include")
--# set suffix for CMake files used for packaging
--if(WIN32 AND NOT CYGWIN)
-- set(INSTALL_CMAKE_DIR CMake)
--else()
-- set(INSTALL_CMAKE_DIR lib/CMake/double-conversion)
--endif()
-
- # Make relative paths absolute (needed later)
- foreach(p LIB BIN INCLUDE CMAKE)
-diff -ur double-conversion-1.1.5.old/src/CMakeLists.txt double-conversion-1.1.5/src/CMakeLists.txt
---- double-conversion-1.1.5.old/src/CMakeLists.txt 2016-12-12 20:35:31.151277793 -0200
-+++ double-conversion-1.1.5/src/CMakeLists.txt 2016-12-12 21:13:30.683045433 -0200
-@@ -36,7 +36,7 @@
- install(TARGETS double-conversion
- EXPORT double-conversionLibraryDepends
- RUNTIME DESTINATION "${INSTALL_BIN_DIR}" COMPONENT bin
-- LIBRARY DESTINATION "${INSTALL_LIB_DIR}/lib" COMPONENT shlib
-- ARCHIVE DESTINATION "${INSTALL_LIB_DIR}/lib" COMPONENT lib
-+ LIBRARY DESTINATION "${INSTALL_LIB_DIR}/lib${LIB_SUFFIX}" COMPONENT shlib
-+ ARCHIVE DESTINATION "${INSTALL_LIB_DIR}/lib${LIB_SUFFIX}" COMPONENT lib
- PUBLIC_HEADER DESTINATION "${INSTALL_INCLUDE_DIR}/include/double-conversion"
- COMPONENT dev)