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
| @@ -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/gtk" | |
| 7 | 8 | ) | |
| @@ -13,8 +14,6 @@ var xGetEnableAnimations func(uintptr) bool | |||
| 13 | 14 | // This should be used when implementing an animated widget to know whether to | |
| 14 | 15 | // animate it or not. | |
| 15 | 16 | func GetEnableAnimations(WidgetVar *gtk.Widget) bool { | |
| 16 | - | core.LazyRegister(&xGetEnableAnimations, "ADW", "adw_get_enable_animations", false) | |
| 17 | - | ||
| 18 | 17 | cret := xGetEnableAnimations(WidgetVar.GoPointer()) | |
| 19 | 18 | return cret | |
| 20 | 19 | } | |
| @@ -23,8 +22,6 @@ var xLerp func(float64, float64, float64) float64 | |||
| 23 | 22 | ||
| 24 | 23 | // Computes the linear interpolation between @a and @b for @t. | |
| 25 | 24 | func Lerp(AVar float64, BVar float64, TVar float64) float64 { | |
| 26 | - | core.LazyRegister(&xLerp, "ADW", "adw_lerp", false) | |
| 27 | - | ||
| 28 | 25 | cret := xLerp(AVar, BVar, TVar) | |
| 29 | 26 | return cret | |
| 30 | 27 | } | |
| @@ -32,4 +29,15 @@ func Lerp(AVar float64, BVar float64, TVar float64) float64 { | |||
| 32 | 29 | func init() { | |
| 33 | 30 | core.SetPackageName("ADW", "libadwaita-1") | |
| 34 | 31 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | |
| 32 | + | var libs []uintptr | |
| 33 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 34 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 35 | + | if err != nil { | |
| 36 | + | panic(err) | |
| 37 | + | } | |
| 38 | + | libs = append(libs, lib) | |
| 39 | + | } | |
| 40 | + | ||
| 41 | + | core.PuregoSafeRegister(&xGetEnableAnimations, libs, "adw_get_enable_animations") | |
| 42 | + | core.PuregoSafeRegister(&xLerp, libs, "adw_lerp") | |
| 35 | 43 | } | |
| @@ -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/gtk" | 7 | "github.com/bnema/puregotk/v4/gtk" | ||
| 7 | ) | 8 | ) | ||
| @@ -13,8 +14,6 @@ var xGetEnableAnimations func(uintptr) bool | |||||
| 13 | // This should be used when implementing an animated widget to know whether to | 14 | // This should be used when implementing an animated widget to know whether to | ||
| 14 | // animate it or not. | 15 | // animate it or not. | ||
| 15 | func GetEnableAnimations(WidgetVar *gtk.Widget) bool { | 16 | func GetEnableAnimations(WidgetVar *gtk.Widget) bool { | ||
| 16 | - | core.LazyRegister(&xGetEnableAnimations, "ADW", "adw_get_enable_animations", false) | |||
| 17 | - | ||||
| 18 | cret := xGetEnableAnimations(WidgetVar.GoPointer()) | 17 | cret := xGetEnableAnimations(WidgetVar.GoPointer()) | ||
| 19 | return cret | 18 | return cret | ||
| 20 | } | 19 | } | ||
| @@ -23,8 +22,6 @@ var xLerp func(float64, float64, float64) float64 | |||||
| 23 | 22 | ||||
| 24 | // Computes the linear interpolation between @a and @b for @t. | 23 | // Computes the linear interpolation between @a and @b for @t. | ||
| 25 | func Lerp(AVar float64, BVar float64, TVar float64) float64 { | 24 | func Lerp(AVar float64, BVar float64, TVar float64) float64 { | ||
| 26 | - | core.LazyRegister(&xLerp, "ADW", "adw_lerp", false) | |||
| 27 | - | ||||
| 28 | cret := xLerp(AVar, BVar, TVar) | 25 | cret := xLerp(AVar, BVar, TVar) | ||
| 29 | return cret | 26 | return cret | ||
| 30 | } | 27 | } | ||
| @@ -32,4 +29,15 @@ func Lerp(AVar float64, BVar float64, TVar float64) float64 { | |||||
| 32 | func init() { | 29 | func init() { | ||
| 33 | core.SetPackageName("ADW", "libadwaita-1") | 30 | core.SetPackageName("ADW", "libadwaita-1") | ||
| 34 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | 31 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | ||
| 32 | + | var libs []uintptr | |||
| 33 | + | for _, libPath := range core.GetPaths("ADW") { | |||
| 34 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |||
| 35 | + | if err != nil { | |||
| 36 | + | panic(err) | |||
| 37 | + | } | |||
| 38 | + | libs = append(libs, lib) | |||
| 39 | + | } | |||
| 40 | + | ||||
| 41 | + | core.PuregoSafeRegister(&xGetEnableAnimations, libs, "adw_get_enable_animations") | |||
| 42 | + | core.PuregoSafeRegister(&xLerp, libs, "adw_lerp") | |||
| 35 | } | 43 | } | ||