Make patch apply again

4 files changed, 12 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 795b07d609e6..12cc2abc4844 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = gitea-git
 	pkgdesc = Painless self-hosted Git service. Community managed fork of Gogs.
-	pkgver = v1.13.0_dev_234_gd9aa007a9
+	pkgver = v1.14.0_dev_371_g6074e13c8d
 	pkgrel = 1
 	url = https://gitea.io/
 	install = gitea.install
@@ -33,7 +33,7 @@ pkgbase = gitea-git
 	sha512sums = 89bf119a91fd48ed35c06131c67de1b4300bd2e79522c47aee9a73d7f1ebb08d9bceadc37408bd2425475d92c8bf59d87a799f2ce0a46bee860bf9fc7a904103
 	sha512sums = 0b93ddbb88ff843014f583a36c00156c011cca568cb69b61eb4c576c557b21ecdab1b105815a5dfdd08349e4e3b0976c8bdf87c8d3b201edae95de9070200352
 	sha512sums = 77f672ed82bc8f78ca04b1e2b7c7d026cb897da6e4f057817adbe1242bf8a67875061553806e6b027cdb3266cdf217ee3993efd9242a66c5802ed34344b5ded1
-	sha512sums = be015e9737b143be1c9211cf0f008a46394a17aff3e9b6f657c415284e8c714134166fe6702d3cdb13ef8e9955dddab707d6b6e802c1f58870b5c17399f26ba8
+	sha512sums = 294f343434477290b43e58cd10effda7eb3c4611ca9d985e37f2ae17138f1357d5fd46e80656efffabd1b6fe59d20b1f21c7e68a38b1396d4ef4cc05dda64fb4
 
 pkgname = gitea-git
 
diff --git a/.gitignore b/.gitignore
index 5b131483b4b1..3374f2c12d07 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,5 @@ pkg/
 src/
 *.tar.gz
 *.tar.xz
+*.tar.zst
 *.zip
diff --git a/PKGBUILD b/PKGBUILD
index 71bac252ba4e..6121995d9630 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@
 
 _pkgname='gitea'
 pkgname=gitea-git
-pkgver=v1.13.0_dev_680_gd71eaacbf2
+pkgver=v1.14.0_dev_371_g6074e13c8d
 pkgrel=1
 pkgdesc='Painless self-hosted Git service. Community managed fork of Gogs.'
 arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64')
@@ -36,7 +36,7 @@ sha512sums=('SKIP'
             '89bf119a91fd48ed35c06131c67de1b4300bd2e79522c47aee9a73d7f1ebb08d9bceadc37408bd2425475d92c8bf59d87a799f2ce0a46bee860bf9fc7a904103'
             '0b93ddbb88ff843014f583a36c00156c011cca568cb69b61eb4c576c557b21ecdab1b105815a5dfdd08349e4e3b0976c8bdf87c8d3b201edae95de9070200352'
             '77f672ed82bc8f78ca04b1e2b7c7d026cb897da6e4f057817adbe1242bf8a67875061553806e6b027cdb3266cdf217ee3993efd9242a66c5802ed34344b5ded1'
-            'be015e9737b143be1c9211cf0f008a46394a17aff3e9b6f657c415284e8c714134166fe6702d3cdb13ef8e9955dddab707d6b6e802c1f58870b5c17399f26ba8')
+            '294f343434477290b43e58cd10effda7eb3c4611ca9d985e37f2ae17138f1357d5fd46e80656efffabd1b6fe59d20b1f21c7e68a38b1396d4ef4cc05dda64fb4')
 install=gitea.install
 
 pkgver() {
diff --git a/gitea-arch-defaults.patch b/gitea-arch-defaults.patch
index fdf430e68390..44af91cc137a 100644
--- a/gitea-arch-defaults.patch
+++ b/gitea-arch-defaults.patch
@@ -1,17 +1,14 @@
 --- a/custom/conf/app.example.ini
 +++ b/custom/conf/app.example.ini
-@@ -7,9 +7,9 @@
+@@ -7,7 +7,7 @@
  ; App name that shows in every page title
  APP_NAME = Gitea: Git with a cup of tea
  ; Change it if you run locally
 -RUN_USER = git
 +RUN_USER = gitea
- ; Either "dev", "prod" or "test", default is "dev"
--RUN_MODE = dev
-+RUN_MODE = prod
+ ; Application run mode, affects performance and debugging. Either "dev", "prod" or "test", default is "prod"
+ RUN_MODE = prod
  
- [project]
- ; Default templates for project boards
 @@ -17,7 +17,7 @@
  PROJECT_BOARD_BUG_TRIAGE_TYPE = Needs Triage, High Priority, Low Priority, Closed
  
@@ -21,7 +18,7 @@
  SCRIPT_TYPE = bash
  ; DETECTED_CHARSETS_ORDER tie-break order for detected charsets.
  ; If the charsets have equal confidence, tie-breaking will be done by order in this list
-@@ -328,7 +328,7 @@
+@@ -354,7 +354,7 @@
  KEY_FILE = https/key.pem
  ; Root directory containing templates and static files.
  ; default is the path where Gitea is executed
@@ -30,7 +27,7 @@
  ; Default path for App data
  APP_DATA_PATH = data
  ; Application level GZIP support
-@@ -398,7 +398,7 @@
+@@ -424,7 +424,7 @@
  ; For iterate buffer, default is 50
  ITERATE_BUFFER_SIZE = 50
  ; Show the database generated SQL
@@ -39,7 +36,7 @@
  ; Maximum number of DB Connect retries
  DB_RETRIES = 10
  ; Backoff time per DB retry (time.Duration)
-@@ -805,10 +805,10 @@
+@@ -838,10 +838,10 @@
  DEFAULT_UI_LOCATION =
  
  [log]
@@ -52,7 +49,7 @@
  ; Buffer length of the channel, keep it as it is if you don't know what it is.
  BUFFER_LEN = 10000
  REDIRECT_MACARON_LOG = false
-@@ -833,7 +833,7 @@
+@@ -866,7 +866,7 @@
  
  ; For "console" mode only
  [log.console]