Merge pull request #350 from bnema/fix/repin-fixed-puregotk
fix(deps): validate puregotk lazy registration fix
907 files · +27874 -25296
M go.mod +3 -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.0 | |
| 14 | + | github.com/bnema/puregotk v0.7.1-0.20260714200603-7370c78950ef | |
| 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 | |
| @@ -47,6 +47,7 @@ require ( | |||
| 47 | 47 | github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect | |
| 48 | 48 | github.com/fatih/color v1.19.0 // indirect | |
| 49 | 49 | github.com/go-viper/mapstructure/v2 v2.5.0 // indirect | |
| 50 | + | github.com/google/go-cmp v0.7.0 // indirect | |
| 50 | 51 | github.com/inconshreveable/mousetrap v1.1.0 // indirect | |
| 51 | 52 | github.com/lucasb-eyer/go-colorful v1.4.0 // indirect | |
| 52 | 53 | github.com/mattn/go-colorable v0.1.14 // indirect | |
| @@ -80,6 +81,7 @@ require ( | |||
| 80 | 81 | golang.org/x/text v0.40.0 // indirect | |
| 81 | 82 | golang.org/x/tools v0.47.0 // indirect | |
| 82 | 83 | gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect | |
| 84 | + | mvdan.cc/gofumpt v0.9.2 // indirect | |
| 83 | 85 | ) | |
| 84 | 86 | ||
| 85 | 87 | tool github.com/a-h/templ/cmd/templ | |
| @@ -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.0 | 14 | + | github.com/bnema/puregotk v0.7.1-0.20260714200603-7370c78950ef |
| 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 | ||
| @@ -47,6 +47,7 @@ require ( | |||||
| 47 | github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect | 47 | github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect | ||
| 48 | github.com/fatih/color v1.19.0 // indirect | 48 | github.com/fatih/color v1.19.0 // indirect | ||
| 49 | github.com/go-viper/mapstructure/v2 v2.5.0 // indirect | 49 | github.com/go-viper/mapstructure/v2 v2.5.0 // indirect | ||
| 50 | + | github.com/google/go-cmp v0.7.0 // indirect | |||
| 50 | github.com/inconshreveable/mousetrap v1.1.0 // indirect | 51 | github.com/inconshreveable/mousetrap v1.1.0 // indirect | ||
| 51 | github.com/lucasb-eyer/go-colorful v1.4.0 // indirect | 52 | github.com/lucasb-eyer/go-colorful v1.4.0 // indirect | ||
| 52 | github.com/mattn/go-colorable v0.1.14 // indirect | 53 | github.com/mattn/go-colorable v0.1.14 // indirect | ||
| @@ -80,6 +81,7 @@ require ( | |||||
| 80 | golang.org/x/text v0.40.0 // indirect | 81 | golang.org/x/text v0.40.0 // indirect | ||
| 81 | golang.org/x/tools v0.47.0 // indirect | 82 | golang.org/x/tools v0.47.0 // indirect | ||
| 82 | gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect | 83 | gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect | ||
| 84 | + | mvdan.cc/gofumpt v0.9.2 // indirect | |||
| 83 | ) | 85 | ) | ||
| 84 | 86 | ||||
| 85 | tool github.com/a-h/templ/cmd/templ | 87 | tool github.com/a-h/templ/cmd/templ | ||
M go.sum +4 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/internal/core/core.go +197 -4 generated file: collapsed
M vendor/github.com/bnema/puregotk/pkg/core/core.go +10 -0 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-about-dialog.go +99 -64 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-about-window.go +95 -62 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-accent-color.go +7 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-action-row.go +33 -29 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-alert-dialog.go +66 -47 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-animation-target.go +10 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-animation-util.go +4 -12 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-animation.go +24 -26 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-application-window.go +14 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-application.go +3 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-avatar.go +22 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-banner.go +23 -26 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-bin.go +5 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-bottom-sheet.go +47 -38 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-breakpoint-bin.go +10 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-breakpoint.go +33 -37 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-button-content.go +18 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-button-row.go +10 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-carousel-indicator-dots.go +5 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-carousel-indicator-lines.go +5 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-carousel.go +47 -37 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-clamp-layout.go +14 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-clamp-scrollable.go +17 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-clamp.go +17 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-combo-row.go +34 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-dialog.go +45 -38 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-easing.go +3 -13
| @@ -2,7 +2,6 @@ | |||
| 2 | 2 | package adw | |
| 3 | 3 | ||
| 4 | 4 | import ( | |
| 5 | - | "github.com/bnema/purego" | |
| 6 | 5 | "github.com/bnema/puregotk/pkg/core" | |
| 7 | 6 | "github.com/bnema/puregotk/v4/gobject/types" | |
| 8 | 7 | ) | |
| @@ -16,6 +15,7 @@ type Easing int | |||
| 16 | 15 | var xEasingGLibType func() types.GType | |
| 17 | 16 | ||
| 18 | 17 | func EasingGLibType() types.GType { | |
| 18 | + | core.LazyRegister(&xEasingGLibType, "ADW", "adw_easing_get_type", false) | |
| 19 | 19 | return xEasingGLibType() | |
| 20 | 20 | } | |
| 21 | 21 | ||
| @@ -132,6 +132,8 @@ var xEasingEase func(Easing, float64) float64 | |||
| 132 | 132 | // | |
| 133 | 133 | // @value should generally be in the [0, 1] range. | |
| 134 | 134 | func EasingEase(SelfVar Easing, ValueVar float64) float64 { | |
| 135 | + | core.LazyRegister(&xEasingEase, "ADW", "adw_easing_ease", false) | |
| 136 | + | ||
| 135 | 137 | cret := xEasingEase(SelfVar, ValueVar) | |
| 136 | 138 | return cret | |
| 137 | 139 | } | |
| @@ -139,16 +141,4 @@ func EasingEase(SelfVar Easing, ValueVar float64) float64 { | |||
| 139 | 141 | func init() { | |
| 140 | 142 | core.SetPackageName("ADW", "libadwaita-1") | |
| 141 | 143 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | |
| 142 | - | var libs []uintptr | |
| 143 | - | for _, libPath := range core.GetPaths("ADW") { | |
| 144 | - | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 145 | - | if err != nil { | |
| 146 | - | panic(err) | |
| 147 | - | } | |
| 148 | - | libs = append(libs, lib) | |
| 149 | - | } | |
| 150 | - | ||
| 151 | - | core.PuregoSafeRegister(&xEasingGLibType, libs, "adw_easing_get_type") | |
| 152 | - | ||
| 153 | - | core.PuregoSafeRegister(&xEasingEase, libs, "adw_easing_ease") | |
| 154 | 144 | } | |
| @@ -2,7 +2,6 @@ | |||||
| 2 | package adw | 2 | package adw | ||
| 3 | 3 | ||||
| 4 | import ( | 4 | import ( | ||
| 5 | - | "github.com/bnema/purego" | |||
| 6 | "github.com/bnema/puregotk/pkg/core" | 5 | "github.com/bnema/puregotk/pkg/core" | ||
| 7 | "github.com/bnema/puregotk/v4/gobject/types" | 6 | "github.com/bnema/puregotk/v4/gobject/types" | ||
| 8 | ) | 7 | ) | ||
| @@ -16,6 +15,7 @@ type Easing int | |||||
| 16 | var xEasingGLibType func() types.GType | 15 | var xEasingGLibType func() types.GType | ||
| 17 | 16 | ||||
| 18 | func EasingGLibType() types.GType { | 17 | func EasingGLibType() types.GType { | ||
| 18 | + | core.LazyRegister(&xEasingGLibType, "ADW", "adw_easing_get_type", false) | |||
| 19 | return xEasingGLibType() | 19 | return xEasingGLibType() | ||
| 20 | } | 20 | } | ||
| 21 | 21 | ||||
| @@ -132,6 +132,8 @@ var xEasingEase func(Easing, float64) float64 | |||||
| 132 | // | 132 | // | ||
| 133 | // @value should generally be in the [0, 1] range. | 133 | // @value should generally be in the [0, 1] range. | ||
| 134 | func EasingEase(SelfVar Easing, ValueVar float64) float64 { | 134 | func EasingEase(SelfVar Easing, ValueVar float64) float64 { | ||
| 135 | + | core.LazyRegister(&xEasingEase, "ADW", "adw_easing_ease", false) | |||
| 136 | + | ||||
| 135 | cret := xEasingEase(SelfVar, ValueVar) | 137 | cret := xEasingEase(SelfVar, ValueVar) | ||
| 136 | return cret | 138 | return cret | ||
| 137 | } | 139 | } | ||
| @@ -139,16 +141,4 @@ func EasingEase(SelfVar Easing, ValueVar float64) float64 { | |||||
| 139 | func init() { | 141 | func init() { | ||
| 140 | core.SetPackageName("ADW", "libadwaita-1") | 142 | core.SetPackageName("ADW", "libadwaita-1") | ||
| 141 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | 143 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | ||
| 142 | - | var libs []uintptr | |||
| 143 | - | for _, libPath := range core.GetPaths("ADW") { | |||
| 144 | - | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |||
| 145 | - | if err != nil { | |||
| 146 | - | panic(err) | |||
| 147 | - | } | |||
| 148 | - | libs = append(libs, lib) | |||
| 149 | - | } | |||
| 150 | - | ||||
| 151 | - | core.PuregoSafeRegister(&xEasingGLibType, libs, "adw_easing_get_type") | |||
| 152 | - | ||||
| 153 | - | core.PuregoSafeRegister(&xEasingEase, libs, "adw_easing_ease") | |||
| 154 | } | 144 | } | ||