Bug#641850: gpe-appmgr version 2.8-3 failed to build on amd64 with GCC-4.6/oneiric

[Daniel T Chen]

Package: gpe-appmgr
Version: 2.8-3
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu oneiric ubuntu-patch

In Ubuntu, the attached patch was applied to achieve the following:

  * cairo_xlib_surface_create() was moved to <cairo-xlib.h>, so
    update 020-cairo-fixes.patch to use the correct header. Fixes
    FTBFS. (LP: #771003)


Thanks for considering the patch.


-- System Information:
Debian Release: wheezy/sid
  APT prefers oneiric-updates
  APT policy: (500, 'oneiric-updates'), (500, 'oneiric-security'), (500, 
'oneiric-proposed'), (500, 'oneiric')
Architecture: amd64 (x86_64)

Kernel: Linux 3.0.0-11-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

diff -u gpe-appmgr-2.8/debian/patches/020-cairo-fixes.patch gpe-appmgr-2.8/debian/patches/020-cairo-fixes.patch
--- gpe-appmgr-2.8/debian/patches/020-cairo-fixes.patch
+++ gpe-appmgr-2.8/debian/patches/020-cairo-fixes.patch
@@ -1,6 +1,15 @@
-diff -Nur gpe-appmgr-2.8/row_view.c gpe-appmgr-2.8.new/row_view.c
---- gpe-appmgr-2.8/row_view.c	2006-12-21 17:42:07.000000000 +0000
-+++ gpe-appmgr-2.8.new/row_view.c	2006-12-21 17:44:39.000000000 +0000
+diff -Nur -x '*.orig' -x '*~' gpe-appmgr-2.8//row_view.c gpe-appmgr-2.8.new//row_view.c
+--- gpe-appmgr-2.8//row_view.c	2011-09-16 15:05:10.000000000 -0400
++++ gpe-appmgr-2.8.new//row_view.c	2011-09-16 15:09:08.000000000 -0400
+@@ -56,7 +56,7 @@
+ #include <X11/Xlib.h>
+ #include <X11/Xatom.h>
+ 
+-#include <cairo.h>
++#include <cairo-xlib.h>
+ #include <math.h>
+ 
+ //#define DEBUG
 @@ -158,34 +158,33 @@
    gv = gdk_window_get_visual (programs_fixed->window);
    gcm = gdk_drawable_get_colormap (programs_fixed->window);