Revert "chore(deps): pin puregotk nil-signal fix"
This reverts commit a161e348e2093172038390b0906448f0ae979a0d.
- commit
- 40378d5e4fd2372d054e49168ab2a6f67aedd0fd
- author
- brice · · 2026-07-14 17:59 UTC
- parent
- 8d647bb
- signature
- GPG Verified
CD88F9E564E0102646FB6077A1A07C7C7C3E349D· arch-gpg Verified for the committer email
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
| @@ -5,6 +5,7 @@ import ( | |||
| 5 | 5 | "structs" | |
| 6 | 6 | "unsafe" | |
| 7 | 7 | ||
| 8 | + | "github.com/bnema/purego" | |
| 8 | 9 | "github.com/bnema/puregotk/pkg/core" | |
| 9 | 10 | "github.com/bnema/puregotk/v4/gobject" | |
| 10 | 11 | "github.com/bnema/puregotk/v4/gobject/types" | |
| @@ -56,7 +57,6 @@ type CarouselIndicatorDots struct { | |||
| 56 | 57 | var xCarouselIndicatorDotsGLibType func() types.GType | |
| 57 | 58 | ||
| 58 | 59 | 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,7 +70,6 @@ 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) | |
| 74 | 73 | var cls *CarouselIndicatorDots | |
| 75 | 74 | ||
| 76 | 75 | cret := xNewCarouselIndicatorDots() | |
| @@ -88,7 +87,6 @@ var xCarouselIndicatorDotsGetCarousel func(uintptr) uintptr | |||
| 88 | 87 | ||
| 89 | 88 | // Gets the displayed carousel. | |
| 90 | 89 | func (x *CarouselIndicatorDots) GetCarousel() *Carousel { | |
| 91 | - | core.LazyRegister(&xCarouselIndicatorDotsGetCarousel, "ADW", "adw_carousel_indicator_dots_get_carousel", false) | |
| 92 | 90 | var cls *Carousel | |
| 93 | 91 | ||
| 94 | 92 | cret := xCarouselIndicatorDotsGetCarousel(x.GoPointer()) | |
| @@ -106,8 +104,6 @@ var xCarouselIndicatorDotsSetCarousel func(uintptr, uintptr) | |||
| 106 | 104 | ||
| 107 | 105 | // Sets the displayed carousel. | |
| 108 | 106 | func (x *CarouselIndicatorDots) SetCarousel(CarouselVar *Carousel) { | |
| 109 | - | core.LazyRegister(&xCarouselIndicatorDotsSetCarousel, "ADW", "adw_carousel_indicator_dots_set_carousel", false) | |
| 110 | - | ||
| 111 | 107 | xCarouselIndicatorDotsSetCarousel(x.GoPointer(), CarouselVar.GoPointer()) | |
| 112 | 108 | } | |
| 113 | 109 | ||
| @@ -396,4 +392,19 @@ func (x *CarouselIndicatorDots) SetOrientation(OrientationVar gtk.Orientation) { | |||
| 396 | 392 | func init() { | |
| 397 | 393 | core.SetPackageName("ADW", "libadwaita-1") | |
| 398 | 394 | 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") | |
| 399 | 410 | } | |
| @@ -5,6 +5,7 @@ import ( | |||||
| 5 | "structs" | 5 | "structs" | ||
| 6 | "unsafe" | 6 | "unsafe" | ||
| 7 | 7 | ||||
| 8 | + | "github.com/bnema/purego" | |||
| 8 | "github.com/bnema/puregotk/pkg/core" | 9 | "github.com/bnema/puregotk/pkg/core" | ||
| 9 | "github.com/bnema/puregotk/v4/gobject" | 10 | "github.com/bnema/puregotk/v4/gobject" | ||
| 10 | "github.com/bnema/puregotk/v4/gobject/types" | 11 | "github.com/bnema/puregotk/v4/gobject/types" | ||
| @@ -56,7 +57,6 @@ type CarouselIndicatorDots struct { | |||||
| 56 | var xCarouselIndicatorDotsGLibType func() types.GType | 57 | var xCarouselIndicatorDotsGLibType func() types.GType | ||
| 57 | 58 | ||||
| 58 | func CarouselIndicatorDotsGLibType() types.GType { | 59 | 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,7 +70,6 @@ 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) | |||
| 74 | var cls *CarouselIndicatorDots | 73 | var cls *CarouselIndicatorDots | ||
| 75 | 74 | ||||
| 76 | cret := xNewCarouselIndicatorDots() | 75 | cret := xNewCarouselIndicatorDots() | ||
| @@ -88,7 +87,6 @@ var xCarouselIndicatorDotsGetCarousel func(uintptr) uintptr | |||||
| 88 | 87 | ||||
| 89 | // Gets the displayed carousel. | 88 | // Gets the displayed carousel. | ||
| 90 | func (x *CarouselIndicatorDots) GetCarousel() *Carousel { | 89 | func (x *CarouselIndicatorDots) GetCarousel() *Carousel { | ||
| 91 | - | core.LazyRegister(&xCarouselIndicatorDotsGetCarousel, "ADW", "adw_carousel_indicator_dots_get_carousel", false) | |||
| 92 | var cls *Carousel | 90 | var cls *Carousel | ||
| 93 | 91 | ||||
| 94 | cret := xCarouselIndicatorDotsGetCarousel(x.GoPointer()) | 92 | cret := xCarouselIndicatorDotsGetCarousel(x.GoPointer()) | ||
| @@ -106,8 +104,6 @@ var xCarouselIndicatorDotsSetCarousel func(uintptr, uintptr) | |||||
| 106 | 104 | ||||
| 107 | // Sets the displayed carousel. | 105 | // Sets the displayed carousel. | ||
| 108 | func (x *CarouselIndicatorDots) SetCarousel(CarouselVar *Carousel) { | 106 | func (x *CarouselIndicatorDots) SetCarousel(CarouselVar *Carousel) { | ||
| 109 | - | core.LazyRegister(&xCarouselIndicatorDotsSetCarousel, "ADW", "adw_carousel_indicator_dots_set_carousel", false) | |||
| 110 | - | ||||
| 111 | xCarouselIndicatorDotsSetCarousel(x.GoPointer(), CarouselVar.GoPointer()) | 107 | xCarouselIndicatorDotsSetCarousel(x.GoPointer(), CarouselVar.GoPointer()) | ||
| 112 | } | 108 | } | ||
| 113 | 109 | ||||
| @@ -396,4 +392,19 @@ func (x *CarouselIndicatorDots) SetOrientation(OrientationVar gtk.Orientation) { | |||||
| 396 | func init() { | 392 | func init() { | ||
| 397 | core.SetPackageName("ADW", "libadwaita-1") | 393 | core.SetPackageName("ADW", "libadwaita-1") | ||
| 398 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | 394 | 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") | |||
| 399 | } | 410 | } | ||