pkg/46429: databases/libgda-mysql needs glib2 patch in databases/libgda

[noud4%home.nl@localhost]

>Number:         46429
>Category:       pkg
>Synopsis:       databases/libgda-mysql needs glib2 patch in databases/libgda
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Tue May 08 23:00:01 +0000 2012
>Originator:     Noud de Brouwer
>Release:        6.99.4
>Organization:
-none-
>Environment:
NetBSD 10.0.2.17 6.99.4 NetBSD 6.99.4 (MONOLITHIC) #0: Wed Apr 18 09:37:46 UTC 
2012  mickey55@10.0.2.17:/obj-src/sys/arch/i386/compile/MONOLITHIC i386
>Description:
libtool: compile:  gcc "-DPACKAGE_NAME=\"GNU Data Access\"" 
-DPACKAGE_TARNAME=\"libgda\" -DPACKAGE_VERSION=\"3.0.1\" 
"-DPACKAGE_STRING=\"GNU Data Access 3.0.1\"" 
-DPACKAGE_BUGREPORT=\"gnome-db-list%gnome.org@localhost\" 
-DBONOBO_EXPLICIT_TRANSLATION_DOMAIN=\"libgda-3.0\" -DSTDC_HEADERS=1 
-DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 
-DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 
-DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DYYTEXT_POINTER=1 
-DGETTEXT_PACKAGE=\"libgda-3.0\" -DHAVE_LOCALE_H=1 -DHAVE_LC_MESSAGES=1 
-DHAVE_BIND_TEXTDOMAIN_CODESET=1 -DHAVE_GETTEXT=1 -DHAVE_DCGETTEXT=1 
-DENABLE_NLS=1 -DHAVE_MYSQL=1 -DHAVE_ORACLE=1 -DHAVE_READLINE_READLINE_H=1 
-DHAVE_READLINE_HISTORY_H=1 -I. -I../.. -pthread 
-I/obj/databases/libgda-mysql/work/.buildlink/include/glib/glib-2.0 
-I/obj/databases/libgda-mysql/work/.buildlink/lib/glib-2.0/include 
-I/obj/databases/libgda-mysql/work/.buildlink/include 
-I/obj/databases/libgda-mysql/work/.buildlink/inclu
 de/libxml2 -I/obj/databases/libgda-mysql/work/.buildlink/include/mysql 
-DUSE_OLD_FUNCTIONS -fPIC -DPIC -Dunix 
-DLIBGDA_DATA_DIR=\"/usr/pkg/share/libgda-3.0\" -DGDA_PACKAGE_VERSION=\"3.0.1\" 
-O2 -MT gda-mysql-provider.lo -MD -MP -MF .deps/gda-mysql-provider.Tpo -c 
gda-mysql-provider.c  -fPIC -DPIC -o .libs/gda-mysql-provider.o

In file included from gda-mysql.h:28:0,

                 from gda-mysql-provider.c:37:

/obj/databases/libgda-mysql/work/.buildlink/include/glib/glib-2.0/glib/gmacros.h:32:2:
 error: #error "Only <glib.h> can be included directly."

gmake: *** [gda-mysql-provider.lo] Error 1

*** Error code 2


>How-To-Repeat:
cd databases/libgda-mysql && make
>Fix:
(tested against a mysql database)
databases/libgda/patches/patch-providers_mysql_gda-mysql_h:
$NetBSD$

Fix build with latest glib2.

--- providers/mysql/gda-mysql.h.orig    2007-04-24 21:13:17.000000000 +0000
+++ providers/mysql/gda-mysql.h 2012-05-08 22:51:07.000000000 +0000
@@ -25,10 +25,9 @@
 #if !defined(__gda_mysql_h__)
 #  define __gda_mysql_h__
 
-#include <glib/gmacros.h>
+#include <glib.h>
 #include <libgda/gda-connection.h>
 #include <libgda/gda-server-provider.h>
-#include <glib/gi18n-lib.h>
 #include <libgda/gda-value.h>
 #include "gda-mysql-provider.h"
 #include <mysql.h>