Provide config changes as standalone config

...because upstream gitea no longer provides a working default config
and instead expects the user to define only the relevant options.

Also set the upstream branch because they switched from master to main

1 files changed, 25 insertions, 22 deletions

diff --git a/PKGBUILD b/PKGBUILD
index d1f44f138973..8ef2da745d06 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@
 
 _pkgname='gitea'
 pkgname=gitea-git
-pkgver=v1.15.0_dev_211_g0590176a23
+pkgver=v1.15.0_dev_359_g2a998048ef
 pkgrel=1
 pkgdesc='Painless self-hosted Git service. Community managed fork of Gogs.'
 arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64')
@@ -17,27 +17,32 @@ url='https://gitea.io/'
 license=('MIT')
 depends=('git')
 makedepends=('go' 'npm')
-optdepends=('mariadb: MariaDB support'
-            'memcached: MemCached support'
-            'openssh: GIT over SSH support'
-            'pam: Authentication via PAM support'
-            'postgresql: PostgreSQL support'
-            'redis: Redis support'
-            'sqlite: SQLite support')
+optdepends=(
+    'mariadb: MariaDB support'
+    'memcached: MemCached support'
+    'openssh: GIT over SSH support'
+    'pam: Authentication via PAM support'
+    'postgresql: PostgreSQL support'
+    'redis: Redis support'
+    'sqlite: SQLite support'
+)
 backup=('etc/gitea/app.ini')
 conflicts=('gitea')
 provides=('gitea')
-source=(git+https://github.com/go-gitea/gitea.git
-        gitea.tmpfiles
-        gitea.service
-        gitea.sysusers
-        gitea-arch-defaults.patch)
-sha512sums=('SKIP'
-            '89bf119a91fd48ed35c06131c67de1b4300bd2e79522c47aee9a73d7f1ebb08d9bceadc37408bd2425475d92c8bf59d87a799f2ce0a46bee860bf9fc7a904103'
-            'd65e053a98976423c6c1f3a4b6b0fd40f51e50a32d7afc651fc02414bb9f3bf574a58cc6a8c96760b85ab9f4f2bfcd0884bd7e9edcc2d71f07e7c1a548783c4c'
-            '77f672ed82bc8f78ca04b1e2b7c7d026cb897da6e4f057817adbe1242bf8a67875061553806e6b027cdb3266cdf217ee3993efd9242a66c5802ed34344b5ded1'
-            '6b5b1e2da05f8b2dc7015608c86db0095402f2139f41d5ac6d4de8b27b0bea387b6f7032985aced0c46603f0fdcb0201767f8b153aa31e62798eb93d90c49129')
-install=gitea.install
+source=(
+    git+https://github.com/go-gitea/gitea.git#branch=main
+    gitea.tmpfiles
+    gitea.service
+    gitea.sysusers
+    app.ini
+)
+sha512sums=(
+    'SKIP'
+    '89bf119a91fd48ed35c06131c67de1b4300bd2e79522c47aee9a73d7f1ebb08d9bceadc37408bd2425475d92c8bf59d87a799f2ce0a46bee860bf9fc7a904103'
+    'd65e053a98976423c6c1f3a4b6b0fd40f51e50a32d7afc651fc02414bb9f3bf574a58cc6a8c96760b85ab9f4f2bfcd0884bd7e9edcc2d71f07e7c1a548783c4c'
+    '77f672ed82bc8f78ca04b1e2b7c7d026cb897da6e4f057817adbe1242bf8a67875061553806e6b027cdb3266cdf217ee3993efd9242a66c5802ed34344b5ded1'
+    '704930578fe4231c45bcfdcc65df5d4f523b96909e670cc6e4f098770043b0f47fe5d90621788bc6ba300b0f19909a203068d2a1c142e7c5d29dc03a0dc5fc1d'
+)
 
 pkgver() {
   cd "${srcdir}/${_pkgname}"
@@ -46,8 +51,6 @@ pkgver() {
 
 prepare() {
   cd ${srcdir}/${_pkgname}
-  # Change default repos path for ArchLinux and some additional settings
-  patch -Np1 -i ../gitea-arch-defaults.patch
   # Be nice to people with read-only home
   GOCACHE="${srcdir}/cache" make vendor
 }
@@ -72,7 +75,7 @@ package() {
   install -Dm644 ${_pkgname}.service -t "${pkgdir}"/usr/lib/systemd/system/
   install -Dm644 ${_pkgname}.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/${_pkgname}.conf
   install -Dm644 ${_pkgname}.sysusers "${pkgdir}"/usr/lib/sysusers.d/${_pkgname}.conf
-  install -D ${_pkgname}/custom/conf/app.example.ini "${pkgdir}"/etc/gitea/app.ini
+  install -Dm644 app.ini "${pkgdir}"/etc/gitea/app.ini
 }
 
 # vim: ts=2 sw=2 et: