Mercurial > mxe-octave
changeset 1274:6ae58fe09ab2
merge
author | Tony Theodore <tonyt@logyst.com> |
---|---|
date | Mon, 04 Oct 2010 07:18:52 +1100 |
parents | 32572d8ee7e5 (current diff) 49ad3988b630 (diff) |
children | ec8c30d00d57 |
files | src/glib-2-darwin-config-libiconv.patch src/glib-3-apple-iconv.patch |
diffstat | 5 files changed, 66 insertions(+), 47 deletions(-) [+] |
line wrap: on
line diff
--- a/src/freetype.mk Mon Oct 04 07:18:17 2010 +1100 +++ b/src/freetype.mk Mon Oct 04 07:18:52 2010 +1100 @@ -4,8 +4,8 @@ # freetype PKG := freetype $(PKG)_IGNORE := -$(PKG)_VERSION := 2.4.2 -$(PKG)_CHECKSUM := cc257ceda2950b8c80950d780ccf3ce665a815d1 +$(PKG)_VERSION := 2.4.3 +$(PKG)_CHECKSUM := 16e5ba0ff23b2de372149a790b7245a762022912 $(PKG)_SUBDIR := freetype-$($(PKG)_VERSION) $(PKG)_FILE := freetype-$($(PKG)_VERSION).tar.bz2 $(PKG)_WEBSITE := http://freetype.sourceforge.net/
--- a/src/glib-1-fixes.patch Mon Oct 04 07:18:17 2010 +1100 +++ b/src/glib-1-fixes.patch Mon Oct 04 07:18:52 2010 +1100 @@ -3,10 +3,10 @@ Contains ad hoc patches for cross building. -From 637620b33c175676972419ae674806825a390734 Mon Sep 17 00:00:00 2001 +From 4693f62d3f01f7b7d26607e6eed843202cbf90f7 Mon Sep 17 00:00:00 2001 From: mingw-cross-env Date: Thu, 23 Sep 2010 21:36:04 +0200 -Subject: [PATCH 1/5] no gtk doc check +Subject: [PATCH 1/7] no gtk doc check diff --git a/configure.ac b/configure.ac @@ -26,10 +26,10 @@ 1.7.1 -From 8f4fde8f0ab605720ef0baf7ef8080479b34af63 Mon Sep 17 00:00:00 2001 +From 46d0d473e6fb32c5204d063cad5f5073d2a139a5 Mon Sep 17 00:00:00 2001 From: mingw-cross-env Date: Thu, 23 Sep 2010 21:41:51 +0200 -Subject: [PATCH 2/5] optional gettext +Subject: [PATCH 2/7] optional gettext diff --git a/configure.ac b/configure.ac @@ -68,10 +68,10 @@ 1.7.1 -From 0a998b24fdb3ae5397ff5ad498260165300a4393 Mon Sep 17 00:00:00 2001 +From 3473b5183b2e59d247cd1db053efc6c9ecaf2aab Mon Sep 17 00:00:00 2001 From: mingw-cross-env Date: Thu, 23 Sep 2010 21:42:46 +0200 -Subject: [PATCH 3/5] fix tool paths +Subject: [PATCH 3/7] fix tool paths diff --git a/glib-2.0.pc.in b/glib-2.0.pc.in @@ -95,10 +95,10 @@ 1.7.1 -From 7ddbe18ccce7aede0cef972c6035058151c3ce10 Mon Sep 17 00:00:00 2001 +From 0e57514812500d5d4dee03e1be8059a25876dd99 Mon Sep 17 00:00:00 2001 From: mingw-cross-env Date: Thu, 23 Sep 2010 21:45:50 +0200 -Subject: [PATCH 4/5] fix dependency libs +Subject: [PATCH 4/7] fix dependency libs diff --git a/configure.ac b/configure.ac @@ -129,10 +129,10 @@ 1.7.1 -From 83ef7aba98793b7502370971c6de0b115c55e49c Mon Sep 17 00:00:00 2001 +From 87931c81f6401fb0c25064ec0ba2edca9ec53924 Mon Sep 17 00:00:00 2001 From: mingw-cross-env Date: Sat, 25 Sep 2010 00:07:33 +0200 -Subject: [PATCH 5/5] add -ldnsapi to gio-2.0.pc +Subject: [PATCH 5/7] add -ldnsapi to gio-2.0.pc diff --git a/gio-2.0.pc.in b/gio-2.0.pc.in @@ -150,3 +150,55 @@ -- 1.7.1 + +From 58d20f08e876298e795f7282ddc6cfccbe6f05fe Mon Sep 17 00:00:00 2001 +From: mingw-cross-env +Date: Sun, 3 Oct 2010 20:24:46 +0200 +Subject: [PATCH 6/7] darwin config libiconv + + +diff --git a/configure.ac b/configure.ac +index e472768..a681285 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -374,6 +374,12 @@ dnl *********************** + dnl + dnl We do this before the gettext checks, to avoid distortion + ++case $host in ++ *-*-darwin*) ++ with_libiconv=native ++ ;; ++esac ++ + dnl On Windows we use a native implementation + + if test x"$glib_native_win32" = xyes; then +-- +1.7.1 + + +From a340fa1dfbf9a8ac58cd1b026bd26de30d7fc581 Mon Sep 17 00:00:00 2001 +From: mingw-cross-env +Date: Sun, 3 Oct 2010 20:25:32 +0200 +Subject: [PATCH 7/7] apple iconv + +This patch has been taken from: +http://mail.gnome.org/archives/gtk-list/2009-August/msg00146.html + +diff --git a/glib/gconvert.c b/glib/gconvert.c +index 52a3dd8..d8b4f89 100644 +--- a/glib/gconvert.c ++++ b/glib/gconvert.c +@@ -61,7 +61,7 @@ + #if defined(USE_LIBICONV_GNU) && !defined (_LIBICONV_H) + #error GNU libiconv in use but included iconv.h not from libiconv + #endif +-#if !defined(USE_LIBICONV_GNU) && defined (_LIBICONV_H) ++#if !defined(USE_LIBICONV_GNU) && defined (_LIBICONV_H) && !defined(__APPLE__) + #error GNU libiconv not in use but included iconv.h is from libiconv + #endif + +-- +1.7.1 +
--- a/src/glib-2-darwin-config-libiconv.patch Mon Oct 04 07:18:17 2010 +1100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ ---- glib-2.25.17/configure.ac 2010-10-02 19:12:16.000000000 +1000 -+++ glib-2.25.17.native/configure.ac 2010-10-02 19:50:40.000000000 +1000 -@@ -374,6 +374,12 @@ - dnl - dnl We do this before the gettext checks, to avoid distortion - -+case $host in -+ *-*-darwin*) -+ with_libiconv=native -+ ;; -+esac -+ - dnl On Windows we use a native implementation - - if test x"$glib_native_win32" = xyes; then
--- a/src/glib-3-apple-iconv.patch Mon Oct 04 07:18:17 2010 +1100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,18 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -This patch has been taken from: -http://mail.gnome.org/archives/gtk-list/2009-August/msg00146.html - -diff -urN glib-2.25.17.orig/glib/gconvert.c glib-2.25.17/glib/gconvert.c ---- glib-2.25.17.orig/glib/gconvert.c 2010-09-14 01:57:51.000000000 +1000 -+++ glib-2.25.17/glib/gconvert.c 2010-09-27 22:51:58.000000000 +1000 -@@ -61,7 +61,7 @@ - #if defined(USE_LIBICONV_GNU) && !defined (_LIBICONV_H) - #error GNU libiconv in use but included iconv.h not from libiconv - #endif --#if !defined(USE_LIBICONV_GNU) && defined (_LIBICONV_H) -+#if !defined(USE_LIBICONV_GNU) && defined (_LIBICONV_H) && !defined(__APPLE__) - #error GNU libiconv not in use but included iconv.h is from libiconv - #endif -
--- a/src/glib.mk Mon Oct 04 07:18:17 2010 +1100 +++ b/src/glib.mk Mon Oct 04 07:18:52 2010 +1100 @@ -4,8 +4,8 @@ # GLib PKG := glib $(PKG)_IGNORE := 2.25.6 -$(PKG)_VERSION := 2.25.17 -$(PKG)_CHECKSUM := b800d4138145b6081c4191d808559409eff72b26 +$(PKG)_VERSION := 2.26.0 +$(PKG)_CHECKSUM := 9d7e9dce2add3fadc35079ad291a94f45ebcf706 $(PKG)_SUBDIR := glib-$($(PKG)_VERSION) $(PKG)_FILE := glib-$($(PKG)_VERSION).tar.bz2 $(PKG)_WEBSITE := http://www.gtk.org/