From 6938ae2dfde578e3980d077adefb86a4bdbd9df1 Mon Sep 17 00:00:00 2001
From: Don Bright <hugh.m.bright@gmail.com>
Date: Tue, 17 Dec 2013 17:08:36 -0600
Subject: prevent cgal::orientation_2 crash on polygons that fail is_simple_2
 test


diff --git a/src/dxftess-cgal.cc b/src/dxftess-cgal.cc
index 14f1204..5f95e6a 100644
--- a/src/dxftess-cgal.cc
+++ b/src/dxftess-cgal.cc
@@ -471,7 +471,7 @@ bool triangulate_polygon( const PolySet::Polygon &pgon, std::vector<PolySet::Pol
 			triangles.push_back( pgon );
 		}
 	}
-	} catch (const CGAL::Assertion_exception &e) {
+	} catch (const CGAL::Failure_exception &e) {
 		PRINTB("CGAL error in dxftess triangulate_polygon: %s", e.what());
 		err = true;
 	}
-- 
cgit v0.10.1


From 90edc3b5f7b21fc3a3317dfad975ac83ed74262e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Tue, 24 Dec 2013 02:11:20 +0100
Subject: `make install` installs manpage and appdata file


diff --git a/openscad.pro b/openscad.pro
index ec5af20..6d8282a 100644
--- a/openscad.pro
+++ b/openscad.pro
@@ -416,10 +416,18 @@ applications.path = $$PREFIX/share/applications
 applications.files = icons/openscad.desktop
 INSTALLS += applications
 
+appdata.path = $$PREFIX/share/appdata
+appdata.files = openscad.appdata.xml
+INSTALLS += appdata
+
 icons.path = $$PREFIX/share/pixmaps
 icons.files = icons/openscad.png
 INSTALLS += icons
 
+man.path = $$PREFIX/share/man/man1
+man.files = doc/openscad.1
+INSTALLS += man
+
 CONFIG(winconsole) {
   include(winconsole.pri)
 }
-- 
cgit v0.10.1


From 107d19e93e9e12bfa3bf1d480b311ed718004b68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Tue, 24 Dec 2013 02:37:43 +0100
Subject: AppData: Do not have 2 default screenshots


diff --git a/openscad.appdata.xml b/openscad.appdata.xml
index 8334d37..0378d15 100644
--- a/openscad.appdata.xml
+++ b/openscad.appdata.xml
@@ -10,7 +10,7 @@
  </description>
  <screenshots>
   <screenshot type="default" width="800" height="437">http://www.openscad.org/images/appdata-screenshot-1.png</screenshot>
-  <screenshot type="default" width="800" height="465">http://www.openscad.org/images/appdata-screenshot-2.png</screenshot>
+  <screenshot width="800" height="465">http://www.openscad.org/images/appdata-screenshot-2.png</screenshot>
  </screenshots>
  <url type="homepage">http://www.openscad.org/</url>
 </application>
-- 
cgit v0.10.1