Update to 1.14.0

And merge foot-git with foot-themes-git (similar to the community
package).

2 files changed, 6 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index faef75dea557..c1a67bee36a6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = foot-git
 	pkgdesc = Wayland terminal emulator - fast, lightweight and minimalistic
-	pkgver = 1.13.1
+	pkgver = 1.14.0
 	pkgrel = 1
 	url = https://codeberg.org/dnkl/foot
 	arch = x86_64
@@ -22,21 +22,13 @@ pkgbase = foot-git
 	depends = ncurses
 	depends = fcft>=3.0.0
 	optdepends = foot-terminfo: alternative to ncurses' terminfo, with additional non-standard capabilities
-	optdepends = foot-themes: color schemes
 	optdepends = libnotify: desktop notifications
 	optdepends = xdg-utils: URI launching
 	optdepends = bash-completion: bash completions for foot itself
 	provides = foot
 	conflicts = foot
+	replaces = foot-themes
 	source = git+https://codeberg.org/dnkl/foot.git
 	sha256sums = SKIP
 
 pkgname = foot-git
-
-pkgname = foot-themes-git
-	pkgdesc = Color schemes for the foot terminal emulator
-	arch = any
-	depends = foot-git
-	optdepends = 
-	provides = foot-themes
-	conflicts = foot-themes
diff --git a/PKGBUILD b/PKGBUILD
index 659a01c2c293..47174372b8fb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -30,10 +30,11 @@
 PGO=auto
 
 pkgdesc='Wayland terminal emulator - fast, lightweight and minimalistic'
-pkgname=(foot-git foot-themes-git)
-pkgver=1.13.1
+pkgname=foot-git
+pkgver=1.14.0
 pkgrel=1
 conflicts=('foot')
+replaces=('foot-themes')
 provides=('foot')
 arch=('x86_64' 'aarch64')
 url=https://codeberg.org/dnkl/foot
@@ -42,7 +43,6 @@ makedepends=('git' 'meson' 'ninja' 'scdoc' 'python' 'wayland-protocols' 'tllist'
 checkdepends=('check')
 depends=('libxkbcommon' 'wayland' 'pixman' 'fontconfig' 'libutf8proc' 'ncurses' 'fcft>=3.0.0')
 optdepends=("foot-terminfo: alternative to ncurses' terminfo, with additional non-standard capabilities"
-            "foot-themes: color schemes"
             "libnotify: desktop notifications"
             "xdg-utils: URI launching"
             "bash-completion: bash completions for foot itself")
@@ -61,8 +61,7 @@ build() {
     . build \
     --prefix=/usr \
     --wrap-mode=nodownload \
-    -Dterminfo=disabled \
-    -Dthemes=false
+    -Dterminfo=disabled
 }
 
 check() {
@@ -75,15 +74,3 @@ package_foot-git() {
   DESTDIR="${pkgdir}/" ninja -C build install
   install -Dm 644 LICENSE "${pkgdir}/usr/share/licenses/foot/LICENSE"
 }
-
-package_foot-themes-git() {
-  pkgdesc="Color schemes for the foot terminal emulator"
-  conflicts=(foot-themes)
-  provides=(foot-themes)
-  depends=(foot-git)
-  optdepends=()
-  arch=(any)
-  cd foot
-  install -d "${pkgdir}/usr/share/foot/themes"
-  install -m 644 themes/* "${pkgdir}/usr/share/foot/themes/"
-}