From owner-freebsd-gnome@FreeBSD.ORG Wed Nov 24 22:55:36 2010 Return-Path: Delivered-To: freebsd-gnome@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8973F106566B; Wed, 24 Nov 2010 22:55:36 +0000 (UTC) (envelope-from andy@neu.net) Received: from mail.neu.net (neu.net [204.109.60.194]) by mx1.freebsd.org (Postfix) with ESMTP id 404578FC13; Wed, 24 Nov 2010 22:55:35 +0000 (UTC) Received: from neu.net (neu.net [204.109.60.194]) by mail.neu.net (8.14.4/8.14.4) with ESMTP id oAOMtBcO039680; Wed, 24 Nov 2010 22:55:11 GMT (envelope-from andy@neu.net) Date: Wed, 24 Nov 2010 22:55:11 +0000 (UTC) From: AN To: Jung-uk Kim In-Reply-To: <201011241621.35784.jkim@FreeBSD.org> Message-ID: References: <201011241621.35784.jkim@FreeBSD.org> User-Agent: Alpine 2.00 (BSF 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed X-Virus-Scanned: clamav-milter 0.96.4 at neu.net X-Virus-Status: Clean X-Spam-Status: No, score=-0.0 required=3.8 tests=T_RP_MATCHES_RCVD autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.neu.net Cc: Daichi GOTO , rnoland@FreeBSD.org, freebsd-gnome@FreeBSD.org Subject: Re: [PATCH] Fix Compiz and Emerald with GTK+ 2.22 X-BeenThere: freebsd-gnome@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: GNOME for FreeBSD -- porting and maintaining List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Nov 2010 22:55:36 -0000 On Wed, 24 Nov 2010, Jung-uk Kim wrote: > I found that gtk-window-decorator and emerald are seriously broken > since GTK+ 2.22. It seems Gnome people have deprecated GdkDrawable > in favor of Cairo from 2.22. However, it is pretty rot now, it > seems. :-( > > So, I did some research and found solutions. > > Patch for x11-wm/compiz: > > http://people.freebsd.org/~jkim/compiz.diff > > This patch is essentially the following upstream commit: > > http://git.compiz.org/compiz/core/commit/?id=64ee56f3619a537f29cfe34a37678b947e1532fd > > Patch for x11-wm/emerald: > > http://people.freebsd.org/~jkim/emerald.diff > > This patch removes GDK_DIABLE_DEPRECATED definition from emerald.h, > which totally broke gdk_draw_drawable() and stuff. Also, it includes > the following upstream commits: > > http://git.compiz.org/fusion/decorators/emerald/commit/?id=f3070c32ba428935ef2c69888d0194e2ae31e777 > http://git.compiz.org/fusion/decorators/emerald/commit/?id=bc53f574ccc06a5366ccb8c8f0fa558836e68d00 > > Cheers, > > Jung-uk Kim > I have a question about the patch procedure. I tried the following command, but I do not know what to do next. root@quadcore /usr/ports/x11-wm/compiz]# patch < compiz.diff Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: x11-wm/compiz/Makefile |=================================================================== |RCS file: /home/pcvs/ports/x11-wm/compiz/Makefile,v |retrieving revision 1.27 |diff -u -r1.27 Makefile |--- x11-wm/compiz/Makefile 20 Nov 2010 15:37:08 -0000 1.27 |+++ x11-wm/compiz/Makefile 24 Nov 2010 21:01:22 -0000 -------------------------- Patching file Makefile using Plan A... Hunk #1 succeeded at 7. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: x11-wm/compiz/files/patch-gtk_window-decorator_gtk-window-decorator.c |=================================================================== |RCS file: /home/pcvs/ports/x11-wm/compiz/files/patch-gtk_window-decorator_gtk-window-decorator.c,v |retrieving revision 1.2 |diff -u -r1.2 patch-gtk_window-decorator_gtk-window-decorator.c |--- x11-wm/compiz/files/patch-gtk_window-decorator_gtk-window-decorator.c 20 Nov 2010 15:37:08 -0000 1.2 |+++ x11-wm/compiz/files/patch-gtk_window-decorator_gtk-window-decorator.c 24 Nov 2010 21:01:22 -0000 -------------------------- File to patch: Would someone please provide exact commands that need to be executed in order to apply the patch, and upgrade the application. Thank you