From e94c232d0af91c3dd4e2a7fd05e1fa9073b2ac00 Mon Sep 17 00:00:00 2001
From: Nick White <git@njw.name>
Date: Tue, 9 Apr 2024 09:09:42 +0100
Subject: Fix make rules setting version string correctly, and fix up flatpak
 build rules further

---
 cmd/rescribe/makefile                  |  4 ++--
 cmd/rescribe/xyz.rescribe.rescribe.yml | 11 ++++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/cmd/rescribe/makefile b/cmd/rescribe/makefile
index 4047ff0..bc177a4 100644
--- a/cmd/rescribe/makefile
+++ b/cmd/rescribe/makefile
@@ -50,7 +50,7 @@ build/darwin/rescribe: build/darwin_amd64/rescribe build/darwin_arm64/rescribe
 
 build/darwin/Rescribe.app: build/darwin/rescribe
 	go install fyne.io/fyne/v2/cmd/fyne@v2.1.2
-	fyne package --release --certificate Rescribe --id xyz.rescribe.rescribe --tags embed --name Rescribe --exe build/darwin/rescribe --os darwin --icon icon.png --appVersion $VERSION
+	fyne package --release --certificate Rescribe --id xyz.rescribe.rescribe --tags embed --name Rescribe --exe build/darwin/rescribe --os darwin --icon icon.png --appVersion $(VERSION)
 	codesign -s Rescribe Rescribe.app
 	mv Rescribe.app $@
 
@@ -65,7 +65,7 @@ build/windows/rescribe-bin.exe: $(GODEPS)
 
 dist/windows/rescribe.exe: build/windows/rescribe-bin.exe
 	mkdir -p dist/windows
-	CC="x86_64-w64-mingw32-gcc" fyne package --tags embed --name Rescribe --exe build/windows/rescribe-bin.exe --os windows --icon icon.png --appVersion $VERSION
+	CC="x86_64-w64-mingw32-gcc" fyne package --tags embed --name Rescribe --exe build/windows/rescribe-bin.exe --os windows --icon icon.png --appVersion $(VERSION)
 	mv rescribe.exe $@
 
 # used for flatpak building
diff --git a/cmd/rescribe/xyz.rescribe.rescribe.yml b/cmd/rescribe/xyz.rescribe.rescribe.yml
index e579e99..cb3278e 100644
--- a/cmd/rescribe/xyz.rescribe.rescribe.yml
+++ b/cmd/rescribe/xyz.rescribe.rescribe.yml
@@ -17,7 +17,7 @@ modules:
   - name: rescribe
     buildsystem: simple
     build-commands:
-      - cd cmd/rescribe && go build .
+      - cd cmd/rescribe && go build -tags flatpak .
       - cd cmd/rescribe && go build -tags flatpak,wayland -o rescribe-wayland .
       - install -Dm00755 cmd/rescribe/rescribe $FLATPAK_DEST/bin/rescribe-bin
       - install -Dm00755 cmd/rescribe/rescribe-wayland $FLATPAK_DEST/bin/rescribe-bin-wayland
@@ -30,15 +30,16 @@ modules:
     sources:
       - type: git
         url: https://github.com/rescribe/bookpipeline
-        tag: v1.2.0
-        commit: bf6e4762191aee0c27242f1d9cbbc2b8972c12f9
+        tag: HEAD
+        commit: f463237e3cda7cba5af2f062eb44a2798daf7b49
       - type: archive
-        url: https://rescribe.xyz/rescribe/modules-20240206-d2399a.tar.xz
-        sha256: 682820d4cb6129c564cf8df494dc12d35ab059ed99dba34c0b3d6260f7fc30fb
+        url: https://rescribe.xyz/rescribe/modules-20240409-1a4506.tar.xz
+        sha256: 0452ec822b9c807d9710ec34ed65169ec342039620f614d483cf91443e7cfc5e
         strip-components: 0
       - type: file
         url: https://rescribe.xyz/rescribe/embeds/tessdata.20220322.zip
         sha256: 725fd570a3c3dc0eba9463248ce47a8646db8bafb198d428d6bb8f0be18540ee
+        dest: cmd/rescribe
   - name: leptonica
     sources:
       - type: git
-- 
cgit v1.2.1-24-ge1ad