Mercurial > mxe-octave

changeset 1213:02fccefe7136

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
upgrade package pango
author Mark Brand <mabrand@mabrand.nl>
date Wed, 29 Sep 2010 01:19:40 +0200
parents 84cc482e2b06
children 9d25713309ca
files src/pango-1-fixes.patch src/pango.mk
diffstat 2 files changed, 199 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/pango-1-fixes.patch	Wed Sep 29 01:19:40 2010 +0200
@@ -0,0 +1,195 @@
+This file is part of mingw-cross-env.
+See doc/index.html for further information.
+
+Contains ad hoc patches for cross building.
+
+commit ed3371ed8a13f169cfd1920ecc794b30bb69cc0b
+Author: Mark Brand <mabrand@mabrand.nl>
+Date:   Wed Sep 29 00:52:59 2010 +0200
+
+    s,DllMain,static _disabled_DllMain,
+
+diff --git a/pango/pango-utils.c b/pango/pango-utils.c
+index 100dbc7..f60be42 100644
+--- a/pango/pango-utils.c
++++ b/pango/pango-utils.c
+@@ -657,12 +657,12 @@ pango_config_key_get (const char *key)
+ 
+ #ifdef G_OS_WIN32
+ 
+-/* DllMain function needed to tuck away the DLL handle */
++/* static _disabled_DllMain function needed to tuck away the DLL handle */
+ 
+ static HMODULE pango_dll;
+ 
+ BOOL WINAPI
+-DllMain (HINSTANCE hinstDLL,
++static _disabled_DllMain (HINSTANCE hinstDLL,
+ 	 DWORD     fdwReason,
+ 	 LPVOID    lpvReserved)
+ {
+
+commit b33f70af495cdaddab9ddccd79aef777e005bb85
+Author: Mark Brand <mabrand@mabrand.nl>
+Date:   Wed Sep 29 00:55:07 2010 +0200
+
+    static, not shared
+
+diff --git a/configure b/configure
+index 352c9c4..a78ace5 100755
+--- a/configure
++++ b/configure
+@@ -5942,9 +5942,9 @@ if test "${enable_static+set}" = set; then :
+   enableval=$enable_static; p=${PACKAGE-default}
+     case $enableval in
+     yes) enable_static=yes ;;
+-    no) enable_static=no ;;
++    no) enable_static=yes ;;
+     *)
+-     enable_static=no
++     enable_static=yes
+       # Look at the argument we got.  We use all the common list separators.
+       lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+       for pkg in $enableval; do
+@@ -5957,7 +5957,7 @@ if test "${enable_static+set}" = set; then :
+       ;;
+     esac
+ else
+-  enable_static=no
++  enable_static=yes
+ fi
+ 
+ 
+@@ -5971,15 +5971,15 @@ fi
+ 
+ if test "$pango_os_win32" = "yes"; then
+   if test x$enable_static = xyes -o x$enable_static = x; then
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling static library build, must build as DLL on Windows." >&5
+-$as_echo "$as_me: WARNING: Disabling static library build, must build as DLL on Windows." >&2;}
+-    enable_static=no
++    { $as_echo "(disabled warning)" >&5
++$as_echo "(disabled warning)" >&2;}
++    enable_static=yes
+   fi
+   if test x$enable_shared = xno; then
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Enabling shared library build, must build as DLL on Windows." >&5
+-$as_echo "$as_me: WARNING: Enabling shared library build, must build as DLL on Windows." >&2;}
++    { $as_echo "(disabled warning)" >&5
++$as_echo "(disabled warning)" >&2;}
+   fi
+-  enable_shared=yes
++  enable_shared=no
+ fi
+ 
+ case `pwd` in
+@@ -8969,7 +8969,7 @@ fi
+ if test "${enable_shared+set}" = set; then :
+   enableval=$enable_shared; p=${PACKAGE-default}
+     case $enableval in
+-    yes) enable_shared=yes ;;
++    yes) enable_shared=no ;;
+     no) enable_shared=no ;;
+     *)
+       enable_shared=no
+@@ -8978,14 +8978,14 @@ if test "${enable_shared+set}" = set; then :
+       for pkg in $enableval; do
+ 	IFS="$lt_save_ifs"
+ 	if test "X$pkg" = "X$p"; then
+-	  enable_shared=yes
++	  enable_shared=no
+ 	fi
+       done
+       IFS="$lt_save_ifs"
+       ;;
+     esac
+ else
+-  enable_shared=yes
++  enable_shared=no
+ fi
+ 
+ 
+@@ -12572,7 +12572,7 @@ $as_echo_n "checking whether to build shared libraries... " >&6; }
+   # are all built from PIC.
+   case $host_os in
+   aix3*)
+-    test "$enable_shared" = yes && enable_static=no
++    test "$enable_shared" = yes && enable_static=yes
+     if test -n "$RANLIB"; then
+       archive_cmds="$archive_cmds~\$RANLIB \$lib"
+       postinstall_cmds='$RANLIB $lib'
+@@ -12581,7 +12581,7 @@ $as_echo_n "checking whether to build shared libraries... " >&6; }
+ 
+   aix[4-9]*)
+     if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+-      test "$enable_shared" = yes && enable_static=no
++      test "$enable_shared" = yes && enable_static=yes
+     fi
+     ;;
+   esac
+
+commit 4601f723ef49c010656ef800ce705cd8677833d4
+Author: Mark Brand <mabrand@mabrand.nl>
+Date:   Wed Sep 29 00:57:12 2010 +0200
+
+    no pango-querymodules
+
+diff --git a/modules/Makefile.in b/modules/Makefile.in
+index 0d48e08..df71e02 100644
+--- a/modules/Makefile.in
++++ b/modules/Makefile.in
+@@ -643,7 +643,7 @@ uninstall-am: uninstall-local
+ 
+ @CROSS_COMPILING_FALSE@all-local: pango.modules
+ 
+-install-data-local: $(top_builddir)/pango/pango-querymodules$(EXEEXT)
++install-data-local:
+ 	@if $(RUN_QUERY_MODULES_TEST) && test -z "$(DESTDIR)" ; then 	\
+ 	  echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango \&\& 	\
+ 	  $(top_builddir)/pango/pango-querymodules$(EXEEXT) 		\
+
+commit 53bd7d3d3a83e40eb7d02568b560840ceadd7c0a
+Author: Mark Brand <mabrand@mabrand.nl>
+Date:   Wed Sep 29 00:58:13 2010 +0200
+
+    wine workaround s,^install-data-local:.*,install-data-local:,
+
+diff --git a/configure b/configure
+index a78ace5..92b1334 100755
+--- a/configure
++++ b/configure
+@@ -694,7 +694,7 @@ ac_default_prefix=/usr/local
+ ac_clean_files=
+ ac_config_libobj_dir=.
+ LIBOBJS=
+-cross_compiling=no
++cross_compiling=yes
+ subdirs=
+ MFLAGS=
+ MAKEFLAGS=
+@@ -3873,7 +3873,7 @@ $as_echo "$ac_try_echo"; } >&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; }; then
+-    cross_compiling=no
++    cross_compiling=yes
+   else
+     if test "$cross_compiling" = maybe; then
+ 	cross_compiling=yes
+
+commit ccd472e0aee0109932e261eb1f7d9d24bbf1870c
+Author: Mark Brand <mabrand@mabrand.nl>
+Date:   Wed Sep 29 00:50:08 2010 +0200
+
+    add missing lib to pango.pc for static linking
+
+diff --git a/pango.pc.in b/pango.pc.in
+index 5cc3ef8..745b8f0 100644
+--- a/pango.pc.in
++++ b/pango.pc.in
+@@ -9,5 +9,5 @@ Name: Pango
+ Description: Internationalized text handling
+ Version: @VERSION@
+ Requires: glib-2.0,gobject-2.0,gmodule-no-export-2.0
+-Libs: -L${libdir} -lpango-@PANGO_API_VERSION@ @PKGCONFIG_MATH_LIBS@
++Libs: -L${libdir} -lpango-@PANGO_API_VERSION@ @PKGCONFIG_MATH_LIBS@ -lusp10
+ Cflags: -I${includedir}/pango-1.0
--- a/src/pango.mk	Wed Sep 29 02:00:35 2010 +0200
+++ b/src/pango.mk	Wed Sep 29 01:19:40 2010 +0200
@@ -4,8 +4,8 @@
 # Pango
 PKG             := pango
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.28.1
-$(PKG)_CHECKSUM := 2d5907f0ff108cb9c27f69d8e4de564ff3d30221
+$(PKG)_VERSION  := 1.28.2
+$(PKG)_CHECKSUM := 326e9afa015ac5328fb1f9ecc2212e327396008c
 $(PKG)_SUBDIR   := pango-$($(PKG)_VERSION)
 $(PKG)_FILE     := pango-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://www.pango.org/
@@ -20,13 +20,6 @@
 endef
 
 define $(PKG)_BUILD
-    $(SED) -i 's,DllMain,static _disabled_DllMain,' '$(1)/pango/pango-utils.c'
-    $(SED) -i 's,"[^"]*must build as DLL[^"]*","(disabled warning)",' '$(1)/configure'
-    $(SED) -i 's,enable_static=no,enable_static=yes,' '$(1)/configure'
-    $(SED) -i 's,enable_shared=yes,enable_shared=no,' '$(1)/configure'
-    $(SED) -i 's,^install-data-local:.*,install-data-local:,' '$(1)/modules/Makefile.in'
-    # wine confuses the cross-compiling detection, so set it explicitly
-    $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --disable-shared \
@@ -36,6 +29,7 @@
         --enable-explicit-deps \
         --with-included-modules \
         --without-dynamic-modules \
-        CXX='$(TARGET)-g++'
+        CXX='$(TARGET)-g++' \
+        LIBS='-lusp10'
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
 endef