Merge pull request #350 from bnema/fix/repin-fixed-puregotk
fix(deps): validate puregotk lazy registration fix
907 files · +27874 -25296
M go.mod +3 -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.0 | |
| 14 | + | github.com/bnema/puregotk v0.7.1-0.20260714200603-7370c78950ef | |
| 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 | |
| @@ -47,6 +47,7 @@ require ( | |||
| 47 | 47 | github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect | |
| 48 | 48 | github.com/fatih/color v1.19.0 // indirect | |
| 49 | 49 | github.com/go-viper/mapstructure/v2 v2.5.0 // indirect | |
| 50 | + | github.com/google/go-cmp v0.7.0 // indirect | |
| 50 | 51 | github.com/inconshreveable/mousetrap v1.1.0 // indirect | |
| 51 | 52 | github.com/lucasb-eyer/go-colorful v1.4.0 // indirect | |
| 52 | 53 | github.com/mattn/go-colorable v0.1.14 // indirect | |
| @@ -80,6 +81,7 @@ require ( | |||
| 80 | 81 | golang.org/x/text v0.40.0 // indirect | |
| 81 | 82 | golang.org/x/tools v0.47.0 // indirect | |
| 82 | 83 | gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect | |
| 84 | + | mvdan.cc/gofumpt v0.9.2 // indirect | |
| 83 | 85 | ) | |
| 84 | 86 | ||
| 85 | 87 | tool github.com/a-h/templ/cmd/templ | |
| @@ -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.0 | 14 | + | github.com/bnema/puregotk v0.7.1-0.20260714200603-7370c78950ef |
| 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 | ||
| @@ -47,6 +47,7 @@ require ( | |||||
| 47 | github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect | 47 | github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect | ||
| 48 | github.com/fatih/color v1.19.0 // indirect | 48 | github.com/fatih/color v1.19.0 // indirect | ||
| 49 | github.com/go-viper/mapstructure/v2 v2.5.0 // indirect | 49 | github.com/go-viper/mapstructure/v2 v2.5.0 // indirect | ||
| 50 | + | github.com/google/go-cmp v0.7.0 // indirect | |||
| 50 | github.com/inconshreveable/mousetrap v1.1.0 // indirect | 51 | github.com/inconshreveable/mousetrap v1.1.0 // indirect | ||
| 51 | github.com/lucasb-eyer/go-colorful v1.4.0 // indirect | 52 | github.com/lucasb-eyer/go-colorful v1.4.0 // indirect | ||
| 52 | github.com/mattn/go-colorable v0.1.14 // indirect | 53 | github.com/mattn/go-colorable v0.1.14 // indirect | ||
| @@ -80,6 +81,7 @@ require ( | |||||
| 80 | golang.org/x/text v0.40.0 // indirect | 81 | golang.org/x/text v0.40.0 // indirect | ||
| 81 | golang.org/x/tools v0.47.0 // indirect | 82 | golang.org/x/tools v0.47.0 // indirect | ||
| 82 | gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect | 83 | gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect | ||
| 84 | + | mvdan.cc/gofumpt v0.9.2 // indirect | |||
| 83 | ) | 85 | ) | ||
| 84 | 86 | ||||
| 85 | tool github.com/a-h/templ/cmd/templ | 87 | tool github.com/a-h/templ/cmd/templ | ||
M go.sum +4 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/internal/core/core.go +197 -4 generated file: collapsed
M vendor/github.com/bnema/puregotk/pkg/core/core.go +10 -0 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-about-dialog.go +99 -64 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-about-window.go +95 -62 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-accent-color.go +7 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-action-row.go +33 -29 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-alert-dialog.go +66 -47 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-animation-target.go +10 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-animation-util.go +4 -12 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-animation.go +24 -26 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-application-window.go +14 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-application.go +3 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-avatar.go +22 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-banner.go +23 -26 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-bin.go +5 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-bottom-sheet.go +47 -38 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-breakpoint-bin.go +10 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-breakpoint.go +33 -37 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-button-content.go +18 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-button-row.go +10 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-carousel-indicator-dots.go +5 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-carousel-indicator-lines.go +5 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-carousel.go +47 -37 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-clamp-layout.go +14 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-clamp-scrollable.go +17 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-clamp.go +17 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-combo-row.go +34 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-dialog.go +45 -38 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-easing.go +3 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-entry-row.go +40 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-enum-list-model.go +13 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-expander-row.go +40 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-flap.go +61 -48 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-fold-threshold-policy.go +10 -1 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-header-bar.go +36 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-inline-view-switcher.go +18 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-layout-slot.go +4 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-layout.go +7 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-leaflet.go +69 -56 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-length-unit.go +5 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-main.go +5 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-message-dialog.go +63 -44 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-multi-layout-view.go +17 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-navigation-direction.go +10 -1 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-navigation-split-view.go +36 -32 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-navigation-view.go +60 -49 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-overlay-split-view.go +48 -38 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-password-entry-row.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-dialog.go +23 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-group.go +24 -26 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-page.go +38 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-row.go +18 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-window.go +31 -29 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-shortcut-label.go +10 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-shortcuts-dialog.go +4 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-shortcuts-item.go +23 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-shortcuts-section.go +8 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-sidebar-item.go +45 -37 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-sidebar-section.go +24 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-sidebar.go +41 -39 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spin-row.go +40 -34 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spinner-paintable.go +5 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spinner.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-split-button.go +39 -34 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spring-animation.go +34 -30 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spring-params.go +17 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-squeezer.go +49 -44 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-status-page.go +20 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-style-manager.go +25 -28 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-swipe-tracker.go +33 -30 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-swipeable.go +33 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-switch-row.go +6 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-tab-bar.go +35 -32 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-tab-button.go +5 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-tab-overview.go +45 -37 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-tab-view.go +123 -87 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-timed-animation.go +30 -28 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-toast-overlay.go +9 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-toast.go +41 -36 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-toggle-group.go +64 -51 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-toolbar-view.go +40 -35 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-version.go +7 -16
| @@ -1,10 +1,7 @@ | |||
| 1 | 1 | // Package adw was automatically generated by github.com/bnema/puregotk DO NOT EDIT | |
| 2 | 2 | package adw | |
| 3 | 3 | ||
| 4 | - | import ( | |
| 5 | - | "github.com/bnema/purego" | |
| 6 | - | "github.com/bnema/puregotk/pkg/core" | |
| 7 | - | ) | |
| 4 | + | import "github.com/bnema/puregotk/pkg/core" | |
| 8 | 5 | ||
| 9 | 6 | const ( | |
| 10 | 7 | // Adwaita major version component (e.g. 1 if the version is 1.2.3). | |
| @@ -29,6 +26,8 @@ var xGetMajorVersion func() uint | |||
| 29 | 26 | // which represents the major version of the libadwaita headers you have | |
| 30 | 27 | // included when compiling your code. | |
| 31 | 28 | func GetMajorVersion() uint { | |
| 29 | + | core.LazyRegister(&xGetMajorVersion, "ADW", "adw_get_major_version", false) | |
| 30 | + | ||
| 32 | 31 | cret := xGetMajorVersion() | |
| 33 | 32 | return cret | |
| 34 | 33 | } | |
| @@ -44,6 +43,8 @@ var xGetMicroVersion func() uint | |||
| 44 | 43 | // which represents the micro version of the libadwaita headers you have | |
| 45 | 44 | // included when compiling your code. | |
| 46 | 45 | func GetMicroVersion() uint { | |
| 46 | + | core.LazyRegister(&xGetMicroVersion, "ADW", "adw_get_micro_version", false) | |
| 47 | + | ||
| 47 | 48 | cret := xGetMicroVersion() | |
| 48 | 49 | return cret | |
| 49 | 50 | } | |
| @@ -59,6 +60,8 @@ var xGetMinorVersion func() uint | |||
| 59 | 60 | // which represents the minor version of the libadwaita headers you have | |
| 60 | 61 | // included when compiling your code. | |
| 61 | 62 | func GetMinorVersion() uint { | |
| 63 | + | core.LazyRegister(&xGetMinorVersion, "ADW", "adw_get_minor_version", false) | |
| 64 | + | ||
| 62 | 65 | cret := xGetMinorVersion() | |
| 63 | 66 | return cret | |
| 64 | 67 | } | |
| @@ -66,16 +69,4 @@ func GetMinorVersion() uint { | |||
| 66 | 69 | func init() { | |
| 67 | 70 | core.SetPackageName("ADW", "libadwaita-1") | |
| 68 | 71 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | |
| 69 | - | var libs []uintptr | |
| 70 | - | for _, libPath := range core.GetPaths("ADW") { | |
| 71 | - | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 72 | - | if err != nil { | |
| 73 | - | panic(err) | |
| 74 | - | } | |
| 75 | - | libs = append(libs, lib) | |
| 76 | - | } | |
| 77 | - | ||
| 78 | - | core.PuregoSafeRegister(&xGetMajorVersion, libs, "adw_get_major_version") | |
| 79 | - | core.PuregoSafeRegister(&xGetMicroVersion, libs, "adw_get_micro_version") | |
| 80 | - | core.PuregoSafeRegister(&xGetMinorVersion, libs, "adw_get_minor_version") | |
| 81 | 72 | } | |
| @@ -1,10 +1,7 @@ | |||||
| 1 | // Package adw was automatically generated by github.com/bnema/puregotk DO NOT EDIT | 1 | // Package adw was automatically generated by github.com/bnema/puregotk DO NOT EDIT | ||
| 2 | package adw | 2 | package adw | ||
| 3 | 3 | ||||
| 4 | - | import ( | 4 | + | import "github.com/bnema/puregotk/pkg/core" |
| 5 | - | "github.com/bnema/purego" | |||
| 6 | - | "github.com/bnema/puregotk/pkg/core" | |||
| 7 | - | ) | |||
| 8 | 5 | ||||
| 9 | const ( | 6 | const ( | ||
| 10 | // Adwaita major version component (e.g. 1 if the version is 1.2.3). | 7 | // Adwaita major version component (e.g. 1 if the version is 1.2.3). | ||
| @@ -29,6 +26,8 @@ var xGetMajorVersion func() uint | |||||
| 29 | // which represents the major version of the libadwaita headers you have | 26 | // which represents the major version of the libadwaita headers you have | ||
| 30 | // included when compiling your code. | 27 | // included when compiling your code. | ||
| 31 | func GetMajorVersion() uint { | 28 | func GetMajorVersion() uint { | ||
| 29 | + | core.LazyRegister(&xGetMajorVersion, "ADW", "adw_get_major_version", false) | |||
| 30 | + | ||||
| 32 | cret := xGetMajorVersion() | 31 | cret := xGetMajorVersion() | ||
| 33 | return cret | 32 | return cret | ||
| 34 | } | 33 | } | ||
| @@ -44,6 +43,8 @@ var xGetMicroVersion func() uint | |||||
| 44 | // which represents the micro version of the libadwaita headers you have | 43 | // which represents the micro version of the libadwaita headers you have | ||
| 45 | // included when compiling your code. | 44 | // included when compiling your code. | ||
| 46 | func GetMicroVersion() uint { | 45 | func GetMicroVersion() uint { | ||
| 46 | + | core.LazyRegister(&xGetMicroVersion, "ADW", "adw_get_micro_version", false) | |||
| 47 | + | ||||
| 47 | cret := xGetMicroVersion() | 48 | cret := xGetMicroVersion() | ||
| 48 | return cret | 49 | return cret | ||
| 49 | } | 50 | } | ||
| @@ -59,6 +60,8 @@ var xGetMinorVersion func() uint | |||||
| 59 | // which represents the minor version of the libadwaita headers you have | 60 | // which represents the minor version of the libadwaita headers you have | ||
| 60 | // included when compiling your code. | 61 | // included when compiling your code. | ||
| 61 | func GetMinorVersion() uint { | 62 | func GetMinorVersion() uint { | ||
| 63 | + | core.LazyRegister(&xGetMinorVersion, "ADW", "adw_get_minor_version", false) | |||
| 64 | + | ||||
| 62 | cret := xGetMinorVersion() | 65 | cret := xGetMinorVersion() | ||
| 63 | return cret | 66 | return cret | ||
| 64 | } | 67 | } | ||
| @@ -66,16 +69,4 @@ func GetMinorVersion() uint { | |||||
| 66 | func init() { | 69 | func init() { | ||
| 67 | core.SetPackageName("ADW", "libadwaita-1") | 70 | core.SetPackageName("ADW", "libadwaita-1") | ||
| 68 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | 71 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | ||
| 69 | - | var libs []uintptr | |||
| 70 | - | for _, libPath := range core.GetPaths("ADW") { | |||
| 71 | - | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |||
| 72 | - | if err != nil { | |||
| 73 | - | panic(err) | |||
| 74 | - | } | |||
| 75 | - | libs = append(libs, lib) | |||
| 76 | - | } | |||
| 77 | - | ||||
| 78 | - | core.PuregoSafeRegister(&xGetMajorVersion, libs, "adw_get_major_version") | |||
| 79 | - | core.PuregoSafeRegister(&xGetMicroVersion, libs, "adw_get_micro_version") | |||
| 80 | - | core.PuregoSafeRegister(&xGetMinorVersion, libs, "adw_get_minor_version") | |||
| 81 | } | 72 | } | ||