Attachment 593917 Details for Bug 834793 – fedpkg patch to build on ARM

[patch] fedpkg patch to build on ARM

0001-Patch-to-build-on-ARM.patch (text/plain), 3.85 KB, created by Chris Tyler on 2012-06-23 16:03:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Tyler

Created: 2012-06-23 16:03:18 UTC

Size: 3.85 KB

patch

obsolete

>From 4c0a4abc6b720135aae61dd12179b07fc9d530a9 Mon Sep 17 00:00:00 2001
>From: Chris Tyler <chris@tylers.info>
>Date: Sat, 23 Jun 2012 11:49:10 -0400
>Subject: [PATCH] Patch to build on ARM
>
>---
> fritzing-casts-for-arm.patch |   56 ++++++++++++++++++++++++++++++++++++++++++
> fritzing.spec                |    9 ++++++-
> 2 files changed, 64 insertions(+), 1 deletions(-)
> create mode 100644 fritzing-casts-for-arm.patch
>
>diff --git a/fritzing-casts-for-arm.patch b/fritzing-casts-for-arm.patch
>new file mode 100644
>index 0000000..062903f
>--- /dev/null
>+++ b/fritzing-casts-for-arm.patch
>@@ -0,0 +1,56 @@
>+From a572302d271bd13411a6ab2c8ebc561559c4da67 Mon Sep 17 00:00:00 2001
>+From: Chris Tyler <chris@tylers.info>
>+Date: Sat, 23 Jun 2012 11:20:11 -0400
>+Subject: [PATCH] Added casts for ARM
>+
>+---
>+ src/autoroute/cmrouter/cmrouter.cpp |   16 ++++++++--------
>+ src/svg/gerbergenerator.cpp         |    4 ++--
>+ 2 files changed, 10 insertions(+), 10 deletions(-)
>+
>+diff --git a/src/autoroute/cmrouter/cmrouter.cpp b/src/autoroute/cmrouter/cmrouter.cpp
>+index 350534f..2236cf1 100644
>+--- a/src/autoroute/cmrouter/cmrouter.cpp
>++++ b/src/autoroute/cmrouter/cmrouter.cpp
>+@@ -1769,14 +1769,14 @@ void CMRouter::hookUpWires(QList<PathUnit *> & fullPath, QList<Wire *> & wires)
>+ 		viewLayerIDs.insert(w->viewLayerID());
>+ 		QPointF p1 = w->pos();
>+ 		QPointF p2 = w->line().p2() + p1;
>+-		l = qMin(p1.x(), l);
>+-		r = qMax(p1.x(), r);
>+-		l = qMin(p2.x(), l);
>+-		r = qMax(p2.x(), r);
>+-		t = qMin(p1.y(), t);
>+-		b = qMax(p1.y(), b);
>+-		t = qMin(p2.y(), t);
>+-		b = qMax(p2.y(), b);
>++		l = qMin(p1.x(),(qreal) l);
>++		r = qMax(p1.x(),(qreal) r);
>++		l = qMin(p2.x(),(qreal) l);
>++		r = qMax(p2.x(),(qreal) r);
>++		t = qMin(p1.y(),(qreal) t);
>++		b = qMax(p1.y(),(qreal) b);
>++		t = qMin(p2.y(),(qreal) t);
>++		b = qMax(p2.y(),(qreal) b);
>+ 	}
>+ 
>+ 	TileRect searchRect;
>+diff --git a/src/svg/gerbergenerator.cpp b/src/svg/gerbergenerator.cpp
>+index 4d60459..92ea871 100644
>+--- a/src/svg/gerbergenerator.cpp
>++++ b/src/svg/gerbergenerator.cpp
>+@@ -462,9 +462,9 @@ QString GerberGenerator::clipToBoard(QString svgString, QRectF & boardRect, cons
>+ 			QRectF mBounds = m.mapRect(bounds);
>+ 
>+ 
>+-			int x1 = qFloor(qMax(0.0, mBounds.left() - sourceRes.left()));
>++			int x1 = qFloor(qMax((qreal) 0.0, mBounds.left() - sourceRes.left()));
>+ 			int x2 = qCeil(qMin(sourceRes.width(), mBounds.right() - sourceRes.left()));
>+-			int y1 = qFloor(qMax(0.0, mBounds.top() - sourceRes.top()));
>++			int y1 = qFloor(qMax((qreal) 0.0, mBounds.top() - sourceRes.top()));
>+ 			int y2 = qCeil(qMin(sourceRes.height(), mBounds.bottom() - sourceRes.top()));
>+ 			
>+ 			if (pixelsCollide(&another, clipImage, x1, y1, x2, y2)) {
>+-- 
>+1.7.7.6
>+
>diff --git a/fritzing.spec b/fritzing.spec
>index 5a1397d..5de9df3 100644
>--- a/fritzing.spec
>+++ b/fritzing.spec
>@@ -1,6 +1,6 @@
> Name:           fritzing
> Version:        0.7.1b
>-Release:        1%{?dist}
>+Release:        2%{?dist}
> Summary:        Electronic Design Automation software; from prototype to product
> 
> Group:          Applications/Engineering
>@@ -13,6 +13,7 @@ Source1:        fritzing.desktop
> Patch0:         fritzing-use-external-libs.patch
> # Fedora-specific patch to disable internal auto-updating feature.
> Patch1:         fritzing-disable-autoupdate.patch
>+Patch2:         fritzing-casts-for-arm.patch
> BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> 
> BuildRequires:  qt4-devel qt-webkit-devel desktop-file-utils boost-devel quazip-devel minizip-devel
>@@ -38,6 +39,9 @@ rm -rf src/lib/quazip
> 
> %patch0 -p1
> %patch1 -p1
>+%ifarch %{arm}
>+%patch2 -p1
>+%endif
> 
> %build
> CXXFLAGS="%{optflags}"
>@@ -72,6 +76,9 @@ rm -rf %{buildroot}
> %{_mandir}/man?/*
> 
> %changelog
>+* Fri Jun 22 2012 Chris Tyler <chris@tylers.info> - 0.7.1b-2
>+- Added patch to build on ARM
>+
> * Sat Mar 10 2012 Ed Marshall <esm@logic.net> - 0.7.1b-1
> - Updated to 0.7.1b release.
> 
>-- 
>1.7.7.6
>

Actions: View | Diff

Attachments on bug 834793: 593917