summaryrefslogtreecommitdiffstats
path: root/meta/packages
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-09-03 22:31:28 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2009-09-03 22:31:28 +0100
commit4426c30114f24165ece2442b3ce5c5f4e28a42ab (patch)
treede473c92b77869b45c43f66db3117ee8d19a0fa4 /meta/packages
parent43fa53c9f3933391a323d4bc6d26b88b750bafeb (diff)
downloadpoky-4426c30114f24165ece2442b3ce5c5f4e28a42ab.tar.gz
dates: Fix owl patch
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages')
-rw-r--r--meta/packages/pimlico/dates/dates-owl-window-menu.patch64
-rw-r--r--meta/packages/pimlico/dates_git.bb2
2 files changed, 24 insertions, 42 deletions
diff --git a/meta/packages/pimlico/dates/dates-owl-window-menu.patch b/meta/packages/pimlico/dates/dates-owl-window-menu.patch
index a52fd5741b..df24a1881b 100644
--- a/meta/packages/pimlico/dates/dates-owl-window-menu.patch
+++ b/meta/packages/pimlico/dates/dates-owl-window-menu.patch
@@ -5,11 +5,11 @@
5 src/dates_platform.h | 2 +- 5 src/dates_platform.h | 2 +-
6 4 files changed, 7 insertions(+), 7 deletions(-) 6 4 files changed, 7 insertions(+), 7 deletions(-)
7 7
8--- dates-0.4.5.orig/src/Makefile.am 8Index: git/src/Makefile.am
9+++ dates-0.4.5/src/Makefile.am 9===================================================================
10@@ -33,11 +33,11 @@ dates_SOURCES = $(platform) \ 10--- git.orig/src/Makefile.am 2009-08-18 12:44:56.000000000 +0100
11 dates_callbacks.h \ 11+++ git/src/Makefile.am 2009-09-03 22:28:50.000000000 +0100
12 dates_callbacks.c \ 12@@ -35,7 +35,7 @@
13 gconf-bridge.h \ 13 gconf-bridge.h \
14 gconf-bridge.c 14 gconf-bridge.c
15 15
@@ -18,13 +18,11 @@
18 18
19 if USE_OWL 19 if USE_OWL
20 dates_LDADD += $(top_builddir)/libowl/libowl.la 20 dates_LDADD += $(top_builddir)/libowl/libowl.la
21 endif 21Index: git/src/dates_gtk.c
22 22===================================================================
23--- dates-0.4.5.orig/src/dates_gtk.c 23--- git.orig/src/dates_gtk.c 2009-08-18 12:44:56.000000000 +0100
24+++ dates-0.4.5/src/dates_gtk.c 24+++ git/src/dates_gtk.c 2009-09-03 22:28:50.000000000 +0100
25@@ -30,14 +30,10 @@ 25@@ -33,10 +33,6 @@
26 #ifdef WITH_HILDON
27 #include <hildon/hildon-color-button.h>
28 #endif 26 #endif
29 27
30 #ifndef DATES_PLATFORM_create_main_window 28 #ifndef DATES_PLATFORM_create_main_window
@@ -35,11 +33,7 @@
35 static GtkWidget * 33 static GtkWidget *
36 create_main_window (DatesData * d, GtkWidget * toolbar, 34 create_main_window (DatesData * d, GtkWidget * toolbar,
37 GtkWidget * menu, GtkAccelGroup * accel_group) 35 GtkWidget * menu, GtkAccelGroup * accel_group)
38 { 36@@ -59,7 +55,6 @@
39 GtkWidget *main_vbox;
40@@ -55,11 +51,10 @@ create_main_window (DatesData * d, GtkWi
41 main_vbox = gtk_vbox_new (FALSE, 0);
42 gtk_widget_show (main_vbox);
43 gtk_container_add (GTK_CONTAINER (d->main_window), main_vbox); 37 gtk_container_add (GTK_CONTAINER (d->main_window), main_vbox);
44 38
45 gtk_widget_show (menu); 39 gtk_widget_show (menu);
@@ -47,13 +41,11 @@
47 41
48 gtk_box_pack_end (GTK_BOX (main_vbox), toolbar, FALSE, FALSE, 0); 42 gtk_box_pack_end (GTK_BOX (main_vbox), toolbar, FALSE, FALSE, 0);
49 gtk_container_set_border_width (GTK_CONTAINER (toolbar), 3); 43 gtk_container_set_border_width (GTK_CONTAINER (toolbar), 3);
50 44Index: git/src/dates_main.c
51 45===================================================================
52--- dates-0.4.5.orig/src/dates_main.c 46--- git.orig/src/dates_main.c 2009-08-18 12:44:56.000000000 +0100
53+++ dates-0.4.5/src/dates_main.c 47+++ git/src/dates_main.c 2009-09-03 22:29:21.000000000 +0100
54@@ -23,10 +23,12 @@ 48@@ -26,6 +26,8 @@
55 #include <math.h>
56 #include <libecal/e-cal-time-util.h>
57 #include <libical/icaltime.h> 49 #include <libical/icaltime.h>
58 #include <gconf/gconf-client.h> 50 #include <gconf/gconf-client.h>
59 51
@@ -62,12 +54,8 @@
62 #include "dates_types.h" 54 #include "dates_types.h"
63 #include "dates_platform.h" 55 #include "dates_platform.h"
64 #include "dates_callbacks.h" 56 #include "dates_callbacks.h"
65 57@@ -582,6 +584,9 @@
66 #include "gconf-bridge.h" 58 g_free (url_uri);
67@@ -564,10 +566,13 @@ main (int argc, char **argv)
68 gtk_widget_show (plug_widget);
69 } else {
70 gtk_widget_show (data.main_window);
71 } 59 }
72 60
73+ owl_set_window_menu (GTK_WINDOW (data.main_window), 61+ owl_set_window_menu (GTK_WINDOW (data.main_window),
@@ -75,14 +63,12 @@
75+ 63+
76 gtk_main (); 64 gtk_main ();
77 65
78 /* clean up */ 66 return 0;
79 g_option_context_free (context); 67Index: git/src/dates_platform.h
80 68===================================================================
81--- dates-0.4.5.orig/src/dates_platform.h 69--- git.orig/src/dates_platform.h 2009-08-18 12:44:56.000000000 +0100
82+++ dates-0.4.5/src/dates_platform.h 70+++ git/src/dates_platform.h 2009-09-03 22:28:50.000000000 +0100
83@@ -18,11 +18,11 @@ 71@@ -20,7 +20,7 @@
84 #ifndef DATES_UI_GTK_H
85 #define DATES_UI_GTK_H
86 72
87 #include "dates_types.h" 73 #include "dates_types.h"
88 74
@@ -91,5 +77,3 @@
91 #define DATES_MENU_WITHOUT_BAR 1 77 #define DATES_MENU_WITHOUT_BAR 1
92 #endif 78 #endif
93 79
94 struct DatesData;
95
diff --git a/meta/packages/pimlico/dates_git.bb b/meta/packages/pimlico/dates_git.bb
index 849af2a4fc..79bc342b0e 100644
--- a/meta/packages/pimlico/dates_git.bb
+++ b/meta/packages/pimlico/dates_git.bb
@@ -4,5 +4,3 @@ PV = "0.4.9+git${SRCPV}"
4S = "${WORKDIR}/git" 4S = "${WORKDIR}/git"
5 5
6SRC_URI = "git://git.gnome.org/${PN};protocol=git" 6SRC_URI = "git://git.gnome.org/${PN};protocol=git"
7
8SRC_URI_append_poky += "file://dates-owl-window-menu.patch;patch=1"