Mercurial > mxe-octave
changeset 2666:26f659185fc3
Merge pull request #61 from residuum/master
Update of json-c
author | mabrand <mabrand@mabrand.nl> |
---|---|
date | Tue, 17 Jul 2012 15:24:22 -0700 |
parents | d51d9fa9747d (diff) 3567da505594 (current diff) |
children | 8161498e1a42 |
files | index.html |
diffstat | 6 files changed, 103 insertions(+), 72 deletions(-) [+] |
line wrap: on
line diff
--- a/index.html Tue Jul 17 23:18:18 2012 +0200 +++ b/index.html Tue Jul 17 15:24:22 2012 -0700 @@ -668,7 +668,7 @@ <!-- http://www.debian.org/distrib/packages#search_packages --> <pre>aptitude install -R autoconf automake bash bison bzip2 \ cmake flex gettext git g++ intltool \ - libtool libltdl-dev openssl libssl-dev \ + libffi-dev libtool libltdl-dev openssl libssl-dev \ libxml-parser-perl make patch perl \ pkg-config scons sed unzip wget \ xz-utils yasm</pre> @@ -683,7 +683,7 @@ <!-- https://admin.fedoraproject.org/pkgdb/ --> <pre>yum install autoconf automake bash bison bzip2 cmake \ flex gcc-c++ gettext git intltool make sed \ - libtool openssl-devel patch perl pkgconfig \ + libffi-devel libtool openssl-devel patch perl pkgconfig \ scons yasm unzip wget xz</pre> <p> @@ -695,7 +695,7 @@ <!-- http://www.freshports.org/ --> <pre>pkg_add -r automake111 autoconf268 bash bison cmake \ - flex gettext git gmake gsed intltool libtool \ + flex gettext git gmake gsed intltool libffi libtool \ openssl patch perl p5-XML-Parser pkg-config \ scons unzip wget yasm</pre> @@ -719,7 +719,7 @@ <!-- http://www.frugalware.org/packages --> <pre>pacman-g2 -S autoconf automake bash bzip2 bison cmake \ - flex gcc gettext git intltool make sed libtool \ + flex gcc gettext git intltool make sed libffi libtool \ openssl patch perl perl-xml-parser pkgconfig \ scons unzip wget xz xz-lzma yasm</pre> @@ -736,7 +736,7 @@ dev-util/cmake sys-devel/flex sys-devel/gcc \ sys-devel/gettext dev-vcs/git \ dev-util/intltool sys-devel/make sys-apps/sed \ - sys-devel/libtool dev-libs/openssl sys-devel/patch \ + dev-libs/libffi sys-devel/libtool dev-libs/openssl sys-devel/patch \ dev-lang/perl dev-perl/XML-Parser \ dev-util/pkgconfig dev-util/scons app-arch/unzip \ net-misc/wget app-arch/xz-utils dev-lang/yasm</pre> @@ -752,7 +752,7 @@ </p> <!-- http://www.macports.org/ports.php --> <pre>sudo port install autoconf automake bison cmake flex \ - gettext git-core gsed intltool libtool \ + gettext git-core gsed intltool libffi libtool \ openssl p5-xml-parser pkgconfig scons \ wget xz yasm</pre> <p> @@ -764,7 +764,7 @@ <!-- http://software.opensuse.org/113/en --> <pre>zypper install -R autoconf automake bash bison bzip2 \ cmake flex gcc-c++ gettext-tools git \ - intltool libtool make openssl \ + intltool libffi-devel libtool make openssl \ libopenssl-devel patch perl \ perl-XML-Parser pkg-config scons \ sed unzip wget xz yasm</pre> @@ -1065,7 +1065,7 @@ </tr> <tr> <td id="fontconfig-package">fontconfig</td> - <td id="fontconfig-version">2.9.0</td> + <td id="fontconfig-version">2.10.0</td> <td id="fontconfig-website"><a href="http://fontconfig.org/">fontconfig</a></td> </tr> <tr>
--- a/src/fontconfig-1-fixes.patch Tue Jul 17 23:18:18 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,43 +0,0 @@ -From 107e1934711cd9246c03f01e0acecdede714ea73 Mon Sep 17 00:00:00 2001 -From: Akira TAGOH <akira@tagoh.org> -Date: Thu, 14 Jun 2012 11:27:31 +0900 -Subject: [PATCH] Fix the fail of make install with --disable-shared on Win32 - (cherry picked from commit - 997a64a67b77ae7c083f4a2898670201ed618fb2) - ---- - configure.in | 1 + - src/Makefile.am | 2 ++ - 3 files changed, 4 insertions(+) - -diff --git a/configure.in b/configure.in -index da6ef95..88b6367 100644 ---- a/configure.in -+++ b/configure.in -@@ -94,6 +94,7 @@ AC_SUBST(WARN_CFLAGS) - dnl ========================================================================== - - AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes) -+AM_CONDITIONAL(ENABLE_SHARED, test "$enable_shared" = "yes") - - dnl ========================================================================== - -diff --git a/src/Makefile.am b/src/Makefile.am -index a7bb73c..81562cb 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -132,9 +132,11 @@ libfontconfig_la_LIBADD = $(ICONV_LIBS) $(FREETYPE_LIBS) $(LIBXML2_LIBS) $(EXPAT - - libfontconfig_la_DEPENDENCIES = $(fontconfig_def_dependency) - -+if ENABLE_SHARED - install-data-local: install-ms-import-lib install-libtool-import-lib - - uninstall-local: uninstall-ms-import-lib uninstall-libtool-import-lib -+endif - - PUBLIC_FILES = \ - $(top_srcdir)/fontconfig/fontconfig.h \ --- -1.7.10.4 -
--- a/src/fontconfig.mk Tue Jul 17 23:18:18 2012 +0200 +++ b/src/fontconfig.mk Tue Jul 17 15:24:22 2012 -0700 @@ -3,7 +3,7 @@ PKG := fontconfig $(PKG)_IGNORE := -$(PKG)_CHECKSUM := 1ab2f437c2261028ae7969892277af2d8d8db489 +$(PKG)_CHECKSUM := d47c6fa5693f91e274d655b5644dd333716c1395 $(PKG)_SUBDIR := fontconfig-$($(PKG)_VERSION) $(PKG)_FILE := fontconfig-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://fontconfig.org/release/$($(PKG)_FILE) @@ -16,18 +16,12 @@ endef define $(PKG)_BUILD - cd '$(1)' && aclocal - cd '$(1)' && autoheader - cd '$(1)' && libtoolize - cd '$(1)' && automake - cd '$(1)' && autoconf cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --with-arch='$(TARGET)' \ - --with-freetype-config='$(PREFIX)/$(TARGET)/bin/freetype-config' \ --with-expat='$(PREFIX)/$(TARGET)' $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
--- a/src/fribidi-1-fix-gassert.patch Tue Jul 17 23:18:18 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,14 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -diff -ru fribidi-0.19.2.orig/lib/fribidi-common.h fribidi-0.19.2/lib/fribidi-common.h ---- fribidi-0.19.2.orig/lib/fribidi-common.h 2007-04-05 18:13:24.000000000 +0200 -+++ fribidi-0.19.2/lib/fribidi-common.h 2010-02-24 17:20:47.000000000 +0100 -@@ -63,6 +63,7 @@ - #if FRIBIDI_USE_GLIB+0 - # ifndef __FRIBIDI_DOC - # include <glib/gmacros.h> -+# include <glib/gtestutils.h> - # endif /* !__FRIBIDI_DOC */ - # define FRIBIDI_BEGIN_DECLS G_BEGIN_DECLS - # define FRIBIDI_END_DECLS G_END_DECLS
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/fribidi-1-fixes.patch Tue Jul 17 15:24:22 2012 -0700 @@ -0,0 +1,93 @@ +This file is part of MXE. +See index.html for further information. + +From 76bd700b45f139679f16e649354eb23a99317b44 Mon Sep 17 00:00:00 2001 +From: Mark Brand <mabrand@mabrand.nl> +Date: Tue, 17 Jul 2012 10:07:07 +0200 +Subject: [PATCH] only include glib.h + + +diff --git a/charset/fribidi-char-sets.c b/charset/fribidi-char-sets.c +index 9de05f8..8e8df8b 100644 +--- a/charset/fribidi-char-sets.c ++++ b/charset/fribidi-char-sets.c +@@ -114,7 +114,7 @@ static FriBidiCharSetHandler char_sets[FRIBIDI_CHAR_SETS_NUM + 1] = { + }; + + #if FRIBIDI_USE_GLIB+0 +-# include <glib/gstrfuncs.h> ++# include <glib.h> + # define fribidi_strcasecmp g_ascii_strcasecmp + #else /* !FRIBIDI_USE_GLIB */ + static char +diff --git a/lib/common.h b/lib/common.h +index 7615ccc..f4bf357 100644 +--- a/lib/common.h ++++ b/lib/common.h +@@ -57,7 +57,7 @@ + # define SIZEOF_VOID_P GLIB_SIZEOF_VOID_P + # endif /* !SIZEOF_VOID_P */ + # ifndef __FRIBIDI_DOC +-# include <glib/gmem.h> ++# include <glib.h> + # endif /* !__FRIBIDI_DOC */ + # ifndef fribidi_malloc + # define fribidi_malloc g_try_malloc +@@ -65,12 +65,12 @@ + # endif /* !fribidi_malloc */ + # ifndef fribidi_assert + # ifndef __FRIBIDI_DOC +-# include <glib/gmessages.h> ++# include <glib.h> + # endif /* !__FRIBIDI_DOC */ + # define fribidi_assert g_assert + # endif /* !fribidi_assert */ + # ifndef __FRIBIDI_DOC +-# include <glib/gmacros.h> ++# include <glib.h> + # endif /* !__FRIBIDI_DOC */ + # ifndef FRIBIDI_BEGIN_STMT + # define FRIBIDI_BEGIN_STMT G_STMT_START { +diff --git a/lib/fribidi-common.h b/lib/fribidi-common.h +index 4724913..6010b84 100644 +--- a/lib/fribidi-common.h ++++ b/lib/fribidi-common.h +@@ -62,7 +62,7 @@ + + #if FRIBIDI_USE_GLIB+0 + # ifndef __FRIBIDI_DOC +-# include <glib/gmacros.h> ++# include <glib.h> + # endif /* !__FRIBIDI_DOC */ + # define FRIBIDI_BEGIN_DECLS G_BEGIN_DECLS + # define FRIBIDI_END_DECLS G_END_DECLS +diff --git a/lib/fribidi-types.h b/lib/fribidi-types.h +index 6a72a53..27c9c3d 100644 +--- a/lib/fribidi-types.h ++++ b/lib/fribidi-types.h +@@ -40,8 +40,7 @@ + + #if FRIBIDI_USE_GLIB+0 + # ifndef __FRIBIDI_DOC +-# include <glib/gtypes.h> +-# include <glib/gunicode.h> ++# include <glib.h> + # endif /* !__FRIBIDI_DOC */ + # define FRIBIDI_INT8_LOCAL gint8 + # define FRIBIDI_INT16_LOCAL gint16 +diff --git a/lib/mem.h b/lib/mem.h +index b1208da..60f0a4e 100644 +--- a/lib/mem.h ++++ b/lib/mem.h +@@ -42,7 +42,7 @@ + #if FRIBIDI_USE_GLIB+0 + + #ifndef __FRIBIDI_DOC +-# include <glib/gmem.h> ++# include <glib.h> + #endif /* !__FRIBIDI_DOC */ + + #define FriBidiMemChunk GMemChunk +-- +1.7.10.4 +
--- a/src/fribidi.mk Tue Jul 17 23:18:18 2012 +0200 +++ b/src/fribidi.mk Tue Jul 17 15:24:22 2012 -0700 @@ -19,6 +19,7 @@ $(SED) -i 's,__declspec(dllimport),,' '$(1)/lib/fribidi-common.h' cd '$(1)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-debug \