summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Popov <pinkbyte@gentoo.org>2015-05-14 11:36:59 +0000
committerSergey Popov <pinkbyte@gentoo.org>2015-05-14 11:36:59 +0000
commit0cd53d75bfd007e1269fa1d22f62cdbf16472bac (patch)
tree6b5df5b6f489b96f90b245501edbd2e277bb414e /app-office
parentDrop old (diff)
downloadhistorical-0cd53d75bfd007e1269fa1d22f62cdbf16472bac.tar.gz
historical-0cd53d75bfd007e1269fa1d22f62cdbf16472bac.tar.bz2
historical-0cd53d75bfd007e1269fa1d22f62cdbf16472bac.zip
Drop old
Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0x60C0742D1F357D42
Diffstat (limited to 'app-office')
-rw-r--r--app-office/mdbtools/Manifest23
-rw-r--r--app-office/mdbtools/files/mdbtools-0.6_pre1-as-needed.patch11
-rw-r--r--app-office/mdbtools/files/mdbtools-0.6_pre1-gcc34.patch35
-rw-r--r--app-office/mdbtools/files/mdbtools-0.6_pre1-gcc41.patch13
-rw-r--r--app-office/mdbtools/files/mdbtools-0.6_pre1-strlen.patch10
-rw-r--r--app-office/mdbtools/files/mdbtools-0.6_pre2-as-needed.patch11
-rw-r--r--app-office/mdbtools/files/mdbtools-0.6_pre2-gcc34.patch35
-rw-r--r--app-office/mdbtools/files/mdbtools-0.6_pre2-haveiconv-fix.patch22
-rw-r--r--app-office/mdbtools/files/mdbtools-0.6_pre2-odbc_definitions.patch146
-rw-r--r--app-office/mdbtools/files/mdbtools-0.6_pre2-parallel-make.patch18
10 files changed, 7 insertions, 317 deletions
diff --git a/app-office/mdbtools/Manifest b/app-office/mdbtools/Manifest
index e8a0e9aceaaa..b554c8cdcaf6 100644
--- a/app-office/mdbtools/Manifest
+++ b/app-office/mdbtools/Manifest
@@ -1,15 +1,6 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-AUX mdbtools-0.6_pre1-as-needed.patch 482 SHA256 38d06663bc41ced3e094d4a78d6a0b81909b08720bec2696ef7431fb90519416 SHA512 e2ffbb01eb8f70c383deeeab14101ee9c3f07cce2b5d490c571f54960a2db3df0067f47c8d138d4fe8734d18de5f62fed3b37b168f7f752aa15ccfda06566a2a WHIRLPOOL a6d80445bb9a8eb678cf816d29f776d812f932956d9642cfb020df49d5ea783381d5ec3d6f201b7b6100d902faa3e2f3d8adfcd68010df42a95b343de7a6fd5b
-AUX mdbtools-0.6_pre1-gcc34.patch 1571 SHA256 63a2f8d06d905274c3dfb60373b7a4c967534a06b864dc3e73e2a92ed8b0f633 SHA512 0b00afb738bf420c7ab50c1315610d6226dd76f764aa0575ffb58c74c2ed74d0e9d6aed04e675b7a03818145f8beb7c1ab2c1d938848e0aeae4e526c3a730db5 WHIRLPOOL bced5cf91b0fae4eca24893272e07dd25828d5e370daabede8ce84eaa4c98d65948098adfa7a75961a8d254cb23ff35c220b832e9ec0d19eae67fd15b44f1ebc
-AUX mdbtools-0.6_pre1-gcc41.patch 498 SHA256 58ab3afcf6e3a97570db7980cf81792b21c84e9074afdc7826c2789306122a63 SHA512 7c60ba2523a6be3c7295579df99dcec0df5b0c8e51805c1a2020be1ab073f00c41e556ddde6cf8023ad77ca9a5ca53118655ad1f79d6998b9ab0d173f88b5705 WHIRLPOOL 63203c6b86b9b4ec2261f8b639b50b69b31254f46d618713eea8eede8a4427af17c928ed8479f23084d719b07d9c96334c3bba4ff03d3b59036c8f3f6f7a62b2
-AUX mdbtools-0.6_pre1-strlen.patch 284 SHA256 a1ba4bde512318dc6db254f5ab04df94644970106fc950e316877734502f40b5 SHA512 7f328cf1885d1c7b876bb511d555c36003f493014b838f2515ba9b84476eb720f0c64da017d22449ea0c077ea27c5d0d6d456bc50dd1235127ffe8efb47d8332 WHIRLPOOL 7e2d3089e8709d8aa192873a297fdbd60baa63321ff23f8c4ba8a8fe92cc1c64795ac7c79260ac39a173c680c8f263463c3d0fff01873e071cf41594a47f2908
-AUX mdbtools-0.6_pre2-as-needed.patch 482 SHA256 38d06663bc41ced3e094d4a78d6a0b81909b08720bec2696ef7431fb90519416 SHA512 e2ffbb01eb8f70c383deeeab14101ee9c3f07cce2b5d490c571f54960a2db3df0067f47c8d138d4fe8734d18de5f62fed3b37b168f7f752aa15ccfda06566a2a WHIRLPOOL a6d80445bb9a8eb678cf816d29f776d812f932956d9642cfb020df49d5ea783381d5ec3d6f201b7b6100d902faa3e2f3d8adfcd68010df42a95b343de7a6fd5b
-AUX mdbtools-0.6_pre2-gcc34.patch 1468 SHA256 ae0f0ea67b9bcc8851073acba54297268f00a31a0d286b59680f7a28f15ba108 SHA512 66c9ef00fd1ac6dd23f05e243765df5facfafaeb40ddb3343b7c84b3f27edddb1039dbb0d3b231c6cd5aab66c9be127fd96dc7ac7d386fb190f025827583c929 WHIRLPOOL c478a3c333658541b68d0861a08476bc4c0893b56ee8349d699e26f6507a876c8019b2446cd21bbd2113810e8aced9589631ac146edc667c9a70a9352edaa61b
-AUX mdbtools-0.6_pre2-haveiconv-fix.patch 660 SHA256 e7fc8f4809968f0cfc8e890d8dc6ca98abd51f1c243d25276e566f88f9461887 SHA512 3f286d6d4814a56025bf69fd3c639821604877f20e86ead312af4c8d2a17dd1428e4afa0f01017f4e1a283f8784bb4141db4f612cc4b887fcbd491e5fb3ac447 WHIRLPOOL b3e50f006d8f880ebfa5e248ca732a0125b759617e39a9bea0c5183b75e53d1fb0985df990576b4e6fedb1f005ecd36d7f315fdd492e7a92bfe14d7897eb83fa
-AUX mdbtools-0.6_pre2-odbc_definitions.patch 4060 SHA256 d3381970ce81ebf4663f00424af02cb5544f7c5095abba87117813182789f6b1 SHA512 ea6d962988a51ef2c2e9b69d75ed526ad9b9916812f965fc1a80881d3dbe98a61fae0b07cbad2966bc59b587055d1adceff668bce4a8f82c910b8263c607421a WHIRLPOOL e2162876e4153eaaf60d655ef430f31e999e67b62979fbd46fc31116b7fc3f1139a76ba960967d85e2ba8f17883836bba4dbc8cc422e56a3e03e717c2229d066
-AUX mdbtools-0.6_pre2-parallel-make.patch 655 SHA256 406acd023f0af39a0d2b2b25284efd5e01defffbfade6c17ee9dcacdaa29e15a SHA512 cd2f5284b4ea9e302207317a40f56c35eb2ca94cf9bc59c3f11c8cfc42833e75befb2064e8c8e91333037525d75d0613920bb2421e4c3058a6f19932a46c222a WHIRLPOOL b92287cd93aacddb6fce25e3fcc8fc1288bc72534d6b46bf05264a353a1fe531522399ec5d346dae0f68723c7ca8ff8d79b236faa984e3e1ec7d1d0837d89a10
AUX mdbtools-0.7.1-parallel-make.patch 513 SHA256 def6502ecc1d21ba17829de1c4f42194fb78eb39185189b2b4d13d13bfdf5e38 SHA512 946139271a757a8beeeb03a909104bc348cbc081a9ef6dde7f739865c775cce06717de57560a49b5055d5196b1f3985824b80b728f139cf7684c0ba847f4bd85 WHIRLPOOL 0a164f299d58f950d842fcc63f1ff67d1a967e86d4ed746d5884358060c3a0ab3c97e96aadcb26982b213695fa323f2b0cab8d083faf80da2257d08e51a68f3d
DIST mdbtools-0.7.1.tar.gz 277257 SHA256 dcf310dc7b07e7ad2f9f6be16047dc81312cfe1ab1bd94d0fa739c8059af0b16 SHA512 bbad415c59a3f54c11bcd04971220b1370046c5dfd7300d1f23e597615a1df6af850c6f767e78033676d486d87a11c72dfdb141abbee8378337c3fda9a450b75 WHIRLPOOL 0e25f7d5a2108575bc3fdf2930ceedc21844412fb7947c504f2538b185f8f623712c31ca9102660446731dc19fb431217aa70c7ee658f07d951966921fc2fc7a
EBUILD mdbtools-0.7.1-r1.ebuild 1256 SHA256 2420777e40ad5542c945ff7a7e1bf85be058c49c7ad2aa26016f751b92fb977b SHA512 197f42415df750543bc0488e9d6c40c36653f9a5441d19b871396e45be39e8809a385bf534bd7eecf583c9e05654f2b1a51fc686f1af7e0758a205c0024b6506 WHIRLPOOL 7c7a9b1de4b61078e72e84faa21e186500562a30d945c0804b770880ad938b69c18b46c07c7c0d62a9c59204398f3b58c0aeaed07150affe5d9ee5f6940b2048
@@ -19,11 +10,11 @@ MISC metadata.xml 481 SHA256 e66bcca97272fab6ff14c8cf5a37d5ad5941ac1de2c16ec8d83
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQEcBAEBCAAGBQJVVIh/AAoJECo/aRed9267WQ8H/0l1SpP2Y0QV4YGRWuLvWvQx
-9IX538tjcZL2lUCN7KIzNhw5HqpIWfK292ZCw9Adq0c6EZXrePLG0U83beSBaBU9
-SF0eO2iRLd8I1MZKwSwHtYFq5D7vmt6Uageo9euD8wMPey+HbkuzNq0prZ5gaCpY
-/2IVa6sCsfymb/CwngyguZrq/VQCP5qz1d304hXjdrjXndUmYWwvo/XWMzre3SZC
-JARIsuI188UYPsEHL8j16Zp9lVAKYEOrELgHvGSNpJm59PO1NVXExEb/W7hOfzm0
-wNvrfzdgpLm7Sm269WdJcAErXKPdmgkNXVZ5Od5Bved+a3Gnd/N01QJ62jsRDhU=
-=GD65
+iQEcBAEBCAAGBQJVVIjaAAoJECo/aRed92672L4H/1arf1Bx7aQCIs+ixYm4xMqc
+0akQrbi7rIBi2Z4Dnma66EoxexCdHuoTMgSONt2s7iWzpoBmMu1Mg+3e75jXSMNp
+Q0eNnI5zT1bDDL3uGC6cPhQ45jkQFAE/QWPHHTfGnx6VToANd2wcBiIkuls2OTla
+Wn7JuBu5WcwwxvmQWcDQVl9uX2AjtsKVc8FBbkfVXOEYWRZd25/VTjiuXbPhE1mG
+vZDKIbO58Yw+ZSFFPYGTTMtcMD2t2zvuVCBhi7vhDu2BAFsiyT8FH/leCJnCOj29
+R0ph+dNVd9t4SPw6ddeVwvhRo3P5OhTJ10tztYAF9HrX4qRnTLXWyNMDAjrfWZY=
+=Su+t
-----END PGP SIGNATURE-----
diff --git a/app-office/mdbtools/files/mdbtools-0.6_pre1-as-needed.patch b/app-office/mdbtools/files/mdbtools-0.6_pre1-as-needed.patch
deleted file mode 100644
index fc424b6d62da..000000000000
--- a/app-office/mdbtools/files/mdbtools-0.6_pre1-as-needed.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/odbc/Makefile.am.orig 2006-07-26 14:05:55.000000000 +0200
-+++ src/odbc/Makefile.am 2006-07-26 14:06:02.000000000 +0200
-@@ -15,7 +15,7 @@
- $(patsubst %.c, %.lo, $(SQLSOURCES))) \
- $(patsubst %, $(MDBDIR)/%, \
- $(patsubst %.c, %.lo, $(MDBSOURCES)))
--LIBS = @LEXLIB@ $(GLIB_LIBS) $(ODBC_LIBS)
-+LIBS = @LEXLIB@ $(GLIB_LIBS) $(ODBC_LIBS) -lm
- unittest_LDADD = libmdbodbc.la ../libmdb/libmdb.la ../sql/libmdbsql.la
-
- ## Need blank statement to avoid compiling odbc.c
diff --git a/app-office/mdbtools/files/mdbtools-0.6_pre1-gcc34.patch b/app-office/mdbtools/files/mdbtools-0.6_pre1-gcc34.patch
deleted file mode 100644
index 605273dd1116..000000000000
--- a/app-office/mdbtools/files/mdbtools-0.6_pre1-gcc34.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -Naur mdbtools-0.6pre1-orig/src/gmdb2/sql.c mdbtools-0.6pre1/src/gmdb2/sql.c
---- mdbtools-0.6pre1-orig/src/gmdb2/sql.c 2004-02-13 13:49:52.000000000 -0500
-+++ mdbtools-0.6pre1/src/gmdb2/sql.c 2005-10-18 08:00:19.088362686 -0400
-@@ -38,6 +38,8 @@
-
- void gmdb_sql_tree_populate(MdbHandle *mdb, GladeXML *xml);
- void gmdb_sql_load_query(GladeXML *xml, gchar *file_path);
-+void gmdb_sql_save_as_cb(GtkWidget *w, GladeXML *xml);
-+void gmdb_sql_save_query(GladeXML *xml, gchar *file_path);
-
- void
- gmdb_sql_close_all()
-diff -Naur mdbtools-0.6pre1-orig/src/gmdb2/table_export.c mdbtools-0.6pre1/src/gmdb2/table_export.c
---- mdbtools-0.6pre1-orig/src/gmdb2/table_export.c 2003-01-14 12:37:44.000000000 -0500
-+++ mdbtools-0.6pre1/src/gmdb2/table_export.c 2005-10-18 08:00:19.089362678 -0400
-@@ -37,6 +37,8 @@
- #define NEVER "Never"
- #define AUTOMAT "Automatic (where necessary)"
-
-+void gmdb_table_export_populate_dialog(GladeXML *xml);
-+
- void
- gmdb_print_quote(FILE *outfile, int need_quote, char quotechar, char *colsep, char *str)
- {
-diff -Naur mdbtools-0.6pre1-orig/src/odbc/odbc.c mdbtools-0.6pre1/src/odbc/odbc.c
---- mdbtools-0.6pre1-orig/src/odbc/odbc.c 2004-05-30 04:06:43.000000000 -0400
-+++ mdbtools-0.6pre1/src/odbc/odbc.c 2005-10-18 08:00:19.090362669 -0400
-@@ -46,6 +46,7 @@
- static SQLRETURN SQL_API _SQLFreeConnect(SQLHDBC hdbc);
- static SQLRETURN SQL_API _SQLFreeEnv(SQLHENV henv);
- static SQLRETURN SQL_API _SQLFreeStmt(SQLHSTMT hstmt, SQLUSMALLINT fOption);
-+static void bind_columns(struct _hstmt *stmt);
-
- static void bind_columns (struct _hstmt*);
-
diff --git a/app-office/mdbtools/files/mdbtools-0.6_pre1-gcc41.patch b/app-office/mdbtools/files/mdbtools-0.6_pre1-gcc41.patch
deleted file mode 100644
index 786028a36426..000000000000
--- a/app-office/mdbtools/files/mdbtools-0.6_pre1-gcc41.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ur mdbtools-0.6pre1-orig/include/mdbtools.h mdbtools-0.6pre1/include/mdbtools.h
---- mdbtools-0.6pre1-orig/include/mdbtools.h 2006-05-28 18:01:32.000000000 -0400
-+++ mdbtools-0.6pre1/include/mdbtools.h 2006-05-28 18:04:33.000000000 -0400
-@@ -147,7 +147,7 @@
- #define IS_JET3(mdb) (mdb->f->jet_version==MDB_VER_JET3)
-
- /* hash to store registered backends */
--extern GHashTable *mdb_backends;
-+static GHashTable *mdb_backends;
-
- /* forward declarations */
- typedef struct mdbindex MdbIndex;
-
diff --git a/app-office/mdbtools/files/mdbtools-0.6_pre1-strlen.patch b/app-office/mdbtools/files/mdbtools-0.6_pre1-strlen.patch
deleted file mode 100644
index 70666dc8cc4f..000000000000
--- a/app-office/mdbtools/files/mdbtools-0.6_pre1-strlen.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/extras/mdbsupport.c.orig 2007-05-13 11:55:43.000000000 +0200
-+++ src/extras/mdbsupport.c 2007-05-13 11:55:57.000000000 +0200
-@@ -1,6 +1,7 @@
- /* support routines for code generated by the util programs */
-
- #include <stdio.h>
-+#include <string.h>
-
- void dump_int (int i)
- {
diff --git a/app-office/mdbtools/files/mdbtools-0.6_pre2-as-needed.patch b/app-office/mdbtools/files/mdbtools-0.6_pre2-as-needed.patch
deleted file mode 100644
index fc424b6d62da..000000000000
--- a/app-office/mdbtools/files/mdbtools-0.6_pre2-as-needed.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/odbc/Makefile.am.orig 2006-07-26 14:05:55.000000000 +0200
-+++ src/odbc/Makefile.am 2006-07-26 14:06:02.000000000 +0200
-@@ -15,7 +15,7 @@
- $(patsubst %.c, %.lo, $(SQLSOURCES))) \
- $(patsubst %, $(MDBDIR)/%, \
- $(patsubst %.c, %.lo, $(MDBSOURCES)))
--LIBS = @LEXLIB@ $(GLIB_LIBS) $(ODBC_LIBS)
-+LIBS = @LEXLIB@ $(GLIB_LIBS) $(ODBC_LIBS) -lm
- unittest_LDADD = libmdbodbc.la ../libmdb/libmdb.la ../sql/libmdbsql.la
-
- ## Need blank statement to avoid compiling odbc.c
diff --git a/app-office/mdbtools/files/mdbtools-0.6_pre2-gcc34.patch b/app-office/mdbtools/files/mdbtools-0.6_pre2-gcc34.patch
deleted file mode 100644
index 9adf31caa191..000000000000
--- a/app-office/mdbtools/files/mdbtools-0.6_pre2-gcc34.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -Naur mdbtools-0.6pre1-orig/src/gmdb2/sql.c mdbtools-0.6pre1/src/gmdb2/sql.c
---- src/gmdb2/sql.c 2004-02-13 13:49:52.000000000 -0500
-+++ src/gmdb2/sql.c 2005-10-18 08:00:19.088362686 -0400
-@@ -38,6 +38,8 @@
-
- static void gmdb_sql_tree_populate(MdbHandle *mdb, GladeXML *xml);
- static void gmdb_sql_load_query(GladeXML *xml, gchar *file_path);
-+void gmdb_sql_save_as_cb(GtkWidget *w, GladeXML *xml);
-+void gmdb_sql_save_query(GladeXML *xml, gchar *file_path);
-
- void
- gmdb_sql_close_all()
-diff -Naur mdbtools-0.6pre1-orig/src/gmdb2/table_export.c mdbtools-0.6pre1/src/gmdb2/table_export.c
---- src/gmdb2/table_export.c 2003-01-14 12:37:44.000000000 -0500
-+++ src/gmdb2/table_export.c 2005-10-18 08:00:19.089362678 -0400
-@@ -37,6 +37,8 @@
- #define NEVER "Never"
- #define AUTOMAT "Automatic (where necessary)"
-
-+void gmdb_table_export_populate_dialog(GladeXML *xml);
-+
- void
- gmdb_print_quote(FILE *outfile, int need_quote, char quotechar, char *colsep, char *str)
- {
-diff -Naur mdbtools-0.6pre1-orig/src/odbc/odbc.c mdbtools-0.6pre1/src/odbc/odbc.c
---- src/odbc/odbc.c 2004-05-30 04:06:43.000000000 -0400
-+++ src/odbc/odbc.c 2005-10-18 08:00:19.090362669 -0400
-@@ -46,6 +46,7 @@
- static SQLRETURN SQL_API _SQLFreeConnect(SQLHDBC hdbc);
- static SQLRETURN SQL_API _SQLFreeEnv(SQLHENV henv);
- static SQLRETURN SQL_API _SQLFreeStmt(SQLHSTMT hstmt, SQLUSMALLINT fOption);
-+static void bind_columns(struct _hstmt *stmt);
-
- static void bind_columns (struct _hstmt*);
-
diff --git a/app-office/mdbtools/files/mdbtools-0.6_pre2-haveiconv-fix.patch b/app-office/mdbtools/files/mdbtools-0.6_pre2-haveiconv-fix.patch
deleted file mode 100644
index dc0c259f9db7..000000000000
--- a/app-office/mdbtools/files/mdbtools-0.6_pre2-haveiconv-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -u -r mdbtools/src/libmdb/file.c mdbtools.fix/src/libmdb/file.c
---- mdbtools/src/libmdb/file.c 2005-06-28 13:53:40.000000000 +0900
-+++ mdbtools.fix/src/libmdb/file.c 2009-09-09 04:02:47.000000000 +0900
-@@ -17,6 +17,7 @@
- * Boston, MA 02111-1307, USA.
- */
-
-+#include "config.h"
- #include "mdbtools.h"
-
- #ifdef DMALLOC
-diff -u -r mdbtools/src/libmdb/iconv.c mdbtools.fix/src/libmdb/iconv.c
---- mdbtools/src/libmdb/iconv.c 2005-09-08 08:27:43.000000000 +0900
-+++ mdbtools.fix/src/libmdb/iconv.c 2009-09-09 04:00:36.000000000 +0900
-@@ -17,6 +17,7 @@
- * Boston, MA 02111-1307, USA.
- */
-
-+#include "config.h"
- #include "mdbtools.h"
- #include "errno.h"
-
diff --git a/app-office/mdbtools/files/mdbtools-0.6_pre2-odbc_definitions.patch b/app-office/mdbtools/files/mdbtools-0.6_pre2-odbc_definitions.patch
deleted file mode 100644
index 03e32800854e..000000000000
--- a/app-office/mdbtools/files/mdbtools-0.6_pre2-odbc_definitions.patch
+++ /dev/null
@@ -1,146 +0,0 @@
---- mdbtools-cvs-20050624/src/odbc/odbc.c.orig 2010-05-24 10:20:59.000000000 -0400
-+++ mdbtools-cvs-20050624/src/odbc/odbc.c 2010-05-25 17:28:05.000000000 -0400
-@@ -210,7 +210,7 @@
- SQLHSTMT hstmt,
- SQLUSMALLINT ipar,
- SQLSMALLINT FAR *pfSqlType,
-- SQLUINTEGER FAR *pcbParamDef,
-+ SQLULEN FAR *pcbParamDef,
- SQLSMALLINT FAR *pibScale,
- SQLSMALLINT FAR *pfNullable)
- {
-@@ -221,8 +221,8 @@
- SQLRETURN SQL_API SQLExtendedFetch(
- SQLHSTMT hstmt,
- SQLUSMALLINT fFetchType,
-- SQLINTEGER irow,
-- SQLUINTEGER FAR *pcrow,
-+ SQLLEN irow,
-+ SQLULEN FAR *pcrow,
- SQLUSMALLINT FAR *rgfRowStatus)
- {
- struct _hstmt *stmt = (struct _hstmt *) hstmt;
-@@ -297,8 +297,8 @@
-
- SQLRETURN SQL_API SQLParamOptions(
- SQLHSTMT hstmt,
-- SQLUINTEGER crow,
-- SQLUINTEGER FAR *pirow)
-+ SQLULEN crow,
-+ SQLULEN FAR *pirow)
- {
- TRACE("SQLParamOptions");
- return SQL_SUCCESS;
-@@ -347,7 +347,7 @@
-
- SQLRETURN SQL_API SQLSetPos(
- SQLHSTMT hstmt,
-- SQLUSMALLINT irow,
-+ SQLSETPOSIROW irow,
- SQLUSMALLINT fOption,
- SQLUSMALLINT fLock)
- {
-@@ -398,11 +398,11 @@
- SQLSMALLINT fParamType,
- SQLSMALLINT fCType,
- SQLSMALLINT fSqlType,
-- SQLUINTEGER cbColDef,
-+ SQLULEN cbColDef,
- SQLSMALLINT ibScale,
- SQLPOINTER rgbValue,
-- SQLINTEGER cbValueMax,
-- SQLINTEGER FAR *pcbValue)
-+ SQLLEN cbValueMax,
-+ SQLLEN FAR *pcbValue)
- {
- struct _hstmt *stmt;
-
-@@ -502,8 +502,8 @@
- SQLUSMALLINT icol,
- SQLSMALLINT fCType,
- SQLPOINTER rgbValue,
-- SQLINTEGER cbValueMax,
-- SQLINTEGER FAR *pcbValue)
-+ SQLLEN cbValueMax,
-+ SQLLEN FAR *pcbValue)
- {
- struct _hstmt *stmt = (struct _hstmt *) hstmt;
- struct _sql_bind_info *cur, *newitem;
-@@ -594,7 +594,7 @@
- SQLSMALLINT cbColNameMax,
- SQLSMALLINT FAR *pcbColName,
- SQLSMALLINT FAR *pfSqlType,
-- SQLUINTEGER FAR *pcbColDef, /* precision */
-+ SQLULEN FAR *pcbColDef, /* precision */
- SQLSMALLINT FAR *pibScale,
- SQLSMALLINT FAR *pfNullable)
- {
-@@ -649,7 +649,7 @@
- SQLPOINTER rgbDesc,
- SQLSMALLINT cbDescMax,
- SQLSMALLINT FAR *pcbDesc,
-- SQLINTEGER FAR *pfDesc)
-+ SQLLEN FAR *pfDesc)
- {
- int namelen, i;
- struct _hstmt *stmt;
-@@ -969,7 +969,7 @@
-
- SQLRETURN SQL_API SQLRowCount(
- SQLHSTMT hstmt,
-- SQLINTEGER FAR *pcrow)
-+ SQLLEN FAR *pcrow)
- {
- struct _hstmt *stmt=(struct _hstmt *)hstmt;
-
-@@ -1002,10 +1002,10 @@
- SQLUSMALLINT ipar,
- SQLSMALLINT fCType,
- SQLSMALLINT fSqlType,
-- SQLUINTEGER cbParamDef,
-+ SQLULEN cbParamDef,
- SQLSMALLINT ibScale,
- SQLPOINTER rgbValue,
-- SQLINTEGER FAR *pcbValue)
-+ SQLLEN FAR *pcbValue)
- {
- TRACE("SQLSetParam");
- return SQL_SUCCESS;
-@@ -1125,8 +1125,8 @@
- SQLUSMALLINT icol,
- SQLSMALLINT fCType,
- SQLPOINTER rgbValue,
-- SQLINTEGER cbValueMax,
-- SQLINTEGER FAR *pcbValue)
-+ SQLLEN cbValueMax,
-+ SQLLEN FAR *pcbValue)
- {
- struct _hstmt *stmt;
- struct _hdbc *dbc;
-@@ -1457,7 +1457,7 @@
- SQLRETURN SQL_API SQLPutData(
- SQLHSTMT hstmt,
- SQLPOINTER rgbValue,
-- SQLINTEGER cbValue)
-+ SQLLEN cbValue)
- {
- TRACE("SQLPutData");
- return SQL_SUCCESS;
-@@ -1466,7 +1466,7 @@
- SQLRETURN SQL_API SQLSetConnectOption(
- SQLHDBC hdbc,
- SQLUSMALLINT fOption,
-- SQLUINTEGER vParam)
-+ SQLULEN vParam)
- {
- TRACE("SQLSetConnectOption");
- return SQL_SUCCESS;
-@@ -1475,7 +1475,7 @@
- SQLRETURN SQL_API SQLSetStmtOption(
- SQLHSTMT hstmt,
- SQLUSMALLINT fOption,
-- SQLUINTEGER vParam)
-+ SQLULEN vParam)
- {
- TRACE("SQLSetStmtOption");
- return SQL_SUCCESS;
diff --git a/app-office/mdbtools/files/mdbtools-0.6_pre2-parallel-make.patch b/app-office/mdbtools/files/mdbtools-0.6_pre2-parallel-make.patch
deleted file mode 100644
index 04117edb3aff..000000000000
--- a/app-office/mdbtools/files/mdbtools-0.6_pre2-parallel-make.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- mdbtools-cvs-20050624.orig/src/sql/Makefile.am 2005-01-15 06:02:06.000000000 +0100
-+++ mdbtools-cvs-20050624/src/sql/Makefile.am 2010-01-12 13:04:01.000000000 +0100
-@@ -1,5 +1,5 @@
- lib_LTLIBRARIES = libmdbsql.la
--libmdbsql_la_SOURCES= mdbsql.c parser.y lexer.l
-+libmdbsql_la_SOURCES= mdbsql.c parser.y lexer.l parser.h
- libmdbsql_la_LDFLAGS = -version-info 1:0:0
- DISTCLEANFILES = parser.c parser.h lexer.c
- AM_CPPFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS)
-@@ -7,5 +7,8 @@
- LDADD = ../libmdb/libmdb.la
- YACC = @YACC@ -d
-
-+parser.h: parser.lo
-+lexer.lo: parser.h
-+
- dist-hook:
- rm -f $(distdir)/parser.c $(distdir)/parser.h $(distdir)/lexer.c