From: Grazvydas Ignotas Date: Thu, 2 Oct 2014 23:52:01 +0000 (+0300) Subject: pango: update to 1.32.5 X-Git-Tag: sz_173~114 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d07e4cb81dd2fd2d5005bf1db9a3e7d717117570;p=openembedded.git pango: update to 1.32.5 --- diff --git a/classes/gnome.bbclass b/classes/gnome.bbclass index 57ff3672b2..8e42938a2e 100644 --- a/classes/gnome.bbclass +++ b/classes/gnome.bbclass @@ -3,8 +3,9 @@ def gnome_verdir(v): m = re.match("^([0-9]+)\.([0-9]+)", v) return "%s.%s" % (m.group(1), m.group(2)) +GNOME_COMPRESS_TYPE ?= "bz2" SECTION ?= "x11/gnome" -SRC_URI = "${GNOME_MIRROR}/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.bz2;name=archive" +SRC_URI = "${GNOME_MIRROR}/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive" DEPENDS += "gnome-common" diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index 3ee1cc04dc..c84bdaae13 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -30,8 +30,8 @@ PREFERRED_VERSION_mesa-xlib = "7.6" PREFERRED_VERSION_mplayer = "0.0+1.0rc3+svnr30165" PREFERRED_VERSION_network-manager-applet = "0.8" #PREFERRED_VERSION_networkmanager = "0.8" -PREFERRED_VERSION_pango = "1.24.4" -PREFERRED_VERSION_pango-native = "1.24.4" +PREFERRED_VERSION_pango = "1.32.5" +PREFERRED_VERSION_pango-native = "1.32.5" #PREFERRED_VERSION_pixman = "0.13.2" PREFERRED_VERSION_pkgconfig = "0.23" PREFERRED_VERSION_pkgconfig-native = "0.23" diff --git a/recipes/harfbuzz/harfbuzz_0.9.35.bb b/recipes/harfbuzz/harfbuzz_0.9.35.bb new file mode 100644 index 0000000000..7fb64fe66e --- /dev/null +++ b/recipes/harfbuzz/harfbuzz_0.9.35.bb @@ -0,0 +1,31 @@ +SUMMARY = "Text shaping library" +DESCRIPTION = "HarfBuzz is an OpenType text shaping engine." +HOMEPAGE = "http://www.freedesktop.org/wiki/Software/HarfBuzz" +BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=HarfBuzz" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=e021dd6dda6ff1e6b1044002fc662b9b \ + file://src/hb-ucdn/COPYING;md5=994ba0f1295f15b4bda4999a5bbeddef \ +" + +SECTION = "libs" + +SRC_URI = "http://www.freedesktop.org/software/harfbuzz/release/${BP}.tar.bz2" +SRC_URI[md5sum] = "531ee8650626ecddcd90b2a4637e31d4" +SRC_URI[sha256sum] = "0aa1a8aba6f502321cf6fef3c9d2c73dde48389c5ed1d3615a7691944c2a06ed" +inherit autotools pkgconfig lib_package + +DEPENDS = "glib-2.0 cairo freetype" + +BBCLASSEXTEND = "native" + +EXTRA_OECONF = "--with-glib --with-freetype --with-cairo --without-graphite2 --without-icu" + +PACKAGES =+ "${PN}-icu ${PN}-icu-dbg ${PN}-icu-dev" + +FILES_${PN}-icu = "${libdir}/libharfbuzz-icu.so.*" +FILES_${PN}-icu-dbg = "${libdir}/.debug/libharfbuzz-icu.so*" +FILES_${PN}-icu-dev = "${libdir}/libharfbuzz-icu.la \ + ${libdir}/libharfbuzz-icu.so \ + ${libdir}/pkgconfig/harfbuzz-icu.pc \ +" diff --git a/recipes/pango/pango-1.32.5/multilib-fix-clean.patch b/recipes/pango/pango-1.32.5/multilib-fix-clean.patch new file mode 100644 index 0000000000..ad414ddf36 --- /dev/null +++ b/recipes/pango/pango-1.32.5/multilib-fix-clean.patch @@ -0,0 +1,75 @@ +Upstream-Status: Pending + +Updated to apply to pango-1.32.5 + +Signed-off-by: Marko Lindqvist +diff -Nurd pango-1.32.5/configure.ac pango-1.32.5/configure.ac +--- pango-1.32.5/configure.ac 2012-12-07 04:43:25.000000000 +0200 ++++ pango-1.32.5/configure.ac 2013-01-09 08:27:40.328516792 +0200 +@@ -213,6 +213,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])],, +diff -Nurd pango-1.32.5/pango/modules.c pango-1.32.5/pango/modules.c +--- pango-1.32.5/pango/modules.c 2012-12-17 20:27:56.000000000 +0200 ++++ pango-1.32.5/pango/modules.c 2013-01-09 08:31:16.336512052 +0200 +@@ -555,11 +555,11 @@ + files = g_new (char *, 3); + + files[0] = g_build_filename (pango_get_sysconf_subdirectory (), +- "pango.modules", ++ MLPREFIX "pango.modules", + NULL); + files[1] = g_build_filename (pango_get_lib_subdirectory (), + MODULE_VERSION, +- "modules.cache", ++ MLPREFIX "modules.cache", + NULL); + files[2] = NULL; + } +@@ -674,7 +674,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 -Nurd pango-1.32.5/pango/modules.c.rej pango-1.32.5/pango/modules.c.rej +--- pango-1.32.5/pango/modules.c.rej 1970-01-01 02:00:00.000000000 +0200 ++++ pango-1.32.5/pango/modules.c.rej 2013-01-09 08:27:40.328516792 +0200 +@@ -0,0 +1,12 @@ ++--- pango/modules.c 2010-09-22 03:37:01.000000000 +0800 +++++ 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); +diff -Nurd pango-1.32.5/pango/querymodules.c pango-1.32.5/pango/querymodules.c +--- pango-1.32.5/pango/querymodules.c 2012-08-28 15:27:18.000000000 +0300 ++++ pango-1.32.5/pango/querymodules.c 2013-01-09 08:31:47.828511359 +0200 +@@ -304,7 +304,7 @@ + + cache_file = g_build_filename (pango_get_lib_subdirectory (), + MODULE_VERSION, +- "modules.cache", ++ MLPREFIX "modules.cache", + NULL); + err = NULL; + if (!g_file_set_contents (cache_file, contents->str, -1, &err)) diff --git a/recipes/pango/pango-1.32.5/no-tests.patch b/recipes/pango/pango-1.32.5/no-tests.patch new file mode 100644 index 0000000000..ddfc126226 --- /dev/null +++ b/recipes/pango/pango-1.32.5/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/recipes/pango/pango-1.32.5/obsolete_automake_macros.patch b/recipes/pango/pango-1.32.5/obsolete_automake_macros.patch new file mode 100644 index 0000000000..3f229b5e42 --- /dev/null +++ b/recipes/pango/pango-1.32.5/obsolete_automake_macros.patch @@ -0,0 +1,15 @@ +Upstream-Status: Accepted [https://bugzilla.gnome.org/show_bug.cgi?id=691263] + +Signed-off-by: Marko Lindqvist +diff -Nurd pango-1.32.5/configure.ac pango-1.32.5/configure.ac +--- pango-1.32.5/configure.ac 2012-12-07 04:43:25.000000000 +0200 ++++ pango-1.32.5/configure.ac 2013-01-07 03:25:42.734109587 +0200 +@@ -54,7 +54,7 @@ + dnl usage of GNU Make specific features. + AM_INIT_AUTOMAKE(1.9 gnits dist-xz no-dist-gzip -Wno-portability) + m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) +-AM_CONFIG_HEADER([config.h]) ++AC_CONFIG_HEADERS([config.h]) + + + PANGO_VERSION_MAJOR=pango_version_major() diff --git a/recipes/pango/pango_1.32.5.bb b/recipes/pango/pango_1.32.5.bb new file mode 100644 index 0000000000..bcbdc400e7 --- /dev/null +++ b/recipes/pango/pango_1.32.5.bb @@ -0,0 +1,70 @@ +SUMMARY = "Framework for layout and rendering of internationalized text" +DESCRIPTION = "Pango is a library for laying out and rendering of text, \ +with an emphasis on internationalization. Pango can be used anywhere \ +that text layout is needed, though most of the work on Pango so far has \ +been done in the context of the GTK+ widget toolkit. Pango forms the \ +core of text and font handling for GTK+-2.x." +HOMEPAGE = "http://www.pango.org/" +BUGTRACKER = "http://bugzilla.gnome.org" +SECTION = "x11/libs" +LICENSE = "LGPL" + +inherit gnome +EXTRA_AUTORECONF = "" + +DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv virtual/libx11 libxft gtk-doc cairo elfutils harfbuzz" + +BBCLASSEXTEND = "native" +DEPENDS_virtclass-native = "glib-2.0-native cairo-native harfbuzz-native" + +PACKAGES_DYNAMIC = "pango-module-*" + +RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc" + +# seems to go wrong with default cflags +FULL_OPTIMIZATION_arm = "-O2" + +EXTRA_OECONF = "--disable-glibtest \ + --disable-introspection \ + --enable-explicit-deps=no \ + --disable-debug \ + --with-xft" + +LEAD_SONAME = "libpango-1.0*" +LIBV = "1.8.0" + +postinst_prologue() { +if [ "x$D" != "x" ]; then + exit 1 +fi + +if ! [ -e $D${sysconfdir}/pango ] ; then + mkdir -p $D${sysconfdir}/pango +fi +} + +python populate_packages_prepend () { + prologue = bb.data.getVar("postinst_prologue", d, 1) + + modules_root = bb.data.expand('${libdir}/pango/${LIBV}/modules', d) + + do_split_packages(d, modules_root, '^pango-(.*)\.so$', 'pango-module-%s', 'Pango module %s', prologue + 'pango-querymodules > /etc/pango/pango.modules') +} + +FILES_${PN} = "${sysconfdir}/pango/* ${bindir}/* ${libdir}/libpango*.so.*" +FILES_${PN}-dbg += "${libdir}/pango/${LIBV}/modules/.debug" +FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la" + +PR = "r1" + +GNOME_COMPRESS_TYPE="xz" + +SRC_URI += "file://no-tests.patch;patch=1 \ + file://multilib-fix-clean.patch;patch=1 \ + file://obsolete_automake_macros.patch;patch=1 \ +" + +SRC_URI[archive.md5sum] = "8e846804d6e219bc795a26a4a39b5bfd" +SRC_URI[archive.sha256sum] = "7d7bc99c3d9b580cb4fe787fe47824e56e39534b9040e1c8a2a159248d8e5821" + +PARALLEL_MAKE = ""