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 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-carousel-indicator-lines.go +16 -5 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-carousel.go +37 -47 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-clamp-layout.go +20 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-clamp-scrollable.go +22 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-clamp.go +22 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-combo-row.go +33 -34 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-dialog.go +38 -45 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-easing.go +13 -3 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-entry-row.go +33 -40 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-enum-list-model.go +22 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-expander-row.go +33 -40 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-flap.go +48 -61 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-fold-threshold-policy.go +1 -10 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-header-bar.go +33 -36 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-inline-view-switcher.go +24 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-layout-slot.go +15 -4
| @@ -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" | |
| @@ -42,7 +43,6 @@ type LayoutSlot struct { | |||
| 42 | 43 | var xLayoutSlotGLibType func() types.GType | |
| 43 | 44 | ||
| 44 | 45 | func LayoutSlotGLibType() types.GType { | |
| 45 | - | core.LazyRegister(&xLayoutSlotGLibType, "ADW", "adw_layout_slot_get_type", false) | |
| 46 | 46 | return xLayoutSlotGLibType() | |
| 47 | 47 | } | |
| 48 | 48 | ||
| @@ -56,7 +56,6 @@ var xNewLayoutSlot func(string) uintptr | |||
| 56 | 56 | ||
| 57 | 57 | // Creates a new `AdwLayoutSlot` with its ID set to @id. | |
| 58 | 58 | func NewLayoutSlot(IdVar string) *LayoutSlot { | |
| 59 | - | core.LazyRegister(&xNewLayoutSlot, "ADW", "adw_layout_slot_new", false) | |
| 60 | 59 | var cls *LayoutSlot | |
| 61 | 60 | ||
| 62 | 61 | cret := xNewLayoutSlot(IdVar) | |
| @@ -74,8 +73,6 @@ var xLayoutSlotGetSlotId func(uintptr) string | |||
| 74 | 73 | ||
| 75 | 74 | // Gets the slot id of @self. | |
| 76 | 75 | func (x *LayoutSlot) GetSlotId() string { | |
| 77 | - | core.LazyRegister(&xLayoutSlotGetSlotId, "ADW", "adw_layout_slot_get_slot_id", false) | |
| 78 | - | ||
| 79 | 76 | cret := xLayoutSlotGetSlotId(x.GoPointer()) | |
| 80 | 77 | return cret | |
| 81 | 78 | } | |
| @@ -375,4 +372,18 @@ func (x *LayoutSlot) GetBuildableId() string { | |||
| 375 | 372 | func init() { | |
| 376 | 373 | core.SetPackageName("ADW", "libadwaita-1") | |
| 377 | 374 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | |
| 375 | + | var libs []uintptr | |
| 376 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 377 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 378 | + | if err != nil { | |
| 379 | + | panic(err) | |
| 380 | + | } | |
| 381 | + | libs = append(libs, lib) | |
| 382 | + | } | |
| 383 | + | ||
| 384 | + | core.PuregoSafeRegister(&xLayoutSlotGLibType, libs, "adw_layout_slot_get_type") | |
| 385 | + | ||
| 386 | + | core.PuregoSafeRegister(&xNewLayoutSlot, libs, "adw_layout_slot_new") | |
| 387 | + | ||
| 388 | + | core.PuregoSafeRegister(&xLayoutSlotGetSlotId, libs, "adw_layout_slot_get_slot_id") | |
| 378 | 389 | } | |
| @@ -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" | ||
| @@ -42,7 +43,6 @@ type LayoutSlot struct { | |||||
| 42 | var xLayoutSlotGLibType func() types.GType | 43 | var xLayoutSlotGLibType func() types.GType | ||
| 43 | 44 | ||||
| 44 | func LayoutSlotGLibType() types.GType { | 45 | func LayoutSlotGLibType() types.GType { | ||
| 45 | - | core.LazyRegister(&xLayoutSlotGLibType, "ADW", "adw_layout_slot_get_type", false) | |||
| 46 | return xLayoutSlotGLibType() | 46 | return xLayoutSlotGLibType() | ||
| 47 | } | 47 | } | ||
| 48 | 48 | ||||
| @@ -56,7 +56,6 @@ var xNewLayoutSlot func(string) uintptr | |||||
| 56 | 56 | ||||
| 57 | // Creates a new `AdwLayoutSlot` with its ID set to @id. | 57 | // Creates a new `AdwLayoutSlot` with its ID set to @id. | ||
| 58 | func NewLayoutSlot(IdVar string) *LayoutSlot { | 58 | func NewLayoutSlot(IdVar string) *LayoutSlot { | ||
| 59 | - | core.LazyRegister(&xNewLayoutSlot, "ADW", "adw_layout_slot_new", false) | |||
| 60 | var cls *LayoutSlot | 59 | var cls *LayoutSlot | ||
| 61 | 60 | ||||
| 62 | cret := xNewLayoutSlot(IdVar) | 61 | cret := xNewLayoutSlot(IdVar) | ||
| @@ -74,8 +73,6 @@ var xLayoutSlotGetSlotId func(uintptr) string | |||||
| 74 | 73 | ||||
| 75 | // Gets the slot id of @self. | 74 | // Gets the slot id of @self. | ||
| 76 | func (x *LayoutSlot) GetSlotId() string { | 75 | func (x *LayoutSlot) GetSlotId() string { | ||
| 77 | - | core.LazyRegister(&xLayoutSlotGetSlotId, "ADW", "adw_layout_slot_get_slot_id", false) | |||
| 78 | - | ||||
| 79 | cret := xLayoutSlotGetSlotId(x.GoPointer()) | 76 | cret := xLayoutSlotGetSlotId(x.GoPointer()) | ||
| 80 | return cret | 77 | return cret | ||
| 81 | } | 78 | } | ||
| @@ -375,4 +372,18 @@ func (x *LayoutSlot) GetBuildableId() string { | |||||
| 375 | func init() { | 372 | func init() { | ||
| 376 | core.SetPackageName("ADW", "libadwaita-1") | 373 | core.SetPackageName("ADW", "libadwaita-1") | ||
| 377 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | 374 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | ||
| 375 | + | var libs []uintptr | |||
| 376 | + | for _, libPath := range core.GetPaths("ADW") { | |||
| 377 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |||
| 378 | + | if err != nil { | |||
| 379 | + | panic(err) | |||
| 380 | + | } | |||
| 381 | + | libs = append(libs, lib) | |||
| 382 | + | } | |||
| 383 | + | ||||
| 384 | + | core.PuregoSafeRegister(&xLayoutSlotGLibType, libs, "adw_layout_slot_get_type") | |||
| 385 | + | ||||
| 386 | + | core.PuregoSafeRegister(&xNewLayoutSlot, libs, "adw_layout_slot_new") | |||
| 387 | + | ||||
| 388 | + | core.PuregoSafeRegister(&xLayoutSlotGetSlotId, libs, "adw_layout_slot_get_slot_id") | |||
| 378 | } | 389 | } | ||