mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-13 18:49:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

moblin-proto: update srcrev and fix build

Browse Source 
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5070 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Ross Burton
2008-08-18 14:18:37 +00:00
parent 9add0a8cc5
commit 23d43ca24a
4 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
meta/packages/clutter/moblin-proto/fix.patch
View File

@@ -20,25 +20,3 @@ Index: git/Makefile
#$(BINARY): $(CFILES)
# $(LD) $(CFLAGS) $(INCS) $(CFILES) $(LIBS) -o $@
Index: git/moblin-desktop.c
===================================================================
--- git.orig/moblin-desktop.c 2008-08-11 22:49:49.000000000 +0100
+++ git/moblin-desktop.c 2008-08-12 12:14:44.000000000 +0100
@@ -620,17 +620,10 @@
attach_reactivate_on_press (old_app);
-<<<<<<< HEAD:moblin-desktop.c
shuttle = clutter_group_new ();
clutter_group_add (CLUTTER_GROUP(desktop->mainstuff), shuttle);
copy_geometry (desktop->middle, shuttle);
clutter_actor_reparent (old_app, shuttle);
-=======
- box = clutter_group_new ();
- clutter_group_add (CLUTTER_GROUP(desktop->stage), box);
- copy_geometry (desktop->middle, box);
- clutter_actor_reparent (old_app, box);
->>>>>>> Removed now unneeded forcible shows of apps.:moblin-desktop.c
{
gint x, y;