Merge pull request #344 from bnema/chore/upstream-foundations
chore(deps): integrate approved upstream foundations
921 files · +28709 -25527
M docs/first-presentation.md +5 -2
| @@ -46,5 +46,8 @@ labels. Set `DUMBER_MACHINE_GPU_PROFILE` to one of `generic-gpu`, | |||
| 46 | 46 | `integrated-gpu`, `discrete-gpu`, `hybrid-gpu`, `virtual-gpu`, or `unknown-gpu`; | |
| 47 | 47 | do not use a device model or other identifier. Publish only the seven reviewed | |
| 48 | 48 | JSON files to an external Gist. Raw logs and temporary XDG homes are removed and | |
| 49 | - | must not be published. A missing or incomplete timeline, non-DMABUF backend, or | |
| 50 | - | invalid run fails collection. | |
| 49 | + | must not be published. `metadata.json` derives the selected | |
| 50 | + | `github.com/bnema/purego-cef2gtk` pseudo-version and its full immutable Git | |
| 51 | + | origin hash from Go module metadata; branch selectors or missing origin metadata | |
| 52 | + | fail collection. A missing or incomplete timeline, non-DMABUF backend, or invalid | |
| 53 | + | run also fails collection. | |
| @@ -46,5 +46,8 @@ labels. Set `DUMBER_MACHINE_GPU_PROFILE` to one of `generic-gpu`, | |||||
| 46 | `integrated-gpu`, `discrete-gpu`, `hybrid-gpu`, `virtual-gpu`, or `unknown-gpu`; | 46 | `integrated-gpu`, `discrete-gpu`, `hybrid-gpu`, `virtual-gpu`, or `unknown-gpu`; | ||
| 47 | do not use a device model or other identifier. Publish only the seven reviewed | 47 | do not use a device model or other identifier. Publish only the seven reviewed | ||
| 48 | JSON files to an external Gist. Raw logs and temporary XDG homes are removed and | 48 | JSON files to an external Gist. Raw logs and temporary XDG homes are removed and | ||
| 49 | - | must not be published. A missing or incomplete timeline, non-DMABUF backend, or | 49 | + | must not be published. `metadata.json` derives the selected |
| 50 | - | invalid run fails collection. | 50 | + | `github.com/bnema/purego-cef2gtk` pseudo-version and its full immutable Git |
| 51 | + | origin hash from Go module metadata; branch selectors or missing origin metadata | |||
| 52 | + | fail collection. A missing or incomplete timeline, non-DMABUF backend, or invalid | |||
| 53 | + | run also fails collection. | |||
M go.mod +5 -5
| @@ -6,11 +6,11 @@ require ( | |||
| 6 | 6 | github.com/a-h/templ v0.3.1020 | |
| 7 | 7 | github.com/andybalholm/brotli v1.2.2 | |
| 8 | 8 | github.com/bnema/purego v0.11.0-bnema.4 | |
| 9 | - | github.com/bnema/purego-cef v0.13.3 | |
| 10 | - | github.com/bnema/purego-cef2gtk v0.8.4 | |
| 11 | - | github.com/bnema/purego-pipewire v0.1.4 | |
| 12 | - | github.com/bnema/purego-sqlite v0.1.3 | |
| 13 | - | github.com/bnema/puregotk v0.7.0 | |
| 9 | + | github.com/bnema/purego-cef v0.13.4-0.20260714140305-f0b7414af67e | |
| 10 | + | github.com/bnema/purego-cef2gtk v0.8.4-0.20260714160309-bbd397409ebe | |
| 11 | + | github.com/bnema/purego-pipewire v0.1.5-0.20260714124450-6504b9cdf02a | |
| 12 | + | github.com/bnema/purego-sqlite v0.1.4-0.20260714131321-3614fe683b9c | |
| 13 | + | github.com/bnema/puregotk v0.7.1-0.20260714170452-0b6b9b901234 | |
| 14 | 14 | github.com/charmbracelet/bubbles v1.0.0 | |
| 15 | 15 | github.com/charmbracelet/bubbletea v1.3.10 | |
| 16 | 16 | github.com/charmbracelet/lipgloss v1.1.0 | |
| @@ -6,11 +6,11 @@ require ( | |||||
| 6 | github.com/a-h/templ v0.3.1020 | 6 | github.com/a-h/templ v0.3.1020 | ||
| 7 | github.com/andybalholm/brotli v1.2.2 | 7 | github.com/andybalholm/brotli v1.2.2 | ||
| 8 | github.com/bnema/purego v0.11.0-bnema.4 | 8 | github.com/bnema/purego v0.11.0-bnema.4 | ||
| 9 | - | github.com/bnema/purego-cef v0.13.3 | 9 | + | github.com/bnema/purego-cef v0.13.4-0.20260714140305-f0b7414af67e |
| 10 | - | github.com/bnema/purego-cef2gtk v0.8.4 | 10 | + | github.com/bnema/purego-cef2gtk v0.8.4-0.20260714160309-bbd397409ebe |
| 11 | - | github.com/bnema/purego-pipewire v0.1.4 | 11 | + | github.com/bnema/purego-pipewire v0.1.5-0.20260714124450-6504b9cdf02a |
| 12 | - | github.com/bnema/purego-sqlite v0.1.3 | 12 | + | github.com/bnema/purego-sqlite v0.1.4-0.20260714131321-3614fe683b9c |
| 13 | - | github.com/bnema/puregotk v0.7.0 | 13 | + | github.com/bnema/puregotk v0.7.1-0.20260714170452-0b6b9b901234 |
| 14 | github.com/charmbracelet/bubbles v1.0.0 | 14 | github.com/charmbracelet/bubbles v1.0.0 | ||
| 15 | github.com/charmbracelet/bubbletea v1.3.10 | 15 | github.com/charmbracelet/bubbletea v1.3.10 | ||
| 16 | github.com/charmbracelet/lipgloss v1.1.0 | 16 | github.com/charmbracelet/lipgloss v1.1.0 | ||
M go.sum +12 -0 generated file: collapsed
A internal/infrastructure/persistence/sqlite/history_repo_benchmark_test.go +71 -0
| @@ -0,0 +1,71 @@ | |||
| 1 | + | package sqlite_test | |
| 2 | + | ||
| 3 | + | import ( | |
| 4 | + | "fmt" | |
| 5 | + | "path/filepath" | |
| 6 | + | "testing" | |
| 7 | + | ||
| 8 | + | "github.com/bnema/dumber/internal/domain/entity" | |
| 9 | + | "github.com/bnema/dumber/internal/domain/repository" | |
| 10 | + | "github.com/bnema/dumber/internal/infrastructure/persistence/sqlite" | |
| 11 | + | ) | |
| 12 | + | ||
| 13 | + | // newHistoryBenchmarkRepository creates a representative local history corpus | |
| 14 | + | // outside the measured operation. Sidebar reads use GetRecent and omnibox | |
| 15 | + | // history suggestions use Search. | |
| 16 | + | func newHistoryBenchmarkRepository(b *testing.B) (repository.HistoryRepository, func()) { | |
| 17 | + | b.Helper() | |
| 18 | + | ||
| 19 | + | ctx := historyTestCtx() | |
| 20 | + | db, err := sqlite.NewConnection(ctx, filepath.Join(b.TempDir(), "dumber.db")) | |
| 21 | + | if err != nil { | |
| 22 | + | b.Fatal(err) | |
| 23 | + | } | |
| 24 | + | ||
| 25 | + | b.Cleanup(func() { | |
| 26 | + | if err := db.Close(); err != nil { | |
| 27 | + | b.Errorf("close benchmark database: %v", err) | |
| 28 | + | } | |
| 29 | + | }) | |
| 30 | + | ||
| 31 | + | repo := sqlite.NewHistoryRepository(db) | |
| 32 | + | for i := range 200 { | |
| 33 | + | entry := &entity.HistoryEntry{ | |
| 34 | + | URL: fmt.Sprintf("https://example%d.test/dumber/history/%d", i%20, i), | |
| 35 | + | Title: fmt.Sprintf("Dumber history entry %d", i), | |
| 36 | + | } | |
| 37 | + | if err := repo.Save(ctx, entry); err != nil { | |
| 38 | + | b.Fatal(err) | |
| 39 | + | } | |
| 40 | + | } | |
| 41 | + | ||
| 42 | + | return repo, func() {} | |
| 43 | + | } | |
| 44 | + | ||
| 45 | + | func BenchmarkHistorySQLiteSidebarRecent(b *testing.B) { | |
| 46 | + | repo, closeDB := newHistoryBenchmarkRepository(b) | |
| 47 | + | defer closeDB() | |
| 48 | + | ctx := historyTestCtx() | |
| 49 | + | ||
| 50 | + | b.ReportAllocs() | |
| 51 | + | b.ResetTimer() | |
| 52 | + | for range b.N { | |
| 53 | + | if _, err := repo.GetRecent(ctx, 50, 0); err != nil { | |
| 54 | + | b.Fatal(err) | |
| 55 | + | } | |
| 56 | + | } | |
| 57 | + | } | |
| 58 | + | ||
| 59 | + | func BenchmarkHistorySQLiteOmniboxSearch(b *testing.B) { | |
| 60 | + | repo, closeDB := newHistoryBenchmarkRepository(b) | |
| 61 | + | defer closeDB() | |
| 62 | + | ctx := historyTestCtx() | |
| 63 | + | ||
| 64 | + | b.ReportAllocs() | |
| 65 | + | b.ResetTimer() | |
| 66 | + | for range b.N { | |
| 67 | + | if _, err := repo.Search(ctx, "dumber history", 10); err != nil { | |
| 68 | + | b.Fatal(err) | |
| 69 | + | } | |
| 70 | + | } | |
| 71 | + | } | |
| @@ -0,0 +1,71 @@ | |||||
| 1 | + | package sqlite_test | |||
| 2 | + | ||||
| 3 | + | import ( | |||
| 4 | + | "fmt" | |||
| 5 | + | "path/filepath" | |||
| 6 | + | "testing" | |||
| 7 | + | ||||
| 8 | + | "github.com/bnema/dumber/internal/domain/entity" | |||
| 9 | + | "github.com/bnema/dumber/internal/domain/repository" | |||
| 10 | + | "github.com/bnema/dumber/internal/infrastructure/persistence/sqlite" | |||
| 11 | + | ) | |||
| 12 | + | ||||
| 13 | + | // newHistoryBenchmarkRepository creates a representative local history corpus | |||
| 14 | + | // outside the measured operation. Sidebar reads use GetRecent and omnibox | |||
| 15 | + | // history suggestions use Search. | |||
| 16 | + | func newHistoryBenchmarkRepository(b *testing.B) (repository.HistoryRepository, func()) { | |||
| 17 | + | b.Helper() | |||
| 18 | + | ||||
| 19 | + | ctx := historyTestCtx() | |||
| 20 | + | db, err := sqlite.NewConnection(ctx, filepath.Join(b.TempDir(), "dumber.db")) | |||
| 21 | + | if err != nil { | |||
| 22 | + | b.Fatal(err) | |||
| 23 | + | } | |||
| 24 | + | ||||
| 25 | + | b.Cleanup(func() { | |||
| 26 | + | if err := db.Close(); err != nil { | |||
| 27 | + | b.Errorf("close benchmark database: %v", err) | |||
| 28 | + | } | |||
| 29 | + | }) | |||
| 30 | + | ||||
| 31 | + | repo := sqlite.NewHistoryRepository(db) | |||
| 32 | + | for i := range 200 { | |||
| 33 | + | entry := &entity.HistoryEntry{ | |||
| 34 | + | URL: fmt.Sprintf("https://example%d.test/dumber/history/%d", i%20, i), | |||
| 35 | + | Title: fmt.Sprintf("Dumber history entry %d", i), | |||
| 36 | + | } | |||
| 37 | + | if err := repo.Save(ctx, entry); err != nil { | |||
| 38 | + | b.Fatal(err) | |||
| 39 | + | } | |||
| 40 | + | } | |||
| 41 | + | ||||
| 42 | + | return repo, func() {} | |||
| 43 | + | } | |||
| 44 | + | ||||
| 45 | + | func BenchmarkHistorySQLiteSidebarRecent(b *testing.B) { | |||
| 46 | + | repo, closeDB := newHistoryBenchmarkRepository(b) | |||
| 47 | + | defer closeDB() | |||
| 48 | + | ctx := historyTestCtx() | |||
| 49 | + | ||||
| 50 | + | b.ReportAllocs() | |||
| 51 | + | b.ResetTimer() | |||
| 52 | + | for range b.N { | |||
| 53 | + | if _, err := repo.GetRecent(ctx, 50, 0); err != nil { | |||
| 54 | + | b.Fatal(err) | |||
| 55 | + | } | |||
| 56 | + | } | |||
| 57 | + | } | |||
| 58 | + | ||||
| 59 | + | func BenchmarkHistorySQLiteOmniboxSearch(b *testing.B) { | |||
| 60 | + | repo, closeDB := newHistoryBenchmarkRepository(b) | |||
| 61 | + | defer closeDB() | |||
| 62 | + | ctx := historyTestCtx() | |||
| 63 | + | ||||
| 64 | + | b.ReportAllocs() | |||
| 65 | + | b.ResetTimer() | |||
| 66 | + | for range b.N { | |||
| 67 | + | if _, err := repo.Search(ctx, "dumber history", 10); err != nil { | |||
| 68 | + | b.Fatal(err) | |||
| 69 | + | } | |||
| 70 | + | } | |||
| 71 | + | } | |||
M internal/logging/first_presentation_collector_test.go +132 -1
| @@ -2,6 +2,7 @@ package logging | |||
| 2 | 2 | ||
| 3 | 3 | import ( | |
| 4 | 4 | "encoding/json" | |
| 5 | + | "fmt" | |
| 5 | 6 | "os" | |
| 6 | 7 | "os/exec" | |
| 7 | 8 | "path/filepath" | |
| @@ -143,8 +144,9 @@ func TestFirstPresentationCollectorSanitizesMachineLocalValues(t *testing.T) { | |||
| 143 | 144 | } | |
| 144 | 145 | for _, required := range []string{ | |
| 145 | 146 | `"measured_source_revision"`, | |
| 147 | + | `"version": "v0.8.4-0.20260714160309-bbd397409ebe"`, | |
| 146 | 148 | `"tag": "v0.8.4"`, | |
| 147 | - | `"revision": "f217ece342dea3ef2a3f98671fcd16a39ad0037d"`, | |
| 149 | + | `"revision": "bbd397409ebed75a5979c1e4566a2ef319f6a484"`, | |
| 148 | 150 | } { | |
| 149 | 151 | require.Contains(t, artifacts.String(), required) | |
| 150 | 152 | } | |
| @@ -166,6 +168,135 @@ func TestFirstPresentationCollectorSanitizesMachineLocalValues(t *testing.T) { | |||
| 166 | 168 | require.Equal(t, "integrated-gpu", metadata.Comparison.MachineGPUProfile) | |
| 167 | 169 | } | |
| 168 | 170 | ||
| 171 | + | func TestFirstPresentationCollectorDerivesSelectedImmutableModuleProvenance(t *testing.T) { | |
| 172 | + | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | |
| 173 | + | require.NoError(t, err) | |
| 174 | + | temp := t.TempDir() | |
| 175 | + | runtime := filepath.Join(temp, "cef-147-runtime") | |
| 176 | + | require.NoError(t, os.Mkdir(runtime, 0o755)) | |
| 177 | + | binary := filepath.Join(temp, "dumber") | |
| 178 | + | require.NoError(t, os.WriteFile(binary, collectorTestBinary(validFirstPresentationLog), 0o755)) | |
| 179 | + | ||
| 180 | + | // This exact pseudo-version is deliberately newer than the former v0.8.4 | |
| 181 | + | // hardcode; the collector must report what the selected module says. | |
| 182 | + | const version = "v0.8.5-0.20300102030405-bbd397409ebe" | |
| 183 | + | const revision = "bbd397409ebed75a5979c1e4566a2ef319f6a484" | |
| 184 | + | goBin := collectorProvenanceGo(t, temp, version, revision, "") | |
| 185 | + | output := filepath.Join(temp, "artifacts") | |
| 186 | + | cmd := exec.Command(filepath.Join(repoRoot, "scripts", "collect_first_presentation.sh")) | |
| 187 | + | cmd.Dir = repoRoot | |
| 188 | + | cmd.Env = append(os.Environ(), | |
| 189 | + | "DISPLAY=:test", | |
| 190 | + | "DUMBER_CEF_DIR="+runtime, | |
| 191 | + | "DUMBER_FIRST_PRESENTATION_BIN="+binary, | |
| 192 | + | "DUMBER_FIRST_PRESENTATION_OUTPUT="+output, | |
| 193 | + | "DUMBER_FIRST_PRESENTATION_TIMEOUT_SECONDS=1", | |
| 194 | + | "PATH="+filepath.Dir(goBin)+":"+os.Getenv("PATH"), | |
| 195 | + | ) | |
| 196 | + | result, err := cmd.CombinedOutput() | |
| 197 | + | require.NoErrorf(t, err, "collector failed: %s", result) | |
| 198 | + | ||
| 199 | + | var metadata struct { | |
| 200 | + | Upstream struct { | |
| 201 | + | Module string `json:"module"` | |
| 202 | + | Version string `json:"version"` | |
| 203 | + | Tag string `json:"tag"` | |
| 204 | + | Revision string `json:"revision"` | |
| 205 | + | } `json:"upstream"` | |
| 206 | + | } | |
| 207 | + | contents, err := os.ReadFile(filepath.Join(output, "metadata.json")) | |
| 208 | + | require.NoError(t, err) | |
| 209 | + | require.NoError(t, json.Unmarshal(contents, &metadata)) | |
| 210 | + | require.Equal(t, "github.com/bnema/purego-cef2gtk", metadata.Upstream.Module) | |
| 211 | + | require.Equal(t, version, metadata.Upstream.Version) | |
| 212 | + | require.Equal(t, "v0.8.5", metadata.Upstream.Tag) | |
| 213 | + | require.Equal(t, revision, metadata.Upstream.Revision) | |
| 214 | + | ||
| 215 | + | script, err := os.ReadFile(filepath.Join(repoRoot, "scripts", "collect_first_presentation.sh")) | |
| 216 | + | require.NoError(t, err) | |
| 217 | + | require.NotContains(t, string(script), "f217ece342dea3ef2a3f98671fcd16a39ad0037d") | |
| 218 | + | } | |
| 219 | + | ||
| 220 | + | func TestFirstPresentationCollectorRejectsNonImmutableModuleProvenanceWithoutLeaks(t *testing.T) { | |
| 221 | + | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | |
| 222 | + | require.NoError(t, err) | |
| 223 | + | ||
| 224 | + | for _, test := range []struct { | |
| 225 | + | name, version, revision, ref string | |
| 226 | + | }{ | |
| 227 | + | {name: "branch selector", version: "main", ref: "main"}, | |
| 228 | + | {name: "missing origin", version: "v0.8.5-0.20300102030405-bbd397409ebe"}, | |
| 229 | + | {name: "named origin ref", version: "v0.8.5-0.20300102030405-bbd397409ebe", revision: "bbd397409ebed75a5979c1e4566a2ef319f6a484", ref: "main"}, | |
| 230 | + | } { | |
| 231 | + | t.Run(test.name, func(t *testing.T) { | |
| 232 | + | temp := t.TempDir() | |
| 233 | + | runtime := filepath.Join(temp, "cef-147-runtime") | |
| 234 | + | require.NoError(t, os.Mkdir(runtime, 0o755)) | |
| 235 | + | binary := filepath.Join(temp, "dumber") | |
| 236 | + | require.NoError(t, os.WriteFile(binary, collectorTestBinary(validFirstPresentationLog), 0o755)) | |
| 237 | + | ||
| 238 | + | goBin := collectorProvenanceGo(t, temp, test.version, test.revision, test.ref) | |
| 239 | + | output := filepath.Join(temp, "artifacts") | |
| 240 | + | cmd := exec.Command(filepath.Join(repoRoot, "scripts", "collect_first_presentation.sh")) | |
| 241 | + | cmd.Dir = repoRoot | |
| 242 | + | cmd.Env = append(os.Environ(), | |
| 243 | + | "DISPLAY=:test", | |
| 244 | + | "DUMBER_CEF_DIR="+runtime, | |
| 245 | + | "DUMBER_FIRST_PRESENTATION_BIN="+binary, | |
| 246 | + | "DUMBER_FIRST_PRESENTATION_OUTPUT="+output, | |
| 247 | + | "PATH="+filepath.Dir(goBin)+":"+os.Getenv("PATH"), | |
| 248 | + | ) | |
| 249 | + | result, runErr := cmd.CombinedOutput() | |
| 250 | + | require.Errorf(t, runErr, "collector accepted nonimmutable module provenance: %s", result) | |
| 251 | + | require.Contains(t, string(result), "immutable module provenance is unavailable") | |
| 252 | + | require.NotContains(t, string(result), temp) | |
| 253 | + | require.NoFileExists(t, filepath.Join(output, "metadata.json")) | |
| 254 | + | for _, name := range runArtifactNames() { | |
| 255 | + | require.NoFileExists(t, filepath.Join(output, name)) | |
| 256 | + | } | |
| 257 | + | }) | |
| 258 | + | } | |
| 259 | + | } | |
| 260 | + | ||
| 261 | + | func collectorProvenanceGo(t *testing.T, temp, version, revision, ref string) string { | |
| 262 | + | t.Helper() | |
| 263 | + | infoPath := filepath.Join(temp, "module.info") | |
| 264 | + | info := map[string]any{"Version": version} | |
| 265 | + | if revision != "" { | |
| 266 | + | info["Origin"] = map[string]string{ | |
| 267 | + | "VCS": "git", "URL": "https://github.com/bnema/purego-cef2gtk", "Hash": revision, "Ref": ref, | |
| 268 | + | } | |
| 269 | + | } | |
| 270 | + | infoJSON, err := json.Marshal(info) | |
| 271 | + | require.NoError(t, err) | |
| 272 | + | require.NoError(t, os.WriteFile(infoPath, infoJSON, 0o600)) | |
| 273 | + | ||
| 274 | + | selectedJSON, err := json.Marshal(map[string]string{ | |
| 275 | + | "Path": "github.com/bnema/purego-cef2gtk", "Version": version, | |
| 276 | + | }) | |
| 277 | + | require.NoError(t, err) | |
| 278 | + | downloadedJSON, err := json.Marshal(map[string]string{ | |
| 279 | + | "Path": "github.com/bnema/purego-cef2gtk", "Version": version, "Info": infoPath, | |
| 280 | + | }) | |
| 281 | + | require.NoError(t, err) | |
| 282 | + | binDir := filepath.Join(temp, "bin") | |
| 283 | + | require.NoError(t, os.Mkdir(binDir, 0o755)) | |
| 284 | + | goBin := filepath.Join(binDir, "go") | |
| 285 | + | script := fmt.Sprintf(`#!/bin/sh | |
| 286 | + | if [ "$1" = "list" ] && [ "$2" = "-m" ] && [ "$3" = "-json" ] && [ "$4" = "github.com/bnema/purego-cef2gtk" ]; then | |
| 287 | + | printf '%%s\n' '%s' | |
| 288 | + | exit 0 | |
| 289 | + | fi | |
| 290 | + | if [ "$1" = "mod" ] && [ "$2" = "download" ] && [ "$3" = "-json" ] && [ "$4" = "github.com/bnema/purego-cef2gtk@%s" ]; then | |
| 291 | + | printf '%%s\n' '%s' | |
| 292 | + | exit 0 | |
| 293 | + | fi | |
| 294 | + | exit 1 | |
| 295 | + | `, selectedJSON, version, downloadedJSON) | |
| 296 | + | require.NoError(t, os.WriteFile(goBin, []byte(script), 0o755)) | |
| 297 | + | return goBin | |
| 298 | + | } | |
| 299 | + | ||
| 169 | 300 | func TestFirstPresentationCollectorDefaultsToXDGStateEvidenceDirectory(t *testing.T) { | |
| 170 | 301 | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | |
| 171 | 302 | require.NoError(t, err) | |
| @@ -2,6 +2,7 @@ package logging | |||||
| 2 | 2 | ||||
| 3 | import ( | 3 | import ( | ||
| 4 | "encoding/json" | 4 | "encoding/json" | ||
| 5 | + | "fmt" | |||
| 5 | "os" | 6 | "os" | ||
| 6 | "os/exec" | 7 | "os/exec" | ||
| 7 | "path/filepath" | 8 | "path/filepath" | ||
| @@ -143,8 +144,9 @@ func TestFirstPresentationCollectorSanitizesMachineLocalValues(t *testing.T) { | |||||
| 143 | } | 144 | } | ||
| 144 | for _, required := range []string{ | 145 | for _, required := range []string{ | ||
| 145 | `"measured_source_revision"`, | 146 | `"measured_source_revision"`, | ||
| 147 | + | `"version": "v0.8.4-0.20260714160309-bbd397409ebe"`, | |||
| 146 | `"tag": "v0.8.4"`, | 148 | `"tag": "v0.8.4"`, | ||
| 147 | - | `"revision": "f217ece342dea3ef2a3f98671fcd16a39ad0037d"`, | 149 | + | `"revision": "bbd397409ebed75a5979c1e4566a2ef319f6a484"`, |
| 148 | } { | 150 | } { | ||
| 149 | require.Contains(t, artifacts.String(), required) | 151 | require.Contains(t, artifacts.String(), required) | ||
| 150 | } | 152 | } | ||
| @@ -166,6 +168,135 @@ func TestFirstPresentationCollectorSanitizesMachineLocalValues(t *testing.T) { | |||||
| 166 | require.Equal(t, "integrated-gpu", metadata.Comparison.MachineGPUProfile) | 168 | require.Equal(t, "integrated-gpu", metadata.Comparison.MachineGPUProfile) | ||
| 167 | } | 169 | } | ||
| 168 | 170 | ||||
| 171 | + | func TestFirstPresentationCollectorDerivesSelectedImmutableModuleProvenance(t *testing.T) { | |||
| 172 | + | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | |||
| 173 | + | require.NoError(t, err) | |||
| 174 | + | temp := t.TempDir() | |||
| 175 | + | runtime := filepath.Join(temp, "cef-147-runtime") | |||
| 176 | + | require.NoError(t, os.Mkdir(runtime, 0o755)) | |||
| 177 | + | binary := filepath.Join(temp, "dumber") | |||
| 178 | + | require.NoError(t, os.WriteFile(binary, collectorTestBinary(validFirstPresentationLog), 0o755)) | |||
| 179 | + | ||||
| 180 | + | // This exact pseudo-version is deliberately newer than the former v0.8.4 | |||
| 181 | + | // hardcode; the collector must report what the selected module says. | |||
| 182 | + | const version = "v0.8.5-0.20300102030405-bbd397409ebe" | |||
| 183 | + | const revision = "bbd397409ebed75a5979c1e4566a2ef319f6a484" | |||
| 184 | + | goBin := collectorProvenanceGo(t, temp, version, revision, "") | |||
| 185 | + | output := filepath.Join(temp, "artifacts") | |||
| 186 | + | cmd := exec.Command(filepath.Join(repoRoot, "scripts", "collect_first_presentation.sh")) | |||
| 187 | + | cmd.Dir = repoRoot | |||
| 188 | + | cmd.Env = append(os.Environ(), | |||
| 189 | + | "DISPLAY=:test", | |||
| 190 | + | "DUMBER_CEF_DIR="+runtime, | |||
| 191 | + | "DUMBER_FIRST_PRESENTATION_BIN="+binary, | |||
| 192 | + | "DUMBER_FIRST_PRESENTATION_OUTPUT="+output, | |||
| 193 | + | "DUMBER_FIRST_PRESENTATION_TIMEOUT_SECONDS=1", | |||
| 194 | + | "PATH="+filepath.Dir(goBin)+":"+os.Getenv("PATH"), | |||
| 195 | + | ) | |||
| 196 | + | result, err := cmd.CombinedOutput() | |||
| 197 | + | require.NoErrorf(t, err, "collector failed: %s", result) | |||
| 198 | + | ||||
| 199 | + | var metadata struct { | |||
| 200 | + | Upstream struct { | |||
| 201 | + | Module string `json:"module"` | |||
| 202 | + | Version string `json:"version"` | |||
| 203 | + | Tag string `json:"tag"` | |||
| 204 | + | Revision string `json:"revision"` | |||
| 205 | + | } `json:"upstream"` | |||
| 206 | + | } | |||
| 207 | + | contents, err := os.ReadFile(filepath.Join(output, "metadata.json")) | |||
| 208 | + | require.NoError(t, err) | |||
| 209 | + | require.NoError(t, json.Unmarshal(contents, &metadata)) | |||
| 210 | + | require.Equal(t, "github.com/bnema/purego-cef2gtk", metadata.Upstream.Module) | |||
| 211 | + | require.Equal(t, version, metadata.Upstream.Version) | |||
| 212 | + | require.Equal(t, "v0.8.5", metadata.Upstream.Tag) | |||
| 213 | + | require.Equal(t, revision, metadata.Upstream.Revision) | |||
| 214 | + | ||||
| 215 | + | script, err := os.ReadFile(filepath.Join(repoRoot, "scripts", "collect_first_presentation.sh")) | |||
| 216 | + | require.NoError(t, err) | |||
| 217 | + | require.NotContains(t, string(script), "f217ece342dea3ef2a3f98671fcd16a39ad0037d") | |||
| 218 | + | } | |||
| 219 | + | ||||
| 220 | + | func TestFirstPresentationCollectorRejectsNonImmutableModuleProvenanceWithoutLeaks(t *testing.T) { | |||
| 221 | + | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | |||
| 222 | + | require.NoError(t, err) | |||
| 223 | + | ||||
| 224 | + | for _, test := range []struct { | |||
| 225 | + | name, version, revision, ref string | |||
| 226 | + | }{ | |||
| 227 | + | {name: "branch selector", version: "main", ref: "main"}, | |||
| 228 | + | {name: "missing origin", version: "v0.8.5-0.20300102030405-bbd397409ebe"}, | |||
| 229 | + | {name: "named origin ref", version: "v0.8.5-0.20300102030405-bbd397409ebe", revision: "bbd397409ebed75a5979c1e4566a2ef319f6a484", ref: "main"}, | |||
| 230 | + | } { | |||
| 231 | + | t.Run(test.name, func(t *testing.T) { | |||
| 232 | + | temp := t.TempDir() | |||
| 233 | + | runtime := filepath.Join(temp, "cef-147-runtime") | |||
| 234 | + | require.NoError(t, os.Mkdir(runtime, 0o755)) | |||
| 235 | + | binary := filepath.Join(temp, "dumber") | |||
| 236 | + | require.NoError(t, os.WriteFile(binary, collectorTestBinary(validFirstPresentationLog), 0o755)) | |||
| 237 | + | ||||
| 238 | + | goBin := collectorProvenanceGo(t, temp, test.version, test.revision, test.ref) | |||
| 239 | + | output := filepath.Join(temp, "artifacts") | |||
| 240 | + | cmd := exec.Command(filepath.Join(repoRoot, "scripts", "collect_first_presentation.sh")) | |||
| 241 | + | cmd.Dir = repoRoot | |||
| 242 | + | cmd.Env = append(os.Environ(), | |||
| 243 | + | "DISPLAY=:test", | |||
| 244 | + | "DUMBER_CEF_DIR="+runtime, | |||
| 245 | + | "DUMBER_FIRST_PRESENTATION_BIN="+binary, | |||
| 246 | + | "DUMBER_FIRST_PRESENTATION_OUTPUT="+output, | |||
| 247 | + | "PATH="+filepath.Dir(goBin)+":"+os.Getenv("PATH"), | |||
| 248 | + | ) | |||
| 249 | + | result, runErr := cmd.CombinedOutput() | |||
| 250 | + | require.Errorf(t, runErr, "collector accepted nonimmutable module provenance: %s", result) | |||
| 251 | + | require.Contains(t, string(result), "immutable module provenance is unavailable") | |||
| 252 | + | require.NotContains(t, string(result), temp) | |||
| 253 | + | require.NoFileExists(t, filepath.Join(output, "metadata.json")) | |||
| 254 | + | for _, name := range runArtifactNames() { | |||
| 255 | + | require.NoFileExists(t, filepath.Join(output, name)) | |||
| 256 | + | } | |||
| 257 | + | }) | |||
| 258 | + | } | |||
| 259 | + | } | |||
| 260 | + | ||||
| 261 | + | func collectorProvenanceGo(t *testing.T, temp, version, revision, ref string) string { | |||
| 262 | + | t.Helper() | |||
| 263 | + | infoPath := filepath.Join(temp, "module.info") | |||
| 264 | + | info := map[string]any{"Version": version} | |||
| 265 | + | if revision != "" { | |||
| 266 | + | info["Origin"] = map[string]string{ | |||
| 267 | + | "VCS": "git", "URL": "https://github.com/bnema/purego-cef2gtk", "Hash": revision, "Ref": ref, | |||
| 268 | + | } | |||
| 269 | + | } | |||
| 270 | + | infoJSON, err := json.Marshal(info) | |||
| 271 | + | require.NoError(t, err) | |||
| 272 | + | require.NoError(t, os.WriteFile(infoPath, infoJSON, 0o600)) | |||
| 273 | + | ||||
| 274 | + | selectedJSON, err := json.Marshal(map[string]string{ | |||
| 275 | + | "Path": "github.com/bnema/purego-cef2gtk", "Version": version, | |||
| 276 | + | }) | |||
| 277 | + | require.NoError(t, err) | |||
| 278 | + | downloadedJSON, err := json.Marshal(map[string]string{ | |||
| 279 | + | "Path": "github.com/bnema/purego-cef2gtk", "Version": version, "Info": infoPath, | |||
| 280 | + | }) | |||
| 281 | + | require.NoError(t, err) | |||
| 282 | + | binDir := filepath.Join(temp, "bin") | |||
| 283 | + | require.NoError(t, os.Mkdir(binDir, 0o755)) | |||
| 284 | + | goBin := filepath.Join(binDir, "go") | |||
| 285 | + | script := fmt.Sprintf(`#!/bin/sh | |||
| 286 | + | if [ "$1" = "list" ] && [ "$2" = "-m" ] && [ "$3" = "-json" ] && [ "$4" = "github.com/bnema/purego-cef2gtk" ]; then | |||
| 287 | + | printf '%%s\n' '%s' | |||
| 288 | + | exit 0 | |||
| 289 | + | fi | |||
| 290 | + | if [ "$1" = "mod" ] && [ "$2" = "download" ] && [ "$3" = "-json" ] && [ "$4" = "github.com/bnema/purego-cef2gtk@%s" ]; then | |||
| 291 | + | printf '%%s\n' '%s' | |||
| 292 | + | exit 0 | |||
| 293 | + | fi | |||
| 294 | + | exit 1 | |||
| 295 | + | `, selectedJSON, version, downloadedJSON) | |||
| 296 | + | require.NoError(t, os.WriteFile(goBin, []byte(script), 0o755)) | |||
| 297 | + | return goBin | |||
| 298 | + | } | |||
| 299 | + | ||||
| 169 | func TestFirstPresentationCollectorDefaultsToXDGStateEvidenceDirectory(t *testing.T) { | 300 | func TestFirstPresentationCollectorDefaultsToXDGStateEvidenceDirectory(t *testing.T) { | ||
| 170 | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | 301 | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | ||
| 171 | require.NoError(t, err) | 302 | require.NoError(t, err) | ||
M scripts/collect_first_presentation.sh +78 -9
| @@ -31,8 +31,78 @@ else | |||
| 31 | 31 | fi | |
| 32 | 32 | readonly output | |
| 33 | 33 | readonly upstream_module="github.com/bnema/purego-cef2gtk" | |
| 34 | - | readonly upstream_tag="v0.8.4" | |
| 35 | - | readonly upstream_revision="f217ece342dea3ef2a3f98671fcd16a39ad0037d" | |
| 34 | + | ||
| 35 | + | # Resolve the version selected by this checkout, then obtain its immutable VCS | |
| 36 | + | # origin from Go's cached module metadata. Do not infer a revision from a tag, | |
| 37 | + | # a branch, or a truncated pseudo-version suffix. | |
| 38 | + | resolve_upstream_provenance() { | |
| 39 | + | local selected_metadata selected_version downloaded_metadata | |
| 40 | + | ||
| 41 | + | selected_metadata="$(go list -m -json "$upstream_module" 2>/dev/null)" || { | |
| 42 | + | echo "first-presentation: immutable module provenance is unavailable" >&2 | |
| 43 | + | exit 2 | |
| 44 | + | } | |
| 45 | + | selected_version="$(python3 - "$upstream_module" "$selected_metadata" <<'PY' | |
| 46 | + | import json, sys | |
| 47 | + | try: | |
| 48 | + | metadata = json.loads(sys.argv[2]) | |
| 49 | + | if metadata.get("Path") != sys.argv[1] or not isinstance(metadata.get("Version"), str): | |
| 50 | + | raise ValueError | |
| 51 | + | print(metadata["Version"]) | |
| 52 | + | except (AttributeError, TypeError, ValueError, json.JSONDecodeError): | |
| 53 | + | raise SystemExit("first-presentation: immutable module provenance is unavailable") | |
| 54 | + | PY | |
| 55 | + | )" || exit $? | |
| 56 | + | downloaded_metadata="$(go mod download -json "$upstream_module@$selected_version" 2>/dev/null)" || { | |
| 57 | + | echo "first-presentation: immutable module provenance is unavailable" >&2 | |
| 58 | + | exit 2 | |
| 59 | + | } | |
| 60 | + | ||
| 61 | + | python3 - "$upstream_module" "$selected_metadata" "$downloaded_metadata" <<'PY' | |
| 62 | + | import json, re, sys | |
| 63 | + | ||
| 64 | + | module, selected_raw, downloaded_raw = sys.argv[1:] | |
| 65 | + | ||
| 66 | + | def fail(): | |
| 67 | + | # Do not expose Go cache locations or other machine-local values. | |
| 68 | + | raise SystemExit("first-presentation: immutable module provenance is unavailable") | |
| 69 | + | ||
| 70 | + | try: | |
| 71 | + | selected = json.loads(selected_raw) | |
| 72 | + | downloaded = json.loads(downloaded_raw) | |
| 73 | + | version = selected["Version"] | |
| 74 | + | if selected.get("Path") != module or downloaded.get("Path") != module: | |
| 75 | + | fail() | |
| 76 | + | if downloaded.get("Version") != version: | |
| 77 | + | fail() | |
| 78 | + | # A selected pseudo-version is an exact immutable selector, never a branch. | |
| 79 | + | match = re.fullmatch(r"(v\d+\.\d+\.\d+)-0\.\d{14}-([0-9a-f]{12})", version) | |
| 80 | + | if not match: | |
| 81 | + | fail() | |
| 82 | + | info_path = downloaded.get("Info") | |
| 83 | + | if not isinstance(info_path, str) or not info_path: | |
| 84 | + | fail() | |
| 85 | + | with open(info_path, encoding="utf-8") as info_file: | |
| 86 | + | info = json.load(info_file) | |
| 87 | + | origin = info.get("Origin") or downloaded.get("Origin") | |
| 88 | + | if info.get("Version") != version or not isinstance(origin, dict): | |
| 89 | + | fail() | |
| 90 | + | revision = origin.get("Hash") | |
| 91 | + | if origin.get("VCS") != "git" or origin.get("URL") != "https://github.com/bnema/purego-cef2gtk": | |
| 92 | + | fail() | |
| 93 | + | if not isinstance(revision, str) or not re.fullmatch(r"[0-9a-f]{40}", revision): | |
| 94 | + | fail() | |
| 95 | + | if not revision.startswith(match.group(2)): | |
| 96 | + | fail() | |
| 97 | + | # A named ref can move. Only the immutable hash itself is acceptable. | |
| 98 | + | if origin.get("Ref") not in (None, "", revision): | |
| 99 | + | fail() | |
| 100 | + | except (AttributeError, KeyError, OSError, TypeError, ValueError, json.JSONDecodeError): | |
| 101 | + | fail() | |
| 102 | + | ||
| 103 | + | print("\t".join((version, match.group(1), revision))) | |
| 104 | + | PY | |
| 105 | + | } | |
| 36 | 106 | ||
| 37 | 107 | # The artifact destination is caller-controlled. Never empty or recursively | |
| 38 | 108 | # clear it: collection only writes to a newly-created directory whose parent is | |
| @@ -66,10 +136,9 @@ prepare_output | |||
| 66 | 136 | [[ -x "$binary" ]] || { echo "first-presentation: executable not found: $binary" >&2; exit 2; } | |
| 67 | 137 | [[ -d "$runtime" ]] || { echo "first-presentation: CEF runtime not found: $runtime" >&2; exit 2; } | |
| 68 | 138 | [[ -n "${WAYLAND_DISPLAY:-}${DISPLAY:-}" ]] || { echo "first-presentation: a current Wayland/X11 display is required" >&2; exit 2; } | |
| 69 | - | [[ "$(go list -m -f '{{.Version}}' "$upstream_module")" == "$upstream_tag" ]] || { | |
| 70 | - | echo "first-presentation: expected $upstream_module@$upstream_tag" >&2 | |
| 71 | - | exit 2 | |
| 72 | - | } | |
| 139 | + | upstream_provenance="$(resolve_upstream_provenance)" || exit $? | |
| 140 | + | IFS=$'\t' read -r upstream_version upstream_tag upstream_revision <<<"$upstream_provenance" | |
| 141 | + | readonly upstream_version upstream_tag upstream_revision | |
| 73 | 142 | ||
| 74 | 143 | # Raw logs and temporary XDG homes may contain machine-local paths. Keep them | |
| 75 | 144 | # outside the committed artifact directory and always remove them. | |
| @@ -80,9 +149,9 @@ cleanup_work_root() { | |||
| 80 | 149 | rm -rf -- "$work_root" | |
| 81 | 150 | } | |
| 82 | 151 | trap cleanup_work_root EXIT | |
| 83 | - | python3 - "$output/metadata.json" "$binary" "$timeout_seconds" "$upstream_module" "$upstream_tag" "$upstream_revision" <<'PY' | |
| 152 | + | python3 - "$output/metadata.json" "$binary" "$timeout_seconds" "$upstream_module" "$upstream_version" "$upstream_tag" "$upstream_revision" <<'PY' | |
| 84 | 153 | import hashlib, json, os, platform, subprocess, sys | |
| 85 | - | path, binary, timeout, upstream_module, upstream_tag, upstream_revision = sys.argv[1:] | |
| 154 | + | path, binary, timeout, upstream_module, upstream_version, upstream_tag, upstream_revision = sys.argv[1:] | |
| 86 | 155 | with open(binary, "rb") as candidate: | |
| 87 | 156 | binary_sha256 = hashlib.file_digest(candidate, "sha256").hexdigest() | |
| 88 | 157 | ||
| @@ -102,7 +171,7 @@ json.dump({ | |||
| 102 | 171 | "binary": {"label": "dumber", "sha256": binary_sha256}, | |
| 103 | 172 | "timeout_seconds": int(timeout), | |
| 104 | 173 | "measured_source_revision": subprocess.check_output(["git", "-c", f"safe.directory={os.getcwd()}", "rev-parse", "HEAD"], text=True).strip(), | |
| 105 | - | "upstream": {"module": upstream_module, "tag": upstream_tag, "revision": upstream_revision}, | |
| 174 | + | "upstream": {"module": upstream_module, "version": upstream_version, "tag": upstream_tag, "revision": upstream_revision}, | |
| 106 | 175 | "comparison": {"os": os_label, "architecture": architecture, "display_protocol": display_protocol, "machine_gpu_profile": gpu_profile}, | |
| 107 | 176 | "render_configuration": {"backend": "gdk-dmabuf", "buffer_sharing": "dmabuf", "renderer": "vulkan"} | |
| 108 | 177 | }, open(path, "w"), indent=2, sort_keys=True) | |
| @@ -31,8 +31,78 @@ else | |||||
| 31 | fi | 31 | fi | ||
| 32 | readonly output | 32 | readonly output | ||
| 33 | readonly upstream_module="github.com/bnema/purego-cef2gtk" | 33 | readonly upstream_module="github.com/bnema/purego-cef2gtk" | ||
| 34 | - | readonly upstream_tag="v0.8.4" | 34 | + | |
| 35 | - | readonly upstream_revision="f217ece342dea3ef2a3f98671fcd16a39ad0037d" | 35 | + | # Resolve the version selected by this checkout, then obtain its immutable VCS |
| 36 | + | # origin from Go's cached module metadata. Do not infer a revision from a tag, | |||
| 37 | + | # a branch, or a truncated pseudo-version suffix. | |||
| 38 | + | resolve_upstream_provenance() { | |||
| 39 | + | local selected_metadata selected_version downloaded_metadata | |||
| 40 | + | ||||
| 41 | + | selected_metadata="$(go list -m -json "$upstream_module" 2>/dev/null)" || { | |||
| 42 | + | echo "first-presentation: immutable module provenance is unavailable" >&2 | |||
| 43 | + | exit 2 | |||
| 44 | + | } | |||
| 45 | + | selected_version="$(python3 - "$upstream_module" "$selected_metadata" <<'PY' | |||
| 46 | + | import json, sys | |||
| 47 | + | try: | |||
| 48 | + | metadata = json.loads(sys.argv[2]) | |||
| 49 | + | if metadata.get("Path") != sys.argv[1] or not isinstance(metadata.get("Version"), str): | |||
| 50 | + | raise ValueError | |||
| 51 | + | print(metadata["Version"]) | |||
| 52 | + | except (AttributeError, TypeError, ValueError, json.JSONDecodeError): | |||
| 53 | + | raise SystemExit("first-presentation: immutable module provenance is unavailable") | |||
| 54 | + | PY | |||
| 55 | + | )" || exit $? | |||
| 56 | + | downloaded_metadata="$(go mod download -json "$upstream_module@$selected_version" 2>/dev/null)" || { | |||
| 57 | + | echo "first-presentation: immutable module provenance is unavailable" >&2 | |||
| 58 | + | exit 2 | |||
| 59 | + | } | |||
| 60 | + | ||||
| 61 | + | python3 - "$upstream_module" "$selected_metadata" "$downloaded_metadata" <<'PY' | |||
| 62 | + | import json, re, sys | |||
| 63 | + | ||||
| 64 | + | module, selected_raw, downloaded_raw = sys.argv[1:] | |||
| 65 | + | ||||
| 66 | + | def fail(): | |||
| 67 | + | # Do not expose Go cache locations or other machine-local values. | |||
| 68 | + | raise SystemExit("first-presentation: immutable module provenance is unavailable") | |||
| 69 | + | ||||
| 70 | + | try: | |||
| 71 | + | selected = json.loads(selected_raw) | |||
| 72 | + | downloaded = json.loads(downloaded_raw) | |||
| 73 | + | version = selected["Version"] | |||
| 74 | + | if selected.get("Path") != module or downloaded.get("Path") != module: | |||
| 75 | + | fail() | |||
| 76 | + | if downloaded.get("Version") != version: | |||
| 77 | + | fail() | |||
| 78 | + | # A selected pseudo-version is an exact immutable selector, never a branch. | |||
| 79 | + | match = re.fullmatch(r"(v\d+\.\d+\.\d+)-0\.\d{14}-([0-9a-f]{12})", version) | |||
| 80 | + | if not match: | |||
| 81 | + | fail() | |||
| 82 | + | info_path = downloaded.get("Info") | |||
| 83 | + | if not isinstance(info_path, str) or not info_path: | |||
| 84 | + | fail() | |||
| 85 | + | with open(info_path, encoding="utf-8") as info_file: | |||
| 86 | + | info = json.load(info_file) | |||
| 87 | + | origin = info.get("Origin") or downloaded.get("Origin") | |||
| 88 | + | if info.get("Version") != version or not isinstance(origin, dict): | |||
| 89 | + | fail() | |||
| 90 | + | revision = origin.get("Hash") | |||
| 91 | + | if origin.get("VCS") != "git" or origin.get("URL") != "https://github.com/bnema/purego-cef2gtk": | |||
| 92 | + | fail() | |||
| 93 | + | if not isinstance(revision, str) or not re.fullmatch(r"[0-9a-f]{40}", revision): | |||
| 94 | + | fail() | |||
| 95 | + | if not revision.startswith(match.group(2)): | |||
| 96 | + | fail() | |||
| 97 | + | # A named ref can move. Only the immutable hash itself is acceptable. | |||
| 98 | + | if origin.get("Ref") not in (None, "", revision): | |||
| 99 | + | fail() | |||
| 100 | + | except (AttributeError, KeyError, OSError, TypeError, ValueError, json.JSONDecodeError): | |||
| 101 | + | fail() | |||
| 102 | + | ||||
| 103 | + | print("\t".join((version, match.group(1), revision))) | |||
| 104 | + | PY | |||
| 105 | + | } | |||
| 36 | 106 | ||||
| 37 | # The artifact destination is caller-controlled. Never empty or recursively | 107 | # The artifact destination is caller-controlled. Never empty or recursively | ||
| 38 | # clear it: collection only writes to a newly-created directory whose parent is | 108 | # clear it: collection only writes to a newly-created directory whose parent is | ||
| @@ -66,10 +136,9 @@ prepare_output | |||||
| 66 | [[ -x "$binary" ]] || { echo "first-presentation: executable not found: $binary" >&2; exit 2; } | 136 | [[ -x "$binary" ]] || { echo "first-presentation: executable not found: $binary" >&2; exit 2; } | ||
| 67 | [[ -d "$runtime" ]] || { echo "first-presentation: CEF runtime not found: $runtime" >&2; exit 2; } | 137 | [[ -d "$runtime" ]] || { echo "first-presentation: CEF runtime not found: $runtime" >&2; exit 2; } | ||
| 68 | [[ -n "${WAYLAND_DISPLAY:-}${DISPLAY:-}" ]] || { echo "first-presentation: a current Wayland/X11 display is required" >&2; exit 2; } | 138 | [[ -n "${WAYLAND_DISPLAY:-}${DISPLAY:-}" ]] || { echo "first-presentation: a current Wayland/X11 display is required" >&2; exit 2; } | ||
| 69 | - | [[ "$(go list -m -f '{{.Version}}' "$upstream_module")" == "$upstream_tag" ]] || { | 139 | + | upstream_provenance="$(resolve_upstream_provenance)" || exit $? |
| 70 | - | echo "first-presentation: expected $upstream_module@$upstream_tag" >&2 | 140 | + | IFS=$'\t' read -r upstream_version upstream_tag upstream_revision <<<"$upstream_provenance" |
| 71 | - | exit 2 | 141 | + | readonly upstream_version upstream_tag upstream_revision |
| 72 | - | } | |||
| 73 | 142 | ||||
| 74 | # Raw logs and temporary XDG homes may contain machine-local paths. Keep them | 143 | # Raw logs and temporary XDG homes may contain machine-local paths. Keep them | ||
| 75 | # outside the committed artifact directory and always remove them. | 144 | # outside the committed artifact directory and always remove them. | ||
| @@ -80,9 +149,9 @@ cleanup_work_root() { | |||||
| 80 | rm -rf -- "$work_root" | 149 | rm -rf -- "$work_root" | ||
| 81 | } | 150 | } | ||
| 82 | trap cleanup_work_root EXIT | 151 | trap cleanup_work_root EXIT | ||
| 83 | - | python3 - "$output/metadata.json" "$binary" "$timeout_seconds" "$upstream_module" "$upstream_tag" "$upstream_revision" <<'PY' | 152 | + | python3 - "$output/metadata.json" "$binary" "$timeout_seconds" "$upstream_module" "$upstream_version" "$upstream_tag" "$upstream_revision" <<'PY' |
| 84 | import hashlib, json, os, platform, subprocess, sys | 153 | import hashlib, json, os, platform, subprocess, sys | ||
| 85 | - | path, binary, timeout, upstream_module, upstream_tag, upstream_revision = sys.argv[1:] | 154 | + | path, binary, timeout, upstream_module, upstream_version, upstream_tag, upstream_revision = sys.argv[1:] |
| 86 | with open(binary, "rb") as candidate: | 155 | with open(binary, "rb") as candidate: | ||
| 87 | binary_sha256 = hashlib.file_digest(candidate, "sha256").hexdigest() | 156 | binary_sha256 = hashlib.file_digest(candidate, "sha256").hexdigest() | ||
| 88 | 157 | ||||
| @@ -102,7 +171,7 @@ json.dump({ | |||||
| 102 | "binary": {"label": "dumber", "sha256": binary_sha256}, | 171 | "binary": {"label": "dumber", "sha256": binary_sha256}, | ||
| 103 | "timeout_seconds": int(timeout), | 172 | "timeout_seconds": int(timeout), | ||
| 104 | "measured_source_revision": subprocess.check_output(["git", "-c", f"safe.directory={os.getcwd()}", "rev-parse", "HEAD"], text=True).strip(), | 173 | "measured_source_revision": subprocess.check_output(["git", "-c", f"safe.directory={os.getcwd()}", "rev-parse", "HEAD"], text=True).strip(), | ||
| 105 | - | "upstream": {"module": upstream_module, "tag": upstream_tag, "revision": upstream_revision}, | 174 | + | "upstream": {"module": upstream_module, "version": upstream_version, "tag": upstream_tag, "revision": upstream_revision}, |
| 106 | "comparison": {"os": os_label, "architecture": architecture, "display_protocol": display_protocol, "machine_gpu_profile": gpu_profile}, | 175 | "comparison": {"os": os_label, "architecture": architecture, "display_protocol": display_protocol, "machine_gpu_profile": gpu_profile}, | ||
| 107 | "render_configuration": {"backend": "gdk-dmabuf", "buffer_sharing": "dmabuf", "renderer": "vulkan"} | 176 | "render_configuration": {"backend": "gdk-dmabuf", "buffer_sharing": "dmabuf", "renderer": "vulkan"} | ||
| 108 | }, open(path, "w"), indent=2, sort_keys=True) | 177 | }, open(path, "w"), indent=2, sort_keys=True) | ||
M vendor/github.com/bnema/purego-cef/cef/bridge.go +8 -13 generated file: collapsed
M vendor/github.com/bnema/purego-cef2gtk/internal/cefadapter/accelerated_paint.go +34 -37 generated file: collapsed
M vendor/github.com/bnema/purego-cef2gtk/internal/dmabuf/frame.go +38 -19 generated file: collapsed
M vendor/github.com/bnema/purego-cef2gtk/internal/gtkgdk/renderer.go +89 -69 generated file: collapsed
M vendor/github.com/bnema/purego-pipewire/internal/core/player.go +5 -0 generated file: collapsed
M vendor/github.com/bnema/purego-pipewire/internal/core/player_rt.go +10 -6 generated file: collapsed
M vendor/github.com/bnema/purego-pipewire/internal/core/pwbuffer.go +66 -32 generated file: collapsed
M vendor/github.com/bnema/purego-sqlite/driver/driver.go +268 -63 generated file: collapsed
M vendor/github.com/bnema/purego-sqlite/internal/core/db.go +8 -0 generated file: collapsed
M vendor/github.com/bnema/purego-sqlite/internal/core/rows.go +13 -0 generated file: collapsed
M vendor/github.com/bnema/purego-sqlite/internal/loader/loader.go +23 -5 generated file: collapsed
M vendor/github.com/bnema/purego-sqlite/internal/ports/in/ports_gen.go +3 -0 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 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-stack.go +78 -62 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-switcher-bar.go +9 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-switcher-sidebar.go +15 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-switcher-title.go +19 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-switcher.go +10 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-window-title.go +10 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-window.go +14 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-wrap-box.go +66 -46 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-wrap-layout.go +57 -46 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/cairo/main.go +36 -79 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkapplaunchcontext.go +10 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcairo.go +12 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcairocontext.go +3 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcicpparams.go +20 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkclipboard.go +34 -32 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcolorstate.go +12 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcontentdeserializer.go +26 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcontentformats.go +28 -31 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcontentprovider.go +23 -28 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcontentserializer.go +26 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcursor.go +12 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdevice.go +36 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdevicepad.go +27 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdevicetool.go +10 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdisplay.go +51 -43 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdisplaymanager.go +10 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdmabuftexture.go +3 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdmabuftexturebuilder.go +53 -41 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdrag.go +20 -28 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdragsurface.go +6 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdragsurfacesize.go +3 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdrawcontext.go +11 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdrop.go +19 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkenums.go +21 -1 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkevents.go +120 -118 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkframeclock.go +22 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkframetimings.go +17 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkglcontext.go +40 -36 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkgltexture.go +4 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkgltexturebuilder.go +41 -35 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkkeys.go +19 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkmemorytexture.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkmemorytexturebuilder.go +42 -35 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 +63 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkpango.go +4 -12 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkpixbuf.go +2 -12 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkpopup.go +47 -26 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkpopuplayout.go +36 -32 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkrgba.go +19 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkseat.go +11 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdksnapshot.go +7 -0 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdksurface.go +46 -40 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdktexture.go +27 -31 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdktoplevel.go +157 -66 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdktoplevellayout.go +24 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdktoplevelsize.go +9 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdktypes.go +95 -72 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkvulkancontext.go +3 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdkpixbuf/gdk-pixbuf-animation.go +26 -32 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdkpixbuf/gdk-pixbuf-core.go +9 -0 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdkpixbuf/gdk-pixbuf-io.go +25 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdkpixbuf/gdk-pixbuf-loader.go +13 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdkpixbuf/gdk-pixbuf-simple-anim.go +8 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdkpixbuf/gdk-pixbuf-transform.go +11 -1 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdkpixbuf/gdk-pixbuf.go +102 -79 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdkpixbuf/main.go +5 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gaction.go +59 -31 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gactiongroup.go +96 -39 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gactionmap.go +33 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gappinfo.go +244 -116 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gapplication.go +79 -55 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gapplicationcommandline.go +31 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gasyncinitable.go +25 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gasyncresult.go +26 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gbufferedinputstream.go +26 -29 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gbufferedoutputstream.go +11 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gbytesicon.go +4 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gcancellable.go +26 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gcharsetconverter.go +8 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gcontenttype.go +30 -26 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gconverter.go +23 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gconverterinputstream.go +3 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gconverteroutputstream.go +3 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gcredentials.go +12 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdatagrambased.go +45 -30 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdatainputstream.go +31 -35 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdataoutputstream.go +14 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusactiongroup.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusaddress.go +10 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusauthobserver.go +6 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusconnection.go +77 -66 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbuserror.go +16 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusinterface.go +26 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusinterfaceskeleton.go +25 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusintrospection.go +54 -56 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusmenumodel.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusmessage.go +88 -64 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusmethodinvocation.go +35 -30 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusnameowning.go +10 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusnamewatching.go +10 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusobject.go +19 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusobjectmanager.go +26 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusobjectmanagerclient.go +16 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusobjectmanagerserver.go +13 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusobjectproxy.go +3 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusobjectskeleton.go +12 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusproxy.go +42 -38 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusserver.go +14 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusutils.go +24 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdebugcontroller.go +12 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdebugcontrollerdbus.go +4 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdrive.go +214 -82 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdtlsclientconnection.go +34 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdtlsconnection.go +207 -80 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdtlsserverconnection.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gemblem.go +6 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gemblemedicon.go +9 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfile.go +1148 -450 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfileattribute.go +13 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfileenumerator.go +34 -35 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfileicon.go +3 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfileinfo.go +138 -84 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfileinputstream.go +17 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfileiostream.go +23 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfilemonitor.go +9 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfilenamecompleter.go +8 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfileoutputstream.go +23 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfilterinputstream.go +6 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfilteroutputstream.go +6 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gicon.go +32 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/ginetaddress.go +40 -34 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/ginetaddressmask.go +14 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/ginetsocketaddress.go +10 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/ginitable.go +11 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/ginputstream.go +52 -48 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gioenums.go +90 -1 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gioerror.go +6 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/giomodule.go +26 -29 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gioscheduler.go +4 -12 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/giostream.go +25 -29 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/giotypes.go +70 -60 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/giptosmessage.go +6 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gipv6tclassmessage.go +6 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/glistmodel.go +33 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gliststore.go +22 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gloadableicon.go +27 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gmemoryinputstream.go +8 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gmemorymonitor.go +2 -12 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gmemoryoutputstream.go +13 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gmenu.go +62 -50 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gmenumodel.go +31 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gmount.go +215 -86 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gmountoperation.go +40 -32 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gnativesocketaddress.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gnativevolumemonitor.go +7 -0 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gnetworkaddress.go +11 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gnetworking.go +3 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gnetworkmonitor.go +49 -31 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gnetworkservice.go +12 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gnotification.go +26 -26 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/goutputstream.go +86 -72 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gpermission.go +33 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gpollableinputstream.go +30 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gpollableoutputstream.go +41 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gpollableutils.go +7 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gpowerprofilemonitor.go +7 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gpropertyaction.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gproxy.go +35 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gproxyaddress.go +16 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gproxyaddressenumerator.go +7 -0 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gproxyresolver.go +35 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gremoteactiongroup.go +12 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gresolver.go +75 -67 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gresource.go +19 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gseekable.go +41 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsettings.go +99 -67 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsettingsbackend.go +19 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsettingsschema.go +48 -43 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsimpleaction.go +9 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsimpleactiongroup.go +9 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsimpleasyncresult.go +46 -40 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsimpleiostream.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsimplepermission.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsimpleproxyresolver.go +8 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsocket.go +87 -72 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsocketaddress.go +11 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsocketaddressenumerator.go +13 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsocketclient.go +54 -44 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsocketconnectable.go +19 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsocketconnection.go +14 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsocketcontrolmessage.go +10 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsocketlistener.go +18 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsocketservice.go +8 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsrvtarget.go +2 -11 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsubprocess.go +40 -39 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsubprocesslauncher.go +34 -31 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gtask.go +70 -52 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gtcpconnection.go +5 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gtcpwrapperconnection.go +3 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gtestdbus.go +16 -22 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gthemedicon.go +10 -19 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gthreadedresolver.go +7 -0 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gthreadedsocketservice.go +2 -12 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gtlsbackend.go +69 -33 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gtlscertificate.go +25 -29 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gtlsclientconnection.go +55 -29 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gtlsconnection.go +56 -46 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gtlsdatabase.go +51 -48 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gtlsfiledatabase.go +2 -13 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gtlsinteraction.go +27 -31 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gtlspassword.go +20 -22 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gtlsserverconnection.go +2 -13 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gunixconnection.go +11 -20 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gunixcredentialsmessage.go +6 -17 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gunixfdlist.go +11 -19 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gunixsocketaddress.go +14 -22 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gvfs.go +18 -24 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gvolume.go +143 -58 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gvolumemonitor.go +11 -19 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gzlibcompressor.go +9 -18 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gzlibdecompressor.go +3 -15 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/main.go +2 -11 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gallocator.go +32 -28 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/garray.go +82 -59 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gasyncqueue.go +56 -39 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gatomic.go +43 -34 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gbacktrace.go +5 -15 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gbase64.go +13 -19 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gbitlock.go +23 -24 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gbookmarkfile.go +69 -61 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gcache.go +10 -15 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gcharset.go +13 -19 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gchecksum.go +23 -25 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gcompletion.go +14 -17 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gconvert.go +25 -28 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gdataset.go +36 -28 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gdate.go +103 -65 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gdatetime.go +107 -66 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gdir.go +12 -19 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/genviron.go +17 -21 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gerror.go +30 -29 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gfileutils.go +45 -38 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/ggettext.go +13 -19 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/ghash.go +81 -53 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/ghmac.go +21 -24 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/ghook.go +28 -26 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/ghostutils.go +11 -18 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/giochannel.go +83 -67 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gkeyfile.go +72 -62 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/glib-types.go +4 -12 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/glist.go +2 -11 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gmain.go +181 -117 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gmappedfile.go +15 -21 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gmarkup.go +51 -43 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gmem.go +44 -31 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gmessages.go +70 -45 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gnode.go +50 -35 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/goption.go +57 -43
| @@ -5,7 +5,6 @@ import ( | |||
| 5 | 5 | "structs" | |
| 6 | 6 | "unsafe" | |
| 7 | 7 | ||
| 8 | - | "github.com/bnema/purego" | |
| 9 | 8 | "github.com/bnema/puregotk/pkg/core" | |
| 10 | 9 | "github.com/bnema/puregotk/v4/gobject/types" | |
| 11 | 10 | ) | |
| @@ -45,6 +44,8 @@ var xOptionContextAddGroup func(uintptr, *OptionGroup) | |||
| 45 | 44 | // will recognize the options in the group. Note that this will take | |
| 46 | 45 | // ownership of the @group and thus the @group should not be freed. | |
| 47 | 46 | func (x *OptionContext) AddGroup(GroupVar *OptionGroup) { | |
| 47 | + | core.LazyRegister(&xOptionContextAddGroup, "GLIB", "g_option_context_add_group", false) | |
| 48 | + | ||
| 48 | 49 | xOptionContextAddGroup(x.GoPointer(), GroupVar) | |
| 49 | 50 | } | |
| 50 | 51 | ||
| @@ -53,6 +54,8 @@ var xOptionContextAddMainEntries func(uintptr, []OptionEntry, uintptr) | |||
| 53 | 54 | // A convenience function which creates a main group if it doesn't | |
| 54 | 55 | // exist, adds the @entries to it and sets the translation domain. | |
| 55 | 56 | func (x *OptionContext) AddMainEntries(EntriesVar []OptionEntry, TranslationDomainVar *string) { | |
| 57 | + | core.LazyRegister(&xOptionContextAddMainEntries, "GLIB", "g_option_context_add_main_entries", false) | |
| 58 | + | ||
| 56 | 59 | TranslationDomainVarPtr := core.GStrdupNullable(TranslationDomainVar) | |
| 57 | 60 | defer core.GFreeNullable(TranslationDomainVarPtr) | |
| 58 | 61 | ||
| @@ -67,6 +70,8 @@ var xOptionContextFree func(uintptr) | |||
| 67 | 70 | // Please note that parsed arguments need to be freed separately (see | |
| 68 | 71 | // #GOptionEntry). | |
| 69 | 72 | func (x *OptionContext) Free() { | |
| 73 | + | core.LazyRegister(&xOptionContextFree, "GLIB", "g_option_context_free", false) | |
| 74 | + | ||
| 70 | 75 | xOptionContextFree(x.GoPointer()) | |
| 71 | 76 | } | |
| 72 | 77 | ||
| @@ -74,6 +79,8 @@ var xOptionContextGetDescription func(uintptr) string | |||
| 74 | 79 | ||
| 75 | 80 | // Returns the description. See g_option_context_set_description(). | |
| 76 | 81 | func (x *OptionContext) GetDescription() string { | |
| 82 | + | core.LazyRegister(&xOptionContextGetDescription, "GLIB", "g_option_context_get_description", false) | |
| 83 | + | ||
| 77 | 84 | cret := xOptionContextGetDescription(x.GoPointer()) | |
| 78 | 85 | return cret | |
| 79 | 86 | } | |
| @@ -88,6 +95,8 @@ var xOptionContextGetHelp func(uintptr, bool, *OptionGroup) string | |||
| 88 | 95 | // To obtain the help text for an option group, call | |
| 89 | 96 | // `g_option_context_get_help (context, FALSE, group)`. | |
| 90 | 97 | func (x *OptionContext) GetHelp(MainHelpVar bool, GroupVar *OptionGroup) string { | |
| 98 | + | core.LazyRegister(&xOptionContextGetHelp, "GLIB", "g_option_context_get_help", false) | |
| 99 | + | ||
| 91 | 100 | cret := xOptionContextGetHelp(x.GoPointer(), MainHelpVar, GroupVar) | |
| 92 | 101 | return cret | |
| 93 | 102 | } | |
| @@ -97,6 +106,8 @@ var xOptionContextGetHelpEnabled func(uintptr) bool | |||
| 97 | 106 | // Returns whether automatic `--help` generation | |
| 98 | 107 | // is turned on for @context. See g_option_context_set_help_enabled(). | |
| 99 | 108 | func (x *OptionContext) GetHelpEnabled() bool { | |
| 109 | + | core.LazyRegister(&xOptionContextGetHelpEnabled, "GLIB", "g_option_context_get_help_enabled", false) | |
| 110 | + | ||
| 100 | 111 | cret := xOptionContextGetHelpEnabled(x.GoPointer()) | |
| 101 | 112 | return cret | |
| 102 | 113 | } | |
| @@ -106,6 +117,8 @@ var xOptionContextGetIgnoreUnknownOptions func(uintptr) bool | |||
| 106 | 117 | // Returns whether unknown options are ignored or not. See | |
| 107 | 118 | // g_option_context_set_ignore_unknown_options(). | |
| 108 | 119 | func (x *OptionContext) GetIgnoreUnknownOptions() bool { | |
| 120 | + | core.LazyRegister(&xOptionContextGetIgnoreUnknownOptions, "GLIB", "g_option_context_get_ignore_unknown_options", false) | |
| 121 | + | ||
| 109 | 122 | cret := xOptionContextGetIgnoreUnknownOptions(x.GoPointer()) | |
| 110 | 123 | return cret | |
| 111 | 124 | } | |
| @@ -114,6 +127,8 @@ var xOptionContextGetMainGroup func(uintptr) uintptr | |||
| 114 | 127 | ||
| 115 | 128 | // Returns a pointer to the main group of @context. | |
| 116 | 129 | func (x *OptionContext) GetMainGroup() *OptionGroup { | |
| 130 | + | core.LazyRegister(&xOptionContextGetMainGroup, "GLIB", "g_option_context_get_main_group", false) | |
| 131 | + | ||
| 117 | 132 | cret := xOptionContextGetMainGroup(x.GoPointer()) | |
| 118 | 133 | if cret == 0 { | |
| 119 | 134 | return nil | |
| @@ -127,6 +142,8 @@ var xOptionContextGetStrictPosix func(uintptr) bool | |||
| 127 | 142 | // | |
| 128 | 143 | // See g_option_context_set_strict_posix() for more information. | |
| 129 | 144 | func (x *OptionContext) GetStrictPosix() bool { | |
| 145 | + | core.LazyRegister(&xOptionContextGetStrictPosix, "GLIB", "g_option_context_get_strict_posix", false) | |
| 146 | + | ||
| 130 | 147 | cret := xOptionContextGetStrictPosix(x.GoPointer()) | |
| 131 | 148 | return cret | |
| 132 | 149 | } | |
| @@ -135,6 +152,8 @@ var xOptionContextGetSummary func(uintptr) string | |||
| 135 | 152 | ||
| 136 | 153 | // Returns the summary. See g_option_context_set_summary(). | |
| 137 | 154 | func (x *OptionContext) GetSummary() string { | |
| 155 | + | core.LazyRegister(&xOptionContextGetSummary, "GLIB", "g_option_context_get_summary", false) | |
| 156 | + | ||
| 138 | 157 | cret := xOptionContextGetSummary(x.GoPointer()) | |
| 139 | 158 | return cret | |
| 140 | 159 | } | |
| @@ -163,6 +182,7 @@ var xOptionContextParse func(uintptr, *int, *[]string, **Error) bool | |||
| 163 | 182 | // [current locale](running.html#locale) for automatic | |
| 164 | 183 | // character set conversion of string and filename arguments. | |
| 165 | 184 | func (x *OptionContext) Parse(ArgcVar *int, ArgvVar *[]string) (bool, error) { | |
| 185 | + | core.LazyRegister(&xOptionContextParse, "GLIB", "g_option_context_parse", false) | |
| 166 | 186 | var cerr *Error | |
| 167 | 187 | ||
| 168 | 188 | cret := xOptionContextParse(x.GoPointer(), ArgcVar, ArgvVar, &cerr) | |
| @@ -191,6 +211,7 @@ var xOptionContextParseStrv func(uintptr, *[]string, **Error) bool | |||
| 191 | 211 | // This function is useful if you are trying to use #GOptionContext with | |
| 192 | 212 | // #GApplication. | |
| 193 | 213 | func (x *OptionContext) ParseStrv(ArgumentsVar *[]string) (bool, error) { | |
| 214 | + | core.LazyRegister(&xOptionContextParseStrv, "GLIB", "g_option_context_parse_strv", false) | |
| 194 | 215 | var cerr *Error | |
| 195 | 216 | ||
| 196 | 217 | cret := xOptionContextParseStrv(x.GoPointer(), ArgumentsVar, &cerr) | |
| @@ -208,6 +229,8 @@ var xOptionContextSetDescription func(uintptr, uintptr) | |||
| 208 | 229 | // Note that the summary is translated (see | |
| 209 | 230 | // g_option_context_set_translate_func()). | |
| 210 | 231 | func (x *OptionContext) SetDescription(DescriptionVar *string) { | |
| 232 | + | core.LazyRegister(&xOptionContextSetDescription, "GLIB", "g_option_context_set_description", false) | |
| 233 | + | ||
| 211 | 234 | DescriptionVarPtr := core.GStrdupNullable(DescriptionVar) | |
| 212 | 235 | defer core.GFreeNullable(DescriptionVarPtr) | |
| 213 | 236 | ||
| @@ -221,6 +244,8 @@ var xOptionContextSetHelpEnabled func(uintptr, bool) | |||
| 221 | 244 | // `-?`, `--help-all` and `--help-groupname` and creates suitable | |
| 222 | 245 | // output to stdout. | |
| 223 | 246 | func (x *OptionContext) SetHelpEnabled(HelpEnabledVar bool) { | |
| 247 | + | core.LazyRegister(&xOptionContextSetHelpEnabled, "GLIB", "g_option_context_set_help_enabled", false) | |
| 248 | + | ||
| 224 | 249 | xOptionContextSetHelpEnabled(x.GoPointer(), HelpEnabledVar) | |
| 225 | 250 | } | |
| 226 | 251 | ||
| @@ -234,6 +259,8 @@ var xOptionContextSetIgnoreUnknownOptions func(uintptr, bool) | |||
| 234 | 259 | // which don't start with a dash). But note that GOption cannot reliably | |
| 235 | 260 | // determine whether a non-option belongs to a preceding unknown option. | |
| 236 | 261 | func (x *OptionContext) SetIgnoreUnknownOptions(IgnoreUnknownVar bool) { | |
| 262 | + | core.LazyRegister(&xOptionContextSetIgnoreUnknownOptions, "GLIB", "g_option_context_set_ignore_unknown_options", false) | |
| 263 | + | ||
| 237 | 264 | xOptionContextSetIgnoreUnknownOptions(x.GoPointer(), IgnoreUnknownVar) | |
| 238 | 265 | } | |
| 239 | 266 | ||
| @@ -244,6 +271,8 @@ var xOptionContextSetMainGroup func(uintptr, *OptionGroup) | |||
| 244 | 271 | // the only difference is that the options in the main group are | |
| 245 | 272 | // treated differently when generating `--help` output. | |
| 246 | 273 | func (x *OptionContext) SetMainGroup(GroupVar *OptionGroup) { | |
| 274 | + | core.LazyRegister(&xOptionContextSetMainGroup, "GLIB", "g_option_context_set_main_group", false) | |
| 275 | + | ||
| 247 | 276 | xOptionContextSetMainGroup(x.GoPointer(), GroupVar) | |
| 248 | 277 | } | |
| 249 | 278 | ||
| @@ -274,6 +303,8 @@ var xOptionContextSetStrictPosix func(uintptr, bool) | |||
| 274 | 303 | // examining the verb name, which should be present in argv[1] after | |
| 275 | 304 | // parsing). | |
| 276 | 305 | func (x *OptionContext) SetStrictPosix(StrictPosixVar bool) { | |
| 306 | + | core.LazyRegister(&xOptionContextSetStrictPosix, "GLIB", "g_option_context_set_strict_posix", false) | |
| 307 | + | ||
| 277 | 308 | xOptionContextSetStrictPosix(x.GoPointer(), StrictPosixVar) | |
| 278 | 309 | } | |
| 279 | 310 | ||
| @@ -286,6 +317,8 @@ var xOptionContextSetSummary func(uintptr, uintptr) | |||
| 286 | 317 | // g_option_context_set_translate_func() and | |
| 287 | 318 | // g_option_context_set_translation_domain()). | |
| 288 | 319 | func (x *OptionContext) SetSummary(SummaryVar *string) { | |
| 320 | + | core.LazyRegister(&xOptionContextSetSummary, "GLIB", "g_option_context_set_summary", false) | |
| 321 | + | ||
| 289 | 322 | SummaryVarPtr := core.GStrdupNullable(SummaryVar) | |
| 290 | 323 | defer core.GFreeNullable(SummaryVarPtr) | |
| 291 | 324 | ||
| @@ -306,6 +339,8 @@ var xOptionContextSetTranslateFunc func(uintptr, uintptr, uintptr, uintptr) | |||
| 306 | 339 | // If you are using gettext(), you only need to set the translation | |
| 307 | 340 | // domain, see g_option_context_set_translation_domain(). | |
| 308 | 341 | func (x *OptionContext) SetTranslateFunc(FuncVar *TranslateFunc, DataVar uintptr, DestroyNotifyVar *DestroyNotify) { | |
| 342 | + | core.LazyRegister(&xOptionContextSetTranslateFunc, "GLIB", "g_option_context_set_translate_func", false) | |
| 343 | + | ||
| 309 | 344 | xOptionContextSetTranslateFunc(x.GoPointer(), NewCallbackNullable(FuncVar), DataVar, NewCallbackNullable(DestroyNotifyVar)) | |
| 310 | 345 | } | |
| 311 | 346 | ||
| @@ -314,6 +349,8 @@ var xOptionContextSetTranslationDomain func(uintptr, string) | |||
| 314 | 349 | // A convenience function to use gettext() for translating | |
| 315 | 350 | // user-visible strings. | |
| 316 | 351 | func (x *OptionContext) SetTranslationDomain(DomainVar string) { | |
| 352 | + | core.LazyRegister(&xOptionContextSetTranslationDomain, "GLIB", "g_option_context_set_translation_domain", false) | |
| 353 | + | ||
| 317 | 354 | xOptionContextSetTranslationDomain(x.GoPointer(), DomainVar) | |
| 318 | 355 | } | |
| 319 | 356 | ||
| @@ -384,6 +421,7 @@ type OptionGroup struct { | |||
| 384 | 421 | var xOptionGroupGLibType func() types.GType | |
| 385 | 422 | ||
| 386 | 423 | func OptionGroupGLibType() types.GType { | |
| 424 | + | core.LazyRegister(&xOptionGroupGLibType, "GLIB", "g_option_group_get_type", false) | |
| 387 | 425 | return xOptionGroupGLibType() | |
| 388 | 426 | } | |
| 389 | 427 | ||
| @@ -408,6 +446,8 @@ var xNewOptionGroup func(string, string, string, uintptr, uintptr) uintptr | |||
| 408 | 446 | // that it matches the style of built-in GLib group titles such as | |
| 409 | 447 | // ‘Application Options:’. | |
| 410 | 448 | func NewOptionGroup(NameVar string, DescriptionVar string, HelpDescriptionVar string, UserDataVar uintptr, DestroyVar *DestroyNotify) *OptionGroup { | |
| 449 | + | core.LazyRegister(&xNewOptionGroup, "GLIB", "g_option_group_new", false) | |
| 450 | + | ||
| 411 | 451 | cret := xNewOptionGroup(NameVar, DescriptionVar, HelpDescriptionVar, UserDataVar, NewCallbackNullable(DestroyVar)) | |
| 412 | 452 | if cret == 0 { | |
| 413 | 453 | return nil | |
| @@ -419,6 +459,8 @@ var xOptionGroupAddEntries func(uintptr, []OptionEntry) | |||
| 419 | 459 | ||
| 420 | 460 | // Adds the options specified in @entries to @group. | |
| 421 | 461 | func (x *OptionGroup) AddEntries(EntriesVar []OptionEntry) { | |
| 462 | + | core.LazyRegister(&xOptionGroupAddEntries, "GLIB", "g_option_group_add_entries", false) | |
| 463 | + | ||
| 422 | 464 | xOptionGroupAddEntries(x.GoPointer(), EntriesVar) | |
| 423 | 465 | } | |
| 424 | 466 | ||
| @@ -427,6 +469,8 @@ var xOptionGroupFree func(uintptr) | |||
| 427 | 469 | // Frees a #GOptionGroup. Note that you must not free groups | |
| 428 | 470 | // which have been added to a #GOptionContext. | |
| 429 | 471 | func (x *OptionGroup) Free() { | |
| 472 | + | core.LazyRegister(&xOptionGroupFree, "GLIB", "g_option_group_free", false) | |
| 473 | + | ||
| 430 | 474 | xOptionGroupFree(x.GoPointer()) | |
| 431 | 475 | } | |
| 432 | 476 | ||
| @@ -434,6 +478,8 @@ var xOptionGroupRef func(uintptr) uintptr | |||
| 434 | 478 | ||
| 435 | 479 | // Increments the reference count of @group by one. | |
| 436 | 480 | func (x *OptionGroup) Ref() *OptionGroup { | |
| 481 | + | core.LazyRegister(&xOptionGroupRef, "GLIB", "g_option_group_ref", false) | |
| 482 | + | ||
| 437 | 483 | cret := xOptionGroupRef(x.GoPointer()) | |
| 438 | 484 | if cret == 0 { | |
| 439 | 485 | return nil | |
| @@ -449,6 +495,8 @@ var xOptionGroupSetErrorHook func(uintptr, uintptr) | |||
| 449 | 495 | // Note that the user data to be passed to @error_func can be | |
| 450 | 496 | // specified when constructing the group with g_option_group_new(). | |
| 451 | 497 | func (x *OptionGroup) SetErrorHook(ErrorFuncVar *OptionErrorFunc) { | |
| 498 | + | core.LazyRegister(&xOptionGroupSetErrorHook, "GLIB", "g_option_group_set_error_hook", false) | |
| 499 | + | ||
| 452 | 500 | xOptionGroupSetErrorHook(x.GoPointer(), NewCallback(ErrorFuncVar)) | |
| 453 | 501 | } | |
| 454 | 502 | ||
| @@ -462,6 +510,8 @@ var xOptionGroupSetParseHooks func(uintptr, uintptr, uintptr) | |||
| 462 | 510 | // @post_parse_func can be specified when constructing the group | |
| 463 | 511 | // with g_option_group_new(). | |
| 464 | 512 | func (x *OptionGroup) SetParseHooks(PreParseFuncVar *OptionParseFunc, PostParseFuncVar *OptionParseFunc) { | |
| 513 | + | core.LazyRegister(&xOptionGroupSetParseHooks, "GLIB", "g_option_group_set_parse_hooks", false) | |
| 514 | + | ||
| 465 | 515 | xOptionGroupSetParseHooks(x.GoPointer(), NewCallbackNullable(PreParseFuncVar), NewCallbackNullable(PostParseFuncVar)) | |
| 466 | 516 | } | |
| 467 | 517 | ||
| @@ -474,6 +524,8 @@ var xOptionGroupSetTranslateFunc func(uintptr, uintptr, uintptr, uintptr) | |||
| 474 | 524 | // If you are using gettext(), you only need to set the translation | |
| 475 | 525 | // domain, see g_option_group_set_translation_domain(). | |
| 476 | 526 | func (x *OptionGroup) SetTranslateFunc(FuncVar *TranslateFunc, DataVar uintptr, DestroyNotifyVar *DestroyNotify) { | |
| 527 | + | core.LazyRegister(&xOptionGroupSetTranslateFunc, "GLIB", "g_option_group_set_translate_func", false) | |
| 528 | + | ||
| 477 | 529 | xOptionGroupSetTranslateFunc(x.GoPointer(), NewCallbackNullable(FuncVar), DataVar, NewCallbackNullable(DestroyNotifyVar)) | |
| 478 | 530 | } | |
| 479 | 531 | ||
| @@ -482,6 +534,8 @@ var xOptionGroupSetTranslationDomain func(uintptr, string) | |||
| 482 | 534 | // A convenience function to use gettext() for translating | |
| 483 | 535 | // user-visible strings. | |
| 484 | 536 | func (x *OptionGroup) SetTranslationDomain(DomainVar string) { | |
| 537 | + | core.LazyRegister(&xOptionGroupSetTranslationDomain, "GLIB", "g_option_group_set_translation_domain", false) | |
| 538 | + | ||
| 485 | 539 | xOptionGroupSetTranslationDomain(x.GoPointer(), DomainVar) | |
| 486 | 540 | } | |
| 487 | 541 | ||
| @@ -491,6 +545,8 @@ var xOptionGroupUnref func(uintptr) | |||
| 491 | 545 | // If the reference count drops to 0, the @group will be freed. | |
| 492 | 546 | // and all memory allocated by the @group is released. | |
| 493 | 547 | func (x *OptionGroup) Unref() { | |
| 548 | + | core.LazyRegister(&xOptionGroupUnref, "GLIB", "g_option_group_unref", false) | |
| 549 | + | ||
| 494 | 550 | xOptionGroupUnref(x.GoPointer()) | |
| 495 | 551 | } | |
| 496 | 552 | ||
| @@ -607,46 +663,4 @@ const ( | |||
| 607 | 663 | func init() { | |
| 608 | 664 | core.SetPackageName("GLIB", "glib-2.0") | |
| 609 | 665 | core.SetSharedLibraries("GLIB", []string{"libgobject-2.0.so.0", "libglib-2.0.so.0", "libgobject-2.0.0.dylib", "libglib-2.0.0.dylib"}) | |
| 610 | - | var libs []uintptr | |
| 611 | - | for _, libPath := range core.GetPaths("GLIB") { | |
| 612 | - | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 613 | - | if err != nil { | |
| 614 | - | panic(err) | |
| 615 | - | } | |
| 616 | - | libs = append(libs, lib) | |
| 617 | - | } | |
| 618 | - | ||
| 619 | - | core.PuregoSafeRegister(&xOptionContextAddGroup, libs, "g_option_context_add_group") | |
| 620 | - | core.PuregoSafeRegister(&xOptionContextAddMainEntries, libs, "g_option_context_add_main_entries") | |
| 621 | - | core.PuregoSafeRegister(&xOptionContextFree, libs, "g_option_context_free") | |
| 622 | - | core.PuregoSafeRegister(&xOptionContextGetDescription, libs, "g_option_context_get_description") | |
| 623 | - | core.PuregoSafeRegister(&xOptionContextGetHelp, libs, "g_option_context_get_help") | |
| 624 | - | core.PuregoSafeRegister(&xOptionContextGetHelpEnabled, libs, "g_option_context_get_help_enabled") | |
| 625 | - | core.PuregoSafeRegister(&xOptionContextGetIgnoreUnknownOptions, libs, "g_option_context_get_ignore_unknown_options") | |
| 626 | - | core.PuregoSafeRegister(&xOptionContextGetMainGroup, libs, "g_option_context_get_main_group") | |
| 627 | - | core.PuregoSafeRegister(&xOptionContextGetStrictPosix, libs, "g_option_context_get_strict_posix") | |
| 628 | - | core.PuregoSafeRegister(&xOptionContextGetSummary, libs, "g_option_context_get_summary") | |
| 629 | - | core.PuregoSafeRegister(&xOptionContextParse, libs, "g_option_context_parse") | |
| 630 | - | core.PuregoSafeRegister(&xOptionContextParseStrv, libs, "g_option_context_parse_strv") | |
| 631 | - | core.PuregoSafeRegister(&xOptionContextSetDescription, libs, "g_option_context_set_description") | |
| 632 | - | core.PuregoSafeRegister(&xOptionContextSetHelpEnabled, libs, "g_option_context_set_help_enabled") | |
| 633 | - | core.PuregoSafeRegister(&xOptionContextSetIgnoreUnknownOptions, libs, "g_option_context_set_ignore_unknown_options") | |
| 634 | - | core.PuregoSafeRegister(&xOptionContextSetMainGroup, libs, "g_option_context_set_main_group") | |
| 635 | - | core.PuregoSafeRegister(&xOptionContextSetStrictPosix, libs, "g_option_context_set_strict_posix") | |
| 636 | - | core.PuregoSafeRegister(&xOptionContextSetSummary, libs, "g_option_context_set_summary") | |
| 637 | - | core.PuregoSafeRegister(&xOptionContextSetTranslateFunc, libs, "g_option_context_set_translate_func") | |
| 638 | - | core.PuregoSafeRegister(&xOptionContextSetTranslationDomain, libs, "g_option_context_set_translation_domain") | |
| 639 | - | ||
| 640 | - | core.PuregoSafeRegister(&xOptionGroupGLibType, libs, "g_option_group_get_type") | |
| 641 | - | ||
| 642 | - | core.PuregoSafeRegister(&xNewOptionGroup, libs, "g_option_group_new") | |
| 643 | - | ||
| 644 | - | core.PuregoSafeRegister(&xOptionGroupAddEntries, libs, "g_option_group_add_entries") | |
| 645 | - | core.PuregoSafeRegister(&xOptionGroupFree, libs, "g_option_group_free") | |
| 646 | - | core.PuregoSafeRegister(&xOptionGroupRef, libs, "g_option_group_ref") | |
| 647 | - | core.PuregoSafeRegister(&xOptionGroupSetErrorHook, libs, "g_option_group_set_error_hook") | |
| 648 | - | core.PuregoSafeRegister(&xOptionGroupSetParseHooks, libs, "g_option_group_set_parse_hooks") | |
| 649 | - | core.PuregoSafeRegister(&xOptionGroupSetTranslateFunc, libs, "g_option_group_set_translate_func") | |
| 650 | - | core.PuregoSafeRegister(&xOptionGroupSetTranslationDomain, libs, "g_option_group_set_translation_domain") | |
| 651 | - | core.PuregoSafeRegister(&xOptionGroupUnref, libs, "g_option_group_unref") | |
| 652 | 666 | } | |
| @@ -5,7 +5,6 @@ import ( | |||||
| 5 | "structs" | 5 | "structs" | ||
| 6 | "unsafe" | 6 | "unsafe" | ||
| 7 | 7 | ||||
| 8 | - | "github.com/bnema/purego" | |||
| 9 | "github.com/bnema/puregotk/pkg/core" | 8 | "github.com/bnema/puregotk/pkg/core" | ||
| 10 | "github.com/bnema/puregotk/v4/gobject/types" | 9 | "github.com/bnema/puregotk/v4/gobject/types" | ||
| 11 | ) | 10 | ) | ||
| @@ -45,6 +44,8 @@ var xOptionContextAddGroup func(uintptr, *OptionGroup) | |||||
| 45 | // will recognize the options in the group. Note that this will take | 44 | // will recognize the options in the group. Note that this will take | ||
| 46 | // ownership of the @group and thus the @group should not be freed. | 45 | // ownership of the @group and thus the @group should not be freed. | ||
| 47 | func (x *OptionContext) AddGroup(GroupVar *OptionGroup) { | 46 | func (x *OptionContext) AddGroup(GroupVar *OptionGroup) { | ||
| 47 | + | core.LazyRegister(&xOptionContextAddGroup, "GLIB", "g_option_context_add_group", false) | |||
| 48 | + | ||||
| 48 | xOptionContextAddGroup(x.GoPointer(), GroupVar) | 49 | xOptionContextAddGroup(x.GoPointer(), GroupVar) | ||
| 49 | } | 50 | } | ||
| 50 | 51 | ||||
| @@ -53,6 +54,8 @@ var xOptionContextAddMainEntries func(uintptr, []OptionEntry, uintptr) | |||||
| 53 | // A convenience function which creates a main group if it doesn't | 54 | // A convenience function which creates a main group if it doesn't | ||
| 54 | // exist, adds the @entries to it and sets the translation domain. | 55 | // exist, adds the @entries to it and sets the translation domain. | ||
| 55 | func (x *OptionContext) AddMainEntries(EntriesVar []OptionEntry, TranslationDomainVar *string) { | 56 | func (x *OptionContext) AddMainEntries(EntriesVar []OptionEntry, TranslationDomainVar *string) { | ||
| 57 | + | core.LazyRegister(&xOptionContextAddMainEntries, "GLIB", "g_option_context_add_main_entries", false) | |||
| 58 | + | ||||
| 56 | TranslationDomainVarPtr := core.GStrdupNullable(TranslationDomainVar) | 59 | TranslationDomainVarPtr := core.GStrdupNullable(TranslationDomainVar) | ||
| 57 | defer core.GFreeNullable(TranslationDomainVarPtr) | 60 | defer core.GFreeNullable(TranslationDomainVarPtr) | ||
| 58 | 61 | ||||
| @@ -67,6 +70,8 @@ var xOptionContextFree func(uintptr) | |||||
| 67 | // Please note that parsed arguments need to be freed separately (see | 70 | // Please note that parsed arguments need to be freed separately (see | ||
| 68 | // #GOptionEntry). | 71 | // #GOptionEntry). | ||
| 69 | func (x *OptionContext) Free() { | 72 | func (x *OptionContext) Free() { | ||
| 73 | + | core.LazyRegister(&xOptionContextFree, "GLIB", "g_option_context_free", false) | |||
| 74 | + | ||||
| 70 | xOptionContextFree(x.GoPointer()) | 75 | xOptionContextFree(x.GoPointer()) | ||
| 71 | } | 76 | } | ||
| 72 | 77 | ||||
| @@ -74,6 +79,8 @@ var xOptionContextGetDescription func(uintptr) string | |||||
| 74 | 79 | ||||
| 75 | // Returns the description. See g_option_context_set_description(). | 80 | // Returns the description. See g_option_context_set_description(). | ||
| 76 | func (x *OptionContext) GetDescription() string { | 81 | func (x *OptionContext) GetDescription() string { | ||
| 82 | + | core.LazyRegister(&xOptionContextGetDescription, "GLIB", "g_option_context_get_description", false) | |||
| 83 | + | ||||
| 77 | cret := xOptionContextGetDescription(x.GoPointer()) | 84 | cret := xOptionContextGetDescription(x.GoPointer()) | ||
| 78 | return cret | 85 | return cret | ||
| 79 | } | 86 | } | ||
| @@ -88,6 +95,8 @@ var xOptionContextGetHelp func(uintptr, bool, *OptionGroup) string | |||||
| 88 | // To obtain the help text for an option group, call | 95 | // To obtain the help text for an option group, call | ||
| 89 | // `g_option_context_get_help (context, FALSE, group)`. | 96 | // `g_option_context_get_help (context, FALSE, group)`. | ||
| 90 | func (x *OptionContext) GetHelp(MainHelpVar bool, GroupVar *OptionGroup) string { | 97 | func (x *OptionContext) GetHelp(MainHelpVar bool, GroupVar *OptionGroup) string { | ||
| 98 | + | core.LazyRegister(&xOptionContextGetHelp, "GLIB", "g_option_context_get_help", false) | |||
| 99 | + | ||||
| 91 | cret := xOptionContextGetHelp(x.GoPointer(), MainHelpVar, GroupVar) | 100 | cret := xOptionContextGetHelp(x.GoPointer(), MainHelpVar, GroupVar) | ||
| 92 | return cret | 101 | return cret | ||
| 93 | } | 102 | } | ||
| @@ -97,6 +106,8 @@ var xOptionContextGetHelpEnabled func(uintptr) bool | |||||
| 97 | // Returns whether automatic `--help` generation | 106 | // Returns whether automatic `--help` generation | ||
| 98 | // is turned on for @context. See g_option_context_set_help_enabled(). | 107 | // is turned on for @context. See g_option_context_set_help_enabled(). | ||
| 99 | func (x *OptionContext) GetHelpEnabled() bool { | 108 | func (x *OptionContext) GetHelpEnabled() bool { | ||
| 109 | + | core.LazyRegister(&xOptionContextGetHelpEnabled, "GLIB", "g_option_context_get_help_enabled", false) | |||
| 110 | + | ||||
| 100 | cret := xOptionContextGetHelpEnabled(x.GoPointer()) | 111 | cret := xOptionContextGetHelpEnabled(x.GoPointer()) | ||
| 101 | return cret | 112 | return cret | ||
| 102 | } | 113 | } | ||
| @@ -106,6 +117,8 @@ var xOptionContextGetIgnoreUnknownOptions func(uintptr) bool | |||||
| 106 | // Returns whether unknown options are ignored or not. See | 117 | // Returns whether unknown options are ignored or not. See | ||
| 107 | // g_option_context_set_ignore_unknown_options(). | 118 | // g_option_context_set_ignore_unknown_options(). | ||
| 108 | func (x *OptionContext) GetIgnoreUnknownOptions() bool { | 119 | func (x *OptionContext) GetIgnoreUnknownOptions() bool { | ||
| 120 | + | core.LazyRegister(&xOptionContextGetIgnoreUnknownOptions, "GLIB", "g_option_context_get_ignore_unknown_options", false) | |||
| 121 | + | ||||
| 109 | cret := xOptionContextGetIgnoreUnknownOptions(x.GoPointer()) | 122 | cret := xOptionContextGetIgnoreUnknownOptions(x.GoPointer()) | ||
| 110 | return cret | 123 | return cret | ||
| 111 | } | 124 | } | ||
| @@ -114,6 +127,8 @@ var xOptionContextGetMainGroup func(uintptr) uintptr | |||||
| 114 | 127 | ||||
| 115 | // Returns a pointer to the main group of @context. | 128 | // Returns a pointer to the main group of @context. | ||
| 116 | func (x *OptionContext) GetMainGroup() *OptionGroup { | 129 | func (x *OptionContext) GetMainGroup() *OptionGroup { | ||
| 130 | + | core.LazyRegister(&xOptionContextGetMainGroup, "GLIB", "g_option_context_get_main_group", false) | |||
| 131 | + | ||||
| 117 | cret := xOptionContextGetMainGroup(x.GoPointer()) | 132 | cret := xOptionContextGetMainGroup(x.GoPointer()) | ||
| 118 | if cret == 0 { | 133 | if cret == 0 { | ||
| 119 | return nil | 134 | return nil | ||
| @@ -127,6 +142,8 @@ var xOptionContextGetStrictPosix func(uintptr) bool | |||||
| 127 | // | 142 | // | ||
| 128 | // See g_option_context_set_strict_posix() for more information. | 143 | // See g_option_context_set_strict_posix() for more information. | ||
| 129 | func (x *OptionContext) GetStrictPosix() bool { | 144 | func (x *OptionContext) GetStrictPosix() bool { | ||
| 145 | + | core.LazyRegister(&xOptionContextGetStrictPosix, "GLIB", "g_option_context_get_strict_posix", false) | |||
| 146 | + | ||||
| 130 | cret := xOptionContextGetStrictPosix(x.GoPointer()) | 147 | cret := xOptionContextGetStrictPosix(x.GoPointer()) | ||
| 131 | return cret | 148 | return cret | ||
| 132 | } | 149 | } | ||
| @@ -135,6 +152,8 @@ var xOptionContextGetSummary func(uintptr) string | |||||
| 135 | 152 | ||||
| 136 | // Returns the summary. See g_option_context_set_summary(). | 153 | // Returns the summary. See g_option_context_set_summary(). | ||
| 137 | func (x *OptionContext) GetSummary() string { | 154 | func (x *OptionContext) GetSummary() string { | ||
| 155 | + | core.LazyRegister(&xOptionContextGetSummary, "GLIB", "g_option_context_get_summary", false) | |||
| 156 | + | ||||
| 138 | cret := xOptionContextGetSummary(x.GoPointer()) | 157 | cret := xOptionContextGetSummary(x.GoPointer()) | ||
| 139 | return cret | 158 | return cret | ||
| 140 | } | 159 | } | ||
| @@ -163,6 +182,7 @@ var xOptionContextParse func(uintptr, *int, *[]string, **Error) bool | |||||
| 163 | // [current locale](running.html#locale) for automatic | 182 | // [current locale](running.html#locale) for automatic | ||
| 164 | // character set conversion of string and filename arguments. | 183 | // character set conversion of string and filename arguments. | ||
| 165 | func (x *OptionContext) Parse(ArgcVar *int, ArgvVar *[]string) (bool, error) { | 184 | func (x *OptionContext) Parse(ArgcVar *int, ArgvVar *[]string) (bool, error) { | ||
| 185 | + | core.LazyRegister(&xOptionContextParse, "GLIB", "g_option_context_parse", false) | |||
| 166 | var cerr *Error | 186 | var cerr *Error | ||
| 167 | 187 | ||||
| 168 | cret := xOptionContextParse(x.GoPointer(), ArgcVar, ArgvVar, &cerr) | 188 | cret := xOptionContextParse(x.GoPointer(), ArgcVar, ArgvVar, &cerr) | ||
| @@ -191,6 +211,7 @@ var xOptionContextParseStrv func(uintptr, *[]string, **Error) bool | |||||
| 191 | // This function is useful if you are trying to use #GOptionContext with | 211 | // This function is useful if you are trying to use #GOptionContext with | ||
| 192 | // #GApplication. | 212 | // #GApplication. | ||
| 193 | func (x *OptionContext) ParseStrv(ArgumentsVar *[]string) (bool, error) { | 213 | func (x *OptionContext) ParseStrv(ArgumentsVar *[]string) (bool, error) { | ||
| 214 | + | core.LazyRegister(&xOptionContextParseStrv, "GLIB", "g_option_context_parse_strv", false) | |||
| 194 | var cerr *Error | 215 | var cerr *Error | ||
| 195 | 216 | ||||
| 196 | cret := xOptionContextParseStrv(x.GoPointer(), ArgumentsVar, &cerr) | 217 | cret := xOptionContextParseStrv(x.GoPointer(), ArgumentsVar, &cerr) | ||
| @@ -208,6 +229,8 @@ var xOptionContextSetDescription func(uintptr, uintptr) | |||||
| 208 | // Note that the summary is translated (see | 229 | // Note that the summary is translated (see | ||
| 209 | // g_option_context_set_translate_func()). | 230 | // g_option_context_set_translate_func()). | ||
| 210 | func (x *OptionContext) SetDescription(DescriptionVar *string) { | 231 | func (x *OptionContext) SetDescription(DescriptionVar *string) { | ||
| 232 | + | core.LazyRegister(&xOptionContextSetDescription, "GLIB", "g_option_context_set_description", false) | |||
| 233 | + | ||||
| 211 | DescriptionVarPtr := core.GStrdupNullable(DescriptionVar) | 234 | DescriptionVarPtr := core.GStrdupNullable(DescriptionVar) | ||
| 212 | defer core.GFreeNullable(DescriptionVarPtr) | 235 | defer core.GFreeNullable(DescriptionVarPtr) | ||
| 213 | 236 | ||||
| @@ -221,6 +244,8 @@ var xOptionContextSetHelpEnabled func(uintptr, bool) | |||||
| 221 | // `-?`, `--help-all` and `--help-groupname` and creates suitable | 244 | // `-?`, `--help-all` and `--help-groupname` and creates suitable | ||
| 222 | // output to stdout. | 245 | // output to stdout. | ||
| 223 | func (x *OptionContext) SetHelpEnabled(HelpEnabledVar bool) { | 246 | func (x *OptionContext) SetHelpEnabled(HelpEnabledVar bool) { | ||
| 247 | + | core.LazyRegister(&xOptionContextSetHelpEnabled, "GLIB", "g_option_context_set_help_enabled", false) | |||
| 248 | + | ||||
| 224 | xOptionContextSetHelpEnabled(x.GoPointer(), HelpEnabledVar) | 249 | xOptionContextSetHelpEnabled(x.GoPointer(), HelpEnabledVar) | ||
| 225 | } | 250 | } | ||
| 226 | 251 | ||||
| @@ -234,6 +259,8 @@ var xOptionContextSetIgnoreUnknownOptions func(uintptr, bool) | |||||
| 234 | // which don't start with a dash). But note that GOption cannot reliably | 259 | // which don't start with a dash). But note that GOption cannot reliably | ||
| 235 | // determine whether a non-option belongs to a preceding unknown option. | 260 | // determine whether a non-option belongs to a preceding unknown option. | ||
| 236 | func (x *OptionContext) SetIgnoreUnknownOptions(IgnoreUnknownVar bool) { | 261 | func (x *OptionContext) SetIgnoreUnknownOptions(IgnoreUnknownVar bool) { | ||
| 262 | + | core.LazyRegister(&xOptionContextSetIgnoreUnknownOptions, "GLIB", "g_option_context_set_ignore_unknown_options", false) | |||
| 263 | + | ||||
| 237 | xOptionContextSetIgnoreUnknownOptions(x.GoPointer(), IgnoreUnknownVar) | 264 | xOptionContextSetIgnoreUnknownOptions(x.GoPointer(), IgnoreUnknownVar) | ||
| 238 | } | 265 | } | ||
| 239 | 266 | ||||
| @@ -244,6 +271,8 @@ var xOptionContextSetMainGroup func(uintptr, *OptionGroup) | |||||
| 244 | // the only difference is that the options in the main group are | 271 | // the only difference is that the options in the main group are | ||
| 245 | // treated differently when generating `--help` output. | 272 | // treated differently when generating `--help` output. | ||
| 246 | func (x *OptionContext) SetMainGroup(GroupVar *OptionGroup) { | 273 | func (x *OptionContext) SetMainGroup(GroupVar *OptionGroup) { | ||
| 274 | + | core.LazyRegister(&xOptionContextSetMainGroup, "GLIB", "g_option_context_set_main_group", false) | |||
| 275 | + | ||||
| 247 | xOptionContextSetMainGroup(x.GoPointer(), GroupVar) | 276 | xOptionContextSetMainGroup(x.GoPointer(), GroupVar) | ||
| 248 | } | 277 | } | ||
| 249 | 278 | ||||
| @@ -274,6 +303,8 @@ var xOptionContextSetStrictPosix func(uintptr, bool) | |||||
| 274 | // examining the verb name, which should be present in argv[1] after | 303 | // examining the verb name, which should be present in argv[1] after | ||
| 275 | // parsing). | 304 | // parsing). | ||
| 276 | func (x *OptionContext) SetStrictPosix(StrictPosixVar bool) { | 305 | func (x *OptionContext) SetStrictPosix(StrictPosixVar bool) { | ||
| 306 | + | core.LazyRegister(&xOptionContextSetStrictPosix, "GLIB", "g_option_context_set_strict_posix", false) | |||
| 307 | + | ||||
| 277 | xOptionContextSetStrictPosix(x.GoPointer(), StrictPosixVar) | 308 | xOptionContextSetStrictPosix(x.GoPointer(), StrictPosixVar) | ||
| 278 | } | 309 | } | ||
| 279 | 310 | ||||
| @@ -286,6 +317,8 @@ var xOptionContextSetSummary func(uintptr, uintptr) | |||||
| 286 | // g_option_context_set_translate_func() and | 317 | // g_option_context_set_translate_func() and | ||
| 287 | // g_option_context_set_translation_domain()). | 318 | // g_option_context_set_translation_domain()). | ||
| 288 | func (x *OptionContext) SetSummary(SummaryVar *string) { | 319 | func (x *OptionContext) SetSummary(SummaryVar *string) { | ||
| 320 | + | core.LazyRegister(&xOptionContextSetSummary, "GLIB", "g_option_context_set_summary", false) | |||
| 321 | + | ||||
| 289 | SummaryVarPtr := core.GStrdupNullable(SummaryVar) | 322 | SummaryVarPtr := core.GStrdupNullable(SummaryVar) | ||
| 290 | defer core.GFreeNullable(SummaryVarPtr) | 323 | defer core.GFreeNullable(SummaryVarPtr) | ||
| 291 | 324 | ||||
| @@ -306,6 +339,8 @@ var xOptionContextSetTranslateFunc func(uintptr, uintptr, uintptr, uintptr) | |||||
| 306 | // If you are using gettext(), you only need to set the translation | 339 | // If you are using gettext(), you only need to set the translation | ||
| 307 | // domain, see g_option_context_set_translation_domain(). | 340 | // domain, see g_option_context_set_translation_domain(). | ||
| 308 | func (x *OptionContext) SetTranslateFunc(FuncVar *TranslateFunc, DataVar uintptr, DestroyNotifyVar *DestroyNotify) { | 341 | func (x *OptionContext) SetTranslateFunc(FuncVar *TranslateFunc, DataVar uintptr, DestroyNotifyVar *DestroyNotify) { | ||
| 342 | + | core.LazyRegister(&xOptionContextSetTranslateFunc, "GLIB", "g_option_context_set_translate_func", false) | |||
| 343 | + | ||||
| 309 | xOptionContextSetTranslateFunc(x.GoPointer(), NewCallbackNullable(FuncVar), DataVar, NewCallbackNullable(DestroyNotifyVar)) | 344 | xOptionContextSetTranslateFunc(x.GoPointer(), NewCallbackNullable(FuncVar), DataVar, NewCallbackNullable(DestroyNotifyVar)) | ||
| 310 | } | 345 | } | ||
| 311 | 346 | ||||
| @@ -314,6 +349,8 @@ var xOptionContextSetTranslationDomain func(uintptr, string) | |||||
| 314 | // A convenience function to use gettext() for translating | 349 | // A convenience function to use gettext() for translating | ||
| 315 | // user-visible strings. | 350 | // user-visible strings. | ||
| 316 | func (x *OptionContext) SetTranslationDomain(DomainVar string) { | 351 | func (x *OptionContext) SetTranslationDomain(DomainVar string) { | ||
| 352 | + | core.LazyRegister(&xOptionContextSetTranslationDomain, "GLIB", "g_option_context_set_translation_domain", false) | |||
| 353 | + | ||||
| 317 | xOptionContextSetTranslationDomain(x.GoPointer(), DomainVar) | 354 | xOptionContextSetTranslationDomain(x.GoPointer(), DomainVar) | ||
| 318 | } | 355 | } | ||
| 319 | 356 | ||||
| @@ -384,6 +421,7 @@ type OptionGroup struct { | |||||
| 384 | var xOptionGroupGLibType func() types.GType | 421 | var xOptionGroupGLibType func() types.GType | ||
| 385 | 422 | ||||
| 386 | func OptionGroupGLibType() types.GType { | 423 | func OptionGroupGLibType() types.GType { | ||
| 424 | + | core.LazyRegister(&xOptionGroupGLibType, "GLIB", "g_option_group_get_type", false) | |||
| 387 | return xOptionGroupGLibType() | 425 | return xOptionGroupGLibType() | ||
| 388 | } | 426 | } | ||
| 389 | 427 | ||||
| @@ -408,6 +446,8 @@ var xNewOptionGroup func(string, string, string, uintptr, uintptr) uintptr | |||||
| 408 | // that it matches the style of built-in GLib group titles such as | 446 | // that it matches the style of built-in GLib group titles such as | ||
| 409 | // ‘Application Options:’. | 447 | // ‘Application Options:’. | ||
| 410 | func NewOptionGroup(NameVar string, DescriptionVar string, HelpDescriptionVar string, UserDataVar uintptr, DestroyVar *DestroyNotify) *OptionGroup { | 448 | func NewOptionGroup(NameVar string, DescriptionVar string, HelpDescriptionVar string, UserDataVar uintptr, DestroyVar *DestroyNotify) *OptionGroup { | ||
| 449 | + | core.LazyRegister(&xNewOptionGroup, "GLIB", "g_option_group_new", false) | |||
| 450 | + | ||||
| 411 | cret := xNewOptionGroup(NameVar, DescriptionVar, HelpDescriptionVar, UserDataVar, NewCallbackNullable(DestroyVar)) | 451 | cret := xNewOptionGroup(NameVar, DescriptionVar, HelpDescriptionVar, UserDataVar, NewCallbackNullable(DestroyVar)) | ||
| 412 | if cret == 0 { | 452 | if cret == 0 { | ||
| 413 | return nil | 453 | return nil | ||
| @@ -419,6 +459,8 @@ var xOptionGroupAddEntries func(uintptr, []OptionEntry) | |||||
| 419 | 459 | ||||
| 420 | // Adds the options specified in @entries to @group. | 460 | // Adds the options specified in @entries to @group. | ||
| 421 | func (x *OptionGroup) AddEntries(EntriesVar []OptionEntry) { | 461 | func (x *OptionGroup) AddEntries(EntriesVar []OptionEntry) { | ||
| 462 | + | core.LazyRegister(&xOptionGroupAddEntries, "GLIB", "g_option_group_add_entries", false) | |||
| 463 | + | ||||
| 422 | xOptionGroupAddEntries(x.GoPointer(), EntriesVar) | 464 | xOptionGroupAddEntries(x.GoPointer(), EntriesVar) | ||
| 423 | } | 465 | } | ||
| 424 | 466 | ||||
| @@ -427,6 +469,8 @@ var xOptionGroupFree func(uintptr) | |||||
| 427 | // Frees a #GOptionGroup. Note that you must not free groups | 469 | // Frees a #GOptionGroup. Note that you must not free groups | ||
| 428 | // which have been added to a #GOptionContext. | 470 | // which have been added to a #GOptionContext. | ||
| 429 | func (x *OptionGroup) Free() { | 471 | func (x *OptionGroup) Free() { | ||
| 472 | + | core.LazyRegister(&xOptionGroupFree, "GLIB", "g_option_group_free", false) | |||
| 473 | + | ||||
| 430 | xOptionGroupFree(x.GoPointer()) | 474 | xOptionGroupFree(x.GoPointer()) | ||
| 431 | } | 475 | } | ||
| 432 | 476 | ||||
| @@ -434,6 +478,8 @@ var xOptionGroupRef func(uintptr) uintptr | |||||
| 434 | 478 | ||||
| 435 | // Increments the reference count of @group by one. | 479 | // Increments the reference count of @group by one. | ||
| 436 | func (x *OptionGroup) Ref() *OptionGroup { | 480 | func (x *OptionGroup) Ref() *OptionGroup { | ||
| 481 | + | core.LazyRegister(&xOptionGroupRef, "GLIB", "g_option_group_ref", false) | |||
| 482 | + | ||||
| 437 | cret := xOptionGroupRef(x.GoPointer()) | 483 | cret := xOptionGroupRef(x.GoPointer()) | ||
| 438 | if cret == 0 { | 484 | if cret == 0 { | ||
| 439 | return nil | 485 | return nil | ||
| @@ -449,6 +495,8 @@ var xOptionGroupSetErrorHook func(uintptr, uintptr) | |||||
| 449 | // Note that the user data to be passed to @error_func can be | 495 | // Note that the user data to be passed to @error_func can be | ||
| 450 | // specified when constructing the group with g_option_group_new(). | 496 | // specified when constructing the group with g_option_group_new(). | ||
| 451 | func (x *OptionGroup) SetErrorHook(ErrorFuncVar *OptionErrorFunc) { | 497 | func (x *OptionGroup) SetErrorHook(ErrorFuncVar *OptionErrorFunc) { | ||
| 498 | + | core.LazyRegister(&xOptionGroupSetErrorHook, "GLIB", "g_option_group_set_error_hook", false) | |||
| 499 | + | ||||
| 452 | xOptionGroupSetErrorHook(x.GoPointer(), NewCallback(ErrorFuncVar)) | 500 | xOptionGroupSetErrorHook(x.GoPointer(), NewCallback(ErrorFuncVar)) | ||
| 453 | } | 501 | } | ||
| 454 | 502 | ||||
| @@ -462,6 +510,8 @@ var xOptionGroupSetParseHooks func(uintptr, uintptr, uintptr) | |||||
| 462 | // @post_parse_func can be specified when constructing the group | 510 | // @post_parse_func can be specified when constructing the group | ||
| 463 | // with g_option_group_new(). | 511 | // with g_option_group_new(). | ||
| 464 | func (x *OptionGroup) SetParseHooks(PreParseFuncVar *OptionParseFunc, PostParseFuncVar *OptionParseFunc) { | 512 | func (x *OptionGroup) SetParseHooks(PreParseFuncVar *OptionParseFunc, PostParseFuncVar *OptionParseFunc) { | ||
| 513 | + | core.LazyRegister(&xOptionGroupSetParseHooks, "GLIB", "g_option_group_set_parse_hooks", false) | |||
| 514 | + | ||||
| 465 | xOptionGroupSetParseHooks(x.GoPointer(), NewCallbackNullable(PreParseFuncVar), NewCallbackNullable(PostParseFuncVar)) | 515 | xOptionGroupSetParseHooks(x.GoPointer(), NewCallbackNullable(PreParseFuncVar), NewCallbackNullable(PostParseFuncVar)) | ||
| 466 | } | 516 | } | ||
| 467 | 517 | ||||
| @@ -474,6 +524,8 @@ var xOptionGroupSetTranslateFunc func(uintptr, uintptr, uintptr, uintptr) | |||||
| 474 | // If you are using gettext(), you only need to set the translation | 524 | // If you are using gettext(), you only need to set the translation | ||
| 475 | // domain, see g_option_group_set_translation_domain(). | 525 | // domain, see g_option_group_set_translation_domain(). | ||
| 476 | func (x *OptionGroup) SetTranslateFunc(FuncVar *TranslateFunc, DataVar uintptr, DestroyNotifyVar *DestroyNotify) { | 526 | func (x *OptionGroup) SetTranslateFunc(FuncVar *TranslateFunc, DataVar uintptr, DestroyNotifyVar *DestroyNotify) { | ||
| 527 | + | core.LazyRegister(&xOptionGroupSetTranslateFunc, "GLIB", "g_option_group_set_translate_func", false) | |||
| 528 | + | ||||
| 477 | xOptionGroupSetTranslateFunc(x.GoPointer(), NewCallbackNullable(FuncVar), DataVar, NewCallbackNullable(DestroyNotifyVar)) | 529 | xOptionGroupSetTranslateFunc(x.GoPointer(), NewCallbackNullable(FuncVar), DataVar, NewCallbackNullable(DestroyNotifyVar)) | ||
| 478 | } | 530 | } | ||
| 479 | 531 | ||||
| @@ -482,6 +534,8 @@ var xOptionGroupSetTranslationDomain func(uintptr, string) | |||||
| 482 | // A convenience function to use gettext() for translating | 534 | // A convenience function to use gettext() for translating | ||
| 483 | // user-visible strings. | 535 | // user-visible strings. | ||
| 484 | func (x *OptionGroup) SetTranslationDomain(DomainVar string) { | 536 | func (x *OptionGroup) SetTranslationDomain(DomainVar string) { | ||
| 537 | + | core.LazyRegister(&xOptionGroupSetTranslationDomain, "GLIB", "g_option_group_set_translation_domain", false) | |||
| 538 | + | ||||
| 485 | xOptionGroupSetTranslationDomain(x.GoPointer(), DomainVar) | 539 | xOptionGroupSetTranslationDomain(x.GoPointer(), DomainVar) | ||
| 486 | } | 540 | } | ||
| 487 | 541 | ||||
| @@ -491,6 +545,8 @@ var xOptionGroupUnref func(uintptr) | |||||
| 491 | // If the reference count drops to 0, the @group will be freed. | 545 | // If the reference count drops to 0, the @group will be freed. | ||
| 492 | // and all memory allocated by the @group is released. | 546 | // and all memory allocated by the @group is released. | ||
| 493 | func (x *OptionGroup) Unref() { | 547 | func (x *OptionGroup) Unref() { | ||
| 548 | + | core.LazyRegister(&xOptionGroupUnref, "GLIB", "g_option_group_unref", false) | |||
| 549 | + | ||||
| 494 | xOptionGroupUnref(x.GoPointer()) | 550 | xOptionGroupUnref(x.GoPointer()) | ||
| 495 | } | 551 | } | ||
| 496 | 552 | ||||
| @@ -607,46 +663,4 @@ const ( | |||||
| 607 | func init() { | 663 | func init() { | ||
| 608 | core.SetPackageName("GLIB", "glib-2.0") | 664 | core.SetPackageName("GLIB", "glib-2.0") | ||
| 609 | core.SetSharedLibraries("GLIB", []string{"libgobject-2.0.so.0", "libglib-2.0.so.0", "libgobject-2.0.0.dylib", "libglib-2.0.0.dylib"}) | 665 | core.SetSharedLibraries("GLIB", []string{"libgobject-2.0.so.0", "libglib-2.0.so.0", "libgobject-2.0.0.dylib", "libglib-2.0.0.dylib"}) | ||
| 610 | - | var libs []uintptr | |||
| 611 | - | for _, libPath := range core.GetPaths("GLIB") { | |||
| 612 | - | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |||
| 613 | - | if err != nil { | |||
| 614 | - | panic(err) | |||
| 615 | - | } | |||
| 616 | - | libs = append(libs, lib) | |||
| 617 | - | } | |||
| 618 | - | ||||
| 619 | - | core.PuregoSafeRegister(&xOptionContextAddGroup, libs, "g_option_context_add_group") | |||
| 620 | - | core.PuregoSafeRegister(&xOptionContextAddMainEntries, libs, "g_option_context_add_main_entries") | |||
| 621 | - | core.PuregoSafeRegister(&xOptionContextFree, libs, "g_option_context_free") | |||
| 622 | - | core.PuregoSafeRegister(&xOptionContextGetDescription, libs, "g_option_context_get_description") | |||
| 623 | - | core.PuregoSafeRegister(&xOptionContextGetHelp, libs, "g_option_context_get_help") | |||
| 624 | - | core.PuregoSafeRegister(&xOptionContextGetHelpEnabled, libs, "g_option_context_get_help_enabled") | |||
| 625 | - | core.PuregoSafeRegister(&xOptionContextGetIgnoreUnknownOptions, libs, "g_option_context_get_ignore_unknown_options") | |||
| 626 | - | core.PuregoSafeRegister(&xOptionContextGetMainGroup, libs, "g_option_context_get_main_group") | |||
| 627 | - | core.PuregoSafeRegister(&xOptionContextGetStrictPosix, libs, "g_option_context_get_strict_posix") | |||
| 628 | - | core.PuregoSafeRegister(&xOptionContextGetSummary, libs, "g_option_context_get_summary") | |||
| 629 | - | core.PuregoSafeRegister(&xOptionContextParse, libs, "g_option_context_parse") | |||
| 630 | - | core.PuregoSafeRegister(&xOptionContextParseStrv, libs, "g_option_context_parse_strv") | |||
| 631 | - | core.PuregoSafeRegister(&xOptionContextSetDescription, libs, "g_option_context_set_description") | |||
| 632 | - | core.PuregoSafeRegister(&xOptionContextSetHelpEnabled, libs, "g_option_context_set_help_enabled") | |||
| 633 | - | core.PuregoSafeRegister(&xOptionContextSetIgnoreUnknownOptions, libs, "g_option_context_set_ignore_unknown_options") | |||
| 634 | - | core.PuregoSafeRegister(&xOptionContextSetMainGroup, libs, "g_option_context_set_main_group") | |||
| 635 | - | core.PuregoSafeRegister(&xOptionContextSetStrictPosix, libs, "g_option_context_set_strict_posix") | |||
| 636 | - | core.PuregoSafeRegister(&xOptionContextSetSummary, libs, "g_option_context_set_summary") | |||
| 637 | - | core.PuregoSafeRegister(&xOptionContextSetTranslateFunc, libs, "g_option_context_set_translate_func") | |||
| 638 | - | core.PuregoSafeRegister(&xOptionContextSetTranslationDomain, libs, "g_option_context_set_translation_domain") | |||
| 639 | - | ||||
| 640 | - | core.PuregoSafeRegister(&xOptionGroupGLibType, libs, "g_option_group_get_type") | |||
| 641 | - | ||||
| 642 | - | core.PuregoSafeRegister(&xNewOptionGroup, libs, "g_option_group_new") | |||
| 643 | - | ||||
| 644 | - | core.PuregoSafeRegister(&xOptionGroupAddEntries, libs, "g_option_group_add_entries") | |||
| 645 | - | core.PuregoSafeRegister(&xOptionGroupFree, libs, "g_option_group_free") | |||
| 646 | - | core.PuregoSafeRegister(&xOptionGroupRef, libs, "g_option_group_ref") | |||
| 647 | - | core.PuregoSafeRegister(&xOptionGroupSetErrorHook, libs, "g_option_group_set_error_hook") | |||
| 648 | - | core.PuregoSafeRegister(&xOptionGroupSetParseHooks, libs, "g_option_group_set_parse_hooks") | |||
| 649 | - | core.PuregoSafeRegister(&xOptionGroupSetTranslateFunc, libs, "g_option_group_set_translate_func") | |||
| 650 | - | core.PuregoSafeRegister(&xOptionGroupSetTranslationDomain, libs, "g_option_group_set_translation_domain") | |||
| 651 | - | core.PuregoSafeRegister(&xOptionGroupUnref, libs, "g_option_group_unref") | |||
| 652 | } | 666 | } | ||