fix(deps): repin puregotk lazy registration fix
- commit
- d685b6e820d6baba0d0dea254169664012ed203d
- author
- brice · · 2026-07-14 18:24 UTC
- parent
- ec6db2e
- signature
- GPG Verified
CD88F9E564E0102646FB6077A1A07C7C7C3E349D· arch-gpg Verified for the committer email
907 files · +27874 -25294
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.20260714181430-679a9ed72959 | |
| 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.20260714181430-679a9ed72959 |
| 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 -16 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
| @@ -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" | |
| @@ -57,6 +56,7 @@ type CarouselIndicatorDots struct { | |||
| 57 | 56 | var xCarouselIndicatorDotsGLibType func() types.GType | |
| 58 | 57 | ||
| 59 | 58 | func CarouselIndicatorDotsGLibType() types.GType { | |
| 59 | + | core.LazyRegister(&xCarouselIndicatorDotsGLibType, "ADW", "adw_carousel_indicator_dots_get_type", false) | |
| 60 | 60 | return xCarouselIndicatorDotsGLibType() | |
| 61 | 61 | } | |
| 62 | 62 | ||
| @@ -70,6 +70,7 @@ var xNewCarouselIndicatorDots func() uintptr | |||
| 70 | 70 | ||
| 71 | 71 | // Creates a new `AdwCarouselIndicatorDots`. | |
| 72 | 72 | func NewCarouselIndicatorDots() *CarouselIndicatorDots { | |
| 73 | + | core.LazyRegister(&xNewCarouselIndicatorDots, "ADW", "adw_carousel_indicator_dots_new", false) | |
| 73 | 74 | var cls *CarouselIndicatorDots | |
| 74 | 75 | ||
| 75 | 76 | cret := xNewCarouselIndicatorDots() | |
| @@ -87,6 +88,7 @@ var xCarouselIndicatorDotsGetCarousel func(uintptr) uintptr | |||
| 87 | 88 | ||
| 88 | 89 | // Gets the displayed carousel. | |
| 89 | 90 | func (x *CarouselIndicatorDots) GetCarousel() *Carousel { | |
| 91 | + | core.LazyRegister(&xCarouselIndicatorDotsGetCarousel, "ADW", "adw_carousel_indicator_dots_get_carousel", false) | |
| 90 | 92 | var cls *Carousel | |
| 91 | 93 | ||
| 92 | 94 | cret := xCarouselIndicatorDotsGetCarousel(x.GoPointer()) | |
| @@ -104,6 +106,8 @@ var xCarouselIndicatorDotsSetCarousel func(uintptr, uintptr) | |||
| 104 | 106 | ||
| 105 | 107 | // Sets the displayed carousel. | |
| 106 | 108 | func (x *CarouselIndicatorDots) SetCarousel(CarouselVar *Carousel) { | |
| 109 | + | core.LazyRegister(&xCarouselIndicatorDotsSetCarousel, "ADW", "adw_carousel_indicator_dots_set_carousel", false) | |
| 110 | + | ||
| 107 | 111 | xCarouselIndicatorDotsSetCarousel(x.GoPointer(), CarouselVar.GoPointer()) | |
| 108 | 112 | } | |
| 109 | 113 | ||
| @@ -392,19 +396,4 @@ func (x *CarouselIndicatorDots) SetOrientation(OrientationVar gtk.Orientation) { | |||
| 392 | 396 | func init() { | |
| 393 | 397 | core.SetPackageName("ADW", "libadwaita-1") | |
| 394 | 398 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | |
| 395 | - | var libs []uintptr | |
| 396 | - | for _, libPath := range core.GetPaths("ADW") { | |
| 397 | - | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 398 | - | if err != nil { | |
| 399 | - | panic(err) | |
| 400 | - | } | |
| 401 | - | libs = append(libs, lib) | |
| 402 | - | } | |
| 403 | - | ||
| 404 | - | core.PuregoSafeRegister(&xCarouselIndicatorDotsGLibType, libs, "adw_carousel_indicator_dots_get_type") | |
| 405 | - | ||
| 406 | - | core.PuregoSafeRegister(&xNewCarouselIndicatorDots, libs, "adw_carousel_indicator_dots_new") | |
| 407 | - | ||
| 408 | - | core.PuregoSafeRegister(&xCarouselIndicatorDotsGetCarousel, libs, "adw_carousel_indicator_dots_get_carousel") | |
| 409 | - | core.PuregoSafeRegister(&xCarouselIndicatorDotsSetCarousel, libs, "adw_carousel_indicator_dots_set_carousel") | |
| 410 | 399 | } | |
| @@ -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" | ||
| @@ -57,6 +56,7 @@ type CarouselIndicatorDots struct { | |||||
| 57 | var xCarouselIndicatorDotsGLibType func() types.GType | 56 | var xCarouselIndicatorDotsGLibType func() types.GType | ||
| 58 | 57 | ||||
| 59 | func CarouselIndicatorDotsGLibType() types.GType { | 58 | func CarouselIndicatorDotsGLibType() types.GType { | ||
| 59 | + | core.LazyRegister(&xCarouselIndicatorDotsGLibType, "ADW", "adw_carousel_indicator_dots_get_type", false) | |||
| 60 | return xCarouselIndicatorDotsGLibType() | 60 | return xCarouselIndicatorDotsGLibType() | ||
| 61 | } | 61 | } | ||
| 62 | 62 | ||||
| @@ -70,6 +70,7 @@ var xNewCarouselIndicatorDots func() uintptr | |||||
| 70 | 70 | ||||
| 71 | // Creates a new `AdwCarouselIndicatorDots`. | 71 | // Creates a new `AdwCarouselIndicatorDots`. | ||
| 72 | func NewCarouselIndicatorDots() *CarouselIndicatorDots { | 72 | func NewCarouselIndicatorDots() *CarouselIndicatorDots { | ||
| 73 | + | core.LazyRegister(&xNewCarouselIndicatorDots, "ADW", "adw_carousel_indicator_dots_new", false) | |||
| 73 | var cls *CarouselIndicatorDots | 74 | var cls *CarouselIndicatorDots | ||
| 74 | 75 | ||||
| 75 | cret := xNewCarouselIndicatorDots() | 76 | cret := xNewCarouselIndicatorDots() | ||
| @@ -87,6 +88,7 @@ var xCarouselIndicatorDotsGetCarousel func(uintptr) uintptr | |||||
| 87 | 88 | ||||
| 88 | // Gets the displayed carousel. | 89 | // Gets the displayed carousel. | ||
| 89 | func (x *CarouselIndicatorDots) GetCarousel() *Carousel { | 90 | func (x *CarouselIndicatorDots) GetCarousel() *Carousel { | ||
| 91 | + | core.LazyRegister(&xCarouselIndicatorDotsGetCarousel, "ADW", "adw_carousel_indicator_dots_get_carousel", false) | |||
| 90 | var cls *Carousel | 92 | var cls *Carousel | ||
| 91 | 93 | ||||
| 92 | cret := xCarouselIndicatorDotsGetCarousel(x.GoPointer()) | 94 | cret := xCarouselIndicatorDotsGetCarousel(x.GoPointer()) | ||
| @@ -104,6 +106,8 @@ var xCarouselIndicatorDotsSetCarousel func(uintptr, uintptr) | |||||
| 104 | 106 | ||||
| 105 | // Sets the displayed carousel. | 107 | // Sets the displayed carousel. | ||
| 106 | func (x *CarouselIndicatorDots) SetCarousel(CarouselVar *Carousel) { | 108 | func (x *CarouselIndicatorDots) SetCarousel(CarouselVar *Carousel) { | ||
| 109 | + | core.LazyRegister(&xCarouselIndicatorDotsSetCarousel, "ADW", "adw_carousel_indicator_dots_set_carousel", false) | |||
| 110 | + | ||||
| 107 | xCarouselIndicatorDotsSetCarousel(x.GoPointer(), CarouselVar.GoPointer()) | 111 | xCarouselIndicatorDotsSetCarousel(x.GoPointer(), CarouselVar.GoPointer()) | ||
| 108 | } | 112 | } | ||
| 109 | 113 | ||||
| @@ -392,19 +396,4 @@ func (x *CarouselIndicatorDots) SetOrientation(OrientationVar gtk.Orientation) { | |||||
| 392 | func init() { | 396 | func init() { | ||
| 393 | core.SetPackageName("ADW", "libadwaita-1") | 397 | core.SetPackageName("ADW", "libadwaita-1") | ||
| 394 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | 398 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | ||
| 395 | - | var libs []uintptr | |||
| 396 | - | for _, libPath := range core.GetPaths("ADW") { | |||
| 397 | - | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |||
| 398 | - | if err != nil { | |||
| 399 | - | panic(err) | |||
| 400 | - | } | |||
| 401 | - | libs = append(libs, lib) | |||
| 402 | - | } | |||
| 403 | - | ||||
| 404 | - | core.PuregoSafeRegister(&xCarouselIndicatorDotsGLibType, libs, "adw_carousel_indicator_dots_get_type") | |||
| 405 | - | ||||
| 406 | - | core.PuregoSafeRegister(&xNewCarouselIndicatorDots, libs, "adw_carousel_indicator_dots_new") | |||
| 407 | - | ||||
| 408 | - | core.PuregoSafeRegister(&xCarouselIndicatorDotsGetCarousel, libs, "adw_carousel_indicator_dots_get_carousel") | |||
| 409 | - | core.PuregoSafeRegister(&xCarouselIndicatorDotsSetCarousel, libs, "adw_carousel_indicator_dots_set_carousel") | |||
| 410 | } | 399 | } | ||