add support for firebird-3.x
This commit is contained in:
parent
3c0b29765a
commit
06f985eaf7
33
qt5-qtbase-5.7.1-firebird.patch
Normal file
33
qt5-qtbase-5.7.1-firebird.patch
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
diff -up qtbase-opensource-src-5.7.1/config.tests/unix/ibase/ibase.cpp.than qtbase-opensource-src-5.7.1/config.tests/unix/ibase/ibase.cpp
|
||||||
|
--- qtbase-opensource-src-5.7.1/config.tests/unix/ibase/ibase.cpp.than 2016-11-28 11:53:02.621749003 -0500
|
||||||
|
+++ qtbase-opensource-src-5.7.1/config.tests/unix/ibase/ibase.cpp 2016-11-28 11:53:17.072001489 -0500
|
||||||
|
@@ -37,7 +37,7 @@
|
||||||
|
**
|
||||||
|
****************************************************************************/
|
||||||
|
|
||||||
|
-#include <ibase.h>
|
||||||
|
+#include <firebird/ibase.h>
|
||||||
|
|
||||||
|
int main(int, char **)
|
||||||
|
{
|
||||||
|
diff -up qtbase-opensource-src-5.7.1/config.tests/unix/ibase/ibase.pro.than qtbase-opensource-src-5.7.1/config.tests/unix/ibase/ibase.pro
|
||||||
|
--- qtbase-opensource-src-5.7.1/config.tests/unix/ibase/ibase.pro.than 2016-11-29 08:00:35.270039482 -0500
|
||||||
|
+++ qtbase-opensource-src-5.7.1/config.tests/unix/ibase/ibase.pro 2016-11-29 08:00:41.280142713 -0500
|
||||||
|
@@ -1,3 +1,3 @@
|
||||||
|
SOURCES = ibase.cpp
|
||||||
|
CONFIG -= qt dylib
|
||||||
|
-LIBS += -lgds
|
||||||
|
+LIBS += -lfbclient
|
||||||
|
diff -up qtbase-opensource-src-5.7.1/src/plugins/sqldrivers/ibase/ibase.pro.than qtbase-opensource-src-5.7.1/src/plugins/sqldrivers/ibase/ibase.pro
|
||||||
|
diff -up qtbase-opensource-src-5.7.1/src/sql/drivers/ibase/qsql_ibase.pri.than qtbase-opensource-src-5.7.1/src/sql/drivers/ibase/qsql_ibase.pri
|
||||||
|
--- qtbase-opensource-src-5.7.1/src/sql/drivers/ibase/qsql_ibase.pri.than 2016-11-29 08:04:26.344004252 -0500
|
||||||
|
+++ qtbase-opensource-src-5.7.1/src/sql/drivers/ibase/qsql_ibase.pri 2016-11-29 08:04:56.684523066 -0500
|
||||||
|
@@ -2,7 +2,7 @@ HEADERS += $$PWD/qsql_ibase_p.h
|
||||||
|
SOURCES += $$PWD/qsql_ibase.cpp
|
||||||
|
|
||||||
|
unix {
|
||||||
|
- !contains(LIBS, .*gds.*):!contains(LIBS, .*libfb.*):LIBS += -lgds
|
||||||
|
+ !contains(LIBS, .*gds.*):!contains(LIBS, .*libfb.*):LIBS += -lfbclient
|
||||||
|
} else {
|
||||||
|
!contains(LIBS, .*gds.*):!contains(LIBS, .*fbclient.*) {
|
||||||
|
LIBS += -lgds32_ms
|
@ -27,6 +27,7 @@
|
|||||||
# set to 1 for openssl-1.1.x support
|
# set to 1 for openssl-1.1.x support
|
||||||
%if 0%{?fedora} > 25 || 0%{?rhel} > 7
|
%if 0%{?fedora} > 25 || 0%{?rhel} > 7
|
||||||
%global openssl11 1
|
%global openssl11 1
|
||||||
|
%global firebird3x 1
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if 0%{?fedora} > 21
|
%if 0%{?fedora} > 21
|
||||||
@ -112,6 +113,9 @@ Patch62: qt5-qtbase-5.7.1-libpng.patch
|
|||||||
# https://github.com/patch-exchange/openssl-1.1-transition/blob/master/qt5-qtbase/qtbase-5.7.0-openssl-1.1.patch
|
# https://github.com/patch-exchange/openssl-1.1-transition/blob/master/qt5-qtbase/qtbase-5.7.0-openssl-1.1.patch
|
||||||
Patch63: qt5-qtbase-5.7.1-openssl11.patch
|
Patch63: qt5-qtbase-5.7.1-openssl11.patch
|
||||||
|
|
||||||
|
# support firebird version 3.x
|
||||||
|
Patch64: qt5-qtbase-5.7.1-firebird.patch
|
||||||
|
|
||||||
## upstream patches
|
## upstream patches
|
||||||
|
|
||||||
# Do not check any files in %%{_qt5_plugindir}/platformthemes/ for requires.
|
# Do not check any files in %%{_qt5_plugindir}/platformthemes/ for requires.
|
||||||
@ -345,10 +349,12 @@ Qt5 libraries used for drawing widgets and OpenGL items.
|
|||||||
%patch54 -p1 -b .arm
|
%patch54 -p1 -b .arm
|
||||||
%patch61 -p1 -b .qt5-qtbase-cxxflag
|
%patch61 -p1 -b .qt5-qtbase-cxxflag
|
||||||
%patch62 -p1 -b .libpng
|
%patch62 -p1 -b .libpng
|
||||||
|
|
||||||
%if 0%{?openssl11}
|
%if 0%{?openssl11}
|
||||||
%patch63 -p1 -b .openssl11
|
%patch63 -p1 -b .openssl11
|
||||||
%endif
|
%endif
|
||||||
|
%if 0%{?firebird3x}
|
||||||
|
%patch64 -p1 -b .firebird
|
||||||
|
%endif
|
||||||
|
|
||||||
%if 0%{?inject_optflags}
|
%if 0%{?inject_optflags}
|
||||||
## adjust $RPM_OPT_FLAGS
|
## adjust $RPM_OPT_FLAGS
|
||||||
@ -949,6 +955,7 @@ fi
|
|||||||
%changelog
|
%changelog
|
||||||
* Mon Nov 28 2016 Than Ngo <than@redhat.com> - 5.7.1-3
|
* Mon Nov 28 2016 Than Ngo <than@redhat.com> - 5.7.1-3
|
||||||
- add condition for rhel
|
- add condition for rhel
|
||||||
|
- add support for firebird-3.x
|
||||||
|
|
||||||
* Thu Nov 24 2016 Than Ngo <than@redhat.com> - 5.7.1-2
|
* Thu Nov 24 2016 Than Ngo <than@redhat.com> - 5.7.1-2
|
||||||
- adapted the berolinux's patch for new openssl-1.1.x
|
- adapted the berolinux's patch for new openssl-1.1.x
|
||||||
|
Loading…
Reference in New Issue
Block a user