~ubuntu-branches/ubuntu/wily/radare/wily

« back to all changes in this revision

Viewing changes to debian/patches/fix-glib-includes.patch

  • Committer: Package Import Robot
  • Author(s): Sebastian Reichel
  • Date: 2012-03-28 03:05:57 UTC
  • mfrom: (2.1.9 sid)
  • Revision ID: package-import@ubuntu.com-20120328030557-f8ceougppsgihb8g
Tags: 1:1.5.2-6
fix glib includes for glib 2.32+ (Closes: #665604) 

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
Description: fix glib includes for glib 2.32+
 
2
 Including invidiual glib headers has been deprecated for several years.
 
3
 .
 
4
 Starting with glib 2.32 it is now mandatory to include glib.h instead
 
5
 of individual headers [1], or the compiler will generate an error.
 
6
Author: Sebastian Reichel <sre@debian.org>
 
7
Bug-Debian: http://bugs.debian.org/665604
 
8
Last-Update: 2012-03-28
 
9
 
 
10
diff --git a/gui/dialog.c b/gui/dialog.c
 
11
index 6b3b681..d9b16a9 100644
 
12
--- a/gui/dialog.c
 
13
+++ b/gui/dialog.c
 
14
@@ -21,8 +21,7 @@
 
15
 #include "main.h"
 
16
 #include <string.h>
 
17
 #include <gtk/gtk.h>
 
18
-#include <glib/glist.h>
 
19
-#include <glib/glist.h>
 
20
+#include <glib.h>
 
21
 
 
22
 int dialog_yes_no(const char *question, int two)
 
23
 {
 
24
diff --git a/gui/toolbar.c b/gui/toolbar.c
 
25
index 3402a9b..f6af0b6 100644
 
26
--- a/gui/toolbar.c
 
27
+++ b/gui/toolbar.c
 
28
@@ -24,8 +24,7 @@
 
29
 #include <stdlib.h>
 
30
 #include <string.h>
 
31
 #include <gtk/gtk.h>
 
32
-#include <glib/glist.h>
 
33
-#include <glib/glist.h>
 
34
+#include <glib.h>
 
35
 #include <vte/vte.h>
 
36
 #include <sys/types.h>
 
37
 #include <fcntl.h>