[PATCH] Fix Compiz and Emerald with GTK+ 2.22

[AN]

On Wed, 24 Nov 2010, Jung-uk Kim wrote:

> On Wednesday 24 November 2010 05:55 pm, AN wrote:
>> 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=64ee56f3619a537f29cf
>>> e34a37678b947e1532fd
>>>
>>> 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=f3070c
>>> 32ba428935ef2c69888d0194e2ae31e777
>>> http://git.compiz.org/fusion/decorators/emerald/commit/?id=bc53f5
>>> 74ccc06a5366ccb8c8f0fa558836e68d00
>>>
>>> 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.
>
> --- >8 --- SNIP!!! --- >8 ---
>
>> Would someone please provide exact commands that need to be
>> executed in order to apply the patch, and upgrade the application.
>
> First, clean up stale files:
>
> rm -rf /usr/ports/x11-wm/compiz /usr/ports/x11-wm/emerald
> csup -h cvsup.freebsd.org \
>    -i ports/x11-wm/compiz \
>    -i ports/x11-wm/emerald \
>    /usr/share/examples/cvsup/ports-supfile
>
> Download patch files:
>
> cd /tmp
> fetch http://people.freebsd.org/~jkim/compiz.diff
> fetch http://people.freebsd.org/~jkim/emerald.diff
>
> Then, finally build and install:
>
> cd /usr/ports/x11-wm
> patch -p1 < /tmp/compiz.diff
> patch -p1 < /tmp/emerald.diff
> find /usr/ports/x11-wm -name "*.orig" -delete
> cd /usr/ports/x11-wm/compiz
> make; make deinstall; make reinstall; make clean
> cd /usr/ports/x11-wm/emerald
> make; make deinstall; make reinstall; make clean
>
> Jung-uk Kim
>


Hi Jung-uk:

Your patch fixed the problem.  Thank you!