[arch-commits] Commit in myodbc/repos (6 files)

2016-03-04 Thread Bartłomiej Piotrowski 
Date: Friday, March 4, 2016 @ 12:20:21
  Author: bpiotrowski
Revision: 164729

archrelease: copy trunk to community-staging-i686, community-staging-x86_64

Added:
  myodbc/repos/community-staging-i686/
  myodbc/repos/community-staging-i686/PKGBUILD
(from rev 164728, myodbc/trunk/PKGBUILD)
  myodbc/repos/community-staging-i686/build-fix.patch
(from rev 164728, myodbc/trunk/build-fix.patch)
  myodbc/repos/community-staging-x86_64/
  myodbc/repos/community-staging-x86_64/PKGBUILD
(from rev 164728, myodbc/trunk/PKGBUILD)
  myodbc/repos/community-staging-x86_64/build-fix.patch
(from rev 164728, myodbc/trunk/build-fix.patch)

--+
 community-staging-i686/PKGBUILD  |   44 +++
 community-staging-i686/build-fix.patch   |   66 +
 community-staging-x86_64/PKGBUILD|   44 +++
 community-staging-x86_64/build-fix.patch |   66 +
 4 files changed, 220 insertions(+)

Copied: myodbc/repos/community-staging-i686/PKGBUILD (from rev 164728, 
myodbc/trunk/PKGBUILD)
===
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2016-03-04 11:20:21 UTC (rev 164729)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Sergej Pupykin 
+
+pkgname=myodbc
+pkgver=5.3.4
+pkgrel=3
+pkgdesc="ODBC driver/connector for mariadb"
+arch=(i686 x86_64)
+url="http://dev.mysql.com/downloads/connector/odbc/;
+depends=('unixodbc' 'libmariadbclient')
+makedepends=('cmake' 'gtk2')
+optdepends=('gtk2')
+license=('GPL')
+options=('libtool')
+source=("http://cdn.mysql.com/Downloads/Connector-ODBC/5.3/mysql-connector-odbc-$pkgver-src.tar.gz;
+   "build-fix.patch")
+md5sums=('6974c4dd9096b961267ed6c4c853a07c'
+ '24c9fc679801c28015876b8f4a0d8b76')
+
+prepare() {
+  cd $srcdir/mysql-connector-odbc-${pkgver}-src
+  patch -p1 <$srcdir/build-fix.patch
+}
+
+build() {
+  cd $srcdir/mysql-connector-odbc-${pkgver}-src
+  export LDFLAGS="-lmysqld"
+  cmake -G "Unix Makefiles" \
+-DCMAKE_INSTALL_PREFIX=/usr \
+-DMYSQLCLIENT_LIB_NAME=libmysqlclient_r.so \
+-DWITH_UNIXODBC=1 .
+  make
+}
+
+package() {
+  cd $srcdir/mysql-connector-odbc-${pkgver}-src
+  make DESTDIR=$pkgdir install
+  pushd $pkgdir/usr
+  rm -rf test
+  install -dm0755 share/mysql-connector-odbc
+  mv ChangeLog COPYING INSTALL Licenses_for_Third-Party_Components.txt README 
README.debug \
+   share/mysql-connector-odbc/
+  popd
+}

Copied: myodbc/repos/community-staging-i686/build-fix.patch (from rev 164728, 
myodbc/trunk/build-fix.patch)
===
--- community-staging-i686/build-fix.patch  (rev 0)
+++ community-staging-i686/build-fix.patch  2016-03-04 11:20:21 UTC (rev 
164729)
@@ -0,0 +1,66 @@
+diff -wbBur mysql-connector-odbc-5.3.4-src/driver/catalog_no_i_s.c 
mysql-connector-odbc-5.3.4-src.my/driver/catalog_no_i_s.c
+--- mysql-connector-odbc-5.3.4-src/driver/catalog_no_i_s.c 2014-06-19 
02:50:16.0 +0400
 mysql-connector-odbc-5.3.4-src.my/driver/catalog_no_i_s.c  2014-09-08 
18:47:59.685268667 +0400
+@@ -1093,7 +1093,7 @@
+   unsigned long *lengths;
+   SQLRETURN rc= SQL_SUCCESS;
+ 
+-  my_init_dynamic_array(, sizeof(MY_FOREIGN_KEY_FIELD), 0, 0);
++  my_init_dynamic_array(, sizeof(MY_FOREIGN_KEY_FIELD), 0, 0, 0);
+ 
+   /* Get the list of tables that match szCatalog and szTable */
+   pthread_mutex_lock(>dbc->lock);
+diff -wbBur mysql-connector-odbc-5.3.4-src/driver/desc.c 
mysql-connector-odbc-5.3.4-src.my/driver/desc.c
+--- mysql-connector-odbc-5.3.4-src/driver/desc.c   2014-06-19 
02:50:16.0 +0400
 mysql-connector-odbc-5.3.4-src.my/driver/desc.c2014-09-08 
