summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--packages/openmoko2/openmoko-dialer2_svn.bb4
-rw-r--r--packages/pimlico/contacts-0.8/.mtn2git_empty (renamed from packages/pimlico/contacts-0.7/.mtn2git_empty)0
-rw-r--r--packages/pimlico/contacts-0.8/contacts-owl-window-menu.patch (renamed from packages/pimlico/contacts-0.7/contacts-owl-window-menu.patch)0
-rw-r--r--packages/pimlico/contacts_0.8.bb (renamed from packages/pimlico/contacts_0.7.bb)0
-rw-r--r--packages/pimlico/contacts_svn.bb4
-rw-r--r--packages/pimlico/dates_0.4.5.bb (renamed from packages/pimlico/dates_0.4.4.bb)0
-rw-r--r--packages/pimlico/dates_svn.bb2
-rw-r--r--packages/pimlico/files/dates-owl-window-menu.patch87
-rw-r--r--packages/pimlico/tasks-0.13/.mtn2git_empty (renamed from packages/pimlico/tasks-0.12/.mtn2git_empty)0
-rw-r--r--packages/pimlico/tasks-0.13/tasks-owl.diff (renamed from packages/pimlico/tasks-0.12/tasks-owl.diff)0
-rw-r--r--packages/pimlico/tasks_0.13.bb (renamed from packages/pimlico/tasks_0.12.bb)0
-rw-r--r--packages/pimlico/tasks_svn.bb3
-rw-r--r--packages/tasks/task-openmoko-feed.bb2
-rw-r--r--packages/uboot/uboot-openmoko_svn.bb2
14 files changed, 63 insertions, 41 deletions
diff --git a/packages/openmoko2/openmoko-dialer2_svn.bb b/packages/openmoko2/openmoko-dialer2_svn.bb
index 5d2683e0fd..171815ef18 100644
--- a/packages/openmoko2/openmoko-dialer2_svn.bb
+++ b/packages/openmoko2/openmoko-dialer2_svn.bb
@@ -1,8 +1,8 @@
DESCRIPTION = "The OpenMoko Dialer"
SECTION = "openmoko/pim"
-DEPENDS = "libjana libmokogsmd2 libmokoui2 libmokojournal2 pulseaudio"
+DEPENDS = "libjana libmokogsmd2 libmokoui2 libmokojournal2 pulseaudio libnotify"
PV = "0.1.0+svnr${SRCREV}"
-PR = "r5"
+PR = "r6"
PE = "1"
inherit openmoko2
diff --git a/packages/pimlico/contacts-0.7/.mtn2git_empty b/packages/pimlico/contacts-0.8/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/pimlico/contacts-0.7/.mtn2git_empty
+++ b/packages/pimlico/contacts-0.8/.mtn2git_empty
diff --git a/packages/pimlico/contacts-0.7/contacts-owl-window-menu.patch b/packages/pimlico/contacts-0.8/contacts-owl-window-menu.patch
index 1fbf1dcc2a..1fbf1dcc2a 100644
--- a/packages/pimlico/contacts-0.7/contacts-owl-window-menu.patch
+++ b/packages/pimlico/contacts-0.8/contacts-owl-window-menu.patch
diff --git a/packages/pimlico/contacts_0.7.bb b/packages/pimlico/contacts_0.8.bb
index d596d45659..d596d45659 100644
--- a/packages/pimlico/contacts_0.7.bb
+++ b/packages/pimlico/contacts_0.8.bb
diff --git a/packages/pimlico/contacts_svn.bb b/packages/pimlico/contacts_svn.bb
index 90a37287d1..0257046e88 100644
--- a/packages/pimlico/contacts_svn.bb
+++ b/packages/pimlico/contacts_svn.bb
@@ -4,9 +4,9 @@ require contacts.inc
#RDEPENDS += "gnome-vfs-plugin-file"
#RRECOMMENDS += "gnome-vfs-plugin-http"
-PV = "0.5+svnr${SRCREV}"
+PV = "0.8+svnr${SRCREV}"
-#DEFAULT_PREFERENCE = "-1"
+DEFAULT_PREFERENCE = "-1"
SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \
file://stock_contact.png \
diff --git a/packages/pimlico/dates_0.4.4.bb b/packages/pimlico/dates_0.4.5.bb
index 9e5451f522..9e5451f522 100644
--- a/packages/pimlico/dates_0.4.4.bb
+++ b/packages/pimlico/dates_0.4.5.bb
diff --git a/packages/pimlico/dates_svn.bb b/packages/pimlico/dates_svn.bb
index d392031abb..0ba1b07dc0 100644
--- a/packages/pimlico/dates_svn.bb
+++ b/packages/pimlico/dates_svn.bb
@@ -2,7 +2,7 @@ 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 \
diff --git a/packages/pimlico/files/dates-owl-window-menu.patch b/packages/pimlico/files/dates-owl-window-menu.patch
index d47875dd65..6bde252ac3 100644
--- a/packages/pimlico/files/dates-owl-window-menu.patch
+++ b/packages/pimlico/files/dates-owl-window-menu.patch
@@ -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;
+
diff --git a/packages/pimlico/tasks-0.12/.mtn2git_empty b/packages/pimlico/tasks-0.13/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/pimlico/tasks-0.12/.mtn2git_empty
+++ b/packages/pimlico/tasks-0.13/.mtn2git_empty
diff --git a/packages/pimlico/tasks-0.12/tasks-owl.diff b/packages/pimlico/tasks-0.13/tasks-owl.diff
index ce1ed9db7e..ce1ed9db7e 100644
--- a/packages/pimlico/tasks-0.12/tasks-owl.diff
+++ b/packages/pimlico/tasks-0.13/tasks-owl.diff
diff --git a/packages/pimlico/tasks_0.12.bb b/packages/pimlico/tasks_0.13.bb
index ff8da563e6..ff8da563e6 100644
--- a/packages/pimlico/tasks_0.12.bb
+++ b/packages/pimlico/tasks_0.13.bb
diff --git a/packages/pimlico/tasks_svn.bb b/packages/pimlico/tasks_svn.bb
index 5ad983ad97..dc998d2508 100644
--- a/packages/pimlico/tasks_svn.bb
+++ b/packages/pimlico/tasks_svn.bb
@@ -2,9 +2,8 @@ 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"
diff --git a/packages/tasks/task-openmoko-feed.bb b/packages/tasks/task-openmoko-feed.bb
index e1fbbabfde..1853f6a181 100644
--- a/packages/tasks/task-openmoko-feed.bb
+++ b/packages/tasks/task-openmoko-feed.bb
@@ -9,7 +9,7 @@ RDEPENDS_task-openmoko-feed = "\
aspell enchant \
bluez-hcidump \
bootchart \
- eet evas ecore embryo epsilon edje efreet emotion epdf \
+ eet evas ecore embryo epsilon edje efreet emotion \
exhibit edje-viewer \
free42-vga \
gpe-filemanager gpe-gallery gpe-timesheet gpe-todo \
diff --git a/packages/uboot/uboot-openmoko_svn.bb b/packages/uboot/uboot-openmoko_svn.bb
index 2ce92ad4a9..1e59e0746d 100644
--- a/packages/uboot/uboot-openmoko_svn.bb
+++ b/packages/uboot/uboot-openmoko_svn.bb
@@ -5,7 +5,7 @@ SECTION = "bootloader"
PRIORITY = "optional"
PROVIDES = "virtual/bootloader"
LOCALVERSION = "+git${SRCDATE}+svnr${SRCREV}"
-PV = "1.3.0${LOCALVERSION}"
+PV = "1.3.1${LOCALVERSION}"
PR = "r1"
SRCREV_FORMAT = "patches"
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-21 14:48:26 +0000