diff options
Diffstat (limited to 'meta/recipes-gnome')
42 files changed, 293 insertions, 501 deletions
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.22.1/configure_fix.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.22.1/configure_fix.patch new file mode 100644 index 000000000..bbf239c8d --- /dev/null +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.22.1/configure_fix.patch @@ -0,0 +1,19 @@ +can sniff check buillds and runs an C binary, which breaks configure in +cross-compile environ. +This patch simple disables it. + +Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> + +Index: gdk-pixbuf-2.22.1/configure.ac +=================================================================== +--- gdk-pixbuf-2.22.1.orig/configure.ac 2010-11-25 16:26:41.000000000 +0800 ++++ gdk-pixbuf-2.22.1/configure.ac 2010-11-25 16:29:22.000000000 +0800 +@@ -99,6 +99,8 @@ + AC_MSG_CHECKING([for native Win32]) + LIB_EXE_MACHINE_FLAG=X86 + EXE_MANIFEST_ARCHITECTURE=X86 ++dnl disable can sniff check in cross compile ++gio_can_sniff=no + case "$host" in + *-*-mingw*) + os_win32=yes diff --git a/meta/recipes-gnome/gtk+/gtk+-2.20.1/hardcoded_libtool.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.22.1/hardcoded_libtool.patch index 66be74475..ae16927e7 100644 --- a/meta/recipes-gnome/gtk+/gtk+-2.20.1/hardcoded_libtool.patch +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.22.1/hardcoded_libtool.patch @@ -1,31 +1,31 @@ -Index: gtk+-2.21.2/configure.in +Index: gdk-pixbuf-2.22.1/configure.ac =================================================================== ---- gtk+-2.21.2.orig/configure.in 2010-06-22 17:21:41.000000000 +0800 -+++ gtk+-2.21.2/configure.in 2010-06-22 17:28:59.000000000 +0800 -@@ -425,7 +425,7 @@ +--- gdk-pixbuf-2.22.1.orig/configure.ac 2010-11-26 09:06:34.000000000 +0800 ++++ gdk-pixbuf-2.22.1/configure.ac 2010-11-26 09:07:33.000000000 +0800 +@@ -287,7 +287,7 @@ case $enable_explicit_deps in auto) export SED - deplibs_check_method=`(./libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh` + deplibs_check_method=`(./$host_alias-libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh` if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then - enable_explicit_deps=yes + enable_explicit_deps=yes else -@@ -804,7 +804,7 @@ +@@ -484,7 +484,7 @@ dnl Now we check to see if our libtool supports shared lib deps dnl (in a rather ugly way even) if $dynworks; then - pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config" -+ pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} $host_alias-libtool --config" ++ pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./$host_alias-libtool --config" pixbuf_deplibs_check=`$pixbuf_libtool_config | \ grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \ sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'` -@@ -1974,7 +1974,7 @@ +@@ -957,7 +957,7 @@ # We are using gmodule-no-export now, but I'm leaving the stripping # code in place for now, since pango and atk still require gmodule. export SED -export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` -+export_dynamic=`($host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` ++export_dynamic=`(./$host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` if test -n "$export_dynamic"; then GDK_PIXBUF_DEP_LIBS=`echo $GDK_PIXBUF_DEP_LIBS | sed -e "s/$export_dynamic//"` - GDK_PIXBUF_XLIB_DEP_LIBS=`echo $GDK_PIXBUF_XLIB_DEP_LIBS | sed -e "s/$export_dynamic//"` + fi diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.22.1.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.22.1.bb new file mode 100644 index 000000000..78f108a0a --- /dev/null +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.22.1.bb @@ -0,0 +1,70 @@ +DESCRIPTION = "Image loading library for GTK+" +HOMEPAGE = "http://www.gtk.org/" +BUGTRACKER = "https://bugzilla.gnome.org/" + +LICENSE = "LGPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ + file://gdk-pixbuf/gdk-pixbuf.h;endline=26;md5=5066b71daefeff678494fffa3040aba9" + +SECTION = "libs" +PRIORITY = "optional" + +DEPENDS = "libpng gettext glib-2.0 jpeg" +PR = "r0" + +SRC_URI = "http://ftp.acc.umu.se/pub/GNOME/sources/gdk-pixbuf/2.22/gdk-pixbuf-${PV}.tar.gz \ + file://hardcoded_libtool.patch;patch=1 \ + file://configure_fix.patch;patch=1 \ + " + +SRC_URI[md5sum] = "fcfc854e9aec7dbb2bb3059484d44556" +SRC_URI[sha256sum] = "bbb57364ffba70d64f5fcfe6eda1d67249b3d58844edb06dc0f94d1ad599b4ec" + +inherit autotools pkgconfig + +LIBV = "2.10.0" + +EXTRA_OECONF = "\ + --without-libtiff \ + --with-libpng \ +" + +FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \ + ${libdir}/lib*.so.*" + +FILES_${PN}-dev += " \ + ${bindir}/gdk-pixbuf-csource \ + ${includedir}/*" + +FILES_${PN}-dbg += " \ + ${libdir}/.debug/* \ + ${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders/.debug/*" + +postinst_pixbufloader () { +if [ "x$D" != "x" ]; then + exit 1 +fi + +GDK_PIXBUF_MODULEDIR=${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders gdk-pixbuf-query-loaders --update-cache + +test -x ${bindir}/gtk-update-icon-cache && gtk-update-icon-cache -q ${datadir}/icons/hicolor +} + +PACKAGES_DYNAMIC += "gdk-pixbuf-loader-*" +PACKAGES_DYNAMIC_virtclass-native = "" + +python populate_packages_prepend () { + postinst_pixbufloader = bb.data.getVar("postinst_pixbufloader", d, 1) + + loaders_root = bb.data.expand('${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders', d) + + do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', postinst_pixbufloader) +} + +do_install_append_virtclass-native() { +#Use wrapper script rather than binary as required libtool library is not installed now + GDK_PIXBUF_MODULEDIR=${D}${libdir}/gdk-pixbuf-2.0/2.10.0/loaders ${S}/gdk-pixbuf/gdk-pixbuf-query-loaders > ${D}${libdir}/gdk-pixbuf-2.0/2.10.0/loaders.cache + sed -i -e 's#${D}##g' ${D}${libdir}/gdk-pixbuf-2.0/2.10.0/loaders.cache + find ${D}${libdir} -name "libpixbufloader-*.la" -exec rm \{\} \; +} +BBCLASSEXTEND = "native" diff --git a/meta/recipes-gnome/gnome/gconf-dbus_svn.bb b/meta/recipes-gnome/gnome/gconf-dbus_svn.bb index 879a0bb55..9fdd82c96 100644 --- a/meta/recipes-gnome/gnome/gconf-dbus_svn.bb +++ b/meta/recipes-gnome/gnome/gconf-dbus_svn.bb @@ -8,7 +8,7 @@ PROVIDES = "gconf" RPROVIDES_${PN} = "gconf" RPROVIDES_${PN}-dev = "gconf-dev" -PV = "2.16.0+svnr${SRCREV}" +PV = "2.16.0+svnr${SRCPV}" SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http" S = "${WORKDIR}/trunk" diff --git a/meta/recipes-gnome/gnome/gnome-common_2.28.0.bb b/meta/recipes-gnome/gnome/gnome-common_2.28.0.bb index b4adfe412..c2e1c8279 100644 --- a/meta/recipes-gnome/gnome/gnome-common_2.28.0.bb +++ b/meta/recipes-gnome/gnome/gnome-common_2.28.0.bb @@ -25,3 +25,5 @@ DEPENDS = "" FILES_${PN} += "${datadir}/aclocal" FILES_${PN}-dev = "" + +BBCLASSEXTEND = "native" diff --git a/meta/recipes-gnome/gnome/gnome-doc-utils.inc b/meta/recipes-gnome/gnome/gnome-doc-utils.inc index 00a64e258..30cff36dd 100644 --- a/meta/recipes-gnome/gnome/gnome-doc-utils.inc +++ b/meta/recipes-gnome/gnome/gnome-doc-utils.inc @@ -1,9 +1,8 @@ LICENSE = "GPL LGPL" -DEPENDS = "libxml2 libxslt libxslt-native" +DEPENDS = "libxml2 libxslt libxslt-native gnome-doc-utils-native" +DEPENDS_virtclass-native = "libxml2-native libxslt-native" -PR = "r1" - -inherit gnome +inherit gnome gettext EXTRA_OECONF = "--disable-scrollkeeper" @@ -13,3 +12,5 @@ do_install_append() { } FILES_${PN} += "${datadir}/xml*" + +BBCLASSEXTEND = "native" diff --git a/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.2.bb b/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.2.bb deleted file mode 100644 index 9bdcceda7..000000000 --- a/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.2.bb +++ /dev/null @@ -1,7 +0,0 @@ -require gnome-doc-utils.inc -LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=eb723b61539feef013de476e68b5c50a \ - file://COPYING.LGPL;md5=a6f89e2100d9b6cdffcea4f398e37343 " -PR = "r1" - -SRC_URI[archive.md5sum] = "920914c13c57e67616c6ff8594579786" -SRC_URI[archive.sha256sum] = "f6c0124f61b9400c63da630dd3a9ac1b738eac0058da245661ff699fad267aca" diff --git a/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.4.bb b/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.4.bb new file mode 100644 index 000000000..a8cbcf0fe --- /dev/null +++ b/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.4.bb @@ -0,0 +1,7 @@ +require gnome-doc-utils.inc +LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=eb723b61539feef013de476e68b5c50a \ + file://COPYING.LGPL;md5=a6f89e2100d9b6cdffcea4f398e37343" +PR = "r0" + +SRC_URI[archive.md5sum] = "6872b68dd081fc033e07d5877b4c0645" +SRC_URI[archive.sha256sum] = "97c6465ffb15969a9fe1761f16f30c1028977fb24ecda89a0b479170f6412e4d" diff --git a/meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb b/meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb index 989842897..17fff1c53 100644 --- a/meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb +++ b/meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb @@ -7,9 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e7e289d90fc8bdceed5e3f142f98229e" SECTION = "x11/gnome" DEPENDS = "icon-naming-utils-native glib-2.0 intltool-native" -RDEPENDS = "hicolor-icon-theme" -RRECOMMENDS = "librsvg-gtk" -PR = "r0" +RDEPENDS_${PN} = "hicolor-icon-theme" +RRECOMMENDS_${PN} = "librsvg-gtk" +PR = "r1" FILES_${PN} += "${datadir}/*" diff --git a/meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb b/meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb index 153979e36..5932ddd8c 100644 --- a/meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb +++ b/meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb @@ -11,12 +11,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ SECTION = "x11/gnome" -PR = "r0" +PR = "r1" inherit autotools gnome pkgconfig DEPENDS = "gtk+ libgcrypt libtasn1 libtasn1-native gconf" -RDEPENDS = "libgnome-keyring" +RDEPENDS_${PN} = "libgnome-keyring" EXTRA_OECONF = "--disable-gtk-doc" diff --git a/meta/recipes-gnome/gnome/gnome-mime-data_2.18.0.bb b/meta/recipes-gnome/gnome/gnome-mime-data_2.18.0.bb index 3bb50d1af..b730daed3 100644 --- a/meta/recipes-gnome/gnome/gnome-mime-data_2.18.0.bb +++ b/meta/recipes-gnome/gnome/gnome-mime-data_2.18.0.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ inherit gnome inherit autotools -PR = "r3" +PR = "r4" SRC_URI += "file://pkgconfig.patch;patch=1" @@ -16,4 +16,4 @@ SRC_URI[archive.md5sum] = "541858188f80090d12a33b5a7c34d42c" SRC_URI[archive.sha256sum] = "37196b5b37085bbcd45c338c36e26898fe35dd5975295f69f48028b1e8436fd7" DEPENDS += "shared-mime-info intltool-native" -RDEPENDS = "shared-mime-info" +RDEPENDS_${PN} = "shared-mime-info" diff --git a/meta/recipes-gnome/gnome/gobject-introspection_git.bb b/meta/recipes-gnome/gnome/gobject-introspection_git.bb index 81d279ac7..17a42a9a5 100644 --- a/meta/recipes-gnome/gnome/gobject-introspection_git.bb +++ b/meta/recipes-gnome/gnome/gobject-introspection_git.bb @@ -8,13 +8,13 @@ SRC_URI_virtclass-native = "git://git.gnome.org/gobject-introspection;protocol=g LICENSE = "GPLv2+ & LGPLv2+" LIC_FILES_CHKSUM = "file://COPYING.tools;md5=94d55d512a9ba36caa9b7df079bae19f \ file://COPYING.lib;md5=3bf50002aefd002f49e7bb854063f7e7" -PV = "0.0+git${SRCREV}" +PV = "0.0+git${SRCPV}" PR = "r3" S = "${WORKDIR}/git" DEPENDS = "libffi python-native gobject-introspection-native" -DEPENDS_virtclass-native = "libffi-native python-native" +DEPENDS_virtclass-native = "libffi-native python-native bison-native flex-native" inherit autotools diff --git a/meta/recipes-gnome/gnome/libgdata_0.6.5.bb b/meta/recipes-gnome/gnome/libgdata_0.7.1.bb index b5e6ee3a6..c3329945a 100644 --- a/meta/recipes-gnome/gnome/libgdata_0.6.5.bb +++ b/meta/recipes-gnome/gnome/libgdata_0.7.1.bb @@ -7,9 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24 \ file://gdata/gdata.h;endline=20;md5=079a554efcf65d46f96a515806e7e99a \ file://gdata/gdata-types.h;endline=20;md5=7399b111aac8718da13888fc634be6ef" -DEPENDS = "libxml2 glib-2.0 libsoup-2.4" +DEPENDS = "gettext libxml2 glib-2.0 libsoup-2.4" inherit gnome pkgconfig autotools -SRC_URI[archive.md5sum] = "e12f52a3d25c25016856c64ca0331221" -SRC_URI[archive.sha256sum] = "dcb82f7162d69549512444376da2cdea65650ee4dae4d00eed7fbbd3387ddf2c" +SRC_URI[archive.md5sum] = "ec5262cbcb07b63b58d45aa3ac636096" +SRC_URI[archive.sha256sum] = "fb244138276a5ce98510b0e2408bbf6f9ce0fd8cdcf86f07cd4be38afbb7c2bc" diff --git a/meta/recipes-gnome/gnome/metacity/crosscompile.patch b/meta/recipes-gnome/gnome/metacity/crosscompile.patch new file mode 100644 index 000000000..8d86134fa --- /dev/null +++ b/meta/recipes-gnome/gnome/metacity/crosscompile.patch @@ -0,0 +1,60 @@ +This patch is revised version from openembed. It build host native binary +rather than target binary in cross-compile environment. + +Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> + +Index: metacity-2.30.3/src/Makefile.am +=================================================================== +--- metacity-2.30.3.orig/src/Makefile.am 2010-09-05 00:09:52.000000000 +0800 ++++ metacity-2.30.3/src/Makefile.am 2010-12-31 11:15:31.000000000 +0800 +@@ -134,11 +134,9 @@ + metacity_theme_viewer_SOURCES= \ + ui/theme-viewer.c + +-schema_bindings_SOURCES = \ +- core/schema-bindings.c \ +- metacity.schemas.in.in ++schema_bindings: ++ @CC_FOR_BUILD@ core/schema-bindings.c -I./include -I../ @CFLAGS_FOR_BUILD@ @LDFLAGS_FOR_BUILD@ -o schema_bindings + +-schema_bindings_LDADD = @METACITY_LIBS@ + metacity.schemas.in: schema_bindings ${srcdir}/metacity.schemas.in.in + @echo Generating keybinding schemas... ${srcdir}/metacity.schemas.in.in + ${builddir}/schema_bindings ${srcdir}/metacity.schemas.in.in ${builddir}/metacity.schemas.in +Index: metacity-2.30.3/configure.in +=================================================================== +--- metacity-2.30.3.orig/configure.in 2010-09-22 22:14:06.000000000 +0800 ++++ metacity-2.30.3/configure.in 2010-12-31 11:15:31.000000000 +0800 +@@ -31,6 +31,32 @@ + AC_LIBTOOL_WIN32_DLL + AM_PROG_LIBTOOL + ++if test x"$CC_FOR_BUILD" = x; then ++ if test x"$cross_compiling" = xyes; then ++ AC_CHECK_PROGS(CC_FOR_BUILD, gcc cc) ++ else ++ CC_FOR_BUILD="$CC" ++ fi ++fi ++AC_SUBST([CC_FOR_BUILD]) ++if test x"$CFLAGS_FOR_BUILD" = x; then ++ if test x"$cross_compiling" = xyes; then ++ echo boo! ++ else ++ CFLAGS_FOR_BUILD="$CFLAGS" ++ fi ++fi ++AC_SUBST([CFLAGS_FOR_BUILD]) ++if test x"$LDFLAGS_FOR_BUILD" = x; then ++ if test x"$cross_compiling" = xyes; then ++ echo boo! ++ else ++ LDFLAGS_FOR_BUILD="$LDFLAGS" ++ fi ++fi ++AC_SUBST([LDFLAGS_FOR_BUILD]) ++ ++ + #### Integer sizes + + AC_CHECK_SIZEOF(char) diff --git a/meta/recipes-gnome/gnome/metacity_2.22.0.bb b/meta/recipes-gnome/gnome/metacity_2.22.0.bb deleted file mode 100644 index e698ec439..000000000 --- a/meta/recipes-gnome/gnome/metacity_2.22.0.bb +++ /dev/null @@ -1,23 +0,0 @@ -SECTION = "x11/wm" -DESCRIPTION = "Metacity is the boring window manager for the adult in you." -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://src/include/main.h;endline=24;md5=c2242df552c880280315989bab626b90" - -DEPENDS = "startup-notification gtk+ gconf gdk-pixbuf-csource-native" -PR = "r3" - -inherit gnome update-alternatives - -ALTERNATIVE_NAME = "x-window-manager" -ALTERNATIVE_LINK = "${bindir}/x-window-manager" -ALTERNATIVE_PATH = "${bindir}/metacity" -ALTERNATIVE_PRIORITY = "10" - -EXTRA_OECONF += "--disable-verbose \ - --disable-xinerama" - -FILES_${PN} += "${datadir}/themes" - -SRC_URI[archive.md5sum] = "8cb6d02cf66a1003532b4f5d2754d696" -SRC_URI[archive.sha256sum] = "3c670b41a214311006dc05f9a005696b9d3fdcb5c80f1275367416600103b3bf" diff --git a/meta/recipes-gnome/gnome/metacity_2.30.3.bb b/meta/recipes-gnome/gnome/metacity_2.30.3.bb new file mode 100644 index 000000000..18105f2d6 --- /dev/null +++ b/meta/recipes-gnome/gnome/metacity_2.30.3.bb @@ -0,0 +1,29 @@ +SECTION = "x11/wm" +DESCRIPTION = "Metacity is the boring window manager for the adult in you." +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ + file://src/include/main.h;endline=24;md5=c2242df552c880280315989bab626b90" + +DEPENDS = "startup-notification gtk+ gconf gdk-pixbuf-native libcanberra" +PR = "r0" + +inherit gnome update-alternatives + +SRC_URI += "file://crosscompile.patch;patch=1" + +ALTERNATIVE_NAME = "x-window-manager" +ALTERNATIVE_LINK = "${bindir}/x-window-manager" +ALTERNATIVE_PATH = "${bindir}/metacity" +ALTERNATIVE_PRIORITY = "10" + +EXTRA_OECONF += "--disable-verbose \ + --disable-xinerama" + +FILES_${PN} += "${datadir}/themes" + +export CC_FOR_BUILD = "${BUILD_CC}" +export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS} -I${STAGING_LIBDIR_NATIVE}/glib-2.0/include -I${STAGING_INCDIR_NATIVE}/glib-2.0 -I${STAGING_INCDIR_NATIVE}/glib-2.0/include -I${STAGING_INCDIR_NATIVE}" +export LDFLAGS_FOR_BUILD = "${BUILD_LDFLAGS} -L${STAGING_LIBDIR_NATIVE} -lglib-2.0" + +SRC_URI[archive.md5sum] = "553784f376d96b902e19ff437cd5b339" +SRC_URI[archive.sha256sum] = "08f887018fa5e447cf184d03bae3fe2c05fdb7583bed6768e3b4d66392fc18dd" diff --git a/meta/recipes-gnome/gthumb/gthumb_2.12.0.bb b/meta/recipes-gnome/gthumb/gthumb_2.12.1.bb index 7df9d5107..8a88230ce 100644 --- a/meta/recipes-gnome/gthumb/gthumb_2.12.0.bb +++ b/meta/recipes-gnome/gthumb/gthumb_2.12.1.bb @@ -3,7 +3,7 @@ SECTION = "x11/gnome" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" DEPENDS = "glib-2.0 gtk+ libxml2 gnome-doc-utils libunique gconf-dbus libpng gstreamer jpeg tiff" -PR = "r1" +PR = "r0" EXTRA_OECONF = "--disable-gnome-keyring --disable-libsoup --disable-exiv2 --disable-clutter" @@ -12,5 +12,5 @@ inherit gnome pkgconfig FILES_${PN} += "${datadir}/icons" FILES_${PN}-dbg += "${libdir}/gthumb/modules/.debug" -SRC_URI[archive.md5sum] = "2911cd9b875efdfd554547176c59e309" -SRC_URI[archive.sha256sum] = "9bb32ee44647f3f934d41344e2c1dbbd1546bf4949824030b3b818545758118c" +SRC_URI[archive.md5sum] = "a89be18a9e6f7f9d65cef56f34eb3022" +SRC_URI[archive.sha256sum] = "94d186db48e4527f1ba1dad41b860fc34b8f13da4228319dc742c91f45ddea64" diff --git a/meta/recipes-gnome/gtk+/gdk-pixbuf-csource-native_2.12.7.bb b/meta/recipes-gnome/gtk+/gdk-pixbuf-csource-native_2.12.7.bb deleted file mode 100644 index c88a79570..000000000 --- a/meta/recipes-gnome/gtk+/gdk-pixbuf-csource-native_2.12.7.bb +++ /dev/null @@ -1,37 +0,0 @@ -require gtk+_${PV}.bb -inherit native -DEPENDS = "jpeg-native libpng-native gettext-native glib-2.0-native libx11-native" -S = "${WORKDIR}/gtk+-${PV}" -FILESPATH = "${FILE_DIRNAME}/gdk-pixbuf-csource:${FILE_DIRNAME}/gtk+-${PV}:${FILE_DIRNAME}/files" -SRC_URI += "file://reduce-dependencies.patch;patch=1" -PR = "r11" - -#clear recommends for uclibc builds -RRECOMMENDS = " " -RRECOMMENDS_${PN}_linux = " " -RRECOMMENDS_${PN}_linux-gnueabi = " " - -EXTRA_OECONF = "\ - --with-gdktarget=x11 \ - --without-libtiff \ - --with-libjpeg \ - --with-libpng \ - --x-includes=${STAGING_INCDIR} \ - --x-libraries=${STAGING_LIBDIR} \ -" - -PACKAGES_DYNAMIC = "" - -do_compile() { - cd gdk-pixbuf && oe_runmake -} - -do_install() { - cd gdk-pixbuf - oe_runmake 'DESTDIR=${D}' install - install -d ${D}${sysconfdir}/gtk-2.0 - GDK_PIXBUF_MODULEDIR=${D}${libdir}/gtk-2.0/2.10.0/loaders ${D}${bindir}/gdk-pixbuf-query-loaders > ${D}${sysconfdir}/gtk-2.0/gdk-pixbuf.loaders - sed -i -e 's#${D}##g' ${D}${sysconfdir}/gtk-2.0/gdk-pixbuf.loaders - find ${D}${libdir} -name "libpixbufloader-*.la" -exec rm \{\} \; -} - diff --git a/meta/recipes-gnome/gtk+/gdk-pixbuf-csource/reduce-dependencies.patch b/meta/recipes-gnome/gtk+/gdk-pixbuf-csource/reduce-dependencies.patch deleted file mode 100644 index 6b030e8f1..000000000 --- a/meta/recipes-gnome/gtk+/gdk-pixbuf-csource/reduce-dependencies.patch +++ /dev/null @@ -1,221 +0,0 @@ -# -# strip unnecessary stuff out of configure, we just want -# to build gdk-pixbuf-csource. -# -- Michael 'Mickey' Lauer <mlauer@vanille-media.de> -# ---- -# configure.in | 116 ++--------------------------------------------------------- -# 1 file changed, 5 insertions(+), 111 deletions(-) -# ---- gtk+-2.12.7.orig/configure.in -+++ gtk+-2.12.7/configure.in -@@ -30,13 +30,10 @@ m4_define([gtk_api_version], [2.0]) - #GTK_BINARY_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$LT_CURRENT - m4_define([gtk_binary_version], [2.10.0]) - - # required versions of other packages - m4_define([glib_required_version], [2.13.5]) --m4_define([pango_required_version], [1.17.3]) --m4_define([atk_required_version], [1.9.0]) --m4_define([cairo_required_version], [1.2.0]) - - - AC_INIT([gtk+], [gtk_version], - [http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B], - [gtk+]) -@@ -347,14 +344,11 @@ ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" - ## Later on we actually use the cflags/libs from separate pkg-config - ## calls. Oh, also the later pkg-config calls don't include - ## the version requirements since those make the module lists - ## annoying to construct - PKG_CHECK_MODULES(BASE_DEPENDENCIES, -- [glib-2.0 >= glib_required_version dnl -- atk >= atk_required_version dnl -- pango >= pango_required_version dnl -- cairo >= cairo_required_version]) -+ [glib-2.0 >= glib_required_version]) - - if test "$os_win32" != yes; then - # libtool option to control which symbols are exported - # right now, symbols starting with _ are not exported - LIBTOOL_EXPORT_OPTIONS='-export-symbols-regex "^[[^_]].*"' -@@ -1059,27 +1053,19 @@ GDK_PIXBUF_DEP_CFLAGS="`$PKG_CONFIG --cf - - GDK_PIXBUF_XLIB_PACKAGES= - GDK_PIXBUF_XLIB_EXTRA_CFLAGS= - GDK_PIXBUF_XLIB_EXTRA_LIBS= - --X_PACKAGES=fontconfig -+X_PACKAGES= - GDK_EXTRA_LIBS="$GDK_WLIBS" - GDK_EXTRA_CFLAGS= - - # GTK+ uses some X calls, so needs to link against X directly - GTK_DEP_PACKAGES_FOR_X= - GTK_DEP_LIBS_FOR_X= - - if test "x$gdktarget" = "xx11"; then -- # -- # We use fontconfig very peripherally when decoding the default -- # settings. -- # -- if $PKG_CONFIG --exists fontconfig; then : ; else -- AC_MSG_ERROR([ --*** fontconfig (http://www.fontconfig.org) is required by the X11 backend.]) -- fi - - # - # Check for basic X packages; we use pkg-config if available - # - if $PKG_CONFIG --exists x11 xext xrender; then -@@ -1122,20 +1108,10 @@ if test "x$gdktarget" = "xx11"; then - CPPFLAGS="$CPPFLAGS $X_CFLAGS" - - gtk_save_LIBS=$LIBS - LIBS="$x_libs_for_checks $LIBS" - -- # Sanity check for the X11 and Xext libraries. While everything we need from -- # Xext is optional, the chances a system has *none* of these things is so -- # small that we just unconditionally require it. -- AC_CHECK_FUNC(XOpenDisplay, :, -- AC_MSG_ERROR([*** libX11 not found. Check 'config.log' for more details.])) -- AC_CHECK_FUNC(XextFindDisplay, :, -- AC_MSG_ERROR([*** libXext not found. Check 'config.log' for more details.])) -- AC_CHECK_FUNC(XRenderQueryExtension, :, -- AC_MSG_ERROR([*** libXrender not found. Check 'config.log' for more details.])) -- - # Check for xReply - - AC_MSG_CHECKING([if <X11/extensions/XIproto.h> is needed for xReply]) - AC_TRY_COMPILE([#include <X11/Xlibint.h>], - [xReply *rep;], -@@ -1416,104 +1392,33 @@ if test "x$gdktarget" = "xdirectfb"; the - AM_CONDITIONAL(USE_DIRECTFB, true) - else - AM_CONDITIONAL(USE_DIRECTFB, false) - fi - -- --# Check for Pango flags -- --if test "x$gdktarget" = "xwin32"; then -- PANGO_PACKAGES="pangowin32 pangocairo" --else -- PANGO_PACKAGES="pango pangocairo" --fi -- --AC_MSG_CHECKING(Pango flags) --if $PKG_CONFIG --exists $PANGO_PACKAGES ; then -- PANGO_CFLAGS=`$PKG_CONFIG --cflags $PANGO_PACKAGES` -- PANGO_LIBS=`$PKG_CONFIG --libs $PANGO_PACKAGES` -- -- AC_MSG_RESULT($PANGO_CFLAGS $PANGO_LIBS) --else -- AC_MSG_ERROR([ --*** Pango not found. Pango built with Cairo support is required --*** to build GTK+. See http://www.pango.org for Pango information. --]) --fi -- --CFLAGS="$CFLAGS $PANGO_CFLAGS" -- --if $PKG_CONFIG --uninstalled $PANGO_PACKAGES; then -- : --else -- gtk_save_LIBS="$LIBS" -- LIBS="$PANGO_LIBS $LIBS" -- AC_TRY_LINK_FUNC(pango_context_new, :, AC_MSG_ERROR([ --*** Can't link to Pango. Pango is required to build --*** GTK+. For more information see http://www.pango.org])) -- LIBS="$gtk_save_LIBS" --fi -- --CFLAGS="$saved_cflags" --LDFLAGS="$saved_ldflags" -- --GDK_PACKAGES="$PANGO_PACKAGES" --if test "x$gdktarget" = "xx11"; then -- GDK_PACKAGES="$GDK_PACKAGES $X_PACKAGES" --fi - GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS" - GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS" - - # - # If we aren't writing explicit dependencies, then don't put the extra libraries we need - # into the pkg-config files - # - if test $enable_explicit_deps != yes ; then -- GDK_PACKAGES="$PANGO_PACKAGES" -+ GDK_PACKAGES= - GDK_EXTRA_LIBS= - fi - - AC_SUBST(GDK_PACKAGES) - AC_SUBST(GDK_EXTRA_LIBS) - AC_SUBST(GDK_EXTRA_CFLAGS) - AC_SUBST(GDK_DEP_LIBS) - AC_SUBST(GDK_DEP_CFLAGS) - - --######################################## --# Check for Accessibility Toolkit flags --######################################## -- --ATK_PACKAGES=atk --AC_MSG_CHECKING(ATK flags) --if $PKG_CONFIG --exists $ATK_PACKAGES ; then -- ATK_CFLAGS=`$PKG_CONFIG --cflags $ATK_PACKAGES` -- ATK_LIBS=`$PKG_CONFIG --libs $ATK_PACKAGES` -- -- AC_MSG_RESULT($ATK_CFLAGS $ATK_LIBS) --else -- AC_MSG_ERROR([ --*** Accessibility Toolkit not found. Accessibility Toolkit is required --*** to build GTK+. --]) --fi -- --if $PKG_CONFIG --uninstalled $ATK_PACKAGES; then -- : --else -- gtk_save_LIBS="$LIBS" -- LIBS="$ATK_LIBS $LIBS" -- AC_TRY_LINK_FUNC(atk_object_get_type, : , AC_MSG_ERROR([ -- *** Cannot link to Accessibility Toolkit. Accessibility Toolkit is required -- *** to build GTK+])) -- LIBS="$gtk_save_LIBS" --fi -- --GTK_PACKAGES="atk cairo" -+GTK_PACKAGES= - GTK_EXTRA_LIBS= - GTK_EXTRA_CFLAGS= --GTK_DEP_LIBS="$GDK_EXTRA_LIBS $GTK_DEP_LIBS_FOR_X `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $PANGO_PACKAGES $GTK_PACKAGES_FOR_X $GTK_PACKAGES` $GTK_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS" -+GTK_DEP_LIBS="$GDK_EXTRA_LIBS $GTK_DEP_LIBS_FOR_X `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GTK_PACKAGES_FOR_X $GTK_PACKAGES` $GTK_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS" - GTK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GTK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS $GTK_EXTRA_CFLAGS" - - if test x"$os_win32" = xyes; then - GTK_EXTRA_CFLAGS="$msnative_struct" - fi -@@ -1567,21 +1472,10 @@ LIBS="$CUPS_LIBS" - AC_CHECK_FUNCS(httpGetAuthString) - LIBS="$gtk_save_libs" - - gtk_save_cppflags="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS" -- --AC_CHECK_HEADER(cairo-pdf.h,,AC_MSG_ERROR([ --*** Can't find cairo-pdf.h. You must build Cairo with the pdf --*** backend enabled.])) -- --if test "$os_win32" != "yes"; then -- AC_CHECK_HEADER(cairo-ps.h,,AC_MSG_ERROR([ --*** Can't find cairo-ps.h. You must build Cairo with the --*** postscript backend enabled.])) --fi -- - CPPFLAGS="$gtk_save_cppflags" - - - AC_ARG_ENABLE(test-print-backend, - [AC_HELP_STRING([--enable-test-print-backend], diff --git a/meta/recipes-gnome/gtk+/gtk+-2.20.1/disable-gio-png-sniff-test.diff b/meta/recipes-gnome/gtk+/gtk+-2.20.1/disable-gio-png-sniff-test.diff deleted file mode 100644 index 13ae61ef8..000000000 --- a/meta/recipes-gnome/gtk+/gtk+-2.20.1/disable-gio-png-sniff-test.diff +++ /dev/null @@ -1,97 +0,0 @@ -Index: gtk+-2.21.2/configure.in -=================================================================== ---- gtk+-2.21.2.orig/configure.in 2010-06-22 18:14:40.000000000 +0800 -+++ gtk+-2.21.2/configure.in 2010-06-22 18:14:58.000000000 +0800 -@@ -1072,48 +1072,50 @@ - # check one of the variables here - AM_CONDITIONAL(INCLUDE_GDIPLUS, [test x"$INCLUDE_gdip_ico" = xyes]) - --if test x$gio_can_sniff = x; then -- AC_MSG_CHECKING([if gio can sniff png]) -- gtk_save_LIBS="$LIBS" -- gtk_save_CFLAGS="$CFLAGS" -- LIBS="`$PKG_CONFIG --libs gio-2.0`" -- CFLAGS="`$PKG_CONFIG --cflags gio-2.0`" -- AC_RUN_IFELSE([AC_LANG_SOURCE([[ -- #include <gio/gio.h> -- static const gsize data_size = 159; -- static const guint8 data[] = -- { -- 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, -- 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, -- 0x08, 0x02, 0x00, 0x00, 0x00, 0x90, 0x77, 0x53, 0xde, 0x00, 0x00, 0x00, -- 0x01, 0x73, 0x52, 0x47, 0x42, 0x00, 0xae, 0xce, 0x1c, 0xe9, 0x00, 0x00, -- 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00, 0x00, -- 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18, 0x00, 0x00, 0x00, 0x07, 0x74, -- 0x49, 0x4d, 0x45, 0x07, 0xd8, 0x07, 0x0f, 0x10, 0x08, 0x15, 0x61, 0xd8, -- 0x35, 0x37, 0x00, 0x00, 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x43, 0x6f, -- 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x00, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, -- 0x64, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x47, 0x49, 0x4d, 0x50, 0x57, -- 0x81, 0x0e, 0x17, 0x00, 0x00, 0x00, 0x0c, 0x49, 0x44, 0x41, 0x54, 0x08, -- 0xd7, 0x63, 0xf8, 0xff, 0xff, 0x3f, 0x00, 0x05, 0xfe, 0x02, 0xfe, 0xdc, -- 0xcc, 0x59, 0xe7, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, -- 0x42, 0x60, 0x82 -- }; -- int -- main (int argc, char **argv) -- { -- char *content_type; -- char *image_png; -- content_type = g_content_type_guess (NULL, data, data_size, NULL); -- image_png = g_content_type_from_mime_type ("image/png"); -- return !!strcmp (content_type, image_png); -- }]])], -- [gio_can_sniff=yes -- AC_DEFINE(GDK_PIXBUF_USE_GIO_MIME, 1, [Define if gio can sniff image data])], -- [gio_can_sniff=no]) -- AC_MSG_RESULT($gio_can_sniff) -- LIBS="$gtk_save_LIBS" -- CFLAGS="$gtk_save_CFLAGS" --fi -+# Disabled due to cross-compile -+#if test x$gio_can_sniff = x; then -+# AC_MSG_CHECKING([if gio can sniff png]) -+# gtk_save_LIBS="$LIBS" -+# gtk_save_CFLAGS="$CFLAGS" -+# LIBS="`$PKG_CONFIG --libs gio-2.0`" -+# CFLAGS="`$PKG_CONFIG --cflags gio-2.0`" -+# AC_RUN_IFELSE([AC_LANG_SOURCE([[ -+# #include <gio/gio.h> -+# static const gsize data_size = 159; -+# static const guint8 data[] = -+# { -+# 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, -+# 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, -+# 0x08, 0x02, 0x00, 0x00, 0x00, 0x90, 0x77, 0x53, 0xde, 0x00, 0x00, 0x00, -+# 0x01, 0x73, 0x52, 0x47, 0x42, 0x00, 0xae, 0xce, 0x1c, 0xe9, 0x00, 0x00, -+# 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00, 0x00, -+# 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18, 0x00, 0x00, 0x00, 0x07, 0x74, -+# 0x49, 0x4d, 0x45, 0x07, 0xd8, 0x07, 0x0f, 0x10, 0x08, 0x15, 0x61, 0xd8, -+# 0x35, 0x37, 0x00, 0x00, 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x43, 0x6f, -+# 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x00, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, -+# 0x64, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x47, 0x49, 0x4d, 0x50, 0x57, -+# 0x81, 0x0e, 0x17, 0x00, 0x00, 0x00, 0x0c, 0x49, 0x44, 0x41, 0x54, 0x08, -+# 0xd7, 0x63, 0xf8, 0xff, 0xff, 0x3f, 0x00, 0x05, 0xfe, 0x02, 0xfe, 0xdc, -+# 0xcc, 0x59, 0xe7, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, -+# 0x42, 0x60, 0x82 -+# }; -+# int -+# main (int argc, char **argv) -+# { -+# char *content_type; -+# char *image_png; -+# content_type = g_content_type_guess (NULL, data, data_size, NULL); -+# image_png = g_content_type_from_mime_type ("image/png"); -+# return !!strcmp (content_type, image_png); -+# }]])], -+# [gio_can_sniff=yes -+# [gio_can_sniff=no]) -+# AC_MSG_RESULT($gio_can_sniff) -+# LIBS="$gtk_save_LIBS" -+# CFLAGS="$gtk_save_CFLAGS" -+#fi -+ -+AC_DEFINE(GDK_PIXBUF_USE_GIO_MIME, 1, [Define if gio can sniff image data])], - - # - # Allow building some or all immodules included diff --git a/meta/recipes-gnome/gtk+/gtk+-2.20.1/no-demos.patch b/meta/recipes-gnome/gtk+/gtk+-2.20.1/no-demos.patch deleted file mode 100644 index 0fc4c48d1..000000000 --- a/meta/recipes-gnome/gtk+/gtk+-2.20.1/no-demos.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- gtk+-2.10.1/Makefile.am.orig 2006-08-08 12:37:30.000000000 +0100 -+++ gtk+-2.10.1/Makefile.am 2006-08-08 12:37:48.000000000 +0100 -@@ -1,6 +1,6 @@ - ## Makefile.am for GTK+ - --SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib -+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules tests perf contrib - SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros - - # require automake 1.4 diff --git a/meta/recipes-gnome/gtk+/gtk+-2.20.1/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch b/meta/recipes-gnome/gtk+/gtk+-2.22.1/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch index ee55f9cc3..ee55f9cc3 100644 --- a/meta/recipes-gnome/gtk+/gtk+-2.20.1/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch +++ b/meta/recipes-gnome/gtk+/gtk+-2.22.1/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch diff --git a/meta/recipes-gnome/gtk+/gtk+-2.20.1/cellrenderer-cairo.patch b/meta/recipes-gnome/gtk+/gtk+-2.22.1/cellrenderer-cairo.patch index 92ce64312..92ce64312 100644 --- a/meta/recipes-gnome/gtk+/gtk+-2.20.1/cellrenderer-cairo.patch +++ b/meta/recipes-gnome/gtk+/gtk+-2.22.1/cellrenderer-cairo.patch diff --git a/meta/recipes-gnome/gtk+/gtk+-2.20.1/configurefix.patch b/meta/recipes-gnome/gtk+/gtk+-2.22.1/configurefix.patch index 7f6c73be4..7f6c73be4 100644 --- a/meta/recipes-gnome/gtk+/gtk+-2.20.1/configurefix.patch +++ b/meta/recipes-gnome/gtk+/gtk+-2.22.1/configurefix.patch diff --git a/meta/recipes-gnome/gtk+/gtk+-2.20.1/entry-cairo.patch b/meta/recipes-gnome/gtk+/gtk+-2.22.1/entry-cairo.patch index 3313e7f13..3313e7f13 100644 --- a/meta/recipes-gnome/gtk+/gtk+-2.20.1/entry-cairo.patch +++ b/meta/recipes-gnome/gtk+/gtk+-2.22.1/entry-cairo.patch diff --git a/meta/recipes-gnome/gtk+/gtk+-2.22.1/hardcoded_libtool.patch b/meta/recipes-gnome/gtk+/gtk+-2.22.1/hardcoded_libtool.patch new file mode 100644 index 000000000..7937ef2d0 --- /dev/null +++ b/meta/recipes-gnome/gtk+/gtk+-2.22.1/hardcoded_libtool.patch @@ -0,0 +1,31 @@ +Index: gtk+-2.23.2/configure.in +=================================================================== +--- gtk+-2.23.2.orig/configure.in 2010-11-10 22:22:47.000000000 +0800 ++++ gtk+-2.23.2/configure.in 2010-11-25 13:32:40.000000000 +0800 +@@ -414,7 +414,7 @@ + case $enable_explicit_deps in + auto) + export SED +- deplibs_check_method=`(./libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh` ++ deplibs_check_method=`(./$host_alias-libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh` + if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then + enable_explicit_deps=yes + else +@@ -773,7 +773,7 @@ + dnl Now we check to see if our libtool supports shared lib deps + dnl (in a rather ugly way even) + if $dynworks; then +- module_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config" ++ module_libtool_config="${CONFIG_SHELL-/bin/sh} $host_alias-libtool --config" + module_deplibs_check=`$module_libtool_config | \ + grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \ + sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'` +@@ -1555,7 +1555,7 @@ + # We are using gmodule-no-export now, but I'm leaving the stripping + # code in place for now, since pango and atk still require gmodule. + export SED +-export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` ++export_dynamic=`($host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` + if test -n "$export_dynamic"; then + GDK_DEP_LIBS=`echo $GDK_DEP_LIBS | sed -e "s/$export_dynamic//"` + GTK_DEP_LIBS=`echo $GTK_DEP_LIBS | sed -e "s/$export_dynamic//"` diff --git a/meta/recipes-gnome/gtk+/gtk+-2.22.1/no-demos.patch b/meta/recipes-gnome/gtk+/gtk+-2.22.1/no-demos.patch new file mode 100644 index 000000000..21700161e --- /dev/null +++ b/meta/recipes-gnome/gtk+/gtk+-2.22.1/no-demos.patch @@ -0,0 +1,13 @@ +Index: gtk+-2.23.2/Makefile.am +=================================================================== +--- gtk+-2.23.2.orig/Makefile.am 2010-11-10 20:34:42.000000000 +0800 ++++ gtk+-2.23.2/Makefile.am 2010-11-25 13:39:22.000000000 +0800 +@@ -1,7 +1,7 @@ + ## Makefile.am for GTK+ + include $(top_srcdir)/Makefile.decl + +-SRC_SUBDIRS = gdk gtk modules demos tests perf ++SRC_SUBDIRS = gdk gtk modules tests perf + SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build + + # require automake 1.4 diff --git a/meta/recipes-gnome/gtk+/gtk+-2.20.1/run-iconcache.patch b/meta/recipes-gnome/gtk+/gtk+-2.22.1/run-iconcache.patch index 518875e6f..518875e6f 100644 --- a/meta/recipes-gnome/gtk+/gtk+-2.20.1/run-iconcache.patch +++ b/meta/recipes-gnome/gtk+/gtk+-2.22.1/run-iconcache.patch diff --git a/meta/recipes-gnome/gtk+/gtk+-2.20.1/toggle-font.diff b/meta/recipes-gnome/gtk+/gtk+-2.22.1/toggle-font.diff index 4853628c8..4853628c8 100644 --- a/meta/recipes-gnome/gtk+/gtk+-2.20.1/toggle-font.diff +++ b/meta/recipes-gnome/gtk+/gtk+-2.22.1/toggle-font.diff diff --git a/meta/recipes-gnome/gtk+/gtk+-2.20.1/xsettings.patch b/meta/recipes-gnome/gtk+/gtk+-2.22.1/xsettings.patch index 84231e9b9..84231e9b9 100644 --- a/meta/recipes-gnome/gtk+/gtk+-2.20.1/xsettings.patch +++ b/meta/recipes-gnome/gtk+/gtk+-2.22.1/xsettings.patch diff --git a/meta/recipes-gnome/gtk+/gtk+.inc b/meta/recipes-gnome/gtk+/gtk+.inc index c34283eb8..94a8fe618 100644 --- a/meta/recipes-gnome/gtk+/gtk+.inc +++ b/meta/recipes-gnome/gtk+/gtk+.inc @@ -6,15 +6,16 @@ BUGTRACKER = "https://bugzilla.gnome.org/" LICENSE = "LGPLv2 & LGPLv2+ & LGPLv2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" + SECTION = "libs" PRIORITY = "optional" DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc-native libxrandr \ - libgcrypt libxdamage libxrender libxcomposite cairo" + libgcrypt libxdamage libxrender libxcomposite cairo gdk-pixbuf" inherit autotools pkgconfig -FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \ - ${bindir}/gtk-update-icon-cache \ +FILES_${PN} = "${bindir}/gtk-update-icon-cache \ ${bindir}/gtk-query-immodules-2.0 \ ${libdir}/lib*${SOLIBS} \ ${datadir}/themes ${sysconfdir} \ @@ -26,7 +27,6 @@ FILES_${PN}-dev += " \ ${libdir}/gtk-2.0/${LIBV}/loaders/*.la \ ${libdir}/gtk-2.0/${LIBV}/immodules/*.la \ ${libdir}/gtk-2.0/${LIBV}/engines/*.la \ - ${bindir}/gdk-pixbuf-csource \ ${bindir}/gtk-builder-convert" FILES_${PN}-dbg += " \ @@ -38,7 +38,6 @@ FILES_${PN}-dbg += " \ BASE_RRECOMMENDS = "ttf-dejavu-sans" BASE_RRECOMMENDS_angstrom = "ttf-dejavu-sans gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" BASE_RRECOMMENDS_poky = "gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm shared-mime-info" -BASE_RRECOMMENDS_moblin = "gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm shared-mime-info" GLIBC_RRECOMMENDS= "${BASE_RRECOMMENDS} glibc-gconv-iso8859-1" @@ -63,8 +62,8 @@ SYSROOT_PREPROCESS_FUNCS += "gtk_sysroot_preprocess" gtk_sysroot_preprocess () { if [ -e ${D}${bindir}/gtk-builder-convert ]; then - install -d ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/ - install -m 755 ${D}${bindir}/gtk-builder-convert ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/ + install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/ + install -m 755 ${D}${bindir}/gtk-builder-convert ${SYSROOT_DESTDIR}${bindir_crossscripts}/ fi } @@ -74,13 +73,3 @@ if [ "x$D" != "x" ]; then fi } - -postinst_pixbufloader() { -if [ "x$D" != "x" ]; then - exit 1 -fi - -gdk-pixbuf-query-loaders > ${sysconfdir}/gtk-2.0/gdk-pixbuf.loaders - -test -x ${bindir}/gtk-update-icon-cache && gtk-update-icon-cache -q ${datadir}/icons/hicolor -} diff --git a/meta/recipes-gnome/gtk+/gtk+_2.12.7.bb b/meta/recipes-gnome/gtk+/gtk+_2.12.7.bb index d82930851..12193f9b9 100644 --- a/meta/recipes-gnome/gtk+/gtk+_2.12.7.bb +++ b/meta/recipes-gnome/gtk+/gtk+_2.12.7.bb @@ -1,6 +1,6 @@ require gtk+.inc -PR = "r9" +PR = "r10" SRC_URI = "http://download.gnome.org/sources/gtk+/2.12/gtk+-${PV}.tar.bz2 \ file://xsettings.patch;patch=1 \ diff --git a/meta/recipes-gnome/gtk+/gtk+_2.16.6.bb b/meta/recipes-gnome/gtk+/gtk+_2.16.6.bb index becd2bc29..1864d1ba0 100644 --- a/meta/recipes-gnome/gtk+/gtk+_2.16.6.bb +++ b/meta/recipes-gnome/gtk+/gtk+_2.16.6.bb @@ -1,6 +1,6 @@ require gtk+.inc -PR = "r5" +PR = "r6" SRC_URI = "http://download.gnome.org/sources/gtk+/2.16/gtk+-${PV}.tar.bz2 \ file://xsettings.patch;patch=1 \ diff --git a/meta/recipes-gnome/gtk+/gtk+_2.20.1.bb b/meta/recipes-gnome/gtk+/gtk+_2.22.1.bb index dec518746..35aa88325 100644 --- a/meta/recipes-gnome/gtk+/gtk+_2.20.1.bb +++ b/meta/recipes-gnome/gtk+/gtk+_2.22.1.bb @@ -4,9 +4,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ file://gtk/gtk.h;endline=27;md5=c59e0b4490dd135a5726ebf851f9b17f \ file://gdk/gdk.h;endline=27;md5=07db285ec208fb3e0bf7d861b0614202 \ file://tests/testgtk.c;endline=27;md5=262db5db5f776f9863e56df31423e24c" -PR = "r1" +PR = "r0" -SRC_URI = "http://download.gnome.org/sources/gtk+/2.20/gtk+-${PV}.tar.bz2 \ +SRC_URI = "http://download.gnome.org/sources/gtk+/2.22/gtk+-${PV}.tar.bz2 \ file://xsettings.patch;patch=1 \ file://run-iconcache.patch;patch=1 \ file://hardcoded_libtool.patch;patch=1 \ @@ -24,18 +24,17 @@ SRC_URI = "http://download.gnome.org/sources/gtk+/2.20/gtk+-${PV}.tar.bz2 \ # file://gtklabel-resize-patch;patch=1 \ # file://menu-deactivate.patch;patch=1 \ # file://combo-arrow-size.patch;patch=1;pnum=0 \ - file://disable-gio-png-sniff-test.diff;patch=1 \ - file://configurefix.patch;patch=1 \ +# file://configurefix.patch;patch=1 \ " -SRC_URI[md5sum] = "53e6f3a93bd22934878fc4a4a34c68aa" -SRC_URI[sha256sum] = "0e081731d21e34ff45c82199490c2889504fa8b3c7e117c043e82ababaec0f65" +SRC_URI[md5sum] = "fdce46ba354c155230b7d4090b17f7d9" +SRC_URI[sha256sum] = "965bc124f0d25087c4cb2a64cbfd7e4f896e05be8d560fbba68dd8685ba24d07" -EXTRA_OECONF = "--without-libtiff --without-libjasper --disable-xkb --disable-glibtest --disable-cups" +EXTRA_OECONF = "--without-libtiff --without-libjasper --enable-xkb --disable-glibtest --disable-cups" LIBV = "2.10.0" -PACKAGES_DYNAMIC += "gdk-pixbuf-loader-* gtk-immodule-* gtk-printbackend-*" +PACKAGES_DYNAMIC += "gtk-immodule-* gtk-printbackend-*" #-fomit-frame-pointer in default FULL_OPTIMIZATION will cause matchbox-panel segfault on atom-pc & emenlow FULL_OPTIMIZATION_emenlow = "-fexpensive-optimizations -frename-registers -O2 -ggdb -feliminate-unused-debug-types" @@ -45,14 +44,11 @@ python populate_packages_prepend () { import os.path prologue = bb.data.getVar("postinst_prologue", d, 1) - postinst_pixbufloader = bb.data.getVar("postinst_pixbufloader", d, 1) gtk_libdir = bb.data.expand('${libdir}/gtk-2.0/${LIBV}', d) - loaders_root = os.path.join(gtk_libdir, 'loaders') immodules_root = os.path.join(gtk_libdir, 'immodules') printmodules_root = os.path.join(gtk_libdir, 'printbackends'); - do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', postinst_pixbufloader) do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s', prologue + 'gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules') do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s') diff --git a/meta/recipes-gnome/gtk-theme-darkilouche/gtk-theme-darkilouche.bb b/meta/recipes-gnome/gtk-theme-darkilouche/gtk-theme-darkilouche.bb deleted file mode 100644 index 6bf1eedaf..000000000 --- a/meta/recipes-gnome/gtk-theme-darkilouche/gtk-theme-darkilouche.bb +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION = "Dark GTK+ theme" -LICENSE = "GPL" -DEPENDS = "gtk-engines" -RDEPENDS = "gtk-engine-clearlooks gnome-icon-theme" -SECTION = "x11/base" -PACKAGE_ARCH = "all" - -PR = "r1" - -#SRC_URI = "http://art.gnome.org/download/themes/gtk2/1285/GTK2-Darkilouche.tar.bz2" -SRC_URI = "git://people.freedesktop.org/~jimmac/Darkilouche.git;protocol=git \ - file://change-colours.diff;patch=1" - -S = "${WORKDIR}/git" -PACKAGES = ${PN} - -do_install () { - install -d ${D}${datadir}/themes/Darkilouche/gtk-2.0 - install -m 0644 ${S}/index.theme ${D}${datadir}/themes/Darkilouche - install -m 0644 ${S}/gtk-2.0/gtkrc ${D}${datadir}/themes/Darkilouche/gtk-2.0 -} - -FILES_${PN} = "${datadir}/themes/Darkilouche/" diff --git a/meta/recipes-gnome/gtk-theme-darkilouche/gtk-theme-darkilouche/change-colours.diff b/meta/recipes-gnome/gtk-theme-darkilouche/gtk-theme-darkilouche/change-colours.diff deleted file mode 100644 index c9fb7bd73..000000000 --- a/meta/recipes-gnome/gtk-theme-darkilouche/gtk-theme-darkilouche/change-colours.diff +++ /dev/null @@ -1,13 +0,0 @@ -Index: git/index.theme -=================================================================== ---- git.orig/index.theme 2008-09-22 18:54:50.000000000 +0100 -+++ git/index.theme 2008-09-22 18:55:02.000000000 +0100 -@@ -6,6 +6,6 @@ - - [X-GNOME-Metatheme] - GtkTheme=Darkilouche --GtkColorScheme= --MetacityTheme=Gilouche -+GtkColorScheme=fg_color:#f5f5f5f5f5f5,bg_color:#88888a8a8585,text_color:#000000000000,base_color:#bababdbdb6b6,selected_fg_color:#ffffffffffff,selected_bg_color:#686890904343,tooltip_fg_color:#000000000000,tooltip_bg_color:#e5e5e5e5e5e5 -+MetacityTheme=Clearlooks - IconTheme=gnome diff --git a/meta/recipes-gnome/gtkhtml2/gtkhtml2_svn.bb b/meta/recipes-gnome/gtkhtml2/gtkhtml2_svn.bb index a21777517..ac921bf48 100644 --- a/meta/recipes-gnome/gtkhtml2/gtkhtml2_svn.bb +++ b/meta/recipes-gnome/gtkhtml2/gtkhtml2_svn.bb @@ -3,7 +3,7 @@ DEPENDS = "gtk+ glib-2.0 libxml2" DESCRIPTION = "A GTK+ HTML rendering library." LICENSE = "LGPLv2" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605" -PV = "2.11.0+svnr${SRCREV}" +PV = "2.11.0+svnr${SRCPV}" PR = "r1" SRC_URI = "svn://anonymous@svn.gnome.org/svn/gtkhtml2/;module=trunk \ diff --git a/meta/recipes-gnome/librsvg/librsvg-2.32.0/doc_Makefile.patch b/meta/recipes-gnome/librsvg/librsvg-2.32.1/doc_Makefile.patch index 217573bd2..217573bd2 100644 --- a/meta/recipes-gnome/librsvg/librsvg-2.32.0/doc_Makefile.patch +++ b/meta/recipes-gnome/librsvg/librsvg-2.32.1/doc_Makefile.patch diff --git a/meta/recipes-gnome/librsvg/librsvg_2.32.0.bb b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb index 35cf5a4fc..ea9456dff 100644 --- a/meta/recipes-gnome/librsvg/librsvg_2.32.0.bb +++ b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb @@ -8,7 +8,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ SECTION = "x11/utils" DEPENDS = "gtk+ libcroco cairo libxml2 popt" -PR = "r2" + +PR = "r0" inherit autotools pkgconfig gnome @@ -16,8 +17,8 @@ EXTRA_OECONF = "--disable-mozilla-plugin --without-svgz --without-croco --disabl SRC_URI += "file://doc_Makefile.patch" -SRC_URI[archive.md5sum] = "b015a9bd80143ec876af489d882dc28b" -SRC_URI[archive.sha256sum] = "e0f6f936dab583de317cc0c36a48f80bdb9c93775225ee84140c7e5e3f841068" +SRC_URI[archive.md5sum] = "4b00d0fee130c936644892c152f42db7" +SRC_URI[archive.sha256sum] = "91b98051f352fab8a6257688d6b2fd665b4648ed66144861f2f853ccf876d334" do_configure_prepend () { export GDK_PIXBUF_QUERYLOADERS="${libdir}/gtk-2.0/version/loaders" @@ -42,6 +43,6 @@ if [ "x$D" != "x" ]; then exit 1 fi -test -x ${bindir}/gdk-pixbuf-query-loaders && { gdk-pixbuf-query-loaders > ${sysconfdir}/gtk-2.0/gdk-pixbuf.loaders ; } +test -x ${bindir}/gdk-pixbuf-query-loaders && { GDK_PIXBUF_MODULEDIR=${libdir}/gdk-pixbuf-2.0/2.10.0/loaders gdk-pixbuf-query-loaders --update-cache ; } test -x ${bindir}/gtk-update-icon-cache && gtk-update-icon-cache -q ${datadir}/icons/hicolor } diff --git a/meta/recipes-gnome/libunique/libunique_1.1.6.bb b/meta/recipes-gnome/libunique/libunique_1.1.6.bb index 7eb64e0ea..dcc65559a 100644 --- a/meta/recipes-gnome/libunique/libunique_1.1.6.bb +++ b/meta/recipes-gnome/libunique/libunique_1.1.6.bb @@ -1,8 +1,13 @@ +DESCRIPTION = "Unique is a library for writing single instance application. If you launch a single instance application twice, the second instance will either just quit or will send a message to the running instance." +HOMEPAGE = "http://live.gnome.org/LibUnique" +BUGTRACKER = "https://bugzilla.gnome.org/enter_bug.cgi?product=libunique" + SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libunique/1.1/libunique-${PV}.tar.bz2" SRC_URI[md5sum] = "7955769ef31f1bc4f83446dbb3625e6d" SRC_URI[sha256sum] = "e5c8041cef8e33c55732f06a292381cb345db946cf792a4ae18aa5c66cdd4fbb" -PR = "r1" + +PR = "r2" DEPENDS = "glib-2.0 gtk+ dbus" diff --git a/meta/recipes-gnome/tasks/task-poky-sdk-gmae.bb b/meta/recipes-gnome/tasks/task-poky-sdk-gmae.bb index b3b5ebbc1..d009e4ebe 100644 --- a/meta/recipes-gnome/tasks/task-poky-sdk-gmae.bb +++ b/meta/recipes-gnome/tasks/task-poky-sdk-gmae.bb @@ -6,7 +6,7 @@ DESCRIPTION = "Gnome Mobile And Embedded Software Development Kit for OpenedHand LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -PR = "r9" +PR = "r10" ALLOW_EMPTY = "1" @@ -14,7 +14,7 @@ require task-sdk-gmae.inc PACKAGES = "${PN}" -RDEPENDS = "\ +RDEPENDS_${PN} = "\ task-poky-sdk \ libglade-dev \ ${SDK-GMAE} \ diff --git a/meta/recipes-gnome/tasks/task-poky-standalone-gmae-sdk-target.bb b/meta/recipes-gnome/tasks/task-poky-standalone-gmae-sdk-target.bb index cf81bf387..7dcad6194 100644 --- a/meta/recipes-gnome/tasks/task-poky-standalone-gmae-sdk-target.bb +++ b/meta/recipes-gnome/tasks/task-poky-standalone-gmae-sdk-target.bb @@ -6,7 +6,7 @@ DESCRIPTION = "Gnome Mobile And Embedded Software Development Kit for OpenedHand LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -PR = "r11" +PR = "r12" ALLOW_EMPTY = "1" @@ -14,7 +14,7 @@ require task-sdk-gmae.inc PACKAGES = "${PN} ${PN}-dbg" -RDEPENDS = "\ +RDEPENDS_${PN} = "\ task-poky-standalone-sdk-target \ libglade-dev \ ${SDK-GMAE} \ |