18:48:41.027931609 +0400
+@@ -63,13 +63,13 @@
+  but in desc_get_rec we manually get a pointer to it. This avoids
+  having to call set_dynamic after modifying the DESCREC.
+   */
+-  if (my_init_dynamic_array(>records, sizeof(DESCREC), 0, 0))
++  if (my_init_dynamic_array(>records, sizeof(DESCREC), 0, 0, 0))
+   {
+ x_free((char *)desc);
+ return NULL;
+   }
+ 
+-  if (my_init_dynamic_array(>bookmark, sizeof(DESCREC), 0, 0))
++  if (my_init_dynamic_array(>bookmark, sizeof(DESCREC), 0, 0, 0))
+   {
+ delete_dynamic(>records);
+ x_free((char *)desc);
+@@ -997,7 +997,7 @@
+   delete_dynamic(>records);
+   if (my_init_dynamic_array(>records, sizeof(DESCREC),
+ src->records.max_element,
+-src->records.alloc_increment))
++src->records.alloc_increment, 0))
+   {
+ return set_desc_error(dest, "HY001",
+   "Memory allocation error",
+diff -wbBur mysql-connector-odbc-5.3.4-src/driver/handle.c 
mysql-connector-odbc-5.3.4-src.my/driver/handle.c
+---

[arch-commits] Commit in myodbc/repos (6 files)

2015-12-06 Thread Evangelos Foutras 
Date: Sunday, December 6, 2015 @ 22:22:25
  Author: foutrelis
Revision: 149244

archrelease: copy trunk to community-staging-i686, community-staging-x86_64

Added:
  myodbc/repos/community-staging-i686/
  myodbc/repos/community-staging-i686/PKGBUILD
(from rev 149243, myodbc/trunk/PKGBUILD)
  myodbc/repos/community-staging-i686/build-fix.patch
(from rev 149243, myodbc/trunk/build-fix.patch)
  myodbc/repos/community-staging-x86_64/
  myodbc/repos/community-staging-x86_64/PKGBUILD
(from rev 149243, myodbc/trunk/PKGBUILD)
  myodbc/repos/community-staging-x86_64/build-fix.patch
(from rev 149243, myodbc/trunk/build-fix.patch)

--+
 community-staging-i686/PKGBUILD  |   44 +++
 community-staging-i686/build-fix.patch   |   66 +
 community-staging-x86_64/PKGBUILD|   44 +++
 community-staging-x86_64/build-fix.patch |   66 +
 4 files changed, 220 insertions(+)

Copied: myodbc/repos/community-staging-i686/PKGBUILD (from rev 149243, 
myodbc/trunk/PKGBUILD)
===
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2015-12-06 21:22:25 UTC (rev 149244)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Sergej Pupykin 
+
+pkgname=myodbc
+pkgver=5.3.4
+pkgrel=2
+pkgdesc="ODBC driver/connector for mariadb"
+arch=(i686 x86_64)
+url="http://dev.mysql.com/downloads/connector/odbc/;
+depends=('unixodbc' 'libmariadbclient')
+makedepends=('cmake' 'gtk2')
+optdepends=('gtk2')
+license=('GPL')
+options=('libtool')
+source=("http://cdn.mysql.com/Downloads/Connector-ODBC/5.3/mysql-connector-odbc-$pkgver-src.tar.gz;
+   "build-fix.patch")
+md5sums=('6974c4dd9096b961267ed6c4c853a07c'
+ '24c9fc679801c28015876b8f4a0d8b76')
+
+prepare() {
+  cd $srcdir/mysql-connector-odbc-${pkgver}-src
+  patch -p1 <$srcdir/build-fix.patch
+}
+
+build() {
+  cd $srcdir/mysql-connector-odbc-${pkgver}-src
+  export LDFLAGS="-lmysqld"
+  cmake -G "Unix Makefiles" \
+-DCMAKE_INSTALL_PREFIX=/usr \
+-DMYSQLCLIENT_LIB_NAME=libmysqlclient_r.so \
+-DWITH_UNIXODBC=1 .
+  make
+}
+
+package() {
+  cd $srcdir/mysql-connector-odbc-${pkgver}-src
+  make DESTDIR=$pkgdir install
+  pushd $pkgdir/usr
+  rm -rf test
+  install -dm0755 share/mysql-connector-odbc
+  mv ChangeLog COPYING INSTALL Licenses_for_Third-Party_Components.txt README 
README.debug \
+   share/mysql-connector-odbc/
+  popd
+}

Copied: myodbc/repos/community-staging-i686/build-fix.patch (from rev 149243, 
myodbc/trunk/build-fix.patch)
===
--- community-staging-i686/build-fix.patch  (rev 0)
+++ community-staging-i686/build-fix.patch  2015-12-06 21:22:25 UTC (rev 
149244)
@@ -0,0 +1,66 @@
+diff -wbBur mysql-connector-odbc-5.3.4-src/driver/catalog_no_i_s.c 
mysql-connector-odbc-5.3.4-src.my/driver/catalog_no_i_s.c
+--- mysql-connector-odbc-5.3.4-src/driver/catalog_no_i_s.c 2014-06-19 
02:50:16.0 +0400
 mysql-connector-odbc-5.3.4-src.my/driver/catalog_no_i_s.c  2014-09-08 
18:47:59.685268667 +0400
+@@ -1093,7 +1093,7 @@
+   unsigned long *lengths;
+   SQLRETURN rc= SQL_SUCCESS;
+ 
+-  my_init_dynamic_array(, sizeof(MY_FOREIGN_KEY_FIELD), 0, 0);
++  my_init_dynamic_array(, sizeof(MY_FOREIGN_KEY_FIELD), 0, 0, 0);
+ 
+   /* Get the list of tables that match szCatalog and szTable */
+   pthread_mutex_lock(>dbc->lock);
+diff -wbBur mysql-connector-odbc-5.3.4-src/driver/desc.c 
mysql-connector-odbc-5.3.4-src.my/driver/desc.c
+--- mysql-connector-odbc-5.3.4-src/driver/desc.c   2014-06-19 
02:50:16.0 +0400
 mysql-connector-odbc-5.3.4-src.my/driver/desc.c2014-09-08 
18:48:41.027931609 +0400
+@@ -63,13 +63,13 @@
+  but in desc_get_rec we manually get a pointer to it. This avoids
+  having to call set_dynamic after modifying the DESCREC.
+   */
+-  if (my_init_dynamic_array(>records, sizeof(DESCREC), 0, 0))
++  if (my_init_dynamic_array(>records, sizeof(DESCREC), 0, 0, 0))
+   {
+ x_free((char *)desc);
+ return NULL;
+   }
+ 
+-  if (my_init_dynamic_array(>bookmark, sizeof(DESCREC), 0, 0))
++  if (my_init_dynamic_array(>bookmark, sizeof(DESCREC), 0, 0, 0))
+   {
+ delete_dynamic(>records);
+ x_free((char *)desc);
+@@ -997,7 +997,7 @@
+   delete_dynamic(>records);
+   if (my_init_dynamic_array(>records, sizeof(DESCREC),
+ src->records.max_element,
+-src->records.alloc_increment))
++src->records.alloc_increment, 0))
+   {
+ return set_desc_error(dest, "HY001",
+   "Memory allocation error",
+diff -wbBur mysql-connector-odbc-5.3.4-src/driver/handle.c 
mysql-connector-odbc-5.3.4-src.my/driver/handle.c
+---

[arch-commits] Commit in myodbc/repos (6 files)

2014-09-08 Thread Sergej Pupykin 
Date: Monday, September 8, 2014 @ 17:00:54
  Author: spupykin
Revision: 118667

archrelease: copy trunk to community-i686, community-x86_64

Added:
  myodbc/repos/community-i686/PKGBUILD
(from rev 118666, myodbc/trunk/PKGBUILD)
  myodbc/repos/community-i686/build-fix.patch
(from rev 118666, myodbc/trunk/build-fix.patch)
  myodbc/repos/community-x86_64/PKGBUILD
(from rev 118666, myodbc/trunk/PKGBUILD)
  myodbc/repos/community-x86_64/build-fix.patch
(from rev 118666, myodbc/trunk/build-fix.patch)
Deleted:
  myodbc/repos/community-i686/PKGBUILD
  myodbc/repos/community-x86_64/PKGBUILD

--+
 /PKGBUILD|   86 +
 community-i686/PKGBUILD  |   37 ---
 community-i686/build-fix.patch   |   66 
 community-x86_64/PKGBUILD|   37 ---
 community-x86_64/build-fix.patch |   66 
 5 files changed, 218 insertions(+), 74 deletions(-)

Deleted: community-i686/PKGBUILD
===
--- community-i686/PKGBUILD 2014-09-08 15:00:42 UTC (rev 118666)
+++ community-i686/PKGBUILD 2014-09-08 15:00:54 UTC (rev 118667)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin pupykin.s+a...@gmail.com
-
-pkgname=myodbc
-pkgver=5.2.6
-pkgrel=2
-pkgdesc=ODBC driver/connector for mariadb
-arch=(i686 x86_64)
-url=http://dev.mysql.com/downloads/connector/odbc/;
-depends=('unixodbc' 'libmariadbclient')
-makedepends=('cmake')
-license=('GPL')
-options=('libtool')
-source=(http://cdn.mysql.com/Downloads/Connector-ODBC/5.2/mysql-connector-odbc-$pkgver-src.tar.gz;)
-md5sums=('066bfed7dc472ef4b68bafc95ca45027')
-
-build() {
-  cd $srcdir/mysql-connector-odbc-${pkgver}-src
-  unset CFLAGS
-  export LDFLAGS=-lpthread -ldl
-  cmake -G Unix Makefiles \
--DCMAKE_INSTALL_PREFIX=/usr \
--DMYSQLCLIENT_LIB_NAME=libmysqlclient_r.a \
--DWITH_UNIXODBC=1 .
-  make
-}
-
-package() {
-  cd $srcdir/mysql-connector-odbc-${pkgver}-src
-  make DESTDIR=$pkgdir install
-  pushd $pkgdir/usr
-  rm -rf test
-  install -dm0755 share/mysql-connector-odbc
-  mv ChangeLog COPYING INSTALL Licenses_for_Third-Party_Components.txt README 
README.debug \
-   share/mysql-connector-odbc/
-  popd
-}

Copied: myodbc/repos/community-i686/PKGBUILD (from rev 118666, 
myodbc/trunk/PKGBUILD)
===
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2014-09-08 15:00:54 UTC (rev 118667)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Sergej Pupykin pupykin.s+a...@gmail.com
+
+pkgname=myodbc
+pkgver=5.3.4
+pkgrel=1
+pkgdesc=ODBC driver/connector for mariadb
+arch=(i686 x86_64)
+url=http://dev.mysql.com/downloads/connector/odbc/;
+depends=('unixodbc' 'libmariadbclient')
+makedepends=('cmake' 'gtk2')
+license=('GPL')
+options=('libtool')
+source=(http://cdn.mysql.com/Downloads/Connector-ODBC/5.3/mysql-connector-odbc-$pkgver-src.tar.gz;
+   build-fix.patch)
+md5sums=('6974c4dd9096b961267ed6c4c853a07c'
+ '24c9fc679801c28015876b8f4a0d8b76')
+
+prepare() {
+  cd $srcdir/mysql-connector-odbc-${pkgver}-src
+  patch -p1 $srcdir/build-fix.patch
+}
+
+build() {
+  cd $srcdir/mysql-connector-odbc-${pkgver}-src
+  export LDFLAGS=-lmysqld
+  cmake -G Unix Makefiles \
+-DCMAKE_INSTALL_PREFIX=/usr \
+-DMYSQLCLIENT_LIB_NAME=libmysqlclient_r.so \
+-DWITH_UNIXODBC=1 .
+  make
+}
+
+package() {
+  cd $srcdir/mysql-connector-odbc-${pkgver}-src
+  make DESTDIR=$pkgdir install
+  pushd $pkgdir/usr
+  rm -rf test
+  install -dm0755 share/mysql-connector-odbc
+  mv ChangeLog COPYING INSTALL Licenses_for_Third-Party_Components.txt README 
README.debug \
+   share/mysql-connector-odbc/
+  popd
+}

Copied: myodbc/repos/community-i686/build-fix.patch (from rev 118666, 
myodbc/trunk/build-fix.patch)
===
--- community-i686/build-fix.patch  (rev 0)
+++ community-i686/build-fix.patch  2014-09-08 15:00:54 UTC (rev 118667)
@@ -0,0 +1,66 @@
+diff -wbBur mysql-connector-odbc-5.3.4-src/driver/catalog_no_i_s.c 
mysql-connector-odbc-5.3.4-src.my/driver/catalog_no_i_s.c
+--- mysql-connector-odbc-5.3.4-src/driver/catalog_no_i_s.c 2014-06-19 
02:50:16.0 +0400
 mysql-connector-odbc-5.3.4-src.my/driver/catalog_no_i_s.c  2014-09-08 
18:47:59.685268667 +0400
+@@ -1093,7 +1093,7 @@
+   unsigned long *lengths;
+   SQLRETURN rc= SQL_SUCCESS;
+ 
+-  my_init_dynamic_array(records, sizeof(MY_FOREIGN_KEY_FIELD), 0, 0);
++  my_init_dynamic_array(records, sizeof(MY_FOREIGN_KEY_FIELD), 0, 0, 0);
+ 
+   /* Get the list of tables that match szCatalog and szTable */
+   pthread_mutex_lock(stmt-dbc-lock);
+diff -wbBur mysql-connector-odbc-5.3.4-src/driver/desc.c 
mysql-connector-odbc-5.3.4-src.my/driver/desc.c
+---