[oe-commits] org.oe.dev merge of '555ca250058a761fb7d692d41e9748b7168b2e6d'
koen commit
openembedded-commits at lists.openembedded.org
Thu Aug 23 12:57:04 UTC 2007
merge of '555ca250058a761fb7d692d41e9748b7168b2e6d'
and '57097c5f7112c41b7466c7f14c1b99593a6d65ae'
Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 7bdd98510b75cefe2a4f144066db7428f35bf824
ViewMTN: http://monotone.openembedded.org/revision.psp?id=7bdd98510b75cefe2a4f144066db7428f35bf824
Files:
1
packages/libxslt/libxslt_1.1.12.bb
packages/twisted/twisted_1.2.0.bb
packages/qmake/qmake2-native-2.01a
packages/qmake/qmake2-native-2.10a
packages/qmake/qmake2-native_2.01a.bb
packages/qmake/qmake2-native_2.10a.bb
packages/gtk+/gtk+-2.10.14/cell-renderer-edit-focus.patch
packages/gtk+/gtk+-2.10.14/treeview-checkbox-size.patch
packages/uicmoc/uicmoc4-native_4.3.1.bb
packages/e17/exhibit_cvs.bb
packages/e17/expedite_cvs.bb
packages/gstreamer/gst-plugins-bad_0.10.3.bb
packages/gstreamer/gstreamer.inc
packages/gtk+/gtk+_2.10.14.bb
packages/uicmoc/uicmoc4-native_4.2.3.bb
packages/uicmoc/uicmoc4-native_4.3.0.bb
packages/bluez/bluez-libs_3.15.bb
Diffs:
#
# mt diff -r555ca250058a761fb7d692d41e9748b7168b2e6d -r7bdd98510b75cefe2a4f144066db7428f35bf824
#
#
#
# delete "packages/libxslt/libxslt_1.1.12.bb"
#
# delete "packages/twisted/twisted_1.2.0.bb"
#
# rename "packages/qmake/qmake2-native-2.01a"
# to "packages/qmake/qmake2-native-2.10a"
#
# rename "packages/qmake/qmake2-native_2.01a.bb"
# to "packages/qmake/qmake2-native_2.10a.bb"
#
# add_file "packages/gtk+/gtk+-2.10.14/cell-renderer-edit-focus.patch"
# content [a6b4fce6163979c9ab25466b6441bb3449e61352]
#
# add_file "packages/gtk+/gtk+-2.10.14/treeview-checkbox-size.patch"
# content [9f82aa13d680670f6f41c683f61e814cae67d056]
#
# add_file "packages/uicmoc/uicmoc4-native_4.3.1.bb"
# content [9a5b3e0cf118671e949e94f3ccdfdc0106bf1511]
#
# patch "packages/e17/exhibit_cvs.bb"
# from [29fad610360202f480fede26fb0c3c7c81eca8e7]
# to [fd141a172c394c58b0e20dad078fce7046c83fc4]
#
# patch "packages/e17/expedite_cvs.bb"
# from [bc914a4638fd17187a62865f8ef6eabe671cb56f]
# to [d6c491e48f867162a8690fce0bf8044dcb7136bc]
#
# patch "packages/gstreamer/gst-plugins-bad_0.10.3.bb"
# from [091c86318da723ac2f5b9708ab9e4cfc39377038]
# to [60a05cd17775d229c49cc169df51e4e7b5ff222b]
#
# patch "packages/gstreamer/gstreamer.inc"
# from [4373e3c63e98e5e7231ff03f8d1ae556374e045f]
# to [a0978cb2802d28b839bb88552a3c5a57a9bf1d23]
#
# patch "packages/gtk+/gtk+_2.10.14.bb"
# from [b7a85a029e4d690ccbcfaae174f1f1950723c46d]
# to [8ae4f9f76c8a1af983ec950a2c99047c7a8a0cc2]
#
# patch "packages/qmake/qmake2-native_2.10a.bb"
# from [b58e6dceed352069e13fc28ed8c4120809744506]
# to [cdb348a27145a7e57dc38436ead198f972573f04]
#
# patch "packages/uicmoc/uicmoc4-native_4.2.3.bb"
# from [bb258bfafd5b03ee012d8e4530a8f4219b862463]
# to [80dd401b3668e6f4f71b2e43bfff330d9196e7a9]
#
# patch "packages/uicmoc/uicmoc4-native_4.3.0.bb"
# from [8520da26a06ef5cd286a9749b5a8e78337c3f665]
# to [bd07c0050ef051ca21f2712499797670879d8879]
#
============================================================
--- packages/gtk+/gtk+-2.10.14/cell-renderer-edit-focus.patch a6b4fce6163979c9ab25466b6441bb3449e61352
+++ packages/gtk+/gtk+-2.10.14/cell-renderer-edit-focus.patch a6b4fce6163979c9ab25466b6441bb3449e61352
@@ -0,0 +1,30 @@
+Index: gtk/gtkcellrenderertext.c
+===================================================================
+--- gtk/gtkcellrenderertext.c (revision 18557)
++++ gtk/gtkcellrenderertext.c (working copy)
+@@ -1794,13 +1794,24 @@ gtk_cell_renderer_text_focus_out_event (
+ gpointer data)
+ {
+ GtkCellRendererTextPrivate *priv;
++ GtkSettings *settings;
++ gboolean in_touchscreen_mode = FALSE;
+
+ priv = GTK_CELL_RENDERER_TEXT_GET_PRIVATE (data);
+
+ if (priv->in_entry_menu)
+ return FALSE;
+
+- GTK_ENTRY (entry)->editing_canceled = TRUE;
++ if (gtk_widget_has_screen (entry))
++ settings = gtk_settings_get_for_screen (gtk_widget_get_screen (entry));
++ else
++ settings = gtk_settings_get_default ();
++
++ g_object_get (G_OBJECT (settings),
++ "gtk-touchscreen-mode", &in_touchscreen_mode,
++ NULL);
++
++ GTK_ENTRY (entry)->editing_canceled = !in_touchscreen_mode;
+ gtk_cell_editable_editing_done (GTK_CELL_EDITABLE (entry));
+ gtk_cell_editable_remove_widget (GTK_CELL_EDITABLE (entry));
+
============================================================
--- packages/gtk+/gtk+-2.10.14/treeview-checkbox-size.patch 9f82aa13d680670f6f41c683f61e814cae67d056
+++ packages/gtk+/gtk+-2.10.14/treeview-checkbox-size.patch 9f82aa13d680670f6f41c683f61e814cae67d056
@@ -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 12
+
+ 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 (G_OBJECT (widget), (gpointer*)&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 (G_OBJECT (widget), (gpointer*)&priv->cached_widget);
++ g_signal_connect (widget, "style-set", G_CALLBACK (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;
+
============================================================
--- packages/uicmoc/uicmoc4-native_4.3.1.bb 9a5b3e0cf118671e949e94f3ccdfdc0106bf1511
+++ packages/uicmoc/uicmoc4-native_4.3.1.bb 9a5b3e0cf118671e949e94f3ccdfdc0106bf1511
@@ -0,0 +1,59 @@
+DESCRIPTION = "User-Interface-, Meta-Object-, and Resource Compiler for Qt/[X11|Mac|Embedded] version 4.x"
+SECTION = "libs"
+HOMEPAGE = "http://www.trolltech.com"
+PRIORITY = "optional"
+LICENSE = "GPL QPL"
+PR = "r0"
+
+SRC_URI = "ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-${PV}.tar.gz"
+S = "${WORKDIR}/qtopia-core-opensource-src-${PV}"
+
+inherit native
+
+EXTRA_OECONF = "-prefix ${STAGING_DIR}/${BUILD_SYS}/qt4 \
+ -qt-libjpeg -qt-gif -system-zlib \
+ -no-nis -no-cups -no-exceptions \
+ -no-accessibility -no-libjpeg \
+ -no-nas-sound -no-sm \
+ -no-xshape -no-xinerama \
+ -no-xcursor -no-xrandr \
+ -no-xrender -no-fontconfig \
+ -no-tablet -no-xkb \
+ -no-libpng \
+ -verbose -release -fast -static \
+ -qt3support "
+# yank default -e
+EXTRA_OEMAKE = " "
+
+do_configure() {
+ echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
+}
+
+TOBUILD = "\
+ src/tools/moc \
+ src/corelib \
+ src/sql \
+ src/qt3support \
+ src/xml \
+ src/tools/uic \
+ src/tools/rcc \
+ src/network \
+ src/gui \
+ src/tools/uic3 \
+"
+
+do_compile() {
+ unset CC CXX CFLAGS LFLAGS CXXFLAGS CPPFLAGS
+ for i in ${TOBUILD}; do
+ cd ${S}/$i && oe_runmake CC="${CC}" CXX="${CXX}"
+ done
+}
+
+do_stage() {
+ install -m 0755 bin/moc ${STAGING_BINDIR}/moc4
+ install -m 0755 bin/uic ${STAGING_BINDIR}/uic4
+ install -m 0755 bin/uic3 ${STAGING_BINDIR}/uic34
+ install -m 0755 bin/rcc ${STAGING_BINDIR}/rcc4
+ install -d ${STAGING_DIR}/${BUILD_SYS}/qt4/
+ install -m 0644 tools/porting/src/q3porting.xml ${STAGING_DIR}/${BUILD_SYS}/qt4/
+}
============================================================
--- packages/e17/exhibit_cvs.bb 29fad610360202f480fede26fb0c3c7c81eca8e7
+++ packages/e17/exhibit_cvs.bb fd141a172c394c58b0e20dad078fce7046c83fc4
@@ -6,5 +6,5 @@ inherit e
inherit e
-SRC_URI = "cvs://anonymous@anoncvs.enlightenment.org/var/cvs/e;module=e17/apps/exhibit"
+SRC_URI = "${E_CVS};module=e17/apps/exhibit"
S = "${WORKDIR}/${PN}"
============================================================
--- packages/e17/expedite_cvs.bb bc914a4638fd17187a62865f8ef6eabe671cb56f
+++ packages/e17/expedite_cvs.bb d6c491e48f867162a8690fce0bf8044dcb7136bc
@@ -6,7 +6,7 @@ inherit e
inherit e
-SRC_URI = "cvs://anonymous@anoncvs.enlightenment.org/var/cvs/e;module=e17/apps/expedite"
+SRC_URI = "${E_CVS};module=e17/apps/expedite"
S = "${WORKDIR}/${PN}"
do_configure_append() {
============================================================
--- packages/gstreamer/gst-plugins-bad_0.10.3.bb 091c86318da723ac2f5b9708ab9e4cfc39377038
+++ packages/gstreamer/gst-plugins-bad_0.10.3.bb 60a05cd17775d229c49cc169df51e4e7b5ff222b
@@ -1,5 +1,5 @@ require gst-plugins.inc
require gst-plugins.inc
-DEPENDS += "gst-plugins-base"
+DEPENDS += "gst-plugins-base directfb"
SRC_URI += "file://cross-compile.patch;patch=1"
+PR = "r6"
-PR = "r4"
============================================================
--- packages/gstreamer/gstreamer.inc 4373e3c63e98e5e7231ff03f8d1ae556374e045f
+++ packages/gstreamer/gstreamer.inc a0978cb2802d28b839bb88552a3c5a57a9bf1d23
@@ -10,3 +10,5 @@ FILES_${PN}-dev += " ${libdir}/gstreamer
FILES_${PN} += " ${libdir}/gstreamer-0.10/*.so"
FILES_${PN}-dev += " ${libdir}/gstreamer-0.10/*.la ${libdir}/gstreamer-0.10/*.a"
+FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug"
+
============================================================
--- packages/gtk+/gtk+_2.10.14.bb b7a85a029e4d690ccbcfaae174f1f1950723c46d
+++ packages/gtk+/gtk+_2.10.14.bb 8ae4f9f76c8a1af983ec950a2c99047c7a8a0cc2
@@ -1,6 +1,6 @@ require gtk-2.10.inc
require gtk-2.10.inc
-PR = "r5"
+PR = "r6"
SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \
file://no-xwc.patch;patch=1 \
@@ -19,19 +19,21 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.
file://spinbutton.patch;patch=1 \
file://gtk+-handhelds.patch;patch=1 \
file://filesel-fix-segfault.patch;patch=1 \
- file://toggle-font.diff;patch=1;pnum=0 \
file://combo-arrow-size.patch;patch=1;pnum=0 \
file://range-no-redraw.patch;patch=1;pnum=0 \
file://scrolled-placement.patch;patch=1;pnum=0 \
+ file://treeview-checkbox-size.patch;patch=1;pnum=0 \
+ file://cell-renderer-edit-focus.patch;patch=1;pnum=0 \
"
-#check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points
+# check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points
require gtk-fpu.inc
EXTRA_OECONF += "${@get_gtk_fpu_setting(bb, d)}"
# try to squeeze some more performance out of it
SRC_URI_append_fic-gta01 = " file://lower-quality-scaling-in-pixbuf-engine.patch;patch=1"
SRC_URI_append_fic-gta02 = " file://lower-quality-scaling-in-pixbuf-engine.patch;patch=1"
+
# this doesn't seem to work
SRC_URI_OVERRIDES_PACKAGE_ARCH = "1"
# let's do it manually then
============================================================
--- packages/qmake/qmake2-native_2.01a.bb b58e6dceed352069e13fc28ed8c4120809744506
+++ packages/qmake/qmake2-native_2.10a.bb cdb348a27145a7e57dc38436ead198f972573f04
@@ -1,13 +1,12 @@ LICENSE = "GPL QPL"
DESCRIPTION = "TrollTech Makefile Generator"
PRIORITY = "optional"
HOMEPAGE = "http://www.trolltech.com"
SECTION = "devel"
LICENSE = "GPL QPL"
+PR = "r0"
-PR = "r2"
+QTVER = "qtopia-core-opensource-src-4.3.1"
-QTVER = "qt-x11-opensource-src-4.3.0"
-
SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/${QTVER}.tar.gz \
file://0001-fix-mkspecs.patch;patch=1 \
file://linux-oe-qmake.conf"
============================================================
--- packages/uicmoc/uicmoc4-native_4.2.3.bb bb258bfafd5b03ee012d8e4530a8f4219b862463
+++ packages/uicmoc/uicmoc4-native_4.2.3.bb 80dd401b3668e6f4f71b2e43bfff330d9196e7a9
@@ -1,7 +1,9 @@ DESCRIPTION = "User-Interface-, Meta-Obj
DESCRIPTION = "User-Interface-, Meta-Object-, and Resource Compiler for Qt/[X11|Mac|Embedded] version 4.x"
+DEPENDS = "libx11-native libxext-native"
SECTION = "libs"
PRIORITY = "optional"
LICENSE = "GPL QPL"
+PR = "r1"
SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz"
============================================================
--- packages/uicmoc/uicmoc4-native_4.3.0.bb 8520da26a06ef5cd286a9749b5a8e78337c3f665
+++ packages/uicmoc/uicmoc4-native_4.3.0.bb bd07c0050ef051ca21f2712499797670879d8879
@@ -1,8 +1,9 @@ DESCRIPTION = "User-Interface-, Meta-Obj
DESCRIPTION = "User-Interface-, Meta-Object-, and Resource Compiler for Qt/[X11|Mac|Embedded] version 4.x"
+DEPENDS = "libx11-native libxext-native"
SECTION = "libs"
PRIORITY = "optional"
LICENSE = "GPL QPL"
-PR = "r2"
+PR = "r3"
SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz"
#
# mt diff -r57097c5f7112c41b7466c7f14c1b99593a6d65ae -r7bdd98510b75cefe2a4f144066db7428f35bf824
#
#
#
# add_file "packages/bluez/bluez-libs_3.15.bb"
# content [dc7c9ab3cf4931c0678271b1a5ef7511ebb7b82d]
#
============================================================
--- packages/bluez/bluez-libs_3.15.bb dc7c9ab3cf4931c0678271b1a5ef7511ebb7b82d
+++ packages/bluez/bluez-libs_3.15.bb dc7c9ab3cf4931c0678271b1a5ef7511ebb7b82d
@@ -0,0 +1 @@
+require bluez-libs.inc
More information about the Openembedded-commits
mailing list