From a53f414ea86477a8592aca0843b7fcd9ab60ab2b Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Tue, 22 Apr 2014 11:52:13 +0000
Subject: main/yajl: upgrade to 2.1.0

---
 main/yajl/APKBUILD   | 10 +++++-----
 main/yajl/libm.patch | 45 ---------------------------------------------
 2 files changed, 5 insertions(+), 50 deletions(-)
 delete mode 100644 main/yajl/libm.patch

(limited to 'main')

diff --git a/main/yajl/APKBUILD b/main/yajl/APKBUILD
index c6e63aea5..99d6e1855 100644
--- a/main/yajl/APKBUILD
+++ b/main/yajl/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=yajl
-pkgver=2.0.4
+pkgver=2.1.0
 pkgrel=0
 pkgdesc="Yet Another JSON Library (YAJL)"
 url="http://lloyd.github.com/yajl/"
@@ -10,8 +10,7 @@ depends=""
 makedepends="cmake"
 install=""
 subpackages="$pkgname-dev $pkgname-tools"
-source="http://dev.alpinelinux.org/archive/yajl/yajl-$pkgver.tar.gz
-	libm.patch"
+source="http://dev.alpinelinux.org/archive/yajl/yajl-$pkgver.tar.gz"
 
 _builddir="$srcdir"/yajl-$pkgver
 
@@ -71,5 +70,6 @@ tools() {
 }
 
 
-md5sums="2e66ad7d668423875aeeb4c1b206e385  yajl-2.0.4.tar.gz
-64ae0008a567c3246ce805b6495d4c54  libm.patch"
+md5sums="f4a2bfee856245a66a25ceea14658be4  yajl-2.1.0.tar.gz"
+sha256sums="b03bb1283e6b86dfff2aac86d3a92dee3969c03ddd59217cacf8b4aa191ffa49  yajl-2.1.0.tar.gz"
+sha512sums="857101d8b99be22bde3c21ec1921ffcbbcd14735ff420728855e064631e6c4c4ceaec40b0e5c8b6d8cba1b36fe1ace0738f8e917e2f992107559b17ddf73de50  yajl-2.1.0.tar.gz"
diff --git a/main/yajl/libm.patch b/main/yajl/libm.patch
deleted file mode 100644
index 9d22369ec..000000000
--- a/main/yajl/libm.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt
-index 29cee35..387366e 100644
---- a/example/CMakeLists.txt
-+++ b/example/CMakeLists.txt
-@@ -20,4 +20,4 @@ LINK_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/lib)
- 
- ADD_EXECUTABLE(parse_config ${SRCS})
- 
--TARGET_LINK_LIBRARIES(parse_config yajl_s)
-+TARGET_LINK_LIBRARIES(parse_config yajl_s m)
-diff --git a/reformatter/CMakeLists.txt b/reformatter/CMakeLists.txt
-index da4032b..d48e218 100644
---- a/reformatter/CMakeLists.txt
-+++ b/reformatter/CMakeLists.txt
-@@ -26,7 +26,7 @@ LINK_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/lib)
- 
- ADD_EXECUTABLE(json_reformat ${SRCS})
- 
--TARGET_LINK_LIBRARIES(json_reformat yajl_s)
-+TARGET_LINK_LIBRARIES(json_reformat yajl_s m)
- 
- # copy the binary into the output directory
- GET_TARGET_PROPERTY(binPath json_reformat LOCATION)
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index e36b736..85083bf 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -38,6 +38,7 @@ SET(LIBRARY_OUTPUT_PATH ${libDir})
- ADD_LIBRARY(yajl_s STATIC ${SRCS} ${HDRS} ${PUB_HDRS})
- 
- ADD_LIBRARY(yajl SHARED ${SRCS} ${HDRS} ${PUB_HDRS})
-+TARGET_LINK_LIBRARIES(yajl m)
- 
- #### setup shared library version number
- SET_TARGET_PROPERTIES(yajl PROPERTIES
-diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
-index 153288c..c5fa974 100644
---- a/test/CMakeLists.txt
-+++ b/test/CMakeLists.txt
-@@ -20,4 +20,4 @@ LINK_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/lib)
- 
- ADD_EXECUTABLE(yajl_test ${SRCS})
- 
--TARGET_LINK_LIBRARIES(yajl_test yajl_s)
-+TARGET_LINK_LIBRARIES(yajl_test yajl_s m)
-- 
cgit v1.2.3