Arch Linux User Repository

This is the patch I needed to build the project in version 2.1.6.r1.gaa5cfeb8. Just update the patch and the checksum in the PKGBUILD file.

From 43769c4bf14d46c4d17c6753a5c3bcc5bb1c944c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20We=C3=9Fel?= <florianwessel@gmx.net>
Date: Wed, 20 May 2020 10:29:11 +0200
Subject: [PATCH] Fix tidy include

---
 src/html/enmlformatter.cpp | 6 +++---
 src/main.cpp               | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/html/enmlformatter.cpp b/src/html/enmlformatter.cpp
index 155db97d..33ad0fac 100644
--- a/src/html/enmlformatter.cpp
+++ b/src/html/enmlformatter.cpp
@@ -38,8 +38,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <tidy.h>
 #include <tidybuffio.h>
 #else
-#include <tidy/tidy.h>
-#include <tidy/tidybuffio.h>
+#include <tidy.h>
+#include <tidybuffio.h>
 #endif

 #define ENML_MODULE_LOGPREFIX "enml-cleanup: "
@@ -916,4 +916,4 @@ bool EnmlFormatter::isFormattingError() const {
 void EnmlFormatter::setContent(QString &contentStr) {
     this->content.clear();
     this->content.append(contentStr.toUtf8());
-}
\ No newline at end of file
+}
diff --git a/src/main.cpp b/src/main.cpp
index c3d5035e..a31ad49c 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -50,8 +50,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <tidy.h>
 #include <tidybuffio.h>
 #else
-#include <tidy/tidy.h>
-#include <tidy/tidybuffio.h>
+#include <tidy.h>
+#include <tidybuffio.h>
 #endif


-- 
2.26.2

@Ataraxy can you pls adapt the patch?

Hi, I don't know how to fork the repo for the patck, so I'm pasting an update here. You have to update the sha256 checksum too or change it to SKIP in PKGBUILD file.

This is the code for the new tidy-source-dir-location.patch file:

--- b/src/html/enmlformatter.cpp
+++ a/src/html/enmlformatter.cpp
@@ -34,13 +34,8 @@
 #include "src/logger/qslog.h"
 #include "src/utilities/NixnoteStringUtils.h"

-#ifdef Q_OS_MACOS
 #include <tidy.h>
 #include <tidybuffio.h>
-#else
-#include <tidy/tidy.h>
-#include <tidy/tidybuffio.h>
-#endif

 #define ENML_MODULE_LOGPREFIX "enml-cleanup: "

--- b/src/main.cpp
+++ a/src/main.cpp
@@ -46,14 +46,8 @@

 #include "src/application.h"

-#ifdef Q_OS_MACOS
 #include <tidy.h>
 #include <tidybuffio.h>
-#else
-#include <tidy/tidy.h>
-#include <tidy/tidybuffio.h>
-#endif
-

 NixNote *w;

I can no longer build this package. I decided to try reinstalling because of the "out of date" warning and because of the recent server problems with nixnote2, and now I am getting this error. The app was working fine before I decided to reinstall.

==> Starting pkgver()... 
==> Updated version: nixnote2-git 2.1.6.r1.gaa5cfeb8-1 
==> Sources are ready. 
==> Making package: nixnote2-git 2.1.6.r1.gaa5cfeb8-1 (Mon 11 May 2020 03:20:36 PM AEST) 
==> Checking runtime dependencies... 
==> Checking buildtime dependencies... 
==> WARNING: Using existing $srcdir/ tree 
==> Starting pkgver()... 
==> Removing existing $pkgdir/ directory... 
==> Starting build()... 
patching file src/html/enmlformatter.cpp 
Hunk #1 FAILED at 23. 
1 out of 1 hunk FAILED -- saving rejects to file src/html/enmlformatter.cpp.rej
patching file src/main.cpp 
Hunk #1 FAILED at 46. 
1 out of 1 hunk FAILED -- saving rejects to file src/main.cpp.rej 
==> ERROR: A failure occurred in build(). 
    Aborting... 
Error making: nixnote2-git

@Ataraxy @robert7

AppImage also doesn't work. Now using Evernote on web :(

Renewed issue https://github.com/robert7/nixnote2/issues/120

@axolx I suggest you remove your cache (or use "clean build" in yay) and then try again.

@vlas I just rebuilt and I can login fine. Upstream has good documentation on getting logs: https://github.com/robert7/nixnote2/wiki/HowTo---Add-log-file-to-the-github-issue

@vlas: Sorry I don't use Arch Linux, so I can't try myself, but it looks like problem on your local system (e.g. some library/dependency/version setup problem).

I suggest try the AppImage build.. Try is very easy and should work "out-of-the-box" just download the file, mark as executable, then run. All dependencies are included.

See https://github.com/robert7/nixnote2/wiki/HowTo---What-to-do-if-the-app-crashes#try-to-use-the-appimage-version

Asks for login forever. So it's not working.

I'm unable to build this package.

[nixnote2-git]$ sudo pacman -Ss poppler-qt5
extra/poppler-qt5 0.75.0-1 [installed]
    Poppler Qt5 bindings

[nixnote2-git]$ makepkg -Acs
==> Making package: nixnote2-git 2.1.3.r0.g01eac69e-1 (Tue 02 Apr 2019 10:39:49 PM PDT)
==> Checking runtime dependencies...
==> Checking buildtime dependencies...
==> Retrieving sources...
  -> Updating nixnote2 git repo...
Fetching origin
  -> Found tidy-source-dir-location.patch
==> Validating source files with sha256sums...
    nixnote2 ... Skipped
    tidy-source-dir-location.patch ... Passed
==> Extracting sources...
  -> Creating working copy of nixnote2 git repo...
Reset branch 'makepkg'
==> Starting pkgver()...
==> Removing existing $pkgdir/ directory...
==> Starting build()...
patching file src/html/enmlformatter.cpp
Hunk #1 succeeded at 23 with fuzz 2.
patching file src/main.cpp
Project MESSAGE: nixnote2: Release build!
Project MESSAGE: nixnote2: Compiler version 8
Project MESSAGE: nixnote2: Adding compiler config g++8
Project MESSAGE: Target binary: qmake-build-release/nixnote2
Project ERROR: poppler-qt5 development package not found
==> ERROR: A failure occurred in build().
    Aborting...

[nixnote2-git]$ git show -q
commit 2946cc93bdf930402438c4710239a0e86c909ea1 (HEAD -> master, origin/master, origin/HEAD)
Author: Tom "Ravi" Hale <tom@hale.ee>
Date:   Tue Dec 11 16:46:19 2018 +1100

    Patch tidy header locations

I'd be happy to help troubleshoot. Please let me know how I can help.

Thanks for pinpointing the commit, @robert7.

I've added a patch to revert the changes of that commit and it all builds properly now.