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
| @@ -5,7 +5,6 @@ import ( | |||
| 5 | 5 | "structs" | |
| 6 | 6 | "unsafe" | |
| 7 | 7 | ||
| 8 | - | "github.com/bnema/purego" | |
| 9 | 8 | "github.com/bnema/puregotk/pkg/core" | |
| 10 | 9 | "github.com/bnema/puregotk/v4/gobject" | |
| 11 | 10 | "github.com/bnema/puregotk/v4/gobject/types" | |
| @@ -51,6 +50,7 @@ type Bin struct { | |||
| 51 | 50 | var xBinGLibType func() types.GType | |
| 52 | 51 | ||
| 53 | 52 | func BinGLibType() types.GType { | |
| 53 | + | core.LazyRegister(&xBinGLibType, "ADW", "adw_bin_get_type", false) | |
| 54 | 54 | return xBinGLibType() | |
| 55 | 55 | } | |
| 56 | 56 | ||
| @@ -64,6 +64,7 @@ var xNewBin func() uintptr | |||
| 64 | 64 | ||
| 65 | 65 | // Creates a new `AdwBin`. | |
| 66 | 66 | func NewBin() *Bin { | |
| 67 | + | core.LazyRegister(&xNewBin, "ADW", "adw_bin_new", false) | |
| 67 | 68 | var cls *Bin | |
| 68 | 69 | ||
| 69 | 70 | cret := xNewBin() | |
| @@ -81,6 +82,7 @@ var xBinGetChild func(uintptr) uintptr | |||
| 81 | 82 | ||
| 82 | 83 | // Gets the child widget of @self. | |
| 83 | 84 | func (x *Bin) GetChild() *gtk.Widget { | |
| 85 | + | core.LazyRegister(&xBinGetChild, "ADW", "adw_bin_get_child", false) | |
| 84 | 86 | var cls *gtk.Widget | |
| 85 | 87 | ||
| 86 | 88 | cret := xBinGetChild(x.GoPointer()) | |
| @@ -98,6 +100,8 @@ var xBinSetChild func(uintptr, uintptr) | |||
| 98 | 100 | ||
| 99 | 101 | // Sets the child widget of @self. | |
| 100 | 102 | func (x *Bin) SetChild(ChildVar *gtk.Widget) { | |
| 103 | + | core.LazyRegister(&xBinSetChild, "ADW", "adw_bin_set_child", false) | |
| 104 | + | ||
| 101 | 105 | xBinSetChild(x.GoPointer(), ChildVar.GoPointer()) | |
| 102 | 106 | } | |
| 103 | 107 | ||
| @@ -375,19 +379,4 @@ func (x *Bin) GetBuildableId() string { | |||
| 375 | 379 | func init() { | |
| 376 | 380 | core.SetPackageName("ADW", "libadwaita-1") | |
| 377 | 381 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | |
| 378 | - | var libs []uintptr | |
| 379 | - | for _, libPath := range core.GetPaths("ADW") { | |
| 380 | - | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 381 | - | if err != nil { | |
| 382 | - | panic(err) | |
| 383 | - | } | |
| 384 | - | libs = append(libs, lib) | |
| 385 | - | } | |
| 386 | - | ||
| 387 | - | core.PuregoSafeRegister(&xBinGLibType, libs, "adw_bin_get_type") | |
| 388 | - | ||
| 389 | - | core.PuregoSafeRegister(&xNewBin, libs, "adw_bin_new") | |
| 390 | - | ||
| 391 | - | core.PuregoSafeRegister(&xBinGetChild, libs, "adw_bin_get_child") | |
| 392 | - | core.PuregoSafeRegister(&xBinSetChild, libs, "adw_bin_set_child") | |
| 393 | 382 | } | |
| @@ -5,7 +5,6 @@ import ( | |||||
| 5 | "structs" | 5 | "structs" | ||
| 6 | "unsafe" | 6 | "unsafe" | ||
| 7 | 7 | ||||
| 8 | - | "github.com/bnema/purego" | |||
| 9 | "github.com/bnema/puregotk/pkg/core" | 8 | "github.com/bnema/puregotk/pkg/core" | ||
| 10 | "github.com/bnema/puregotk/v4/gobject" | 9 | "github.com/bnema/puregotk/v4/gobject" | ||
| 11 | "github.com/bnema/puregotk/v4/gobject/types" | 10 | "github.com/bnema/puregotk/v4/gobject/types" | ||
| @@ -51,6 +50,7 @@ type Bin struct { | |||||
| 51 | var xBinGLibType func() types.GType | 50 | var xBinGLibType func() types.GType | ||
| 52 | 51 | ||||
| 53 | func BinGLibType() types.GType { | 52 | func BinGLibType() types.GType { | ||
| 53 | + | core.LazyRegister(&xBinGLibType, "ADW", "adw_bin_get_type", false) | |||
| 54 | return xBinGLibType() | 54 | return xBinGLibType() | ||
| 55 | } | 55 | } | ||
| 56 | 56 | ||||
| @@ -64,6 +64,7 @@ var xNewBin func() uintptr | |||||
| 64 | 64 | ||||
| 65 | // Creates a new `AdwBin`. | 65 | // Creates a new `AdwBin`. | ||
| 66 | func NewBin() *Bin { | 66 | func NewBin() *Bin { | ||
| 67 | + | core.LazyRegister(&xNewBin, "ADW", "adw_bin_new", false) | |||
| 67 | var cls *Bin | 68 | var cls *Bin | ||
| 68 | 69 | ||||
| 69 | cret := xNewBin() | 70 | cret := xNewBin() | ||
| @@ -81,6 +82,7 @@ var xBinGetChild func(uintptr) uintptr | |||||
| 81 | 82 | ||||
| 82 | // Gets the child widget of @self. | 83 | // Gets the child widget of @self. | ||
| 83 | func (x *Bin) GetChild() *gtk.Widget { | 84 | func (x *Bin) GetChild() *gtk.Widget { | ||
| 85 | + | core.LazyRegister(&xBinGetChild, "ADW", "adw_bin_get_child", false) | |||
| 84 | var cls *gtk.Widget | 86 | var cls *gtk.Widget | ||
| 85 | 87 | ||||
| 86 | cret := xBinGetChild(x.GoPointer()) | 88 | cret := xBinGetChild(x.GoPointer()) | ||
| @@ -98,6 +100,8 @@ var xBinSetChild func(uintptr, uintptr) | |||||
| 98 | 100 | ||||
| 99 | // Sets the child widget of @self. | 101 | // Sets the child widget of @self. | ||
| 100 | func (x *Bin) SetChild(ChildVar *gtk.Widget) { | 102 | func (x *Bin) SetChild(ChildVar *gtk.Widget) { | ||
| 103 | + | core.LazyRegister(&xBinSetChild, "ADW", "adw_bin_set_child", false) | |||
| 104 | + | ||||
| 101 | xBinSetChild(x.GoPointer(), ChildVar.GoPointer()) | 105 | xBinSetChild(x.GoPointer(), ChildVar.GoPointer()) | ||
| 102 | } | 106 | } | ||
| 103 | 107 | ||||
| @@ -375,19 +379,4 @@ func (x *Bin) GetBuildableId() string { | |||||
| 375 | func init() { | 379 | func init() { | ||
| 376 | core.SetPackageName("ADW", "libadwaita-1") | 380 | core.SetPackageName("ADW", "libadwaita-1") | ||
| 377 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | 381 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | ||
| 378 | - | var libs []uintptr | |||
| 379 | - | for _, libPath := range core.GetPaths("ADW") { | |||
| 380 | - | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |||
| 381 | - | if err != nil { | |||
| 382 | - | panic(err) | |||
| 383 | - | } | |||
| 384 | - | libs = append(libs, lib) | |||
| 385 | - | } | |||
| 386 | - | ||||
| 387 | - | core.PuregoSafeRegister(&xBinGLibType, libs, "adw_bin_get_type") | |||
| 388 | - | ||||
| 389 | - | core.PuregoSafeRegister(&xNewBin, libs, "adw_bin_new") | |||
| 390 | - | ||||
| 391 | - | core.PuregoSafeRegister(&xBinGetChild, libs, "adw_bin_get_child") | |||
| 392 | - | core.PuregoSafeRegister(&xBinSetChild, libs, "adw_bin_set_child") | |||
| 393 | } | 382 | } | ||