From bd033a1a2902a48784aa38cf275bfdfaeb521a69 Mon Sep 17 00:00:00 2001 From: Niels Kristian Bech Jensen Date: Fri, 24 May 2013 13:12:57 +1000 Subject: [PATCH] update package libzip --- index.html | 2 +- src/libzip-1-static_build.patch | 13 +++++++------ src/libzip.mk | 4 ++-- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/index.html b/index.html index e10f7d9d..7df375cf 100644 --- a/index.html +++ b/index.html @@ -1679,7 +1679,7 @@ aptitude -t squeeze-backports install cmake yasm libzip - 0.10.1 + 0.11.1 libzip diff --git a/src/libzip-1-static_build.patch b/src/libzip-1-static_build.patch index e3142633..c9d03b03 100644 --- a/src/libzip-1-static_build.patch +++ b/src/libzip-1-static_build.patch @@ -6,16 +6,17 @@ This is a quick&dirty fix. The bug is being discussed at http://www.nih.at/listarchive/libzip-discuss/msg00304.html ---- a/lib/zip.h 2012-03-15 10:28:05.000000000 +0100 -+++ b/lib/zip.h 2012-12-18 02:05:31.416621709 +0100 -@@ -37,8 +37,8 @@ +--- a/lib/zip.h 2013-03-19 11:09:51.000000000 +0100 ++++ b/lib/zip.h 2013-05-23 16:50:53.881403133 +0200 +@@ -37,9 +37,9 @@ #ifndef ZIP_EXTERN -#ifdef _WIN32 --#define ZIP_EXTERN __declspec(dllimport) +#ifdef _MSC_VER -+#define ZIP_EXTERN __declspec(dllexport) + #define ZIP_EXTERN __declspec(dllimport) +-#elif defined(__GNUC__) && __GNUC__ >= 4 ++#elif (defined(__GNUC__) && __GNUC__ >= 4) && !defined(_WIN32) + #define ZIP_EXTERN __attribute__ ((visibility ("default"))) #else #define ZIP_EXTERN - #endif diff --git a/src/libzip.mk b/src/libzip.mk index 1ca6a812..a5372b69 100644 --- a/src/libzip.mk +++ b/src/libzip.mk @@ -3,9 +3,9 @@ PKG := libzip $(PKG)_IGNORE := -$(PKG)_CHECKSUM := 04be811a1919e1063a1f5210671181b7b5416d45 +$(PKG)_CHECKSUM := 3c82cdc0de51f06d5e1c60f098d3d9cc0d48f8a7 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) -$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 +$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://www.nih.at/libzip/$($(PKG)_FILE) $(PKG)_DEPS := gcc zlib