Merge pull request #349 from bnema/fix/rollback-lazy-puregotk
fix(deps): emergency rollback puregotk lazy registration regression
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 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-shortcuts-item.go +25 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-shortcuts-section.go +17 -8 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-sidebar-item.go +37 -45 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-sidebar-section.go +27 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-sidebar.go +39 -41 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spin-row.go +34 -40 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spinner-paintable.go +16 -5 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spinner.go +13 -2 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-split-button.go +34 -39 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spring-animation.go +30 -34 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spring-params.go +21 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-squeezer.go +44 -49 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-status-page.go +24 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-style-manager.go +28 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-swipe-tracker.go +30 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-swipeable.go +21 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-switch-row.go +16 -6 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-tab-bar.go +32 -35 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-tab-button.go +16 -5 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-tab-overview.go +37 -45 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-tab-view.go +87 -123 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-timed-animation.go +28 -30 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-toast-overlay.go +18 -9
| @@ -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" | |
| @@ -82,7 +83,6 @@ type ToastOverlay struct { | |||
| 82 | 83 | var xToastOverlayGLibType func() types.GType | |
| 83 | 84 | ||
| 84 | 85 | func ToastOverlayGLibType() types.GType { | |
| 85 | - | core.LazyRegister(&xToastOverlayGLibType, "ADW", "adw_toast_overlay_get_type", false) | |
| 86 | 86 | return xToastOverlayGLibType() | |
| 87 | 87 | } | |
| 88 | 88 | ||
| @@ -96,7 +96,6 @@ var xNewToastOverlay func() uintptr | |||
| 96 | 96 | ||
| 97 | 97 | // Creates a new `AdwToastOverlay`. | |
| 98 | 98 | func NewToastOverlay() *ToastOverlay { | |
| 99 | - | core.LazyRegister(&xNewToastOverlay, "ADW", "adw_toast_overlay_new", false) | |
| 100 | 99 | var cls *ToastOverlay | |
| 101 | 100 | ||
| 102 | 101 | cret := xNewToastOverlay() | |
| @@ -123,8 +122,6 @@ var xToastOverlayAddToast func(uintptr, uintptr) | |||
| 123 | 122 | // If called on a toast currently in the queue, the toast will be bumped | |
| 124 | 123 | // forward to be shown as soon as possible. | |
| 125 | 124 | func (x *ToastOverlay) AddToast(ToastVar *Toast) { | |
| 126 | - | core.LazyRegister(&xToastOverlayAddToast, "ADW", "adw_toast_overlay_add_toast", false) | |
| 127 | - | ||
| 128 | 125 | xToastOverlayAddToast(x.GoPointer(), ToastVar.GoPointer()) | |
| 129 | 126 | } | |
| 130 | 127 | ||
| @@ -134,8 +131,6 @@ var xToastOverlayDismissAll func(uintptr) | |||
| 134 | 131 | // | |
| 135 | 132 | // Use [method@Toast.dismiss] to dismiss a single toast. | |
| 136 | 133 | func (x *ToastOverlay) DismissAll() { | |
| 137 | - | core.LazyRegister(&xToastOverlayDismissAll, "ADW", "adw_toast_overlay_dismiss_all", false) | |
| 138 | - | ||
| 139 | 134 | xToastOverlayDismissAll(x.GoPointer()) | |
| 140 | 135 | } | |
| 141 | 136 | ||
| @@ -143,7 +138,6 @@ var xToastOverlayGetChild func(uintptr) uintptr | |||
| 143 | 138 | ||
| 144 | 139 | // Gets the child widget of @self. | |
| 145 | 140 | func (x *ToastOverlay) GetChild() *gtk.Widget { | |
| 146 | - | core.LazyRegister(&xToastOverlayGetChild, "ADW", "adw_toast_overlay_get_child", false) | |
| 147 | 141 | var cls *gtk.Widget | |
| 148 | 142 | ||
| 149 | 143 | cret := xToastOverlayGetChild(x.GoPointer()) | |
| @@ -161,8 +155,6 @@ var xToastOverlaySetChild func(uintptr, uintptr) | |||
| 161 | 155 | ||
| 162 | 156 | // Sets the child widget of @self. | |
| 163 | 157 | func (x *ToastOverlay) SetChild(ChildVar *gtk.Widget) { | |
| 164 | - | core.LazyRegister(&xToastOverlaySetChild, "ADW", "adw_toast_overlay_set_child", false) | |
| 165 | - | ||
| 166 | 158 | xToastOverlaySetChild(x.GoPointer(), ChildVar.GoPointer()) | |
| 167 | 159 | } | |
| 168 | 160 | ||
| @@ -440,4 +432,21 @@ func (x *ToastOverlay) GetBuildableId() string { | |||
| 440 | 432 | func init() { | |
| 441 | 433 | core.SetPackageName("ADW", "libadwaita-1") | |
| 442 | 434 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | |
| 435 | + | var libs []uintptr | |
| 436 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 437 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 438 | + | if err != nil { | |
| 439 | + | panic(err) | |
| 440 | + | } | |
| 441 | + | libs = append(libs, lib) | |
| 442 | + | } | |
| 443 | + | ||
| 444 | + | core.PuregoSafeRegister(&xToastOverlayGLibType, libs, "adw_toast_overlay_get_type") | |
| 445 | + | ||
| 446 | + | core.PuregoSafeRegister(&xNewToastOverlay, libs, "adw_toast_overlay_new") | |
| 447 | + | ||
| 448 | + | core.PuregoSafeRegister(&xToastOverlayAddToast, libs, "adw_toast_overlay_add_toast") | |
| 449 | + | core.PuregoSafeRegister(&xToastOverlayDismissAll, libs, "adw_toast_overlay_dismiss_all") | |
| 450 | + | core.PuregoSafeRegister(&xToastOverlayGetChild, libs, "adw_toast_overlay_get_child") | |
| 451 | + | core.PuregoSafeRegister(&xToastOverlaySetChild, libs, "adw_toast_overlay_set_child") | |
| 443 | 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" | ||
| @@ -82,7 +83,6 @@ type ToastOverlay struct { | |||||
| 82 | var xToastOverlayGLibType func() types.GType | 83 | var xToastOverlayGLibType func() types.GType | ||
| 83 | 84 | ||||
| 84 | func ToastOverlayGLibType() types.GType { | 85 | func ToastOverlayGLibType() types.GType { | ||
| 85 | - | core.LazyRegister(&xToastOverlayGLibType, "ADW", "adw_toast_overlay_get_type", false) | |||
| 86 | return xToastOverlayGLibType() | 86 | return xToastOverlayGLibType() | ||
| 87 | } | 87 | } | ||
| 88 | 88 | ||||
| @@ -96,7 +96,6 @@ var xNewToastOverlay func() uintptr | |||||
| 96 | 96 | ||||
| 97 | // Creates a new `AdwToastOverlay`. | 97 | // Creates a new `AdwToastOverlay`. | ||
| 98 | func NewToastOverlay() *ToastOverlay { | 98 | func NewToastOverlay() *ToastOverlay { | ||
| 99 | - | core.LazyRegister(&xNewToastOverlay, "ADW", "adw_toast_overlay_new", false) | |||
| 100 | var cls *ToastOverlay | 99 | var cls *ToastOverlay | ||
| 101 | 100 | ||||
| 102 | cret := xNewToastOverlay() | 101 | cret := xNewToastOverlay() | ||
| @@ -123,8 +122,6 @@ var xToastOverlayAddToast func(uintptr, uintptr) | |||||
| 123 | // If called on a toast currently in the queue, the toast will be bumped | 122 | // If called on a toast currently in the queue, the toast will be bumped | ||
| 124 | // forward to be shown as soon as possible. | 123 | // forward to be shown as soon as possible. | ||
| 125 | func (x *ToastOverlay) AddToast(ToastVar *Toast) { | 124 | func (x *ToastOverlay) AddToast(ToastVar *Toast) { | ||
| 126 | - | core.LazyRegister(&xToastOverlayAddToast, "ADW", "adw_toast_overlay_add_toast", false) | |||
| 127 | - | ||||
| 128 | xToastOverlayAddToast(x.GoPointer(), ToastVar.GoPointer()) | 125 | xToastOverlayAddToast(x.GoPointer(), ToastVar.GoPointer()) | ||
| 129 | } | 126 | } | ||
| 130 | 127 | ||||
| @@ -134,8 +131,6 @@ var xToastOverlayDismissAll func(uintptr) | |||||
| 134 | // | 131 | // | ||
| 135 | // Use [method@Toast.dismiss] to dismiss a single toast. | 132 | // Use [method@Toast.dismiss] to dismiss a single toast. | ||
| 136 | func (x *ToastOverlay) DismissAll() { | 133 | func (x *ToastOverlay) DismissAll() { | ||
| 137 | - | core.LazyRegister(&xToastOverlayDismissAll, "ADW", "adw_toast_overlay_dismiss_all", false) | |||
| 138 | - | ||||
| 139 | xToastOverlayDismissAll(x.GoPointer()) | 134 | xToastOverlayDismissAll(x.GoPointer()) | ||
| 140 | } | 135 | } | ||
| 141 | 136 | ||||
| @@ -143,7 +138,6 @@ var xToastOverlayGetChild func(uintptr) uintptr | |||||
| 143 | 138 | ||||
| 144 | // Gets the child widget of @self. | 139 | // Gets the child widget of @self. | ||
| 145 | func (x *ToastOverlay) GetChild() *gtk.Widget { | 140 | func (x *ToastOverlay) GetChild() *gtk.Widget { | ||
| 146 | - | core.LazyRegister(&xToastOverlayGetChild, "ADW", "adw_toast_overlay_get_child", false) | |||
| 147 | var cls *gtk.Widget | 141 | var cls *gtk.Widget | ||
| 148 | 142 | ||||
| 149 | cret := xToastOverlayGetChild(x.GoPointer()) | 143 | cret := xToastOverlayGetChild(x.GoPointer()) | ||
| @@ -161,8 +155,6 @@ var xToastOverlaySetChild func(uintptr, uintptr) | |||||
| 161 | 155 | ||||
| 162 | // Sets the child widget of @self. | 156 | // Sets the child widget of @self. | ||
| 163 | func (x *ToastOverlay) SetChild(ChildVar *gtk.Widget) { | 157 | func (x *ToastOverlay) SetChild(ChildVar *gtk.Widget) { | ||
| 164 | - | core.LazyRegister(&xToastOverlaySetChild, "ADW", "adw_toast_overlay_set_child", false) | |||
| 165 | - | ||||
| 166 | xToastOverlaySetChild(x.GoPointer(), ChildVar.GoPointer()) | 158 | xToastOverlaySetChild(x.GoPointer(), ChildVar.GoPointer()) | ||
| 167 | } | 159 | } | ||
| 168 | 160 | ||||
| @@ -440,4 +432,21 @@ func (x *ToastOverlay) GetBuildableId() string { | |||||
| 440 | func init() { | 432 | func init() { | ||
| 441 | core.SetPackageName("ADW", "libadwaita-1") | 433 | core.SetPackageName("ADW", "libadwaita-1") | ||
| 442 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | 434 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | ||
| 435 | + | var libs []uintptr | |||
| 436 | + | for _, libPath := range core.GetPaths("ADW") { | |||
| 437 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |||
| 438 | + | if err != nil { | |||
| 439 | + | panic(err) | |||
| 440 | + | } | |||
| 441 | + | libs = append(libs, lib) | |||
| 442 | + | } | |||
| 443 | + | ||||
| 444 | + | core.PuregoSafeRegister(&xToastOverlayGLibType, libs, "adw_toast_overlay_get_type") | |||
| 445 | + | ||||
| 446 | + | core.PuregoSafeRegister(&xNewToastOverlay, libs, "adw_toast_overlay_new") | |||
| 447 | + | ||||
| 448 | + | core.PuregoSafeRegister(&xToastOverlayAddToast, libs, "adw_toast_overlay_add_toast") | |||
| 449 | + | core.PuregoSafeRegister(&xToastOverlayDismissAll, libs, "adw_toast_overlay_dismiss_all") | |||
| 450 | + | core.PuregoSafeRegister(&xToastOverlayGetChild, libs, "adw_toast_overlay_get_child") | |||
| 451 | + | core.PuregoSafeRegister(&xToastOverlaySetChild, libs, "adw_toast_overlay_set_child") | |||
| 443 | } | 452 | } | ||