summaryrefslogtreecommitdiff
path: root/debian/patches/02-prevent-unused-but-set-variable-ftbfs.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches/02-prevent-unused-but-set-variable-ftbfs.patch')
-rw-r--r--debian/patches/02-prevent-unused-but-set-variable-ftbfs.patch22
1 files changed, 22 insertions, 0 deletions
diff --git a/debian/patches/02-prevent-unused-but-set-variable-ftbfs.patch b/debian/patches/02-prevent-unused-but-set-variable-ftbfs.patch
new file mode 100644
index 0000000..d7354d0
--- /dev/null
+++ b/debian/patches/02-prevent-unused-but-set-variable-ftbfs.patch
@@ -0,0 +1,22 @@
+Description: Prevents gcc 4.6 FTBFS (do not create a variable that is never used).
+ The relevant Bibletime upstream git log entry is:
+ commit 984d9f41bdb7efb9477a706fb1f524b2fbc9c54b
+ Author: Gary Holmlund <gary.holmlund@gmail.com>
+ Date: Mon May 16 22:05:02 2011 -0700
+ Fix compile error on Fedora 15
+Origin: upstream, https://gitorious.org/bibletime/bibletime/commit/984d9f41bdb7efb9477a706fb1f524b2fbc9c54b
+Author: Gary Holmlund <gary.holmlund@gmail.com>
+
+Index: debian/src/frontend/keychooser/ckeychooserwidget.cpp
+===================================================================
+--- debian.orig/src/frontend/keychooser/ckeychooserwidget.cpp 2011-07-10 14:10:48.000000000 -0700
++++ debian/src/frontend/keychooser/ckeychooserwidget.cpp 2011-07-10 14:11:20.000000000 -0700
+@@ -180,7 +180,7 @@
+ emit changed(m_comboBox->currentIndex());
+ }
+
+- const QSize dummySize = m_comboBox->sizeHint(); //without this function call the combo box won't be properly sized!
++ m_comboBox->sizeHint(); //without this function call the combo box won't be properly sized!
+ //DON'T REMOVE OR MOVE THE show()! Otherwise QComboBox's sizeHint() function won't work properly!
+ m_comboBox->show();
+