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
| @@ -5,6 +5,7 @@ import ( | |||
| 5 | 5 | "structs" | |
| 6 | 6 | "unsafe" | |
| 7 | 7 | ||
| 8 | + | "github.com/bnema/purego" | |
| 8 | 9 | "github.com/bnema/puregotk/pkg/core" | |
| 9 | 10 | "github.com/bnema/puregotk/v4/gio" | |
| 10 | 11 | "github.com/bnema/puregotk/v4/gobject" | |
| @@ -55,7 +56,6 @@ type EnumListItem struct { | |||
| 55 | 56 | var xEnumListItemGLibType func() types.GType | |
| 56 | 57 | ||
| 57 | 58 | func EnumListItemGLibType() types.GType { | |
| 58 | - | core.LazyRegister(&xEnumListItemGLibType, "ADW", "adw_enum_list_item_get_type", false) | |
| 59 | 59 | return xEnumListItemGLibType() | |
| 60 | 60 | } | |
| 61 | 61 | ||
| @@ -69,8 +69,6 @@ var xEnumListItemGetName func(uintptr) string | |||
| 69 | 69 | ||
| 70 | 70 | // Gets the enum value name. | |
| 71 | 71 | func (x *EnumListItem) GetName() string { | |
| 72 | - | core.LazyRegister(&xEnumListItemGetName, "ADW", "adw_enum_list_item_get_name", false) | |
| 73 | - | ||
| 74 | 72 | cret := xEnumListItemGetName(x.GoPointer()) | |
| 75 | 73 | return cret | |
| 76 | 74 | } | |
| @@ -79,8 +77,6 @@ var xEnumListItemGetNick func(uintptr) string | |||
| 79 | 77 | ||
| 80 | 78 | // Gets the enum value nick. | |
| 81 | 79 | func (x *EnumListItem) GetNick() string { | |
| 82 | - | core.LazyRegister(&xEnumListItemGetNick, "ADW", "adw_enum_list_item_get_nick", false) | |
| 83 | - | ||
| 84 | 80 | cret := xEnumListItemGetNick(x.GoPointer()) | |
| 85 | 81 | return cret | |
| 86 | 82 | } | |
| @@ -89,8 +85,6 @@ var xEnumListItemGetValue func(uintptr) int | |||
| 89 | 85 | ||
| 90 | 86 | // Gets the enum value. | |
| 91 | 87 | func (x *EnumListItem) GetValue() int { | |
| 92 | - | core.LazyRegister(&xEnumListItemGetValue, "ADW", "adw_enum_list_item_get_value", false) | |
| 93 | - | ||
| 94 | 88 | cret := xEnumListItemGetValue(x.GoPointer()) | |
| 95 | 89 | return cret | |
| 96 | 90 | } | |
| @@ -140,7 +134,6 @@ type EnumListModel struct { | |||
| 140 | 134 | var xEnumListModelGLibType func() types.GType | |
| 141 | 135 | ||
| 142 | 136 | func EnumListModelGLibType() types.GType { | |
| 143 | - | core.LazyRegister(&xEnumListModelGLibType, "ADW", "adw_enum_list_model_get_type", false) | |
| 144 | 137 | return xEnumListModelGLibType() | |
| 145 | 138 | } | |
| 146 | 139 | ||
| @@ -154,7 +147,6 @@ var xNewEnumListModel func(types.GType) uintptr | |||
| 154 | 147 | ||
| 155 | 148 | // Creates a new `AdwEnumListModel` for @enum_type. | |
| 156 | 149 | func NewEnumListModel(EnumTypeVar types.GType) *EnumListModel { | |
| 157 | - | core.LazyRegister(&xNewEnumListModel, "ADW", "adw_enum_list_model_new", false) | |
| 158 | 150 | var cls *EnumListModel | |
| 159 | 151 | ||
| 160 | 152 | cret := xNewEnumListModel(EnumTypeVar) | |
| @@ -173,8 +165,6 @@ var xEnumListModelFindPosition func(uintptr, int) uint | |||
| 173 | 165 | // | |
| 174 | 166 | // If the value is not found, [const@Gtk.INVALID_LIST_POSITION] is returned. | |
| 175 | 167 | func (x *EnumListModel) FindPosition(ValueVar int) uint { | |
| 176 | - | core.LazyRegister(&xEnumListModelFindPosition, "ADW", "adw_enum_list_model_find_position", false) | |
| 177 | - | ||
| 178 | 168 | cret := xEnumListModelFindPosition(x.GoPointer(), ValueVar) | |
| 179 | 169 | return cret | |
| 180 | 170 | } | |
| @@ -183,8 +173,6 @@ var xEnumListModelGetEnumType func(uintptr) types.GType | |||
| 183 | 173 | ||
| 184 | 174 | // Gets the type of the enum represented by @self. | |
| 185 | 175 | func (x *EnumListModel) GetEnumType() types.GType { | |
| 186 | - | core.LazyRegister(&xEnumListModelGetEnumType, "ADW", "adw_enum_list_model_get_enum_type", false) | |
| 187 | - | ||
| 188 | 176 | cret := xEnumListModelGetEnumType(x.GoPointer()) | |
| 189 | 177 | return cret | |
| 190 | 178 | } | |
| @@ -297,4 +285,25 @@ func (x *EnumListModel) ItemsChanged(PositionVar uint, RemovedVar uint, AddedVar | |||
| 297 | 285 | func init() { | |
| 298 | 286 | core.SetPackageName("ADW", "libadwaita-1") | |
| 299 | 287 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | |
| 288 | + | var libs []uintptr | |
| 289 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 290 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 291 | + | if err != nil { | |
| 292 | + | panic(err) | |
| 293 | + | } | |
| 294 | + | libs = append(libs, lib) | |
| 295 | + | } | |
| 296 | + | ||
| 297 | + | core.PuregoSafeRegister(&xEnumListItemGLibType, libs, "adw_enum_list_item_get_type") | |
| 298 | + | ||
| 299 | + | core.PuregoSafeRegister(&xEnumListItemGetName, libs, "adw_enum_list_item_get_name") | |
| 300 | + | core.PuregoSafeRegister(&xEnumListItemGetNick, libs, "adw_enum_list_item_get_nick") | |
| 301 | + | core.PuregoSafeRegister(&xEnumListItemGetValue, libs, "adw_enum_list_item_get_value") | |
| 302 | + | ||
| 303 | + | core.PuregoSafeRegister(&xEnumListModelGLibType, libs, "adw_enum_list_model_get_type") | |
| 304 | + | ||
| 305 | + | core.PuregoSafeRegister(&xNewEnumListModel, libs, "adw_enum_list_model_new") | |
| 306 | + | ||
| 307 | + | core.PuregoSafeRegister(&xEnumListModelFindPosition, libs, "adw_enum_list_model_find_position") | |
| 308 | + | core.PuregoSafeRegister(&xEnumListModelGetEnumType, libs, "adw_enum_list_model_get_enum_type") | |
| 300 | 309 | } | |
| @@ -5,6 +5,7 @@ import ( | |||||
| 5 | "structs" | 5 | "structs" | ||
| 6 | "unsafe" | 6 | "unsafe" | ||
| 7 | 7 | ||||
| 8 | + | "github.com/bnema/purego" | |||
| 8 | "github.com/bnema/puregotk/pkg/core" | 9 | "github.com/bnema/puregotk/pkg/core" | ||
| 9 | "github.com/bnema/puregotk/v4/gio" | 10 | "github.com/bnema/puregotk/v4/gio" | ||
| 10 | "github.com/bnema/puregotk/v4/gobject" | 11 | "github.com/bnema/puregotk/v4/gobject" | ||
| @@ -55,7 +56,6 @@ type EnumListItem struct { | |||||
| 55 | var xEnumListItemGLibType func() types.GType | 56 | var xEnumListItemGLibType func() types.GType | ||
| 56 | 57 | ||||
| 57 | func EnumListItemGLibType() types.GType { | 58 | func EnumListItemGLibType() types.GType { | ||
| 58 | - | core.LazyRegister(&xEnumListItemGLibType, "ADW", "adw_enum_list_item_get_type", false) | |||
| 59 | return xEnumListItemGLibType() | 59 | return xEnumListItemGLibType() | ||
| 60 | } | 60 | } | ||
| 61 | 61 | ||||
| @@ -69,8 +69,6 @@ var xEnumListItemGetName func(uintptr) string | |||||
| 69 | 69 | ||||
| 70 | // Gets the enum value name. | 70 | // Gets the enum value name. | ||
| 71 | func (x *EnumListItem) GetName() string { | 71 | func (x *EnumListItem) GetName() string { | ||
| 72 | - | core.LazyRegister(&xEnumListItemGetName, "ADW", "adw_enum_list_item_get_name", false) | |||
| 73 | - | ||||
| 74 | cret := xEnumListItemGetName(x.GoPointer()) | 72 | cret := xEnumListItemGetName(x.GoPointer()) | ||
| 75 | return cret | 73 | return cret | ||
| 76 | } | 74 | } | ||
| @@ -79,8 +77,6 @@ var xEnumListItemGetNick func(uintptr) string | |||||
| 79 | 77 | ||||
| 80 | // Gets the enum value nick. | 78 | // Gets the enum value nick. | ||
| 81 | func (x *EnumListItem) GetNick() string { | 79 | func (x *EnumListItem) GetNick() string { | ||
| 82 | - | core.LazyRegister(&xEnumListItemGetNick, "ADW", "adw_enum_list_item_get_nick", false) | |||
| 83 | - | ||||
| 84 | cret := xEnumListItemGetNick(x.GoPointer()) | 80 | cret := xEnumListItemGetNick(x.GoPointer()) | ||
| 85 | return cret | 81 | return cret | ||
| 86 | } | 82 | } | ||
| @@ -89,8 +85,6 @@ var xEnumListItemGetValue func(uintptr) int | |||||
| 89 | 85 | ||||
| 90 | // Gets the enum value. | 86 | // Gets the enum value. | ||
| 91 | func (x *EnumListItem) GetValue() int { | 87 | func (x *EnumListItem) GetValue() int { | ||
| 92 | - | core.LazyRegister(&xEnumListItemGetValue, "ADW", "adw_enum_list_item_get_value", false) | |||
| 93 | - | ||||
| 94 | cret := xEnumListItemGetValue(x.GoPointer()) | 88 | cret := xEnumListItemGetValue(x.GoPointer()) | ||
| 95 | return cret | 89 | return cret | ||
| 96 | } | 90 | } | ||
| @@ -140,7 +134,6 @@ type EnumListModel struct { | |||||
| 140 | var xEnumListModelGLibType func() types.GType | 134 | var xEnumListModelGLibType func() types.GType | ||
| 141 | 135 | ||||
| 142 | func EnumListModelGLibType() types.GType { | 136 | func EnumListModelGLibType() types.GType { | ||
| 143 | - | core.LazyRegister(&xEnumListModelGLibType, "ADW", "adw_enum_list_model_get_type", false) | |||
| 144 | return xEnumListModelGLibType() | 137 | return xEnumListModelGLibType() | ||
| 145 | } | 138 | } | ||
| 146 | 139 | ||||
| @@ -154,7 +147,6 @@ var xNewEnumListModel func(types.GType) uintptr | |||||
| 154 | 147 | ||||
| 155 | // Creates a new `AdwEnumListModel` for @enum_type. | 148 | // Creates a new `AdwEnumListModel` for @enum_type. | ||
| 156 | func NewEnumListModel(EnumTypeVar types.GType) *EnumListModel { | 149 | func NewEnumListModel(EnumTypeVar types.GType) *EnumListModel { | ||
| 157 | - | core.LazyRegister(&xNewEnumListModel, "ADW", "adw_enum_list_model_new", false) | |||
| 158 | var cls *EnumListModel | 150 | var cls *EnumListModel | ||
| 159 | 151 | ||||
| 160 | cret := xNewEnumListModel(EnumTypeVar) | 152 | cret := xNewEnumListModel(EnumTypeVar) | ||
| @@ -173,8 +165,6 @@ var xEnumListModelFindPosition func(uintptr, int) uint | |||||
| 173 | // | 165 | // | ||
| 174 | // If the value is not found, [const@Gtk.INVALID_LIST_POSITION] is returned. | 166 | // If the value is not found, [const@Gtk.INVALID_LIST_POSITION] is returned. | ||
| 175 | func (x *EnumListModel) FindPosition(ValueVar int) uint { | 167 | func (x *EnumListModel) FindPosition(ValueVar int) uint { | ||
| 176 | - | core.LazyRegister(&xEnumListModelFindPosition, "ADW", "adw_enum_list_model_find_position", false) | |||
| 177 | - | ||||
| 178 | cret := xEnumListModelFindPosition(x.GoPointer(), ValueVar) | 168 | cret := xEnumListModelFindPosition(x.GoPointer(), ValueVar) | ||
| 179 | return cret | 169 | return cret | ||
| 180 | } | 170 | } | ||
| @@ -183,8 +173,6 @@ var xEnumListModelGetEnumType func(uintptr) types.GType | |||||
| 183 | 173 | ||||
| 184 | // Gets the type of the enum represented by @self. | 174 | // Gets the type of the enum represented by @self. | ||
| 185 | func (x *EnumListModel) GetEnumType() types.GType { | 175 | func (x *EnumListModel) GetEnumType() types.GType { | ||
| 186 | - | core.LazyRegister(&xEnumListModelGetEnumType, "ADW", "adw_enum_list_model_get_enum_type", false) | |||
| 187 | - | ||||
| 188 | cret := xEnumListModelGetEnumType(x.GoPointer()) | 176 | cret := xEnumListModelGetEnumType(x.GoPointer()) | ||
| 189 | return cret | 177 | return cret | ||
| 190 | } | 178 | } | ||
| @@ -297,4 +285,25 @@ func (x *EnumListModel) ItemsChanged(PositionVar uint, RemovedVar uint, AddedVar | |||||
| 297 | func init() { | 285 | func init() { | ||
| 298 | core.SetPackageName("ADW", "libadwaita-1") | 286 | core.SetPackageName("ADW", "libadwaita-1") | ||
| 299 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | 287 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | ||
| 288 | + | var libs []uintptr | |||
| 289 | + | for _, libPath := range core.GetPaths("ADW") { | |||
| 290 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |||
| 291 | + | if err != nil { | |||
| 292 | + | panic(err) | |||
| 293 | + | } | |||
| 294 | + | libs = append(libs, lib) | |||
| 295 | + | } | |||
| 296 | + | ||||
| 297 | + | core.PuregoSafeRegister(&xEnumListItemGLibType, libs, "adw_enum_list_item_get_type") | |||
| 298 | + | ||||
| 299 | + | core.PuregoSafeRegister(&xEnumListItemGetName, libs, "adw_enum_list_item_get_name") | |||
| 300 | + | core.PuregoSafeRegister(&xEnumListItemGetNick, libs, "adw_enum_list_item_get_nick") | |||
| 301 | + | core.PuregoSafeRegister(&xEnumListItemGetValue, libs, "adw_enum_list_item_get_value") | |||
| 302 | + | ||||
| 303 | + | core.PuregoSafeRegister(&xEnumListModelGLibType, libs, "adw_enum_list_model_get_type") | |||
| 304 | + | ||||
| 305 | + | core.PuregoSafeRegister(&xNewEnumListModel, libs, "adw_enum_list_model_new") | |||
| 306 | + | ||||
| 307 | + | core.PuregoSafeRegister(&xEnumListModelFindPosition, libs, "adw_enum_list_model_find_position") | |||
| 308 | + | core.PuregoSafeRegister(&xEnumListModelGetEnumType, libs, "adw_enum_list_model_get_enum_type") | |||
| 300 | } | 309 | } | ||