[librecad/el6] fix stable_sort
Tom Callaway
spot at fedoraproject.org
Wed Jul 9 17:20:35 UTC 2014
commit 946c41c84d7775b924198d682871bb0b2dead9c8
Author: Tom Callaway <spot at fedoraproject.org>
Date: Wed Jul 9 13:20:47 2014 -0400
fix stable_sort
librecad-algorithm-for-stable_sort.patch | 11 +++++++++++
librecad.spec | 5 +++++
2 files changed, 16 insertions(+), 0 deletions(-)
---
diff --git a/librecad-algorithm-for-stable_sort.patch b/librecad-algorithm-for-stable_sort.patch
new file mode 100644
index 0000000..8f8751e
--- /dev/null
+++ b/librecad-algorithm-for-stable_sort.patch
@@ -0,0 +1,11 @@
+diff -up LibreCAD-f442b00591320f226eb1aa563839712accb5d476/librecad/src/lib/engine/rs_layerlist.h.fix LibreCAD-f442b00591320f226eb1aa563839712accb5d476/librecad/src/lib/engine/rs_layerlist.h
+--- LibreCAD-f442b00591320f226eb1aa563839712accb5d476/librecad/src/lib/engine/rs_layerlist.h.fix 2014-07-09 13:19:09.892928816 -0400
++++ LibreCAD-f442b00591320f226eb1aa563839712accb5d476/librecad/src/lib/engine/rs_layerlist.h 2014-07-09 13:19:17.551880681 -0400
+@@ -28,6 +28,7 @@
+ #ifndef RS_LAYERLIST_H
+ #define RS_LAYERLIST_H
+
++#include <algorithm>
+ #include <QList>
+
+ class RS_Layer;
diff --git a/librecad.spec b/librecad.spec
index 1480b22..34f86e0 100644
--- a/librecad.spec
+++ b/librecad.spec
@@ -39,6 +39,7 @@ Patch1: librecad-desktop.patch
Patch2: librecad-install.patch
Patch3: librecad-plugindir.patch
Patch4: librecad-use-system-shapelib.patch
+Patch5: librecad-algorithm-for-stable_sort.patch
BuildRequires: qt4-devel, wqy-microhei-fonts, muParser-devel, freetype-devel, libdxfrw-devel >= 0.5.7-3
BuildRequires: desktop-file-utils, boost-devel, shapelib-devel
Requires: %{name}-fonts = %{version}-%{release}
@@ -97,6 +98,7 @@ Pattern files for LibreCAD.
%patch2 -p1 -b .install
%patch3 -p1
%patch4 -p1 -b .system-shapelib
+%patch5 -p1 -b .algo
sed -i 's|##LIBDIR##|%{_libdir}|g' librecad/src/lib/engine/rs_system.cpp
sed -i 's|$${DXFRW_INCLUDEDIR}|%{dxfrw_includedir}|g' librecad/src/src.pro
@@ -187,6 +189,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
%{_datadir}/%{name}/patterns/
%changelog
+* Wed Jul 9 2014 Tom Callaway <spot at fedoraproject.org> - 2.0.4-2.1
+- fixes for ancient releases
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
More information about the scm-commits
mailing list