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
| @@ -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 | "github.com/bnema/puregotk/v4/gtk" | |
| @@ -21,7 +22,6 @@ type LengthUnit int | |||
| 21 | 22 | var xLengthUnitGLibType func() types.GType | |
| 22 | 23 | ||
| 23 | 24 | func LengthUnitGLibType() types.GType { | |
| 24 | - | core.LazyRegister(&xLengthUnitGLibType, "ADW", "adw_length_unit_get_type", false) | |
| 25 | 25 | return xLengthUnitGLibType() | |
| 26 | 26 | } | |
| 27 | 27 | ||
| @@ -39,8 +39,6 @@ var xLengthUnitFromPx func(LengthUnit, float64, uintptr) float64 | |||
| 39 | 39 | ||
| 40 | 40 | // Converts @value from pixels to @unit. | |
| 41 | 41 | func LengthUnitFromPx(UnitVar LengthUnit, ValueVar float64, SettingsVar *gtk.Settings) float64 { | |
| 42 | - | core.LazyRegister(&xLengthUnitFromPx, "ADW", "adw_length_unit_from_px", false) | |
| 43 | - | ||
| 44 | 42 | cret := xLengthUnitFromPx(UnitVar, ValueVar, SettingsVar.GoPointer()) | |
| 45 | 43 | return cret | |
| 46 | 44 | } | |
| @@ -49,8 +47,6 @@ var xLengthUnitToPx func(LengthUnit, float64, uintptr) float64 | |||
| 49 | 47 | ||
| 50 | 48 | // Converts @value from @unit to pixels. | |
| 51 | 49 | func LengthUnitToPx(UnitVar LengthUnit, ValueVar float64, SettingsVar *gtk.Settings) float64 { | |
| 52 | - | core.LazyRegister(&xLengthUnitToPx, "ADW", "adw_length_unit_to_px", false) | |
| 53 | - | ||
| 54 | 50 | cret := xLengthUnitToPx(UnitVar, ValueVar, SettingsVar.GoPointer()) | |
| 55 | 51 | return cret | |
| 56 | 52 | } | |
| @@ -58,4 +54,17 @@ func LengthUnitToPx(UnitVar LengthUnit, ValueVar float64, SettingsVar *gtk.Setti | |||
| 58 | 54 | func init() { | |
| 59 | 55 | core.SetPackageName("ADW", "libadwaita-1") | |
| 60 | 56 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | |
| 57 | + | var libs []uintptr | |
| 58 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 59 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 60 | + | if err != nil { | |
| 61 | + | panic(err) | |
| 62 | + | } | |
| 63 | + | libs = append(libs, lib) | |
| 64 | + | } | |
| 65 | + | ||
| 66 | + | core.PuregoSafeRegister(&xLengthUnitGLibType, libs, "adw_length_unit_get_type") | |
| 67 | + | ||
| 68 | + | core.PuregoSafeRegister(&xLengthUnitFromPx, libs, "adw_length_unit_from_px") | |
| 69 | + | core.PuregoSafeRegister(&xLengthUnitToPx, libs, "adw_length_unit_to_px") | |
| 61 | 70 | } | |
| @@ -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 | "github.com/bnema/puregotk/v4/gtk" | 8 | "github.com/bnema/puregotk/v4/gtk" | ||
| @@ -21,7 +22,6 @@ type LengthUnit int | |||||
| 21 | var xLengthUnitGLibType func() types.GType | 22 | var xLengthUnitGLibType func() types.GType | ||
| 22 | 23 | ||||
| 23 | func LengthUnitGLibType() types.GType { | 24 | func LengthUnitGLibType() types.GType { | ||
| 24 | - | core.LazyRegister(&xLengthUnitGLibType, "ADW", "adw_length_unit_get_type", false) | |||
| 25 | return xLengthUnitGLibType() | 25 | return xLengthUnitGLibType() | ||
| 26 | } | 26 | } | ||
| 27 | 27 | ||||
| @@ -39,8 +39,6 @@ var xLengthUnitFromPx func(LengthUnit, float64, uintptr) float64 | |||||
| 39 | 39 | ||||
| 40 | // Converts @value from pixels to @unit. | 40 | // Converts @value from pixels to @unit. | ||
| 41 | func LengthUnitFromPx(UnitVar LengthUnit, ValueVar float64, SettingsVar *gtk.Settings) float64 { | 41 | func LengthUnitFromPx(UnitVar LengthUnit, ValueVar float64, SettingsVar *gtk.Settings) float64 { | ||
| 42 | - | core.LazyRegister(&xLengthUnitFromPx, "ADW", "adw_length_unit_from_px", false) | |||
| 43 | - | ||||
| 44 | cret := xLengthUnitFromPx(UnitVar, ValueVar, SettingsVar.GoPointer()) | 42 | cret := xLengthUnitFromPx(UnitVar, ValueVar, SettingsVar.GoPointer()) | ||
| 45 | return cret | 43 | return cret | ||
| 46 | } | 44 | } | ||
| @@ -49,8 +47,6 @@ var xLengthUnitToPx func(LengthUnit, float64, uintptr) float64 | |||||
| 49 | 47 | ||||
| 50 | // Converts @value from @unit to pixels. | 48 | // Converts @value from @unit to pixels. | ||
| 51 | func LengthUnitToPx(UnitVar LengthUnit, ValueVar float64, SettingsVar *gtk.Settings) float64 { | 49 | func LengthUnitToPx(UnitVar LengthUnit, ValueVar float64, SettingsVar *gtk.Settings) float64 { | ||
| 52 | - | core.LazyRegister(&xLengthUnitToPx, "ADW", "adw_length_unit_to_px", false) | |||
| 53 | - | ||||
| 54 | cret := xLengthUnitToPx(UnitVar, ValueVar, SettingsVar.GoPointer()) | 50 | cret := xLengthUnitToPx(UnitVar, ValueVar, SettingsVar.GoPointer()) | ||
| 55 | return cret | 51 | return cret | ||
| 56 | } | 52 | } | ||
| @@ -58,4 +54,17 @@ func LengthUnitToPx(UnitVar LengthUnit, ValueVar float64, SettingsVar *gtk.Setti | |||||
| 58 | func init() { | 54 | func init() { | ||
| 59 | core.SetPackageName("ADW", "libadwaita-1") | 55 | core.SetPackageName("ADW", "libadwaita-1") | ||
| 60 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | 56 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | ||
| 57 | + | var libs []uintptr | |||
| 58 | + | for _, libPath := range core.GetPaths("ADW") { | |||
| 59 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |||
| 60 | + | if err != nil { | |||
| 61 | + | panic(err) | |||
| 62 | + | } | |||
| 63 | + | libs = append(libs, lib) | |||
| 64 | + | } | |||
| 65 | + | ||||
| 66 | + | core.PuregoSafeRegister(&xLengthUnitGLibType, libs, "adw_length_unit_get_type") | |||
| 67 | + | ||||
| 68 | + | core.PuregoSafeRegister(&xLengthUnitFromPx, libs, "adw_length_unit_from_px") | |||
| 69 | + | core.PuregoSafeRegister(&xLengthUnitToPx, libs, "adw_length_unit_to_px") | |||
| 61 | } | 70 | } | ||