Mercurial > mxe-octave
diff src/mingw-pango-1-fixes.patch @ 3172:8d294e37ce65
[MSVC] enable Pango compilation (and bump version to 1.34.1)
author | Michael Goffioul <michael.goffioul@gmail.com> |
---|---|
date | Tue, 23 Jul 2013 22:29:33 -0400 |
parents | src/pango-1-fixes.patch@c9c16664efca |
children |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/mingw-pango-1-fixes.patch Tue Jul 23 22:29:33 2013 -0400 @@ -0,0 +1,176 @@ +This file is part of MXE. +See index.html for further information. + +From 6dc99b57932d52db33413b9f054ef8843f697ec0 Mon Sep 17 00:00:00 2001 +From: Mark Brand <mabrand@mabrand.nl> +Date: Wed, 29 Sep 2010 00:52:59 +0200 +Subject: [PATCH 1/4] s,DllMain,static _disabled_DllMain, + + +diff --git a/pango/pango-utils.c b/pango/pango-utils.c +index 18ffa26..aac59ab 100644 +--- a/pango/pango-utils.c ++++ b/pango/pango-utils.c +@@ -691,12 +691,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; /* MT-safe */ + + BOOL WINAPI +-DllMain (HINSTANCE hinstDLL, ++static _disabled_DllMain (HINSTANCE hinstDLL, + DWORD fdwReason, + LPVOID lpvReserved) + { +-- +1.7.10.4 + + +From e5359406f68e5bb4bd5f1b9516f9d28f41e8b38e Mon Sep 17 00:00:00 2001 +From: Mark Brand <mabrand@mabrand.nl> +Date: Wed, 29 Sep 2010 00:50:08 +0200 +Subject: [PATCH 2/4] add missing lib to pango.pc for static linking + + +diff --git a/pango.pc.in b/pango.pc.in +index 17a8b7a..16c5981 100644 +--- a/pango.pc.in ++++ b/pango.pc.in +@@ -10,5 +10,5 @@ Description: Internationalized text handling + Version: @VERSION@ + Requires: glib-2.0 gobject-2.0 + Requires.private: 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 +-- +1.7.10.4 + + +From 8a4c71a44d76896fcdb610f50eaa07be3d108c3d Mon Sep 17 00:00:00 2001 +From: Mark Brand <mabrand@mabrand.nl> +Date: Fri, 15 Jun 2012 16:21:40 +0200 +Subject: [PATCH 3/4] do not force shared for win32 + + +diff --git a/configure.in b/configure.in +index a0e0057..fe1f7fe 100644 +--- a/configure.in ++++ b/configure.in +@@ -142,20 +142,6 @@ AC_CHECK_HEADERS(unistd.h sys/mman.h) + # Win32 stuff + # + +-AC_LIBTOOL_WIN32_DLL +-AM_DISABLE_STATIC +- +-if test "$pango_os_win32" = "yes"; then +- if test x$enable_static = xyes -o x$enable_static = x; then +- AC_MSG_WARN([Disabling static library build, must build as DLL on Windows.]) +- enable_static=no +- fi +- if test x$enable_shared = xno; then +- AC_MSG_WARN([Enabling shared library build, must build as DLL on Windows.]) +- fi +- enable_shared=yes +-fi +- + AM_PROG_LIBTOOL + dnl when using libtool 2.x create libtool early, because it's used in configure + m4_ifdef([LT_OUTPUT], [LT_OUTPUT]) +diff --git a/modules/Makefile.am b/modules/Makefile.am +index 73b42f4..19c5a4f 100644 +--- a/modules/Makefile.am ++++ b/modules/Makefile.am +@@ -21,22 +21,7 @@ RUN_QUERY_MODULES_TEST=true + all-local: pango.modules + endif + +-install-data-local: $(top_builddir)/pango/pango-querymodules$(EXEEXT) +- @if $(RUN_QUERY_MODULES_TEST) && test -z "$(DESTDIR)" ; then \ +- echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango \&\& \ +- $(top_builddir)/pango/pango-querymodules$(EXEEXT) \ +- \> $(DESTDIR)$(sysconfdir)/pango/pango.modules ; \ +- $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango && \ +- $(top_builddir)/pango/pango-querymodules$(EXEEXT) \ +- > $(DESTDIR)$(sysconfdir)/pango/pango.modules ; \ +- else \ +- echo "***" ; \ +- echo "*** Warning: $(sysconfdir)/pango/pango.modules" ; \ +- echo "*** not created" ; \ +- echo "*** Generate this file on the target system" ; \ +- echo "*** using pango-querymodules" ; \ +- echo "***" ; \ +- fi ++install-data-local: + + uninstall-local: + $(RM) $(DESTDIR)$(sysconfdir)/pango/pango.modules +-- +1.7.10.4 + + +From ed84a78833202e38407f47e1fcd28fa8e612d536 Mon Sep 17 00:00:00 2001 +From: Mark Brand <mabrand@mabrand.nl> +Date: Mon, 18 Jun 2012 21:36:53 +0200 +Subject: [PATCH 4/4] kill gtk-doc (MXE specific) + + +diff --git a/Makefile.am b/Makefile.am +index 1ac018a..1999723 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,6 +1,6 @@ + ## Process this file with automake to create Makefile.in. + +-SUBDIRS= pango modules pango-view examples docs tools tests build ++SUBDIRS= pango modules pango-view examples tools tests build + + EXTRA_DIST = \ + autogen.sh \ +diff --git a/autogen.sh b/autogen.sh +index bc7c59c..4e1918c 100755 +--- a/autogen.sh ++++ b/autogen.sh +@@ -7,14 +7,6 @@ test -n "$srcdir" || srcdir=. + olddir=`pwd` + cd "$srcdir" + +-GTKDOCIZE=`which gtkdocize` +-if test -z $GTKDOCIZE; then +- echo "*** No GTK-Doc found, please install it ***" +- exit 1 +-else +- gtkdocize || exit $? +-fi +- + AUTORECONF=`which autoreconf` + if test -z $AUTORECONF; then + echo "*** No autoreconf found, please install it ***" +diff --git a/configure.in b/configure.in +index fe1f7fe..23c4311 100644 +--- a/configure.in ++++ b/configure.in +@@ -568,14 +568,7 @@ dnl ************************** + dnl *** Checks for gtk-doc *** + dnl ************************** + +-if $have_cairo ; then : ; else +- if test x$enable_gtk_doc = xyes ; then +- AC_MSG_WARN([Cairo not present, disabling doc building]) +- enable_gtk_doc=no +- fi +-fi +- +-GTK_DOC_CHECK([1.0]) ++enable_gtk_doc=no + + AC_ARG_ENABLE(man, + AC_HELP_STRING([--enable-man], +-- +1.7.10.4 +