add Firebird patch to all versions back to 5.9.0

hmoffatt · hmoffatt · commit cbfa33bccac2 · 2019-10-03T12:18:20.000+10:00
diff --git a/buildconfig/configure-5.10.0.sh b/buildconfig/configure-5.10.0.sh
@@ -1,2 +1,3 @@
 #!/bin/sh
+sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json
 ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb
diff --git a/buildconfig/configure-5.10.1.sh b/buildconfig/configure-5.10.1.sh
@@ -1,2 +1,3 @@
 #!/bin/sh
+sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json
 ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb
diff --git a/buildconfig/configure-5.11.0.sh b/buildconfig/configure-5.11.0.sh
@@ -1,2 +1,3 @@
 #!/bin/sh
+sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json
 ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb
diff --git a/buildconfig/configure-5.11.1.sh b/buildconfig/configure-5.11.1.sh
@@ -1,2 +1,3 @@
 #!/bin/sh
+sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json
 ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb
diff --git a/buildconfig/configure-5.11.2.sh b/buildconfig/configure-5.11.2.sh
@@ -1,2 +1,3 @@
 #!/bin/sh
+sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json
 ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb
diff --git a/buildconfig/configure-5.11.3.sh b/buildconfig/configure-5.11.3.sh
@@ -1,2 +1,3 @@
 #!/bin/sh
+sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json
 ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb
diff --git a/buildconfig/configure-5.12.0.sh b/buildconfig/configure-5.12.0.sh
@@ -1,2 +1,3 @@
 #!/bin/sh
+sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json
 ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb
diff --git a/buildconfig/configure-5.12.1.sh b/buildconfig/configure-5.12.1.sh
@@ -1,2 +1,3 @@
 #!/bin/sh
+sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json
 ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests
diff --git a/buildconfig/configure-5.12.2.sh b/buildconfig/configure-5.12.2.sh
@@ -1,2 +1,3 @@
 #!/bin/sh
+sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json
 ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests
diff --git a/buildconfig/configure-5.12.3.sh b/buildconfig/configure-5.12.3.sh
@@ -1,2 +1,3 @@
 #!/bin/sh
+sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json
 ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests
diff --git a/buildconfig/configure-5.12.4.sh b/buildconfig/configure-5.12.4.sh
@@ -1,2 +1,3 @@
 #!/bin/sh
+sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json
 ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests
diff --git a/buildconfig/configure-5.12.5.sh b/buildconfig/configure-5.12.5.sh
@@ -1,5 +1,3 @@
 #!/bin/sh
-# Patch Qt to find Firebird library
 sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json
-
-../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests
+../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests
diff --git a/buildconfig/configure-5.13.0.sh b/buildconfig/configure-5.13.0.sh
@@ -1,2 +1,3 @@
 #!/bin/sh
+sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json
 ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests
diff --git a/buildconfig/configure-5.13.1.sh b/buildconfig/configure-5.13.1.sh
@@ -1,5 +1,3 @@
 #!/bin/sh
-# Patch Qt to find Firebird library
 sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json
-
 ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests
diff --git a/buildconfig/configure-5.9.0.sh b/buildconfig/configure-5.9.0.sh
@@ -13,6 +13,7 @@ make -j$CORE_COUNT > /dev/null 2>&1 || make -j$CORE_COUNT
 make test > /dev/null 2>&1 || make test
 make install > /dev/null 2>&1 || make install
 cd ..
+sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json
 OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib
 mkdir /opt/extra-dependencies/opt
 cp -r /opt/openssl_build_stable /opt/extra-dependencies/opt
diff --git a/buildconfig/configure-5.9.1.sh b/buildconfig/configure-5.9.1.sh
@@ -13,6 +13,7 @@ make -j$CORE_COUNT > /dev/null 2>&1 || make -j$CORE_COUNT
 make test > /dev/null 2>&1 || make test
 make install > /dev/null 2>&1 || make install
 cd ..
+sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json
 OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib
 mkdir /opt/extra-dependencies/opt
 cp -r /opt/openssl_build_stable /opt/extra-dependencies/opt
diff --git a/buildconfig/configure-5.9.2.sh b/buildconfig/configure-5.9.2.sh
@@ -13,6 +13,7 @@ make -j$CORE_COUNT > /dev/null 2>&1 || make -j$CORE_COUNT
 make test > /dev/null 2>&1 || make test
 make install > /dev/null 2>&1 || make install
 cd ..
+sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json
 OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib
 mkdir /opt/extra-dependencies/opt
 cp -r /opt/openssl_build_stable /opt/extra-dependencies/opt
diff --git a/buildconfig/configure-5.9.3.sh b/buildconfig/configure-5.9.3.sh
@@ -13,6 +13,7 @@ make -j$CORE_COUNT > /dev/null 2>&1 || make -j$CORE_COUNT
 make test > /dev/null 2>&1 || make test
 make install > /dev/null 2>&1 || make install
 cd ..
+sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json
 OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib
 mkdir /opt/extra-dependencies/opt
 cp -r /opt/openssl_build_stable /opt/extra-dependencies/opt
diff --git a/buildconfig/configure-5.9.4.sh b/buildconfig/configure-5.9.4.sh
@@ -13,6 +13,7 @@ make -j$CORE_COUNT > /dev/null 2>&1 || make -j$CORE_COUNT
 make test > /dev/null 2>&1 || make test
 make install > /dev/null 2>&1 || make install
 cd ..
+sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json
 OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib
 mkdir /opt/extra-dependencies/opt
 cp -r /opt/openssl_build_stable /opt/extra-dependencies/opt
diff --git a/buildconfig/configure-5.9.5.sh b/buildconfig/configure-5.9.5.sh
@@ -13,6 +13,7 @@ make -j$CORE_COUNT > /dev/null 2>&1 || make -j$CORE_COUNT
 make test > /dev/null 2>&1 || make test
 make install > /dev/null 2>&1 || make install
 cd ..
+sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json
 OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib
 mkdir /opt/extra-dependencies/opt
 cp -r /opt/openssl_build_stable /opt/extra-dependencies/opt
diff --git a/buildconfig/configure-5.9.6.sh b/buildconfig/configure-5.9.6.sh
@@ -13,6 +13,7 @@ make -j$CORE_COUNT > /dev/null 2>&1 || make -j$CORE_COUNT
 make test > /dev/null 2>&1 || make test
 make install > /dev/null 2>&1 || make install
 cd ..
+sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json
 OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib
 mkdir /opt/extra-dependencies/opt
 cp -r /opt/openssl_build_stable /opt/extra-dependencies/opt
diff --git a/buildconfig/configure-5.9.7.sh b/buildconfig/configure-5.9.7.sh
@@ -13,6 +13,7 @@ make -j$CORE_COUNT > /dev/null 2>&1 || make -j$CORE_COUNT
 make test > /dev/null 2>&1 || make test
 make install > /dev/null 2>&1 || make install
 cd ..
+sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json
 OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib
 mkdir /opt/extra-dependencies/opt
 cp -r /opt/openssl_build_stable /opt/extra-dependencies/opt
diff --git a/buildconfig/configure-5.9.8.sh b/buildconfig/configure-5.9.8.sh
@@ -13,6 +13,7 @@ make -j$CORE_COUNT > /dev/null 2>&1 || make -j$CORE_COUNT
 make test > /dev/null 2>&1 || make test
 make install > /dev/null 2>&1 || make install
 cd ..
+sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json
 OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib
 mkdir /opt/extra-dependencies/opt
 cp -r /opt/openssl_build_stable /opt/extra-dependencies/opt

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`#!/bin/sh`
	`2`	`+sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json`
`2`	`3`	`../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb`