Merge pull request #349 from bnema/fix/rollback-lazy-puregotk
fix(deps): emergency rollback puregotk lazy registration regression
905 files · +25263 -27842
M go.mod +1 -1
| @@ -11,7 +11,7 @@ require ( | |||
| 11 | 11 | github.com/bnema/purego-pipewire v0.1.5-0.20260714124450-6504b9cdf02a | |
| 12 | 12 | github.com/bnema/purego-sqlite v0.1.4-0.20260714131321-3614fe683b9c | |
| 13 | 13 | github.com/bnema/purego-webp v0.2.1-0.20260714152238-7bc9c402fdf6 | |
| 14 | - | github.com/bnema/puregotk v0.7.1-0.20260714170452-0b6b9b901234 | |
| 14 | + | github.com/bnema/puregotk v0.7.0 | |
| 15 | 15 | github.com/charmbracelet/bubbles v1.0.0 | |
| 16 | 16 | github.com/charmbracelet/bubbletea v1.3.10 | |
| 17 | 17 | github.com/charmbracelet/lipgloss v1.1.0 | |
| @@ -11,7 +11,7 @@ require ( | |||||
| 11 | github.com/bnema/purego-pipewire v0.1.5-0.20260714124450-6504b9cdf02a | 11 | github.com/bnema/purego-pipewire v0.1.5-0.20260714124450-6504b9cdf02a | ||
| 12 | github.com/bnema/purego-sqlite v0.1.4-0.20260714131321-3614fe683b9c | 12 | github.com/bnema/purego-sqlite v0.1.4-0.20260714131321-3614fe683b9c | ||
| 13 | github.com/bnema/purego-webp v0.2.1-0.20260714152238-7bc9c402fdf6 | 13 | github.com/bnema/purego-webp v0.2.1-0.20260714152238-7bc9c402fdf6 | ||
| 14 | - | github.com/bnema/puregotk v0.7.1-0.20260714170452-0b6b9b901234 | 14 | + | github.com/bnema/puregotk v0.7.0 |
| 15 | github.com/charmbracelet/bubbles v1.0.0 | 15 | github.com/charmbracelet/bubbles v1.0.0 | ||
| 16 | github.com/charmbracelet/bubbletea v1.3.10 | 16 | github.com/charmbracelet/bubbletea v1.3.10 | ||
| 17 | github.com/charmbracelet/lipgloss v1.1.0 | 17 | github.com/charmbracelet/lipgloss v1.1.0 | ||
M go.sum +0 -4 generated file: collapsed
M vendor/github.com/bnema/puregotk/internal/core/core.go +4 -197 generated file: collapsed
M vendor/github.com/bnema/puregotk/pkg/core/core.go +0 -10 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-about-dialog.go +64 -99 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-about-window.go +62 -95 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-accent-color.go +15 -7 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-action-row.go +29 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-alert-dialog.go +47 -66 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-animation-target.go +27 -10 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-animation-util.go +12 -4 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-animation.go +26 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-application-window.go +22 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-application.go +15 -3 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-avatar.go +25 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-banner.go +26 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-bin.go +16 -5 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-bottom-sheet.go +38 -47 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-breakpoint-bin.go +19 -10 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-breakpoint.go +37 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-button-content.go +22 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-button-row.go +18 -10 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-carousel-indicator-dots.go +16 -5 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-carousel-indicator-lines.go +16 -5 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-carousel.go +37 -47 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-clamp-layout.go +20 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-clamp-scrollable.go +22 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-clamp.go +22 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-combo-row.go +33 -34 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-dialog.go +38 -45 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-easing.go +13 -3 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-entry-row.go +33 -40 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-enum-list-model.go +22 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-expander-row.go +33 -40 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-flap.go +48 -61 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-fold-threshold-policy.go +1 -10 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-header-bar.go +33 -36 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-inline-view-switcher.go +24 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-layout-slot.go +15 -4 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-layout.go +17 -7 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-leaflet.go +56 -69 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-length-unit.go +14 -5 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-main.go +15 -5
| @@ -1,7 +1,10 @@ | |||
| 1 | 1 | // Package adw was automatically generated by github.com/bnema/puregotk DO NOT EDIT | |
| 2 | 2 | package adw | |
| 3 | 3 | ||
| 4 | - | import "github.com/bnema/puregotk/pkg/core" | |
| 4 | + | import ( | |
| 5 | + | "github.com/bnema/purego" | |
| 6 | + | "github.com/bnema/puregotk/pkg/core" | |
| 7 | + | ) | |
| 5 | 8 | ||
| 6 | 9 | var xInit func() | |
| 7 | 10 | ||
| @@ -17,8 +20,6 @@ var xInit func() | |||
| 17 | 20 | // This makes sure translations, types, themes, and icons for the Adwaita | |
| 18 | 21 | // library are set up properly. | |
| 19 | 22 | func Init() { | |
| 20 | - | core.LazyRegister(&xInit, "ADW", "adw_init", false) | |
| 21 | - | ||
| 22 | 23 | xInit() | |
| 23 | 24 | } | |
| 24 | 25 | ||
| @@ -27,8 +28,6 @@ var xIsInitialized func() bool | |||
| 27 | 28 | // Use this function to check if libadwaita has been initialized with | |
| 28 | 29 | // [func@init]. | |
| 29 | 30 | func IsInitialized() bool { | |
| 30 | - | core.LazyRegister(&xIsInitialized, "ADW", "adw_is_initialized", false) | |
| 31 | - | ||
| 32 | 31 | cret := xIsInitialized() | |
| 33 | 32 | return cret | |
| 34 | 33 | } | |
| @@ -36,4 +35,15 @@ func IsInitialized() bool { | |||
| 36 | 35 | func init() { | |
| 37 | 36 | core.SetPackageName("ADW", "libadwaita-1") | |
| 38 | 37 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | |
| 38 | + | var libs []uintptr | |
| 39 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 40 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 41 | + | if err != nil { | |
| 42 | + | panic(err) | |
| 43 | + | } | |
| 44 | + | libs = append(libs, lib) | |
| 45 | + | } | |
| 46 | + | ||
| 47 | + | core.PuregoSafeRegister(&xInit, libs, "adw_init") | |
| 48 | + | core.PuregoSafeRegister(&xIsInitialized, libs, "adw_is_initialized") | |
| 39 | 49 | } | |
| @@ -1,7 +1,10 @@ | |||||
| 1 | // Package adw was automatically generated by github.com/bnema/puregotk DO NOT EDIT | 1 | // Package adw was automatically generated by github.com/bnema/puregotk DO NOT EDIT | ||
| 2 | package adw | 2 | package adw | ||
| 3 | 3 | ||||
| 4 | - | import "github.com/bnema/puregotk/pkg/core" | 4 | + | import ( |
| 5 | + | "github.com/bnema/purego" | |||
| 6 | + | "github.com/bnema/puregotk/pkg/core" | |||
| 7 | + | ) | |||
| 5 | 8 | ||||
| 6 | var xInit func() | 9 | var xInit func() | ||
| 7 | 10 | ||||
| @@ -17,8 +20,6 @@ var xInit func() | |||||
| 17 | // This makes sure translations, types, themes, and icons for the Adwaita | 20 | // This makes sure translations, types, themes, and icons for the Adwaita | ||
| 18 | // library are set up properly. | 21 | // library are set up properly. | ||
| 19 | func Init() { | 22 | func Init() { | ||
| 20 | - | core.LazyRegister(&xInit, "ADW", "adw_init", false) | |||
| 21 | - | ||||
| 22 | xInit() | 23 | xInit() | ||
| 23 | } | 24 | } | ||
| 24 | 25 | ||||
| @@ -27,8 +28,6 @@ var xIsInitialized func() bool | |||||
| 27 | // Use this function to check if libadwaita has been initialized with | 28 | // Use this function to check if libadwaita has been initialized with | ||
| 28 | // [func@init]. | 29 | // [func@init]. | ||
| 29 | func IsInitialized() bool { | 30 | func IsInitialized() bool { | ||
| 30 | - | core.LazyRegister(&xIsInitialized, "ADW", "adw_is_initialized", false) | |||
| 31 | - | ||||
| 32 | cret := xIsInitialized() | 31 | cret := xIsInitialized() | ||
| 33 | return cret | 32 | return cret | ||
| 34 | } | 33 | } | ||
| @@ -36,4 +35,15 @@ func IsInitialized() bool { | |||||
| 36 | func init() { | 35 | func init() { | ||
| 37 | core.SetPackageName("ADW", "libadwaita-1") | 36 | core.SetPackageName("ADW", "libadwaita-1") | ||
| 38 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | 37 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | ||
| 38 | + | var libs []uintptr | |||
| 39 | + | for _, libPath := range core.GetPaths("ADW") { | |||
| 40 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |||
| 41 | + | if err != nil { | |||
| 42 | + | panic(err) | |||
| 43 | + | } | |||
| 44 | + | libs = append(libs, lib) | |||
| 45 | + | } | |||
| 46 | + | ||||
| 47 | + | core.PuregoSafeRegister(&xInit, libs, "adw_init") | |||
| 48 | + | core.PuregoSafeRegister(&xIsInitialized, libs, "adw_is_initialized") | |||
| 39 | } | 49 | } | ||