From 24f2ec87d3474065d243d4d932c9fa60eb734cc9 Mon Sep 17 00:00:00 2001 From: Cedric Lewe <0skillallluck@pm.me> Date: Sat, 7 Mar 2026 14:48:43 +0100 Subject: [PATCH 1/5] Update Schwifty version --- go.mod | 2 +- go.sum | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 0ff594f..ea3f029 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/0skillallluck/scanline go 1.26.0 require ( - codeberg.org/dergs/tonearm v1.4.0 + codeberg.org/dergs/tonearm v1.4.1-0.20260304095737-2bc41c208498 github.com/google/uuid v1.6.0 github.com/jeandeaual/go-locale v0.0.0-20250612000132-0ef82f21eade github.com/jwijenbergh/puregotk v0.0.0-20260115100645-c78e1521129b diff --git a/go.sum b/go.sum index f750f04..180705a 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,9 @@ codeberg.org/dergs/tonearm v1.4.0 h1:YHKAn7EIRsCmLhjQD34RsbHFqPqzA/PPqNLrbQQtCjs= codeberg.org/dergs/tonearm v1.4.0/go.mod h1:SNCwGgi0rUBx04oA3xWoJey9RsNRdC+kSjmt3iwWgfg= +codeberg.org/dergs/tonearm v1.4.1-0.20260304095737-2bc41c208498 h1:AboL9yBPVCXMISsHh+CtQDYvKyoRS+ParsmBvy2Q5w0= +codeberg.org/dergs/tonearm v1.4.1-0.20260304095737-2bc41c208498/go.mod h1:0tdRotuB0qHS0o4fEHZpyJqHXH3RCfiv2HaZCBSB3e0= +codeberg.org/puregotk/puregotk v0.0.0-20260226083027-5647eb6a2bba h1:vaq9DqM7xkLsqKP7aYvVwirqStiJk6OnXy12BtwiG6k= +codeberg.org/puregotk/puregotk v0.0.0-20260226083027-5647eb6a2bba/go.mod h1:Q2E89WEkiGRObalH0QeYJe19f1H+6cn40xavs9+cxdU= 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/fogleman/gg v1.3.0 h1:/7zJX8F6AaYQc57WQCyN9cAIz+4bCJGO9B+dyW29am8= From 4404c1359807667a2d389f0a3adca4714cb59352 Mon Sep 17 00:00:00 2001 From: Cedric Lewe <0skillallluck@pm.me> Date: Sat, 7 Mar 2026 14:50:15 +0100 Subject: [PATCH 2/5] Update puregotk --- README.md | 2 +- app/app.go | 6 ++-- app/appctx/appctx.go | 2 +- app/auth/signin.go | 8 +++--- app/components/cards/cast.go | 4 +-- app/components/cards/info_card.go | 2 +- app/components/cards/media_info.go | 4 +-- app/components/cards/poster.go | 6 ++-- app/components/cards/poster_episode.go | 2 +- app/components/cards/poster_movie.go | 2 +- app/components/cards/poster_season.go | 2 +- app/components/cards/poster_show.go | 2 +- app/components/cards/preview.go | 6 ++-- app/components/cards/preview_episode.go | 2 +- app/components/cards/preview_movie.go | 2 +- app/components/cards/season_episode.go | 8 +++--- app/components/cards/subtitle.go | 4 +-- app/components/lists/horizontal_list.go | 6 ++-- app/components/player/player.go | 10 +++---- app/components/player/settings.go | 4 +-- app/components/route_button.go | 2 +- app/components/widgets/hero.go | 6 ++-- app/components/widgets/ratings.go | 2 +- app/dialogs/about/about.go | 6 ++-- app/dialogs/linking/linking.go | 8 +++--- app/dialogs/preferences/experimental.go | 4 +-- app/dialogs/preferences/general.go | 6 ++-- app/dialogs/preferences/performance.go | 4 +-- app/dialogs/secretservice/secret_service.go | 8 +++--- app/dialogs/sources/sources.go | 4 +-- app/pages/episode.go | 4 +-- app/pages/home.go | 2 +- app/pages/library.go | 6 ++-- app/pages/movie.go | 4 +-- app/pages/search.go | 4 +-- app/pages/search/results.go | 2 +- app/pages/season.go | 4 +-- app/pages/show.go | 4 +-- app/preference/experimental.go | 4 +-- app/preference/general.go | 2 +- app/preference/performance.go | 4 +-- app/preference/preference.go | 2 +- app/router/history.go | 2 +- app/windows/main.go | 12 ++++---- app/windows/main_actions.go | 8 +++--- app/windows/main_content.go | 10 +++---- assets/meta/go.mod.yml | 4 +-- assets/meta/modules.txt | 32 ++++++++++----------- go.mod | 4 +-- go.sum | 8 ++---- internal/features/macosfixes/init_darwin.go | 2 +- main.go | 6 ++-- utils/imageutils/crop.go | 4 +-- utils/imageutils/imageutils.go | 2 +- utils/imageutils/loader.go | 4 +-- 55 files changed, 135 insertions(+), 139 deletions(-) diff --git a/README.md b/README.md index 0e144c4..4283fb1 100644 --- a/README.md +++ b/README.md @@ -94,7 +94,7 @@ then add this anywhere in your system configuration as you see fit ## Acknowledgements The following projects and resources served as inspiration or were helpful during the development of Scanline. - [Tonearm](https://codeberg.org/dergs/Tonearm) and its [schwifty](https://codeberg.org/dergs/Tonearm/src/branch/main/pkg/schwifty) UI framework for providing the foundation -- [puregotk](https://github.com/jwijenbergh/puregotk) for making this project possible with only minimal CGO bindings +- [puregotk](https://codeberg.org/puregotk/puregotk) for making this project possible with only minimal CGO bindings - [Plex](https://www.plex.tv/) for the media server platform - [Dråfølin](https://drafolin.ch/) for the beautiful icon diff --git a/app/app.go b/app/app.go index cdd5953..d3e91db 100644 --- a/app/app.go +++ b/app/app.go @@ -4,14 +4,14 @@ import ( "context" "log/slog" + "codeberg.org/puregotk/puregotk/v4/adw" + "codeberg.org/puregotk/puregotk/v4/gio" "github.com/0skillallluck/scanline/app/appctx" "github.com/0skillallluck/scanline/app/dialogs/secretservice" "github.com/0skillallluck/scanline/app/router" + "github.com/0skillallluck/scanline/app/secrets" "github.com/0skillallluck/scanline/app/sources" "github.com/0skillallluck/scanline/app/windows" - "github.com/0skillallluck/scanline/app/secrets" - "github.com/jwijenbergh/puregotk/v4/adw" - "github.com/jwijenbergh/puregotk/v4/gio" ) func OnActivate(application *adw.Application) func(gio.Application) { diff --git a/app/appctx/appctx.go b/app/appctx/appctx.go index db627be..d790e18 100644 --- a/app/appctx/appctx.go +++ b/app/appctx/appctx.go @@ -3,8 +3,8 @@ package appctx import ( "context" + "codeberg.org/puregotk/puregotk/v4/gtk" "github.com/0skillallluck/scanline/app/sources" - "github.com/jwijenbergh/puregotk/v4/gtk" ) type AppContext struct { diff --git a/app/auth/signin.go b/app/auth/signin.go index 4d738e6..048f8d2 100644 --- a/app/auth/signin.go +++ b/app/auth/signin.go @@ -6,14 +6,14 @@ import ( "sync" "codeberg.org/dergs/tonearm/pkg/schwifty" + "codeberg.org/puregotk/puregotk/v4/adw" + "codeberg.org/puregotk/puregotk/v4/gtk" "github.com/0skillallluck/scanline/app/dialogs/linking" + "github.com/0skillallluck/scanline/app/secrets" "github.com/0skillallluck/scanline/app/sources" "github.com/0skillallluck/scanline/internal/gettext" - "github.com/0skillallluck/scanline/utils/notifications" - "github.com/0skillallluck/scanline/app/secrets" "github.com/0skillallluck/scanline/provider/plex/auth" - "github.com/jwijenbergh/puregotk/v4/adw" - "github.com/jwijenbergh/puregotk/v4/gtk" + "github.com/0skillallluck/scanline/utils/notifications" ) // PerformSignIn runs the full Plex sign-in flow in a goroutine: diff --git a/app/components/cards/cast.go b/app/components/cards/cast.go index 10d600b..9a8de85 100644 --- a/app/components/cards/cast.go +++ b/app/components/cards/cast.go @@ -3,10 +3,10 @@ package cards import ( "codeberg.org/dergs/tonearm/pkg/schwifty" . "codeberg.org/dergs/tonearm/pkg/schwifty/syntax" + "codeberg.org/puregotk/puregotk/v4/gtk" + "codeberg.org/puregotk/puregotk/v4/pango" "github.com/0skillallluck/scanline/app/preference" "github.com/0skillallluck/scanline/utils/imageutils" - "github.com/jwijenbergh/puregotk/v4/gtk" - "github.com/jwijenbergh/puregotk/v4/pango" ) func NewCastMember(name, role, thumbURL string) schwifty.Box { diff --git a/app/components/cards/info_card.go b/app/components/cards/info_card.go index 5a07145..9895d83 100644 --- a/app/components/cards/info_card.go +++ b/app/components/cards/info_card.go @@ -3,7 +3,7 @@ package cards import ( "codeberg.org/dergs/tonearm/pkg/schwifty" . "codeberg.org/dergs/tonearm/pkg/schwifty/syntax" - "github.com/jwijenbergh/puregotk/v4/gtk" + "codeberg.org/puregotk/puregotk/v4/gtk" ) func NewInfoCard(icon, title, subtitle string) schwifty.Box { diff --git a/app/components/cards/media_info.go b/app/components/cards/media_info.go index d226a28..9bab2a8 100644 --- a/app/components/cards/media_info.go +++ b/app/components/cards/media_info.go @@ -6,9 +6,9 @@ import ( "codeberg.org/dergs/tonearm/pkg/schwifty" . "codeberg.org/dergs/tonearm/pkg/schwifty/syntax" - "github.com/0skillallluck/scanline/internal/gettext" + "codeberg.org/puregotk/puregotk/v4/gtk" "github.com/0skillallluck/scanline/app/sources" - "github.com/jwijenbergh/puregotk/v4/gtk" + "github.com/0skillallluck/scanline/internal/gettext" ) // MediaInfo creates an HStack of info cards showing resolution, video codec, audio, and container. diff --git a/app/components/cards/poster.go b/app/components/cards/poster.go index ba733b2..c89a008 100644 --- a/app/components/cards/poster.go +++ b/app/components/cards/poster.go @@ -3,11 +3,11 @@ package cards import ( "codeberg.org/dergs/tonearm/pkg/schwifty" . "codeberg.org/dergs/tonearm/pkg/schwifty/syntax" + "codeberg.org/puregotk/puregotk/v4/gdk" + "codeberg.org/puregotk/puregotk/v4/gtk" + "codeberg.org/puregotk/puregotk/v4/pango" "github.com/0skillallluck/scanline/app/preference" "github.com/0skillallluck/scanline/utils/imageutils" - "github.com/jwijenbergh/puregotk/v4/gdk" - "github.com/jwijenbergh/puregotk/v4/gtk" - "github.com/jwijenbergh/puregotk/v4/pango" ) func poster[T any](title string, subTitle schwifty.Widgetable[T], coverURL string) schwifty.Button { diff --git a/app/components/cards/poster_episode.go b/app/components/cards/poster_episode.go index 8566ce4..2eb1fe8 100644 --- a/app/components/cards/poster_episode.go +++ b/app/components/cards/poster_episode.go @@ -5,8 +5,8 @@ import ( "codeberg.org/dergs/tonearm/pkg/schwifty" . "codeberg.org/dergs/tonearm/pkg/schwifty/syntax" + "codeberg.org/puregotk/puregotk/v4/glib" "github.com/0skillallluck/scanline/app/sources" - "github.com/jwijenbergh/puregotk/v4/glib" ) // NewEpisodePoster creates a new poster card for a tv-show episode. diff --git a/app/components/cards/poster_movie.go b/app/components/cards/poster_movie.go index 662a775..ecd484c 100644 --- a/app/components/cards/poster_movie.go +++ b/app/components/cards/poster_movie.go @@ -4,8 +4,8 @@ import ( "strconv" "codeberg.org/dergs/tonearm/pkg/schwifty" + "codeberg.org/puregotk/puregotk/v4/glib" "github.com/0skillallluck/scanline/app/sources" - "github.com/jwijenbergh/puregotk/v4/glib" ) // NewMoviePoster creates a new poster card for a movie. diff --git a/app/components/cards/poster_season.go b/app/components/cards/poster_season.go index 854eb03..2ef9936 100644 --- a/app/components/cards/poster_season.go +++ b/app/components/cards/poster_season.go @@ -2,9 +2,9 @@ package cards import ( "codeberg.org/dergs/tonearm/pkg/schwifty" + "codeberg.org/puregotk/puregotk/v4/glib" "github.com/0skillallluck/scanline/app/sources" "github.com/0skillallluck/scanline/internal/gettext" - "github.com/jwijenbergh/puregotk/v4/glib" ) // NewSeasonPoster creates a new poster card for a tv-show season. diff --git a/app/components/cards/poster_show.go b/app/components/cards/poster_show.go index 406b0cc..bd5f40b 100644 --- a/app/components/cards/poster_show.go +++ b/app/components/cards/poster_show.go @@ -2,9 +2,9 @@ package cards import ( "codeberg.org/dergs/tonearm/pkg/schwifty" + "codeberg.org/puregotk/puregotk/v4/glib" "github.com/0skillallluck/scanline/app/sources" "github.com/0skillallluck/scanline/internal/gettext" - "github.com/jwijenbergh/puregotk/v4/glib" ) // NewShowPoster creates a new poster card for a tv-show. diff --git a/app/components/cards/preview.go b/app/components/cards/preview.go index 35cb9d2..44dc9e6 100644 --- a/app/components/cards/preview.go +++ b/app/components/cards/preview.go @@ -3,11 +3,11 @@ package cards import ( "codeberg.org/dergs/tonearm/pkg/schwifty" . "codeberg.org/dergs/tonearm/pkg/schwifty/syntax" + "codeberg.org/puregotk/puregotk/v4/gdk" + "codeberg.org/puregotk/puregotk/v4/gtk" + "codeberg.org/puregotk/puregotk/v4/pango" "github.com/0skillallluck/scanline/app/preference" "github.com/0skillallluck/scanline/utils/imageutils" - "github.com/jwijenbergh/puregotk/v4/gdk" - "github.com/jwijenbergh/puregotk/v4/gtk" - "github.com/jwijenbergh/puregotk/v4/pango" ) func previewCard[T any](title string, subTitle schwifty.Widgetable[T], artURL string, progress float64) schwifty.Button { diff --git a/app/components/cards/preview_episode.go b/app/components/cards/preview_episode.go index 5259ece..0581948 100644 --- a/app/components/cards/preview_episode.go +++ b/app/components/cards/preview_episode.go @@ -5,8 +5,8 @@ import ( "codeberg.org/dergs/tonearm/pkg/schwifty" . "codeberg.org/dergs/tonearm/pkg/schwifty/syntax" + "codeberg.org/puregotk/puregotk/v4/glib" "github.com/0skillallluck/scanline/app/sources" - "github.com/jwijenbergh/puregotk/v4/glib" ) // NewEpisodePreviewCard creates a new 16:9 preview card for a tv-show episode. diff --git a/app/components/cards/preview_movie.go b/app/components/cards/preview_movie.go index 28a5501..57cc036 100644 --- a/app/components/cards/preview_movie.go +++ b/app/components/cards/preview_movie.go @@ -4,8 +4,8 @@ import ( "strconv" "codeberg.org/dergs/tonearm/pkg/schwifty" + "codeberg.org/puregotk/puregotk/v4/glib" "github.com/0skillallluck/scanline/app/sources" - "github.com/jwijenbergh/puregotk/v4/glib" ) // NewMoviePreviewCard creates a new 16:9 preview card for a movie. diff --git a/app/components/cards/season_episode.go b/app/components/cards/season_episode.go index 5fd54ec..0a767a4 100644 --- a/app/components/cards/season_episode.go +++ b/app/components/cards/season_episode.go @@ -3,14 +3,14 @@ package cards import ( "codeberg.org/dergs/tonearm/pkg/schwifty" . "codeberg.org/dergs/tonearm/pkg/schwifty/syntax" + "codeberg.org/puregotk/puregotk/v4/gdk" + "codeberg.org/puregotk/puregotk/v4/glib" + "codeberg.org/puregotk/puregotk/v4/gtk" + "codeberg.org/puregotk/puregotk/v4/pango" "github.com/0skillallluck/scanline/app/preference" "github.com/0skillallluck/scanline/app/sources" "github.com/0skillallluck/scanline/internal/gettext" "github.com/0skillallluck/scanline/utils/imageutils" - "github.com/jwijenbergh/puregotk/v4/gdk" - "github.com/jwijenbergh/puregotk/v4/glib" - "github.com/jwijenbergh/puregotk/v4/gtk" - "github.com/jwijenbergh/puregotk/v4/pango" ) func NewSeasonEpisode(metadata *sources.Metadata, coverURL, serverID string) schwifty.Button { diff --git a/app/components/cards/subtitle.go b/app/components/cards/subtitle.go index f6c20a4..f758d68 100644 --- a/app/components/cards/subtitle.go +++ b/app/components/cards/subtitle.go @@ -3,8 +3,8 @@ package cards import ( "codeberg.org/dergs/tonearm/pkg/schwifty" . "codeberg.org/dergs/tonearm/pkg/schwifty/syntax" - "github.com/jwijenbergh/puregotk/v4/gtk" - "github.com/jwijenbergh/puregotk/v4/pango" + "codeberg.org/puregotk/puregotk/v4/gtk" + "codeberg.org/puregotk/puregotk/v4/pango" ) func subTitle(text string) schwifty.Label { diff --git a/app/components/lists/horizontal_list.go b/app/components/lists/horizontal_list.go index 186e248..062b171 100644 --- a/app/components/lists/horizontal_list.go +++ b/app/components/lists/horizontal_list.go @@ -3,12 +3,12 @@ package lists import ( "math" - "github.com/0skillallluck/scanline/internal/gettext" - "github.com/0skillallluck/scanline/app/router" "codeberg.org/dergs/tonearm/pkg/schwifty" "codeberg.org/dergs/tonearm/pkg/schwifty/state" . "codeberg.org/dergs/tonearm/pkg/schwifty/syntax" - "github.com/jwijenbergh/puregotk/v4/gtk" + "codeberg.org/puregotk/puregotk/v4/gtk" + "github.com/0skillallluck/scanline/app/router" + "github.com/0skillallluck/scanline/internal/gettext" ) type HorizontalList struct { diff --git a/app/components/player/player.go b/app/components/player/player.go index a87ec4d..cd80425 100644 --- a/app/components/player/player.go +++ b/app/components/player/player.go @@ -9,12 +9,12 @@ import ( "codeberg.org/dergs/tonearm/pkg/schwifty" . "codeberg.org/dergs/tonearm/pkg/schwifty/syntax" + "codeberg.org/puregotk/puregotk/v4/gdk" + "codeberg.org/puregotk/puregotk/v4/gio" + "codeberg.org/puregotk/puregotk/v4/glib" + "codeberg.org/puregotk/puregotk/v4/gtk" "github.com/0skillallluck/scanline/app/sources" "github.com/google/uuid" - "github.com/jwijenbergh/puregotk/v4/gdk" - "github.com/jwijenbergh/puregotk/v4/gio" - "github.com/jwijenbergh/puregotk/v4/glib" - "github.com/jwijenbergh/puregotk/v4/gtk" ) // PlayerParams configures a new player window. @@ -23,7 +23,7 @@ type PlayerParams struct { Title string PartKey string // raw media part key (e.g. "/library/parts/12345/file.mkv") Window *gtk.Window - RatingKey string // metadata ratingKey + RatingKey string // metadata ratingKey Media []sources.Media // full Media array from Metadata Source sources.Source // the source for this playback } diff --git a/app/components/player/settings.go b/app/components/player/settings.go index d0e16de..9b5ef08 100644 --- a/app/components/player/settings.go +++ b/app/components/player/settings.go @@ -7,9 +7,9 @@ import ( "codeberg.org/dergs/tonearm/pkg/schwifty" . "codeberg.org/dergs/tonearm/pkg/schwifty/syntax" - "github.com/0skillallluck/scanline/internal/gettext" + "codeberg.org/puregotk/puregotk/v4/gtk" "github.com/0skillallluck/scanline/app/sources" - "github.com/jwijenbergh/puregotk/v4/gtk" + "github.com/0skillallluck/scanline/internal/gettext" ) type qualityPreset struct { diff --git a/app/components/route_button.go b/app/components/route_button.go index fb179f7..4b6ce30 100644 --- a/app/components/route_button.go +++ b/app/components/route_button.go @@ -5,9 +5,9 @@ import ( "codeberg.org/dergs/tonearm/pkg/schwifty" . "codeberg.org/dergs/tonearm/pkg/schwifty/syntax" + "codeberg.org/puregotk/puregotk/v4/gtk" "github.com/0skillallluck/scanline/app/router" "github.com/0skillallluck/scanline/internal/signals" - "github.com/jwijenbergh/puregotk/v4/gtk" ) type RouteButton struct { diff --git a/app/components/widgets/hero.go b/app/components/widgets/hero.go index a62a1fc..b904c0d 100644 --- a/app/components/widgets/hero.go +++ b/app/components/widgets/hero.go @@ -5,13 +5,13 @@ import ( "codeberg.org/dergs/tonearm/pkg/schwifty" . "codeberg.org/dergs/tonearm/pkg/schwifty/syntax" + "codeberg.org/puregotk/puregotk/v4/gdk" + "codeberg.org/puregotk/puregotk/v4/gtk" + "codeberg.org/puregotk/puregotk/v4/pango" "github.com/0skillallluck/scanline/app/preference" "github.com/0skillallluck/scanline/app/sources" "github.com/0skillallluck/scanline/internal/gettext" "github.com/0skillallluck/scanline/utils/imageutils" - "github.com/jwijenbergh/puregotk/v4/gdk" - "github.com/jwijenbergh/puregotk/v4/gtk" - "github.com/jwijenbergh/puregotk/v4/pango" ) // HeroPosterParams configures the poster image in a hero section. diff --git a/app/components/widgets/ratings.go b/app/components/widgets/ratings.go index e11bb20..3420278 100644 --- a/app/components/widgets/ratings.go +++ b/app/components/widgets/ratings.go @@ -6,8 +6,8 @@ import ( "codeberg.org/dergs/tonearm/pkg/schwifty" . "codeberg.org/dergs/tonearm/pkg/schwifty/syntax" + "codeberg.org/puregotk/puregotk/v4/gdk" "github.com/0skillallluck/scanline/app/sources" - "github.com/jwijenbergh/puregotk/v4/gdk" ) // RatingsParams contains the rating values for the Ratings component. diff --git a/app/dialogs/about/about.go b/app/dialogs/about/about.go index fbb8c22..7b29c89 100644 --- a/app/dialogs/about/about.go +++ b/app/dialogs/about/about.go @@ -4,9 +4,9 @@ import ( "fmt" "regexp" + "codeberg.org/puregotk/puregotk/v4/adw" + "codeberg.org/puregotk/puregotk/v4/gtk" "github.com/0skillallluck/scanline/internal/gettext" - "github.com/jwijenbergh/puregotk/v4/adw" - "github.com/jwijenbergh/puregotk/v4/gtk" ) var ( @@ -131,7 +131,7 @@ func NewAboutDialog() *adw.AboutDialog { dialog.AddLegalSection("DBus Client (godbus/dbus)", "© 2020 Georg Reinke https://github.com/godbus/dbus", gtk.LicenseBsdValue, "") dialog.AddLegalSection("UUID (google/uuid)", "© 2009, 2014 Google Inc. https://github.com/google/uuid", gtk.LicenseBsd3Value, "") dialog.AddLegalSection("System Locale Detection (jeandeaual/go-locale)", "© 2020 Alexis Jeandeau https://github.com/jeandeaual/go-locale", gtk.LicenseMitX11Value, "") - dialog.AddLegalSection("GTK4 / Libadwaita Bindings (jwijenbergh/puregotk)", "© 2022 Kyle McGough https://github.com/jwijenbergh/puregotk", gtk.LicenseMitX11Value, "") + dialog.AddLegalSection("GTK4 / Libadwaita Bindings (jwijenbergh/puregotk)", "© 2022 Kyle McGough https://codeberg.org/puregotk/puregotk", gtk.LicenseMitX11Value, "") dialog.AddLegalSection("Libsecret (lescuer97/go-libsecret)", "© 2025 Leonardo Escuer https://github.com/lescuer97/go-libsecret", gtk.LicenseMitX11Value, "") dialog.AddLegalSection("JSON Merger (qjebbs/go-jsons)", "© 2022 Jebbs https://github.com/qjebbs/go-jsons", gtk.LicenseMitX11Value, "") dialog.AddLegalSection("ISO8601 Duration Parser (osodev/duration)", "© 2023 Jeroen Wijenbergh https://github.com/sosodev/duration", gtk.LicenseMitX11Value, "") diff --git a/app/dialogs/linking/linking.go b/app/dialogs/linking/linking.go index e165144..b29cef2 100644 --- a/app/dialogs/linking/linking.go +++ b/app/dialogs/linking/linking.go @@ -8,11 +8,11 @@ import ( "codeberg.org/dergs/tonearm/pkg/schwifty" . "codeberg.org/dergs/tonearm/pkg/schwifty/syntax" + "codeberg.org/puregotk/puregotk/v4/adw" + "codeberg.org/puregotk/puregotk/v4/gdk" + "codeberg.org/puregotk/puregotk/v4/glib" + "codeberg.org/puregotk/puregotk/v4/gtk" "github.com/0skillallluck/scanline/internal/gettext" - "github.com/jwijenbergh/puregotk/v4/adw" - "github.com/jwijenbergh/puregotk/v4/gdk" - "github.com/jwijenbergh/puregotk/v4/glib" - "github.com/jwijenbergh/puregotk/v4/gtk" "github.com/yeqown/go-qrcode/v2" "github.com/yeqown/go-qrcode/writer/standard" "github.com/yeqown/go-qrcode/writer/standard/shapes" diff --git a/app/dialogs/preferences/experimental.go b/app/dialogs/preferences/experimental.go index d6e1d11..ca296c2 100644 --- a/app/dialogs/preferences/experimental.go +++ b/app/dialogs/preferences/experimental.go @@ -2,9 +2,9 @@ package preferences import ( . "codeberg.org/dergs/tonearm/pkg/schwifty/syntax" - "github.com/0skillallluck/scanline/internal/gettext" + "codeberg.org/puregotk/puregotk/v4/adw" "github.com/0skillallluck/scanline/app/preference" - "github.com/jwijenbergh/puregotk/v4/adw" + "github.com/0skillallluck/scanline/internal/gettext" ) var experimentalPreferences = PreferencesPage( diff --git a/app/dialogs/preferences/general.go b/app/dialogs/preferences/general.go index 0c1337e..31bc7ee 100644 --- a/app/dialogs/preferences/general.go +++ b/app/dialogs/preferences/general.go @@ -2,10 +2,10 @@ package preferences import ( . "codeberg.org/dergs/tonearm/pkg/schwifty/syntax" - "github.com/0skillallluck/scanline/internal/gettext" + "codeberg.org/puregotk/puregotk/v4/adw" + "codeberg.org/puregotk/puregotk/v4/gtk" "github.com/0skillallluck/scanline/app/preference" - "github.com/jwijenbergh/puregotk/v4/adw" - "github.com/jwijenbergh/puregotk/v4/gtk" + "github.com/0skillallluck/scanline/internal/gettext" ) var generalPreferences = PreferencesPage( diff --git a/app/dialogs/preferences/performance.go b/app/dialogs/preferences/performance.go index 3a67cac..50019e1 100644 --- a/app/dialogs/preferences/performance.go +++ b/app/dialogs/preferences/performance.go @@ -2,10 +2,10 @@ package preferences import ( . "codeberg.org/dergs/tonearm/pkg/schwifty/syntax" - "github.com/0skillallluck/scanline/internal/gettext" + "codeberg.org/puregotk/puregotk/v4/adw" "github.com/0skillallluck/scanline/app/preference" + "github.com/0skillallluck/scanline/internal/gettext" "github.com/0skillallluck/scanline/utils/cacheutils" - "github.com/jwijenbergh/puregotk/v4/adw" ) var performancePreferences = PreferencesPage( diff --git a/app/dialogs/secretservice/secret_service.go b/app/dialogs/secretservice/secret_service.go index 337d863..fe1ac04 100644 --- a/app/dialogs/secretservice/secret_service.go +++ b/app/dialogs/secretservice/secret_service.go @@ -2,11 +2,11 @@ package secretservice import ( . "codeberg.org/dergs/tonearm/pkg/schwifty/syntax" - "github.com/0skillallluck/scanline/internal/gettext" - "github.com/0skillallluck/scanline/app/secrets" + "codeberg.org/puregotk/puregotk/v4/adw" + "codeberg.org/puregotk/puregotk/v4/gtk" "github.com/0skillallluck/scanline/app/preference" - "github.com/jwijenbergh/puregotk/v4/adw" - "github.com/jwijenbergh/puregotk/v4/gtk" + "github.com/0skillallluck/scanline/app/secrets" + "github.com/0skillallluck/scanline/internal/gettext" ) // PresentSecretServiceErrorDialog creates and presents a dialog to display secret service errors. diff --git a/app/dialogs/sources/sources.go b/app/dialogs/sources/sources.go index c753a69..47e6386 100644 --- a/app/dialogs/sources/sources.go +++ b/app/dialogs/sources/sources.go @@ -5,11 +5,11 @@ import ( "codeberg.org/dergs/tonearm/pkg/schwifty" . "codeberg.org/dergs/tonearm/pkg/schwifty/syntax" + "codeberg.org/puregotk/puregotk/v4/adw" + "codeberg.org/puregotk/puregotk/v4/gtk" appauth "github.com/0skillallluck/scanline/app/auth" "github.com/0skillallluck/scanline/app/sources" "github.com/0skillallluck/scanline/internal/gettext" - "github.com/jwijenbergh/puregotk/v4/adw" - "github.com/jwijenbergh/puregotk/v4/gtk" ) func NewSourceSelection(ctx context.Context, window *gtk.Window, mgr *sources.Manager, onDone func()) *adw.Dialog { diff --git a/app/pages/episode.go b/app/pages/episode.go index 7f085bf..4d1ef19 100644 --- a/app/pages/episode.go +++ b/app/pages/episode.go @@ -6,15 +6,15 @@ import ( "codeberg.org/dergs/tonearm/pkg/schwifty" . "codeberg.org/dergs/tonearm/pkg/schwifty/syntax" + "codeberg.org/puregotk/puregotk/v4/gtk" "github.com/0skillallluck/scanline/app/appctx" "github.com/0skillallluck/scanline/app/components/cards" "github.com/0skillallluck/scanline/app/components/lists" "github.com/0skillallluck/scanline/app/components/player" "github.com/0skillallluck/scanline/app/components/widgets" - "github.com/0skillallluck/scanline/internal/gettext" "github.com/0skillallluck/scanline/app/router" + "github.com/0skillallluck/scanline/internal/gettext" "github.com/0skillallluck/scanline/utils/notifications" - "github.com/jwijenbergh/puregotk/v4/gtk" ) var EpisodeRoute = router.NewRoute("episode/:server/:ratingKey", Episode) diff --git a/app/pages/home.go b/app/pages/home.go index 7f89cfc..8c8a919 100644 --- a/app/pages/home.go +++ b/app/pages/home.go @@ -4,13 +4,13 @@ import ( "log/slog" . "codeberg.org/dergs/tonearm/pkg/schwifty/syntax" + "codeberg.org/puregotk/puregotk/v4/gtk" "github.com/0skillallluck/scanline/app/appctx" "github.com/0skillallluck/scanline/app/components/cards" "github.com/0skillallluck/scanline/app/components/lists" "github.com/0skillallluck/scanline/app/router" "github.com/0skillallluck/scanline/app/sources" "github.com/0skillallluck/scanline/internal/gettext" - "github.com/jwijenbergh/puregotk/v4/gtk" ) var HomeRoute = router.NewRoute("home", home) diff --git a/app/pages/library.go b/app/pages/library.go index f39e5b7..b155d76 100644 --- a/app/pages/library.go +++ b/app/pages/library.go @@ -2,13 +2,13 @@ package pages import ( . "codeberg.org/dergs/tonearm/pkg/schwifty/syntax" + "codeberg.org/puregotk/puregotk/v4/adw" + "codeberg.org/puregotk/puregotk/v4/gtk" "github.com/0skillallluck/scanline/app/appctx" "github.com/0skillallluck/scanline/app/components/lists" + "github.com/0skillallluck/scanline/app/router" "github.com/0skillallluck/scanline/app/sources" "github.com/0skillallluck/scanline/internal/gettext" - "github.com/0skillallluck/scanline/app/router" - "github.com/jwijenbergh/puregotk/v4/adw" - "github.com/jwijenbergh/puregotk/v4/gtk" ) var LibraryRoute = router.NewRoute("library/:server/:id", Library) diff --git a/app/pages/movie.go b/app/pages/movie.go index 97a54b4..44ddca5 100644 --- a/app/pages/movie.go +++ b/app/pages/movie.go @@ -7,16 +7,16 @@ import ( "codeberg.org/dergs/tonearm/pkg/schwifty" . "codeberg.org/dergs/tonearm/pkg/schwifty/syntax" + "codeberg.org/puregotk/puregotk/v4/gtk" "github.com/0skillallluck/scanline/app/appctx" "github.com/0skillallluck/scanline/app/components/cards" "github.com/0skillallluck/scanline/app/components/lists" "github.com/0skillallluck/scanline/app/components/player" "github.com/0skillallluck/scanline/app/components/widgets" + "github.com/0skillallluck/scanline/app/router" "github.com/0skillallluck/scanline/app/sources" "github.com/0skillallluck/scanline/internal/gettext" - "github.com/0skillallluck/scanline/app/router" "github.com/0skillallluck/scanline/utils/notifications" - "github.com/jwijenbergh/puregotk/v4/gtk" ) var MovieRoute = router.NewRoute("movie/:server/:ratingKey", Movie) diff --git a/app/pages/search.go b/app/pages/search.go index 879b40a..be04b34 100644 --- a/app/pages/search.go +++ b/app/pages/search.go @@ -6,11 +6,11 @@ import ( "codeberg.org/dergs/tonearm/pkg/schwifty/state" . "codeberg.org/dergs/tonearm/pkg/schwifty/syntax" + "codeberg.org/puregotk/puregotk/v4/gtk" "github.com/0skillallluck/scanline/app/appctx" "github.com/0skillallluck/scanline/app/pages/search" - "github.com/0skillallluck/scanline/internal/gettext" "github.com/0skillallluck/scanline/app/router" - "github.com/jwijenbergh/puregotk/v4/gtk" + "github.com/0skillallluck/scanline/internal/gettext" ) var SearchRoute = router.NewRoute("search", func(appCtx *appctx.AppContext) *router.Response { diff --git a/app/pages/search/results.go b/app/pages/search/results.go index c40a662..312fee6 100644 --- a/app/pages/search/results.go +++ b/app/pages/search/results.go @@ -3,9 +3,9 @@ package search import ( "codeberg.org/dergs/tonearm/pkg/schwifty" . "codeberg.org/dergs/tonearm/pkg/schwifty/syntax" + "codeberg.org/puregotk/puregotk/v4/gtk" "github.com/0skillallluck/scanline/app/components/lists" "github.com/0skillallluck/scanline/app/sources" - "github.com/jwijenbergh/puregotk/v4/gtk" ) func Results(hubs []sources.Hub, coverURL func(string) string, serverID string) schwifty.Box { diff --git a/app/pages/season.go b/app/pages/season.go index 830d7ef..55c2ae1 100644 --- a/app/pages/season.go +++ b/app/pages/season.go @@ -5,12 +5,12 @@ import ( "log/slog" . "codeberg.org/dergs/tonearm/pkg/schwifty/syntax" + "codeberg.org/puregotk/puregotk/v4/gtk" "github.com/0skillallluck/scanline/app/appctx" "github.com/0skillallluck/scanline/app/components/cards" "github.com/0skillallluck/scanline/app/components/widgets" - "github.com/0skillallluck/scanline/internal/gettext" "github.com/0skillallluck/scanline/app/router" - "github.com/jwijenbergh/puregotk/v4/gtk" + "github.com/0skillallluck/scanline/internal/gettext" ) var SeasonRoute = router.NewRoute("season/:server/:ratingKey", Season) diff --git a/app/pages/show.go b/app/pages/show.go index 2bf7fa7..1a36d66 100644 --- a/app/pages/show.go +++ b/app/pages/show.go @@ -5,13 +5,13 @@ import ( "log/slog" . "codeberg.org/dergs/tonearm/pkg/schwifty/syntax" + "codeberg.org/puregotk/puregotk/v4/gtk" "github.com/0skillallluck/scanline/app/appctx" "github.com/0skillallluck/scanline/app/components/cards" "github.com/0skillallluck/scanline/app/components/lists" "github.com/0skillallluck/scanline/app/components/widgets" - "github.com/0skillallluck/scanline/internal/gettext" "github.com/0skillallluck/scanline/app/router" - "github.com/jwijenbergh/puregotk/v4/gtk" + "github.com/0skillallluck/scanline/internal/gettext" ) var ShowRoute = router.NewRoute("show/:server/:ratingKey", Show) diff --git a/app/preference/experimental.go b/app/preference/experimental.go index f7cfb14..d3ce9f5 100644 --- a/app/preference/experimental.go +++ b/app/preference/experimental.go @@ -1,8 +1,8 @@ package preference import ( - "github.com/jwijenbergh/puregotk/v4/gio" - "github.com/jwijenbergh/puregotk/v4/gobject" + "codeberg.org/puregotk/puregotk/v4/gio" + "codeberg.org/puregotk/puregotk/v4/gobject" ) type ExperimentalSettings struct { diff --git a/app/preference/general.go b/app/preference/general.go index 3de0361..576028d 100644 --- a/app/preference/general.go +++ b/app/preference/general.go @@ -1,7 +1,7 @@ package preference import ( - "github.com/jwijenbergh/puregotk/v4/gio" + "codeberg.org/puregotk/puregotk/v4/gio" ) type GeneralSettings struct { diff --git a/app/preference/performance.go b/app/preference/performance.go index 92e854d..c6f5acf 100644 --- a/app/preference/performance.go +++ b/app/preference/performance.go @@ -1,8 +1,8 @@ package preference import ( - "github.com/jwijenbergh/puregotk/v4/gio" - "github.com/jwijenbergh/puregotk/v4/gobject" + "codeberg.org/puregotk/puregotk/v4/gio" + "codeberg.org/puregotk/puregotk/v4/gobject" ) type PerformanceSettings struct { diff --git a/app/preference/preference.go b/app/preference/preference.go index 068dc29..f4ec0d4 100644 --- a/app/preference/preference.go +++ b/app/preference/preference.go @@ -3,8 +3,8 @@ package preference import ( "runtime" + "codeberg.org/puregotk/puregotk/v4/gio" "github.com/0skillallluck/scanline/internal/g" - "github.com/jwijenbergh/puregotk/v4/gio" ) var General = g.Lazy(func() *GeneralSettings { diff --git a/app/router/history.go b/app/router/history.go index 3714cb7..3f8b002 100644 --- a/app/router/history.go +++ b/app/router/history.go @@ -4,9 +4,9 @@ import ( "sync" "time" + "codeberg.org/puregotk/puregotk/v4/gtk" "github.com/0skillallluck/scanline/app/preference" "github.com/0skillallluck/scanline/internal/signals" - "github.com/jwijenbergh/puregotk/v4/gtk" ) type HistoryEntry struct { diff --git a/app/windows/main.go b/app/windows/main.go index a58c710..cca1de3 100644 --- a/app/windows/main.go +++ b/app/windows/main.go @@ -6,18 +6,18 @@ import ( "codeberg.org/dergs/tonearm/pkg/schwifty" . "codeberg.org/dergs/tonearm/pkg/schwifty/syntax" + "codeberg.org/puregotk/puregotk/v4/adw" + "codeberg.org/puregotk/puregotk/v4/gobject" + "codeberg.org/puregotk/puregotk/v4/gtk" "github.com/0skillallluck/scanline/app/appctx" "github.com/0skillallluck/scanline/app/dialogs/about" "github.com/0skillallluck/scanline/app/dialogs/sources" + "github.com/0skillallluck/scanline/app/preference" + "github.com/0skillallluck/scanline/app/router" "github.com/0skillallluck/scanline/internal/g" "github.com/0skillallluck/scanline/internal/gettext" - "github.com/0skillallluck/scanline/utils/notifications" - "github.com/0skillallluck/scanline/app/router" - "github.com/0skillallluck/scanline/app/preference" "github.com/0skillallluck/scanline/internal/signals" - "github.com/jwijenbergh/puregotk/v4/adw" - "github.com/jwijenbergh/puregotk/v4/gobject" - "github.com/jwijenbergh/puregotk/v4/gtk" + "github.com/0skillallluck/scanline/utils/notifications" _ "github.com/0skillallluck/scanline/app/pages" _ "github.com/0skillallluck/scanline/app/pages/search" diff --git a/app/windows/main_actions.go b/app/windows/main_actions.go index 2f88092..ae2d78a 100644 --- a/app/windows/main_actions.go +++ b/app/windows/main_actions.go @@ -4,15 +4,15 @@ import ( "unsafe" "codeberg.org/dergs/tonearm/pkg/schwifty" + "codeberg.org/puregotk/puregotk/v4/adw" + "codeberg.org/puregotk/puregotk/v4/gio" + "codeberg.org/puregotk/puregotk/v4/glib" + "codeberg.org/puregotk/puregotk/v4/gtk" "github.com/0skillallluck/scanline/app/dialogs/about" "github.com/0skillallluck/scanline/app/dialogs/preferences" "github.com/0skillallluck/scanline/app/dialogs/shortcuts" "github.com/0skillallluck/scanline/app/dialogs/sources" "github.com/0skillallluck/scanline/app/router" - "github.com/jwijenbergh/puregotk/v4/adw" - "github.com/jwijenbergh/puregotk/v4/gio" - "github.com/jwijenbergh/puregotk/v4/glib" - "github.com/jwijenbergh/puregotk/v4/gtk" ) // installAppActions installs actions that live for the entire app lifecycle: diff --git a/app/windows/main_content.go b/app/windows/main_content.go index 9bc5713..5c812e8 100644 --- a/app/windows/main_content.go +++ b/app/windows/main_content.go @@ -7,15 +7,15 @@ import ( "codeberg.org/dergs/tonearm/pkg/schwifty" "codeberg.org/dergs/tonearm/pkg/schwifty/state" . "codeberg.org/dergs/tonearm/pkg/schwifty/syntax" + "codeberg.org/puregotk/puregotk/v4/adw" + "codeberg.org/puregotk/puregotk/v4/gio" + "codeberg.org/puregotk/puregotk/v4/gtk" "github.com/0skillallluck/scanline/app/components" + "github.com/0skillallluck/scanline/app/preference" + "github.com/0skillallluck/scanline/app/router" "github.com/0skillallluck/scanline/app/sources" "github.com/0skillallluck/scanline/internal/gettext" - "github.com/0skillallluck/scanline/app/router" - "github.com/0skillallluck/scanline/app/preference" "github.com/0skillallluck/scanline/internal/signals" - "github.com/jwijenbergh/puregotk/v4/adw" - "github.com/jwijenbergh/puregotk/v4/gio" - "github.com/jwijenbergh/puregotk/v4/gtk" ) var decorationLayoutState = state.NewStateful("icon,appmenu:close") diff --git a/assets/meta/go.mod.yml b/assets/meta/go.mod.yml index 46f2b80..212db95 100644 --- a/assets/meta/go.mod.yml +++ b/assets/meta/go.mod.yml @@ -17,11 +17,11 @@ strip-components: 3 type: archive url: https://proxy.golang.org/github.com/jeandeaual/go-locale/@v/v0.0.0-20250612000132-0ef82f21eade.zip -- dest: vendor/github.com/jwijenbergh/puregotk +- dest: vendor/codeberg.org/puregotk/puregotk sha256: 56947051fb1de3cb0f0c60640d258f810fa92615c51f2eee5590086f8552baa2 strip-components: 3 type: archive - url: https://proxy.golang.org/github.com/jwijenbergh/puregotk/@v/v0.0.0-20260115100645-c78e1521129b.zip + url: https://proxy.golang.org/codeberg.org/puregotk/puregotk/@v/v0.0.0-20260115100645-c78e1521129b.zip - dest: vendor/github.com/keybase/go-keychain sha256: 9514a68da08d39d60a47640bef049e44c829aab5dbbddd03d272e9252039a5c7 strip-components: 3 diff --git a/assets/meta/modules.txt b/assets/meta/modules.txt index 12fa82b..d4e8e49 100644 --- a/assets/meta/modules.txt +++ b/assets/meta/modules.txt @@ -31,23 +31,23 @@ github.com/jwijenbergh/purego/internal/cgo github.com/jwijenbergh/purego/internal/fakecgo github.com/jwijenbergh/purego/internal/strings github.com/jwijenbergh/purego/internal/xreflect -# github.com/jwijenbergh/puregotk v0.0.0-20260115100645-c78e1521129b +# codeberg.org/puregotk/puregotk v0.0.0-20260115100645-c78e1521129b ## explicit; go 1.23.0 -github.com/jwijenbergh/puregotk/internal/core -github.com/jwijenbergh/puregotk/pkg/core -github.com/jwijenbergh/puregotk/v4/adw -github.com/jwijenbergh/puregotk/v4/cairo -github.com/jwijenbergh/puregotk/v4/gdk -github.com/jwijenbergh/puregotk/v4/gdkpixbuf -github.com/jwijenbergh/puregotk/v4/gio -github.com/jwijenbergh/puregotk/v4/glib -github.com/jwijenbergh/puregotk/v4/gmodule -github.com/jwijenbergh/puregotk/v4/gobject -github.com/jwijenbergh/puregotk/v4/gobject/types -github.com/jwijenbergh/puregotk/v4/graphene -github.com/jwijenbergh/puregotk/v4/gsk -github.com/jwijenbergh/puregotk/v4/gtk -github.com/jwijenbergh/puregotk/v4/pango +codeberg.org/puregotk/puregotk/internal/core +codeberg.org/puregotk/puregotk/pkg/core +codeberg.org/puregotk/puregotk/v4/adw +codeberg.org/puregotk/puregotk/v4/cairo +codeberg.org/puregotk/puregotk/v4/gdk +codeberg.org/puregotk/puregotk/v4/gdkpixbuf +codeberg.org/puregotk/puregotk/v4/gio +codeberg.org/puregotk/puregotk/v4/glib +codeberg.org/puregotk/puregotk/v4/gmodule +codeberg.org/puregotk/puregotk/v4/gobject +codeberg.org/puregotk/puregotk/v4/gobject/types +codeberg.org/puregotk/puregotk/v4/graphene +codeberg.org/puregotk/puregotk/v4/gsk +codeberg.org/puregotk/puregotk/v4/gtk +codeberg.org/puregotk/puregotk/v4/pango # github.com/keybase/go-keychain v0.0.1 ## explicit; go 1.21 github.com/keybase/go-keychain diff --git a/go.mod b/go.mod index ea3f029..d7914a6 100644 --- a/go.mod +++ b/go.mod @@ -4,9 +4,9 @@ go 1.26.0 require ( codeberg.org/dergs/tonearm v1.4.1-0.20260304095737-2bc41c208498 + codeberg.org/puregotk/puregotk v0.0.0-20260226083027-5647eb6a2bba github.com/google/uuid v1.6.0 github.com/jeandeaual/go-locale v0.0.0-20250612000132-0ef82f21eade - github.com/jwijenbergh/puregotk v0.0.0-20260115100645-c78e1521129b github.com/keybase/go-keychain v0.0.1 github.com/leonelquinteros/gotext v1.7.2 github.com/lescuer97/go-libsecret v0.0.0-20251130160347-067b741bcf5a @@ -15,9 +15,9 @@ require ( ) require ( + codeberg.org/puregotk/purego v0.0.0-20260224095105-2513c838cb80 // indirect github.com/fogleman/gg v1.3.0 // indirect github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect - github.com/jwijenbergh/purego v0.0.0-20251017112123-b71757b9ba42 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/yeqown/reedsolomon v1.0.0 // indirect golang.org/x/image v0.36.0 // indirect diff --git a/go.sum b/go.sum index 180705a..ba83f28 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,7 @@ -codeberg.org/dergs/tonearm v1.4.0 h1:YHKAn7EIRsCmLhjQD34RsbHFqPqzA/PPqNLrbQQtCjs= -codeberg.org/dergs/tonearm v1.4.0/go.mod h1:SNCwGgi0rUBx04oA3xWoJey9RsNRdC+kSjmt3iwWgfg= codeberg.org/dergs/tonearm v1.4.1-0.20260304095737-2bc41c208498 h1:AboL9yBPVCXMISsHh+CtQDYvKyoRS+ParsmBvy2Q5w0= codeberg.org/dergs/tonearm v1.4.1-0.20260304095737-2bc41c208498/go.mod h1:0tdRotuB0qHS0o4fEHZpyJqHXH3RCfiv2HaZCBSB3e0= +codeberg.org/puregotk/purego v0.0.0-20260224095105-2513c838cb80 h1:y5ZxMLLOjl4xc2tBl02olxZQ06xbbKiR+2ipBfDrVcs= +codeberg.org/puregotk/purego v0.0.0-20260224095105-2513c838cb80/go.mod h1:hVVM4ddvYRlc3IcK3CXJPlMwd/vaLj7gdDBZ6oPgT8w= codeberg.org/puregotk/puregotk v0.0.0-20260226083027-5647eb6a2bba h1:vaq9DqM7xkLsqKP7aYvVwirqStiJk6OnXy12BtwiG6k= codeberg.org/puregotk/puregotk v0.0.0-20260226083027-5647eb6a2bba/go.mod h1:Q2E89WEkiGRObalH0QeYJe19f1H+6cn40xavs9+cxdU= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= @@ -14,10 +14,6 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/jeandeaual/go-locale v0.0.0-20250612000132-0ef82f21eade h1:FmusiCI1wHw+XQbvL9M+1r/C3SPqKrmBaIOYwVfQoDE= github.com/jeandeaual/go-locale v0.0.0-20250612000132-0ef82f21eade/go.mod h1:ZDXo8KHryOWSIqnsb/CiDq7hQUYryCgdVnxbj8tDG7o= -github.com/jwijenbergh/purego v0.0.0-20251017112123-b71757b9ba42 h1:kQ0LX4ffJvtONhymro3HzrB8XUa6dIGgrbnkl38Rgl0= -github.com/jwijenbergh/purego v0.0.0-20251017112123-b71757b9ba42/go.mod h1:amE5lVGstyh2GTEIHFEbgJHmoMD0llIuapnzIlZx7Fc= -github.com/jwijenbergh/puregotk v0.0.0-20260115100645-c78e1521129b h1:V1Fap0BIdI1DbO4Q1cgLcDJm/wBSgkX0S73wZLwPXyI= -github.com/jwijenbergh/puregotk v0.0.0-20260115100645-c78e1521129b/go.mod h1:mZu8qSvCSqtVL+xoiebZuicnJijwrLfGRs6/eTVgFlc= github.com/keybase/go-keychain v0.0.1 h1:way+bWYa6lDppZoZcgMbYsvC7GxljxrskdNInRtuthU= github.com/keybase/go-keychain v0.0.1/go.mod h1:PdEILRW3i9D8JcdM+FmY6RwkHGnhHxXwkPPMeUgOK1k= github.com/leonelquinteros/gotext v1.7.2 h1:bDPndU8nt+/kRo1m4l/1OXiiy2v7Z7dfPQ9+YP7G1Mc= diff --git a/internal/features/macosfixes/init_darwin.go b/internal/features/macosfixes/init_darwin.go index 6628b6b..4639828 100644 --- a/internal/features/macosfixes/init_darwin.go +++ b/internal/features/macosfixes/init_darwin.go @@ -2,7 +2,7 @@ package macosfixes -import "github.com/jwijenbergh/puregotk/pkg/core" +import "codeberg.org/puregotk/puregotk/pkg/core" func init() { // puregotk defaults to Linux SONAMEs; macOS requires dylib names. diff --git a/main.go b/main.go index 62c0d57..f7a504d 100644 --- a/main.go +++ b/main.go @@ -9,10 +9,10 @@ import ( _ "github.com/0skillallluck/scanline/internal/features/macosfixes" "codeberg.org/dergs/tonearm/pkg/schwifty/tracking" + "codeberg.org/puregotk/puregotk/v4/adw" + "codeberg.org/puregotk/puregotk/v4/gio" + "codeberg.org/puregotk/puregotk/v4/glib" "github.com/0skillallluck/scanline/app" - "github.com/jwijenbergh/puregotk/v4/adw" - "github.com/jwijenbergh/puregotk/v4/gio" - "github.com/jwijenbergh/puregotk/v4/glib" ) //go:generate glib-compile-schemas ./assets/meta diff --git a/utils/imageutils/crop.go b/utils/imageutils/crop.go index 5fed303..1efd29b 100644 --- a/utils/imageutils/crop.go +++ b/utils/imageutils/crop.go @@ -3,8 +3,8 @@ package imageutils import ( "math" - "github.com/jwijenbergh/puregotk/v4/gdk" - "github.com/jwijenbergh/puregotk/v4/gdkpixbuf" + "codeberg.org/puregotk/puregotk/v4/gdk" + "codeberg.org/puregotk/puregotk/v4/gdkpixbuf" ) func Crop(texture *gdk.Texture) *gdk.Texture { diff --git a/utils/imageutils/imageutils.go b/utils/imageutils/imageutils.go index 1f7880b..dcc2e90 100644 --- a/utils/imageutils/imageutils.go +++ b/utils/imageutils/imageutils.go @@ -4,7 +4,7 @@ import ( "codeberg.org/dergs/tonearm/pkg/schwifty" "codeberg.org/dergs/tonearm/pkg/schwifty/tracking" "codeberg.org/dergs/tonearm/pkg/schwifty/utils/weak" - "github.com/jwijenbergh/puregotk/v4/gtk" + "codeberg.org/puregotk/puregotk/v4/gtk" ) func LoadIntoImage(url string, image *gtk.Image) { diff --git a/utils/imageutils/loader.go b/utils/imageutils/loader.go index 6127867..edd6d3b 100644 --- a/utils/imageutils/loader.go +++ b/utils/imageutils/loader.go @@ -1,8 +1,8 @@ package imageutils import ( - "github.com/jwijenbergh/puregotk/v4/gdk" - "github.com/jwijenbergh/puregotk/v4/glib" + "codeberg.org/puregotk/puregotk/v4/gdk" + "codeberg.org/puregotk/puregotk/v4/glib" ) func Load(url string) (*gdk.Texture, error) { From b6a50ae525a9f93f59adb5bd19c1900f8238d9f7 Mon Sep 17 00:00:00 2001 From: Cedric Lewe <0skillallluck@pm.me> Date: Sat, 7 Mar 2026 14:59:37 +0100 Subject: [PATCH 3/5] Fix int/int32 stuff --- app/components/cards/preview.go | 2 +- app/components/lists/horizontal_list.go | 6 +++--- app/components/player/player.go | 26 ++++++++++++------------- app/components/player/settings.go | 12 ++++++------ app/components/widgets/hero.go | 6 +++--- app/preference/general.go | 8 ++++---- app/preference/performance.go | 2 +- app/windows/main_actions.go | 2 +- main.go | 4 ++-- utils/imageutils/crop.go | 4 ++-- utils/imageutils/imageutils.go | 8 ++++---- 11 files changed, 40 insertions(+), 40 deletions(-) diff --git a/app/components/cards/preview.go b/app/components/cards/preview.go index 44dc9e6..c06fc2c 100644 --- a/app/components/cards/preview.go +++ b/app/components/cards/preview.go @@ -12,7 +12,7 @@ import ( func previewCard[T any](title string, subTitle schwifty.Widgetable[T], artURL string, progress float64) schwifty.Button { // Progress bar width based on progress - progressWidth := int(480 * progress) + progressWidth := int32(480 * progress) // Create the picture widget picture := Picture(). diff --git a/app/components/lists/horizontal_list.go b/app/components/lists/horizontal_list.go index 062b171..c1d2f6d 100644 --- a/app/components/lists/horizontal_list.go +++ b/app/components/lists/horizontal_list.go @@ -15,7 +15,7 @@ type HorizontalList struct { schwifty.Box container *gtk.Box - marginState *state.State[int] + marginState *state.State[int32] routeButtonState *state.State[any] } @@ -24,7 +24,7 @@ func (h *HorizontalList) Append(child schwifty.BaseWidgetable) *HorizontalList { return h } -func (h *HorizontalList) SetPageMargin(margin int) *HorizontalList { +func (h *HorizontalList) SetPageMargin(margin int32) *HorizontalList { h.marginState.SetValue(margin) return h } @@ -43,7 +43,7 @@ func (h *HorizontalList) SetViewAllRoute(path string) *HorizontalList { } func NewHorizontalList(title string) *HorizontalList { - marginState := state.NewStateful[int](0) + marginState := state.NewStateful[int32](0) routeButtonState := state.NewStateful[any](nil) container := HStack().BindHMargin(marginState)() diff --git a/app/components/player/player.go b/app/components/player/player.go index cd80425..70f136e 100644 --- a/app/components/player/player.go +++ b/app/components/player/player.go @@ -64,7 +64,7 @@ func NewPlayer(params PlayerParams) { gtk.StyleContextAddProviderForDisplay( display, cssProvider, - uint(gtk.STYLE_PROVIDER_PRIORITY_APPLICATION), + uint32(gtk.STYLE_PROVIDER_PRIORITY_APPLICATION), ) win.AddCssClass("scanline-player-window") overlay.AddCssClass("scanline-player-overlay") @@ -426,7 +426,7 @@ func NewPlayer(params PlayerParams) { // Only start timer if not already running if hideTimerID.Load() == 0 { id := glib.TimeoutAdd(500, &hideTimerCallback, 0) // check every 500ms - hideTimerID.Store(uint32(id)) + hideTimerID.Store(id) } } @@ -453,7 +453,7 @@ func NewPlayer(params PlayerParams) { if settingsPopover != nil { mapCb := func(w gtk.Widget) { if old := hideTimerID.Load(); old != 0 { - glib.SourceRemove(uint(old)) + glib.SourceRemove(old) hideTimerID.Store(0) } showControls() @@ -468,12 +468,12 @@ func NewPlayer(params PlayerParams) { // --- ESC key to close --- keyCtrl := gtk.NewEventControllerKey() - keyPressedCb := func(ctrl gtk.EventControllerKey, keyval uint, keycode uint, state gdk.ModifierType) bool { + keyPressedCb := func(ctrl gtk.EventControllerKey, keyval uint32, keycode uint32, state gdk.ModifierType) bool { switch keyval { - case uint(gdk.KEY_Escape): + case uint32(gdk.KEY_Escape): win.Close() return true - case uint(gdk.KEY_space): + case uint32(gdk.KEY_space): if media == nil { return true } @@ -493,7 +493,7 @@ func NewPlayer(params PlayerParams) { sendProgress(sources.StatePlaying) } return true - case uint(gdk.KEY_Left): + case uint32(gdk.KEY_Left): if media == nil { return true } @@ -501,7 +501,7 @@ func NewPlayer(params PlayerParams) { newTS := max(ts-30*1000000, 0) doSeek(newTS) return true - case uint(gdk.KEY_Right): + case uint32(gdk.KEY_Right): if media == nil { return true } @@ -513,7 +513,7 @@ func NewPlayer(params PlayerParams) { } doSeek(newTS) return true - case uint(gdk.KEY_Up): + case uint32(gdk.KEY_Up): if media == nil { return true } @@ -523,7 +523,7 @@ func NewPlayer(params PlayerParams) { } media.SetVolume(vol) return true - case uint(gdk.KEY_Down): + case uint32(gdk.KEY_Down): if media == nil { return true } @@ -589,7 +589,7 @@ func NewPlayer(params PlayerParams) { return true // G_SOURCE_CONTINUE }) tid := glib.TimeoutAdd(500, &tickerCb, 0) - tickerID.Store(uint32(tid)) + tickerID.Store(tid) // --- Set up window --- win.SetChild(&overlay.Widget) @@ -609,11 +609,11 @@ func NewPlayer(params PlayerParams) { media.Pause() } if id := tickerID.Load(); id != 0 { - glib.SourceRemove(uint(id)) + glib.SourceRemove(id) tickerID.Store(0) } if id := hideTimerID.Load(); id != 0 { - glib.SourceRemove(uint(id)) + glib.SourceRemove(id) hideTimerID.Store(0) } // Remove CSS provider to avoid affecting other windows diff --git a/app/components/player/settings.go b/app/components/player/settings.go index 9b5ef08..508d105 100644 --- a/app/components/player/settings.go +++ b/app/components/player/settings.go @@ -93,14 +93,14 @@ func buildSettingsPopover( // Build audio stream labels and IDs var audioLabels []string var audioStreamIDs []int - selectedAudio := uint(0) - audioIdx := 0 + var selectedAudio uint32 + var audioIdx uint32 for i, s := range streams { if s.StreamType == 2 { // audio audioLabels = append(audioLabels, streamLabel(s, i)) audioStreamIDs = append(audioStreamIDs, s.ID) if s.Selected { - selectedAudio = uint(audioIdx) + selectedAudio = audioIdx } audioIdx++ } @@ -109,15 +109,15 @@ func buildSettingsPopover( // Build subtitle stream labels and IDs ("None" + subtitle streams) subtitleLabels := []string{gettext.Get("None")} subtitleStreamIDs := []int{0} - selectedSubtitle := uint(0) - subtitleIdx := 0 + var selectedSubtitle uint32 + var subtitleIdx uint32 for i, s := range streams { if s.StreamType == 3 { // subtitle subtitleLabels = append(subtitleLabels, streamLabel(s, i)) subtitleStreamIDs = append(subtitleStreamIDs, s.ID) subtitleIdx++ if s.Selected { - selectedSubtitle = uint(subtitleIdx) + selectedSubtitle = subtitleIdx } } } diff --git a/app/components/widgets/hero.go b/app/components/widgets/hero.go index b904c0d..e5d0f65 100644 --- a/app/components/widgets/hero.go +++ b/app/components/widgets/hero.go @@ -17,8 +17,8 @@ import ( // HeroPosterParams configures the poster image in a hero section. type HeroPosterParams struct { ImageURL string - Width int - Height int + Width int32 + Height int32 } // HeroSection creates a hero layout with a poster image and content area. @@ -153,7 +153,7 @@ func HeroContent(params HeroContentParams) schwifty.Box { if row.Value == "" { continue } - marginTop := 4 + var marginTop int32 = 4 if i == 0 { marginTop = 8 } diff --git a/app/preference/general.go b/app/preference/general.go index 576028d..b6b05fa 100644 --- a/app/preference/general.go +++ b/app/preference/general.go @@ -16,18 +16,18 @@ func (g *GeneralSettings) SetHideSecretServiceWarning(hide bool) bool { return g.settings.SetBoolean("hide-secret-service-warning", hide) } -func (g *GeneralSettings) GetWindowHeight() int { +func (g *GeneralSettings) GetWindowHeight() int32 { return g.settings.GetInt("window-height") } -func (g *GeneralSettings) SetWindowHeight(height int) { +func (g *GeneralSettings) SetWindowHeight(height int32) { g.settings.SetInt("window-height", height) } -func (g *GeneralSettings) GetWindowWidth() int { +func (g *GeneralSettings) GetWindowWidth() int32 { return g.settings.GetInt("window-width") } -func (g *GeneralSettings) SetWindowWidth(width int) { +func (g *GeneralSettings) SetWindowWidth(width int32) { g.settings.SetInt("window-width", width) } diff --git a/app/preference/performance.go b/app/preference/performance.go index c6f5acf..afc3938 100644 --- a/app/preference/performance.go +++ b/app/preference/performance.go @@ -48,5 +48,5 @@ func (p *PerformanceSettings) BindMaxRouterHistorySize(target *gobject.Object, p } func (p *PerformanceSettings) MaxRouterHistorySize() int { - return p.settings.GetInt("max-router-history-size") + return int(p.settings.GetInt("max-router-history-size")) } diff --git a/app/windows/main_actions.go b/app/windows/main_actions.go index ae2d78a..15edfe8 100644 --- a/app/windows/main_actions.go +++ b/app/windows/main_actions.go @@ -128,7 +128,7 @@ func (w *Window) installMouseClickHandler() { gestureController := gtk.NewGestureClick() gestureController.SetButton(0) gestureController.SetPropagationPhase(gtk.PhaseCaptureValue) - gestureController.ConnectPressed(new(func(controller gtk.GestureClick, nPress int, x float64, y float64) { + gestureController.ConnectPressed(new(func(controller gtk.GestureClick, nPress int32, x float64, y float64) { switch controller.GetCurrentButton() { case MouseButtonBack: w.ActivateAction("navigate-back", nil) diff --git a/main.go b/main.go index f7a504d..84ece80 100644 --- a/main.go +++ b/main.go @@ -53,8 +53,8 @@ func main() { defer application.Unref() application.ConnectActivate(new(app.OnActivate(application))) - if code := application.Run(len(os.Args), os.Args); code > 0 { + if code := application.Run(int32(len(os.Args)), os.Args); code > 0 { application.Quit() - os.Exit(code) + os.Exit(int(code)) } } diff --git a/utils/imageutils/crop.go b/utils/imageutils/crop.go index 1efd29b..2dd6f99 100644 --- a/utils/imageutils/crop.go +++ b/utils/imageutils/crop.go @@ -11,7 +11,7 @@ func Crop(texture *gdk.Texture) *gdk.Texture { texture.Ref() defer texture.Unref() - size := int(math.Min(float64(texture.GetIntrinsicWidth()), float64(texture.GetIntrinsicHeight()))) + size := int32(math.Min(float64(texture.GetIntrinsicWidth()), float64(texture.GetIntrinsicHeight()))) srcX := (texture.GetIntrinsicWidth() - size) / 2 srcY := (texture.GetIntrinsicHeight() - size) / 2 @@ -24,7 +24,7 @@ func Crop(texture *gdk.Texture) *gdk.Texture { return gdk.NewTextureForPixbuf(cropped) } -func Scale(texture *gdk.Texture, targetW, targetH int) *gdk.Texture { +func Scale(texture *gdk.Texture, targetW, targetH int32) *gdk.Texture { texture.Ref() defer texture.Unref() diff --git a/utils/imageutils/imageutils.go b/utils/imageutils/imageutils.go index dcc2e90..474d878 100644 --- a/utils/imageutils/imageutils.go +++ b/utils/imageutils/imageutils.go @@ -25,7 +25,7 @@ func LoadIntoImage(url string, image *gtk.Image) { }() } -func LoadIntoImageCropped(url string, size int, image *gtk.Image) { +func LoadIntoImageCropped(url string, size int32, image *gtk.Image) { ref := weak.NewWidgetRef(&image.Widget) go func() { texture, err := Load(url) @@ -48,7 +48,7 @@ func LoadIntoImageCropped(url string, size int, image *gtk.Image) { }() } -func LoadIntoImageScaled(url string, width, height int, image *gtk.Image) { +func LoadIntoImageScaled(url string, width, height int32, image *gtk.Image) { ref := weak.NewWidgetRef(&image.Widget) go func() { texture, err := Load(url) @@ -69,7 +69,7 @@ func LoadIntoImageScaled(url string, width, height int, image *gtk.Image) { }() } -func LoadIntoPictureCropped(url string, size int, picture *gtk.Picture) { +func LoadIntoPictureCropped(url string, size int32, picture *gtk.Picture) { ref := weak.NewWidgetRef(&picture.Widget) go func() { texture, err := Load(url) @@ -92,7 +92,7 @@ func LoadIntoPictureCropped(url string, size int, picture *gtk.Picture) { }() } -func LoadIntoPictureScaled(url string, width, height int, picture *gtk.Picture) { +func LoadIntoPictureScaled(url string, width, height int32, picture *gtk.Picture) { ref := weak.NewWidgetRef(&picture.Widget) go func() { texture, err := Load(url) From 1854333c9f2ddc9c692349f652ddfb4c01e51f05 Mon Sep 17 00:00:00 2001 From: Cedric Lewe <0skillallluck@pm.me> Date: Sat, 7 Mar 2026 15:03:20 +0100 Subject: [PATCH 4/5] Update flatpak modules and nix --- assets/meta/go.mod.yml | 24 +++++++++++------------ assets/meta/modules.txt | 42 ++++++++++++++++++++--------------------- flake.nix | 2 +- 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/assets/meta/go.mod.yml b/assets/meta/go.mod.yml index 212db95..a01d944 100644 --- a/assets/meta/go.mod.yml +++ b/assets/meta/go.mod.yml @@ -3,10 +3,15 @@ path: assets/meta/modules.txt type: file - dest: vendor/codeberg.org/dergs/tonearm - sha256: bb133e7d1683038f1cadf92144d1607eb8f60bc8ece1909dcf551d104d945d82 + sha256: dcb91873c7b49d7559dcaf0df9c3e86dee669839ded1d1a53193fca07c0983ac strip-components: 3 type: archive - url: https://proxy.golang.org/codeberg.org/dergs/tonearm/@v/v1.4.0.zip + url: https://proxy.golang.org/codeberg.org/dergs/tonearm/@v/v1.4.1-0.20260304095737-2bc41c208498.zip +- dest: vendor/codeberg.org/puregotk/puregotk + sha256: 52c4394f5fe8d2ec9ccb8a0063617a11273772e06474c265cef0104cb626d99a + strip-components: 3 + type: archive + url: https://proxy.golang.org/codeberg.org/puregotk/puregotk/@v/v0.0.0-20260226083027-5647eb6a2bba.zip - dest: vendor/github.com/google/uuid sha256: d0f02f377217f42702e259684e06441edbf5140dddcc34ba9bea56038b38a6ed strip-components: 3 @@ -17,11 +22,6 @@ strip-components: 3 type: archive url: https://proxy.golang.org/github.com/jeandeaual/go-locale/@v/v0.0.0-20250612000132-0ef82f21eade.zip -- dest: vendor/codeberg.org/puregotk/puregotk - sha256: 56947051fb1de3cb0f0c60640d258f810fa92615c51f2eee5590086f8552baa2 - strip-components: 3 - type: archive - url: https://proxy.golang.org/codeberg.org/puregotk/puregotk/@v/v0.0.0-20260115100645-c78e1521129b.zip - dest: vendor/github.com/keybase/go-keychain sha256: 9514a68da08d39d60a47640bef049e44c829aab5dbbddd03d272e9252039a5c7 strip-components: 3 @@ -47,6 +47,11 @@ strip-components: 5 type: archive url: https://proxy.golang.org/github.com/yeqown/go-qrcode/writer/standard/@v/v1.3.0.zip +- dest: vendor/codeberg.org/puregotk/purego + sha256: 0d5fb9e11934b151ac357a9c0660e4dcd287d2f93db0829356415f6e6a8ef84b + strip-components: 3 + type: archive + url: https://proxy.golang.org/codeberg.org/puregotk/purego/@v/v0.0.0-20260224095105-2513c838cb80.zip - dest: vendor/github.com/fogleman/gg sha256: 792f7a3ea9eea31b7947dabaf9d5a307389245069078e4bf435d76cb0505439c strip-components: 3 @@ -57,11 +62,6 @@ strip-components: 3 type: archive url: https://proxy.golang.org/github.com/golang/freetype/@v/v0.0.0-20170609003504-e2365dfdc4a0.zip -- dest: vendor/github.com/jwijenbergh/purego - sha256: aa4903b6c7333843f77e6012d68c89846462f4755fe6201a4069e69547d1000e - strip-components: 3 - type: archive - url: https://proxy.golang.org/github.com/jwijenbergh/purego/@v/v0.0.0-20251017112123-b71757b9ba42.zip - dest: vendor/github.com/pkg/errors sha256: d4c36b8bcd0616290a3913215e0f53b931bd6e00670596f2960df1b44af2bd07 strip-components: 3 diff --git a/assets/meta/modules.txt b/assets/meta/modules.txt index d4e8e49..1bfcf24 100644 --- a/assets/meta/modules.txt +++ b/assets/meta/modules.txt @@ -1,4 +1,4 @@ -# codeberg.org/dergs/tonearm v1.4.0 +# codeberg.org/dergs/tonearm v1.4.1-0.20260304095737-2bc41c208498 ## explicit; go 1.26.0 codeberg.org/dergs/tonearm/internal/signals codeberg.org/dergs/tonearm/pkg/schwifty @@ -11,27 +11,14 @@ codeberg.org/dergs/tonearm/pkg/schwifty/syntax codeberg.org/dergs/tonearm/pkg/schwifty/tracking codeberg.org/dergs/tonearm/pkg/schwifty/utils/weak codeberg.org/dergs/tonearm/pkg/utils/cutil -# github.com/fogleman/gg v1.3.0 -## explicit -github.com/fogleman/gg -# github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 -## explicit -github.com/golang/freetype/raster -github.com/golang/freetype/truetype -# github.com/google/uuid v1.6.0 -## explicit -github.com/google/uuid -# github.com/jeandeaual/go-locale v0.0.0-20250612000132-0ef82f21eade -## explicit; go 1.18 -github.com/jeandeaual/go-locale -# github.com/jwijenbergh/purego v0.0.0-20251017112123-b71757b9ba42 +# codeberg.org/puregotk/purego v0.0.0-20260224095105-2513c838cb80 ## explicit; go 1.18 -github.com/jwijenbergh/purego -github.com/jwijenbergh/purego/internal/cgo -github.com/jwijenbergh/purego/internal/fakecgo -github.com/jwijenbergh/purego/internal/strings -github.com/jwijenbergh/purego/internal/xreflect -# codeberg.org/puregotk/puregotk v0.0.0-20260115100645-c78e1521129b +codeberg.org/puregotk/purego +codeberg.org/puregotk/purego/internal/cgo +codeberg.org/puregotk/purego/internal/fakecgo +codeberg.org/puregotk/purego/internal/strings +codeberg.org/puregotk/purego/internal/xreflect +# codeberg.org/puregotk/puregotk v0.0.0-20260226083027-5647eb6a2bba ## explicit; go 1.23.0 codeberg.org/puregotk/puregotk/internal/core codeberg.org/puregotk/puregotk/pkg/core @@ -48,6 +35,19 @@ codeberg.org/puregotk/puregotk/v4/graphene codeberg.org/puregotk/puregotk/v4/gsk codeberg.org/puregotk/puregotk/v4/gtk codeberg.org/puregotk/puregotk/v4/pango +# github.com/fogleman/gg v1.3.0 +## explicit +github.com/fogleman/gg +# github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 +## explicit +github.com/golang/freetype/raster +github.com/golang/freetype/truetype +# github.com/google/uuid v1.6.0 +## explicit +github.com/google/uuid +# github.com/jeandeaual/go-locale v0.0.0-20250612000132-0ef82f21eade +## explicit; go 1.18 +github.com/jeandeaual/go-locale # github.com/keybase/go-keychain v0.0.1 ## explicit; go 1.21 github.com/keybase/go-keychain diff --git a/flake.nix b/flake.nix index abd7664..7bfec5a 100644 --- a/flake.nix +++ b/flake.nix @@ -81,7 +81,7 @@ pname = "scanline"; version = "0.1.0"; src = pkgs.lib.cleanSource ./.; - vendorHash = "sha256-nMRr1k8y0bOmsicDKF04tT6kfoP5IxTuvAr5/sR89A4="; + vendorHash = "sha256-8XdtaVj/LDHtjuD8hY2cMQDA7IsBFlEQ/SDWdo8yNBo="; ldflags = [ "-X \"github.com/0skillallluck/scanline/app/dialogs/about.Commit=${ From 5d9c2f99db80201729884872c1b068c773375d08 Mon Sep 17 00:00:00 2001 From: Cedric Lewe <0skillallluck@pm.me> Date: Sat, 7 Mar 2026 15:10:19 +0100 Subject: [PATCH 5/5] Fix workflow --- .github/workflows/pull-request.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index e9bc714..c1f56aa 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -162,7 +162,9 @@ jobs: go-version: "1.26" cache: true - name: Generate - run: go run github.com/dennwc/flatpak-go-mod@latest + run: | + go run github.com/dennwc/flatpak-go-mod@latest + sed -i 's|path: modules.txt|path: assets/meta/modules.txt|' go.mod.yml - name: Diff run: | if ! diff -q go.mod.yml assets/meta/go.mod.yml > /dev/null 2>&1 || \