From 9b89bd65c45617fc0002e3302126b261c02319a7 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 27 Dec 2008 14:36:22 +0000 Subject: pango: bump version --- package/pango/pango-1.19.3-gtk-doc.patch | 59 ------------------------- package/pango/pango-1.19.3-no-cairo-atsui.patch | 42 ------------------ package/pango/pango-1.19.3-no-libthai.patch | 10 ----- package/pango/pango-1.19.3-no-tests.patch | 22 --------- package/pango/pango-gtk-doc.patch | 59 +++++++++++++++++++++++++ package/pango/pango-no-libthai.patch | 10 +++++ package/pango/pango-no-tests.patch | 22 +++++++++ package/pango/pango.mk | 2 +- 8 files changed, 92 insertions(+), 134 deletions(-) delete mode 100644 package/pango/pango-1.19.3-gtk-doc.patch delete mode 100644 package/pango/pango-1.19.3-no-cairo-atsui.patch delete mode 100644 package/pango/pango-1.19.3-no-libthai.patch delete mode 100644 package/pango/pango-1.19.3-no-tests.patch create mode 100644 package/pango/pango-gtk-doc.patch create mode 100644 package/pango/pango-no-libthai.patch create mode 100644 package/pango/pango-no-tests.patch (limited to 'package') diff --git a/package/pango/pango-1.19.3-gtk-doc.patch b/package/pango/pango-1.19.3-gtk-doc.patch deleted file mode 100644 index bee5fe631..000000000 --- a/package/pango/pango-1.19.3-gtk-doc.patch +++ /dev/null @@ -1,59 +0,0 @@ ---- pango/acinclude.m4.old 2004-05-08 11:31:48.000000000 +0100 -+++ pango/acinclude.m4 2004-05-08 11:31:58.000000000 +0100 -@@ -55,3 +55,56 @@ - ]) - - -+dnl -*- mode: autoconf -*- -+ -+# serial 1 -+ -+dnl Usage: -+dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) -+AC_DEFUN([GTK_DOC_CHECK], -+[ -+ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first -+ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first -+ dnl for overriding the documentation installation directory -+ AC_ARG_WITH(html-dir, -+ AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, -+ [with_html_dir='${datadir}/gtk-doc/html']) -+ HTML_DIR="$with_html_dir" -+ AC_SUBST(HTML_DIR) -+ -+ dnl enable/disable documentation building -+ AC_ARG_ENABLE(gtk-doc, -+ AC_HELP_STRING([--enable-gtk-doc], -+ [use gtk-doc to build documentation [default=no]]),, -+ enable_gtk_doc=no) -+ -+ have_gtk_doc=no -+ if test -z "$PKG_CONFIG"; then -+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no) -+ fi -+ if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then -+ have_gtk_doc=yes -+ fi -+ -+ dnl do we want to do a version check? -+ifelse([$1],[],, -+ [gtk_doc_min_version=$1 -+ if test "$have_gtk_doc" = yes; then -+ AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version]) -+ if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then -+ AC_MSG_RESULT(yes) -+ else -+ AC_MSG_RESULT(no) -+ have_gtk_doc=no -+ fi -+ fi -+]) -+ if test x$enable_gtk_doc = xyes; then -+ if test "$have_gtk_doc" != yes; then -+ enable_gtk_doc=no -+ fi -+ fi -+ -+ AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes) -+ AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL") -+]) diff --git a/package/pango/pango-1.19.3-no-cairo-atsui.patch b/package/pango/pango-1.19.3-no-cairo-atsui.patch deleted file mode 100644 index dcecf4b58..000000000 --- a/package/pango/pango-1.19.3-no-cairo-atsui.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- a/configure.in 2008-01-21 21:12:10.000000000 -0500 -+++ b/configure.in 2008-02-09 13:32:20.000000000 -0500 -@@ -318,11 +318,6 @@ if test "$pango_os_win32" = "yes"; then - fi - - # --# Checks for ATSUI --# --AC_CHECK_HEADER(Carbon/Carbon.h, [have_atsui=true], [have_atsui=true]) -- --# - # Checks for Cairo - # - have_cairo=false - ---- a/configure.in 2008-02-09 13:37:25.000000000 -0500 -+++ b/configure.in 2008-02-09 13:39:42.000000000 -0500 -@@ -374,12 +374,6 @@ if $have_cairo ; then - have_cairo=true - fi - -- PKG_CHECK_EXISTS(cairo-atsui >= $cairo_required, have_cairo_atsui=true, :) -- if $have_cairo_atsui && $have_atsui ; then -- AC_DEFINE(HAVE_CAIRO_ATSUI, 1, [Whether Cairo uses ATSUI for fonts]) -- have_cairo=true -- fi -- - if $have_cairo ; then - AC_DEFINE(HAVE_CAIRO, 1, [Have usable Cairo library and font backend]) - fi - ---- a/configure 2008-02-09 13:25:54.000000000 -0500 -+++ b/configure 2008-02-09 13:27:56.000000000 -0500 -@@ -22516,7 +22516,7 @@ fi - if $have_cairo_atsui && $have_atsui ; then - - cat >>confdefs.h <<\_ACEOF --#define HAVE_CAIRO_ATSUI 1 -+/* #undef HAVE_CAIRO_ATSUI */ - _ACEOF - - have_cairo=true diff --git a/package/pango/pango-1.19.3-no-libthai.patch b/package/pango/pango-1.19.3-no-libthai.patch deleted file mode 100644 index 78a3bafdd..000000000 --- a/package/pango/pango-1.19.3-no-libthai.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/modules/Makefile.am 2007-07-05 17:30:28.000000000 -0400 -+++ b/modules/Makefile.am 2008-02-09 19:37:13.000000000 -0500 -@@ -8,7 +8,6 @@ SUBDIRS = \ - indic \ - khmer \ - syriac \ -- thai \ - tibetan - - EXTRA_DIST = \ diff --git a/package/pango/pango-1.19.3-no-tests.patch b/package/pango/pango-1.19.3-no-tests.patch deleted file mode 100644 index 7ebcbc634..000000000 --- a/package/pango/pango-1.19.3-no-tests.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/Makefile.in 2008-01-21 22:28:49.000000000 -0500 -+++ b/Makefile.in 2008-02-09 13:02:41.000000000 -0500 -@@ -260,7 +260,7 @@ sysconfdir = @sysconfdir@ - target_alias = @target_alias@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --SUBDIRS = pango modules pango-view examples docs tools tests -+SUBDIRS = pango modules pango-view examples docs tools - EXTRA_DIST = \ - autogen.sh \ - pango.pc.in \ - ---- a/Makefile.am 2008-01-17 16:37:49.000000000 -0500 -+++ b/Makefile.am 2008-02-09 13:35:13.000000000 -0500 -@@ -1,6 +1,6 @@ - ## Process this file with automake to create Makefile.in. - --SUBDIRS= pango modules pango-view examples docs tools tests -+SUBDIRS= pango modules pango-view examples docs tools - - EXTRA_DIST = \ - autogen.sh \ diff --git a/package/pango/pango-gtk-doc.patch b/package/pango/pango-gtk-doc.patch new file mode 100644 index 000000000..bee5fe631 --- /dev/null +++ b/package/pango/pango-gtk-doc.patch @@ -0,0 +1,59 @@ +--- pango/acinclude.m4.old 2004-05-08 11:31:48.000000000 +0100 ++++ pango/acinclude.m4 2004-05-08 11:31:58.000000000 +0100 +@@ -55,3 +55,56 @@ + ]) + + ++dnl -*- mode: autoconf -*- ++ ++# serial 1 ++ ++dnl Usage: ++dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) ++AC_DEFUN([GTK_DOC_CHECK], ++[ ++ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first ++ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first ++ dnl for overriding the documentation installation directory ++ AC_ARG_WITH(html-dir, ++ AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, ++ [with_html_dir='${datadir}/gtk-doc/html']) ++ HTML_DIR="$with_html_dir" ++ AC_SUBST(HTML_DIR) ++ ++ dnl enable/disable documentation building ++ AC_ARG_ENABLE(gtk-doc, ++ AC_HELP_STRING([--enable-gtk-doc], ++ [use gtk-doc to build documentation [default=no]]),, ++ enable_gtk_doc=no) ++ ++ have_gtk_doc=no ++ if test -z "$PKG_CONFIG"; then ++ AC_PATH_PROG(PKG_CONFIG, pkg-config, no) ++ fi ++ if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then ++ have_gtk_doc=yes ++ fi ++ ++ dnl do we want to do a version check? ++ifelse([$1],[],, ++ [gtk_doc_min_version=$1 ++ if test "$have_gtk_doc" = yes; then ++ AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version]) ++ if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then ++ AC_MSG_RESULT(yes) ++ else ++ AC_MSG_RESULT(no) ++ have_gtk_doc=no ++ fi ++ fi ++]) ++ if test x$enable_gtk_doc = xyes; then ++ if test "$have_gtk_doc" != yes; then ++ enable_gtk_doc=no ++ fi ++ fi ++ ++ AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes) ++ AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL") ++]) diff --git a/package/pango/pango-no-libthai.patch b/package/pango/pango-no-libthai.patch new file mode 100644 index 000000000..78a3bafdd --- /dev/null +++ b/package/pango/pango-no-libthai.patch @@ -0,0 +1,10 @@ +--- a/modules/Makefile.am 2007-07-05 17:30:28.000000000 -0400 ++++ b/modules/Makefile.am 2008-02-09 19:37:13.000000000 -0500 +@@ -8,7 +8,6 @@ SUBDIRS = \ + indic \ + khmer \ + syriac \ +- thai \ + tibetan + + EXTRA_DIST = \ diff --git a/package/pango/pango-no-tests.patch b/package/pango/pango-no-tests.patch new file mode 100644 index 000000000..7ebcbc634 --- /dev/null +++ b/package/pango/pango-no-tests.patch @@ -0,0 +1,22 @@ +--- a/Makefile.in 2008-01-21 22:28:49.000000000 -0500 ++++ b/Makefile.in 2008-02-09 13:02:41.000000000 -0500 +@@ -260,7 +260,7 @@ sysconfdir = @sysconfdir@ + target_alias = @target_alias@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-SUBDIRS = pango modules pango-view examples docs tools tests ++SUBDIRS = pango modules pango-view examples docs tools + EXTRA_DIST = \ + autogen.sh \ + pango.pc.in \ + +--- a/Makefile.am 2008-01-17 16:37:49.000000000 -0500 ++++ b/Makefile.am 2008-02-09 13:35:13.000000000 -0500 +@@ -1,6 +1,6 @@ + ## Process this file with automake to create Makefile.in. + +-SUBDIRS= pango modules pango-view examples docs tools tests ++SUBDIRS= pango modules pango-view examples docs tools + + EXTRA_DIST = \ + autogen.sh \ diff --git a/package/pango/pango.mk b/package/pango/pango.mk index b6c3c7a5d..440e578c5 100644 --- a/package/pango/pango.mk +++ b/package/pango/pango.mk @@ -3,7 +3,7 @@ # pango # ############################################################# -PANGO_VERSION = 1.19.3 +PANGO_VERSION = 1.20.5 PANGO_SOURCE = pango-$(PANGO_VERSION).tar.bz2 PANGO_SITE = http://ftp.gnome.org/pub/GNOME/sources/pango/1.19 PANGO_AUTORECONF = YES -- cgit v1.2.3