summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Bishop2016-09-13 08:05:39 -0400
committerAaron Bishop2016-09-13 08:05:39 -0400
commit68b9c520d3acfd197dfb638aeaaa73063b22d762 (patch)
tree6d4148d0529c6a2b36ecfcbebc3b7a21192cd562
parent185999d5a97fd5d6497fbfe8f3119f225776e62c (diff)
downloadaur-68b9c520d3acfd197dfb638aeaaa73063b22d762.tar.gz
Updated for 0.03
Moved sqlpp11 to makedepends and optdepends since it is header only
-rw-r--r--.SRCINFO12
-rw-r--r--0.42.patch11
-rw-r--r--PKGBUILD14
3 files changed, 28 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c67928ee7840..5ac863b87fa9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = sqlpp11-connector-odbc
pkgdesc = ODBC wrapper for sqlpp11
- pkgver = 0.02.1
+ pkgver = 0.03
pkgrel = 1
url = https://github.com/Erroneous1/sqlpp11-connector-odbc
arch = x86_64
@@ -9,9 +9,13 @@ pkgbase = sqlpp11-connector-odbc
makedepends = cmake
makedepends = git
makedepends = unixodbc
- depends = sqlpp11
- source = https://github.com/Erroneous1/sqlpp11-connector-odbc/archive/v0.02.1.tar.gz
- sha256sums = e8f89cc6a6aa7eae33d8fb90d4fc77af5f74bc2ecd08ea91cb63bb8804fb2476
+ makedepends = sqlpp11>=0.42
+ depends = gcc-libs
+ optdepends = sqlpp11: For building programs using sqlpp11-connector-odbc
+ source = https://github.com/Erroneous1/sqlpp11-connector-odbc/archive/v0.03.tar.gz
+ source = 0.42.patch
+ sha256sums = c7117a5765dee89d9603fefe9b57adaea550e15791f0012979b41173c41ff46b
+ sha256sums = ac55b1c63c99aafa44a415a99697be4af117e48137cdfd17939b7705015f7dea
pkgname = sqlpp11-connector-odbc
diff --git a/0.42.patch b/0.42.patch
new file mode 100644
index 000000000000..316108b83a65
--- /dev/null
+++ b/0.42.patch
@@ -0,0 +1,11 @@
+diff -ur sqlpp11-connector-odbc-0.03/src/bind_result.cpp sqlpp11-connector-odbc-0.03-b/src/bind_result.cpp
+--- sqlpp11-connector-odbc-0.03/src/bind_result.cpp 2016-09-13 07:52:23.297892246 -0400
++++ sqlpp11-connector-odbc-0.03-b/src/bind_result.cpp 2016-09-13 07:33:45.000000000 -0400
+@@ -27,7 +27,6 @@
+
+ #include <iostream>
+ #include <vector>
+-#include <sqlpp11/expression_return_types.h>
+ #include <sqlpp11/exception.h>
+ #include <sqlpp11/odbc/bind_result.h>
+ #include <sql.h>
diff --git a/PKGBUILD b/PKGBUILD
index 2bded5747256..5fb3e50c59d2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,20 +1,24 @@
# Maintainer: Aaron Bishop < erroneous at gmail >
pkgname=sqlpp11-connector-odbc
-pkgver=0.02.1
+pkgver=0.03
pkgrel=1
pkgdesc="ODBC wrapper for sqlpp11"
arch=('x86_64' 'i686')
url="https://github.com/Erroneous1/sqlpp11-connector-odbc"
license=('CUSTOM')
-depends=('sqlpp11')
-makedepends=('cmake' 'git' 'unixodbc')
-source=("${url}/archive/v${pkgver}.tar.gz")
-sha256sums=('e8f89cc6a6aa7eae33d8fb90d4fc77af5f74bc2ecd08ea91cb63bb8804fb2476')
+depends=('gcc-libs')
+makedepends=('cmake' 'git' 'unixodbc' 'sqlpp11>=0.42')
+optdepends=('sqlpp11: For building programs using sqlpp11-connector-odbc')
+source=("${url}/archive/v${pkgver}.tar.gz"
+ "0.42.patch")
+sha256sums=('c7117a5765dee89d9603fefe9b57adaea550e15791f0012979b41173c41ff46b'
+ 'ac55b1c63c99aafa44a415a99697be4af117e48137cdfd17939b7705015f7dea')
prepare() {
rm -Rf build
mkdir build
+ patch -Rp0 < 0.42.patch
cd build
cmake -DCMAKE_INSTALL_PREFIX=/usr -DDATE_INCLUDE_DIR=/usr/include/sqlpp11 ../${pkgname}-${pkgver}
}