Add upstream patch for Qt5 QFileDialog usage
This commit is contained in:
parent
4f3147d1f4
commit
3c531e141a
32
cmake.git-48624b3c.patch
Normal file
32
cmake.git-48624b3c.patch
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
From 48624b3cb85a6e1854eff0ef45996ef75b5aa9e9 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Clinton Stimpson <clinton@elemtech.com>
|
||||||
|
Date: Thu, 22 Sep 2016 13:13:38 -0600
|
||||||
|
Subject: [PATCH] cmake-gui: Do not remove library paths for Qt5 plugins.
|
||||||
|
|
||||||
|
Not removing library paths is necessary for QFileDialog to function correctly
|
||||||
|
on Linux when using Qt5.
|
||||||
|
---
|
||||||
|
Source/QtDialog/CMakeSetup.cxx | 2 ++
|
||||||
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/Source/QtDialog/CMakeSetup.cxx b/Source/QtDialog/CMakeSetup.cxx
|
||||||
|
index c849d52..61c4d7b 100644
|
||||||
|
--- a/Source/QtDialog/CMakeSetup.cxx
|
||||||
|
+++ b/Source/QtDialog/CMakeSetup.cxx
|
||||||
|
@@ -101,11 +101,13 @@ int main(int argc, char** argv)
|
||||||
|
QTextCodec::setCodecForLocale(utf8_codec);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+#if QT_VERSION < 0x050000
|
||||||
|
// clean out standard Qt paths for plugins, which we don't use anyway
|
||||||
|
// when creating Mac bundles, it potentially causes problems
|
||||||
|
foreach (QString p, QApplication::libraryPaths()) {
|
||||||
|
QApplication::removeLibraryPath(p);
|
||||||
|
}
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
// tell the cmake library where cmake is
|
||||||
|
QDir cmExecDir(QApplication::applicationDirPath());
|
||||||
|
--
|
||||||
|
1.7.10.4
|
||||||
|
|
@ -60,6 +60,9 @@ Source2: macros.%{name}
|
|||||||
Source3: %{name}.attr
|
Source3: %{name}.attr
|
||||||
Source4: %{name}.prov
|
Source4: %{name}.prov
|
||||||
|
|
||||||
|
# Upstream patch to fix cmake-gui with Qt5
|
||||||
|
# https://cmake.org/gitweb?p=cmake.git;a=commit;h=48624b3c
|
||||||
|
Patch0: cmake.git-48624b3c.patch
|
||||||
# Patch to fix RindRuby vendor settings
|
# Patch to fix RindRuby vendor settings
|
||||||
# http://public.kitware.com/Bug/view.php?id=12965
|
# http://public.kitware.com/Bug/view.php?id=12965
|
||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=822796
|
# https://bugzilla.redhat.com/show_bug.cgi?id=822796
|
||||||
@ -166,6 +169,7 @@ The %{name}-gui package contains the Qt based GUI for %{name}.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -qn %{orig_name}-%{version}%{?rcver:-%rcver}
|
%setup -qn %{orig_name}-%{version}%{?rcver:-%rcver}
|
||||||
|
%patch0 -p1
|
||||||
|
|
||||||
# Apply renaming on EPEL before all other patches
|
# Apply renaming on EPEL before all other patches
|
||||||
%if 0%{?name_suffix:1}
|
%if 0%{?name_suffix:1}
|
||||||
@ -394,6 +398,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Sep 26 2016 Orion Poplawski <orion@cora.nwra.com> - 3.6.2-4
|
||||||
|
- Add upstream patch for Qt5 QFileDialog usage
|
||||||
|
|
||||||
* Mon Sep 26 2016 Than Ngo <than@redhat.com> - 3.6.2-3
|
* Mon Sep 26 2016 Than Ngo <than@redhat.com> - 3.6.2-3
|
||||||
- Add aarch32 to libarch for arm platform
|
- Add aarch32 to libarch for arm platform
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user