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
| @@ -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" | |
| @@ -155,7 +156,6 @@ type BreakpointBin struct { | |||
| 155 | 156 | var xBreakpointBinGLibType func() types.GType | |
| 156 | 157 | ||
| 157 | 158 | func BreakpointBinGLibType() types.GType { | |
| 158 | - | core.LazyRegister(&xBreakpointBinGLibType, "ADW", "adw_breakpoint_bin_get_type", false) | |
| 159 | 159 | return xBreakpointBinGLibType() | |
| 160 | 160 | } | |
| 161 | 161 | ||
| @@ -169,7 +169,6 @@ var xNewBreakpointBin func() uintptr | |||
| 169 | 169 | ||
| 170 | 170 | // Creates a new `AdwBreakpointBin`. | |
| 171 | 171 | func NewBreakpointBin() *BreakpointBin { | |
| 172 | - | core.LazyRegister(&xNewBreakpointBin, "ADW", "adw_breakpoint_bin_new", false) | |
| 173 | 172 | var cls *BreakpointBin | |
| 174 | 173 | ||
| 175 | 174 | cret := xNewBreakpointBin() | |
| @@ -187,8 +186,6 @@ var xBreakpointBinAddBreakpoint func(uintptr, uintptr) | |||
| 187 | 186 | ||
| 188 | 187 | // Adds @breakpoint to @self. | |
| 189 | 188 | func (x *BreakpointBin) AddBreakpoint(BreakpointVar *Breakpoint) { | |
| 190 | - | core.LazyRegister(&xBreakpointBinAddBreakpoint, "ADW", "adw_breakpoint_bin_add_breakpoint", false) | |
| 191 | - | ||
| 192 | 189 | xBreakpointBinAddBreakpoint(x.GoPointer(), BreakpointVar.GoPointer()) | |
| 193 | 190 | } | |
| 194 | 191 | ||
| @@ -196,7 +193,6 @@ var xBreakpointBinGetChild func(uintptr) uintptr | |||
| 196 | 193 | ||
| 197 | 194 | // Gets the child widget of @self. | |
| 198 | 195 | func (x *BreakpointBin) GetChild() *gtk.Widget { | |
| 199 | - | core.LazyRegister(&xBreakpointBinGetChild, "ADW", "adw_breakpoint_bin_get_child", false) | |
| 200 | 196 | var cls *gtk.Widget | |
| 201 | 197 | ||
| 202 | 198 | cret := xBreakpointBinGetChild(x.GoPointer()) | |
| @@ -214,7 +210,6 @@ var xBreakpointBinGetCurrentBreakpoint func(uintptr) uintptr | |||
| 214 | 210 | ||
| 215 | 211 | // Gets the current breakpoint. | |
| 216 | 212 | func (x *BreakpointBin) GetCurrentBreakpoint() *Breakpoint { | |
| 217 | - | core.LazyRegister(&xBreakpointBinGetCurrentBreakpoint, "ADW", "adw_breakpoint_bin_get_current_breakpoint", false) | |
| 218 | 213 | var cls *Breakpoint | |
| 219 | 214 | ||
| 220 | 215 | cret := xBreakpointBinGetCurrentBreakpoint(x.GoPointer()) | |
| @@ -232,8 +227,6 @@ var xBreakpointBinRemoveBreakpoint func(uintptr, uintptr) | |||
| 232 | 227 | ||
| 233 | 228 | // Removes @breakpoint from @self. | |
| 234 | 229 | func (x *BreakpointBin) RemoveBreakpoint(BreakpointVar *Breakpoint) { | |
| 235 | - | core.LazyRegister(&xBreakpointBinRemoveBreakpoint, "ADW", "adw_breakpoint_bin_remove_breakpoint", false) | |
| 236 | - | ||
| 237 | 230 | xBreakpointBinRemoveBreakpoint(x.GoPointer(), BreakpointVar.GoPointer()) | |
| 238 | 231 | } | |
| 239 | 232 | ||
| @@ -241,8 +234,6 @@ var xBreakpointBinSetChild func(uintptr, uintptr) | |||
| 241 | 234 | ||
| 242 | 235 | // Sets the child widget of @self. | |
| 243 | 236 | func (x *BreakpointBin) SetChild(ChildVar *gtk.Widget) { | |
| 244 | - | core.LazyRegister(&xBreakpointBinSetChild, "ADW", "adw_breakpoint_bin_set_child", false) | |
| 245 | - | ||
| 246 | 237 | xBreakpointBinSetChild(x.GoPointer(), ChildVar.GoPointer()) | |
| 247 | 238 | } | |
| 248 | 239 | ||
| @@ -520,4 +511,22 @@ func (x *BreakpointBin) GetBuildableId() string { | |||
| 520 | 511 | func init() { | |
| 521 | 512 | core.SetPackageName("ADW", "libadwaita-1") | |
| 522 | 513 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | |
| 514 | + | var libs []uintptr | |
| 515 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 516 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 517 | + | if err != nil { | |
| 518 | + | panic(err) | |
| 519 | + | } | |
| 520 | + | libs = append(libs, lib) | |
| 521 | + | } | |
| 522 | + | ||
| 523 | + | core.PuregoSafeRegister(&xBreakpointBinGLibType, libs, "adw_breakpoint_bin_get_type") | |
| 524 | + | ||
| 525 | + | core.PuregoSafeRegister(&xNewBreakpointBin, libs, "adw_breakpoint_bin_new") | |
| 526 | + | ||
| 527 | + | core.PuregoSafeRegister(&xBreakpointBinAddBreakpoint, libs, "adw_breakpoint_bin_add_breakpoint") | |
| 528 | + | core.PuregoSafeRegister(&xBreakpointBinGetChild, libs, "adw_breakpoint_bin_get_child") | |
| 529 | + | core.PuregoSafeRegister(&xBreakpointBinGetCurrentBreakpoint, libs, "adw_breakpoint_bin_get_current_breakpoint") | |
| 530 | + | core.PuregoSafeRegister(&xBreakpointBinRemoveBreakpoint, libs, "adw_breakpoint_bin_remove_breakpoint") | |
| 531 | + | core.PuregoSafeRegister(&xBreakpointBinSetChild, libs, "adw_breakpoint_bin_set_child") | |
| 523 | 532 | } | |
| @@ -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" | ||
| @@ -155,7 +156,6 @@ type BreakpointBin struct { | |||||
| 155 | var xBreakpointBinGLibType func() types.GType | 156 | var xBreakpointBinGLibType func() types.GType | ||
| 156 | 157 | ||||
| 157 | func BreakpointBinGLibType() types.GType { | 158 | func BreakpointBinGLibType() types.GType { | ||
| 158 | - | core.LazyRegister(&xBreakpointBinGLibType, "ADW", "adw_breakpoint_bin_get_type", false) | |||
| 159 | return xBreakpointBinGLibType() | 159 | return xBreakpointBinGLibType() | ||
| 160 | } | 160 | } | ||
| 161 | 161 | ||||
| @@ -169,7 +169,6 @@ var xNewBreakpointBin func() uintptr | |||||
| 169 | 169 | ||||
| 170 | // Creates a new `AdwBreakpointBin`. | 170 | // Creates a new `AdwBreakpointBin`. | ||
| 171 | func NewBreakpointBin() *BreakpointBin { | 171 | func NewBreakpointBin() *BreakpointBin { | ||
| 172 | - | core.LazyRegister(&xNewBreakpointBin, "ADW", "adw_breakpoint_bin_new", false) | |||
| 173 | var cls *BreakpointBin | 172 | var cls *BreakpointBin | ||
| 174 | 173 | ||||
| 175 | cret := xNewBreakpointBin() | 174 | cret := xNewBreakpointBin() | ||
| @@ -187,8 +186,6 @@ var xBreakpointBinAddBreakpoint func(uintptr, uintptr) | |||||
| 187 | 186 | ||||
| 188 | // Adds @breakpoint to @self. | 187 | // Adds @breakpoint to @self. | ||
| 189 | func (x *BreakpointBin) AddBreakpoint(BreakpointVar *Breakpoint) { | 188 | func (x *BreakpointBin) AddBreakpoint(BreakpointVar *Breakpoint) { | ||
| 190 | - | core.LazyRegister(&xBreakpointBinAddBreakpoint, "ADW", "adw_breakpoint_bin_add_breakpoint", false) | |||
| 191 | - | ||||
| 192 | xBreakpointBinAddBreakpoint(x.GoPointer(), BreakpointVar.GoPointer()) | 189 | xBreakpointBinAddBreakpoint(x.GoPointer(), BreakpointVar.GoPointer()) | ||
| 193 | } | 190 | } | ||
| 194 | 191 | ||||
| @@ -196,7 +193,6 @@ var xBreakpointBinGetChild func(uintptr) uintptr | |||||
| 196 | 193 | ||||
| 197 | // Gets the child widget of @self. | 194 | // Gets the child widget of @self. | ||
| 198 | func (x *BreakpointBin) GetChild() *gtk.Widget { | 195 | func (x *BreakpointBin) GetChild() *gtk.Widget { | ||
| 199 | - | core.LazyRegister(&xBreakpointBinGetChild, "ADW", "adw_breakpoint_bin_get_child", false) | |||
| 200 | var cls *gtk.Widget | 196 | var cls *gtk.Widget | ||
| 201 | 197 | ||||
| 202 | cret := xBreakpointBinGetChild(x.GoPointer()) | 198 | cret := xBreakpointBinGetChild(x.GoPointer()) | ||
| @@ -214,7 +210,6 @@ var xBreakpointBinGetCurrentBreakpoint func(uintptr) uintptr | |||||
| 214 | 210 | ||||
| 215 | // Gets the current breakpoint. | 211 | // Gets the current breakpoint. | ||
| 216 | func (x *BreakpointBin) GetCurrentBreakpoint() *Breakpoint { | 212 | func (x *BreakpointBin) GetCurrentBreakpoint() *Breakpoint { | ||
| 217 | - | core.LazyRegister(&xBreakpointBinGetCurrentBreakpoint, "ADW", "adw_breakpoint_bin_get_current_breakpoint", false) | |||
| 218 | var cls *Breakpoint | 213 | var cls *Breakpoint | ||
| 219 | 214 | ||||
| 220 | cret := xBreakpointBinGetCurrentBreakpoint(x.GoPointer()) | 215 | cret := xBreakpointBinGetCurrentBreakpoint(x.GoPointer()) | ||
| @@ -232,8 +227,6 @@ var xBreakpointBinRemoveBreakpoint func(uintptr, uintptr) | |||||
| 232 | 227 | ||||
| 233 | // Removes @breakpoint from @self. | 228 | // Removes @breakpoint from @self. | ||
| 234 | func (x *BreakpointBin) RemoveBreakpoint(BreakpointVar *Breakpoint) { | 229 | func (x *BreakpointBin) RemoveBreakpoint(BreakpointVar *Breakpoint) { | ||
| 235 | - | core.LazyRegister(&xBreakpointBinRemoveBreakpoint, "ADW", "adw_breakpoint_bin_remove_breakpoint", false) | |||
| 236 | - | ||||
| 237 | xBreakpointBinRemoveBreakpoint(x.GoPointer(), BreakpointVar.GoPointer()) | 230 | xBreakpointBinRemoveBreakpoint(x.GoPointer(), BreakpointVar.GoPointer()) | ||
| 238 | } | 231 | } | ||
| 239 | 232 | ||||
| @@ -241,8 +234,6 @@ var xBreakpointBinSetChild func(uintptr, uintptr) | |||||
| 241 | 234 | ||||
| 242 | // Sets the child widget of @self. | 235 | // Sets the child widget of @self. | ||
| 243 | func (x *BreakpointBin) SetChild(ChildVar *gtk.Widget) { | 236 | func (x *BreakpointBin) SetChild(ChildVar *gtk.Widget) { | ||
| 244 | - | core.LazyRegister(&xBreakpointBinSetChild, "ADW", "adw_breakpoint_bin_set_child", false) | |||
| 245 | - | ||||
| 246 | xBreakpointBinSetChild(x.GoPointer(), ChildVar.GoPointer()) | 237 | xBreakpointBinSetChild(x.GoPointer(), ChildVar.GoPointer()) | ||
| 247 | } | 238 | } | ||
| 248 | 239 | ||||
| @@ -520,4 +511,22 @@ func (x *BreakpointBin) GetBuildableId() string { | |||||
| 520 | func init() { | 511 | func init() { | ||
| 521 | core.SetPackageName("ADW", "libadwaita-1") | 512 | core.SetPackageName("ADW", "libadwaita-1") | ||
| 522 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | 513 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | ||
| 514 | + | var libs []uintptr | |||
| 515 | + | for _, libPath := range core.GetPaths("ADW") { | |||
| 516 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |||
| 517 | + | if err != nil { | |||
| 518 | + | panic(err) | |||
| 519 | + | } | |||
| 520 | + | libs = append(libs, lib) | |||
| 521 | + | } | |||
| 522 | + | ||||
| 523 | + | core.PuregoSafeRegister(&xBreakpointBinGLibType, libs, "adw_breakpoint_bin_get_type") | |||
| 524 | + | ||||
| 525 | + | core.PuregoSafeRegister(&xNewBreakpointBin, libs, "adw_breakpoint_bin_new") | |||
| 526 | + | ||||
| 527 | + | core.PuregoSafeRegister(&xBreakpointBinAddBreakpoint, libs, "adw_breakpoint_bin_add_breakpoint") | |||
| 528 | + | core.PuregoSafeRegister(&xBreakpointBinGetChild, libs, "adw_breakpoint_bin_get_child") | |||
| 529 | + | core.PuregoSafeRegister(&xBreakpointBinGetCurrentBreakpoint, libs, "adw_breakpoint_bin_get_current_breakpoint") | |||
| 530 | + | core.PuregoSafeRegister(&xBreakpointBinRemoveBreakpoint, libs, "adw_breakpoint_bin_remove_breakpoint") | |||
| 531 | + | core.PuregoSafeRegister(&xBreakpointBinSetChild, libs, "adw_breakpoint_bin_set_child") | |||
| 523 | } | 532 | } | ||