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
| @@ -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/glib" | |
| 10 | 11 | "github.com/bnema/puregotk/v4/gobject" | |
| @@ -87,7 +88,6 @@ type ButtonRow struct { | |||
| 87 | 88 | var xButtonRowGLibType func() types.GType | |
| 88 | 89 | ||
| 89 | 90 | func ButtonRowGLibType() types.GType { | |
| 90 | - | core.LazyRegister(&xButtonRowGLibType, "ADW", "adw_button_row_get_type", false) | |
| 91 | 91 | return xButtonRowGLibType() | |
| 92 | 92 | } | |
| 93 | 93 | ||
| @@ -101,7 +101,6 @@ var xNewButtonRow func() uintptr | |||
| 101 | 101 | ||
| 102 | 102 | // Creates a new `AdwButtonRow`. | |
| 103 | 103 | func NewButtonRow() *ButtonRow { | |
| 104 | - | core.LazyRegister(&xNewButtonRow, "ADW", "adw_button_row_new", false) | |
| 105 | 104 | var cls *ButtonRow | |
| 106 | 105 | ||
| 107 | 106 | cret := xNewButtonRow() | |
| @@ -119,8 +118,6 @@ var xButtonRowGetEndIconName func(uintptr) string | |||
| 119 | 118 | ||
| 120 | 119 | // Gets the end icon name for @self. | |
| 121 | 120 | func (x *ButtonRow) GetEndIconName() string { | |
| 122 | - | core.LazyRegister(&xButtonRowGetEndIconName, "ADW", "adw_button_row_get_end_icon_name", false) | |
| 123 | - | ||
| 124 | 121 | cret := xButtonRowGetEndIconName(x.GoPointer()) | |
| 125 | 122 | return cret | |
| 126 | 123 | } | |
| @@ -129,8 +126,6 @@ var xButtonRowGetStartIconName func(uintptr) string | |||
| 129 | 126 | ||
| 130 | 127 | // Gets the start icon name for @self. | |
| 131 | 128 | func (x *ButtonRow) GetStartIconName() string { | |
| 132 | - | core.LazyRegister(&xButtonRowGetStartIconName, "ADW", "adw_button_row_get_start_icon_name", false) | |
| 133 | - | ||
| 134 | 129 | cret := xButtonRowGetStartIconName(x.GoPointer()) | |
| 135 | 130 | return cret | |
| 136 | 131 | } | |
| @@ -139,8 +134,6 @@ var xButtonRowSetEndIconName func(uintptr, uintptr) | |||
| 139 | 134 | ||
| 140 | 135 | // Sets the end icon name for @self. | |
| 141 | 136 | func (x *ButtonRow) SetEndIconName(IconNameVar *string) { | |
| 142 | - | core.LazyRegister(&xButtonRowSetEndIconName, "ADW", "adw_button_row_set_end_icon_name", false) | |
| 143 | - | ||
| 144 | 137 | IconNameVarPtr := core.GStrdupNullable(IconNameVar) | |
| 145 | 138 | defer core.GFreeNullable(IconNameVarPtr) | |
| 146 | 139 | ||
| @@ -151,8 +144,6 @@ var xButtonRowSetStartIconName func(uintptr, uintptr) | |||
| 151 | 144 | ||
| 152 | 145 | // Sets the start icon name for @self. | |
| 153 | 146 | func (x *ButtonRow) SetStartIconName(IconNameVar *string) { | |
| 154 | - | core.LazyRegister(&xButtonRowSetStartIconName, "ADW", "adw_button_row_set_start_icon_name", false) | |
| 155 | - | ||
| 156 | 147 | IconNameVarPtr := core.GStrdupNullable(IconNameVar) | |
| 157 | 148 | defer core.GFreeNullable(IconNameVarPtr) | |
| 158 | 149 | ||
| @@ -569,4 +560,21 @@ func (x *ButtonRow) GetBuildableId() string { | |||
| 569 | 560 | func init() { | |
| 570 | 561 | core.SetPackageName("ADW", "libadwaita-1") | |
| 571 | 562 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | |
| 563 | + | var libs []uintptr | |
| 564 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 565 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 566 | + | if err != nil { | |
| 567 | + | panic(err) | |
| 568 | + | } | |
| 569 | + | libs = append(libs, lib) | |
| 570 | + | } | |
| 571 | + | ||
| 572 | + | core.PuregoSafeRegister(&xButtonRowGLibType, libs, "adw_button_row_get_type") | |
| 573 | + | ||
| 574 | + | core.PuregoSafeRegister(&xNewButtonRow, libs, "adw_button_row_new") | |
| 575 | + | ||
| 576 | + | core.PuregoSafeRegister(&xButtonRowGetEndIconName, libs, "adw_button_row_get_end_icon_name") | |
| 577 | + | core.PuregoSafeRegister(&xButtonRowGetStartIconName, libs, "adw_button_row_get_start_icon_name") | |
| 578 | + | core.PuregoSafeRegister(&xButtonRowSetEndIconName, libs, "adw_button_row_set_end_icon_name") | |
| 579 | + | core.PuregoSafeRegister(&xButtonRowSetStartIconName, libs, "adw_button_row_set_start_icon_name") | |
| 572 | 580 | } | |
| @@ -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/glib" | 10 | "github.com/bnema/puregotk/v4/glib" | ||
| 10 | "github.com/bnema/puregotk/v4/gobject" | 11 | "github.com/bnema/puregotk/v4/gobject" | ||
| @@ -87,7 +88,6 @@ type ButtonRow struct { | |||||
| 87 | var xButtonRowGLibType func() types.GType | 88 | var xButtonRowGLibType func() types.GType | ||
| 88 | 89 | ||||
| 89 | func ButtonRowGLibType() types.GType { | 90 | func ButtonRowGLibType() types.GType { | ||
| 90 | - | core.LazyRegister(&xButtonRowGLibType, "ADW", "adw_button_row_get_type", false) | |||
| 91 | return xButtonRowGLibType() | 91 | return xButtonRowGLibType() | ||
| 92 | } | 92 | } | ||
| 93 | 93 | ||||
| @@ -101,7 +101,6 @@ var xNewButtonRow func() uintptr | |||||
| 101 | 101 | ||||
| 102 | // Creates a new `AdwButtonRow`. | 102 | // Creates a new `AdwButtonRow`. | ||
| 103 | func NewButtonRow() *ButtonRow { | 103 | func NewButtonRow() *ButtonRow { | ||
| 104 | - | core.LazyRegister(&xNewButtonRow, "ADW", "adw_button_row_new", false) | |||
| 105 | var cls *ButtonRow | 104 | var cls *ButtonRow | ||
| 106 | 105 | ||||
| 107 | cret := xNewButtonRow() | 106 | cret := xNewButtonRow() | ||
| @@ -119,8 +118,6 @@ var xButtonRowGetEndIconName func(uintptr) string | |||||
| 119 | 118 | ||||
| 120 | // Gets the end icon name for @self. | 119 | // Gets the end icon name for @self. | ||
| 121 | func (x *ButtonRow) GetEndIconName() string { | 120 | func (x *ButtonRow) GetEndIconName() string { | ||
| 122 | - | core.LazyRegister(&xButtonRowGetEndIconName, "ADW", "adw_button_row_get_end_icon_name", false) | |||
| 123 | - | ||||
| 124 | cret := xButtonRowGetEndIconName(x.GoPointer()) | 121 | cret := xButtonRowGetEndIconName(x.GoPointer()) | ||
| 125 | return cret | 122 | return cret | ||
| 126 | } | 123 | } | ||
| @@ -129,8 +126,6 @@ var xButtonRowGetStartIconName func(uintptr) string | |||||
| 129 | 126 | ||||
| 130 | // Gets the start icon name for @self. | 127 | // Gets the start icon name for @self. | ||
| 131 | func (x *ButtonRow) GetStartIconName() string { | 128 | func (x *ButtonRow) GetStartIconName() string { | ||
| 132 | - | core.LazyRegister(&xButtonRowGetStartIconName, "ADW", "adw_button_row_get_start_icon_name", false) | |||
| 133 | - | ||||
| 134 | cret := xButtonRowGetStartIconName(x.GoPointer()) | 129 | cret := xButtonRowGetStartIconName(x.GoPointer()) | ||
| 135 | return cret | 130 | return cret | ||
| 136 | } | 131 | } | ||
| @@ -139,8 +134,6 @@ var xButtonRowSetEndIconName func(uintptr, uintptr) | |||||
| 139 | 134 | ||||
| 140 | // Sets the end icon name for @self. | 135 | // Sets the end icon name for @self. | ||
| 141 | func (x *ButtonRow) SetEndIconName(IconNameVar *string) { | 136 | func (x *ButtonRow) SetEndIconName(IconNameVar *string) { | ||
| 142 | - | core.LazyRegister(&xButtonRowSetEndIconName, "ADW", "adw_button_row_set_end_icon_name", false) | |||
| 143 | - | ||||
| 144 | IconNameVarPtr := core.GStrdupNullable(IconNameVar) | 137 | IconNameVarPtr := core.GStrdupNullable(IconNameVar) | ||
| 145 | defer core.GFreeNullable(IconNameVarPtr) | 138 | defer core.GFreeNullable(IconNameVarPtr) | ||
| 146 | 139 | ||||
| @@ -151,8 +144,6 @@ var xButtonRowSetStartIconName func(uintptr, uintptr) | |||||
| 151 | 144 | ||||
| 152 | // Sets the start icon name for @self. | 145 | // Sets the start icon name for @self. | ||
| 153 | func (x *ButtonRow) SetStartIconName(IconNameVar *string) { | 146 | func (x *ButtonRow) SetStartIconName(IconNameVar *string) { | ||
| 154 | - | core.LazyRegister(&xButtonRowSetStartIconName, "ADW", "adw_button_row_set_start_icon_name", false) | |||
| 155 | - | ||||
| 156 | IconNameVarPtr := core.GStrdupNullable(IconNameVar) | 147 | IconNameVarPtr := core.GStrdupNullable(IconNameVar) | ||
| 157 | defer core.GFreeNullable(IconNameVarPtr) | 148 | defer core.GFreeNullable(IconNameVarPtr) | ||
| 158 | 149 | ||||
| @@ -569,4 +560,21 @@ func (x *ButtonRow) GetBuildableId() string { | |||||
| 569 | func init() { | 560 | func init() { | ||
| 570 | core.SetPackageName("ADW", "libadwaita-1") | 561 | core.SetPackageName("ADW", "libadwaita-1") | ||
| 571 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | 562 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | ||
| 563 | + | var libs []uintptr | |||
| 564 | + | for _, libPath := range core.GetPaths("ADW") { | |||
| 565 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |||
| 566 | + | if err != nil { | |||
| 567 | + | panic(err) | |||
| 568 | + | } | |||
| 569 | + | libs = append(libs, lib) | |||
| 570 | + | } | |||
| 571 | + | ||||
| 572 | + | core.PuregoSafeRegister(&xButtonRowGLibType, libs, "adw_button_row_get_type") | |||
| 573 | + | ||||
| 574 | + | core.PuregoSafeRegister(&xNewButtonRow, libs, "adw_button_row_new") | |||
| 575 | + | ||||
| 576 | + | core.PuregoSafeRegister(&xButtonRowGetEndIconName, libs, "adw_button_row_get_end_icon_name") | |||
| 577 | + | core.PuregoSafeRegister(&xButtonRowGetStartIconName, libs, "adw_button_row_get_start_icon_name") | |||
| 578 | + | core.PuregoSafeRegister(&xButtonRowSetEndIconName, libs, "adw_button_row_set_end_icon_name") | |||
| 579 | + | core.PuregoSafeRegister(&xButtonRowSetStartIconName, libs, "adw_button_row_set_start_icon_name") | |||
| 572 | } | 580 | } | ||