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
| @@ -2,6 +2,7 @@ | |||
| 2 | 2 | package adw | |
| 3 | 3 | ||
| 4 | 4 | import ( | |
| 5 | + | "github.com/bnema/purego" | |
| 5 | 6 | "github.com/bnema/puregotk/pkg/core" | |
| 6 | 7 | "github.com/bnema/puregotk/v4/gobject/types" | |
| 7 | 8 | ) | |
| @@ -15,7 +16,6 @@ type Easing int | |||
| 15 | 16 | var xEasingGLibType func() types.GType | |
| 16 | 17 | ||
| 17 | 18 | func EasingGLibType() types.GType { | |
| 18 | - | core.LazyRegister(&xEasingGLibType, "ADW", "adw_easing_get_type", false) | |
| 19 | 19 | return xEasingGLibType() | |
| 20 | 20 | } | |
| 21 | 21 | ||
| @@ -132,8 +132,6 @@ var xEasingEase func(Easing, float64) float64 | |||
| 132 | 132 | // | |
| 133 | 133 | // @value should generally be in the [0, 1] range. | |
| 134 | 134 | func EasingEase(SelfVar Easing, ValueVar float64) float64 { | |
| 135 | - | core.LazyRegister(&xEasingEase, "ADW", "adw_easing_ease", false) | |
| 136 | - | ||
| 137 | 135 | cret := xEasingEase(SelfVar, ValueVar) | |
| 138 | 136 | return cret | |
| 139 | 137 | } | |
| @@ -141,4 +139,16 @@ func EasingEase(SelfVar Easing, ValueVar float64) float64 { | |||
| 141 | 139 | func init() { | |
| 142 | 140 | core.SetPackageName("ADW", "libadwaita-1") | |
| 143 | 141 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | |
| 142 | + | var libs []uintptr | |
| 143 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 144 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 145 | + | if err != nil { | |
| 146 | + | panic(err) | |
| 147 | + | } | |
| 148 | + | libs = append(libs, lib) | |
| 149 | + | } | |
| 150 | + | ||
| 151 | + | core.PuregoSafeRegister(&xEasingGLibType, libs, "adw_easing_get_type") | |
| 152 | + | ||
| 153 | + | core.PuregoSafeRegister(&xEasingEase, libs, "adw_easing_ease") | |
| 144 | 154 | } | |
| @@ -2,6 +2,7 @@ | |||||
| 2 | package adw | 2 | package adw | ||
| 3 | 3 | ||||
| 4 | import ( | 4 | import ( | ||
| 5 | + | "github.com/bnema/purego" | |||
| 5 | "github.com/bnema/puregotk/pkg/core" | 6 | "github.com/bnema/puregotk/pkg/core" | ||
| 6 | "github.com/bnema/puregotk/v4/gobject/types" | 7 | "github.com/bnema/puregotk/v4/gobject/types" | ||
| 7 | ) | 8 | ) | ||
| @@ -15,7 +16,6 @@ type Easing int | |||||
| 15 | var xEasingGLibType func() types.GType | 16 | var xEasingGLibType func() types.GType | ||
| 16 | 17 | ||||
| 17 | func EasingGLibType() types.GType { | 18 | func EasingGLibType() types.GType { | ||
| 18 | - | core.LazyRegister(&xEasingGLibType, "ADW", "adw_easing_get_type", false) | |||
| 19 | return xEasingGLibType() | 19 | return xEasingGLibType() | ||
| 20 | } | 20 | } | ||
| 21 | 21 | ||||
| @@ -132,8 +132,6 @@ var xEasingEase func(Easing, float64) float64 | |||||
| 132 | // | 132 | // | ||
| 133 | // @value should generally be in the [0, 1] range. | 133 | // @value should generally be in the [0, 1] range. | ||
| 134 | func EasingEase(SelfVar Easing, ValueVar float64) float64 { | 134 | func EasingEase(SelfVar Easing, ValueVar float64) float64 { | ||
| 135 | - | core.LazyRegister(&xEasingEase, "ADW", "adw_easing_ease", false) | |||
| 136 | - | ||||
| 137 | cret := xEasingEase(SelfVar, ValueVar) | 135 | cret := xEasingEase(SelfVar, ValueVar) | ||
| 138 | return cret | 136 | return cret | ||
| 139 | } | 137 | } | ||
| @@ -141,4 +139,16 @@ func EasingEase(SelfVar Easing, ValueVar float64) float64 { | |||||
| 141 | func init() { | 139 | func init() { | ||
| 142 | core.SetPackageName("ADW", "libadwaita-1") | 140 | core.SetPackageName("ADW", "libadwaita-1") | ||
| 143 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | 141 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | ||
| 142 | + | var libs []uintptr | |||
| 143 | + | for _, libPath := range core.GetPaths("ADW") { | |||
| 144 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |||
| 145 | + | if err != nil { | |||
| 146 | + | panic(err) | |||
| 147 | + | } | |||
| 148 | + | libs = append(libs, lib) | |||
| 149 | + | } | |||
| 150 | + | ||||
| 151 | + | core.PuregoSafeRegister(&xEasingGLibType, libs, "adw_easing_get_type") | |||
| 152 | + | ||||
| 153 | + | core.PuregoSafeRegister(&xEasingEase, libs, "adw_easing_ease") | |||
| 144 | } | 154 | } | ||