diff --git a/qgis-2.12.0-arm.patch b/qgis-2.12.0-arm.patch new file mode 100644 index 0000000..47e315e --- /dev/null +++ b/qgis-2.12.0-arm.patch @@ -0,0 +1,13 @@ +diff --git a/src/app/qgswelcomepageitemsmodel.cpp b/src/app/qgswelcomepageitemsmodel.cpp +index 4a42a6d..5a4b975 100644 +--- a/src/app/qgswelcomepageitemsmodel.cpp ++++ b/src/app/qgswelcomepageitemsmodel.cpp +@@ -114,7 +114,7 @@ QSize QgsWelcomePageItemDelegate::sizeHint( const QStyleOptionViewItem & option, + index.data( QgsWelcomePageItemsModel::CrsRole ).toString() ) ); + doc.setTextWidth( width - ( !icon.isNull() ? icon.width() + 35 : 35 ) ); + +- return QSize( width, qMax( doc.size().height() + 10, ( double )icon.height() ) + 20 ); ++ return QSize( width, qMax( ( double ) doc.size().height() + 10, ( double )icon.height() ) + 20 ); + } + + QgsWelcomePageItemsModel::QgsWelcomePageItemsModel( QObject* parent ) diff --git a/qgis.spec b/qgis.spec index 252a861..e617e72 100644 --- a/qgis.spec +++ b/qgis.spec @@ -13,7 +13,7 @@ Name: qgis Version: 2.12.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A user friendly Open Source Geographic Information System Group: Applications/Engineering @@ -33,6 +33,9 @@ Source4: %{name}-server-README.fedora # Based on debian/qgis.xml but excluding already defined or proprietary types Source5: %{name}-mime.xml +# https://github.com/qgis/QGIS/pull/2401 +Patch0: qgis-2.12.0-arm.patch + # Some plug-ins need Pyspatialite (bundled) # The license is not totally clear, see: # http://code.google.com/p/pyspatialite/issues/detail?id=3 @@ -173,6 +176,7 @@ Please refer to %{name}-server-README.fedora for details! %prep %setup -q +%patch0 -p1 # Remove executable permissions from source code files find . \( -name "*.cpp" -o -name "*.h" \) -type f -perm /111 -execdir chmod -x {} \+ @@ -398,6 +402,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Mon Oct 26 2015 Volker Froehlich - 2.12.0-2 +- Fix ARM build + * Sat Oct 24 2015 Volker Froehlich - 2.12.0-1 - New upstream release - Add qca BR