summaryrefslogtreecommitdiffstats
path: root/meta/packages/pango
diff options
context:
space:
mode:
authorYu Ke <ke.yu@intel.com>2010-07-03 21:49:22 +0800
committerRichard Purdie <rpurdie@linux.intel.com>2010-07-05 13:29:48 +0100
commit52759ea5774bb907cb882c78286bda36c0fdbd3a (patch)
tree7e1c0f2424ccf08a07aa71da34b24dbb05d626df /meta/packages/pango
parent8f88fd5483a8d784249d588c84c55b56159f07a3 (diff)
downloadpoky-52759ea5774bb907cb882c78286bda36c0fdbd3a.tar.gz
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 <ke.yu@intel.com>
Diffstat (limited to 'meta/packages/pango')
-rw-r--r--meta/packages/pango/pango-1.22.2/doublefix.patch17
-rw-r--r--meta/packages/pango/pango-1.26.0/no-introspect.patch13
-rw-r--r--meta/packages/pango/pango-1.26.0/no-tests.patch12
-rw-r--r--meta/packages/pango/pango-1.28.0/no-tests.patch (renamed from meta/packages/pango/pango-1.22.2/no-tests.patch)0
-rw-r--r--meta/packages/pango/pango.inc20
-rw-r--r--meta/packages/pango/pango_1.22.2.bb6
-rw-r--r--meta/packages/pango/pango_1.26.0.bb6
-rw-r--r--meta/packages/pango/pango_1.28.0.bb9
8 files changed, 20 insertions, 63 deletions
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 @@
1Fix double header inclusion for bug with recent autoconf/automake
2
3RP 4/2/10
4
5Index: pango-1.22.2/pango/Makefile.am
6===================================================================
7--- pango-1.22.2.orig/pango/Makefile.am 2010-02-04 12:05:30.000000000 +0000
8+++ pango-1.22.2/pango/Makefile.am 2010-02-04 12:07:21.000000000 +0000
9@@ -233,7 +233,7 @@
10 # ------------------- libpangoxft -------------------
11
12 if HAVE_XFT
13-pangoinclude_HEADERS += pangoxft.h pangoxft-render.h pango-ot.h
14+pangoinclude_HEADERS += pangoxft.h pangoxft-render.h
15 lib_LTLIBRARIES += libpangoxft-1.0.la
16 endif
17
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 @@
1Index: pango-1.26.0/configure.in
2===================================================================
3--- pango-1.26.0.orig/configure.in 2009-10-12 17:46:48.000000000 +0100
4+++ pango-1.26.0/configure.in 2009-10-12 17:47:00.000000000 +0100
5@@ -494,7 +494,7 @@
6 # Checks for GObject Introspection
7 #
8 have_introspection=false
9-PKG_CHECK_MODULES(INTROSPECTION, gobject-introspection-1.0 >= 0.6.4, have_introspection=true, have_introspection=false)
10+#PKG_CHECK_MODULES(INTROSPECTION, gobject-introspection-1.0 >= 0.6.4, have_introspection=true, have_introspection=false)
11 AM_CONDITIONAL(HAVE_INTROSPECTION, $have_introspection)
12
13 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 @@
1Index: pango-1.22.2/Makefile.am
2===================================================================
3--- pango-1.22.2.orig/Makefile.am
4+++ pango-1.22.2/Makefile.am
5@@ -1,6 +1,6 @@
6 ## Process this file with automake to create Makefile.in.
7
8-SUBDIRS= pango modules pango-view examples docs tools tests
9+SUBDIRS= pango modules pango-view examples docs tools
10
11 EXTRA_DIST = \
12 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
index 4a74d8c4d6..4a74d8c4d6 100644
--- a/meta/packages/pango/pango-1.22.2/no-tests.patch
+++ b/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 @@
1DESCRIPTION = "The goal of the Pango project is to provide an \ 1DESCRIPTION = "The goal of the Pango project is to provide an \
2Open Source framework for the layout and rendering of \ 2Open Source framework for the layout and rendering of \
3internationalized text." 3internationalized text."
4LICENSE = "LGPL" 4HOMEPAGE = "http://www.pango.org/"
5 5BUGTRACKER = "http://bugzilla.gnome.org"
6inherit gnome
7EXTRA_AUTORECONF = ""
8
9SECTION = "x11/libs" 6SECTION = "x11/libs"
7LICENSE = "LGPL"
10 8
11DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv virtual/libx11 libxft gtk-doc-native cairo" 9DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv virtual/libx11 libxft gtk-doc-native cairo"
12 10
@@ -14,6 +12,10 @@ PACKAGES_DYNAMIC = "pango-module-*"
14 12
15RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc" 13RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc"
16 14
15inherit gnome
16
17EXTRA_AUTORECONF = ""
18
17# seems to go wrong with default cflags 19# seems to go wrong with default cflags
18FULL_OPTIMIZATION_arm = "-O2" 20FULL_OPTIMIZATION_arm = "-O2"
19 21
@@ -24,10 +26,6 @@ EXTRA_OECONF = "--disable-glibtest \
24LEAD_SONAME = "libpango-1.0*" 26LEAD_SONAME = "libpango-1.0*"
25LIBV = "1.6.0" 27LIBV = "1.6.0"
26 28
27FILES_${PN} = "/etc ${bindir}/* ${libdir}/libpango*${SOLIBS}"
28FILES_${PN}-dbg += "${libdir}/pango/${LIBV}/modules/.debug"
29FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la"
30
31do_stage () { 29do_stage () {
32 autotools_stage_all 30 autotools_stage_all
33} 31}
@@ -46,3 +44,7 @@ python populate_packages_prepend () {
46 44
47 do_split_packages(d, modules_root, '^pango-(.*)\.so$', 'pango-module-%s', 'Pango module %s', prologue + 'pango-querymodules > /etc/pango/pango.modules') 45 do_split_packages(d, modules_root, '^pango-(.*)\.so$', 'pango-module-%s', 'Pango module %s', prologue + 'pango-querymodules > /etc/pango/pango.modules')
48} 46}
47
48FILES_${PN} = "/etc ${bindir}/* ${libdir}/libpango*${SOLIBS}"
49FILES_${PN}-dbg += "${libdir}/pango/${LIBV}/modules/.debug"
50FILES_${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 @@
1require pango.inc
2
3SRC_URI += "file://no-tests.patch;patch=1"
4SRC_URI += "file://doublefix.patch;patch=1"
5
6PR = "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 @@
1require pango.inc
2
3SRC_URI += "file://no-tests.patch;patch=1"
4SRC_URI += "file://no-introspect.patch;patch=1"
5
6PARALLEL_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 @@
1require pango.inc
2
3LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
4
5PR = "r0"
6
7SRC_URI += "file://no-tests.patch"
8
9PARALLEL_MAKE = ""