[swift] fix building in rawhide

Jan Kaluža jkaluza at fedoraproject.org
Tue Jan 10 08:56:53 UTC 2012


commit 38cb8c14f8b7d6d5504e99b9d5a05f002f026baf
Author: Jan Kaluza <hanzz.k at gmail.com>
Date:   Tue Jan 10 09:52:35 2012 +0100

    fix building in rawhide

 swift-warnings.patch |   15 +++++++++++++++
 swift.spec           |    5 +++++
 2 files changed, 20 insertions(+), 0 deletions(-)
---
diff --git a/swift-warnings.patch b/swift-warnings.patch
new file mode 100644
index 0000000..17eac47
--- /dev/null
+++ b/swift-warnings.patch
@@ -0,0 +1,15 @@
+diff --git a/Swift/QtUI/QtSwift.cpp b/Swift/QtUI/QtSwift.cpp
+index d4c306f..96d30e1 100644
+--- a/Swift/QtUI/QtSwift.cpp
++++ b/Swift/QtUI/QtSwift.cpp
+@@ -93,8 +93,8 @@ QtSwift::QtSwift(const po::variables_map& options) : networkFactories_(&clientMa
+ 		Swift::logging = true;
+ 	}
+ 
+-	tabs_ = options.count("no-tabs") && !(splitter_ > 0) ? NULL : new QtChatTabs();
+-	bool startMinimized = options.count("start-minimized") > 0;
++	tabs_ = options.count("no-tabs") && !(splitter_ != NULL) ? NULL : new QtChatTabs();
++	bool startMinimized = options.count("start-minimized") ? true : false;
+ 	settings_ = new QtSettingsProvider();
+ 	applicationPathProvider_ = new PlatformApplicationPathProvider(SWIFT_APPLICATION_NAME);
+ 	storagesFactory_ = new FileStoragesFactory(applicationPathProvider_->getDataDir());
diff --git a/swift.spec b/swift.spec
index 8ff0dfd..3745144 100644
--- a/swift.spec
+++ b/swift.spec
@@ -16,6 +16,7 @@ Patch0: swift-build.patch
 Patch1: swift-login-crash.patch
 Patch2: swift-vector-refs.patch
 Patch3: swift-moc-boost-join.patch
+Patch4: swift-warnings.patch
 URL: http://swift.im/
 BuildRequires: scons
 BuildRequires: qt-devel
@@ -41,6 +42,7 @@ application.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 # Remove 3rd party libraries.
 find 3rdParty/Boost -delete
@@ -87,6 +89,9 @@ desktop-file-install \
 %{_datadir}/pixmaps/%{name}.xpm
 
 %changelog
+* Tue Jan 10 2012 Jan Kaluza <jkaluza at redhat.com> - 1.0-7
+- fix building in rawhide
+
 * Tue Nov 22 2011 Jan Kaluza <jkaluza at redhat.com> - 1.0-6
 - hack moc-qt4 execution to not parse boost headers
 


More information about the scm-commits mailing list