From 106745f0ef1aec31e2e370f327aa89e8d92b407b Mon Sep 17 00:00:00 2001
From: Nathaniel van Diepen <Eeems@users.noreply.github.com>
Date: Mon, 8 Jan 2024 17:58:02 -0700
Subject: [PATCH] Stable merge window for week 1 of 2024 (#819)

### New Packages
- `sudoku` - 0.1.1-1 (#817)

### Updated Packages
- `webinterface-onboot` - 1.2.3-1 (#813)
---
 package/sudoku/package              | 34 +++++++++++++++++++++++++++++
 package/webinterface-onboot/package |  8 +++----
 2 files changed, 38 insertions(+), 4 deletions(-)
 create mode 100644 package/sudoku/package

diff --git a/package/sudoku/package b/package/sudoku/package
new file mode 100644
index 000000000..1807fbda7
--- /dev/null
+++ b/package/sudoku/package
@@ -0,0 +1,34 @@
+#!/usr/bin/env bash
+# Copyright (c) 2024 HookedBehemoth
+# SPDX-License-Identifier: GPL-3.0-only
+
+pkgnames=(sudoku)
+pkgdesc="Sudoku for Remarkable"
+url="https://github.com/HookedBehemoth/remarkable-sudoku"
+pkgver=0.1.1-1
+timestamp=2023-01-05T03:15Z
+section="games"
+maintainer="Luis S. <luis@scheurenbrand.me>"
+license=GPL-3.0-only
+installdepends=(display)
+flags=(patch_rm2fb)
+
+image=rust:v3.1
+source=("https://github.com/HookedBehemoth/remarkable-sudoku/archive/refs/tags/v${pkgver%-*}.tar.gz")
+sha256sums=(c3d9e941d0d837b90d376104eec7693f6b609010662d7e9b5ae57570648d8856)
+
+build() {
+    cargo build --release
+}
+
+package() {
+    install -D -m 755 -t "$pkgdir"/opt/bin \
+        "$srcdir"/target/armv7-unknown-linux-gnueabihf/release/sudoku
+    install -D -m 644 -t "$pkgdir"/opt/etc/draft \
+        "$srcdir"/sudoku.draft
+    install -D -m 644 -T "$srcdir"/res/702.png "$pkgdir"/opt/etc/draft/icons/sudoku.png
+    install -D -m 644 -t "$pkgdir"/opt/usr/share/applications \
+        "$srcdir"/sudoku.oxide
+    install -D -m 644 -T "$srcdir"/res/702.png "$pkgdir"/opt/usr/share/icons/oxide/702x702/sudoku.png
+    install -D -m 644 -T "$srcdir"/res/48.png "$pkgdir"/opt/usr/share/icons/oxide/48x48/apps/sudoku.png
+}
diff --git a/package/webinterface-onboot/package b/package/webinterface-onboot/package
index 3e7552815..fc12319fe 100644
--- a/package/webinterface-onboot/package
+++ b/package/webinterface-onboot/package
@@ -6,8 +6,8 @@ _pkgname='webinterface-onboot'
 pkgnames=("$_pkgname")
 pkgdesc="Start the web interface without the cable, on boot."
 url="https://github.com/rM-self-serve/$_pkgname"
-pkgver=1.2.2-4
-timestamp=2023-12-03T11:43:00Z
+pkgver=1.2.3-1
+timestamp=2023-12-31T11:43:00Z
 section="utils"
 maintainer="rM-self-serve <122753594+rM-self-serve@users.noreply.github.com>"
 license=MIT
@@ -15,11 +15,11 @@ conflicts=(ddvk-hacks signature-rm)
 installdepends=(libbfd)
 
 source=(
-    "$url"/archive/cdfe457435974f7ca309b1ac50f1b2ef67000813.zip
+    "$url"/archive/e184b6a37ccba0ebeacd34faf63c8f4cdfa5c448.zip
     "$_pkgname-toltec.service"
 )
 sha256sums=(
-    bad965b923fa0979e7c8b97f6a90a400300ef8461292276e6fa2107a89624c8b
+    2e3666b1875f874ef09da2bbd163295b89e9e241f1e59e77349b0e2db716b8ff
     SKIP
 )