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
| @@ -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" | |
| @@ -56,6 +55,7 @@ type CarouselIndicatorLines struct { | |||
| 56 | 55 | var xCarouselIndicatorLinesGLibType func() types.GType | |
| 57 | 56 | ||
| 58 | 57 | func CarouselIndicatorLinesGLibType() types.GType { | |
| 58 | + | core.LazyRegister(&xCarouselIndicatorLinesGLibType, "ADW", "adw_carousel_indicator_lines_get_type", false) | |
| 59 | 59 | return xCarouselIndicatorLinesGLibType() | |
| 60 | 60 | } | |
| 61 | 61 | ||
| @@ -69,6 +69,7 @@ var xNewCarouselIndicatorLines func() uintptr | |||
| 69 | 69 | ||
| 70 | 70 | // Creates a new `AdwCarouselIndicatorLines`. | |
| 71 | 71 | func NewCarouselIndicatorLines() *CarouselIndicatorLines { | |
| 72 | + | core.LazyRegister(&xNewCarouselIndicatorLines, "ADW", "adw_carousel_indicator_lines_new", false) | |
| 72 | 73 | var cls *CarouselIndicatorLines | |
| 73 | 74 | ||
| 74 | 75 | cret := xNewCarouselIndicatorLines() | |
| @@ -86,6 +87,7 @@ var xCarouselIndicatorLinesGetCarousel func(uintptr) uintptr | |||
| 86 | 87 | ||
| 87 | 88 | // Gets the displayed carousel. | |
| 88 | 89 | func (x *CarouselIndicatorLines) GetCarousel() *Carousel { | |
| 90 | + | core.LazyRegister(&xCarouselIndicatorLinesGetCarousel, "ADW", "adw_carousel_indicator_lines_get_carousel", false) | |
| 89 | 91 | var cls *Carousel | |
| 90 | 92 | ||
| 91 | 93 | cret := xCarouselIndicatorLinesGetCarousel(x.GoPointer()) | |
| @@ -103,6 +105,8 @@ var xCarouselIndicatorLinesSetCarousel func(uintptr, uintptr) | |||
| 103 | 105 | ||
| 104 | 106 | // Sets the displayed carousel. | |
| 105 | 107 | func (x *CarouselIndicatorLines) SetCarousel(CarouselVar *Carousel) { | |
| 108 | + | core.LazyRegister(&xCarouselIndicatorLinesSetCarousel, "ADW", "adw_carousel_indicator_lines_set_carousel", false) | |
| 109 | + | ||
| 106 | 110 | xCarouselIndicatorLinesSetCarousel(x.GoPointer(), CarouselVar.GoPointer()) | |
| 107 | 111 | } | |
| 108 | 112 | ||
| @@ -391,19 +395,4 @@ func (x *CarouselIndicatorLines) SetOrientation(OrientationVar gtk.Orientation) | |||
| 391 | 395 | func init() { | |
| 392 | 396 | core.SetPackageName("ADW", "libadwaita-1") | |
| 393 | 397 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | |
| 394 | - | var libs []uintptr | |
| 395 | - | for _, libPath := range core.GetPaths("ADW") { | |
| 396 | - | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 397 | - | if err != nil { | |
| 398 | - | panic(err) | |
| 399 | - | } | |
| 400 | - | libs = append(libs, lib) | |
| 401 | - | } | |
| 402 | - | ||
| 403 | - | core.PuregoSafeRegister(&xCarouselIndicatorLinesGLibType, libs, "adw_carousel_indicator_lines_get_type") | |
| 404 | - | ||
| 405 | - | core.PuregoSafeRegister(&xNewCarouselIndicatorLines, libs, "adw_carousel_indicator_lines_new") | |
| 406 | - | ||
| 407 | - | core.PuregoSafeRegister(&xCarouselIndicatorLinesGetCarousel, libs, "adw_carousel_indicator_lines_get_carousel") | |
| 408 | - | core.PuregoSafeRegister(&xCarouselIndicatorLinesSetCarousel, libs, "adw_carousel_indicator_lines_set_carousel") | |
| 409 | 398 | } | |
| @@ -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" | ||
| @@ -56,6 +55,7 @@ type CarouselIndicatorLines struct { | |||||
| 56 | var xCarouselIndicatorLinesGLibType func() types.GType | 55 | var xCarouselIndicatorLinesGLibType func() types.GType | ||
| 57 | 56 | ||||
| 58 | func CarouselIndicatorLinesGLibType() types.GType { | 57 | func CarouselIndicatorLinesGLibType() types.GType { | ||
| 58 | + | core.LazyRegister(&xCarouselIndicatorLinesGLibType, "ADW", "adw_carousel_indicator_lines_get_type", false) | |||
| 59 | return xCarouselIndicatorLinesGLibType() | 59 | return xCarouselIndicatorLinesGLibType() | ||
| 60 | } | 60 | } | ||
| 61 | 61 | ||||
| @@ -69,6 +69,7 @@ var xNewCarouselIndicatorLines func() uintptr | |||||
| 69 | 69 | ||||
| 70 | // Creates a new `AdwCarouselIndicatorLines`. | 70 | // Creates a new `AdwCarouselIndicatorLines`. | ||
| 71 | func NewCarouselIndicatorLines() *CarouselIndicatorLines { | 71 | func NewCarouselIndicatorLines() *CarouselIndicatorLines { | ||
| 72 | + | core.LazyRegister(&xNewCarouselIndicatorLines, "ADW", "adw_carousel_indicator_lines_new", false) | |||
| 72 | var cls *CarouselIndicatorLines | 73 | var cls *CarouselIndicatorLines | ||
| 73 | 74 | ||||
| 74 | cret := xNewCarouselIndicatorLines() | 75 | cret := xNewCarouselIndicatorLines() | ||
| @@ -86,6 +87,7 @@ var xCarouselIndicatorLinesGetCarousel func(uintptr) uintptr | |||||
| 86 | 87 | ||||
| 87 | // Gets the displayed carousel. | 88 | // Gets the displayed carousel. | ||
| 88 | func (x *CarouselIndicatorLines) GetCarousel() *Carousel { | 89 | func (x *CarouselIndicatorLines) GetCarousel() *Carousel { | ||
| 90 | + | core.LazyRegister(&xCarouselIndicatorLinesGetCarousel, "ADW", "adw_carousel_indicator_lines_get_carousel", false) | |||
| 89 | var cls *Carousel | 91 | var cls *Carousel | ||
| 90 | 92 | ||||
| 91 | cret := xCarouselIndicatorLinesGetCarousel(x.GoPointer()) | 93 | cret := xCarouselIndicatorLinesGetCarousel(x.GoPointer()) | ||
| @@ -103,6 +105,8 @@ var xCarouselIndicatorLinesSetCarousel func(uintptr, uintptr) | |||||
| 103 | 105 | ||||
| 104 | // Sets the displayed carousel. | 106 | // Sets the displayed carousel. | ||
| 105 | func (x *CarouselIndicatorLines) SetCarousel(CarouselVar *Carousel) { | 107 | func (x *CarouselIndicatorLines) SetCarousel(CarouselVar *Carousel) { | ||
| 108 | + | core.LazyRegister(&xCarouselIndicatorLinesSetCarousel, "ADW", "adw_carousel_indicator_lines_set_carousel", false) | |||
| 109 | + | ||||
| 106 | xCarouselIndicatorLinesSetCarousel(x.GoPointer(), CarouselVar.GoPointer()) | 110 | xCarouselIndicatorLinesSetCarousel(x.GoPointer(), CarouselVar.GoPointer()) | ||
| 107 | } | 111 | } | ||
| 108 | 112 | ||||
| @@ -391,19 +395,4 @@ func (x *CarouselIndicatorLines) SetOrientation(OrientationVar gtk.Orientation) | |||||
| 391 | func init() { | 395 | func init() { | ||
| 392 | core.SetPackageName("ADW", "libadwaita-1") | 396 | core.SetPackageName("ADW", "libadwaita-1") | ||
| 393 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | 397 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | ||
| 394 | - | var libs []uintptr | |||
| 395 | - | for _, libPath := range core.GetPaths("ADW") { | |||
| 396 | - | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |||
| 397 | - | if err != nil { | |||
| 398 | - | panic(err) | |||
| 399 | - | } | |||
| 400 | - | libs = append(libs, lib) | |||
| 401 | - | } | |||
| 402 | - | ||||
| 403 | - | core.PuregoSafeRegister(&xCarouselIndicatorLinesGLibType, libs, "adw_carousel_indicator_lines_get_type") | |||
| 404 | - | ||||
| 405 | - | core.PuregoSafeRegister(&xNewCarouselIndicatorLines, libs, "adw_carousel_indicator_lines_new") | |||
| 406 | - | ||||
| 407 | - | core.PuregoSafeRegister(&xCarouselIndicatorLinesGetCarousel, libs, "adw_carousel_indicator_lines_get_carousel") | |||
| 408 | - | core.PuregoSafeRegister(&xCarouselIndicatorLinesSetCarousel, libs, "adw_carousel_indicator_lines_set_carousel") | |||
| 409 | } | 398 | } | ||