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 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-layout.go +17 -7
| @@ -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" | |
| @@ -37,7 +38,6 @@ type Layout struct { | |||
| 37 | 38 | var xLayoutGLibType func() types.GType | |
| 38 | 39 | ||
| 39 | 40 | func LayoutGLibType() types.GType { | |
| 40 | - | core.LazyRegister(&xLayoutGLibType, "ADW", "adw_layout_get_type", false) | |
| 41 | 41 | return xLayoutGLibType() | |
| 42 | 42 | } | |
| 43 | 43 | ||
| @@ -51,7 +51,6 @@ var xNewLayout func(uintptr) uintptr | |||
| 51 | 51 | ||
| 52 | 52 | // Creates a new `AdwLayout` that contains @content. | |
| 53 | 53 | func NewLayout(ContentVar *gtk.Widget) *Layout { | |
| 54 | - | core.LazyRegister(&xNewLayout, "ADW", "adw_layout_new", false) | |
| 55 | 54 | var cls *Layout | |
| 56 | 55 | ||
| 57 | 56 | cret := xNewLayout(ContentVar.GoPointer()) | |
| @@ -68,7 +67,6 @@ var xLayoutGetContent func(uintptr) uintptr | |||
| 68 | 67 | ||
| 69 | 68 | // Gets the content widget. | |
| 70 | 69 | func (x *Layout) GetContent() *gtk.Widget { | |
| 71 | - | core.LazyRegister(&xLayoutGetContent, "ADW", "adw_layout_get_content", false) | |
| 72 | 70 | var cls *gtk.Widget | |
| 73 | 71 | ||
| 74 | 72 | cret := xLayoutGetContent(x.GoPointer()) | |
| @@ -86,8 +84,6 @@ var xLayoutGetName func(uintptr) string | |||
| 86 | 84 | ||
| 87 | 85 | // Gets the name of the layout. | |
| 88 | 86 | func (x *Layout) GetName() string { | |
| 89 | - | core.LazyRegister(&xLayoutGetName, "ADW", "adw_layout_get_name", false) | |
| 90 | - | ||
| 91 | 87 | cret := xLayoutGetName(x.GoPointer()) | |
| 92 | 88 | return cret | |
| 93 | 89 | } | |
| @@ -96,8 +92,6 @@ var xLayoutSetName func(uintptr, uintptr) | |||
| 96 | 92 | ||
| 97 | 93 | // Sets the name of the layout. | |
| 98 | 94 | func (x *Layout) SetName(NameVar *string) { | |
| 99 | - | core.LazyRegister(&xLayoutSetName, "ADW", "adw_layout_set_name", false) | |
| 100 | - | ||
| 101 | 95 | NameVarPtr := core.GStrdupNullable(NameVar) | |
| 102 | 96 | defer core.GFreeNullable(NameVarPtr) | |
| 103 | 97 | ||
| @@ -144,4 +138,20 @@ func (x *Layout) GetBuildableId() string { | |||
| 144 | 138 | func init() { | |
| 145 | 139 | core.SetPackageName("ADW", "libadwaita-1") | |
| 146 | 140 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | |
| 141 | + | var libs []uintptr | |
| 142 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 143 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 144 | + | if err != nil { | |
| 145 | + | panic(err) | |
| 146 | + | } | |
| 147 | + | libs = append(libs, lib) | |
| 148 | + | } | |
| 149 | + | ||
| 150 | + | core.PuregoSafeRegister(&xLayoutGLibType, libs, "adw_layout_get_type") | |
| 151 | + | ||
| 152 | + | core.PuregoSafeRegister(&xNewLayout, libs, "adw_layout_new") | |
| 153 | + | ||
| 154 | + | core.PuregoSafeRegister(&xLayoutGetContent, libs, "adw_layout_get_content") | |
| 155 | + | core.PuregoSafeRegister(&xLayoutGetName, libs, "adw_layout_get_name") | |
| 156 | + | core.PuregoSafeRegister(&xLayoutSetName, libs, "adw_layout_set_name") | |
| 147 | 157 | } | |
| @@ -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" | ||
| @@ -37,7 +38,6 @@ type Layout struct { | |||||
| 37 | var xLayoutGLibType func() types.GType | 38 | var xLayoutGLibType func() types.GType | ||
| 38 | 39 | ||||
| 39 | func LayoutGLibType() types.GType { | 40 | func LayoutGLibType() types.GType { | ||
| 40 | - | core.LazyRegister(&xLayoutGLibType, "ADW", "adw_layout_get_type", false) | |||
| 41 | return xLayoutGLibType() | 41 | return xLayoutGLibType() | ||
| 42 | } | 42 | } | ||
| 43 | 43 | ||||
| @@ -51,7 +51,6 @@ var xNewLayout func(uintptr) uintptr | |||||
| 51 | 51 | ||||
| 52 | // Creates a new `AdwLayout` that contains @content. | 52 | // Creates a new `AdwLayout` that contains @content. | ||
| 53 | func NewLayout(ContentVar *gtk.Widget) *Layout { | 53 | func NewLayout(ContentVar *gtk.Widget) *Layout { | ||
| 54 | - | core.LazyRegister(&xNewLayout, "ADW", "adw_layout_new", false) | |||
| 55 | var cls *Layout | 54 | var cls *Layout | ||
| 56 | 55 | ||||
| 57 | cret := xNewLayout(ContentVar.GoPointer()) | 56 | cret := xNewLayout(ContentVar.GoPointer()) | ||
| @@ -68,7 +67,6 @@ var xLayoutGetContent func(uintptr) uintptr | |||||
| 68 | 67 | ||||
| 69 | // Gets the content widget. | 68 | // Gets the content widget. | ||
| 70 | func (x *Layout) GetContent() *gtk.Widget { | 69 | func (x *Layout) GetContent() *gtk.Widget { | ||
| 71 | - | core.LazyRegister(&xLayoutGetContent, "ADW", "adw_layout_get_content", false) | |||
| 72 | var cls *gtk.Widget | 70 | var cls *gtk.Widget | ||
| 73 | 71 | ||||
| 74 | cret := xLayoutGetContent(x.GoPointer()) | 72 | cret := xLayoutGetContent(x.GoPointer()) | ||
| @@ -86,8 +84,6 @@ var xLayoutGetName func(uintptr) string | |||||
| 86 | 84 | ||||
| 87 | // Gets the name of the layout. | 85 | // Gets the name of the layout. | ||
| 88 | func (x *Layout) GetName() string { | 86 | func (x *Layout) GetName() string { | ||
| 89 | - | core.LazyRegister(&xLayoutGetName, "ADW", "adw_layout_get_name", false) | |||
| 90 | - | ||||
| 91 | cret := xLayoutGetName(x.GoPointer()) | 87 | cret := xLayoutGetName(x.GoPointer()) | ||
| 92 | return cret | 88 | return cret | ||
| 93 | } | 89 | } | ||
| @@ -96,8 +92,6 @@ var xLayoutSetName func(uintptr, uintptr) | |||||
| 96 | 92 | ||||
| 97 | // Sets the name of the layout. | 93 | // Sets the name of the layout. | ||
| 98 | func (x *Layout) SetName(NameVar *string) { | 94 | func (x *Layout) SetName(NameVar *string) { | ||
| 99 | - | core.LazyRegister(&xLayoutSetName, "ADW", "adw_layout_set_name", false) | |||
| 100 | - | ||||
| 101 | NameVarPtr := core.GStrdupNullable(NameVar) | 95 | NameVarPtr := core.GStrdupNullable(NameVar) | ||
| 102 | defer core.GFreeNullable(NameVarPtr) | 96 | defer core.GFreeNullable(NameVarPtr) | ||
| 103 | 97 | ||||
| @@ -144,4 +138,20 @@ func (x *Layout) GetBuildableId() string { | |||||
| 144 | func init() { | 138 | func init() { | ||
| 145 | core.SetPackageName("ADW", "libadwaita-1") | 139 | core.SetPackageName("ADW", "libadwaita-1") | ||
| 146 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | 140 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | ||
| 141 | + | var libs []uintptr | |||
| 142 | + | for _, libPath := range core.GetPaths("ADW") { | |||
| 143 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |||
| 144 | + | if err != nil { | |||
| 145 | + | panic(err) | |||
| 146 | + | } | |||
| 147 | + | libs = append(libs, lib) | |||
| 148 | + | } | |||
| 149 | + | ||||
| 150 | + | core.PuregoSafeRegister(&xLayoutGLibType, libs, "adw_layout_get_type") | |||
| 151 | + | ||||
| 152 | + | core.PuregoSafeRegister(&xNewLayout, libs, "adw_layout_new") | |||
| 153 | + | ||||
| 154 | + | core.PuregoSafeRegister(&xLayoutGetContent, libs, "adw_layout_get_content") | |||
| 155 | + | core.PuregoSafeRegister(&xLayoutGetName, libs, "adw_layout_get_name") | |||
| 156 | + | core.PuregoSafeRegister(&xLayoutSetName, libs, "adw_layout_set_name") | |||
| 147 | } | 157 | } | ||