From 52759ea5774bb907cb882c78286bda36c0fdbd3a Mon Sep 17 00:00:00 2001 From: Yu Ke Date: Sat, 3 Jul 2010 21:49:22 +0800 Subject: [PATCH] pango: upgrade to version 1.28.0 when upgrade to 1.28.0, the local patch no-introspect.patch is removed, since it is already in 1.28.0 upstream. this patch also fix the meta data, and change the field order according to the style guide. Signed-off-by: Yu Ke --- .../distro/include/poky-fixed-revisions.inc | 2 +- .../pango/pango-1.22.2/doublefix.patch | 17 ---------------- .../pango/pango-1.26.0/no-introspect.patch | 13 ------------ .../pango/pango-1.26.0/no-tests.patch | 12 ----------- .../no-tests.patch | 0 meta/packages/pango/pango.inc | 20 ++++++++++--------- meta/packages/pango/pango_1.22.2.bb | 6 ------ meta/packages/pango/pango_1.26.0.bb | 6 ------ meta/packages/pango/pango_1.28.0.bb | 9 +++++++++ 9 files changed, 21 insertions(+), 64 deletions(-) delete mode 100644 meta/packages/pango/pango-1.22.2/doublefix.patch delete mode 100644 meta/packages/pango/pango-1.26.0/no-introspect.patch delete mode 100644 meta/packages/pango/pango-1.26.0/no-tests.patch rename meta/packages/pango/{pango-1.22.2 => pango-1.28.0}/no-tests.patch (100%) delete mode 100644 meta/packages/pango/pango_1.22.2.bb delete mode 100644 meta/packages/pango/pango_1.26.0.bb create mode 100644 meta/packages/pango/pango_1.28.0.bb diff --git a/meta/conf/distro/include/poky-fixed-revisions.inc b/meta/conf/distro/include/poky-fixed-revisions.inc index df0b8f8f45..42f54ce299 100644 --- a/meta/conf/distro/include/poky-fixed-revisions.inc +++ b/meta/conf/distro/include/poky-fixed-revisions.inc @@ -13,7 +13,7 @@ PREFERRED_VERSION_glib-2.0 ?= "2.24.1" PREFERRED_VERSION_glib-2.0-native ?= "2.24.1" PREFERRED_VERSION_atk ?= "1.24.0" PREFERRED_VERSION_cairo ?= "1.8.10" -PREFERRED_VERSION_pango ?= "1.22.2" +PREFERRED_VERSION_pango ?= "1.28.0" PREFERRED_VERSION_gtk+ ?= "2.14.2" PREFERRED_VERSION_dbus ?= "1.2.4" diff --git a/meta/packages/pango/pango-1.22.2/doublefix.patch b/meta/packages/pango/pango-1.22.2/doublefix.patch deleted file mode 100644 index 876f62ab39..0000000000 --- a/meta/packages/pango/pango-1.22.2/doublefix.patch +++ /dev/null @@ -1,17 +0,0 @@ -Fix double header inclusion for bug with recent autoconf/automake - -RP 4/2/10 - -Index: pango-1.22.2/pango/Makefile.am -=================================================================== ---- pango-1.22.2.orig/pango/Makefile.am 2010-02-04 12:05:30.000000000 +0000 -+++ pango-1.22.2/pango/Makefile.am 2010-02-04 12:07:21.000000000 +0000 -@@ -233,7 +233,7 @@ - # ------------------- libpangoxft ------------------- - - if HAVE_XFT --pangoinclude_HEADERS += pangoxft.h pangoxft-render.h pango-ot.h -+pangoinclude_HEADERS += pangoxft.h pangoxft-render.h - lib_LTLIBRARIES += libpangoxft-1.0.la - endif - diff --git a/meta/packages/pango/pango-1.26.0/no-introspect.patch b/meta/packages/pango/pango-1.26.0/no-introspect.patch deleted file mode 100644 index b5ee86aa89..0000000000 --- a/meta/packages/pango/pango-1.26.0/no-introspect.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: pango-1.26.0/configure.in -=================================================================== ---- pango-1.26.0.orig/configure.in 2009-10-12 17:46:48.000000000 +0100 -+++ pango-1.26.0/configure.in 2009-10-12 17:47:00.000000000 +0100 -@@ -494,7 +494,7 @@ - # Checks for GObject Introspection - # - have_introspection=false --PKG_CHECK_MODULES(INTROSPECTION, gobject-introspection-1.0 >= 0.6.4, have_introspection=true, have_introspection=false) -+#PKG_CHECK_MODULES(INTROSPECTION, gobject-introspection-1.0 >= 0.6.4, have_introspection=true, have_introspection=false) - AM_CONDITIONAL(HAVE_INTROSPECTION, $have_introspection) - - G_IR_SCANNER= diff --git a/meta/packages/pango/pango-1.26.0/no-tests.patch b/meta/packages/pango/pango-1.26.0/no-tests.patch deleted file mode 100644 index 4a74d8c4d6..0000000000 --- a/meta/packages/pango/pango-1.26.0/no-tests.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: pango-1.22.2/Makefile.am -=================================================================== ---- pango-1.22.2.orig/Makefile.am -+++ pango-1.22.2/Makefile.am -@@ -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/meta/packages/pango/pango-1.22.2/no-tests.patch b/meta/packages/pango/pango-1.28.0/no-tests.patch similarity index 100% rename from meta/packages/pango/pango-1.22.2/no-tests.patch rename to meta/packages/pango/pango-1.28.0/no-tests.patch diff --git a/meta/packages/pango/pango.inc b/meta/packages/pango/pango.inc index eee9b938ce..2e28cc4431 100644 --- a/meta/packages/pango/pango.inc +++ b/meta/packages/pango/pango.inc @@ -1,12 +1,10 @@ DESCRIPTION = "The goal of the Pango project is to provide an \ Open Source framework for the layout and rendering of \ internationalized text." -LICENSE = "LGPL" - -inherit gnome -EXTRA_AUTORECONF = "" - +HOMEPAGE = "http://www.pango.org/" +BUGTRACKER = "http://bugzilla.gnome.org" SECTION = "x11/libs" +LICENSE = "LGPL" DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv virtual/libx11 libxft gtk-doc-native cairo" @@ -14,6 +12,10 @@ PACKAGES_DYNAMIC = "pango-module-*" RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc" +inherit gnome + +EXTRA_AUTORECONF = "" + # seems to go wrong with default cflags FULL_OPTIMIZATION_arm = "-O2" @@ -24,10 +26,6 @@ EXTRA_OECONF = "--disable-glibtest \ LEAD_SONAME = "libpango-1.0*" LIBV = "1.6.0" -FILES_${PN} = "/etc ${bindir}/* ${libdir}/libpango*${SOLIBS}" -FILES_${PN}-dbg += "${libdir}/pango/${LIBV}/modules/.debug" -FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la" - do_stage () { autotools_stage_all } @@ -46,3 +44,7 @@ python populate_packages_prepend () { do_split_packages(d, modules_root, '^pango-(.*)\.so$', 'pango-module-%s', 'Pango module %s', prologue + 'pango-querymodules > /etc/pango/pango.modules') } + +FILES_${PN} = "/etc ${bindir}/* ${libdir}/libpango*${SOLIBS}" +FILES_${PN}-dbg += "${libdir}/pango/${LIBV}/modules/.debug" +FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la" diff --git a/meta/packages/pango/pango_1.22.2.bb b/meta/packages/pango/pango_1.22.2.bb deleted file mode 100644 index 14153db1ac..0000000000 --- a/meta/packages/pango/pango_1.22.2.bb +++ /dev/null @@ -1,6 +0,0 @@ -require pango.inc - -SRC_URI += "file://no-tests.patch;patch=1" -SRC_URI += "file://doublefix.patch;patch=1" - -PR = "r1" diff --git a/meta/packages/pango/pango_1.26.0.bb b/meta/packages/pango/pango_1.26.0.bb deleted file mode 100644 index 101035eb61..0000000000 --- a/meta/packages/pango/pango_1.26.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -require pango.inc - -SRC_URI += "file://no-tests.patch;patch=1" -SRC_URI += "file://no-introspect.patch;patch=1" - -PARALLEL_MAKE = "" diff --git a/meta/packages/pango/pango_1.28.0.bb b/meta/packages/pango/pango_1.28.0.bb new file mode 100644 index 0000000000..ae914ffc53 --- /dev/null +++ b/meta/packages/pango/pango_1.28.0.bb @@ -0,0 +1,9 @@ +require pango.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" + +PR = "r0" + +SRC_URI += "file://no-tests.patch" + +PARALLEL_MAKE = ""