[oe-commits] org.oe.dev merge of 'aa908f9edf3bb81b538c3115f62602d8a40d01df'
hrw commit
openembedded-commits at lists.openembedded.org
Wed Dec 19 19:46:28 UTC 2007
merge of 'aa908f9edf3bb81b538c3115f62602d8a40d01df'
and 'd99a2eec5529a214f0a05a5ffe3a8697d12c08f0'
Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 4b7cb89c725753ca0394fa234977114cc6a07f7a
ViewMTN: http://monotone.openembedded.org/revision/info/4b7cb89c725753ca0394fa234977114cc6a07f7a
Files:
1
packages/qt/qt4-x11-free_4.1.2.bb
packages/qt/qt4-x11-free_4.3.2.bb
packages/pimlico/contacts-0.7
packages/pimlico/contacts-0.8
packages/pimlico/contacts_0.7.bb
packages/pimlico/contacts_0.8.bb
packages/pimlico/dates_0.4.4.bb
packages/pimlico/dates_0.4.5.bb
packages/pimlico/tasks-0.12
packages/pimlico/tasks-0.13
packages/pimlico/tasks_0.12.bb
packages/pimlico/tasks_0.13.bb
packages/pimlico/contacts_svn.bb
packages/pimlico/dates_svn.bb
packages/pimlico/files/dates-owl-window-menu.patch
packages/pimlico/tasks_svn.bb
Diffs:
#
# mt diff -raa908f9edf3bb81b538c3115f62602d8a40d01df -r4b7cb89c725753ca0394fa234977114cc6a07f7a
#
#
#
# patch "packages/qt/qt4-x11-free_4.1.2.bb"
# from [87ff0a36e1696d7c7726c3e3ffd517ca7f9233f3]
# to [3f0c2bbb385a352c8af18085b894d4224822db3c]
#
# patch "packages/qt/qt4-x11-free_4.3.2.bb"
# from [2a8bfa1b9cc3aa059dd561726a7bbdfc8bcc4e79]
# to [706fc53c8f4c041fca267bea9825aa99010fa460]
#
============================================================
--- packages/qt/qt4-x11-free_4.1.2.bb 87ff0a36e1696d7c7726c3e3ffd517ca7f9233f3
+++ packages/qt/qt4-x11-free_4.1.2.bb 3f0c2bbb385a352c8af18085b894d4224822db3c
@@ -70,6 +70,7 @@ do_stage() {
do_stage() {
oe_runmake install INSTALL_ROOT=/
+ install -d ${STAGING_QT_DIR}
install -m 0755 ${STAGING_BINDIR_NATIVE}/rcc4 ${STAGING_QT_DIR}/bin/rcc
install -m 0755 ${STAGING_BINDIR_NATIVE}/moc4 ${STAGING_QT_DIR}/bin/moc
install -m 0755 ${STAGING_BINDIR_NATIVE}/uic4 ${STAGING_QT_DIR}/bin/uic
============================================================
--- packages/qt/qt4-x11-free_4.3.2.bb 2a8bfa1b9cc3aa059dd561726a7bbdfc8bcc4e79
+++ packages/qt/qt4-x11-free_4.3.2.bb 706fc53c8f4c041fca267bea9825aa99010fa460
@@ -62,7 +62,7 @@ do_compile() {
# FIXME: Might want to compile the cross tools for the -dev packages as well...
do_compile() {
- unset CFLAGS CXXFLAGS
+ unset CFLAGS CXXFLAGSi
install -m 0755 ${STAGING_BINDIR_NATIVE}/rcc4 ${S}/bin/rcc
install -m 0755 ${STAGING_BINDIR_NATIVE}/moc4 ${S}/bin/moc
install -m 0755 ${STAGING_BINDIR_NATIVE}/uic4 ${S}/bin/uic
@@ -74,6 +74,7 @@ do_stage() {
do_stage() {
oe_runmake install INSTALL_ROOT=/
+ install -d ${STAGING_QT_DIR}
install -m 0755 ${STAGING_BINDIR_NATIVE}/rcc4 ${STAGING_QT_DIR}/bin/rcc
install -m 0755 ${STAGING_BINDIR_NATIVE}/moc4 ${STAGING_QT_DIR}/bin/moc
install -m 0755 ${STAGING_BINDIR_NATIVE}/uic4 ${STAGING_QT_DIR}/bin/uic
#
# mt diff -rd99a2eec5529a214f0a05a5ffe3a8697d12c08f0 -r4b7cb89c725753ca0394fa234977114cc6a07f7a
#
#
#
# rename "packages/pimlico/contacts-0.7"
# to "packages/pimlico/contacts-0.8"
#
# rename "packages/pimlico/contacts_0.7.bb"
# to "packages/pimlico/contacts_0.8.bb"
#
# rename "packages/pimlico/dates_0.4.4.bb"
# to "packages/pimlico/dates_0.4.5.bb"
#
# rename "packages/pimlico/tasks-0.12"
# to "packages/pimlico/tasks-0.13"
#
# rename "packages/pimlico/tasks_0.12.bb"
# to "packages/pimlico/tasks_0.13.bb"
#
# patch "packages/pimlico/contacts_svn.bb"
# from [7c97d1154efdefb942bab51a32eb1592e722bf76]
# to [70e6be2ce496955087d94d8f76b045ea75864fed]
#
# patch "packages/pimlico/dates_svn.bb"
# from [7c0ffed6b182d350037aa0adc293f7e23087f9c9]
# to [4d0e79460872b2843ef9cd590bf2685f79e3efe0]
#
# patch "packages/pimlico/files/dates-owl-window-menu.patch"
# from [961ef2c4f747b24491f90f723be67ad849510220]
# to [b9252eb6fad201ed11b37ac0939d42ffa7a86659]
#
# patch "packages/pimlico/tasks_svn.bb"
# from [6f444d0caa32c1ef1f193f39ed7a93f4bd1c5eae]
# to [68cbf175c159861fc4f319b86c0e36bba742822c]
#
============================================================
--- packages/pimlico/contacts_svn.bb 7c97d1154efdefb942bab51a32eb1592e722bf76
+++ packages/pimlico/contacts_svn.bb 70e6be2ce496955087d94d8f76b045ea75864fed
@@ -1,10 +1,10 @@ require contacts.inc
require contacts.inc
#DEPENDS += "gnome-vfs"
#RDEPENDS += "gnome-vfs-plugin-file"
#RRECOMMENDS += "gnome-vfs-plugin-http"
-PV = "0.5+svnr${SRCREV}"
+PV = "0.8+svnr${SRCREV}"
#DEFAULT_PREFERENCE = "-1"
============================================================
--- packages/pimlico/dates_svn.bb 7c0ffed6b182d350037aa0adc293f7e23087f9c9
+++ packages/pimlico/dates_svn.bb 4d0e79460872b2843ef9cd590bf2685f79e3efe0
@@ -1,8 +1,8 @@ DEFAULT_PREFERENCE = "-1"
require dates.inc
DEFAULT_PREFERENCE = "-1"
-PV = "0.4.4+svnr${SRCREV}"
+PV = "0.4.5+svnr${SRCREV}"
S = "${WORKDIR}/trunk"
SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \
============================================================
--- packages/pimlico/files/dates-owl-window-menu.patch 961ef2c4f747b24491f90f723be67ad849510220
+++ packages/pimlico/files/dates-owl-window-menu.patch b9252eb6fad201ed11b37ac0939d42ffa7a86659
@@ -1,21 +1,30 @@
-Index: trunk/src/Makefile.am
-===================================================================
---- trunk.orig/src/Makefile.am 2007-07-11 22:16:15.000000000 +0100
-+++ trunk/src/Makefile.am 2007-07-13 08:21:11.000000000 +0100
-@@ -47,7 +47,7 @@
- libgtkdatesviewinclude_HEADERS = \
- dates_view.h
+---
+ src/Makefile.am | 2 +-
+ src/dates_gtk.c | 5 -----
+ src/dates_main.c | 5 +++++
+ src/dates_platform.h | 2 +-
+ 4 files changed, 7 insertions(+), 7 deletions(-)
+
+--- dates-0.4.5.orig/src/Makefile.am
++++ dates-0.4.5/src/Makefile.am
+@@ -33,11 +33,11 @@ dates_SOURCES = $(platform) \
+ dates_callbacks.h \
+ dates_callbacks.c \
+ gconf-bridge.h \
+ gconf-bridge.c
--dates_LDADD = $(DATES_LIBS) libgtkdatesview.la
-+dates_LDADD = $(DATES_LIBS) libgtkdatesview.la -lowl
+-dates_LDADD = $(DATES_LIBS) libgtkdatesview.la
++dates_LDADD = $(DATES_LIBS) libgtkdatesview.la -lowl
if USE_OWL
dates_LDADD += $(top_builddir)/libowl/libowl.la
-Index: trunk/src/dates_gtk.c
-===================================================================
---- trunk.orig/src/dates_gtk.c 2007-07-11 22:16:15.000000000 +0100
-+++ trunk/src/dates_gtk.c 2007-07-13 08:33:48.000000000 +0100
-@@ -32,10 +32,6 @@
+ endif
+
+--- dates-0.4.5.orig/src/dates_gtk.c
++++ dates-0.4.5/src/dates_gtk.c
+@@ -30,14 +30,10 @@
+ #ifdef WITH_HILDON
+ #include <hildon/hildon-color-button.h>
#endif
#ifndef DATES_PLATFORM_create_main_window
@@ -26,7 +35,11 @@ Index: trunk/src/dates_gtk.c
static GtkWidget *
create_main_window (DatesData * d, GtkWidget * toolbar,
GtkWidget * menu, GtkAccelGroup * accel_group)
-@@ -57,7 +53,6 @@
+ {
+ GtkWidget *main_vbox;
+@@ -55,11 +51,10 @@ create_main_window (DatesData * d, GtkWi
+ main_vbox = gtk_vbox_new (FALSE, 0);
+ gtk_widget_show (main_vbox);
gtk_container_add (GTK_CONTAINER (d->main_window), main_vbox);
gtk_widget_show (menu);
@@ -34,24 +47,13 @@ Index: trunk/src/dates_gtk.c
gtk_box_pack_end (GTK_BOX (main_vbox), toolbar, FALSE, FALSE, 0);
gtk_container_set_border_width (GTK_CONTAINER (toolbar), 3);
-Index: trunk/src/dates_platform.h
-===================================================================
---- trunk.orig/src/dates_platform.h 2007-07-11 22:16:15.000000000 +0100
-+++ trunk/src/dates_platform.h 2007-07-13 08:21:11.000000000 +0100
-@@ -20,7 +20,7 @@
- #include "dates_types.h"
--#ifdef WITH_HILDON
-+#if 1
- #define DATES_MENU_WITHOUT_BAR 1
- #endif
-
-Index: trunk/src/dates_main.c
-===================================================================
---- trunk.orig/src/dates_main.c 2007-07-11 22:16:15.000000000 +0100
-+++ trunk/src/dates_main.c 2007-07-13 08:36:11.000000000 +0100
-@@ -25,6 +25,8 @@
+--- dates-0.4.5.orig/src/dates_main.c
++++ dates-0.4.5/src/dates_main.c
+@@ -23,10 +23,12 @@
+ #include <math.h>
+ #include <libecal/e-cal-time-util.h>
#include <libical/icaltime.h>
#include <gconf/gconf-client.h>
@@ -60,7 +62,11 @@ Index: trunk/src/dates_main.c
#include "dates_types.h"
#include "dates_platform.h"
#include "dates_callbacks.h"
-@@ -566,6 +568,9 @@
+
+ #include "gconf-bridge.h"
+@@ -564,10 +566,13 @@ main (int argc, char **argv)
+ gtk_widget_show (plug_widget);
+ } else {
gtk_widget_show (data.main_window);
}
@@ -70,3 +76,20 @@ Index: trunk/src/dates_main.c
gtk_main ();
/* clean up */
+ g_option_context_free (context);
+
+--- dates-0.4.5.orig/src/dates_platform.h
++++ dates-0.4.5/src/dates_platform.h
+@@ -18,11 +18,11 @@
+ #ifndef DATES_UI_GTK_H
+ #define DATES_UI_GTK_H
+
+ #include "dates_types.h"
+
+-#ifdef WITH_HILDON
++#if 1
+ #define DATES_MENU_WITHOUT_BAR 1
+ #endif
+
+ struct DatesData;
+
============================================================
--- packages/pimlico/tasks_svn.bb 6f444d0caa32c1ef1f193f39ed7a93f4bd1c5eae
+++ packages/pimlico/tasks_svn.bb 68cbf175c159861fc4f319b86c0e36bba742822c
@@ -1,10 +1,9 @@ DEFAULT_PREFERENCE = "-1"
require tasks.inc
DEFAULT_PREFERENCE = "-1"
-PV = "0.12+svnr${SRCREV}"
+PV = "0.13+svnr${SRCREV}"
S = "${WORKDIR}/trunk"
SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \
- file://tasks-single.diff;patch=1 \
file://tasks-owl.diff;patch=1"
More information about the Openembedded-commits
mailing list