diff options
25 files changed, 487 insertions, 3 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini index 1fbfb61039..ccabc558dc 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -8094,6 +8094,10 @@ sha256=7ce4919b4742ad6aad9dbfb2b962434d70dbcf9c63bb513870f3276deb28bee0 md5=d5e8f9f2806c9662693f292b155dd238 sha256=f12699367ec4f48ffce87f8b116b55561a03e055c4bf74cc96e5adb3b4e2fce6 +[http://ftp.gnome.org/pub/GNOME/sources/gedit-plugins/2.28/gedit-plugins-2.28.0.tar.bz2] +md5=7a0068ef250f2cfe8d60a5cf0e7a7c93 +sha256=d615d2f26e66d7a23f37205089096a60faa2cb6e9108f9034cf2e66b940bf2ca + [ftp://ftp.billsgames.com/unix/x/gemdropx/src/gemdropx-0.9.tar.gz] md5=fd0337e89778e2dba74461c555ea8e42 sha256=e50495d292a1d456c28044efbf07c16d8865f8d95e1caba86f4c5b2e3fb1d28f @@ -9298,6 +9302,10 @@ sha256=173df749482f7391e50a6eb8339107b2b201582978637c63190c4a79f8e66d07 md5=338f0084f04a16f78797ad01f85d3251 sha256=a3c7fdbbafa6c9cfee7f16c067b043c3041cd0240292aa92b653a2221ae04503 +[http://ftp.gnome.org/pub/GNOME/sources/gnumeric/1.9/gnumeric-1.9.14.tar.bz2] +md5=6781d0df02e603c556758d90e96e37f6 +sha256=0f934eddd2204f938f0359d8c39ef590ab4fec60d6922853e6c8c23e3069d7f4 + [ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-1.4.2.2.tar.bz2] md5=c34736eb7cb687f9e5b6d4df48aaf7c8 sha256=174e7f78c670d76984c4c4bd6077a0b9fec7b4be700b9f3e40c6889b78110c57 @@ -9406,6 +9414,10 @@ sha256=b126902259875a24ece29bdf1f93cc7fd4fd7b83508cae1c15dabd10b4d537cd md5=3d8d3357f9d58af901cd1d6eb42e2973 sha256=a252aff88d801175b27fd7c20e00b0b5f674a5a70e64cd95091abdcab87db35c +[http://ftp.gnome.org/pub/GNOME/sources/goffice/0.7/goffice-0.7.14.tar.bz2] +md5=c48a89bfceeb604f163aa55540088021 +sha256=0fe2f4d7c39e85b5b577c6fa7a88c9a135ae5819cc521083af888e4c23deaacd + [http://downloads.sourceforge.net/gparted/gparted-0.3.3.tar.bz2] md5=f3d16ccfda72fa1dac9fa1ff9ded2c42 sha256=c7c86abd344055bdf1f840a037d04064759f52039cb075260b60369b721f245c @@ -10818,6 +10830,10 @@ sha256=18e0f9792028e6cc5108447678f17d396f9a2cdfec1e6ab5dca98cb844f954af md5=bb7ef5463a74a80454ced2c1d47a0192 sha256=05fce9327dbe78a74ad4cd45383d541f96f19d40d3c03076cdf6908ad28ad241 +[http://download.gnome.org/sources/gtk+/2.18/gtk+-2.18.3.tar.bz2] +md5=369e173600efc272131b53b1902679e8 +sha256=1c0665fe560a560851e8b3c9a6501d416c4b54abfb6fa07549d703a04ea768bf + [http://handhelds.org/packages/gtk-2.0/gtk+-2.2.4.diff.bz2] md5=c6697665e06cad01e87c2cf8d0913725 sha256=2a768a45adea587c4a7d6e3c3567ad7961bf7509e118ae62ce32f5369b1aeeb0 @@ -14742,6 +14758,10 @@ sha256=ef7833047caf66ed3de7b0195223911d28e45c78617d25c6bd05a53fd6c30a0c md5=b35e95f6bd7b8add9981b6cf6336674a sha256=458e7b2ca26f0d212f91b445f0a93db62a679ec671bd3cc980f3c1ac65f06b96 +[http://ftp.gnome.org/pub/GNOME/sources/libgsf/1.14/libgsf-1.14.16.tar.bz2] +md5=8478d83fda0b6e57f36550c11a693ee1 +sha256=11fd8fca1bdbcfa426276a124ad083cca9632f03cf766523bcdfb2fca0b08908 + [http://ftp.gnome.org/pub/GNOME/sources/libgsf/1.14/libgsf-1.14.2.tar.bz2] md5=aea16a8408b65f95c308b0db3e3d3d47 sha256=8b78905b3c61f67dbe9b50782b7005ee5a44cdb48dd0f654f42732b4807c829d @@ -18674,6 +18694,10 @@ sha256=777ff60afa89426f0e52e49b0e7a7661ddb45b59d2ebbfdcbe07fd179e526ff3 md5=49fc135e1cde90cd935c1229467fa37e sha256=33a878a8fc3efdd74519b09b4ec3d16fa9d3a0436b321c13344e5f3ab723c5e4 +[ftp://ftp.osuosl.org/pub/mythtv/mythtv-0.22rc1.tar.bz2] +md5=049e93d78d5370351539c9a23b47e1af +sha256=8e6823f4b92d88c837735322ca71199919406a2826bddae257c6e0f52d089cd7 + [http://kldp.net/frs/download.php/3742/nabi-0.17.tar.gz] md5=8746890ea666ac1b7ae6db77993c6592 sha256=1a239a7bb0644441ca781459fbf5a1c5fb95e823351bf308aa680eb60cc45b94 diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index 0bce352a7a..3098101d7f 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -11,7 +11,7 @@ PREFERRED_VERSION_glib-2.0-native = "2.22.1" PREFERRED_VERSION_glibmm = "2.22.1" PREFERRED_VERSION_glproto = "1.4.9" PREFERRED_VERSION_gst-pulse = "0.9.7" -PREFERRED_VERSION_gtk+ = "2.18.0" +PREFERRED_VERSION_gtk+ = "2.18.3" PREFERRED_VERSION_gtkmm = "2.18.1" PREFERRED_VERSION_hal = "0.5.13" PREFERRED_VERSION_libgemwidget = "1.0" diff --git a/recipes/eglibc/eglibc_2.10.bb b/recipes/eglibc/eglibc_2.10.bb index d15bd61268..1bd3d6e5da 100644 --- a/recipes/eglibc/eglibc_2.10.bb +++ b/recipes/eglibc/eglibc_2.10.bb @@ -3,11 +3,12 @@ require eglibc.inc DEPENDS += "gperf-native" FILESPATHPKG =. "eglibc-svn:" PV = "2.10" -PR = "${INC_PR}.2" +PR = "${INC_PR}.3" SVN_REV="9124" EGLIBC_BRANCH="eglibc-2_10" SRC_URI = "svn://svn.eglibc.org/branches;module=eglibc-2_10;rev=${SVN_REV};proto=svn \ file://eglibc-svn-arm-lowlevellock-include-tls.patch;patch=1 \ + file://armv4t-interworking.patch;patch=1 \ file://etc/ld.so.conf \ file://generate-supported.mk" S = "${WORKDIR}/${EGLIBC_BRANCH}/libc" diff --git a/recipes/eglibc/eglibc_2.9.bb b/recipes/eglibc/eglibc_2.9.bb index bc1b04133f..6b27745f65 100644 --- a/recipes/eglibc/eglibc_2.9.bb +++ b/recipes/eglibc/eglibc_2.9.bb @@ -3,11 +3,12 @@ require eglibc.inc DEPENDS += "gperf-native" FILESPATHPKG =. "eglibc-svn:" PV = "2.9" -PR = "${INC_PR}.3" +PR = "${INC_PR}.4" SVN_REV="8690" EGLIBC_BRANCH="eglibc-2_9" SRC_URI = "svn://svn.eglibc.org/branches;module=eglibc-2_9;rev=${SVN_REV};proto=svn \ file://eglibc-svn-arm-lowlevellock-include-tls.patch;patch=1 \ + file://armv4t-interworking.patch;patch=1 \ file://etc/ld.so.conf \ file://generate-supported.mk" S = "${WORKDIR}/${EGLIBC_BRANCH}/libc" diff --git a/recipes/eglibc/eglibc_svn.bb b/recipes/eglibc/eglibc_svn.bb index f652c61b96..1988350e6b 100644 --- a/recipes/eglibc/eglibc_svn.bb +++ b/recipes/eglibc/eglibc_svn.bb @@ -9,6 +9,7 @@ PR = "${INC_PR}.1" EGLIBC_BRANCH="trunk" SRC_URI = "svn://svn.eglibc.org;module=trunk \ file://eglibc-svn-arm-lowlevellock-include-tls.patch;patch=1 \ + file://armv4t-interworking.patch;patch=1 \ file://etc/ld.so.conf \ file://generate-supported.mk" S = "${WORKDIR}/${EGLIBC_BRANCH}/libc" diff --git a/recipes/eglibc/files/armv4t-interworking.patch b/recipes/eglibc/files/armv4t-interworking.patch new file mode 100644 index 0000000000..55ee8565d7 --- /dev/null +++ b/recipes/eglibc/files/armv4t-interworking.patch @@ -0,0 +1,53 @@ +Index: libc/ports/sysdeps/arm/memcpy.S +=================================================================== +--- libc.orig/ports/sysdeps/arm/memcpy.S 2009-09-03 16:12:00.000000000 -0700 ++++ libc/ports/sysdeps/arm/memcpy.S 2009-10-28 12:51:22.000000000 -0700 +@@ -130,7 +130,12 @@ ENTRY(memcpy) + strcsb r4, [r0], #1 + strcsb ip, [r0] + ++#if defined (__ARM_ARCH_4T__) && defined(__THUMB_INTERWORK__) ++ ldmfd sp!, {r0, r4, lr} ++ bx lr ++#else + ldmfd sp!, {r0, r4, pc} ++#endif + + 9: rsb ip, ip, #4 + cmp ip, #2 +Index: libc/ports/sysdeps/arm/memmove.S +=================================================================== +--- libc.orig/ports/sysdeps/arm/memmove.S 2009-09-03 16:12:00.000000000 -0700 ++++ libc/ports/sysdeps/arm/memmove.S 2009-10-28 12:51:22.000000000 -0700 +@@ -144,7 +144,12 @@ ENTRY(memmove) + strneb r3, [r0, #-1]! + strcsb r4, [r0, #-1]! + strcsb ip, [r0, #-1] ++#if defined (__ARM_ARCH_4T__) && defined (__THUMB_INTERWORK__) ++ ldmfd sp!, {r0, r4, lr} ++ bx lr ++#else + ldmfd sp!, {r0, r4, pc} ++#endif + + 9: cmp ip, #2 + ldrgtb r3, [r1, #-1]! +Index: libc/ports/sysdeps/unix/sysv/linux/arm/clone.S +=================================================================== +--- libc.orig/ports/sysdeps/unix/sysv/linux/arm/clone.S 2009-09-03 16:12:04.000000000 -0700 ++++ libc/ports/sysdeps/unix/sysv/linux/arm/clone.S 2009-10-28 12:51:22.000000000 -0700 +@@ -96,8 +96,14 @@ ENTRY(__clone) + #endif + @ pick the function arg and call address off the stack and execute + ldr r0, [sp, #4] ++#if defined(__ARM_ARCH_V4T__) && defined(__THUMB_INTERWORK__) ++ ldr ip, [sp], #8 ++ mov lr, pc ++ bx ip ++#else + mov lr, pc + ldr pc, [sp], #8 ++#endif + + @ and we are done, passing the return value through r0 + b PLTJMP(HIDDEN_JUMPTARGET(_exit)) diff --git a/recipes/gnome/gedit-plugins_2.28.0.bb b/recipes/gnome/gedit-plugins_2.28.0.bb new file mode 100644 index 0000000000..e3d7bfcac7 --- /dev/null +++ b/recipes/gnome/gedit-plugins_2.28.0.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "GNOME editor plugins" +SECTION = "x11/gnome" +LICENSE = "GPL" + +DEPENDS = "gedit" + +inherit gnome pkgconfig + +FILES_${PN} += " \ + ${libdir}/gedit-2/plugins \ + ${datadir}/gedit-2/plugins \ + " + +FILES_${PN}-dbg += " \ + ${libdir}/gedit-2/plugins/.debug \ + " + diff --git a/recipes/gnumeric/files/remove-docs.patch b/recipes/gnome/gnumeric/remove-docs.patch index 650ad6f4fa..650ad6f4fa 100644 --- a/recipes/gnumeric/files/remove-docs.patch +++ b/recipes/gnome/gnumeric/remove-docs.patch diff --git a/recipes/gnumeric/gnumeric_1.8.4.bb b/recipes/gnome/gnumeric_1.8.4.bb index e375f278f2..e375f278f2 100644 --- a/recipes/gnumeric/gnumeric_1.8.4.bb +++ b/recipes/gnome/gnumeric_1.8.4.bb diff --git a/recipes/gnome/gnumeric_1.9.14.bb b/recipes/gnome/gnumeric_1.9.14.bb new file mode 100644 index 0000000000..8c7023ee37 --- /dev/null +++ b/recipes/gnome/gnumeric_1.9.14.bb @@ -0,0 +1,30 @@ +LICENSE = "GPL" +SECTION = "x11/utils" +DEPENDS = "gdk-pixbuf-csource-native libgsf gtk+ libxml2 goffice libglade libart-lgpl intltool-native libgnomecanvas libgnomeprint libgnomeprintui libbonoboui orbit2-native" +DESCRIPTION = "Gnumeric spreadsheet for GNOME" + +PARALLEL_MAKE = "" + +inherit gnome flow-lossage + +EXTRA_OECONF=" --without-perl " + +PACKAGES_DYNAMIC += "gnumeric-plugin-*" + +FILES_${PN}-dbg += "${libdir}/gnumeric/${PV}/plugins/*/.debug" +FILES_${PN} += "${libdir}/libspreadsheet-${PV}.so " + +do_configure_prepend() { + sed -i -e s:doc\ tools:tools: ${S}/Makefile.am +} + +# We need native orbit-idl with target idl files. No way to say it in a clean way: +do_configure_append () { + find -name Makefile -exec sed -i '/\/usr\/bin\/orbit-idl-2/{s:/usr/bin:${STAGING_BINDIR_NATIVE}:;s:/usr/share:${STAGING_DATADIR}:g}' {} \; +} + +python populate_packages_prepend () { + gnumeric_libdir = bb.data.expand('${libdir}/gnumeric/${PV}/plugins', d) + + do_split_packages(d, gnumeric_libdir, '(.*)', 'gnumeric-plugin-%s', 'Gnumeric plugin for %s', allow_dirs=True) +} diff --git a/recipes/gnome/goffice_0.7.14.bb b/recipes/gnome/goffice_0.7.14.bb new file mode 100644 index 0000000000..9fff0b4cfe --- /dev/null +++ b/recipes/gnome/goffice_0.7.14.bb @@ -0,0 +1,21 @@ +DESCRIPTION="Gnome Office Library" +LICENSE="GPLv2" + +DEPENDS="glib-2.0 gtk+ pango cairo libgnomeprint libgsf libglade libpcre libxml2 libart-lgpl" + +FILES_${PN}-dbg += "${libdir}/goffice/${PV}/plugins/*/.debug" + +inherit gnome pkgconfig + +do_stage() { + autotools_stage_all +} + +PACKAGES_DYNAMIC = "goffice-plugin-*" + +python populate_packages_prepend () { + goffice_libdir = bb.data.expand('${libdir}/goffice/${PV}/plugins', d) + + do_split_packages(d, goffice_libdir, '(.*)', 'goffice-plugin-%s', 'Goffice plugin for %s', allow_dirs=True) +} + diff --git a/recipes/libgsf/libgsf_1.10.0.bb b/recipes/gnome/libgsf_1.10.0.bb index ce464feba9..ce464feba9 100644 --- a/recipes/libgsf/libgsf_1.10.0.bb +++ b/recipes/gnome/libgsf_1.10.0.bb diff --git a/recipes/libgsf/libgsf_1.12.0.bb b/recipes/gnome/libgsf_1.12.0.bb index 2698639873..2698639873 100644 --- a/recipes/libgsf/libgsf_1.12.0.bb +++ b/recipes/gnome/libgsf_1.12.0.bb diff --git a/recipes/libgsf/libgsf_1.12.1.bb b/recipes/gnome/libgsf_1.12.1.bb index 310d922d6e..310d922d6e 100644 --- a/recipes/libgsf/libgsf_1.12.1.bb +++ b/recipes/gnome/libgsf_1.12.1.bb diff --git a/recipes/libgsf/libgsf_1.12.2.bb b/recipes/gnome/libgsf_1.12.2.bb index 02e95718dd..02e95718dd 100644 --- a/recipes/libgsf/libgsf_1.12.2.bb +++ b/recipes/gnome/libgsf_1.12.2.bb diff --git a/recipes/libgsf/libgsf_1.13.2.bb b/recipes/gnome/libgsf_1.13.2.bb index caeb4e4dc9..caeb4e4dc9 100644 --- a/recipes/libgsf/libgsf_1.13.2.bb +++ b/recipes/gnome/libgsf_1.13.2.bb diff --git a/recipes/libgsf/libgsf_1.13.3.bb b/recipes/gnome/libgsf_1.13.3.bb index 1f793b1143..1f793b1143 100644 --- a/recipes/libgsf/libgsf_1.13.3.bb +++ b/recipes/gnome/libgsf_1.13.3.bb diff --git a/recipes/gnome/libgsf_1.14.16.bb b/recipes/gnome/libgsf_1.14.16.bb new file mode 100644 index 0000000000..5697275f7a --- /dev/null +++ b/recipes/gnome/libgsf_1.14.16.bb @@ -0,0 +1,21 @@ +LICENSE = "GPL" +SECTION = "libs" + +DEPENDS= "libxml2 bzip2 glib-2.0 zlib gtk-doc libbonobo gnome-vfs" +RDEPENDS = "gconf gnome-vfs" + +PACKAGES =+ "${PN}-gnome ${PN}-gnome-dev " + +FILES_${PN}-gnome = "${libdir}/libgsf-gnome-1.so.*" +FILES_${PN}-gnome-dev = "${libdir}/libgsf-gnome-1.* ${includedir}/libgsf-1/gsf-gnome" + +inherit gnome + +EXTRA_OECONF = "\ + --without-python \ + --with-gnome \ + --with-bz2" + +do_stage() { + autotools_stage_all +} diff --git a/recipes/libgsf/libgsf_1.14.8.bb b/recipes/gnome/libgsf_1.14.8.bb index 43fd3ab9c7..43fd3ab9c7 100644 --- a/recipes/libgsf/libgsf_1.14.8.bb +++ b/recipes/gnome/libgsf_1.14.8.bb diff --git a/recipes/gtk+/gtk+-2.18.3/hardcoded_libtool.patch b/recipes/gtk+/gtk+-2.18.3/hardcoded_libtool.patch new file mode 100644 index 0000000000..82fbbac8d7 --- /dev/null +++ b/recipes/gtk+/gtk+-2.18.3/hardcoded_libtool.patch @@ -0,0 +1,31 @@ +Index: gtk+-2.14.2/configure.in +=================================================================== +--- gtk+-2.14.2.orig/configure.in 2008-09-23 15:52:44.000000000 +0100 ++++ gtk+-2.14.2/configure.in 2008-09-23 15:53:51.000000000 +0100 +@@ -401,7 +401,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 +@@ -759,7 +759,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_deplibs_check=`$pixbuf_libtool_config | \ + grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \ + sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'` +@@ -1893,7 +1893,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_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//"` diff --git a/recipes/gtk+/gtk+-2.18.3/no-demos.patch b/recipes/gtk+/gtk+-2.18.3/no-demos.patch new file mode 100644 index 0000000000..0fc4c48d1a --- /dev/null +++ b/recipes/gtk+/gtk+-2.18.3/no-demos.patch @@ -0,0 +1,10 @@ +--- 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/recipes/gtk+/gtk+-2.18.3/run-iconcache.patch b/recipes/gtk+/gtk+-2.18.3/run-iconcache.patch new file mode 100644 index 0000000000..aa1bffa8a7 --- /dev/null +++ b/recipes/gtk+/gtk+-2.18.3/run-iconcache.patch @@ -0,0 +1,19 @@ +--- /tmp/Makefile.am 2009-10-28 18:21:54.000000000 +0100 ++++ gtk+-2.18.3/gtk/Makefile.am 2009-10-28 18:23:07.000000000 +0100 +@@ -1300,11 +1300,11 @@ + ./gtk-update-icon-cache + endif + +-gtkbuiltincache.h: @REBUILD@ stamp-icons +- $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) $(GTK_UPDATE_ICON_CACHE_MANIFEST) +- $(gtk_update_icon_cache_program) --force --ignore-theme-index \ +- --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \ +- mv gtkbuiltincache.h.tmp gtkbuiltincache.h ++#gtkbuiltincache.h: @REBUILD@ stamp-icons ++# $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) $(GTK_UPDATE_ICON_CACHE_MANIFEST) ++# $(gtk_update_icon_cache_program) --force --ignore-theme-index \ ++# --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \ ++# mv gtkbuiltincache.h.tmp gtkbuiltincache.h + + EXTRA_DIST += \ + $(STOCK_ICONS) \ diff --git a/recipes/gtk+/gtk+-2.18.3/toggle-font.diff b/recipes/gtk+/gtk+-2.18.3/toggle-font.diff new file mode 100644 index 0000000000..59ad150b2f --- /dev/null +++ b/recipes/gtk+/gtk+-2.18.3/toggle-font.diff @@ -0,0 +1,100 @@ +Index: gtk/gtkcellrenderertoggle.c +=================================================================== +--- gtk/gtkcellrenderertoggle.c (revision 18523) ++++ gtk/gtkcellrenderertoggle.c (working copy) +@@ -71,6 +71,8 @@ + PROP_INDICATOR_SIZE + }; + ++/* This is a hard-coded default which promptly gets overridden by a size ++ calculated from the font size. */ + #define TOGGLE_WIDTH 13 + + static guint toggle_cell_signals[LAST_SIGNAL] = { 0 }; +@@ -80,8 +82,9 @@ + typedef struct _GtkCellRendererTogglePrivate GtkCellRendererTogglePrivate; + struct _GtkCellRendererTogglePrivate + { +- gint indicator_size; +- ++ gint indicator_size; /* This is the real size */ ++ gint override_size; /* This is the size set from the indicator-size property */ ++ GtkWidget *cached_widget; + guint inconsistent : 1; + }; + +@@ -104,6 +107,7 @@ + GTK_CELL_RENDERER (celltoggle)->ypad = 2; + + priv->indicator_size = TOGGLE_WIDTH; ++ priv->override_size = 0; + priv->inconsistent = FALSE; + } + +@@ -210,7 +214,7 @@ + g_value_set_boolean (value, celltoggle->radio); + break; + case PROP_INDICATOR_SIZE: +- g_value_set_int (value, priv->indicator_size); ++ g_value_set_int (value, priv->override_size ? priv->override_size : priv->indicator_size); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec); +@@ -245,7 +249,7 @@ + celltoggle->radio = g_value_get_boolean (value); + break; + case PROP_INDICATOR_SIZE: +- priv->indicator_size = g_value_get_int (value); ++ priv->override_size = g_value_get_int (value); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec); +@@ -273,6 +277,27 @@ + } + + static void ++on_widget_style_set (GtkWidget *widget, GtkStyle *previous, gpointer user_data) ++{ ++ GtkCellRendererTogglePrivate *priv = user_data; ++ PangoContext *context; ++ PangoFontMetrics *metrics; ++ int height; ++ ++ context = gtk_widget_get_pango_context (widget); ++ metrics = pango_context_get_metrics (context, ++ widget->style->font_desc, ++ pango_context_get_language (context)); ++ ++ height = pango_font_metrics_get_ascent (metrics) + ++ pango_font_metrics_get_descent (metrics); ++ ++ pango_font_metrics_unref (metrics); ++ ++ priv->indicator_size = PANGO_PIXELS (height * 0.85); ++} ++ ++static void + gtk_cell_renderer_toggle_get_size (GtkCellRenderer *cell, + GtkWidget *widget, + GdkRectangle *cell_area, +@@ -287,6 +312,20 @@ + + priv = GTK_CELL_RENDERER_TOGGLE_GET_PRIVATE (cell); + ++ if (priv->override_size) { ++ priv->indicator_size = priv->override_size; ++ } else if (priv->cached_widget != widget) { ++ if (priv->cached_widget) { ++ g_object_remove_weak_pointer (widget, &priv->cached_widget); ++ g_signal_handlers_disconnect_by_func (priv->cached_widget, on_widget_style_set, priv); ++ } ++ priv->cached_widget = widget; ++ g_object_add_weak_pointer (widget, &priv->cached_widget); ++ g_signal_connect (widget, "style-set", on_widget_style_set, priv); ++ ++ on_widget_style_set (widget, NULL, priv); ++ } ++ + calc_width = (gint) cell->xpad * 2 + priv->indicator_size; + calc_height = (gint) cell->ypad * 2 + priv->indicator_size; + diff --git a/recipes/gtk+/gtk+_2.18.3.bb b/recipes/gtk+/gtk+_2.18.3.bb new file mode 100644 index 0000000000..d2cf4c6858 --- /dev/null +++ b/recipes/gtk+/gtk+_2.18.3.bb @@ -0,0 +1,66 @@ +require gtk+.inc + +DEPENDS += "cairo jasper" +PR = "${INC_PR}.0" + +# disabled per default - this uses as little patches as possible +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "http://download.gnome.org/sources/gtk+/2.18/gtk+-${PV}.tar.bz2 \ + file://xsettings.patch;patch=1 \ + file://run-iconcache.patch;patch=1 \ + file://hardcoded_libtool.patch;patch=1 \ + file://no-demos.patch;patch=1 \ + file://toggle-font.diff;patch=1;pnum=0 \ + " + +EXTRA_OECONF = "--with-libtiff --disable-xkb --disable-glibtest --enable-display-migration gio_can_sniff=yes" + +LIBV = "2.10.0" + +PACKAGES_DYNAMIC = "gtk-module-* gdk-pixbuf-loader-* gtk-immodule-* gtk-printbackend-*" + +python populate_packages_prepend () { + import os.path + + prologue = bb.data.getVar("postinst_prologue", 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'); + modules_root = bb.data.expand('${libdir}/gtk-2.0/modules/',d) + + do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', prologue + 'gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders', extra_depends='') + 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', extra_depends='') + do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s', extra_depends='') + do_split_packages(d, modules_root, '^lib(.*)\.so$', 'gtk-module-%s', 'GTK module for %s', extra_depends='') + + if (bb.data.getVar('DEBIAN_NAMES', d, 1)): + bb.data.setVar('PKG_${PN}', 'libgtk-2.0', d) +} + +# gail is part of gtk+ since gtk+-2.13.0 (targetting >=GNOME 2.23): +PROVIDES = "virtual/gail" +RPROVIDES_${PN} = "libgailutil18" +RCONFLICTS_${PN} = "libgailutil18" +RREPLACES_${PN} = "libgailutil18" +RPROVIDES_${PN}-dev = "libgailutil-dev" +RCONFLICTS_${PN}-dev = "libgailutil-dev" +RREPLACES_${PN}-dev = "libgailutil-dev" +RPROVIDES_${PN}-doc = "libgailutil-doc" +RCONFLICTS_${PN}-doc = "libgailutil-doc" +RREPLACES_${PN}-doc = "libgailutil-doc" +RPROVIDES_${PN}-dbg = "libgailutil-dbg" +RCONFLICTS_${PN}-dbg = "libgailutil-dbg" +RREPLACES_${PN}-dbg = "libgailutil-dbg" +# FIXME: replace locales as well + +do_stage_append() { + + # this tool is required by gnome-keyring 2.26.0 to get built + # it is written in Python and use only Python xml + install -d ${STAGING_BINDIR_NATIVE} + install -m 0755 ${S}/gtk/gtk-builder-convert ${STAGING_BINDIR_NATIVE} + +} diff --git a/recipes/mythtv/mythtv_0.22rc1.bb b/recipes/mythtv/mythtv_0.22rc1.bb new file mode 100644 index 0000000000..b7cadb3c4a --- /dev/null +++ b/recipes/mythtv/mythtv_0.22rc1.bb @@ -0,0 +1,89 @@ +require mythtv.inc + +inherit qmake2 qt4x11 + +DEFAULT_PREFERENCE = "-1" + +PV = "0.21+0.22rc1" +PR = "r2" +REALPV = "0.22" + +SRC_URI = "ftp://ftp.osuosl.org/pub/mythtv/mythtv-0.22rc1.tar.bz2" + +S = "${WORKDIR}/mythtv-0.22rc1" + +QMAKE_PROFILES = "mythtv.pro" + +mythlibs = "mythdb mythavutil mythavcodec mythavformat mythswscale mythhdhomerun myth mythtv mythui mythfreemheg mythupnp mythlivemedia" +PACKAGES =+ "mythtv-backend mythtv-frontend mythtv-bin mythtv-filters mythtv-data" + +FILES_${PN}-dbg += "${libdir}/mythtv/filters/.debug" +FILES_mythtv-backend = "${bindir}/mythbackend ${bindir}/mythcommflag ${bindir}/mythfilldatabase ${bindir}/mythtranscode" +FILES_mythtv-frontend = "${bindir}/mythfrontend ${datadir}/mythtv/i18n/mythfrontend_* ${datadir}/mythtv/*.ttf" +FILES_mythtv-bin = "${bindir}/*" +FILES_mythtv-filters = "${libdir}/mythtv/filters/*" +FILES_mythtv-data = "${datadir}" +RDEPENDS_${PN} = "mythtv-backend mythtv-frontend mythtv-bin mythtv-filters mythtv-data" +ALLOW_EMPTY_${PN} = "1" + +PACKAGES_DYNAMIC = "mythtv-theme-*" + +python __anonymous () { + import bb + + mythlibs = bb.data.getVar('mythlibs', d).split() + pv = bb.data.expand(bb.data.getVar("REALPV", d), d) + + for m in mythlibs: + bb.data.setVar("FILES_lib%s%s" % (m, pv), "${libdir}/lib%s-%s.so.*" % (m, pv), d) + bb.data.setVar("FILES_lib%s%s-dev" % (m, pv), "${libdir}/lib%s-%s.*" % (m, pv), d) + + packages = " ".join(map(lambda x: "lib%s%s lib%s%s-dev" % (x, pv, x, pv), mythlibs) + bb.data.getVar("PACKAGES", d).split()) + + bb.data.setVar("PACKAGES", packages, d) +} + +EXTRA_MYTHTVCONF_armv7a = "--cpu=cortex-a8" +EXTRA_MYTHTVCONF_armv5te = "--cpu=armv5te" +EXTRA_MYTHTVCONF ?= "" + +EXTRA_OECONF = " \ + --cross-prefix=${TARGET_PREFIX} \ + --sysroot=${STAGING_DIR_HOST} \ + --prefix=${prefix} \ + \ + --arch=${TARGET_ARCH} \ + --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \ + --extra-cxxflags="${TARGET_CXXFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \ + --extra-ldflags="${TARGET_LDFLAGS}" \ + ${EXTRA_MYTHTVCONF} \ +" + +do_configure_prepend() { +# it's not autotools anyway, so we call ./configure directly + find . -name "Makefile"|xargs rm -f + + ./configure --qmake=qmake2 \ + --disable-altivec \ + --disable-opengl \ + --disable-stripping \ + --disable-xvmc \ + --enable-v4l \ + --enable-audio-oss \ + --enable-dvb \ + --enable-libmp3lame \ + --dvb-path=${STAGING_INCDIR} \ + --without-bindings=perl,python \ + ${EXTRA_OECONF} +} + +python populate_packages_prepend () { + new_packages = [] + + def the_hook(file, pkg, pattern, format, basename): + new_packages.append(pkg) + + do_split_packages(d, root=bb.data.expand('${datadir}/mythtv/themes', d), file_regex='(.*)', output_pattern='mythtv-theme-%s', description='MythTV theme %s', allow_dirs=True, hook=the_hook, prepend=True) + + bb.data.setVar("RDEPENDS_${PN}", "%s %s" % (bb.data.getVar("RDEPENDS_${PN}", d), " ".join(new_packages)), d) +} |