[oe-commits] org.oe.dev merge of '4da6387963b0050f0f62cbd7daa0a2826339e342'
hrw commit
openembedded-commits at lists.openembedded.org
Mon Nov 12 13:40:51 UTC 2007
merge of '4da6387963b0050f0f62cbd7daa0a2826339e342'
and 'bff6f2c3b18977b23d686ec5fb277c0bd904bb5c'
Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 5672bf2a0f12a48b56894d35d8a4795114e47b16
ViewMTN: http://monotone.openembedded.org/revision/info/5672bf2a0f12a48b56894d35d8a4795114e47b16
Files:
1
packages/python/python-gst_0.10.8.bb
packages/maemo3/libconic
packages/maemo-mapper/files/mapper-hildon1.diff
packages/maemo-mapper/maemo-mapper_svn.bb
packages/maemo3/libconic/dbus-api-update.patch
packages/maemo3/libconic_0.13.bb
packages/squid/squid-native_2.6.STABLE14.bb
packages/fontconfig/fontconfig_2.4.1.bb
packages/maemo3/libhildonfm_1.9.41.bb
packages/squid/squid_2.6.STABLE14.bb
Diffs:
#
# mt diff -r4da6387963b0050f0f62cbd7daa0a2826339e342 -r5672bf2a0f12a48b56894d35d8a4795114e47b16
#
#
#
# patch "packages/python/python-gst_0.10.8.bb"
# from [71eb392f58cb009c9be3ce8878d3320a22c37a0d]
# to [c738ad94538f071894dcbaebf4a60e829de0e880]
#
============================================================
--- packages/python/python-gst_0.10.8.bb 71eb392f58cb009c9be3ce8878d3320a22c37a0d
+++ packages/python/python-gst_0.10.8.bb c738ad94538f071894dcbaebf4a60e829de0e880
@@ -1,8 +1,8 @@ DEPENDS = "gstreamer gst-plugins-base py
DESCRIPTION = "Python Gstreamer bindings"
SECTION = "devel/python"
LICENSE = "LGPL"
DEPENDS = "gstreamer gst-plugins-base python-pygobject"
-PR = "ml0"
+PR = "ml1"
SRC_URI = "http://gstreamer.freedesktop.org/src/gst-python/gst-python-${PV}.tar.bz2 \
file://python-path.patch;patch=1"
@@ -21,4 +21,4 @@ do_stage() {
autotools_stage_all
}
+FILES_${PN}-dbg = "${libdir}/python2.5/site-packages/gst-0.10/gst/.debug/"
-FILES_${PN}-dbg = "${libdir}/python2.4/site-packages/gst-0.10/gst/.debug/"
#
# mt diff -rbff6f2c3b18977b23d686ec5fb277c0bd904bb5c -r5672bf2a0f12a48b56894d35d8a4795114e47b16
#
#
#
# add_dir "packages/maemo3/libconic"
#
# add_file "packages/maemo-mapper/files/mapper-hildon1.diff"
# content [2dff18a84a4c192197eed4710e8d20b244175b92]
#
# add_file "packages/maemo-mapper/maemo-mapper_svn.bb"
# content [8932daad08877170ec5cccb94f910cbbe677f388]
#
# add_file "packages/maemo3/libconic/dbus-api-update.patch"
# content [444fe88252705927354a1abe138e385eba51b634]
#
# add_file "packages/maemo3/libconic_0.13.bb"
# content [a868945ce6c923fc705a172c4c384f2e3ccf6103]
#
# add_file "packages/squid/squid-native_2.6.STABLE14.bb"
# content [1172f29b0c10317874bdc571c8d3f5ff1b162d49]
#
# patch "packages/fontconfig/fontconfig_2.4.1.bb"
# from [8a529f524c54cb5fef5e520821d90acda5fbd9fb]
# to [d1bbd036150276e6c165ee78593ba796695d165a]
#
# patch "packages/maemo3/libhildonfm_1.9.41.bb"
# from [28bd888a778dcd453876624cbdc43e8650ebcd59]
# to [3152331d0e5291c8a6586a8679d55f536cb6d2dc]
#
# patch "packages/squid/squid_2.6.STABLE14.bb"
# from [5aa7fbb4de7e6c5a481b693a5c5ae386e4433b0f]
# to [a3362ec5fbb758d23c416f5a20431fc5e27a6f40]
#
============================================================
--- packages/maemo-mapper/files/mapper-hildon1.diff 2dff18a84a4c192197eed4710e8d20b244175b92
+++ packages/maemo-mapper/files/mapper-hildon1.diff 2dff18a84a4c192197eed4710e8d20b244175b92
@@ -0,0 +1,20 @@
+--- /tmp/maemo-mapper.c 2007-10-02 12:15:04.000000000 +0200
++++ maemo-mapper/src/maemo-mapper.c 2007-10-02 12:18:06.622045000 +0200
+@@ -52,7 +52,7 @@
+ #include <hildon-widgets/hildon-controlbar.h>
+ #include <hildon-widgets/hildon-note.h>
+ #include <hildon-widgets/hildon-color-button.h>
+-#include <hildon-widgets/hildon-file-chooser-dialog.h>
++#include <hildon-fm-2/hildon/hildon-file-chooser-dialog.h>
+ #include <hildon-widgets/hildon-number-editor.h>
+ #include <hildon-widgets/hildon-banner.h>
+ #include <hildon-widgets/hildon-system-sound.h>
+@@ -6532,8 +6532,6 @@
+
+ gtk_widget_show_all(GTK_WIDGET(menu));
+
+- gtk_widget_tap_and_hold_setup(_map_widget, GTK_WIDGET(menu), NULL, 0);
+-
+ vprintf("%s(): return\n", __PRETTY_FUNCTION__);
+ }
+
============================================================
--- packages/maemo-mapper/maemo-mapper_svn.bb 8932daad08877170ec5cccb94f910cbbe677f388
+++ packages/maemo-mapper/maemo-mapper_svn.bb 8932daad08877170ec5cccb94f910cbbe677f388
@@ -0,0 +1,21 @@
+DESCRIPTION = "GPS navigation/map display software"
+LICENSE = "GPL"
+DEPENDS = "gdbm libconic sqlite3 gtk+ libhildonfm libosso osso-ic-oss libosso-help gnome-vfs dbus bluez-libs"
+RDEPENDS = "bluez-utils"
+RRECOMMENDS = "gpsd flite"
+PV = "2.0.3+svnr${SRCREV}"
+PR = "r2"
+
+SRC_URI = "svn://garage.maemo.org/svn/maemo-mapper;proto=https;module=trunk \
+ file://mapper-hildon1.diff;patch=1;maxrev=108"
+
+S = "${WORKDIR}/trunk"
+
+inherit autotools pkgconfig
+
+do_install_append () {
+ install -d ${D}${datadir}/applications/
+ mv ${D}/maemo-mapper.desktop ${D}${datadir}/applications/
+}
+
+#FILES_${PN} += "${datadir}/icons"
============================================================
--- packages/maemo3/libconic/dbus-api-update.patch 444fe88252705927354a1abe138e385eba51b634
+++ packages/maemo3/libconic/dbus-api-update.patch 444fe88252705927354a1abe138e385eba51b634
@@ -0,0 +1,19 @@
+--- /tmp/conicconnection.c 2007-11-12 12:45:37.000000000 +0100
++++ libconic-0.13/conic/conicconnection.c 2007-11-12 12:46:04.663234000 +0100
+@@ -473,7 +473,7 @@
+ ICD_DBUS_PATH,
+ &icd_vtable,
+ NULL)) {
+- dbus_connection_disconnect(dbus_connection);
++ dbus_connection_close(dbus_connection);
+ dbus_connection_unref(dbus_connection);
+ dbus_connection = NULL;
+ }
+--- /tmp/Makefile.am 2007-11-12 12:47:22.000000000 +0100
++++ libconic-0.13/Makefile.am 2007-11-12 12:47:29.773234000 +0100
+@@ -1,4 +1,4 @@
+-SUBDIRS = conic tests
++SUBDIRS = conic
+
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = conic.pc
============================================================
--- packages/maemo3/libconic_0.13.bb a868945ce6c923fc705a172c4c384f2e3ccf6103
+++ packages/maemo3/libconic_0.13.bb a868945ce6c923fc705a172c4c384f2e3ccf6103
@@ -0,0 +1,13 @@
+DESCRIPTION = "Internet connection library"
+LICENSE = "LGPL"
+DEPENDS = "dbus-glib gconf"
+
+SRC_URI = "http://repository.maemo.org/pool/bora/free/source/${PN}_${PV}.tar.gz \
+ file://dbus-api-update.patch;patch=1"
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
+
+
============================================================
--- packages/squid/squid-native_2.6.STABLE14.bb 1172f29b0c10317874bdc571c8d3f5ff1b162d49
+++ packages/squid/squid-native_2.6.STABLE14.bb 1172f29b0c10317874bdc571c8d3f5ff1b162d49
@@ -0,0 +1,11 @@
+inherit native autotools
+
+SRC_URI = "http://www.squid-cache.org/Versions/v2/2.6/squid-${PV}.tar.bz2"
+S = "${WORKDIR}/squid-${PV}"
+
+inherit native autotools
+
+do_stage() {
+ install -d ${STAGING_BINDIR_NATIVE}
+ install -m 0755 src/cf_gen ${STAGING_BINDIR_NATIVE}/cf_gen
+}
============================================================
--- packages/fontconfig/fontconfig_2.4.1.bb 8a529f524c54cb5fef5e520821d90acda5fbd9fb
+++ packages/fontconfig/fontconfig_2.4.1.bb d1bbd036150276e6c165ee78593ba796695d165a
@@ -5,7 +5,7 @@ SRC_URI = "http://fontconfig.org/release
SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \
https://stage.maemo.org/svn/maemo/projects/haf/trunk/fontconfig/device_symbols.h"
-PR = "r1"
+PR = "r2"
PACKAGES =+ "fontconfig-utils-dbg fontconfig-utils "
FILES_fontconfig-utils-dbg = "${bindir}/*.dbg"
@@ -43,6 +43,7 @@ do_stage () {
oe_libinstall -so -a -C src libfontconfig ${STAGING_LIBDIR}
install -d ${STAGING_INCDIR}/fontconfig
for i in ${S}/fontconfig/*.h; do install -m 0644 $i ${STAGING_INCDIR}/fontconfig/; done
+ ln -sf ${STAGING_INCDIR}/fontconfig/device_symbols.h ${STAGING_INCDIR}
}
BUILD_CFLAGS += " -I${STAGING_INCDIR_NATIVE}/freetype2"
============================================================
--- packages/maemo3/libhildonfm_1.9.41.bb 28bd888a778dcd453876624cbdc43e8650ebcd59
+++ packages/maemo3/libhildonfm_1.9.41.bb 3152331d0e5291c8a6586a8679d55f536cb6d2dc
@@ -1,9 +1,9 @@ DEPENDS = "hildon-thumbnail mce-dev libh
LICENSE = "LGPL"
DESCRIPTION = "Nokia hildon filemanager library"
DEPENDS = "hildon-thumbnail mce-dev libhildonmime osso-gwconnect hildon-libs osso-thumbnail"
-PR = "r0"
+PR = "r1"
SRC_URI = "http://repository.maemo.org/pool/sardine/main/source/libh/libhildonfm/libhildonfm_${PV}.tar.gz \
file://hildonfm-ifdef-maemogtk.diff;patch=1 \
@@ -24,6 +24,7 @@ do_stage() {
do_stage() {
autotools_stage_all
+ ln -sf ${STAGING_INCDIR}/hildon-fm-2/hildon/* ${STAGING_INCDIR}/hildon-widgets/
}
============================================================
--- packages/squid/squid_2.6.STABLE14.bb 5aa7fbb4de7e6c5a481b693a5c5ae386e4433b0f
+++ packages/squid/squid_2.6.STABLE14.bb a3362ec5fbb758d23c416f5a20431fc5e27a6f40
@@ -1,11 +1,23 @@ LICENSE = "GPLv2"
DESCRIPTION = "Squid is a caching proxy for the Web supporting HTTP, HTTPS, FTP, and more"
LICENSE = "GPLv2"
-DEPENDS = "aio"
+DEPENDS = "squid-native-${PV}"
-SRC_URI = "http://www.squid-cache.org/Versions/v2/2.6/squid-2.6.STABLE14.tar.bz2"
+SRC_URI = "http://www.squid-cache.org/Versions/v2/2.6/squid-${PV}.tar.bz2"
inherit autotools
+EXTRA_OECONF = "--disable-epoll --disable-nls"
+do_configure_append() {
+ sed -i -e 's|./cf_gen |${STAGING_BINDIR_NATIVE}/cf_gen |g' src/Makefile
+}
+# this packages the languages better and saves some space, installs
+# English as errors default and the others in locale package
+
+FILES_${PN} += " ${datadir}/errors/English/* \
+ ${datadir}/icons/* \
+ ${datadir}/mib.txt"
+
+FILES_${PN}-locale += " ${datadir}/errors/* "
More information about the Openembedded-commits
mailing list