From e724321967bac8269b4212250d1a9c11d33a1d8e Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 19 Oct 2017 15:32:02 -0500 Subject: [PATCH 1/2] refresh mariadb patch support (upstreamed version apparently incomplete) --- qt5-qtbase.spec | 7 ++++++- qtbase-mariadb.patch | 21 +++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 qtbase-mariadb.patch diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index f1f365a..bd68f8d 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -55,7 +55,7 @@ BuildRequires: pkgconfig(libsystemd) Name: qt5-qtbase Summary: Qt5 - QtBase components Version: 5.9.2 -Release: 1%{?dist} +Release: 2%{?dist} # See LGPL_EXCEPTIONS.txt, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -108,6 +108,7 @@ Patch64: qt5-qtbase-5.9.1-firebird.patch # fix for new mariadb Patch65: qtbase-opensource-src-5.9.0-mysql.patch +Patch66: qtbase-mariadb.patch ## upstream patches (5.9 branch) @@ -349,6 +350,7 @@ Qt5 libraries used for drawing widgets and OpenGL items. %if 0%{?fedora} > 27 %patch65 -p1 -b .mysql %endif +%patch66 -p1 -b .mariadb %if 0%{?inject_optflags} ## adjust $RPM_OPT_FLAGS @@ -963,6 +965,9 @@ fi %changelog +* Thu Oct 19 2017 Rex Dieter - 5.9.2-2 +- refresh mariadb patch support (upstreamed version apparently incomplete) + * Mon Oct 09 2017 Jan Grulich - 5.9.2-1 - 5.9.2 diff --git a/qtbase-mariadb.patch b/qtbase-mariadb.patch new file mode 100644 index 0000000..84cf11d --- /dev/null +++ b/qtbase-mariadb.patch @@ -0,0 +1,21 @@ +diff -up qtbase-opensource-src-5.9.2/src/plugins/sqldrivers/mysql/qsql_mysql.cpp.rex qtbase-opensource-src-5.9.2/src/plugins/sqldrivers/mysql/qsql_mysql.cpp +--- qtbase-opensource-src-5.9.2/src/plugins/sqldrivers/mysql/qsql_mysql.cpp.rex 2017-10-02 03:43:38.000000000 -0500 ++++ qtbase-opensource-src-5.9.2/src/plugins/sqldrivers/mysql/qsql_mysql.cpp 2017-10-19 14:56:16.752878279 -0500 +@@ -1159,14 +1159,15 @@ static void qLibraryInit() + # endif // MYSQL_VERSION_ID + #endif // Q_NO_MYSQL_EMBEDDED + +-#ifdef MARIADB_BASE_VERSION ++#if defined(MARIADB_BASE_VERSION) || defined(MARIADB_VERSION_ID) + qAddPostRoutine(mysql_server_end); + #endif + } + + static void qLibraryEnd() + { +-#if !defined(MARIADB_BASE_VERSION) ++#if !defined(MARIADB_BASE_VERSION) && !defined(MARIADB_VERSION_ID) ++//#error should not get here on f27+ says rex + # if !defined(Q_NO_MYSQL_EMBEDDED) + # if MYSQL_VERSION_ID > 40000 + # if (MYSQL_VERSION_ID >= 40110 && MYSQL_VERSION_ID < 50000) || MYSQL_VERSION_ID >= 50003 From 16ef8031d10c6abccb36d80652150e3ef83e9143 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 23 Oct 2017 11:24:16 -0500 Subject: [PATCH 2/2] pass QMAKE_*_RELEASE to configure to ensure optflags get used (#1505260) --- qt5-qtbase.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index bd68f8d..e49403b 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -55,7 +55,7 @@ BuildRequires: pkgconfig(libsystemd) Name: qt5-qtbase Summary: Qt5 - QtBase components Version: 5.9.2 -Release: 2%{?dist} +Release: 3%{?dist} # See LGPL_EXCEPTIONS.txt, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -465,7 +465,10 @@ export MAKEFLAGS="%{?_smp_mflags}" %{?xkbcommon} \ -system-zlib \ %{?use_gold_linker} \ - -no-directfb + -no-directfb \ + QMAKE_CFLAGS_RELEASE="${CFLAGS:-$RPM_OPT_FLAGS}" \ + QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS:-$RPM_OPT_FLAGS}" \ + QMAKE_LFLAGS_RELEASE="${LDFLAGS:-$RPM_LD_FLAGS}" %if ! 0%{?inject_optflags} # ensure qmake build using optflags (which can happen if not munging qmake.conf defaults) @@ -965,6 +968,9 @@ fi %changelog +* Mon Oct 23 2017 Rex Dieter - 5.9.2-3 +- pass QMAKE_*_RELEASE to configure to ensure optflags get used (#1505260) + * Thu Oct 19 2017 Rex Dieter - 5.9.2-2 - refresh mariadb patch support (upstreamed version apparently incomplete)