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
| @@ -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/gio" | |
| 10 | 11 | "github.com/bnema/puregotk/v4/glib" | |
| @@ -86,7 +87,6 @@ type Application struct { | |||
| 86 | 87 | var xApplicationGLibType func() types.GType | |
| 87 | 88 | ||
| 88 | 89 | func ApplicationGLibType() types.GType { | |
| 89 | - | core.LazyRegister(&xApplicationGLibType, "ADW", "adw_application_get_type", false) | |
| 90 | 90 | return xApplicationGLibType() | |
| 91 | 91 | } | |
| 92 | 92 | ||
| @@ -106,7 +106,6 @@ var xNewApplication func(uintptr, gio.ApplicationFlags) uintptr | |||
| 106 | 106 | // If no application ID is given then some features (most notably application | |
| 107 | 107 | // uniqueness) will be disabled. | |
| 108 | 108 | func NewApplication(ApplicationIdVar *string, FlagsVar gio.ApplicationFlags) *Application { | |
| 109 | - | core.LazyRegister(&xNewApplication, "ADW", "adw_application_new", false) | |
| 110 | 109 | var cls *Application | |
| 111 | 110 | ||
| 112 | 111 | ApplicationIdVarPtr := core.GStrdupNullable(ApplicationIdVar) | |
| @@ -129,7 +128,6 @@ var xApplicationGetStyleManager func(uintptr) uintptr | |||
| 129 | 128 | // This is a convenience property allowing to access `AdwStyleManager` through | |
| 130 | 129 | // property bindings or expressions. | |
| 131 | 130 | func (x *Application) GetStyleManager() *StyleManager { | |
| 132 | - | core.LazyRegister(&xApplicationGetStyleManager, "ADW", "adw_application_get_style_manager", false) | |
| 133 | 131 | var cls *StyleManager | |
| 134 | 132 | ||
| 135 | 133 | cret := xApplicationGetStyleManager(x.GoPointer()) | |
| @@ -490,4 +488,18 @@ func (x *Application) RemoveActionEntries(EntriesVar []gio.ActionEntry, NEntries | |||
| 490 | 488 | func init() { | |
| 491 | 489 | core.SetPackageName("ADW", "libadwaita-1") | |
| 492 | 490 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | |
| 491 | + | var libs []uintptr | |
| 492 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 493 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 494 | + | if err != nil { | |
| 495 | + | panic(err) | |
| 496 | + | } | |
| 497 | + | libs = append(libs, lib) | |
| 498 | + | } | |
| 499 | + | ||
| 500 | + | core.PuregoSafeRegister(&xApplicationGLibType, libs, "adw_application_get_type") | |
| 501 | + | ||
| 502 | + | core.PuregoSafeRegister(&xNewApplication, libs, "adw_application_new") | |
| 503 | + | ||
| 504 | + | core.PuregoSafeRegister(&xApplicationGetStyleManager, libs, "adw_application_get_style_manager") | |
| 493 | 505 | } | |
| @@ -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/gio" | 10 | "github.com/bnema/puregotk/v4/gio" | ||
| 10 | "github.com/bnema/puregotk/v4/glib" | 11 | "github.com/bnema/puregotk/v4/glib" | ||
| @@ -86,7 +87,6 @@ type Application struct { | |||||
| 86 | var xApplicationGLibType func() types.GType | 87 | var xApplicationGLibType func() types.GType | ||
| 87 | 88 | ||||
| 88 | func ApplicationGLibType() types.GType { | 89 | func ApplicationGLibType() types.GType { | ||
| 89 | - | core.LazyRegister(&xApplicationGLibType, "ADW", "adw_application_get_type", false) | |||
| 90 | return xApplicationGLibType() | 90 | return xApplicationGLibType() | ||
| 91 | } | 91 | } | ||
| 92 | 92 | ||||
| @@ -106,7 +106,6 @@ var xNewApplication func(uintptr, gio.ApplicationFlags) uintptr | |||||
| 106 | // If no application ID is given then some features (most notably application | 106 | // If no application ID is given then some features (most notably application | ||
| 107 | // uniqueness) will be disabled. | 107 | // uniqueness) will be disabled. | ||
| 108 | func NewApplication(ApplicationIdVar *string, FlagsVar gio.ApplicationFlags) *Application { | 108 | func NewApplication(ApplicationIdVar *string, FlagsVar gio.ApplicationFlags) *Application { | ||
| 109 | - | core.LazyRegister(&xNewApplication, "ADW", "adw_application_new", false) | |||
| 110 | var cls *Application | 109 | var cls *Application | ||
| 111 | 110 | ||||
| 112 | ApplicationIdVarPtr := core.GStrdupNullable(ApplicationIdVar) | 111 | ApplicationIdVarPtr := core.GStrdupNullable(ApplicationIdVar) | ||
| @@ -129,7 +128,6 @@ var xApplicationGetStyleManager func(uintptr) uintptr | |||||
| 129 | // This is a convenience property allowing to access `AdwStyleManager` through | 128 | // This is a convenience property allowing to access `AdwStyleManager` through | ||
| 130 | // property bindings or expressions. | 129 | // property bindings or expressions. | ||
| 131 | func (x *Application) GetStyleManager() *StyleManager { | 130 | func (x *Application) GetStyleManager() *StyleManager { | ||
| 132 | - | core.LazyRegister(&xApplicationGetStyleManager, "ADW", "adw_application_get_style_manager", false) | |||
| 133 | var cls *StyleManager | 131 | var cls *StyleManager | ||
| 134 | 132 | ||||
| 135 | cret := xApplicationGetStyleManager(x.GoPointer()) | 133 | cret := xApplicationGetStyleManager(x.GoPointer()) | ||
| @@ -490,4 +488,18 @@ func (x *Application) RemoveActionEntries(EntriesVar []gio.ActionEntry, NEntries | |||||
| 490 | func init() { | 488 | func init() { | ||
| 491 | core.SetPackageName("ADW", "libadwaita-1") | 489 | core.SetPackageName("ADW", "libadwaita-1") | ||
| 492 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | 490 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | ||
| 491 | + | var libs []uintptr | |||
| 492 | + | for _, libPath := range core.GetPaths("ADW") { | |||
| 493 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |||
| 494 | + | if err != nil { | |||
| 495 | + | panic(err) | |||
| 496 | + | } | |||
| 497 | + | libs = append(libs, lib) | |||
| 498 | + | } | |||
| 499 | + | ||||
| 500 | + | core.PuregoSafeRegister(&xApplicationGLibType, libs, "adw_application_get_type") | |||
| 501 | + | ||||
| 502 | + | core.PuregoSafeRegister(&xNewApplication, libs, "adw_application_new") | |||
| 503 | + | ||||
| 504 | + | core.PuregoSafeRegister(&xApplicationGetStyleManager, libs, "adw_application_get_style_manager") | |||
| 493 | } | 505 | } | ||