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 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-switch-row.go +16 -6 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-tab-bar.go +32 -35 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-tab-button.go +16 -5 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-tab-overview.go +37 -45 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-tab-view.go +87 -123 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-timed-animation.go +28 -30 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-toast-overlay.go +18 -9 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-toast.go +36 -41 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-toggle-group.go +51 -64 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-toolbar-view.go +35 -40 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-version.go +16 -7 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-stack.go +62 -78 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-switcher-bar.go +18 -9 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-switcher-sidebar.go +22 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-switcher-title.go +23 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-switcher.go +20 -10 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-window-title.go +18 -10 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-window.go +22 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-wrap-box.go +46 -66 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-wrap-layout.go +46 -57 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/cairo/main.go +79 -36 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkapplaunchcontext.go +17 -10 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcairo.go +16 -12 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcairocontext.go +13 -3 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcicpparams.go +25 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkclipboard.go +32 -34 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcolorstate.go +16 -12 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcontentdeserializer.go +27 -26 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcontentformats.go +31 -28 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcontentprovider.go +28 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcontentserializer.go +27 -26 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcursor.go +21 -12 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdevice.go +33 -36 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdevicepad.go +22 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdevicetool.go +18 -10 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdisplay.go +43 -51 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdisplaymanager.go +20 -10 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdmabuftexture.go +13 -3 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdmabuftexturebuilder.go +41 -53 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdrag.go +28 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdragsurface.go +14 -6 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdragsurfacesize.go +13 -3 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdrawcontext.go +18 -11 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdrop.go +24 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkenums.go +1 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkevents.go +118 -120 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkframeclock.go +24 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkframetimings.go +20 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkglcontext.go +36 -40 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkgltexture.go +15 -4 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkgltexturebuilder.go +35 -41 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkkeys.go +22 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkmemorytexture.go +13 -2 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkmemorytexturebuilder.go +35 -42 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkmonitor.go +27 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkpaintable.go +33 -63 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkpango.go +12 -4 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkpixbuf.go +12 -2 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkpopup.go +26 -47 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkpopuplayout.go +32 -36 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkrgba.go +21 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkseat.go +20 -11 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdksnapshot.go +0 -7 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdksurface.go +40 -46 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdktexture.go +31 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdktoplevel.go +66 -157 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdktoplevellayout.go +25 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdktoplevelsize.go +16 -9 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdktypes.go +72 -95 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkvulkancontext.go +13 -3 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdkpixbuf/gdk-pixbuf-animation.go +32 -26 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdkpixbuf/gdk-pixbuf-core.go +0 -9 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdkpixbuf/gdk-pixbuf-io.go +23 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdkpixbuf/gdk-pixbuf-loader.go +22 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdkpixbuf/gdk-pixbuf-simple-anim.go +17 -8 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdkpixbuf/gdk-pixbuf-transform.go +1 -11 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdkpixbuf/gdk-pixbuf.go +79 -102 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdkpixbuf/main.go +17 -5
| @@ -2,6 +2,7 @@ | |||
| 2 | 2 | package gdkpixbuf | |
| 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/glib" | |
| 7 | 8 | "github.com/bnema/puregotk/v4/gobject/types" | |
| @@ -10,8 +11,6 @@ import ( | |||
| 10 | 11 | var xPixbufErrorQuark func() glib.Quark | |
| 11 | 12 | ||
| 12 | 13 | func PixbufErrorQuark() glib.Quark { | |
| 13 | - | core.LazyRegister(&xPixbufErrorQuark, "GDKPIXBUF", "gdk_pixbuf_error_quark", false) | |
| 14 | - | ||
| 15 | 14 | cret := xPixbufErrorQuark() | |
| 16 | 15 | return cret | |
| 17 | 16 | } | |
| @@ -23,7 +22,6 @@ type PixbufNonAnim struct { | |||
| 23 | 22 | var xPixbufNonAnimGLibType func() types.GType | |
| 24 | 23 | ||
| 25 | 24 | func PixbufNonAnimGLibType() types.GType { | |
| 26 | - | core.LazyRegister(&xPixbufNonAnimGLibType, "GDKPIXBUF", "gdk_pixbuf_non_anim_get_type", false) | |
| 27 | 25 | return xPixbufNonAnimGLibType() | |
| 28 | 26 | } | |
| 29 | 27 | ||
| @@ -36,7 +34,6 @@ func PixbufNonAnimNewFromInternalPtr(ptr uintptr) *PixbufNonAnim { | |||
| 36 | 34 | var xNewPixbufNonAnim func(uintptr) uintptr | |
| 37 | 35 | ||
| 38 | 36 | func NewPixbufNonAnim(PixbufVar *Pixbuf) *PixbufNonAnim { | |
| 39 | - | core.LazyRegister(&xNewPixbufNonAnim, "GDKPIXBUF", "gdk_pixbuf_non_anim_new", false) | |
| 40 | 37 | var cls *PixbufNonAnim | |
| 41 | 38 | ||
| 42 | 39 | cret := xNewPixbufNonAnim(PixbufVar.GoPointer()) | |
| @@ -67,7 +64,6 @@ type PixbufSimpleAnimIter struct { | |||
| 67 | 64 | var xPixbufSimpleAnimIterGLibType func() types.GType | |
| 68 | 65 | ||
| 69 | 66 | func PixbufSimpleAnimIterGLibType() types.GType { | |
| 70 | - | core.LazyRegister(&xPixbufSimpleAnimIterGLibType, "GDKPIXBUF", "gdk_pixbuf_simple_anim_iter_get_type", false) | |
| 71 | 67 | return xPixbufSimpleAnimIterGLibType() | |
| 72 | 68 | } | |
| 73 | 69 | ||
| @@ -91,4 +87,20 @@ func (c *PixbufSimpleAnimIter) SetGoPointer(ptr uintptr) { | |||
| 91 | 87 | func init() { | |
| 92 | 88 | core.SetPackageName("GDKPIXBUF", "gdk-pixbuf-2.0") | |
| 93 | 89 | core.SetSharedLibraries("GDKPIXBUF", []string{"libgdk_pixbuf-2.0.so.0", "libgdk_pixbuf-2.0.0.dylib"}) | |
| 90 | + | var libs []uintptr | |
| 91 | + | for _, libPath := range core.GetPaths("GDKPIXBUF") { | |
| 92 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 93 | + | if err != nil { | |
| 94 | + | panic(err) | |
| 95 | + | } | |
| 96 | + | libs = append(libs, lib) | |
| 97 | + | } | |
| 98 | + | ||
| 99 | + | core.PuregoSafeRegister(&xPixbufErrorQuark, libs, "gdk_pixbuf_error_quark") | |
| 100 | + | ||
| 101 | + | core.PuregoSafeRegister(&xPixbufNonAnimGLibType, libs, "gdk_pixbuf_non_anim_get_type") | |
| 102 | + | ||
| 103 | + | core.PuregoSafeRegister(&xNewPixbufNonAnim, libs, "gdk_pixbuf_non_anim_new") | |
| 104 | + | ||
| 105 | + | core.PuregoSafeRegister(&xPixbufSimpleAnimIterGLibType, libs, "gdk_pixbuf_simple_anim_iter_get_type") | |
| 94 | 106 | } | |
| @@ -2,6 +2,7 @@ | |||||
| 2 | package gdkpixbuf | 2 | package gdkpixbuf | ||
| 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/glib" | 7 | "github.com/bnema/puregotk/v4/glib" | ||
| 7 | "github.com/bnema/puregotk/v4/gobject/types" | 8 | "github.com/bnema/puregotk/v4/gobject/types" | ||
| @@ -10,8 +11,6 @@ import ( | |||||
| 10 | var xPixbufErrorQuark func() glib.Quark | 11 | var xPixbufErrorQuark func() glib.Quark | ||
| 11 | 12 | ||||
| 12 | func PixbufErrorQuark() glib.Quark { | 13 | func PixbufErrorQuark() glib.Quark { | ||
| 13 | - | core.LazyRegister(&xPixbufErrorQuark, "GDKPIXBUF", "gdk_pixbuf_error_quark", false) | |||
| 14 | - | ||||
| 15 | cret := xPixbufErrorQuark() | 14 | cret := xPixbufErrorQuark() | ||
| 16 | return cret | 15 | return cret | ||
| 17 | } | 16 | } | ||
| @@ -23,7 +22,6 @@ type PixbufNonAnim struct { | |||||
| 23 | var xPixbufNonAnimGLibType func() types.GType | 22 | var xPixbufNonAnimGLibType func() types.GType | ||
| 24 | 23 | ||||
| 25 | func PixbufNonAnimGLibType() types.GType { | 24 | func PixbufNonAnimGLibType() types.GType { | ||
| 26 | - | core.LazyRegister(&xPixbufNonAnimGLibType, "GDKPIXBUF", "gdk_pixbuf_non_anim_get_type", false) | |||
| 27 | return xPixbufNonAnimGLibType() | 25 | return xPixbufNonAnimGLibType() | ||
| 28 | } | 26 | } | ||
| 29 | 27 | ||||
| @@ -36,7 +34,6 @@ func PixbufNonAnimNewFromInternalPtr(ptr uintptr) *PixbufNonAnim { | |||||
| 36 | var xNewPixbufNonAnim func(uintptr) uintptr | 34 | var xNewPixbufNonAnim func(uintptr) uintptr | ||
| 37 | 35 | ||||
| 38 | func NewPixbufNonAnim(PixbufVar *Pixbuf) *PixbufNonAnim { | 36 | func NewPixbufNonAnim(PixbufVar *Pixbuf) *PixbufNonAnim { | ||
| 39 | - | core.LazyRegister(&xNewPixbufNonAnim, "GDKPIXBUF", "gdk_pixbuf_non_anim_new", false) | |||
| 40 | var cls *PixbufNonAnim | 37 | var cls *PixbufNonAnim | ||
| 41 | 38 | ||||
| 42 | cret := xNewPixbufNonAnim(PixbufVar.GoPointer()) | 39 | cret := xNewPixbufNonAnim(PixbufVar.GoPointer()) | ||
| @@ -67,7 +64,6 @@ type PixbufSimpleAnimIter struct { | |||||
| 67 | var xPixbufSimpleAnimIterGLibType func() types.GType | 64 | var xPixbufSimpleAnimIterGLibType func() types.GType | ||
| 68 | 65 | ||||
| 69 | func PixbufSimpleAnimIterGLibType() types.GType { | 66 | func PixbufSimpleAnimIterGLibType() types.GType { | ||
| 70 | - | core.LazyRegister(&xPixbufSimpleAnimIterGLibType, "GDKPIXBUF", "gdk_pixbuf_simple_anim_iter_get_type", false) | |||
| 71 | return xPixbufSimpleAnimIterGLibType() | 67 | return xPixbufSimpleAnimIterGLibType() | ||
| 72 | } | 68 | } | ||
| 73 | 69 | ||||
| @@ -91,4 +87,20 @@ func (c *PixbufSimpleAnimIter) SetGoPointer(ptr uintptr) { | |||||
| 91 | func init() { | 87 | func init() { | ||
| 92 | core.SetPackageName("GDKPIXBUF", "gdk-pixbuf-2.0") | 88 | core.SetPackageName("GDKPIXBUF", "gdk-pixbuf-2.0") | ||
| 93 | core.SetSharedLibraries("GDKPIXBUF", []string{"libgdk_pixbuf-2.0.so.0", "libgdk_pixbuf-2.0.0.dylib"}) | 89 | core.SetSharedLibraries("GDKPIXBUF", []string{"libgdk_pixbuf-2.0.so.0", "libgdk_pixbuf-2.0.0.dylib"}) | ||
| 90 | + | var libs []uintptr | |||
| 91 | + | for _, libPath := range core.GetPaths("GDKPIXBUF") { | |||
| 92 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |||
| 93 | + | if err != nil { | |||
| 94 | + | panic(err) | |||
| 95 | + | } | |||
| 96 | + | libs = append(libs, lib) | |||
| 97 | + | } | |||
| 98 | + | ||||
| 99 | + | core.PuregoSafeRegister(&xPixbufErrorQuark, libs, "gdk_pixbuf_error_quark") | |||
| 100 | + | ||||
| 101 | + | core.PuregoSafeRegister(&xPixbufNonAnimGLibType, libs, "gdk_pixbuf_non_anim_get_type") | |||
| 102 | + | ||||
| 103 | + | core.PuregoSafeRegister(&xNewPixbufNonAnim, libs, "gdk_pixbuf_non_anim_new") | |||
| 104 | + | ||||
| 105 | + | core.PuregoSafeRegister(&xPixbufSimpleAnimIterGLibType, libs, "gdk_pixbuf_simple_anim_iter_get_type") | |||
| 94 | } | 106 | } | ||