diff options
| -rw-r--r-- | src/gsl.mk | 4 | ||||
| -rw-r--r-- | src/libzip-1-fixes.patch | 50 | ||||
| -rw-r--r-- | src/libzip-1-static_build.patch | 21 | ||||
| -rw-r--r-- | src/libzip-2-pkgconfig_private.patch | 15 | ||||
| -rw-r--r-- | src/libzip.mk | 4 |
5 files changed, 54 insertions, 40 deletions
@@ -4,8 +4,8 @@ PKG := gsl $(PKG)_WEBSITE := https://www.gnu.org/software/gsl/ $(PKG)_DESCR := GSL $(PKG)_IGNORE := -$(PKG)_VERSION := 1.16 -$(PKG)_CHECKSUM := 73bc2f51b90d2a780e6d266d43e487b3dbd78945dd0b04b14ca5980fe28d2f53 +$(PKG)_VERSION := 2.3 +$(PKG)_CHECKSUM := 562500b789cd599b3a4f88547a7a3280538ab2ff4939504c8b4ac4ca25feadfb $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://ftp.gnu.org/gnu/$(PKG)/$($(PKG)_FILE) diff --git a/src/libzip-1-fixes.patch b/src/libzip-1-fixes.patch new file mode 100644 index 0000000..03ff845 --- /dev/null +++ b/src/libzip-1-fixes.patch @@ -0,0 +1,50 @@ +This file is part of MXE. See LICENSE.md for licensing information. + +From 8aa28e38f7b753c40fa1d107d88a5e1281a09dec Mon Sep 17 00:00:00 2001 +From: Sylvain Beucler <beuc@beuc.net> +Date: Sun, 15 Jan 2017 17:25:49 +0100 +Subject: [PATCH 1/2] static build fixes + + +diff --git a/lib/zip.h b/lib/zip.h +index 27141b3..8d85e61 100644 +--- a/lib/zip.h ++++ b/lib/zip.h +@@ -37,9 +37,9 @@ + + #ifndef ZIP_EXTERN + # ifndef ZIP_STATIC +-# ifdef _WIN32 ++# ifdef _MSC_VER + # 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 +-- +2.9.3 + + +From d7b8bf5ccfbedfc10bddaa46f19c08635f1fa17f Mon Sep 17 00:00:00 2001 +From: Sylvain Beucler <beuc@beuc.net> +Date: Sun, 15 Jan 2017 17:28:42 +0100 +Subject: [PATCH 2/2] pkgconfig private + + +diff --git a/libzip.pc.in b/libzip.pc.in +index ef8af2d..f053510 100644 +--- a/libzip.pc.in ++++ b/libzip.pc.in +@@ -9,6 +9,7 @@ zipcmp=@prefix@/bin/zipcmp + Name: libzip + Description: library for handling zip archives + Version: @VERSION@ +-Libs: @PKG_CONFIG_RPATH@ -L${libdir} -lzip @LIBS@ ++Libs: @PKG_CONFIG_RPATH@ -L${libdir} -lzip + Cflags: -I${includedir} -I${libincludedir} ++Requires.private: zlib + +-- +2.9.3 + diff --git a/src/libzip-1-static_build.patch b/src/libzip-1-static_build.patch deleted file mode 100644 index d94c2bc..0000000 --- a/src/libzip-1-static_build.patch +++ /dev/null @@ -1,21 +0,0 @@ -This file is part of MXE. See LICENSE.md for licensing information. - -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 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 -+#ifdef _MSC_VER - #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 diff --git a/src/libzip-2-pkgconfig_private.patch b/src/libzip-2-pkgconfig_private.patch deleted file mode 100644 index 979c2b1..0000000 --- a/src/libzip-2-pkgconfig_private.patch +++ /dev/null @@ -1,15 +0,0 @@ -This file is part of MXE. See LICENSE.md for licensing information. - -Only advertise -lz for static builds. - ---- a/libzip.pc.in 2012-03-15 10:28:05.000000000 +0100 -+++ b/libzip.pc.in 2012-12-18 22:48:27.807773881 +0100 -@@ -9,6 +9,7 @@ - Name: libzip - Description: library for handling zip archives - Version: @VERSION@ --Libs: -L${libdir} -lzip @LIBS@ -+Libs: -L${libdir} -lzip - Cflags: -I${includedir} -I${libincludedir} -+Requires.private: zlib - diff --git a/src/libzip.mk b/src/libzip.mk index 92e72fa..bd1f597 100644 --- a/src/libzip.mk +++ b/src/libzip.mk @@ -3,8 +3,8 @@ PKG := libzip $(PKG)_WEBSITE := http://www.nih.at/libzip/ $(PKG)_IGNORE := -$(PKG)_VERSION := 0.11.2 -$(PKG)_CHECKSUM := 7cfbbc2c540e154b933b6e9ec781e2671086bd8114eb744ae1a1ade34d2bb6bb +$(PKG)_VERSION := 1.1.3 +$(PKG)_CHECKSUM := 729a295a59a9fd6e5b9fe9fd291d36ae391a9d2be0b0824510a214cfaa05ceee $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://www.nih.at/libzip/$($(PKG)_FILE) |