From 82720dd1aa2594cc308130da4db4ff600263ac74 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 28 Nov 2012 13:34:05 +0200 Subject: pango: update to upstream version 1.30.1 Signed-off-by: Marko Lindqvist Signed-off-by: Richard Purdie --- .../pango/pango-1.30.0/multilib-fix-clean.patch | 42 ---------------------- .../pango/pango-1.30.0/no-tests.patch | 15 -------- .../pango/pango-1.30.1/multilib-fix-clean.patch | 42 ++++++++++++++++++++++ .../pango/pango-1.30.1/no-tests.patch | 15 ++++++++ meta/recipes-graphics/pango/pango_1.30.0.bb | 15 -------- meta/recipes-graphics/pango/pango_1.30.1.bb | 15 ++++++++ 6 files changed, 72 insertions(+), 72 deletions(-) delete mode 100644 meta/recipes-graphics/pango/pango-1.30.0/multilib-fix-clean.patch delete mode 100644 meta/recipes-graphics/pango/pango-1.30.0/no-tests.patch create mode 100644 meta/recipes-graphics/pango/pango-1.30.1/multilib-fix-clean.patch create mode 100644 meta/recipes-graphics/pango/pango-1.30.1/no-tests.patch delete mode 100644 meta/recipes-graphics/pango/pango_1.30.0.bb create mode 100644 meta/recipes-graphics/pango/pango_1.30.1.bb (limited to 'meta/recipes-graphics/pango') diff --git a/meta/recipes-graphics/pango/pango-1.30.0/multilib-fix-clean.patch b/meta/recipes-graphics/pango/pango-1.30.0/multilib-fix-clean.patch deleted file mode 100644 index 3f00ad8de5..0000000000 --- a/meta/recipes-graphics/pango/pango-1.30.0/multilib-fix-clean.patch +++ /dev/null @@ -1,42 +0,0 @@ -Upstream-Status: Pending - -Index: pango-1.28.4/configure.in -=================================================================== ---- pango-1.28.4.orig/configure.in 2011-04-05 04:29:16.000000000 +0800 -+++ pango-1.28.4/configure.in 2012-05-08 21:32:17.000000000 +0800 -@@ -205,6 +205,11 @@ - - AC_SUBST(PANGO_DEBUG_FLAGS) - -+AC_ARG_WITH(mlprefix, -+ AC_HELP_STRING([--with-mlprefix=], [multilib prefix]), -+ mlprefix_str=$withval, mlprefix_str="") -+AC_DEFINE_UNQUOTED([MLPREFIX], ["$mlprefix_str"], [multilib prefix.]) -+ - AC_ARG_ENABLE(rebuilds, - [AC_HELP_STRING([--disable-rebuilds], - [disable all source autogeneration rules])],, -Index: pango-1.28.4/pango/modules.c -=================================================================== ---- pango-1.28.4.orig/pango/modules.c 2010-09-22 03:37:01.000000000 +0800 -+++ pango-1.28.4/pango/modules.c 2012-05-08 21:21:02.000000000 +0800 -@@ -529,7 +529,8 @@ - - if (!file_str) - file_str = g_build_filename (pango_get_sysconf_subdirectory (), -- "pango.modules", -+/* For multilib case, keep multiple config file for different libs */ -+ MLPREFIX "pango.modules", - NULL); - - files = pango_split_file_list (file_str); -@@ -640,7 +641,8 @@ - if (!no_module_warning) - { - gchar *filename = g_build_filename (pango_get_sysconf_subdirectory (), -- "pango.modules", -+/* For multilib case, keep multiple config file for different libs */ -+ MLPREFIX "pango.modules", - NULL); - g_critical ("No modules found:\n" - "No builtin or dynamically loaded modules were found.\n" diff --git a/meta/recipes-graphics/pango/pango-1.30.0/no-tests.patch b/meta/recipes-graphics/pango/pango-1.30.0/no-tests.patch deleted file mode 100644 index ddfc126226..0000000000 --- a/meta/recipes-graphics/pango/pango-1.30.0/no-tests.patch +++ /dev/null @@ -1,15 +0,0 @@ -Signed-off-by: Radu Moisan -Upstream-Status: Pending - -Index: pango-1.30.0/Makefile.am -=================================================================== ---- pango-1.30.0.orig/Makefile.am 2011-08-16 04:11:08.000000000 +0300 -+++ pango-1.30.0/Makefile.am 2012-08-06 12:48:27.000000000 +0300 -@@ -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 docs tools build - - EXTRA_DIST = \ - autogen.sh \ diff --git a/meta/recipes-graphics/pango/pango-1.30.1/multilib-fix-clean.patch b/meta/recipes-graphics/pango/pango-1.30.1/multilib-fix-clean.patch new file mode 100644 index 0000000000..3f00ad8de5 --- /dev/null +++ b/meta/recipes-graphics/pango/pango-1.30.1/multilib-fix-clean.patch @@ -0,0 +1,42 @@ +Upstream-Status: Pending + +Index: pango-1.28.4/configure.in +=================================================================== +--- pango-1.28.4.orig/configure.in 2011-04-05 04:29:16.000000000 +0800 ++++ pango-1.28.4/configure.in 2012-05-08 21:32:17.000000000 +0800 +@@ -205,6 +205,11 @@ + + AC_SUBST(PANGO_DEBUG_FLAGS) + ++AC_ARG_WITH(mlprefix, ++ AC_HELP_STRING([--with-mlprefix=], [multilib prefix]), ++ mlprefix_str=$withval, mlprefix_str="") ++AC_DEFINE_UNQUOTED([MLPREFIX], ["$mlprefix_str"], [multilib prefix.]) ++ + AC_ARG_ENABLE(rebuilds, + [AC_HELP_STRING([--disable-rebuilds], + [disable all source autogeneration rules])],, +Index: pango-1.28.4/pango/modules.c +=================================================================== +--- pango-1.28.4.orig/pango/modules.c 2010-09-22 03:37:01.000000000 +0800 ++++ pango-1.28.4/pango/modules.c 2012-05-08 21:21:02.000000000 +0800 +@@ -529,7 +529,8 @@ + + if (!file_str) + file_str = g_build_filename (pango_get_sysconf_subdirectory (), +- "pango.modules", ++/* For multilib case, keep multiple config file for different libs */ ++ MLPREFIX "pango.modules", + NULL); + + files = pango_split_file_list (file_str); +@@ -640,7 +641,8 @@ + if (!no_module_warning) + { + gchar *filename = g_build_filename (pango_get_sysconf_subdirectory (), +- "pango.modules", ++/* For multilib case, keep multiple config file for different libs */ ++ MLPREFIX "pango.modules", + NULL); + g_critical ("No modules found:\n" + "No builtin or dynamically loaded modules were found.\n" diff --git a/meta/recipes-graphics/pango/pango-1.30.1/no-tests.patch b/meta/recipes-graphics/pango/pango-1.30.1/no-tests.patch new file mode 100644 index 0000000000..ddfc126226 --- /dev/null +++ b/meta/recipes-graphics/pango/pango-1.30.1/no-tests.patch @@ -0,0 +1,15 @@ +Signed-off-by: Radu Moisan +Upstream-Status: Pending + +Index: pango-1.30.0/Makefile.am +=================================================================== +--- pango-1.30.0.orig/Makefile.am 2011-08-16 04:11:08.000000000 +0300 ++++ pango-1.30.0/Makefile.am 2012-08-06 12:48:27.000000000 +0300 +@@ -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 docs tools build + + EXTRA_DIST = \ + autogen.sh \ diff --git a/meta/recipes-graphics/pango/pango_1.30.0.bb b/meta/recipes-graphics/pango/pango_1.30.0.bb deleted file mode 100644 index de562b1754..0000000000 --- a/meta/recipes-graphics/pango/pango_1.30.0.bb +++ /dev/null @@ -1,15 +0,0 @@ -require pango.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" - -PR = "r1" - -GNOME_COMPRESS_TYPE="xz" - -SRC_URI += "file://no-tests.patch \ - file://multilib-fix-clean.patch" - -SRC_URI[archive.md5sum] = "2a70627ffd9f43c52c04cc0b05fe359f" -SRC_URI[archive.sha256sum] = "7c6d2ab024affaed0e942f9279b818235f9c6a36d9fc50688f48d387f4102dff" - -#PARALLEL_MAKE = "" diff --git a/meta/recipes-graphics/pango/pango_1.30.1.bb b/meta/recipes-graphics/pango/pango_1.30.1.bb new file mode 100644 index 0000000000..7254321744 --- /dev/null +++ b/meta/recipes-graphics/pango/pango_1.30.1.bb @@ -0,0 +1,15 @@ +require pango.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" + +PR = "r0" + +GNOME_COMPRESS_TYPE="xz" + +SRC_URI += "file://no-tests.patch \ + file://multilib-fix-clean.patch" + +SRC_URI[archive.md5sum] = "ec3c1f236ee9bd4a982a5f46fcaff7b9" +SRC_URI[archive.sha256sum] = "3a8c061e143c272ddcd5467b3567e970cfbb64d1d1600a8f8e62435556220cbe" + +#PARALLEL_MAKE = "" -- cgit 1.2.3-korg