/[gentoo-x86]/gnome-extra/assogiate/files/assogiate-0.2.1-glib-2.32.patch
Gentoo

Contents of /gnome-extra/assogiate/files/assogiate-0.2.1-glib-2.32.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download)
Sat Aug 11 20:01:06 2012 UTC (20 months, 1 week ago) by tetromino
Branch: MAIN
CVS Tags: HEAD
Add Debian patches to fix building with glib-2.32 (bug #428314, thanks to Diego Elio Pettenò) and with gcc-4.7.

(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)

1 Description: Include glib.h instead of individual headers
2 Author: Vincent Legout <vlegout@debian.org>
3 Bug-Debian: http://bugs.debian.org/665507
4
5 Index: assogiate/libassogiate/mime-database.cc
6 ===================================================================
7 --- assogiate.orig/libassogiate/mime-database.cc 2012-03-25 10:43:34.000000000 +0200
8 +++ assogiate/libassogiate/mime-database.cc 2012-03-25 10:47:00.072890551 +0200
9 @@ -23,7 +23,7 @@
10 #include "private.hh"
11 #include "mime-database.hh"
12
13 -#include <glib/gutils.h>
14 +#include <glib.h>
15 #include <glibmm/miscutils.h>
16
17 /******************************************************************************/
18 Index: assogiate/libassogiate/mime-type.cc
19 ===================================================================
20 --- assogiate.orig/libassogiate/mime-type.cc 2012-03-25 10:43:34.000000000 +0200
21 +++ assogiate/libassogiate/mime-type.cc 2012-03-25 10:47:00.072890551 +0200
22 @@ -23,7 +23,7 @@
23 #include "private.hh"
24 #include "mime-type.hh"
25
26 -#include <glib/gutils.h>
27 +#include <glib.h>
28 #include <gtkmm/icontheme.h>
29 #include <libxml++/nodes/element.h>
30 #include <libxml++/nodes/textnode.h>
31 Index: assogiate/libassogiate/misc/extras.cc
32 ===================================================================
33 --- assogiate.orig/libassogiate/misc/extras.cc 2012-03-25 10:43:34.000000000 +0200
34 +++ assogiate/libassogiate/misc/extras.cc 2012-03-25 10:47:00.092890549 +0200
35 @@ -24,7 +24,7 @@
36
37 #include <algorithm>
38 #include <stdexcept>
39 -#include <glib/gmem.h>
40 +#include <glib.h>
41 #include <glibmm/utility.h>
42
43 /******************************************************************************/
44 Index: assogiate/src/main.cc
45 ===================================================================
46 --- assogiate.orig/src/main.cc 2012-03-25 10:43:34.396895145 +0200
47 +++ assogiate/src/main.cc 2012-03-25 10:47:07.628890386 +0200
48 @@ -28,8 +28,7 @@
49 #include <clocale>
50 #include <iostream>
51 #include <locale>
52 -#include <glib/goption.h>
53 -#include <glib/gutils.h>
54 +#include <glib.h>
55 #include <glibmm/optionentry.h>
56 #include <gtk/gtkaboutdialog.h>
57 #include <gtk/gtkversion.h>

  ViewVC Help
Powered by ViewVC 1.1.20