[packages/qt5-qtbase] up to 5.14.2
atler
atler at pld-linux.org
Sat Apr 18 00:23:01 CEST 2020
commit 45baacb43951a73239326f77600a48ec2defc665
Author: Jan Palus <atler at pld-linux.org>
Date: Fri Apr 17 23:25:32 2020 +0200
up to 5.14.2
- remove oracle instantclient patch (dropped from spec in f97107f)
qt5-qtbase.spec | 6 +++---
qtbase-oracle-instantclient.patch | 17 -----------------
2 files changed, 3 insertions(+), 20 deletions(-)
---
diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec
index 6ec7912..6a1d1d7 100644
--- a/qt5-qtbase.spec
+++ b/qt5-qtbase.spec
@@ -65,15 +65,15 @@
Summary: Qt5 - base components
Summary(pl.UTF-8): Biblioteka Qt5 - podstawowe komponenty
Name: qt5-%{orgname}
-Version: 5.14.1
+Version: 5.14.2
Release: 1
# See LGPL_EXCEPTION.txt for exception details
License: LGPL v2 with Digia Qt LGPL Exception v1.1 or GPL v3
Group: X11/Libraries
Source0: http://download.qt.io/official_releases/qt/5.14/%{version}/submodules/%{orgname}-everywhere-src-%{version}.tar.xz
-# Source0-md5: b57ec3276d2c85b00199a1b7e0614528
+# Source0-md5: b6c14e01ff20925305be109785ed4aa4
Source1: http://download.qt.io/official_releases/qt/5.14/%{version}/submodules/qttranslations-everywhere-src-%{version}.tar.xz
-# Source1-md5: ef18bbad424173c3211c2ce0f4074485
+# Source1-md5: bcf8b00e49f4fe4271ff4651bf32aca8
Patch0: %{name}-system_cacerts.patch
URL: http://www.qt.io/
%{?with_directfb:BuildRequires: DirectFB-devel}
diff --git a/qtbase-oracle-instantclient.patch b/qtbase-oracle-instantclient.patch
deleted file mode 100644
index 611379a..0000000
--- a/qtbase-oracle-instantclient.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- 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
-+
- 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
-+QMAKE_CXXFLAGS += -I/usr/include/oracle/client
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/qt5-qtbase.git/commitdiff/45baacb43951a73239326f77600a48ec2defc665
More information about the pld-cvs-commit
mailing list