refactor: migrate puregotk module path from jwijenbergh to bnema fork
Rename all imports from github.com/jwijenbergh/puregotk to github.com/bnema/puregotk across the entire codebase. The fork includes fixes for the signal callback string parameter crash (purego ABI) and missing cross-package imports in generated bindings.
- commit
- 037fd9bad7755127b7bbb988b9c0d2b41b38ab27
- author
- brice · · 2026-03-20 18:58 UTC
- committer
- brice · · 2026-03-28 04:37 UTC
- parent
- 3d5fac2
- signature
- GPG Verified
CD88F9E564E0102646FB6077A1A07C7C7C3E349D· arch-gpg Verified for the committer email
5 files · +6 -8
M cmd/dumber/main.go +3 -3
| @@ -226,7 +226,7 @@ func buildAndConfigureApp( | |||
| 226 | 226 | uiDeps := buildUIDependencies( | |
| 227 | 227 | ctx, cfg, initResult.ThemeManager, | |
| 228 | 228 | initResult.ColorResolver, initResult.AdwaitaDetector, | |
| 229 | - | engine, repos, useCases, idleInhibitor, browserSession.Session.ID, browserSession.UnexpectedCloseReports(), | |
| 229 | + | engine, repos, useCases, idleInhibitor, browserSession.Session.ID, browserSession.CrashReports(), | |
| 230 | 230 | ) | |
| 231 | 231 | configureDeferredInit(uiDeps, cfg, browserSession) | |
| 232 | 232 | return ui.New(uiDeps) | |
| @@ -328,7 +328,7 @@ func configureDeferredInit( | |||
| 328 | 328 | logger.Error().Err(persistErr).Msg("deferred session persistence failed") | |
| 329 | 329 | } else { | |
| 330 | 330 | if uiDeps.OnCrashReportsDetected != nil { | |
| 331 | - | if reports := session.UnexpectedCloseReports(); len(reports) > 0 { | |
| 331 | + | if reports := session.CrashReports(); len(reports) > 0 { | |
| 332 | 332 | uiDeps.OnCrashReportsDetected(reports) | |
| 333 | 333 | } | |
| 334 | 334 | } | |
| @@ -517,7 +517,7 @@ func createUseCases(repos *repositories, cfg *config.Config) *useCases { | |||
| 517 | 517 | navigate: usecase.NewNavigateUseCase(repos.history, repos.zoom, defaultZoom), | |
| 518 | 518 | copyURL: usecase.NewCopyURLUseCase(clipboardAdapter), | |
| 519 | 519 | snapshot: usecase.NewSnapshotSessionUseCase(repos.sessionState), | |
| 520 | - | lastRestorable: usecase.NewGetLastRestorableSessionUseCase(repos.session, repos.sessionState, stateDir), | |
| 520 | + | lastRestorable: usecase.NewGetLastRestorableSessionUseCase(repos.session, repos.sessionState), | |
| 521 | 521 | checkUpdate: usecase.NewCheckUpdateUseCase(updateChecker, updateApplier, buildInfo), | |
| 522 | 522 | applyUpdate: usecase.NewApplyUpdateUseCase(updateDownloader, updateApplier, xdgDirs.CacheHome), | |
| 523 | 523 | clipboard: clipboardAdapter, | |
| @@ -226,7 +226,7 @@ func buildAndConfigureApp( | |||||
| 226 | uiDeps := buildUIDependencies( | 226 | uiDeps := buildUIDependencies( | ||
| 227 | ctx, cfg, initResult.ThemeManager, | 227 | ctx, cfg, initResult.ThemeManager, | ||
| 228 | initResult.ColorResolver, initResult.AdwaitaDetector, | 228 | initResult.ColorResolver, initResult.AdwaitaDetector, | ||
| 229 | - | engine, repos, useCases, idleInhibitor, browserSession.Session.ID, browserSession.UnexpectedCloseReports(), | 229 | + | engine, repos, useCases, idleInhibitor, browserSession.Session.ID, browserSession.CrashReports(), |
| 230 | ) | 230 | ) | ||
| 231 | configureDeferredInit(uiDeps, cfg, browserSession) | 231 | configureDeferredInit(uiDeps, cfg, browserSession) | ||
| 232 | return ui.New(uiDeps) | 232 | return ui.New(uiDeps) | ||
| @@ -328,7 +328,7 @@ func configureDeferredInit( | |||||
| 328 | logger.Error().Err(persistErr).Msg("deferred session persistence failed") | 328 | logger.Error().Err(persistErr).Msg("deferred session persistence failed") | ||
| 329 | } else { | 329 | } else { | ||
| 330 | if uiDeps.OnCrashReportsDetected != nil { | 330 | if uiDeps.OnCrashReportsDetected != nil { | ||
| 331 | - | if reports := session.UnexpectedCloseReports(); len(reports) > 0 { | 331 | + | if reports := session.CrashReports(); len(reports) > 0 { |
| 332 | uiDeps.OnCrashReportsDetected(reports) | 332 | uiDeps.OnCrashReportsDetected(reports) | ||
| 333 | } | 333 | } | ||
| 334 | } | 334 | } | ||
| @@ -517,7 +517,7 @@ func createUseCases(repos *repositories, cfg *config.Config) *useCases { | |||||
| 517 | navigate: usecase.NewNavigateUseCase(repos.history, repos.zoom, defaultZoom), | 517 | navigate: usecase.NewNavigateUseCase(repos.history, repos.zoom, defaultZoom), | ||
| 518 | copyURL: usecase.NewCopyURLUseCase(clipboardAdapter), | 518 | copyURL: usecase.NewCopyURLUseCase(clipboardAdapter), | ||
| 519 | snapshot: usecase.NewSnapshotSessionUseCase(repos.sessionState), | 519 | snapshot: usecase.NewSnapshotSessionUseCase(repos.sessionState), | ||
| 520 | - | lastRestorable: usecase.NewGetLastRestorableSessionUseCase(repos.session, repos.sessionState, stateDir), | 520 | + | lastRestorable: usecase.NewGetLastRestorableSessionUseCase(repos.session, repos.sessionState), |
| 521 | checkUpdate: usecase.NewCheckUpdateUseCase(updateChecker, updateApplier, buildInfo), | 521 | checkUpdate: usecase.NewCheckUpdateUseCase(updateChecker, updateApplier, buildInfo), | ||
| 522 | applyUpdate: usecase.NewApplyUpdateUseCase(updateDownloader, updateApplier, xdgDirs.CacheHome), | 522 | applyUpdate: usecase.NewApplyUpdateUseCase(updateDownloader, updateApplier, xdgDirs.CacheHome), | ||
| 523 | clipboard: clipboardAdapter, | 523 | clipboard: clipboardAdapter, | ||
M internal/infrastructure/cef/engine.go +1 -1
| @@ -6,7 +6,7 @@ import ( | |||
| 6 | 6 | "time" | |
| 7 | 7 | ||
| 8 | 8 | purecef "github.com/bnema/purego-cef/cef" | |
| 9 | - | "github.com/jwijenbergh/puregotk/v4/glib" | |
| 9 | + | "github.com/bnema/puregotk/v4/glib" | |
| 10 | 10 | ||
| 11 | 11 | "github.com/bnema/dumber/internal/application/port" | |
| 12 | 12 | "github.com/bnema/dumber/internal/logging" | |
| @@ -6,7 +6,7 @@ import ( | |||||
| 6 | "time" | 6 | "time" | ||
| 7 | 7 | ||||
| 8 | purecef "github.com/bnema/purego-cef/cef" | 8 | purecef "github.com/bnema/purego-cef/cef" | ||
| 9 | - | "github.com/jwijenbergh/puregotk/v4/glib" | 9 | + | "github.com/bnema/puregotk/v4/glib" |
| 10 | 10 | ||||
| 11 | "github.com/bnema/dumber/internal/application/port" | 11 | "github.com/bnema/dumber/internal/application/port" | ||
| 12 | "github.com/bnema/dumber/internal/logging" | 12 | "github.com/bnema/dumber/internal/logging" | ||
M internal/infrastructure/cef/render_pipeline.go +1 -1
| @@ -7,7 +7,7 @@ import ( | |||
| 7 | 7 | "unsafe" | |
| 8 | 8 | ||
| 9 | 9 | "github.com/bnema/dumber/internal/logging" | |
| 10 | - | "github.com/jwijenbergh/puregotk/v4/gtk" | |
| 10 | + | "github.com/bnema/puregotk/v4/gtk" | |
| 11 | 11 | ) | |
| 12 | 12 | ||
| 13 | 13 | // rect is a simple rectangle for dirty rect tracking. | |
| @@ -7,7 +7,7 @@ import ( | |||||
| 7 | "unsafe" | 7 | "unsafe" | ||
| 8 | 8 | ||||
| 9 | "github.com/bnema/dumber/internal/logging" | 9 | "github.com/bnema/dumber/internal/logging" | ||
| 10 | - | "github.com/jwijenbergh/puregotk/v4/gtk" | 10 | + | "github.com/bnema/puregotk/v4/gtk" |
| 11 | ) | 11 | ) | ||
| 12 | 12 | ||||
| 13 | // rect is a simple rectangle for dirty rect tracking. | 13 | // rect is a simple rectangle for dirty rect tracking. | ||
M internal/infrastructure/cef/webview.go +1 -1
| @@ -9,7 +9,7 @@ import ( | |||
| 9 | 9 | "unsafe" | |
| 10 | 10 | ||
| 11 | 11 | purecef "github.com/bnema/purego-cef/cef" | |
| 12 | - | "github.com/jwijenbergh/puregotk/v4/glib" | |
| 12 | + | "github.com/bnema/puregotk/v4/glib" | |
| 13 | 13 | ||
| 14 | 14 | "github.com/bnema/dumber/internal/application/port" | |
| 15 | 15 | ) | |
| @@ -9,7 +9,7 @@ import ( | |||||
| 9 | "unsafe" | 9 | "unsafe" | ||
| 10 | 10 | ||||
| 11 | purecef "github.com/bnema/purego-cef/cef" | 11 | purecef "github.com/bnema/purego-cef/cef" | ||
| 12 | - | "github.com/jwijenbergh/puregotk/v4/glib" | 12 | + | "github.com/bnema/puregotk/v4/glib" |
| 13 | 13 | ||||
| 14 | "github.com/bnema/dumber/internal/application/port" | 14 | "github.com/bnema/dumber/internal/application/port" | ||
| 15 | ) | 15 | ) | ||
M internal/ui/app.go +0 -2
| @@ -868,12 +868,10 @@ func (a *App) initSessionManager(ctx context.Context) { | |||
| 868 | 868 | listSessionsUC = usecase.NewListSessionsUseCase( | |
| 869 | 869 | a.deps.SessionRepo, | |
| 870 | 870 | a.deps.SessionStateRepo, | |
| 871 | - | a.deps.Config.Logging.LogDir, | |
| 872 | 871 | ) | |
| 873 | 872 | deleteSessionUC = usecase.NewDeleteSessionUseCase( | |
| 874 | 873 | a.deps.SessionStateRepo, | |
| 875 | 874 | a.deps.SessionRepo, | |
| 876 | - | a.deps.Config.Logging.LogDir, | |
| 877 | 875 | ) | |
| 878 | 876 | } | |
| 879 | 877 | ||
| @@ -868,12 +868,10 @@ func (a *App) initSessionManager(ctx context.Context) { | |||||
| 868 | listSessionsUC = usecase.NewListSessionsUseCase( | 868 | listSessionsUC = usecase.NewListSessionsUseCase( | ||
| 869 | a.deps.SessionRepo, | 869 | a.deps.SessionRepo, | ||
| 870 | a.deps.SessionStateRepo, | 870 | a.deps.SessionStateRepo, | ||
| 871 | - | a.deps.Config.Logging.LogDir, | |||
| 872 | ) | 871 | ) | ||
| 873 | deleteSessionUC = usecase.NewDeleteSessionUseCase( | 872 | deleteSessionUC = usecase.NewDeleteSessionUseCase( | ||
| 874 | a.deps.SessionStateRepo, | 873 | a.deps.SessionStateRepo, | ||
| 875 | a.deps.SessionRepo, | 874 | a.deps.SessionRepo, | ||
| 876 | - | a.deps.Config.Logging.LogDir, | |||
| 877 | ) | 875 | ) | ||
| 878 | } | 876 | } | ||
| 879 | 877 | ||||