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 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-leaflet.go +56 -69 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-length-unit.go +14 -5 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-main.go +15 -5 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-message-dialog.go +44 -63 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-multi-layout-view.go +23 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-navigation-direction.go +1 -10 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-navigation-split-view.go +32 -36 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-navigation-view.go +49 -60 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-overlay-split-view.go +38 -48 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-password-entry-row.go +13 -2 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-dialog.go +25 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-group.go +26 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-page.go +33 -38 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-row.go +22 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-window.go +29 -31 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-shortcut-label.go +18 -10 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-shortcuts-dialog.go +15 -4
| @@ -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" | |
| @@ -127,7 +128,6 @@ type ShortcutsDialog struct { | |||
| 127 | 128 | var xShortcutsDialogGLibType func() types.GType | |
| 128 | 129 | ||
| 129 | 130 | func ShortcutsDialogGLibType() types.GType { | |
| 130 | - | core.LazyRegister(&xShortcutsDialogGLibType, "ADW", "adw_shortcuts_dialog_get_type", false) | |
| 131 | 131 | return xShortcutsDialogGLibType() | |
| 132 | 132 | } | |
| 133 | 133 | ||
| @@ -141,7 +141,6 @@ var xNewShortcutsDialog func() uintptr | |||
| 141 | 141 | ||
| 142 | 142 | // Creates a new `AdwShortcutsDialog`. | |
| 143 | 143 | func NewShortcutsDialog() *ShortcutsDialog { | |
| 144 | - | core.LazyRegister(&xNewShortcutsDialog, "ADW", "adw_shortcuts_dialog_new", false) | |
| 145 | 144 | var cls *ShortcutsDialog | |
| 146 | 145 | ||
| 147 | 146 | cret := xNewShortcutsDialog() | |
| @@ -159,8 +158,6 @@ var xShortcutsDialogAdd func(uintptr, uintptr) | |||
| 159 | 158 | ||
| 160 | 159 | // Adds @section to @self. | |
| 161 | 160 | func (x *ShortcutsDialog) Add(SectionVar *ShortcutsSection) { | |
| 162 | - | core.LazyRegister(&xShortcutsDialogAdd, "ADW", "adw_shortcuts_dialog_add", false) | |
| 163 | - | ||
| 164 | 161 | xShortcutsDialogAdd(x.GoPointer(), SectionVar.GoPointer()) | |
| 165 | 162 | } | |
| 166 | 163 | ||
| @@ -438,4 +435,18 @@ func (x *ShortcutsDialog) GetBuildableId() string { | |||
| 438 | 435 | func init() { | |
| 439 | 436 | core.SetPackageName("ADW", "libadwaita-1") | |
| 440 | 437 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | |
| 438 | + | var libs []uintptr | |
| 439 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 440 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 441 | + | if err != nil { | |
| 442 | + | panic(err) | |
| 443 | + | } | |
| 444 | + | libs = append(libs, lib) | |
| 445 | + | } | |
| 446 | + | ||
| 447 | + | core.PuregoSafeRegister(&xShortcutsDialogGLibType, libs, "adw_shortcuts_dialog_get_type") | |
| 448 | + | ||
| 449 | + | core.PuregoSafeRegister(&xNewShortcutsDialog, libs, "adw_shortcuts_dialog_new") | |
| 450 | + | ||
| 451 | + | core.PuregoSafeRegister(&xShortcutsDialogAdd, libs, "adw_shortcuts_dialog_add") | |
| 441 | 452 | } | |
| @@ -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" | ||
| @@ -127,7 +128,6 @@ type ShortcutsDialog struct { | |||||
| 127 | var xShortcutsDialogGLibType func() types.GType | 128 | var xShortcutsDialogGLibType func() types.GType | ||
| 128 | 129 | ||||
| 129 | func ShortcutsDialogGLibType() types.GType { | 130 | func ShortcutsDialogGLibType() types.GType { | ||
| 130 | - | core.LazyRegister(&xShortcutsDialogGLibType, "ADW", "adw_shortcuts_dialog_get_type", false) | |||
| 131 | return xShortcutsDialogGLibType() | 131 | return xShortcutsDialogGLibType() | ||
| 132 | } | 132 | } | ||
| 133 | 133 | ||||
| @@ -141,7 +141,6 @@ var xNewShortcutsDialog func() uintptr | |||||
| 141 | 141 | ||||
| 142 | // Creates a new `AdwShortcutsDialog`. | 142 | // Creates a new `AdwShortcutsDialog`. | ||
| 143 | func NewShortcutsDialog() *ShortcutsDialog { | 143 | func NewShortcutsDialog() *ShortcutsDialog { | ||
| 144 | - | core.LazyRegister(&xNewShortcutsDialog, "ADW", "adw_shortcuts_dialog_new", false) | |||
| 145 | var cls *ShortcutsDialog | 144 | var cls *ShortcutsDialog | ||
| 146 | 145 | ||||
| 147 | cret := xNewShortcutsDialog() | 146 | cret := xNewShortcutsDialog() | ||
| @@ -159,8 +158,6 @@ var xShortcutsDialogAdd func(uintptr, uintptr) | |||||
| 159 | 158 | ||||
| 160 | // Adds @section to @self. | 159 | // Adds @section to @self. | ||
| 161 | func (x *ShortcutsDialog) Add(SectionVar *ShortcutsSection) { | 160 | func (x *ShortcutsDialog) Add(SectionVar *ShortcutsSection) { | ||
| 162 | - | core.LazyRegister(&xShortcutsDialogAdd, "ADW", "adw_shortcuts_dialog_add", false) | |||
| 163 | - | ||||
| 164 | xShortcutsDialogAdd(x.GoPointer(), SectionVar.GoPointer()) | 161 | xShortcutsDialogAdd(x.GoPointer(), SectionVar.GoPointer()) | ||
| 165 | } | 162 | } | ||
| 166 | 163 | ||||
| @@ -438,4 +435,18 @@ func (x *ShortcutsDialog) GetBuildableId() string { | |||||
| 438 | func init() { | 435 | func init() { | ||
| 439 | core.SetPackageName("ADW", "libadwaita-1") | 436 | core.SetPackageName("ADW", "libadwaita-1") | ||
| 440 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | 437 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | ||
| 438 | + | var libs []uintptr | |||
| 439 | + | for _, libPath := range core.GetPaths("ADW") { | |||
| 440 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |||
| 441 | + | if err != nil { | |||
| 442 | + | panic(err) | |||
| 443 | + | } | |||
| 444 | + | libs = append(libs, lib) | |||
| 445 | + | } | |||
| 446 | + | ||||
| 447 | + | core.PuregoSafeRegister(&xShortcutsDialogGLibType, libs, "adw_shortcuts_dialog_get_type") | |||
| 448 | + | ||||
| 449 | + | core.PuregoSafeRegister(&xNewShortcutsDialog, libs, "adw_shortcuts_dialog_new") | |||
| 450 | + | ||||
| 451 | + | core.PuregoSafeRegister(&xShortcutsDialogAdd, libs, "adw_shortcuts_dialog_add") | |||
| 441 | } | 452 | } | ||