diff options
| author | quininer kel | 2016-07-05 21:58:15 +0800 |
|---|---|---|
| committer | quininer kel | 2016-07-05 21:58:15 +0800 |
| commit | ae687f70c7470a7bf8b7ad098d9df975388e10cc (patch) | |
| tree | a97d72c5d7409b5cff68d31f0f113ee31ebeab40 | |
| parent | f98605d0e35a20db4a7d501c345beec0415167ef (diff) | |
| download | aur-ae687f70c7470a7bf8b7ad098d9df975388e10cc.tar.gz | |
version update
| -rw-r--r-- | .SRCINFO | 10 | ||||
| -rw-r--r-- | PKGBUILD | 11 | ||||
| -rw-r--r-- | patch-isnan.patch | 12 |
3 files changed, 8 insertions, 25 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Thu Mar 24 08:20:22 UTC 2016 +# Tue Jul 5 13:58:13 UTC 2016 pkgbase = xournalpp-git pkgdesc = C++ re-write of tablet notetaking app Xournal - GIT development branch - pkgver = 1.0.0.317.g283273c + pkgver = 1.0.0.328.gbb3c205 pkgrel = 1 url = https://github.com/xournalpp/xournalpp install = xournalpp.install @@ -21,17 +21,15 @@ pkgbase = xournalpp-git depends = glibmm depends = texlive-bin depends = desktop-file-utils - provides = xournal=1.0.0.317.g283273c - provides = xournal-dmgerman=1.0.0.317.g283273c xournalpp=1.0.0.317.g283273c + provides = xournal=1.0.0.328.gbb3c205 + provides = xournal-dmgerman=1.0.0.328.gbb3c205 xournalpp=1.0.0.328.gbb3c205 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 - source = patch-isnan.patch sha256sums = SKIP - sha256sums = 825b7aeb4c30805324062e3e13759bf9a4f7b59f25d0df0b2f266c2a55e4a41a pkgname = xournalpp-git @@ -3,7 +3,7 @@ _pkgname="xournalpp" pkgname="${_pkgname}-git" -pkgver=1.0.0.317.g283273c +pkgver=1.0.0.328.gbb3c205 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" "patch-isnan.patch") -sha256sums=('SKIP' '825b7aeb4c30805324062e3e13759bf9a4f7b59f25d0df0b2f266c2a55e4a41a') +source=("${_pkgname}::git+https://github.com/xournalpp/xournalpp.git#branch=development") +sha256sums=('SKIP') pkgver() { cd "${srcdir}/${_pkgname}/" @@ -33,10 +33,7 @@ prepare() { } build() { - cd "${srcdir}/${_pkgname}" - patch src/control/tools/EditSelectionContents.cpp <../../patch-isnan.patch - - cd build + cd "${srcdir}/${_pkgname}/build" make echo } diff --git a/patch-isnan.patch b/patch-isnan.patch deleted file mode 100644 index 564fd6ac6c18..000000000000 --- a/patch-isnan.patch +++ /dev/null @@ -1,12 +0,0 @@ -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) - { |