diff options
17 files changed, 207 insertions, 75 deletions
diff --git a/packages/bluez/bluez-libs_3.15.bb b/packages/bluez/bluez-libs_3.15.bb new file mode 100644 index 0000000000..6ddf62a4fb --- /dev/null +++ b/packages/bluez/bluez-libs_3.15.bb @@ -0,0 +1 @@ +require bluez-libs.inc diff --git a/packages/e17/exhibit_cvs.bb b/packages/e17/exhibit_cvs.bb index 1c3c836955..4433287353 100644 --- a/packages/e17/exhibit_cvs.bb +++ b/packages/e17/exhibit_cvs.bb @@ -6,5 +6,5 @@ PR = "r0" 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}" diff --git a/packages/e17/expedite_cvs.bb b/packages/e17/expedite_cvs.bb index ea376c2442..9d8a7d6070 100644 --- a/packages/e17/expedite_cvs.bb +++ b/packages/e17/expedite_cvs.bb @@ -6,7 +6,7 @@ PR = "r0" 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() { diff --git a/packages/gstreamer/gst-plugins-bad_0.10.3.bb b/packages/gstreamer/gst-plugins-bad_0.10.3.bb index 51ce56dc1f..3e487314be 100644 --- a/packages/gstreamer/gst-plugins-bad_0.10.3.bb +++ b/packages/gstreamer/gst-plugins-bad_0.10.3.bb @@ -1,5 +1,5 @@ require gst-plugins.inc -DEPENDS += "gst-plugins-base" +DEPENDS += "gst-plugins-base directfb" SRC_URI += "file://cross-compile.patch;patch=1" -PR = "r4" +PR = "r6" diff --git a/packages/gstreamer/gstreamer.inc b/packages/gstreamer/gstreamer.inc index a8bece92e3..87a6f82135 100644 --- a/packages/gstreamer/gstreamer.inc +++ b/packages/gstreamer/gstreamer.inc @@ -10,3 +10,5 @@ EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --with-check= 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" + diff --git a/packages/gtk+/gtk+-2.10.14/cell-renderer-edit-focus.patch b/packages/gtk+/gtk+-2.10.14/cell-renderer-edit-focus.patch new file mode 100644 index 0000000000..aa7e276bec --- /dev/null +++ b/packages/gtk+/gtk+-2.10.14/cell-renderer-edit-focus.patch @@ -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)); + diff --git a/packages/gtk+/gtk+-2.10.14/treeview-checkbox-size.patch b/packages/gtk+/gtk+-2.10.14/treeview-checkbox-size.patch new file mode 100644 index 0000000000..ab3c208ee5 --- /dev/null +++ b/packages/gtk+/gtk+-2.10.14/treeview-checkbox-size.patch @@ -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; + diff --git a/packages/gtk+/gtk+_2.10.14.bb b/packages/gtk+/gtk+_2.10.14.bb index ecee0bf91a..947cf19077 100644 --- a/packages/gtk+/gtk+_2.10.14.bb +++ b/packages/gtk+/gtk+_2.10.14.bb @@ -1,6 +1,6 @@ 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.10/gtk+-${PV}.tar.bz2 \ 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 diff --git a/packages/libxslt/libxslt_1.1.12.bb b/packages/libxslt/libxslt_1.1.12.bb deleted file mode 100644 index 9c59407ebf..0000000000 --- a/packages/libxslt/libxslt_1.1.12.bb +++ /dev/null @@ -1,45 +0,0 @@ -DESCRIPTION = "GNOME XSLT library" -SECTION = "libs" -PRIORITY = "optional" -DEPENDS = "libxml2" -LICENSE = "MIT" -PR = "r2" - -SRC_URI = "ftp://xmlsoft.org/libxml2/libxslt-${PV}.tar.gz" -S = "${WORKDIR}/libxslt-${PV}" - -inherit autotools pkgconfig - -EXTRA_OECONF = "--without-python --without-debug --without-mem-debug --without-crypto" - -xsltheaders = "attributes.h documents.h extensions.h extra.h functions.h imports.h \ - keys.h namespaces.h numbersInternals.h pattern.h preproc.h security.h \ - templates.h transform.h variables.h xslt.h xsltInternals.h xsltconfig.h \ - xsltexports.h xsltutils.h" -exsltheaders = "exslt.h exsltconfig.h exsltexports.h" - -do_stage () { - oe_libinstall -C libxslt -so -a libxslt ${STAGING_LIBDIR} - oe_libinstall -C libexslt -so -a libexslt ${STAGING_LIBDIR} - - mkdir -p ${STAGING_INCDIR}/libxslt - for i in ${xsltheaders}; do - install -m 0644 ${S}/libxslt/$i ${STAGING_INCDIR}/libxslt/$i - done - mkdir -p ${STAGING_INCDIR}/libexslt - for i in ${exsltheaders}; do - install -m 0644 ${S}/libexslt/$i ${STAGING_INCDIR}/libexslt/$i - done - - cat xslt-config | sed -e "s,^prefix=.*,prefix=${STAGING_DIR}/${HOST_SYS}," \ - -e "s,^exec_prefix=.*,exec_prefix=${STAGING_DIR}/${HOST_SYS}," \ - -e "s,^includedir=.*,includedir=${STAGING_INCDIR}," \ - -e "s,^libdir=.*,libdir=${STAGING_LIBDIR}," > ${STAGING_BINDIR_CROSS}/xslt-config - chmod a+rx ${STAGING_BINDIR_CROSS}/xslt-config - install -m 0644 libxslt.m4 ${STAGING_DATADIR}/aclocal/ -} - -PACKAGES = "${PN}-dbg ${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale" - -FILES_${PN}-dev += "${bindir}/xslt-config" -FILES_${PN}-utils += "${bindir}" diff --git a/packages/qmake/qmake2-native-2.01a/.mtn2git_empty b/packages/qmake/qmake2-native-2.10a/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/qmake/qmake2-native-2.01a/.mtn2git_empty +++ b/packages/qmake/qmake2-native-2.10a/.mtn2git_empty diff --git a/packages/qmake/qmake2-native-2.01a/0001-fix-mkspecs.patch b/packages/qmake/qmake2-native-2.10a/0001-fix-mkspecs.patch index abebfdfa27..abebfdfa27 100644 --- a/packages/qmake/qmake2-native-2.01a/0001-fix-mkspecs.patch +++ b/packages/qmake/qmake2-native-2.10a/0001-fix-mkspecs.patch diff --git a/packages/qmake/qmake2-native-2.01a/linux-oe-qmake.conf b/packages/qmake/qmake2-native-2.10a/linux-oe-qmake.conf index f58481a693..f58481a693 100644 --- a/packages/qmake/qmake2-native-2.01a/linux-oe-qmake.conf +++ b/packages/qmake/qmake2-native-2.10a/linux-oe-qmake.conf diff --git a/packages/qmake/qmake2-native_2.01a.bb b/packages/qmake/qmake2-native_2.10a.bb index 2ec783574c..94b2002a20 100644 --- a/packages/qmake/qmake2-native_2.01a.bb +++ b/packages/qmake/qmake2-native_2.10a.bb @@ -3,10 +3,9 @@ PRIORITY = "optional" HOMEPAGE = "http://www.trolltech.com" SECTION = "devel" LICENSE = "GPL QPL" +PR = "r0" -PR = "r2" - -QTVER = "qt-x11-opensource-src-4.3.0" +QTVER = "qtopia-core-opensource-src-4.3.1" SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/${QTVER}.tar.gz \ file://0001-fix-mkspecs.patch;patch=1 \ diff --git a/packages/twisted/twisted_1.2.0.bb b/packages/twisted/twisted_1.2.0.bb deleted file mode 100644 index 40f8218fbb..0000000000 --- a/packages/twisted/twisted_1.2.0.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "Twisted is an event-driven networking framework written in \ -Python and licensed under the LGPL. \ Twisted supports TCP, UDP, SSL/TLS, \ -multicast, Unix sockets, a large number of protocols (including HTTP, NNTP, \ -IMAP, SSH, IRC, FTP, and others), and much more." -HOMEPAGE = "http://www.twistedmatrix.com" -SECTION = "console/network" -PRIORITY = "optional" -LICENSE = "LGPL" -RDEPENDS = "python-core" -PR = "r1" - -SRC_URI = "http://tmrc.mit.edu/mirror/twisted/old/Twisted-${PV}.tar.bz2" -S = "${WORKDIR}/Twisted-${PV}" - -inherit distutils - -FILES_${PN}-dbg += "${libdir}/python2.4/site-packages/twisted/protocols/.debug" -FILES_${PN}-dbg += "${libdir}/python2.4/site-packages/twisted/runner/.debug" -FILES_${PN}-dbg += "${libdir}/python2.4/site-packages/twisted/spread/.debug" diff --git a/packages/uicmoc/uicmoc4-native_4.2.3.bb b/packages/uicmoc/uicmoc4-native_4.2.3.bb index 341b092e29..27b5b5bb31 100644 --- a/packages/uicmoc/uicmoc4-native_4.2.3.bb +++ b/packages/uicmoc/uicmoc4-native_4.2.3.bb @@ -1,7 +1,9 @@ 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" diff --git a/packages/uicmoc/uicmoc4-native_4.3.0.bb b/packages/uicmoc/uicmoc4-native_4.3.0.bb index fbfd8125cd..27443f6876 100644 --- a/packages/uicmoc/uicmoc4-native_4.3.0.bb +++ b/packages/uicmoc/uicmoc4-native_4.3.0.bb @@ -1,8 +1,9 @@ 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" diff --git a/packages/uicmoc/uicmoc4-native_4.3.1.bb b/packages/uicmoc/uicmoc4-native_4.3.1.bb new file mode 100644 index 0000000000..8fdddb042c --- /dev/null +++ b/packages/uicmoc/uicmoc4-native_4.3.1.bb @@ -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/ +} |