diff options
| author | Tomas Frydrych <tf@openedhand.com> | 2007-04-23 16:44:51 +0000 |
|---|---|---|
| committer | Tomas Frydrych <tf@openedhand.com> | 2007-04-23 16:44:51 +0000 |
| commit | 273f0d8c9179a396d2e729484ecf9d48bbd1c50e (patch) | |
| tree | 6dcf8b2120186c1f22473852d93b275660528a1f | |
| parent | d9c3ae611a7ffd14c2a0e0c73e88358e919dcfbf (diff) | |
| download | openembedded-core-273f0d8c9179a396d2e729484ecf9d48bbd1c50e.tar.gz openembedded-core-273f0d8c9179a396d2e729484ecf9d48bbd1c50e.tar.bz2 openembedded-core-273f0d8c9179a396d2e729484ecf9d48bbd1c50e.tar.xz openembedded-core-273f0d8c9179a396d2e729484ecf9d48bbd1c50e.zip | |
patched leafpad to use owl window menu
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1536 311d38ba-8fff-0310-9ca6-ca027cbcb966
| -rw-r--r-- | meta/packages/leafpad/files/owl-menu.patch | 61 | ||||
| -rw-r--r-- | meta/packages/leafpad/leafpad_0.8.9.bb | 5 |
2 files changed, 64 insertions, 2 deletions
diff --git a/meta/packages/leafpad/files/owl-menu.patch b/meta/packages/leafpad/files/owl-menu.patch new file mode 100644 index 000000000..bcb591744 --- /dev/null +++ b/meta/packages/leafpad/files/owl-menu.patch @@ -0,0 +1,61 @@ +--- tmp/src/menu.c.orig 2007-04-23 12:08:41.000000000 +0100 ++++ tmp/src/menu.c 2007-04-23 12:08:41.000000000 +0100 +@@ -152,7 +152,7 @@ + } + + accel_group = gtk_accel_group_new(); +- ifactory = gtk_item_factory_new(GTK_TYPE_MENU_BAR, "<main>", accel_group); ++ ifactory = gtk_item_factory_new(GTK_TYPE_MENU, "<main>", accel_group); + gtk_item_factory_set_translate_func(ifactory, menu_translate, NULL, NULL); + gtk_item_factory_create_items(ifactory, nmenu_items, menu_items, NULL); + gtk_window_add_accel_group(GTK_WINDOW(window), accel_group); + +--- tmp/src/window.c.orig 2007-04-23 12:14:07.000000000 +0100 ++++ tmp/src/window.c 2007-04-23 12:14:07.000000000 +0100 +@@ -18,6 +18,8 @@ + */ + + #include "leafpad.h" ++#include "owlwindowmenu.h" ++ + /* + static void cb_scroll_event(GtkAdjustment *adj, GtkWidget *view) + { +@@ -52,7 +54,6 @@ + gtk_container_add(GTK_CONTAINER(window), vbox); + + menubar = create_menu_bar(window); +- gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, FALSE, 0); + + sw = gtk_scrolled_window_new(NULL, NULL); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), + +--- tmp/src/main.c.orig 2007-04-23 12:15:03.000000000 +0100 ++++ tmp/src/main.c 2007-04-23 12:15:03.000000000 +0100 +@@ -244,6 +244,7 @@ + Conf *conf; + GtkItemFactory *ifactory; + gchar *stdin_data = NULL; ++ GtkWidget *menu; + + bindtextdomain(PACKAGE, LOCALEDIR); + bind_textdomain_codeset(PACKAGE, "UTF-8"); +@@ -293,7 +294,10 @@ + conf->autoindent); + + gtk_widget_show_all(pub->mw->window); ++ owl_set_window_menu (GTK_WINDOW(pub->mw->window), ++ GTK_MENU(pub->mw->menubar)); ++ + g_free(conf->fontname); + g_free(conf); + + +--- tmp/src/Makefile.am.orig 2007-04-23 12:17:54.000000000 +0100 ++++ tmp/src/Makefile.am 2007-04-23 12:17:54.000000000 +0100 +@@ -27,4 +27,4 @@ + i18n.h + + leafpad_CFLAGS = $(GTK_CFLAGS) $(GNOMEPRINT_CFLAGS) +-leafpad_LDADD = $(GTK_LIBS) $(INTLLIBS) $(GNOMEPRINT_LIBS) ++leafpad_LDADD = $(GTK_LIBS) $(INTLLIBS) $(GNOMEPRINT_LIBS) -lowl diff --git a/meta/packages/leafpad/leafpad_0.8.9.bb b/meta/packages/leafpad/leafpad_0.8.9.bb index f8e8e3bd5..0b19526b1 100644 --- a/meta/packages/leafpad/leafpad_0.8.9.bb +++ b/meta/packages/leafpad/leafpad_0.8.9.bb @@ -1,8 +1,9 @@ LICENSE = "GPLv2" -DEPENDS = "gtk+ intltool-native" +DEPENDS = "gtk+ intltool-native libowl" SRC_URI = "http://savannah.nongnu.org/download/${PN}/${PN}-${PV}.tar.gz \ + file://owl-menu.patch;patch=1 \ file://leafpad.desktop" -PR = "r2" +PR = "r3" inherit autotools pkgconfig |