diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-01-25 12:01:49 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-01-25 12:01:49 +0100 |
commit | 8e40bdbb2496be15fdba2e683af427bc2333be42 (patch) | |
tree | 03ace0b9a2ffc12133cb0357fee75079c964f67a /staging/qt3/qt-odbc.patch | |
parent | 33fcf0e7b95e530b849e59e90fdea4001e01283d (diff) | |
parent | 2aa2acfff38de7de825868995e49792ecfc03126 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/libvisual-projectm/PKGBUILD
community/python-memcached/PKGBUILD
community/python-mpi4py/PKGBUILD
core/sqlite3/PKGBUILD
core/udev/PKGBUILD
extra/kdeplasma-applets-networkmanagement/PKGBUILD
extra/pixman/PKGBUILD
extra/sg3_utils/PKGBUILD
libre/kdeutils-libre/PKGBUILD
libre/linux-libre/PKGBUILD
libre/linux-libre/linux-libre.install
multilib/lib32-libxcb/PKGBUILD
multilib/lib32-openssl/PKGBUILD
multilib/lib32-sdl_image/PKGBUILD
multilib/lib32-sqlite3/PKGBUILD
multilib/lib32-udev/PKGBUILD
Diffstat (limited to 'staging/qt3/qt-odbc.patch')
-rw-r--r-- | staging/qt3/qt-odbc.patch | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/staging/qt3/qt-odbc.patch b/staging/qt3/qt-odbc.patch deleted file mode 100644 index 6f21e3cf1..000000000 --- a/staging/qt3/qt-odbc.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -up qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp.orig qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp ---- qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp.orig 2009-02-24 11:32:27.000000000 +0100 -+++ qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp 2009-02-24 11:33:43.000000000 +0100 -@@ -57,13 +57,13 @@ - #endif - - // newer platform SDKs use SQLLEN instead of SQLINTEGER --#ifdef SQLLEN -+#if defined(SQLLEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX) - # define QSQLLEN SQLLEN - #else - # define QSQLLEN SQLINTEGER - #endif - --#ifdef SQLULEN -+#if defined(SQLULEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX) - # define QSQLULEN SQLULEN - #else - # define QSQLULEN SQLUINTEGER |