Package: ganv
Version: 0~svn4142~dfsg0-1
Severity: normal
Tags: upstream patch

Hello,

ganv failed to build in Ubuntu 12.10 enviroment because of two problems:

1. glib 2.33 doesn't allow direct inclusion of gmacros.h header.
2. gtk/gtk.h is not located on the default include path, thus g-ir-scanner 
   fails (see buildlog at [1])

Patches attached, hopefully they will be useful for Debian and upstream.

[1] https://launchpad.net/ubuntu/+source/ganv/0~svn4142~dfsg0-1/+build/3452367

-- System Information:
Debian Release: wheezy/sid
  APT prefers precise-updates
  APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500, 
'precise-proposed'), (500, 'precise'), (100, 'precise-backports')
Architecture: i386 (i686)

Kernel: Linux 3.2.0-24-generic (SMP w/2 CPU cores)
Locale: LANG=ru_RU.UTF-8, LC_CTYPE=ru_RU.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Description: fix FTBFS because of missing include paths
 Headers such as gtk/gtk.h may not be found on the default include path. For
 example, in Ubuntu, they are located in /usr/include/gtk-2.0. In this case,
 g-ir-scanner will fail.
Author: Ilya Barygin <[email protected]>

--- a/wscript
+++ b/wscript
@@ -164,6 +164,7 @@
             ' --no-libtool ' +
             ('--pkg=%s' % pc_path) +
             (' -I%s' % bld.path.bldpath()) +
+            ''.join([' -I' + path for path in bld.env.INCLUDES_GTK]) +
             (' -L%s' % bld_dir) +
             ' --library=ganv-1'
             ' --include=GObject-2.0 --include=Gdk-2.0 --include Gtk-2.0'
Description: fix FTBFS with glib 2.33
 With glib 2.33, gmacros.h produces #error when included directly.
Author: Ilya Barygin <[email protected]>

--- a/src/color.h
+++ b/src/color.h
@@ -16,7 +16,7 @@
 #ifndef GANV_UTIL_H
 #define GANV_UTIL_H
 
-#include <glib/gmacros.h>
+#include <glib.h>
 
 #define DEFAULT_TEXT_COLOR   0xFFFFFFFF
 #define DEFAULT_FILL_COLOR   0x1E2224FF

Reply via email to