diff options
| author |   Leonardo Boshell <leonardop@gentoo.org> | 2005-10-26 18:32:37 +0000 |
|---|---|---|
| committer | Leonardo Boshell <leonardop@gentoo.org> | 2005-10-26 18:32:37 +0000 |
| commit | 05506d33f62c7b03dd5b4554b5be331207713a90 (patch) | |
| tree | 0bc6ada9384cb5c2b9f78389672082ba06947f25 /gnome-extra/libgda/files | |
| parent | Stable on amd64. (diff) | |
| download | gentoo-2-05506d33f62c7b03dd5b4554b5be331207713a90.tar.gz gentoo-2-05506d33f62c7b03dd5b4554b5be331207713a90.tar.bz2 gentoo-2-05506d33f62c7b03dd5b4554b5be331207713a90.zip | |
New revision, with patches for bugs #110467 (fix syslog() calls) and #110135 (fix compilation with freetds-0.63).
(Portage version: 2.0.53_rc6)
Diffstat (limited to 'gnome-extra/libgda/files')
3 files changed, 58 insertions, 0 deletions
diff --git a/gnome-extra/libgda/files/digest-libgda-1.2.2-r1 b/gnome-extra/libgda/files/digest-libgda-1.2.2-r1 new file mode 100644 index 000000000000..822ce4798614 --- /dev/null +++ b/gnome-extra/libgda/files/digest-libgda-1.2.2-r1 @@ -0,0 +1 @@ +MD5 19d5ec3fe7f482fe89bcf6926cfac67e libgda-1.2.2.tar.bz2 1242035 diff --git a/gnome-extra/libgda/files/libgda-1.2-syslog_format_fix.patch b/gnome-extra/libgda/files/libgda-1.2-syslog_format_fix.patch new file mode 100644 index 000000000000..fd3d7b531b72 --- /dev/null +++ b/gnome-extra/libgda/files/libgda-1.2-syslog_format_fix.patch @@ -0,0 +1,21 @@ +diff -NurdB libgda-1.2.2/libgda/gda-log.c libgda-1.2.2-patched/libgda/gda-log.c +--- libgda-1.2.2/libgda/gda-log.c 2005-10-26 04:08:14.000000000 -0500 ++++ libgda-1.2.2-patched/libgda/gda-log.c 2005-10-26 04:07:15.000000000 -0500 +@@ -111,7 +111,7 @@ + #ifdef LIBGDA_WIN32 + g_log ("Gda", G_LOG_LEVEL_INFO, "%s", msg); + #else +- syslog (LOG_USER | LOG_INFO, msg); ++ syslog (LOG_USER | LOG_INFO, "%s", msg); + #endif + g_free (msg); + } +@@ -144,7 +144,7 @@ + #ifdef LIBGDA_WIN32 + g_log ("Gda", G_LOG_LEVEL_ERROR, "%s", msg); + #else +- syslog (LOG_USER | LOG_ERR, msg); ++ syslog (LOG_USER | LOG_ERR, "%s", msg); + #endif + g_free (msg); + } diff --git a/gnome-extra/libgda/files/libgda-1.2.2-freetds_fixes.patch b/gnome-extra/libgda/files/libgda-1.2.2-freetds_fixes.patch new file mode 100644 index 000000000000..8e332120c329 --- /dev/null +++ b/gnome-extra/libgda/files/libgda-1.2.2-freetds_fixes.patch @@ -0,0 +1,36 @@ +diff -NurdB libgda-1.2.2/configure.in libgda-1.2.2-patched/configure.in +--- libgda-1.2.2/configure.in 2005-04-30 05:22:36.000000000 -0500 ++++ libgda-1.2.2-patched/configure.in 2005-10-26 10:15:29.000000000 -0500 +@@ -454,6 +454,13 @@ + FREETDS_LIBS="-L${freetdsdir}/lib -ltds" + AC_DEFINE(HAVE_FREETDS, 1, [Have freetds]) + ;; ++ *v0.6[[3-9]]*) AC_MSG_RESULT($freetdsvercheck - using v0.63 api) ++ AC_DEFINE(HAVE_FREETDS_VER0_63, 1, [Have freetds v0.63 API]) ++ AC_DEFINE(HAVE_FREETDS_VER0_6X, 1, [Have freetds v0.6x API]) ++ FREETDS_CFLAGS="-I${freetds_incdir}" ++ FREETDS_LIBS="-L${freetdsdir}/lib -ltds" ++ AC_DEFINE(HAVE_FREETDS, 1, [Have freetds]) ++ ;; + *v0.6*) AC_MSG_RESULT($freetdsvercheck - using v0.6x api) + AC_DEFINE(HAVE_FREETDS_VER0_6X, 1, [Have freetds v0.6x API]) + FREETDS_CFLAGS="-I${freetds_incdir}" +diff -NurdB libgda-1.2.2/providers/freetds/gda-freetds-provider.h libgda-1.2.2-patched/providers/freetds/gda-freetds-provider.h +--- libgda-1.2.2/providers/freetds/gda-freetds-provider.h 2003-09-17 06:05:03.000000000 -0500 ++++ libgda-1.2.2-patched/providers/freetds/gda-freetds-provider.h 2005-10-26 09:42:10.000000000 -0500 +@@ -30,6 +30,15 @@ + + G_BEGIN_DECLS + ++/* Compatibility macros */ ++#ifdef HAVE_FREETDS_VER0_63 ++ ++#define TDSCONNECTINFO TDSCONNECTION ++#define TDSCOLINFO TDSCOLUMN ++#define TDSMSGINFO TDSMESSAGE ++ ++#endif /* HAVE_FREETDS_VER0_63 */ ++ + #define GDA_TYPE_FREETDS_PROVIDER (gda_freetds_provider_get_type()) + #define GDA_FREETDS_PROVIDER(obj) (G_TYPE_CHECK_INSTANCE_CAST (obj, GDA_TYPE_FREETDS_PROVIDER, GdaFreeTDSProvider)) + #define GDA_FREETDS_PROVIDER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (klass, GDA_TYPE_FREETDS_PROVIDER, GdaFreeTDSProviderClass)) |