← Back to branch summary

~ubuntu-branches/ubuntu/maverick/gnome-power-manager/maverick-proposed

« back to all changes in this revision

Viewing changes to debian/patches/00git_brightness_applet_build_2.patch

  • Committer: Bazaar Package Importer
  • Author(s): Robert Ancell
  • Date: 2010-09-02 14:51:05 UTC
  • mfrom: (2.1.56 upstream)
  • Revision ID: james.westby@ubuntu.com-20100902145105-e3zntudl9sko8gtl
Tags: 2.31.91-0ubuntu1
* New upstream release
* debian/patches/00git_brightness_applet_build_1.patch:
* debian/patches/00git_brightness_applet_build_2.patch:
* debian/patches/00git_inhibit_applet_build.patch:
* debian/patches/15_distclean.patch:
  - Applied upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/00git_brightness_applet_build_2.patch
1
 
commit 81c4c85f4efbac2ec5720abf9f3398492857c752
2
 
Author: Martin Pitt <martin.pitt@ubuntu.com>
3
 
Date:   Thu Aug 19 17:06:55 2010 +0200
4
 
 
5
 
    Re-enable deprecated GDK functions for brightness applet
6
 
    
7
 
    brightness-applet.c: In function ‘gpm_applet_draw_cb’:
8
 
    brightness-applet.c:282: warning: implicit declaration of function ‘gdk_gc_new’
9
 
    brightness-applet.c:282: warning: assignment makes pointer from integer without a cast
10
 
    brightness-applet.c:288: warning: implicit declaration of function ‘gdk_draw_drawable’
11
 
    brightness-applet.c:293: warning: implicit declaration of function ‘gdk_gc_set_rgb_fg_color’
12
 
    brightness-applet.c:294: warning: implicit declaration of function ‘gdk_gc_set_fill’
13
 
    brightness-applet.c:295: warning: implicit declaration of function ‘gdk_draw_rectangle’
14
 
    brightness-applet.c:307: warning: implicit declaration of function ‘gdk_draw_pixbuf’
15
 
    
16
 
    The long-term fix is to port the applet from gdk_gc_* to cairo, but implicit
17
 
    pointer conversions cause crashes on x86_64 platforms, so re-enable the
18
 
    functions for now.
19
 
 
20
 
diff --git a/applets/brightness/brightness-applet.c b/applets/brightness/brightness-applet.c
21
 
index fa82a93..118864c 100644
22
 
--- a/applets/brightness/brightness-applet.c
23
 
+++ b/applets/brightness/brightness-applet.c
24
 
@@ -25,6 +25,9 @@
25
 
 #  include <config.h>
26
 
 #endif
27
 
 
28
 
+/* FIXME: gdk_gc_* needs porting to cairo */
29
 
+#undef GDK_DISABLE_DEPRECATED
30
 
+
31
 
 #include <stdio.h>
32
 
 #include <stdlib.h>
33
 
 #include <string.h>