diff options
Diffstat (limited to 'dev-db/libiodbc/files')
5 files changed, 0 insertions, 145 deletions
diff --git a/dev-db/libiodbc/files/fix-runpaths.patch b/dev-db/libiodbc/files/fix-runpaths.patch deleted file mode 100644 index e913b4c7c4cc..000000000000 --- a/dev-db/libiodbc/files/fix-runpaths.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- 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.7-gtk.patch b/dev-db/libiodbc/files/libiodbc-3.52.7-gtk.patch deleted file mode 100644 index 83fc954d46c9..000000000000 --- a/dev-db/libiodbc/files/libiodbc-3.52.7-gtk.patch +++ /dev/null @@ -1,16 +0,0 @@ -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 deleted file mode 100644 index 73e81d30aec0..000000000000 --- a/dev-db/libiodbc/files/libiodbc-3.52.7-multilib.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- 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.8-gtk-parallel-make.patch b/dev-db/libiodbc/files/libiodbc-3.52.8-gtk-parallel-make.patch deleted file mode 100644 index 7278499aff35..000000000000 --- a/dev-db/libiodbc/files/libiodbc-3.52.8-gtk-parallel-make.patch +++ /dev/null @@ -1,23 +0,0 @@ -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 deleted file mode 100644 index 50724ba46b48..000000000000 --- a/dev-db/libiodbc/files/libiodbc-3.52.8-runtime-failures.patch +++ /dev/null @@ -1,56 +0,0 @@ -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 <iodbc.h> - #include <dlfcn.h> - #include <sys/stat.h> -@@ -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 |