From 6ea82c82744c295863b781b3d29f871cd8e4e27e Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Tue, 8 Oct 2013 22:50:28 +0200 Subject: update packages: cminpack file harfbuzz libircclient mpg123 netpbm --- src/cminpack.mk | 4 +-- src/file.mk | 4 +-- src/harfbuzz.mk | 4 +-- src/libircclient-1-fixes.patch | 67 +++++++++--------------------------------- src/libircclient.mk | 4 +-- src/mpg123.mk | 4 +-- src/netpbm.mk | 4 +-- 7 files changed, 26 insertions(+), 65 deletions(-) diff --git a/src/cminpack.mk b/src/cminpack.mk index 96afc76..a8ec0c3 100644 --- a/src/cminpack.mk +++ b/src/cminpack.mk @@ -3,8 +3,8 @@ PKG := cminpack $(PKG)_IGNORE := -$(PKG)_VERSION := 1.3.0 -$(PKG)_CHECKSUM := 8bf19ce37b486707c402a046c33d823c9e359410 +$(PKG)_VERSION := 1.3.1 +$(PKG)_CHECKSUM := be9a9e3ef4ffa776d9f7d57356e5c52ccec00406 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://devernay.free.fr/hacks/cminpack/$($(PKG)_FILE) diff --git a/src/file.mk b/src/file.mk index e6533dd..0d0a251 100644 --- a/src/file.mk +++ b/src/file.mk @@ -3,8 +3,8 @@ PKG := file $(PKG)_IGNORE := -$(PKG)_VERSION := 5.14 -$(PKG)_CHECKSUM := 064c8f17a5f7ae1e336a9285131e046d3b2d04d7 +$(PKG)_VERSION := 5.15 +$(PKG)_CHECKSUM := de1a060aa5fe61c1a6f0359fb526e824b4244323 $(PKG)_SUBDIR := file-$($(PKG)_VERSION) $(PKG)_FILE := file-$($(PKG)_VERSION).tar.gz $(PKG)_URL := ftp://ftp.astron.com/pub/file/$($(PKG)_FILE) diff --git a/src/harfbuzz.mk b/src/harfbuzz.mk index e0c64bb..2afd62c 100644 --- a/src/harfbuzz.mk +++ b/src/harfbuzz.mk @@ -3,8 +3,8 @@ PKG := harfbuzz $(PKG)_IGNORE := -$(PKG)_VERSION := 0.9.20 -$(PKG)_CHECKSUM := 82c3c0d461f239d0991e660a5895a11d1c75e535 +$(PKG)_VERSION := 0.9.22 +$(PKG)_CHECKSUM := c76797b5c970066436e8f0b3bcd8fc33bbcb12d6 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://www.freedesktop.org/software/$(PKG)/release/$($(PKG)_FILE) diff --git a/src/libircclient-1-fixes.patch b/src/libircclient-1-fixes.patch index da48eb5..b22e428 100644 --- a/src/libircclient-1-fixes.patch +++ b/src/libircclient-1-fixes.patch @@ -3,58 +3,19 @@ See index.html for further information. Contains ad hoc patches for cross building. -From 06b27e262de1d156ea31b52762ed372211b72de9 Mon Sep 17 00:00:00 2001 -From: MXE -Date: Mon, 23 Jan 2012 08:26:14 +0100 +From aab6124359bbf8d0b3003ccf4adc791e0d921aa3 Mon Sep 17 00:00:00 2001 +From: Mark Brand +Date: Tue, 8 Oct 2013 22:37:07 +0200 Subject: [PATCH 1/2] use the proper WIN32 define -diff --git a/examples/censor.cpp b/examples/censor.cpp -index 0c15f4c..c784040 100644 ---- a/examples/censor.cpp -+++ b/examples/censor.cpp -@@ -32,7 +32,7 @@ - #include - #include - --#if !defined (WIN32) -+#if !defined (_WIN32) - #include - #endif - -diff --git a/examples/irctest.c b/examples/irctest.c -index bd6dbc3..08d2ba7 100644 ---- a/examples/irctest.c -+++ b/examples/irctest.c -@@ -51,7 +51,7 @@ void addlog (const char * fmt, ...) - va_list va_alist; - - va_start (va_alist, fmt); --#if defined (WIN32) -+#if defined (_WIN32) - _vsnprintf (buf, sizeof(buf), fmt, va_alist); - #else - vsnprintf (buf, sizeof(buf), fmt, va_alist); -diff --git a/examples/spammer.c b/examples/spammer.c -index ae9c2c7..2a0861b 100644 ---- a/examples/spammer.c -+++ b/examples/spammer.c -@@ -17,7 +17,7 @@ - #include - #include - --#if defined (WIN32) -+#if defined (_WIN32) - #include - - #define CREATE_THREAD(id,func,param) (CreateThread(0, 0, func, param, 0, id) == 0) diff --git a/include/libircclient.h b/include/libircclient.h -index 2dcd44c..af7d769 100644 +index 250a0d1..7ff83be 100644 --- a/include/libircclient.h +++ b/include/libircclient.h -@@ -44,7 +44,7 @@ - #ifndef INCLUDE_LIBIRC_H - #define INCLUDE_LIBIRC_H +@@ -46,7 +46,7 @@ + + #include -#if !defined (WIN32) +#if !defined (_WIN32) @@ -62,20 +23,20 @@ index 2dcd44c..af7d769 100644 #else #include -- -1.7.8.3 +1.8.1.4 -From 1a54c4dda67b99c1c0c0c68b45a395b741cb7030 Mon Sep 17 00:00:00 2001 -From: MXE -Date: Sun, 22 Jan 2012 22:39:23 +0100 +From 1ac4521bd869d7cb3a82640d44f80cb9f9388eb7 Mon Sep 17 00:00:00 2001 +From: Mark Brand +Date: Tue, 8 Oct 2013 22:37:29 +0200 Subject: [PATCH 2/2] fix missing header diff --git a/include/libircclient.h b/include/libircclient.h -index af7d769..57c8516 100644 +index 7ff83be..677f41f 100644 --- a/include/libircclient.h +++ b/include/libircclient.h -@@ -131,6 +131,7 @@ typedef void (*irc_dcc_callback_t) (irc_session_t * session, irc_dcc_t id, int s +@@ -133,6 +133,7 @@ typedef void (*irc_dcc_callback_t) (irc_session_t * session, irc_dcc_t id, int s #include "libirc_errors.h" #include "libirc_events.h" #include "libirc_options.h" @@ -84,5 +45,5 @@ index af7d769..57c8516 100644 -- -1.7.8.3 +1.8.1.4 diff --git a/src/libircclient.mk b/src/libircclient.mk index 4f2b5dc..ac114a4 100644 --- a/src/libircclient.mk +++ b/src/libircclient.mk @@ -5,8 +5,8 @@ PKG := libircclient $(PKG)_IGNORE := -$(PKG)_VERSION := 1.6 -$(PKG)_CHECKSUM := 10fb7a2478f6d668dce2d7fb5cd5a35ea8f53ed4 +$(PKG)_VERSION := 1.7 +$(PKG)_CHECKSUM := 02f1502d486c89ca26a59d6ba2cc5a4f92be95b1 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE) diff --git a/src/mpg123.mk b/src/mpg123.mk index 6605b12..0bb1afe 100644 --- a/src/mpg123.mk +++ b/src/mpg123.mk @@ -3,8 +3,8 @@ PKG := mpg123 $(PKG)_IGNORE := -$(PKG)_VERSION := 1.15.4 -$(PKG)_CHECKSUM := f39d927bcf7abf4f9d857f10cd97c8ceccaffbfa +$(PKG)_VERSION := 1.16.0 +$(PKG)_CHECKSUM := 73105629f8d4b9426ec9fe93455a8271a96c4ae4 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/mpg123/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE) diff --git a/src/netpbm.mk b/src/netpbm.mk index 417c870..59f86f8 100644 --- a/src/netpbm.mk +++ b/src/netpbm.mk @@ -3,8 +3,8 @@ PKG := netpbm $(PKG)_IGNORE := -$(PKG)_VERSION := 10.35.89 -$(PKG)_CHECKSUM := f9d07c0b82f5feed66a5e995b077492093aa24b5 +$(PKG)_VERSION := 10.35.90 +$(PKG)_CHECKSUM := 5d5c1f9619f2c27698aabbbe90dff955ef26b223 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tgz $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/netpbm/super_stable/$($(PKG)_VERSION)/$($(PKG)_FILE) -- cgit v0.12