summaryrefslogtreecommitdiffstats
path: root/meta/packages
diff options
context:
space:
mode:
Diffstat (limited to 'meta/packages')
-rw-r--r--meta/packages/clutter/moblin-proto/fix.patch22
-rw-r--r--meta/packages/clutter/moblin-proto/paths.patch15
-rw-r--r--meta/packages/clutter/moblin-proto_git.bb8
3 files changed, 21 insertions, 24 deletions
diff --git a/meta/packages/clutter/moblin-proto/fix.patch b/meta/packages/clutter/moblin-proto/fix.patch
index 802b8c4b6c..8bde67762c 100644
--- a/meta/packages/clutter/moblin-proto/fix.patch
+++ b/meta/packages/clutter/moblin-proto/fix.patch
@@ -20,25 +20,3 @@ Index: git/Makefile
20 20
21 #$(BINARY): $(CFILES) 21 #$(BINARY): $(CFILES)
22 # $(LD) $(CFLAGS) $(INCS) $(CFILES) $(LIBS) -o $@ 22 # $(LD) $(CFLAGS) $(INCS) $(CFILES) $(LIBS) -o $@
23Index: git/moblin-desktop.c
24===================================================================
25--- git.orig/moblin-desktop.c 2008-08-11 22:49:49.000000000 +0100
26+++ git/moblin-desktop.c 2008-08-12 12:14:44.000000000 +0100
27@@ -620,17 +620,10 @@
28
29 attach_reactivate_on_press (old_app);
30
31-<<<<<<< HEAD:moblin-desktop.c
32 shuttle = clutter_group_new ();
33 clutter_group_add (CLUTTER_GROUP(desktop->mainstuff), shuttle);
34 copy_geometry (desktop->middle, shuttle);
35 clutter_actor_reparent (old_app, shuttle);
36-=======
37- box = clutter_group_new ();
38- clutter_group_add (CLUTTER_GROUP(desktop->stage), box);
39- copy_geometry (desktop->middle, box);
40- clutter_actor_reparent (old_app, box);
41->>>>>>> Removed now unneeded forcible shows of apps.:moblin-desktop.c
42
43 {
44 gint x, y;
diff --git a/meta/packages/clutter/moblin-proto/paths.patch b/meta/packages/clutter/moblin-proto/paths.patch
new file mode 100644
index 0000000000..d241c8ff71
--- /dev/null
+++ b/meta/packages/clutter/moblin-proto/paths.patch
@@ -0,0 +1,15 @@
1diff --git a/moblin-desktop.h b/moblin-desktop.h
2index 880a9ad..3d51a14 100644
3--- a/moblin-desktop.h
4+++ b/moblin-desktop.h
5@@ -29,8 +29,8 @@
6 #define __MAIN_H__
7
8
9-#define ASSET_ROOT "./assets/"
10-#define JSON_ROOT "./layouts/"
11+#define ASSET_ROOT "/usr/share/moblin-proto/assets/"
12+#define JSON_ROOT "/usr/share/moblin-proto/layouts/"
13
14 typedef struct
15 {
diff --git a/meta/packages/clutter/moblin-proto_git.bb b/meta/packages/clutter/moblin-proto_git.bb
index 00b5b5e3f3..8ce97bbeab 100644
--- a/meta/packages/clutter/moblin-proto_git.bb
+++ b/meta/packages/clutter/moblin-proto_git.bb
@@ -1,14 +1,18 @@
1
2DEPENDS = "clutter-box2d" 1DEPENDS = "clutter-box2d"
3 2
4PV = "0.0+git${SRCREV}" 3PV = "0.0+git${SRCREV}"
4PR = "r1"
5 5
6SRC_URI = "git://moblin.org/repos/users/pippin/prototype.git/;protocol=http \ 6SRC_URI = "git://moblin.org/repos/users/pippin/prototype.git/;protocol=http \
7 file://fix.patch;patch=1" 7 file://paths.patch;patch=1"
8 8
9S = "${WORKDIR}/git" 9S = "${WORKDIR}/git"
10 10
11do_install () { 11do_install () {
12 install -d ${D}${bindir} 12 install -d ${D}${bindir}
13 install ${S}/moblin-proto ${D}${bindir} 13 install ${S}/moblin-proto ${D}${bindir}
14
15 install -d ${D}${datadir}/moblin-proto/
16 cp -a ${S}/assets ${D}${datadir}/moblin-proto/
17 cp -a ${S}/layouts ${D}${datadir}/moblin-proto/
14} 18}