- release 4 (by relup.sh)

[packages/qt5-qtbase.git] / qtbase-oracle-instantclient.patch

diff --git a/qtbase-oracle-instantclient.patch b/qtbase-oracle-instantclient.patch
index 322d1d503f5635628788b51e892f6e0f668d09ac..611379a7fdd1907dde462174c21feac3e080b56e 100644 (file)
--- a/qtbase-oracle-instantclient.patch
+++ b/qtbase-oracle-instantclient.patch
@@ -1,14 +1,17 @@
---- qtbase-opensource-src-5.3.0/src/sql/drivers/oci/qsql_oci.pri.orig  2014-05-15 19:12:11.000000000 +0200
-+++ qtbase-opensource-src-5.3.0/src/sql/drivers/oci/qsql_oci.pri       2014-06-01 13:15:50.625305132 +0200
-@@ -7,3 +7,4 @@
-     LIBS *= -loci
- }
- mac:QMAKE_LFLAGS += -Wl,-flat_namespace,-U,_environ
+--- a/src/plugins/sqldrivers/oci/oci.pro~      2017-01-18 15:20:58.000000000 +0100
++++ b/src/plugins/sqldrivers/oci/oci.pro       2017-01-23 22:35:03.156681327 +0100
+@@ -7,6 +7,8 @@ QMAKE_USE += oci
+ 
+ darwin:QMAKE_LFLAGS += -Wl,-flat_namespace,-U,_environ
+ 
 +QMAKE_CXXFLAGS += -I/usr/include/oracle/client
---- qtbase-opensource-src-5.3.0/config.tests/unix/oci/oci.pro.orig     2014-05-15 19:12:18.000000000 +0200
-+++ qtbase-opensource-src-5.3.0/config.tests/unix/oci/oci.pro  2014-06-01 13:17:02.585303633 +0200
-@@ -1,3 +1,4 @@
++
+ OTHER_FILES += oci.json
+ 
+ PLUGIN_CLASS_NAME = QOCIDriverPlugin
+--- a/config.tests/unix/oci/oci.pro~   2017-01-18 15:20:58.000000000 +0100
++++ b/config.tests/unix/oci/oci.pro    2017-01-23 22:35:23.760582770 +0100
+@@ -1,2 +1,3 @@
  SOURCES = oci.cpp
  CONFIG -= qt dylib
- LIBS += -lclntsh
 +QMAKE_CXXFLAGS += -I/usr/include/oracle/client