Skip to content
Snippets Groups Projects
Commit 1ac700c4 authored by mio's avatar mio Committed by Natanael Copa
Browse files

testing/transito: fix build with go 1.24.1 

Update gio dependency to fix build error with go 1.24.1.
parent aeb5950f
No related branches found
No related tags found
1 merge request!81555testing/transito: fix build with go 1.24.1
Pipeline #308676 skipped
Hide whitespace changes
Inline Side-by-side
testing/transito/APKBUILD
+ 5
− 2
View file @ 1ac700c4
maintainer="Hugo Osvaldo Barrera <hugo@whynothugo.nl>" maintainer="Hugo Osvaldo Barrera <hugo@whynothugo.nl>"
pkgname=transito pkgname=transito
pkgver=0.9.1 pkgver=0.9.1
pkgrel=3 pkgrel=4
pkgdesc="Public transportation planner" pkgdesc="Public transportation planner"
url="https://git.sr.ht/~mil/transito" url="https://git.sr.ht/~mil/transito"
arch="all !armv7 !armhf" arch="all !armv7 !armhf"
...@@ -19,7 +19,9 @@ makedepends=" ...@@ -19,7 +19,9 @@ makedepends="
" "
depends="xdg-utils tzdata mesa-gles" depends="xdg-utils tzdata mesa-gles"
subpackages="$pkgname-doc" subpackages="$pkgname-doc"
source="transito-$pkgver.tar.gz::https://git.sr.ht/~mil/transito/archive/v$pkgver.tar.gz" source="transito-$pkgver.tar.gz::https://git.sr.ht/~mil/transito/archive/v$pkgver.tar.gz
use-gio-0.8.patch
"
builddir="$srcdir/$pkgname-v$pkgver" builddir="$srcdir/$pkgname-v$pkgver"
options="!check net" options="!check net"
...@@ -41,4 +43,5 @@ package() { ...@@ -41,4 +43,5 @@ package() {
sha512sums=" sha512sums="
c309ef5c8ff8ef105aef383aed7ae5c603935572fcdec96688805276ef68a333e233d06b7f91eb299079680d3e8a60dda498133d80365b1d751762a4b278f22a transito-0.9.1.tar.gz c309ef5c8ff8ef105aef383aed7ae5c603935572fcdec96688805276ef68a333e233d06b7f91eb299079680d3e8a60dda498133d80365b1d751762a4b278f22a transito-0.9.1.tar.gz
76ac943836ebceaf7f5fd2fcba7d84e6a8361f41e43edfa3e12b235dfd9d9b54b326ad6a407c8a801ce70a154affcdc950132fb962f01429a14adc1b1636bca7 use-gio-0.8.patch
" "
testing/transito/use-gio-0.8.patch 0 → 100644
+ 301
− 0
View file @ 1ac700c4
Patch-Source: https://git.sr.ht/~mil/transito/commit/e192fd165b84f090490b04ca61815e3d9b706422
---
From e192fd165b84f090490b04ca61815e3d9b706422 Mon Sep 17 00:00:00 2001
From: Miles Alan <m@milesalan.com>
Date: Fri, 17 Jan 2025 09:33:31 -0500
Subject: [PATCH] Update to use gio v0.8 and replace giohyperlink with
gio-plugins
---
.build.yml | 2 +-
go.mod | 19 +++---
go.sum | 64 +++++--------------
src/ui/ui.go | 9 +--
.../pageconfig/pageconfigfeedsmanage.go | 1 +
src/uipages/pageroute/pageroute.go | 10 ++-
src/util/utillinkhandler/utillinkhandler.go | 9 +--
7 files changed, 45 insertions(+), 69 deletions(-)
diff --git a/.build.yml b/.build.yml
index 5bea3f5..3bca6b8 100644
--- a/.build.yml
+++ b/.build.yml
@@ -32,7 +32,7 @@ tasks:
sudo chown $USER $ANDROID_HOME
sh -c 'yes | sdkmanager --licenses'
sdkmanager "platforms;android-31" "build-tools;31.0.0" "ndk-bundle;r21e"
- go install 'gioui.org/cmd/gogio@v0.7.0'
+ go install 'gioui.org/cmd/gogio@v0.8.0'
- buildapk: |
export ANDROID_SDK_ROOT=/opt/android-sdk
export PATH="$PATH:/home/$USER/go/bin"
diff --git a/go.mod b/go.mod
index 8748665..8f69c3a 100644
--- a/go.mod
+++ b/go.mod
@@ -1,24 +1,25 @@
module git.sr.ht/~mil/transito
-go 1.21
+go 1.22
+
+toolchain go1.23.4
//replace git.sr.ht/~mil/mobroute => ../mobroute
//replace git.sr.ht/~mil/mobsql => ../mobsql
require (
- gioui.org v0.5.0
- gioui.org/x v0.5.0
+ gioui.org v0.8.0
+ gioui.org/x v0.8.0
git.sr.ht/~mil/mobroute v0.9.0
- golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
- golang.org/x/exp/shiny v0.0.0-20220906200021-fcb1a314c389 // indirect
- golang.org/x/image v0.7.0 // indirect
+ golang.org/x/exp v0.0.0-20240707233637-46b078467d37 // indirect
+ golang.org/x/exp/shiny v0.0.0-20240707233637-46b078467d37 // indirect
+ golang.org/x/image v0.18.0 // indirect
)
-require github.com/inkeliz/giohyperlink v0.0.0-20220903215451-2ac5d54abdce
+require github.com/gioui-plugins/gio-plugins v0.1.1-0.20241219101404-5bad9f318498
require (
- gioui.org/cpu v0.0.0-20210817075930-8d6a761490d2 // indirect
gioui.org/shader v1.0.8 // indirect
git.sr.ht/~mil/mobsql v0.9.0 // indirect
git.wow.st/gmp/jni v0.0.0-20210610011705-34026c7e22d0 // indirect
@@ -26,7 +27,7 @@ require (
github.com/go-playground/locales v0.14.1 // indirect
github.com/go-playground/universal-translator v0.18.1 // indirect
github.com/go-playground/validator/v10 v10.23.0 // indirect
- github.com/go-text/typesetting v0.0.0-20230803102845-24e03d8b5372 // indirect
+ github.com/go-text/typesetting v0.2.1 // indirect
github.com/jmoiron/sqlx v1.4.0 // indirect
github.com/leodido/go-urn v1.4.0 // indirect
github.com/mattn/go-sqlite3 v1.14.24 // indirect
diff --git a/go.sum b/go.sum
index 41b0151..d0c07d2 100644
--- a/go.sum
+++ b/go.sum
@@ -2,15 +2,13 @@ eliasnaur.com/font v0.0.0-20230308162249-dd43949cb42d h1:ARo7NCVvN2NdhLlJE9xAbKw
eliasnaur.com/font v0.0.0-20230308162249-dd43949cb42d/go.mod h1:OYVuxibdk9OSLX8vAqydtRPP87PyTFcT9uH3MlEGBQA=
filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
-gioui.org v0.5.0 h1:07g7/LY1MFuTncfO4A5DIKMMsQV6PkPHyx0MhDqgmYY=
-gioui.org v0.5.0/go.mod h1:2atiYR4upH71/6ehnh6XsUELa7JZOrOHHNMDxGBZF0Q=
+gioui.org v0.8.0 h1:QV5p5JvsmSmGiIXVYOKn6d9YDliTfjtLlVf5J+BZ9Pg=
+gioui.org v0.8.0/go.mod h1:vEMmpxMOd/iwJhXvGVIzWEbxMWhnMQ9aByOGQdlQ8rc=
gioui.org/cpu v0.0.0-20210808092351-bfe733dd3334/go.mod h1:A8M0Cn5o+vY5LTMlnRoK3O5kG+rH0kWfJjeKd9QpBmQ=
-gioui.org/cpu v0.0.0-20210817075930-8d6a761490d2 h1:AGDDxsJE1RpcXTAxPG2B4jrwVUJGFDjINIPi1jtO6pc=
-gioui.org/cpu v0.0.0-20210817075930-8d6a761490d2/go.mod h1:A8M0Cn5o+vY5LTMlnRoK3O5kG+rH0kWfJjeKd9QpBmQ=
gioui.org/shader v1.0.8 h1:6ks0o/A+b0ne7RzEqRZK5f4Gboz2CfG+mVliciy6+qA=
gioui.org/shader v1.0.8/go.mod h1:mWdiME581d/kV7/iEhLmUgUK5iZ09XR5XpduXzbePVM=
-gioui.org/x v0.5.0 h1:NVKTn5AZuYhkAnF7MYcy1dIes36+U1N4gUTsgBhfr4A=
-gioui.org/x v0.5.0/go.mod h1:X4UBhvanAN+8S16L3K6jDMrVo7Dii7NptgBpOLBD7E4=
+gioui.org/x v0.8.0 h1:RhIlQNOFKKn8D8FeaKKaXCo7vB3x+fq4VcD10HW/YpA=
+gioui.org/x v0.8.0/go.mod h1:aXtQb+kyqoUOjDl5/uMqAopjzVzMkeHBbMQOGT5KnSE=
git.sr.ht/~mil/mobroute v0.9.0 h1:lRn2OuHT+I+gS2wDr7bJoa4PoUMQGQ2tz2Qisqpl3HQ=
git.sr.ht/~mil/mobroute v0.9.0/go.mod h1:IAElt3D7KHlv/NODrWSX9/tb7/tDZvTpYlPqcbED02U=
git.sr.ht/~mil/mobsql v0.9.0 h1:IAXT2mMJwcAsZ7kuzR44S8uLEg7kWdkwQ/ioW0NjVKA=
@@ -21,6 +19,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/gabriel-vasile/mimetype v1.4.7 h1:SKFKl7kD0RiPdbht0s7hFtjl489WcQ1VyPW8ZzUMYCA=
github.com/gabriel-vasile/mimetype v1.4.7/go.mod h1:GDlAgAyIRT27BhFl53XNAFtfjzOkLaF35JdEG0P7LtU=
+github.com/gioui-plugins/gio-plugins v0.1.1-0.20241219101404-5bad9f318498 h1:/+c9tcpZqaekhT+6KVoYl6QPQY8mLgAWUo0ND9dXvyg=
+github.com/gioui-plugins/gio-plugins v0.1.1-0.20241219101404-5bad9f318498/go.mod h1:ZbyxR4ZMWuuDqZauTiBqoeh3ej3HpKkAQQJQFvwiybI=
github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
@@ -31,12 +31,10 @@ github.com/go-playground/validator/v10 v10.23.0 h1:/PwmTwZhS0dPkav3cdK9kV1FsAmrL
github.com/go-playground/validator/v10 v10.23.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y=
github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg=
-github.com/go-text/typesetting v0.0.0-20230803102845-24e03d8b5372 h1:FQivqchis6bE2/9uF70M2gmmLpe82esEm2QadL0TEJo=
-github.com/go-text/typesetting v0.0.0-20230803102845-24e03d8b5372/go.mod h1:evDBbvNR/KaVFZ2ZlDSOWWXIUKq0wCOEtzLxRM8SG3k=
-github.com/go-text/typesetting-utils v0.0.0-20230616150549-2a7df14b6a22 h1:LBQTFxP2MfsyEDqSKmUBZaDuDHN1vpqDyOZjcqS7MYI=
-github.com/go-text/typesetting-utils v0.0.0-20230616150549-2a7df14b6a22/go.mod h1:DDxDdQEnB70R8owOx3LVpEFvpMK9eeH1o2r0yZhFI9o=
-github.com/inkeliz/giohyperlink v0.0.0-20220903215451-2ac5d54abdce h1:VY+88zGHu3up1GEdcSH9bFBrwF/0HJRLhaR7QGn+6II=
-github.com/inkeliz/giohyperlink v0.0.0-20220903215451-2ac5d54abdce/go.mod h1:aYfTeMhp1YaZo0welffItZD1SeIsccPQ7A4evWbHjmY=
+github.com/go-text/typesetting v0.2.1 h1:x0jMOGyO3d1qFAPI0j4GSsh7M0Q3Ypjzr4+CEVg82V8=
+github.com/go-text/typesetting v0.2.1/go.mod h1:mTOxEwasOFpAMBjEQDhdWRckoLLeI/+qrQeBCTGEt6M=
+github.com/go-text/typesetting-utils v0.0.0-20241103174707-87a29e9e6066 h1:qCuYC+94v2xrb1PoS4NIDe7DGYtLnU2wWiQe9a1B1c0=
+github.com/go-text/typesetting-utils v0.0.0-20241103174707-87a29e9e6066/go.mod h1:DDxDdQEnB70R8owOx3LVpEFvpMK9eeH1o2r0yZhFI9o=
github.com/jmoiron/sqlx v1.4.0 h1:1PLqN7S1UYp5t4SrVVnt4nUVNemrDAtxlulVe+Qgm3o=
github.com/jmoiron/sqlx v1.4.0/go.mod h1:ZrZ7UsYB/weZdl2Bxg6jCRO9c3YHl8r3ahlKmRT4JLY=
github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
@@ -52,49 +50,19 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
github.com/yuin/goldmark v1.4.13 h1:fVcFKWvrslecOb/tg+Cc05dkeYx540o0FuFt3nUVDoE=
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
-golang.org/x/exp v0.0.0-20230905200255-921286631fa9 h1:GoHiUyI/Tp2nVkLI2mCxVkOjsbSXD66ic0XW0js0R9g=
-golang.org/x/exp v0.0.0-20230905200255-921286631fa9/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k=
-golang.org/x/exp/shiny v0.0.0-20220906200021-fcb1a314c389 h1:RJgV139fC8cnvcf8+MhE9Idc9wzOfUPhGY7q7R0YTvQ=
-golang.org/x/exp/shiny v0.0.0-20220906200021-fcb1a314c389/go.mod h1:VjAR7z0ngyATZTELrBSkxOOHhhlnVUxDye4mcjx5h/8=
-golang.org/x/image v0.7.0 h1:gzS29xtG1J5ybQlv0PuyfE3nmc6R4qB73m6LUUmvFuw=
-golang.org/x/image v0.7.0/go.mod h1:nd/q4ef1AKKYl/4kft7g+6UyGbdiqWqTP1ZAbRoV7Rg=
-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/exp v0.0.0-20240707233637-46b078467d37 h1:uLDX+AfeFCct3a2C7uIWBKMJIR3CJMhcgfrUAqjRK6w=
+golang.org/x/exp v0.0.0-20240707233637-46b078467d37/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY=
+golang.org/x/exp/shiny v0.0.0-20240707233637-46b078467d37 h1:SOSg7+sueresE4IbmmGM60GmlIys+zNX63d6/J4CMtU=
+golang.org/x/exp/shiny v0.0.0-20240707233637-46b078467d37/go.mod h1:3F+MieQB7dRYLTmnncoFbb1crS5lfQoTfDgQy6K4N0o=
+golang.org/x/image v0.18.0 h1:jGzIakQa/ZXI1I0Fxvaa9W7yP25TqT6cHIHn+6CqvSQ=
+golang.org/x/image v0.18.0/go.mod h1:4yyo5vMFQjVjUcVk4jEQcU9MGy/rulF5WvUILseCM2E=
golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/src/ui/ui.go b/src/ui/ui.go
index 158bd4c..c1eea59 100644
--- a/src/ui/ui.go
+++ b/src/ui/ui.go
@@ -17,7 +17,7 @@ import (
"git.sr.ht/~mil/transito/src/uipages/pageroute"
"git.sr.ht/~mil/transito/src/uipages/pagestops"
"git.sr.ht/~mil/transito/src/util/utilplatform"
- "github.com/inkeliz/giohyperlink"
+ "github.com/gioui-plugins/gio-plugins/plugin/gioplugins"
"log"
"os"
)
@@ -34,7 +34,8 @@ func CreateUI() {
Save: globalstate.FileLoadWarnError(),
},
}
- uiInstance.GlobalState.Window = app.NewWindow(app.Title("Transito"), app.Size(unit.Dp(420), unit.Dp(780)))
+ uiInstance.GlobalState.Window = &app.Window{}
+ uiInstance.GlobalState.Window.Option(app.Title("Transito"), app.Size(unit.Dp(420), unit.Dp(780)))
uiInstance.GlobalState.Theme.Shaper = text.NewShaper(text.WithCollection(gofont.Collection()))
uiInstance.Tabs = []UITab{
{Tabname: "Route", Page: pageroute.Initialize(&uiInstance.GlobalState)},
@@ -64,8 +65,8 @@ func CreateUI() {
func (ui *UI) Run(w *app.Window) error {
var ops op.Ops
for {
- e := w.NextEvent()
- giohyperlink.ListenEvents(e)
+ //e := w.Event()
+ e := gioplugins.Hijack(w)
switch e := e.(type) {
case app.FrameEvent:
gtx := app.NewContext(&ops, e)
diff --git a/src/uipages/pageconfig/pageconfigfeedsmanage.go b/src/uipages/pageconfig/pageconfigfeedsmanage.go
index ca300a6..bfee97e 100644
--- a/src/uipages/pageconfig/pageconfigfeedsmanage.go
+++ b/src/uipages/pageconfig/pageconfigfeedsmanage.go
@@ -28,6 +28,7 @@ func (page *PageConfig) renderConfigWidgetsFeedsManage(gtx layout.Context) []lay
if splt[0] == "feedid_update" {
feedID, _ := strconv.Atoi(splt[1])
page.GlobalState.AppQueueload = &globalstate.AppQueueload{FeedIDUpdate: &feedID, ReturnToTab: "Config"}
+ page.GlobalState.Window.Invalidate()
}
}
}
diff --git a/src/uipages/pageroute/pageroute.go b/src/uipages/pageroute/pageroute.go
index becf570..5ef5d1d 100644
--- a/src/uipages/pageroute/pageroute.go
+++ b/src/uipages/pageroute/pageroute.go
@@ -5,6 +5,7 @@ import (
"encoding/json"
"io"
"log"
+ "net/url"
"time"
"gioui.org/font/gofont"
@@ -21,7 +22,8 @@ import (
"git.sr.ht/~mil/transito/src/components/buttonrow"
"git.sr.ht/~mil/transito/src/globalstate"
"git.sr.ht/~mil/transito/src/util/utiltheme"
- "github.com/inkeliz/giohyperlink"
+ "github.com/gioui-plugins/gio-plugins/hyperlink/giohyperlink"
+ "github.com/gioui-plugins/gio-plugins/plugin/gioplugins"
)
type PageRoute struct {
@@ -131,8 +133,10 @@ func Initialize(u *globalstate.GlobalState) *PageRoute {
}
// Open map URL for map button
page.buttonRow.Buttons[3].Callback = func(gtx layout.Context) {
- if err := giohyperlink.Open(*pageptr.ResultMRRoute.MapURL); err != nil {
- log.Println("Error opening map URL:", err)
+ if u, err := url.Parse(*pageptr.ResultMRRoute.MapURL); err != nil {
+ log.Printf("Error parsing link <%s>: %v", *pageptr.ResultMRRoute.MapURL, err)
+ } else {
+ gioplugins.Execute(gtx, giohyperlink.OpenCmd{URI: u})
}
}
page.GlobalState.Theme.Shaper = text.NewShaper(text.WithCollection(gofont.Collection()))
diff --git a/src/util/utillinkhandler/utillinkhandler.go b/src/util/utillinkhandler/utillinkhandler.go
index 9c37496..6fcba54 100644
--- a/src/util/utillinkhandler/utillinkhandler.go
+++ b/src/util/utillinkhandler/utillinkhandler.go
@@ -8,14 +8,15 @@ import (
"gioui.org/layout"
"gioui.org/x/markdown"
"gioui.org/x/richtext"
- "github.com/inkeliz/giohyperlink"
+ "github.com/gioui-plugins/gio-plugins/hyperlink/giohyperlink"
+ "github.com/gioui-plugins/gio-plugins/plugin/gioplugins"
)
// Handles link events by default opening all normally parsed links via
// giohyperlink. If a URI has the transito:// scheme then the body/host of
// the link will be return; otherwise empty string returned
func HandleLinkEvents(window *app.Window, textstate *richtext.InteractiveText, gtx layout.Context) string {
- giohyperlink.InsecureIgnoreScheme = true
+ //giohyperlink.InsecureIgnoreScheme = true
for {
o, e, ok := textstate.Update(gtx)
@@ -31,8 +32,8 @@ func HandleLinkEvents(window *app.Window, textstate *richtext.InteractiveText, g
log.Printf("Error parsing link <%s>: %v", urlLink, err)
} else if u.Scheme == "transito" {
return u.Host
- } else if err := giohyperlink.Open(urlLink); err != nil {
- log.Printf("Error opening link <%s>: %v", urlLink, err)
+ } else {
+ gioplugins.Execute(gtx, giohyperlink.OpenCmd{URI: u})
}
}
case richtext.Hover:
--
2.45.3
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment