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
| @@ -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" | |
| @@ -50,7 +51,6 @@ type Bin struct { | |||
| 50 | 51 | var xBinGLibType func() types.GType | |
| 51 | 52 | ||
| 52 | 53 | func BinGLibType() types.GType { | |
| 53 | - | core.LazyRegister(&xBinGLibType, "ADW", "adw_bin_get_type", false) | |
| 54 | 54 | return xBinGLibType() | |
| 55 | 55 | } | |
| 56 | 56 | ||
| @@ -64,7 +64,6 @@ 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) | |
| 68 | 67 | var cls *Bin | |
| 69 | 68 | ||
| 70 | 69 | cret := xNewBin() | |
| @@ -82,7 +81,6 @@ var xBinGetChild func(uintptr) uintptr | |||
| 82 | 81 | ||
| 83 | 82 | // Gets the child widget of @self. | |
| 84 | 83 | func (x *Bin) GetChild() *gtk.Widget { | |
| 85 | - | core.LazyRegister(&xBinGetChild, "ADW", "adw_bin_get_child", false) | |
| 86 | 84 | var cls *gtk.Widget | |
| 87 | 85 | ||
| 88 | 86 | cret := xBinGetChild(x.GoPointer()) | |
| @@ -100,8 +98,6 @@ var xBinSetChild func(uintptr, uintptr) | |||
| 100 | 98 | ||
| 101 | 99 | // Sets the child widget of @self. | |
| 102 | 100 | func (x *Bin) SetChild(ChildVar *gtk.Widget) { | |
| 103 | - | core.LazyRegister(&xBinSetChild, "ADW", "adw_bin_set_child", false) | |
| 104 | - | ||
| 105 | 101 | xBinSetChild(x.GoPointer(), ChildVar.GoPointer()) | |
| 106 | 102 | } | |
| 107 | 103 | ||
| @@ -379,4 +375,19 @@ func (x *Bin) GetBuildableId() string { | |||
| 379 | 375 | func init() { | |
| 380 | 376 | core.SetPackageName("ADW", "libadwaita-1") | |
| 381 | 377 | 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") | |
| 382 | 393 | } | |
| @@ -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" | ||
| @@ -50,7 +51,6 @@ type Bin struct { | |||||
| 50 | var xBinGLibType func() types.GType | 51 | var xBinGLibType func() types.GType | ||
| 51 | 52 | ||||
| 52 | func BinGLibType() types.GType { | 53 | 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,7 +64,6 @@ 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) | |||
| 68 | var cls *Bin | 67 | var cls *Bin | ||
| 69 | 68 | ||||
| 70 | cret := xNewBin() | 69 | cret := xNewBin() | ||
| @@ -82,7 +81,6 @@ var xBinGetChild func(uintptr) uintptr | |||||
| 82 | 81 | ||||
| 83 | // Gets the child widget of @self. | 82 | // Gets the child widget of @self. | ||
| 84 | func (x *Bin) GetChild() *gtk.Widget { | 83 | func (x *Bin) GetChild() *gtk.Widget { | ||
| 85 | - | core.LazyRegister(&xBinGetChild, "ADW", "adw_bin_get_child", false) | |||
| 86 | var cls *gtk.Widget | 84 | var cls *gtk.Widget | ||
| 87 | 85 | ||||
| 88 | cret := xBinGetChild(x.GoPointer()) | 86 | cret := xBinGetChild(x.GoPointer()) | ||
| @@ -100,8 +98,6 @@ var xBinSetChild func(uintptr, uintptr) | |||||
| 100 | 98 | ||||
| 101 | // Sets the child widget of @self. | 99 | // Sets the child widget of @self. | ||
| 102 | func (x *Bin) SetChild(ChildVar *gtk.Widget) { | 100 | func (x *Bin) SetChild(ChildVar *gtk.Widget) { | ||
| 103 | - | core.LazyRegister(&xBinSetChild, "ADW", "adw_bin_set_child", false) | |||
| 104 | - | ||||
| 105 | xBinSetChild(x.GoPointer(), ChildVar.GoPointer()) | 101 | xBinSetChild(x.GoPointer(), ChildVar.GoPointer()) | ||
| 106 | } | 102 | } | ||
| 107 | 103 | ||||
| @@ -379,4 +375,19 @@ func (x *Bin) GetBuildableId() string { | |||||
| 379 | func init() { | 375 | func init() { | ||
| 380 | core.SetPackageName("ADW", "libadwaita-1") | 376 | core.SetPackageName("ADW", "libadwaita-1") | ||
| 381 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | 377 | 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") | |||
| 382 | } | 393 | } | ||