summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom "Ravi" Hale2020-06-30 11:20:58 +0700
committerTom "Ravi" Hale2020-06-30 11:30:57 +0700
commitd11abfcdd6a1b520746386fd7ac9b6527f320637 (patch)
treecb17cb508da2c073f91cf2ab8d0b746777591d13
parent2946cc93bdf930402438c4710239a0e86c909ea1 (diff)
downloadaur-d11abfcdd6a1b520746386fd7ac9b6527f320637.tar.gz
Update tidy-source-dir-location.patch
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD4
-rw-r--r--tidy-source-dir-location.patch32
3 files changed, 22 insertions, 22 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c1d2a5b6389f..a5d778d84974 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = nixnote2-git
pkgdesc = Evernote clone (formerly Nevernote) - git checkout
- pkgver = 2.1.1.r3.gf5e206dd
+ pkgver = 2.1.6.r1.gaa5cfeb8
pkgrel = 1
url = https://github.com/robert7/nixnote2
arch = x86_64
@@ -15,15 +15,15 @@ pkgbase = nixnote2-git
depends = poppler-qt5
depends = tidy
depends = qt5-webkit
- provides = nixnote=2.1.1
- provides = nixnote2=2.1.1
+ provides = nixnote=2.1.6
+ provides = nixnote2=2.1.6
replaces = nevernote
replaces = nixnote
replaces = nixnote-beta
source = git+https://github.com/robert7/nixnote2.git
source = tidy-source-dir-location.patch
sha256sums = SKIP
- sha256sums = 75410b80f3c06ca61842eade4e2da1fb869a3da7c269116a4b5a7703a196e621
+ sha256sums = 8cb8e5c3d3d320ffb0991d34a5c155b631dd83b9a94d530815da4f92c5ebd5ff
pkgname = nixnote2-git
diff --git a/PKGBUILD b/PKGBUILD
index 045452aa927a..7d33d2b08147 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
_pkgname=nixnote2
pkgname=${_pkgname}-git
-pkgver=2.1.1.r3.gf5e206dd
+pkgver=2.1.6.r1.gaa5cfeb8
pkgrel=1
pkgdesc='Evernote clone (formerly Nevernote) - git checkout'
url="https://github.com/robert7/$_pkgname"
@@ -14,7 +14,7 @@ makedepends=(boost gcc git qt5-tools)
provides=("nixnote=${pkgver%.r*}" "$_pkgname=${pkgver%.r*}")
replaces=(nevernote nixnote nixnote-beta)
source=("git+${url}.git" tidy-source-dir-location.patch)
-sha256sums=(SKIP 75410b80f3c06ca61842eade4e2da1fb869a3da7c269116a4b5a7703a196e621)
+sha256sums=(SKIP 8cb8e5c3d3d320ffb0991d34a5c155b631dd83b9a94d530815da4f92c5ebd5ff)
pkgver() {
cd "$srcdir/$_pkgname"
diff --git a/tidy-source-dir-location.patch b/tidy-source-dir-location.patch
index ee3709780924..d5120ec40e08 100644
--- a/tidy-source-dir-location.patch
+++ b/tidy-source-dir-location.patch
@@ -1,26 +1,26 @@
--- b/src/html/enmlformatter.cpp
+++ a/src/html/enmlformatter.cpp
-@@ -23,8 +23,8 @@
- #include <QWebFrame>
- #include <QIcon>
- #include <QMessageBox>
-+#include <tidy.h>
-+#include <tidybuffio.h>
+@@ -38,8 +38,8 @@
+ #include <tidy.h>
+ #include <tidybuffio.h>
+ #else
-#include <tidy/tidy.h>
-#include <tidy/tidybuffio.h>
- #include <iostream>
++#include <tidy.h>
++#include <tidybuffio.h>
+ #endif
- #include "enmlformatter.h"
+ #define ENML_MODULE_LOGPREFIX "enml-cleanup: "
--- b/src/main.cpp
+++ a/src/main.cpp
-@@ -46,8 +46,8 @@
-
- #include "src/application.h"
-
-+#include <tidy.h>
-+#include <tidybuffio.h>
+@@ -50,8 +50,8 @@
+ #include <tidy.h>
+ #include <tidybuffio.h>
+ #else
-#include <tidy/tidy.h>
-#include <tidy/tidybuffio.h>
++#include <tidy.h>
++#include <tidybuffio.h>
+ #endif
-
- NixNote *w;
+