patch isnan

3 files changed, 34 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1d5c23d09a66..b23bfb4dcc80 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Thu Mar 24 08:20:22 UTC 2016
 pkgbase = xournalpp-git
 	pkgdesc = C++ re-write of tablet notetaking app Xournal - GIT development branch
-	pkgver = 1.0.0.307.gd6eb675
+	pkgver = 1.0.0.317.g283273c
 	pkgrel = 1
 	url = https://github.com/xournalpp/xournalpp
 	install = xournalpp.install
@@ -19,15 +21,17 @@ pkgbase = xournalpp-git
 	depends = glibmm
 	depends = texlive-bin
 	depends = desktop-file-utils
-	provides = xournal=1.0.0.307.gd6eb675
-	provides = xournal-dmgerman=1.0.0.307.gd6eb675 xournalpp=1.0.0.307.gd6eb675
+	provides = xournal=1.0.0.317.g283273c
+	provides = xournal-dmgerman=1.0.0.317.g283273c xournalpp=1.0.0.317.g283273c
 	conflicts = xournal
 	conflicts = xournalpp
 	conflicts = xournal-dmgerman
 	conflicts = xournal-image-patched
 	conflicts = xournalpp-svn
 	source = xournalpp::git+https://github.com/xournalpp/xournalpp.git#branch=development
-	sha1sums = SKIP
+	source = patch-isnan.patch
+	sha256sums = SKIP
+	sha256sums = 825b7aeb4c30805324062e3e13759bf9a4f7b59f25d0df0b2f266c2a55e4a41a
 
 pkgname = xournalpp-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 9fb426495049..61a0e352ba59 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 _pkgname="xournalpp"
 pkgname="${_pkgname}-git"
 
-pkgver=1.0.0.307.gd6eb675
+pkgver=1.0.0.317.g283273c
 pkgrel=1
 pkgdesc="C++ re-write of tablet notetaking app Xournal - GIT development branch"
 arch=('i686' 'x86_64')
@@ -14,8 +14,8 @@ depends=('gtk2' 'boost-libs' 'glib2' 'libglade' 'poppler-glib' 'glibmm' 'texlive
 provides=("xournal=${pkgver}" "xournal-dmgerman=${pkgver} xournalpp=${pkgver}")
 conflicts=('xournal' 'xournalpp' 'xournal-dmgerman' 'xournal-image-patched' 'xournalpp-svn')
 install="xournalpp.install"
-source=("${_pkgname}::git+https://github.com/xournalpp/xournalpp.git#branch=development")
-sha1sums=('SKIP')
+source=("${_pkgname}::git+https://github.com/xournalpp/xournalpp.git#branch=development" "patch-isnan.patch")
+sha256sums=('SKIP' '825b7aeb4c30805324062e3e13759bf9a4f7b59f25d0df0b2f266c2a55e4a41a')
 
 pkgver() {
 	cd "${srcdir}/${_pkgname}/"
@@ -24,39 +24,41 @@ pkgver() {
 
 prepare() {
 	cd "${srcdir}/${_pkgname}/"
-	
+
 	rm -rf "${srcdir}/${_pkgname}/build" || true
 	mkdir -p "${srcdir}/${_pkgname}/build"
 	cd "${srcdir}/${_pkgname}/build"
-	
+
 	cmake -DENABLE_OS="OFF" -DENABLE_MATHTEX="ON" -DCMAKE_INSTALL_PREFIX="/usr/" ..
 }
 
 build() {
-	cd "${srcdir}/${_pkgname}/build"
-	
+	cd "${srcdir}/${_pkgname}"
+	patch src/control/tools/EditSelectionContents.cpp <../../patch-isnan.patch
+
+	cd build
 	make
 	echo
 }
 
 package() {
 	cd "${srcdir}/${_pkgname}/build"
-	
+
 	# sed 's|/usr/local|/usr|g' -i "${srcdir}/${_pkgname}/build/cmake_install.cmake" || true
 	make DESTDIR="${pkgdir}/" install
 	echo
-	
+
 	mkdir -p "${pkgdir}/usr/share/icons/hicolor/scalable/apps"
 	mkdir -p "${pkgdir}/usr/share/icons/hicolor/scalable/mimetypes"
-	
+
 	install -D -m0644 "${srcdir}/${_pkgname}/ui/pixmaps/xournalpp.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/xournalpp.svg"
 	install -D -m0644 "${srcdir}/${_pkgname}/ui/pixmaps/xoj.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/mimetypes/xoj.svg"
 	ln -s "/usr/share/icons/hicolor/scalable/mimetypes/xoj.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/mimetypes/gnome-mime-application-x-xoj.svg"
-	
+
 	mkdir -p "${pkgdir}/usr/share/mime/packages"
 	mkdir -p "${pkgdir}/usr/share/applications"
 	mkdir -p "${pkgdir}/usr/share/mimelnk/application"
-	
+
 	install -D -m0644 "${srcdir}/${_pkgname}/desktop/xournal.xml" "${pkgdir}/usr/share/mime/packages"
 	install -D -m0644 "${srcdir}/${_pkgname}/desktop/xournalpp.desktop" "${pkgdir}/usr/share/applications"
 	install -D -m0644 "${srcdir}/${_pkgname}/desktop/x-xoj.desktop" "${pkgdir}/usr/share/mimelnk/application"
diff --git a/patch-isnan.patch b/patch-isnan.patch
new file mode 100644
index 000000000000..564fd6ac6c18
--- /dev/null
+++ b/patch-isnan.patch
@@ -0,0 +1,12 @@
+diff --git a/src/control/tools/EditSelectionContents.cpp b/src/control/tools/EditSelectionContents.cpp
+--- a/src/control/tools/EditSelectionContents.cpp
++++ b/src/control/tools/EditSelectionContents.cpp
+@@ -26,6 +26,8 @@
+ 
+ #include <math.h>
+ 
++#define isnan std::isnan
++
+ EditSelectionContents::EditSelectionContents(double x, double y, double width, double height,
+ 											 PageRef sourcePage, Layer* sourceLayer, PageView* sourceView)
+ {