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 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
| @@ -185,7 +185,6 @@ type Swipeable interface { | |||
| 185 | 185 | var xSwipeableGLibType func() types.GType | |
| 186 | 186 | ||
| 187 | 187 | func SwipeableGLibType() types.GType { | |
| 188 | - | core.LazyRegister(&xSwipeableGLibType, "ADW", "adw_swipeable_get_type", false) | |
| 189 | 188 | return xSwipeableGLibType() | |
| 190 | 189 | } | |
| 191 | 190 | ||
| @@ -246,42 +245,31 @@ func (x *SwipeableBase) GetSwipeArea(NavigationDirectionVar NavigationDirection, | |||
| 246 | 245 | XAdwSwipeableGetSwipeArea(x.GoPointer(), NavigationDirectionVar, IsDragVar, RectVar) | |
| 247 | 246 | } | |
| 248 | 247 | ||
| 249 | - | var XAdwSwipeableGetCancelProgress func(uintptr) float64 = func(instance uintptr) float64 { | |
| 250 | - | core.LazyRegister(&xXAdwSwipeableGetCancelProgress, "ADW", "adw_swipeable_get_cancel_progress", false) | |
| 251 | - | return xXAdwSwipeableGetCancelProgress(instance) | |
| 252 | - | } | |
| 253 | - | ||
| 254 | - | var ( | |
| 255 | - | xXAdwSwipeableGetCancelProgress func(uintptr) float64 | |
| 256 | - | XAdwSwipeableGetDistance func(uintptr) float64 = func(instance uintptr) float64 { | |
| 257 | - | core.LazyRegister(&xXAdwSwipeableGetDistance, "ADW", "adw_swipeable_get_distance", false) | |
| 258 | - | return xXAdwSwipeableGetDistance(instance) | |
| 259 | - | } | |
| 260 | - | ) | |
| 261 | 248 | var ( | |
| 262 | - | xXAdwSwipeableGetDistance func(uintptr) float64 | |
| 263 | - | XAdwSwipeableGetProgress func(uintptr) float64 = func(instance uintptr) float64 { | |
| 264 | - | core.LazyRegister(&xXAdwSwipeableGetProgress, "ADW", "adw_swipeable_get_progress", false) | |
| 265 | - | return xXAdwSwipeableGetProgress(instance) | |
| 266 | - | } | |
| 249 | + | XAdwSwipeableGetCancelProgress func(uintptr) float64 | |
| 250 | + | XAdwSwipeableGetDistance func(uintptr) float64 | |
| 251 | + | XAdwSwipeableGetProgress func(uintptr) float64 | |
| 252 | + | XAdwSwipeableGetSnapPoints func(uintptr, *int) uintptr | |
| 253 | + | XAdwSwipeableGetSwipeArea func(uintptr, NavigationDirection, bool, *gdk.Rectangle) | |
| 267 | 254 | ) | |
| 268 | - | var ( | |
| 269 | - | xXAdwSwipeableGetProgress func(uintptr) float64 | |
| 270 | - | XAdwSwipeableGetSnapPoints func(uintptr, *int) uintptr = func(instance uintptr, NSnapPointsVarp *int) uintptr { | |
| 271 | - | core.LazyRegister(&xXAdwSwipeableGetSnapPoints, "ADW", "adw_swipeable_get_snap_points", false) | |
| 272 | - | return xXAdwSwipeableGetSnapPoints(instance, NSnapPointsVarp) | |
| 273 | - | } | |
| 274 | - | ) | |
| 275 | - | var ( | |
| 276 | - | xXAdwSwipeableGetSnapPoints func(uintptr, *int) uintptr | |
| 277 | - | XAdwSwipeableGetSwipeArea func(uintptr, NavigationDirection, bool, *gdk.Rectangle) = func(instance uintptr, NavigationDirectionVarp NavigationDirection, IsDragVarp bool, RectVarp *gdk.Rectangle) { | |
| 278 | - | core.LazyRegister(&xXAdwSwipeableGetSwipeArea, "ADW", "adw_swipeable_get_swipe_area", false) | |
| 279 | - | xXAdwSwipeableGetSwipeArea(instance, NavigationDirectionVarp, IsDragVarp, RectVarp) | |
| 280 | - | } | |
| 281 | - | ) | |
| 282 | - | var xXAdwSwipeableGetSwipeArea func(uintptr, NavigationDirection, bool, *gdk.Rectangle) | |
| 283 | 255 | ||
| 284 | 256 | func init() { | |
| 285 | 257 | core.SetPackageName("ADW", "libadwaita-1") | |
| 286 | 258 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | |
| 259 | + | var libs []uintptr | |
| 260 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 261 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 262 | + | if err != nil { | |
| 263 | + | panic(err) | |
| 264 | + | } | |
| 265 | + | libs = append(libs, lib) | |
| 266 | + | } | |
| 267 | + | ||
| 268 | + | core.PuregoSafeRegister(&xSwipeableGLibType, libs, "adw_swipeable_get_type") | |
| 269 | + | ||
| 270 | + | core.PuregoSafeRegister(&XAdwSwipeableGetCancelProgress, libs, "adw_swipeable_get_cancel_progress") | |
| 271 | + | core.PuregoSafeRegister(&XAdwSwipeableGetDistance, libs, "adw_swipeable_get_distance") | |
| 272 | + | core.PuregoSafeRegister(&XAdwSwipeableGetProgress, libs, "adw_swipeable_get_progress") | |
| 273 | + | core.PuregoSafeRegister(&XAdwSwipeableGetSnapPoints, libs, "adw_swipeable_get_snap_points") | |
| 274 | + | core.PuregoSafeRegister(&XAdwSwipeableGetSwipeArea, libs, "adw_swipeable_get_swipe_area") | |
| 287 | 275 | } | |
| @@ -185,7 +185,6 @@ type Swipeable interface { | |||||
| 185 | var xSwipeableGLibType func() types.GType | 185 | var xSwipeableGLibType func() types.GType | ||
| 186 | 186 | ||||
| 187 | func SwipeableGLibType() types.GType { | 187 | func SwipeableGLibType() types.GType { | ||
| 188 | - | core.LazyRegister(&xSwipeableGLibType, "ADW", "adw_swipeable_get_type", false) | |||
| 189 | return xSwipeableGLibType() | 188 | return xSwipeableGLibType() | ||
| 190 | } | 189 | } | ||
| 191 | 190 | ||||
| @@ -246,42 +245,31 @@ func (x *SwipeableBase) GetSwipeArea(NavigationDirectionVar NavigationDirection, | |||||
| 246 | XAdwSwipeableGetSwipeArea(x.GoPointer(), NavigationDirectionVar, IsDragVar, RectVar) | 245 | XAdwSwipeableGetSwipeArea(x.GoPointer(), NavigationDirectionVar, IsDragVar, RectVar) | ||
| 247 | } | 246 | } | ||
| 248 | 247 | ||||
| 249 | - | var XAdwSwipeableGetCancelProgress func(uintptr) float64 = func(instance uintptr) float64 { | |||
| 250 | - | core.LazyRegister(&xXAdwSwipeableGetCancelProgress, "ADW", "adw_swipeable_get_cancel_progress", false) | |||
| 251 | - | return xXAdwSwipeableGetCancelProgress(instance) | |||
| 252 | - | } | |||
| 253 | - | ||||
| 254 | - | var ( | |||
| 255 | - | xXAdwSwipeableGetCancelProgress func(uintptr) float64 | |||
| 256 | - | XAdwSwipeableGetDistance func(uintptr) float64 = func(instance uintptr) float64 { | |||
| 257 | - | core.LazyRegister(&xXAdwSwipeableGetDistance, "ADW", "adw_swipeable_get_distance", false) | |||
| 258 | - | return xXAdwSwipeableGetDistance(instance) | |||
| 259 | - | } | |||
| 260 | - | ) | |||
| 261 | var ( | 248 | var ( | ||
| 262 | - | xXAdwSwipeableGetDistance func(uintptr) float64 | 249 | + | XAdwSwipeableGetCancelProgress func(uintptr) float64 |
| 263 | - | XAdwSwipeableGetProgress func(uintptr) float64 = func(instance uintptr) float64 { | 250 | + | XAdwSwipeableGetDistance func(uintptr) float64 |
| 264 | - | core.LazyRegister(&xXAdwSwipeableGetProgress, "ADW", "adw_swipeable_get_progress", false) | 251 | + | XAdwSwipeableGetProgress func(uintptr) float64 |
| 265 | - | return xXAdwSwipeableGetProgress(instance) | 252 | + | XAdwSwipeableGetSnapPoints func(uintptr, *int) uintptr |
| 266 | - | } | 253 | + | XAdwSwipeableGetSwipeArea func(uintptr, NavigationDirection, bool, *gdk.Rectangle) |
| 267 | ) | 254 | ) | ||
| 268 | - | var ( | |||
| 269 | - | xXAdwSwipeableGetProgress func(uintptr) float64 | |||
| 270 | - | XAdwSwipeableGetSnapPoints func(uintptr, *int) uintptr = func(instance uintptr, NSnapPointsVarp *int) uintptr { | |||
| 271 | - | core.LazyRegister(&xXAdwSwipeableGetSnapPoints, "ADW", "adw_swipeable_get_snap_points", false) | |||
| 272 | - | return xXAdwSwipeableGetSnapPoints(instance, NSnapPointsVarp) | |||
| 273 | - | } | |||
| 274 | - | ) | |||
| 275 | - | var ( | |||
| 276 | - | xXAdwSwipeableGetSnapPoints func(uintptr, *int) uintptr | |||
| 277 | - | XAdwSwipeableGetSwipeArea func(uintptr, NavigationDirection, bool, *gdk.Rectangle) = func(instance uintptr, NavigationDirectionVarp NavigationDirection, IsDragVarp bool, RectVarp *gdk.Rectangle) { | |||
| 278 | - | core.LazyRegister(&xXAdwSwipeableGetSwipeArea, "ADW", "adw_swipeable_get_swipe_area", false) | |||
| 279 | - | xXAdwSwipeableGetSwipeArea(instance, NavigationDirectionVarp, IsDragVarp, RectVarp) | |||
| 280 | - | } | |||
| 281 | - | ) | |||
| 282 | - | var xXAdwSwipeableGetSwipeArea func(uintptr, NavigationDirection, bool, *gdk.Rectangle) | |||
| 283 | 255 | ||||
| 284 | func init() { | 256 | func init() { | ||
| 285 | core.SetPackageName("ADW", "libadwaita-1") | 257 | core.SetPackageName("ADW", "libadwaita-1") | ||
| 286 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | 258 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | ||
| 259 | + | var libs []uintptr | |||
| 260 | + | for _, libPath := range core.GetPaths("ADW") { | |||
| 261 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |||
| 262 | + | if err != nil { | |||
| 263 | + | panic(err) | |||
| 264 | + | } | |||
| 265 | + | libs = append(libs, lib) | |||
| 266 | + | } | |||
| 267 | + | ||||
| 268 | + | core.PuregoSafeRegister(&xSwipeableGLibType, libs, "adw_swipeable_get_type") | |||
| 269 | + | ||||
| 270 | + | core.PuregoSafeRegister(&XAdwSwipeableGetCancelProgress, libs, "adw_swipeable_get_cancel_progress") | |||
| 271 | + | core.PuregoSafeRegister(&XAdwSwipeableGetDistance, libs, "adw_swipeable_get_distance") | |||
| 272 | + | core.PuregoSafeRegister(&XAdwSwipeableGetProgress, libs, "adw_swipeable_get_progress") | |||
| 273 | + | core.PuregoSafeRegister(&XAdwSwipeableGetSnapPoints, libs, "adw_swipeable_get_snap_points") | |||
| 274 | + | core.PuregoSafeRegister(&XAdwSwipeableGetSwipeArea, libs, "adw_swipeable_get_swipe_area") | |||
| 287 | } | 275 | } | ||