diff options
| -rw-r--r-- | packages/angstrom/task-angstrom-x11.bb | 6 | ||||
| -rw-r--r-- | packages/gpe-scap/.mtn2git_empty (renamed from packages/gpe-screenshot/.mtn2git_empty) | 0 | ||||
| -rw-r--r-- | packages/gpe-scap/gpe-scap_1.0.bb (renamed from packages/gpe-screenshot/gpe-screenshot_0.4.bb) | 7 | ||||
| -rw-r--r-- | packages/gpe-screenshot/files/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/gpe-screenshot/files/fix-segfault.patch | 36 | ||||
| -rw-r--r-- | packages/tasks/task-gpe.bb | 2 |
6 files changed, 9 insertions, 42 deletions
diff --git a/packages/angstrom/task-angstrom-x11.bb b/packages/angstrom/task-angstrom-x11.bb index 62e468a014..0060d07877 100644 --- a/packages/angstrom/task-angstrom-x11.bb +++ b/packages/angstrom/task-angstrom-x11.bb @@ -25,7 +25,7 @@ RDEPENDS_angstrom-x11-base-depends := "\ RDEPENDS_angstrom-gpe-task-base := "\ matchbox \ xcursor-transparent-theme \ - rxvt-unicode \ +# rxvt-unicode \ matchbox-themes-gtk \ xst \ xhost \ @@ -36,7 +36,7 @@ RDEPENDS_angstrom-gpe-task-base := "\ gpe-session-scripts \ gpe-icons \ gpe-confd \ - gpe-autostarter \ +# gpe-autostarter \ libgtkstylus \ libgtkinput \ suspend-desktop \ @@ -79,7 +79,7 @@ RDEPENDS_angstrom-gpe-task-apps := "\ gpe-aerial \ gpe-soundbite \ rosetta \ - gpe-screenshot \ + gpe-scap \ gpe-windowlist" RDEPENDS_angstrom-gpe-task-games := "\ diff --git a/packages/gpe-screenshot/.mtn2git_empty b/packages/gpe-scap/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/gpe-screenshot/.mtn2git_empty +++ b/packages/gpe-scap/.mtn2git_empty diff --git a/packages/gpe-screenshot/gpe-screenshot_0.4.bb b/packages/gpe-scap/gpe-scap_1.0.bb index ce31febc3d..6f0c7746ef 100644 --- a/packages/gpe-screenshot/gpe-screenshot_0.4.bb +++ b/packages/gpe-scap/gpe-scap_1.0.bb @@ -2,10 +2,13 @@ DESCRIPTION = "GPE screenshot application" LICENSE = "GPL" PRIORITY = "optional" SECTION = "gpe" -PR = "r1" +PR = "r0" + +RREPLACES = "gpe-screenshot" DEPENDS = "glib-2.0 gtk+ libglade" +GPE_TARBALL_SUFFIX = "bz2" + inherit gpe autotools -SRC_URI += "file://fix-segfault.patch;patch=1;pnum=0 " diff --git a/packages/gpe-screenshot/files/.mtn2git_empty b/packages/gpe-screenshot/files/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/gpe-screenshot/files/.mtn2git_empty +++ /dev/null diff --git a/packages/gpe-screenshot/files/fix-segfault.patch b/packages/gpe-screenshot/files/fix-segfault.patch deleted file mode 100644 index dc185a9b51..0000000000 --- a/packages/gpe-screenshot/files/fix-segfault.patch +++ /dev/null @@ -1,36 +0,0 @@ -Index: src/gpe-screenshot.c -=================================================================== -RCS file: /cvs/gpe/base/gpe-screenshot/src/gpe-screenshot.c,v -retrieving revision 1.1 -retrieving revision 1.2 -diff -u -r1.1 -r1.2 ---- src/gpe-screenshot.c 1 Nov 2005 20:54:38 -0000 1.1 -+++ src/gpe-screenshot.c 10 Aug 2006 15:07:21 -0000 1.2 -@@ -334,10 +334,9 @@ - { - GtkWidget *icon = gtk_image_new_from_stock (GTK_STOCK_JUMP_TO, GTK_ICON_SIZE_BUTTON); - -- g_object_set (mainDlg->ok_button, "use-stock", FALSE); -- g_object_set (mainDlg->ok_button, "use-underline", TRUE); -- g_object_set (mainDlg->ok_button, "label", "_Upload"); -- g_object_set (mainDlg->ok_button, "image", GTK_WIDGET (icon)); -+ gtk_button_set_use_stock (mainDlg->ok_button, FALSE); -+ gtk_button_set_label (mainDlg->ok_button, "_Upload"); -+ gtk_button_set_image (mainDlg->ok_button, icon); - - gtk_widget_set_sensitive (GTK_WIDGET (mainDlg->entry), FALSE); - gtk_widget_set_sensitive (GTK_WIDGET (mainDlg->browse_button), FALSE); -@@ -347,10 +346,9 @@ - GtkWidget *icon = gtk_image_new_from_stock (GTK_STOCK_SAVE, GTK_ICON_SIZE_BUTTON); - - /* for some odd reason use-stock doesn't have any effect. set the image manually...*/ -- g_object_set (mainDlg->ok_button, "use-stock", TRUE); -- g_object_set (mainDlg->ok_button, "use-underline", TRUE); -- g_object_set (mainDlg->ok_button, "label", GTK_STOCK_SAVE); -- g_object_set (mainDlg->ok_button, "image", GTK_WIDGET (icon)); -+ gtk_button_set_label (mainDlg->ok_button, GTK_STOCK_SAVE); -+ gtk_button_set_use_stock (mainDlg->ok_button, TRUE); -+ gtk_button_set_image (mainDlg->ok_button, icon); - - gtk_widget_set_sensitive (GTK_WIDGET (mainDlg->entry), TRUE); - gtk_widget_set_sensitive (GTK_WIDGET (mainDlg->browse_button), TRUE); diff --git a/packages/tasks/task-gpe.bb b/packages/tasks/task-gpe.bb index 80f85238d1..31b00c1680 100644 --- a/packages/tasks/task-gpe.bb +++ b/packages/tasks/task-gpe.bb @@ -88,7 +88,7 @@ RDEPENDS_gpe-task-apps := "\ gpe-aerial \ gpe-soundbite \ rosetta \ - gpe-screenshot \ + gpe-scap \ gpe-windowlist" RDEPENDS_gpe-task-games := "\ |