From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- dev-db/libiodbc/files/fix-runpaths-r1.patch | 15 ++++++ dev-db/libiodbc/files/fix-runpaths.patch | 15 ++++++ .../libiodbc/files/libiodbc-3.52.12-multilib.patch | 37 ++++++++++++++ .../files/libiodbc-3.52.7-debian_bug501100.patch | 14 ++++++ .../files/libiodbc-3.52.7-debian_bug508480.patch | 14 ++++++ dev-db/libiodbc/files/libiodbc-3.52.7-gtk.patch | 16 +++++++ .../libiodbc/files/libiodbc-3.52.7-multilib.patch | 35 ++++++++++++++ .../files/libiodbc-3.52.7-unicode_includes.patch | 12 +++++ .../files/libiodbc-3.52.8-gtk-parallel-make.patch | 23 +++++++++ .../files/libiodbc-3.52.8-runtime-failures.patch | 56 ++++++++++++++++++++++ 10 files changed, 237 insertions(+) create mode 100644 dev-db/libiodbc/files/fix-runpaths-r1.patch create mode 100644 dev-db/libiodbc/files/fix-runpaths.patch create mode 100644 dev-db/libiodbc/files/libiodbc-3.52.12-multilib.patch create mode 100644 dev-db/libiodbc/files/libiodbc-3.52.7-debian_bug501100.patch create mode 100644 dev-db/libiodbc/files/libiodbc-3.52.7-debian_bug508480.patch create mode 100644 dev-db/libiodbc/files/libiodbc-3.52.7-gtk.patch create mode 100644 dev-db/libiodbc/files/libiodbc-3.52.7-multilib.patch create mode 100644 dev-db/libiodbc/files/libiodbc-3.52.7-unicode_includes.patch create mode 100644 dev-db/libiodbc/files/libiodbc-3.52.8-gtk-parallel-make.patch create mode 100644 dev-db/libiodbc/files/libiodbc-3.52.8-runtime-failures.patch (limited to 'dev-db/libiodbc/files') diff --git a/dev-db/libiodbc/files/fix-runpaths-r1.patch b/dev-db/libiodbc/files/fix-runpaths-r1.patch new file mode 100644 index 000000000000..2cd76c816254 --- /dev/null +++ b/dev-db/libiodbc/files/fix-runpaths-r1.patch @@ -0,0 +1,15 @@ +--- a/samples/Makefile.am 2012-03-27 05:15:02.000000000 +0200 ++++ b/samples/Makefile.am.new 2013-04-09 14:07:48.303789999 +0200 +@@ -78,12 +78,10 @@ + # + iodbctest_SOURCES = iodbctest.c + iodbctest_LDADD = ../iodbc/libiodbc.la +-iodbctest_LDFLAGS = -static + + iodbctestw_CFLAGS = -DUNICODE + iodbctestw_SOURCES = iodbctest.c + iodbctestw_LDADD = ../iodbc/libiodbc.la +-iodbctestw_LDFLAGS = -static + + EXTRA_DIST = $(srcdir)/Makefile.sample + diff --git a/dev-db/libiodbc/files/fix-runpaths.patch b/dev-db/libiodbc/files/fix-runpaths.patch new file mode 100644 index 000000000000..e913b4c7c4cc --- /dev/null +++ b/dev-db/libiodbc/files/fix-runpaths.patch @@ -0,0 +1,15 @@ +--- samples/Makefile.am 2012-03-27 05:15:02.000000000 +0200 ++++ samples/Makefile.am.new 2013-04-09 14:07:48.303789999 +0200 +@@ -78,12 +78,10 @@ + # + iodbctest_SOURCES = iodbctest.c + iodbctest_LDADD = ../iodbc/libiodbc.la +-iodbctest_LDFLAGS = -static + + iodbctestw_CFLAGS = -DUNICODE + iodbctestw_SOURCES = iodbctest.c + iodbctestw_LDADD = ../iodbc/libiodbc.la +-iodbctestw_LDFLAGS = -static + + EXTRA_DIST = $(srcdir)/Makefile.sample + diff --git a/dev-db/libiodbc/files/libiodbc-3.52.12-multilib.patch b/dev-db/libiodbc/files/libiodbc-3.52.12-multilib.patch new file mode 100644 index 000000000000..e2819211ccac --- /dev/null +++ b/dev-db/libiodbc/files/libiodbc-3.52.12-multilib.patch @@ -0,0 +1,37 @@ +diff --git a/bin/iodbc-config.in b/bin/iodbc-config.in +index 08d46ae..576aa8b 100644 +--- a/bin/iodbc-config.in ++++ b/bin/iodbc-config.in +@@ -145,10 +145,10 @@ while test $# -gt 0; do + echo_libs=yes + ;; + --static-libs) +- echo_staticlibs=yes ++ echo_libs=yes + ;; + --libtool-libs) +- echo_libtoollibs=yes ++ echo_libs=yes + ;; + --data-dir) + echo_data_dir=yes +@@ -196,19 +196,5 @@ if test "$echo_libs" = "yes"; then + if test "$lib_iodbc" = "yes"; then + libs="$libs -liodbc -liodbcinst" + fi +- echo "-L@libdir@ $libs" +-fi +-if test "$echo_staticlibs" = "yes"; then +- libs="" +- if test "$lib_iodbc" = "yes"; then +- libs="@libdir@/libiodbc.a @libdir@/libiodbcinst.a -lpthread @LIBADD_DL@" +- fi +- echo "$libs" +-fi +-if test "$echo_libtoollibs" = "yes"; then +- libs="" +- if test "$lib_iodbc" = "yes"; then +- libs="@libdir@/libiodbc.la @libdir@/libiodbcinst.la" +- fi + echo "$libs" + fi diff --git a/dev-db/libiodbc/files/libiodbc-3.52.7-debian_bug501100.patch b/dev-db/libiodbc/files/libiodbc-3.52.7-debian_bug501100.patch new file mode 100644 index 000000000000..5e19d1e68094 --- /dev/null +++ b/dev-db/libiodbc/files/libiodbc-3.52.7-debian_bug501100.patch @@ -0,0 +1,14 @@ +Index: libiodbc2-3.52.7/include/sqltypes.h +=================================================================== +--- libiodbc2-3.52.7.orig/include/sqltypes.h 2010-06-26 21:15:00.000000000 +0200 ++++ libiodbc2-3.52.7/include/sqltypes.h 2010-06-26 21:15:36.000000000 +0200 +@@ -96,6 +96,9 @@ + extern "C" { + #endif + ++#ifndef _IODBCUNIX_H ++#include ++#endif + + /* + * Environment specific definitions diff --git a/dev-db/libiodbc/files/libiodbc-3.52.7-debian_bug508480.patch b/dev-db/libiodbc/files/libiodbc-3.52.7-debian_bug508480.patch new file mode 100644 index 000000000000..d1e80184e5b1 --- /dev/null +++ b/dev-db/libiodbc/files/libiodbc-3.52.7-debian_bug508480.patch @@ -0,0 +1,14 @@ +Index: libiodbc2-3.52.7/iodbcinst/inifile.c +=================================================================== +--- libiodbc2-3.52.7.orig/iodbcinst/inifile.c 2010-06-26 21:29:43.000000000 +0200 ++++ libiodbc2-3.52.7/iodbcinst/inifile.c 2010-06-26 21:30:07.000000000 +0200 +@@ -1023,7 +1023,8 @@ + + if (!_iodbcdm_cfg_find (pCfg, lpszSection, NULL)) + { +- while (curr < cbRetBuffer && 0 == _iodbcdm_cfg_nextentry (pCfg)) ++ while (curr < cbRetBuffer && 0 == _iodbcdm_cfg_nextentry (pCfg) ++ && pCfg->section) + { + if (_iodbcdm_cfg_section (pCfg)) + break; diff --git a/dev-db/libiodbc/files/libiodbc-3.52.7-gtk.patch b/dev-db/libiodbc/files/libiodbc-3.52.7-gtk.patch new file mode 100644 index 000000000000..83fc954d46c9 --- /dev/null +++ b/dev-db/libiodbc/files/libiodbc-3.52.7-gtk.patch @@ -0,0 +1,16 @@ +diff -pruN 3.52.6-1/configure.in 3.52.6-1ubuntu1/configure.in +--- 3.52.6-1/configure.in 2007-10-08 14:04:32.000000000 +0100 ++++ 3.52.6-1ubuntu1/configure.in 2007-12-06 00:12:00.000000000 +0000 +@@ -315,12 +315,6 @@ then + no_gtk="" + # Check for GTK+ 2.x + AM_PATH_GTK_2_0(2.0.0) +- if test x$no_gtk != x +- then +- # Try GTK 1.2.x instead +- no_gtk="" +- AM_PATH_GTK(1.2.3) +- fi + if test x$no_gtk = x + then + USE_GTK=true diff --git a/dev-db/libiodbc/files/libiodbc-3.52.7-multilib.patch b/dev-db/libiodbc/files/libiodbc-3.52.7-multilib.patch new file mode 100644 index 000000000000..73e81d30aec0 --- /dev/null +++ b/dev-db/libiodbc/files/libiodbc-3.52.7-multilib.patch @@ -0,0 +1,35 @@ +--- bin/iodbc-config.in.orig 2006-01-23 11:29:22.000000000 +0100 ++++ bin/iodbc-config.in 2009-06-04 17:48:19.000000000 +0200 +@@ -145,10 +145,10 @@ + echo_libs=yes + ;; + --static-libs) +- echo_staticlibs=yes ++ echo_libs=yes + ;; + --libtool-libs) +- echo_libtoollibs=yes ++ echo_libs=yes + ;; + --data-dir) + echo_data_dir=yes +@@ -196,19 +196,5 @@ + if test "$lib_iodbc" = "yes"; then + libs="$libs -liodbc -liodbcinst" + fi +- echo "-L@libdir@ $libs" +-fi +-if test "$echo_staticlibs" = "yes"; then +- libs="" +- if test "$lib_iodbc" = "yes"; then +- libs="@libdir@/libiodbc.a @libdir@/libiodbcinst.a @LIBADD_DL@" +- fi +- echo "$libs" +-fi +-if test "$echo_libtoollibs" = "yes"; then +- libs="" +- if test "$lib_iodbc" = "yes"; then +- libs="@libdir@/libiodbc.la @libdir@/libiodbcinst.la" +- fi + echo "$libs" + fi diff --git a/dev-db/libiodbc/files/libiodbc-3.52.7-unicode_includes.patch b/dev-db/libiodbc/files/libiodbc-3.52.7-unicode_includes.patch new file mode 100644 index 000000000000..67730ec65556 --- /dev/null +++ b/dev-db/libiodbc/files/libiodbc-3.52.7-unicode_includes.patch @@ -0,0 +1,12 @@ +Index: libiodbc2-3.52.7/iodbcinst/unicode.h +=================================================================== +--- libiodbc2-3.52.7.orig/iodbcinst/unicode.h 2009-09-09 14:13:17.000000000 +0200 ++++ libiodbc2-3.52.7/iodbcinst/unicode.h 2010-06-26 21:16:26.000000000 +0200 +@@ -76,6 +76,7 @@ + + #ifndef _UNICODE_H + #define _UNICODE_H ++#include + + + #if defined (__APPLE__) && !defined (MACOSX102) && !defined (HAVE_CONFIG_H) diff --git a/dev-db/libiodbc/files/libiodbc-3.52.8-gtk-parallel-make.patch b/dev-db/libiodbc/files/libiodbc-3.52.8-gtk-parallel-make.patch new file mode 100644 index 000000000000..7278499aff35 --- /dev/null +++ b/dev-db/libiodbc/files/libiodbc-3.52.8-gtk-parallel-make.patch @@ -0,0 +1,23 @@ +diff -u -r iODBC-3.52.8.orig/iodbcadm/Makefile.am iODBC-3.52.8/iodbcadm/Makefile.am +--- iODBC-3.52.8.orig/iodbcadm/Makefile.am 2012-03-27 05:15:02.000000000 -0500 ++++ iODBC-3.52.8/iodbcadm/Makefile.am 2013-01-08 08:12:58.639414826 -0600 +@@ -96,7 +96,7 @@ + + if GTK + libiodbcadm_la_LIBADD = \ +- ../iodbcadm/gtk/libiodbcadm-gtk.la \ ++ gtk/libiodbcadm-gtk.la \ + $(LIBADD_DL) \ + @GTK_LIBS@ \ + ../iodbcinst/libiodbc_common.la \ +@@ -117,8 +117,8 @@ + + iodbcadm_gtk_SOURCES = + iodbcadm_gtk_LDADD = \ +- ../iodbcadm/gtk/main.lo \ +- ../iodbcadm/libiodbcadm.la \ ++ gtk/main.lo \ ++ libiodbcadm.la \ + ../iodbcinst/libiodbcinst.la \ + ../iodbc/libiodbc.la \ + @GTK_LIBS@ diff --git a/dev-db/libiodbc/files/libiodbc-3.52.8-runtime-failures.patch b/dev-db/libiodbc/files/libiodbc-3.52.8-runtime-failures.patch new file mode 100644 index 000000000000..50724ba46b48 --- /dev/null +++ b/dev-db/libiodbc/files/libiodbc-3.52.8-runtime-failures.patch @@ -0,0 +1,56 @@ +diff -u -r iODBC-3.52.8.orig/configure.in iODBC-3.52.8/configure.in +--- iODBC-3.52.8.orig/configure.in 2012-03-27 05:15:02.000000000 -0500 ++++ iODBC-3.52.8/configure.in 2013-01-08 10:31:39.740041040 -0600 +@@ -87,7 +87,7 @@ + AC_CONFIG_SRCDIR([include/isql.h]) + AC_CONFIG_AUX_DIR(admin) + AC_CONFIG_MACRO_DIR(admin) +-AM_CONFIG_HEADER(include/config.h) ++AC_CONFIG_HEADER(include/config.h) + AM_INIT_AUTOMAKE(AC_PACKAGE_TARNAME, AC_PACKAGE_VERSION) + AC_CANONICAL_HOST + AM_MAINTAINER_MODE +diff -u -r iODBC-3.52.8.orig/iodbcadm/gtk/administrator.c iODBC-3.52.8/iodbcadm/gtk/administrator.c +--- iODBC-3.52.8.orig/iodbcadm/gtk/administrator.c 2012-03-27 05:15:02.000000000 -0500 ++++ iODBC-3.52.8/iodbcadm/gtk/administrator.c 2013-01-08 10:29:51.758462953 -0600 +@@ -72,6 +72,13 @@ + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + ++#ifdef __linux ++# ifndef _GNU_SOURCE ++# define _GNU_SOURCE /* make sure dladdr is declared */ ++# endif ++# define HAVE_DL_INFO 1 ++#endif ++ + #include + #include + #include +@@ -82,7 +89,7 @@ + #include "odbc4.xpm" + + +-#if !defined(HAVE_DL_INFO) ++#if defined (HAVE_DLADDR) && !defined(HAVE_DL_INFO) + typedef struct + { + const char *dli_fname; /* File name of defining object. */ +@@ -90,6 +97,7 @@ + const char *dli_sname; /* Name of nearest symbol. */ + void *dli_saddr; /* Exact value of nearest symbol. */ + } Dl_info; ++ + #endif /* HAVE_DL_INFO */ + + static char *szDriverButtons[] = { +diff -u -r iODBC-3.52.8.orig/iodbcadm/gtk/gui.h iODBC-3.52.8/iodbcadm/gtk/gui.h +--- iODBC-3.52.8.orig/iodbcadm/gtk/gui.h 2012-03-27 05:15:02.000000000 -0500 ++++ iODBC-3.52.8/iodbcadm/gtk/gui.h 2013-01-08 10:30:48.124240299 -0600 +@@ -219,5 +219,6 @@ + void addlistofdir_to_optionmenu(GtkWidget* widget, LPCSTR path, TDSNCHOOSER *choose_t); + LPSTR create_keyval (HWND wnd, LPCSTR attrs, BOOL *verify_conn); + LPSTR create_fgensetup (HWND hwnd, LPCSTR dsn, LPCSTR attrs, BOOL add, BOOL *verify_conn); ++void create_message (HWND hwnd, LPCSTR dsn, LPCSTR text); + + #endif -- cgit v1.2.3