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
| @@ -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/glib" | |
| 11 | 10 | "github.com/bnema/puregotk/v4/gobject/types" | |
| @@ -27,6 +26,7 @@ type DBusAnnotationInfo struct { | |||
| 27 | 26 | var xDBusAnnotationInfoGLibType func() types.GType | |
| 28 | 27 | ||
| 29 | 28 | func DBusAnnotationInfoGLibType() types.GType { | |
| 29 | + | core.LazyRegister(&xDBusAnnotationInfoGLibType, "GIO", "g_dbus_annotation_info_get_type", false) | |
| 30 | 30 | return xDBusAnnotationInfoGLibType() | |
| 31 | 31 | } | |
| 32 | 32 | ||
| @@ -47,6 +47,8 @@ var xDBusAnnotationInfoRef func(uintptr) uintptr | |||
| 47 | 47 | // If @info is statically allocated does nothing. Otherwise increases | |
| 48 | 48 | // the reference count. | |
| 49 | 49 | func (x *DBusAnnotationInfo) Ref() *DBusAnnotationInfo { | |
| 50 | + | core.LazyRegister(&xDBusAnnotationInfoRef, "GIO", "g_dbus_annotation_info_ref", false) | |
| 51 | + | ||
| 50 | 52 | cret := xDBusAnnotationInfoRef(x.GoPointer()) | |
| 51 | 53 | if cret == 0 { | |
| 52 | 54 | return nil | |
| @@ -60,6 +62,8 @@ var xDBusAnnotationInfoUnref func(uintptr) | |||
| 60 | 62 | // the reference count of @info. When its reference count drops to 0, | |
| 61 | 63 | // the memory used is freed. | |
| 62 | 64 | func (x *DBusAnnotationInfo) Unref() { | |
| 65 | + | core.LazyRegister(&xDBusAnnotationInfoUnref, "GIO", "g_dbus_annotation_info_unref", false) | |
| 66 | + | ||
| 63 | 67 | xDBusAnnotationInfoUnref(x.GoPointer()) | |
| 64 | 68 | } | |
| 65 | 69 | ||
| @@ -79,6 +83,7 @@ type DBusArgInfo struct { | |||
| 79 | 83 | var xDBusArgInfoGLibType func() types.GType | |
| 80 | 84 | ||
| 81 | 85 | func DBusArgInfoGLibType() types.GType { | |
| 86 | + | core.LazyRegister(&xDBusArgInfoGLibType, "GIO", "g_dbus_arg_info_get_type", false) | |
| 82 | 87 | return xDBusArgInfoGLibType() | |
| 83 | 88 | } | |
| 84 | 89 | ||
| @@ -99,6 +104,8 @@ var xDBusArgInfoRef func(uintptr) uintptr | |||
| 99 | 104 | // If @info is statically allocated does nothing. Otherwise increases | |
| 100 | 105 | // the reference count. | |
| 101 | 106 | func (x *DBusArgInfo) Ref() *DBusArgInfo { | |
| 107 | + | core.LazyRegister(&xDBusArgInfoRef, "GIO", "g_dbus_arg_info_ref", false) | |
| 108 | + | ||
| 102 | 109 | cret := xDBusArgInfoRef(x.GoPointer()) | |
| 103 | 110 | if cret == 0 { | |
| 104 | 111 | return nil | |
| @@ -112,6 +119,8 @@ var xDBusArgInfoUnref func(uintptr) | |||
| 112 | 119 | // the reference count of @info. When its reference count drops to 0, | |
| 113 | 120 | // the memory used is freed. | |
| 114 | 121 | func (x *DBusArgInfo) Unref() { | |
| 122 | + | core.LazyRegister(&xDBusArgInfoUnref, "GIO", "g_dbus_arg_info_unref", false) | |
| 123 | + | ||
| 115 | 124 | xDBusArgInfoUnref(x.GoPointer()) | |
| 116 | 125 | } | |
| 117 | 126 | ||
| @@ -135,6 +144,7 @@ type DBusInterfaceInfo struct { | |||
| 135 | 144 | var xDBusInterfaceInfoGLibType func() types.GType | |
| 136 | 145 | ||
| 137 | 146 | func DBusInterfaceInfoGLibType() types.GType { | |
| 147 | + | core.LazyRegister(&xDBusInterfaceInfoGLibType, "GIO", "g_dbus_interface_info_get_type", false) | |
| 138 | 148 | return xDBusInterfaceInfoGLibType() | |
| 139 | 149 | } | |
| 140 | 150 | ||
| @@ -163,6 +173,8 @@ var xDBusInterfaceInfoCacheBuild func(uintptr) | |||
| 163 | 173 | // Note that @info cannot be modified until | |
| 164 | 174 | // g_dbus_interface_info_cache_release() is called. | |
| 165 | 175 | func (x *DBusInterfaceInfo) CacheBuild() { | |
| 176 | + | core.LazyRegister(&xDBusInterfaceInfoCacheBuild, "GIO", "g_dbus_interface_info_cache_build", false) | |
| 177 | + | ||
| 166 | 178 | xDBusInterfaceInfoCacheBuild(x.GoPointer()) | |
| 167 | 179 | } | |
| 168 | 180 | ||
| @@ -172,6 +184,8 @@ var xDBusInterfaceInfoCacheRelease func(uintptr) | |||
| 172 | 184 | // g_dbus_interface_info_cache_build() (if any) and frees the | |
| 173 | 185 | // resources used by the cache if the usage count drops to zero. | |
| 174 | 186 | func (x *DBusInterfaceInfo) CacheRelease() { | |
| 187 | + | core.LazyRegister(&xDBusInterfaceInfoCacheRelease, "GIO", "g_dbus_interface_info_cache_release", false) | |
| 188 | + | ||
| 175 | 189 | xDBusInterfaceInfoCacheRelease(x.GoPointer()) | |
| 176 | 190 | } | |
| 177 | 191 | ||
| @@ -184,6 +198,8 @@ var xDBusInterfaceInfoGenerateXml func(uintptr, uint, *glib.String) | |||
| 184 | 198 | // `org.freedesktop.DBus.Introspectable.Introspect` | |
| 185 | 199 | // method. | |
| 186 | 200 | func (x *DBusInterfaceInfo) GenerateXml(IndentVar uint, StringBuilderVar *glib.String) { | |
| 201 | + | core.LazyRegister(&xDBusInterfaceInfoGenerateXml, "GIO", "g_dbus_interface_info_generate_xml", false) | |
| 202 | + | ||
| 187 | 203 | xDBusInterfaceInfoGenerateXml(x.GoPointer(), IndentVar, StringBuilderVar) | |
| 188 | 204 | } | |
| 189 | 205 | ||
| @@ -194,6 +210,8 @@ var xDBusInterfaceInfoLookupMethod func(uintptr, string) uintptr | |||
| 194 | 210 | // The cost of this function is O(n) in number of methods unless | |
| 195 | 211 | // g_dbus_interface_info_cache_build() has been used on @info. | |
| 196 | 212 | func (x *DBusInterfaceInfo) LookupMethod(NameVar string) *DBusMethodInfo { | |
| 213 | + | core.LazyRegister(&xDBusInterfaceInfoLookupMethod, "GIO", "g_dbus_interface_info_lookup_method", false) | |
| 214 | + | ||
| 197 | 215 | cret := xDBusInterfaceInfoLookupMethod(x.GoPointer(), NameVar) | |
| 198 | 216 | if cret == 0 { | |
| 199 | 217 | return nil | |
| @@ -208,6 +226,8 @@ var xDBusInterfaceInfoLookupProperty func(uintptr, string) uintptr | |||
| 208 | 226 | // The cost of this function is O(n) in number of properties unless | |
| 209 | 227 | // g_dbus_interface_info_cache_build() has been used on @info. | |
| 210 | 228 | func (x *DBusInterfaceInfo) LookupProperty(NameVar string) *DBusPropertyInfo { | |
| 229 | + | core.LazyRegister(&xDBusInterfaceInfoLookupProperty, "GIO", "g_dbus_interface_info_lookup_property", false) | |
| 230 | + | ||
| 211 | 231 | cret := xDBusInterfaceInfoLookupProperty(x.GoPointer(), NameVar) | |
| 212 | 232 | if cret == 0 { | |
| 213 | 233 | return nil | |
| @@ -222,6 +242,8 @@ var xDBusInterfaceInfoLookupSignal func(uintptr, string) uintptr | |||
| 222 | 242 | // The cost of this function is O(n) in number of signals unless | |
| 223 | 243 | // g_dbus_interface_info_cache_build() has been used on @info. | |
| 224 | 244 | func (x *DBusInterfaceInfo) LookupSignal(NameVar string) *DBusSignalInfo { | |
| 245 | + | core.LazyRegister(&xDBusInterfaceInfoLookupSignal, "GIO", "g_dbus_interface_info_lookup_signal", false) | |
| 246 | + | ||
| 225 | 247 | cret := xDBusInterfaceInfoLookupSignal(x.GoPointer(), NameVar) | |
| 226 | 248 | if cret == 0 { | |
| 227 | 249 | return nil | |
| @@ -234,6 +256,8 @@ var xDBusInterfaceInfoRef func(uintptr) uintptr | |||
| 234 | 256 | // If @info is statically allocated does nothing. Otherwise increases | |
| 235 | 257 | // the reference count. | |
| 236 | 258 | func (x *DBusInterfaceInfo) Ref() *DBusInterfaceInfo { | |
| 259 | + | core.LazyRegister(&xDBusInterfaceInfoRef, "GIO", "g_dbus_interface_info_ref", false) | |
| 260 | + | ||
| 237 | 261 | cret := xDBusInterfaceInfoRef(x.GoPointer()) | |
| 238 | 262 | if cret == 0 { | |
| 239 | 263 | return nil | |
| @@ -247,6 +271,8 @@ var xDBusInterfaceInfoUnref func(uintptr) | |||
| 247 | 271 | // the reference count of @info. When its reference count drops to 0, | |
| 248 | 272 | // the memory used is freed. | |
| 249 | 273 | func (x *DBusInterfaceInfo) Unref() { | |
| 274 | + | core.LazyRegister(&xDBusInterfaceInfoUnref, "GIO", "g_dbus_interface_info_unref", false) | |
| 275 | + | ||
| 250 | 276 | xDBusInterfaceInfoUnref(x.GoPointer()) | |
| 251 | 277 | } | |
| 252 | 278 | ||
| @@ -268,6 +294,7 @@ type DBusMethodInfo struct { | |||
| 268 | 294 | var xDBusMethodInfoGLibType func() types.GType | |
| 269 | 295 | ||
| 270 | 296 | func DBusMethodInfoGLibType() types.GType { | |
| 297 | + | core.LazyRegister(&xDBusMethodInfoGLibType, "GIO", "g_dbus_method_info_get_type", false) | |
| 271 | 298 | return xDBusMethodInfoGLibType() | |
| 272 | 299 | } | |
| 273 | 300 | ||
| @@ -288,6 +315,8 @@ var xDBusMethodInfoRef func(uintptr) uintptr | |||
| 288 | 315 | // If @info is statically allocated does nothing. Otherwise increases | |
| 289 | 316 | // the reference count. | |
| 290 | 317 | func (x *DBusMethodInfo) Ref() *DBusMethodInfo { | |
| 318 | + | core.LazyRegister(&xDBusMethodInfoRef, "GIO", "g_dbus_method_info_ref", false) | |
| 319 | + | ||
| 291 | 320 | cret := xDBusMethodInfoRef(x.GoPointer()) | |
| 292 | 321 | if cret == 0 { | |
| 293 | 322 | return nil | |
| @@ -301,6 +330,8 @@ var xDBusMethodInfoUnref func(uintptr) | |||
| 301 | 330 | // the reference count of @info. When its reference count drops to 0, | |
| 302 | 331 | // the memory used is freed. | |
| 303 | 332 | func (x *DBusMethodInfo) Unref() { | |
| 333 | + | core.LazyRegister(&xDBusMethodInfoUnref, "GIO", "g_dbus_method_info_unref", false) | |
| 334 | + | ||
| 304 | 335 | xDBusMethodInfoUnref(x.GoPointer()) | |
| 305 | 336 | } | |
| 306 | 337 | ||
| @@ -322,6 +353,7 @@ type DBusNodeInfo struct { | |||
| 322 | 353 | var xDBusNodeInfoGLibType func() types.GType | |
| 323 | 354 | ||
| 324 | 355 | func DBusNodeInfoGLibType() types.GType { | |
| 356 | + | core.LazyRegister(&xDBusNodeInfoGLibType, "GIO", "g_dbus_node_info_get_type", false) | |
| 325 | 357 | return xDBusNodeInfoGLibType() | |
| 326 | 358 | } | |
| 327 | 359 | ||
| @@ -348,6 +380,7 @@ var xNewDBusNodeInfoForXml func(string, **glib.Error) uintptr | |||
| 348 | 380 | // [GMarkup](../glib/markup.html)-based | |
| 349 | 381 | // parser that only accepts a subset of valid XML documents. | |
| 350 | 382 | func NewDBusNodeInfoForXml(XmlDataVar string) (*DBusNodeInfo, error) { | |
| 383 | + | core.LazyRegister(&xNewDBusNodeInfoForXml, "GIO", "g_dbus_node_info_new_for_xml", false) | |
| 351 | 384 | var cerr *glib.Error | |
| 352 | 385 | ||
| 353 | 386 | cret := xNewDBusNodeInfoForXml(XmlDataVar, &cerr) | |
| @@ -367,6 +400,8 @@ var xDBusNodeInfoGenerateXml func(uintptr, uint, *glib.String) | |||
| 367 | 400 | // This function is typically used for generating introspection XML documents at run-time for | |
| 368 | 401 | // handling the `org.freedesktop.DBus.Introspectable.Introspect` method. | |
| 369 | 402 | func (x *DBusNodeInfo) GenerateXml(IndentVar uint, StringBuilderVar *glib.String) { | |
| 403 | + | core.LazyRegister(&xDBusNodeInfoGenerateXml, "GIO", "g_dbus_node_info_generate_xml", false) | |
| 404 | + | ||
| 370 | 405 | xDBusNodeInfoGenerateXml(x.GoPointer(), IndentVar, StringBuilderVar) | |
| 371 | 406 | } | |
| 372 | 407 | ||
| @@ -376,6 +411,8 @@ var xDBusNodeInfoLookupInterface func(uintptr, string) uintptr | |||
| 376 | 411 | // | |
| 377 | 412 | // The cost of this function is O(n) in number of interfaces. | |
| 378 | 413 | func (x *DBusNodeInfo) LookupInterface(NameVar string) *DBusInterfaceInfo { | |
| 414 | + | core.LazyRegister(&xDBusNodeInfoLookupInterface, "GIO", "g_dbus_node_info_lookup_interface", false) | |
| 415 | + | ||
| 379 | 416 | cret := xDBusNodeInfoLookupInterface(x.GoPointer(), NameVar) | |
| 380 | 417 | if cret == 0 { | |
| 381 | 418 | return nil | |
| @@ -388,6 +425,8 @@ var xDBusNodeInfoRef func(uintptr) uintptr | |||
| 388 | 425 | // If @info is statically allocated does nothing. Otherwise increases | |
| 389 | 426 | // the reference count. | |
| 390 | 427 | func (x *DBusNodeInfo) Ref() *DBusNodeInfo { | |
| 428 | + | core.LazyRegister(&xDBusNodeInfoRef, "GIO", "g_dbus_node_info_ref", false) | |
| 429 | + | ||
| 391 | 430 | cret := xDBusNodeInfoRef(x.GoPointer()) | |
| 392 | 431 | if cret == 0 { | |
| 393 | 432 | return nil | |
| @@ -401,6 +440,8 @@ var xDBusNodeInfoUnref func(uintptr) | |||
| 401 | 440 | // the reference count of @info. When its reference count drops to 0, | |
| 402 | 441 | // the memory used is freed. | |
| 403 | 442 | func (x *DBusNodeInfo) Unref() { | |
| 443 | + | core.LazyRegister(&xDBusNodeInfoUnref, "GIO", "g_dbus_node_info_unref", false) | |
| 444 | + | ||
| 404 | 445 | xDBusNodeInfoUnref(x.GoPointer()) | |
| 405 | 446 | } | |
| 406 | 447 | ||
| @@ -422,6 +463,7 @@ type DBusPropertyInfo struct { | |||
| 422 | 463 | var xDBusPropertyInfoGLibType func() types.GType | |
| 423 | 464 | ||
| 424 | 465 | func DBusPropertyInfoGLibType() types.GType { | |
| 466 | + | core.LazyRegister(&xDBusPropertyInfoGLibType, "GIO", "g_dbus_property_info_get_type", false) | |
| 425 | 467 | return xDBusPropertyInfoGLibType() | |
| 426 | 468 | } | |
| 427 | 469 | ||
| @@ -442,6 +484,8 @@ var xDBusPropertyInfoRef func(uintptr) uintptr | |||
| 442 | 484 | // If @info is statically allocated does nothing. Otherwise increases | |
| 443 | 485 | // the reference count. | |
| 444 | 486 | func (x *DBusPropertyInfo) Ref() *DBusPropertyInfo { | |
| 487 | + | core.LazyRegister(&xDBusPropertyInfoRef, "GIO", "g_dbus_property_info_ref", false) | |
| 488 | + | ||
| 445 | 489 | cret := xDBusPropertyInfoRef(x.GoPointer()) | |
| 446 | 490 | if cret == 0 { | |
| 447 | 491 | return nil | |
| @@ -455,6 +499,8 @@ var xDBusPropertyInfoUnref func(uintptr) | |||
| 455 | 499 | // the reference count of @info. When its reference count drops to 0, | |
| 456 | 500 | // the memory used is freed. | |
| 457 | 501 | func (x *DBusPropertyInfo) Unref() { | |
| 502 | + | core.LazyRegister(&xDBusPropertyInfoUnref, "GIO", "g_dbus_property_info_unref", false) | |
| 503 | + | ||
| 458 | 504 | xDBusPropertyInfoUnref(x.GoPointer()) | |
| 459 | 505 | } | |
| 460 | 506 | ||
| @@ -474,6 +520,7 @@ type DBusSignalInfo struct { | |||
| 474 | 520 | var xDBusSignalInfoGLibType func() types.GType | |
| 475 | 521 | ||
| 476 | 522 | func DBusSignalInfoGLibType() types.GType { | |
| 523 | + | core.LazyRegister(&xDBusSignalInfoGLibType, "GIO", "g_dbus_signal_info_get_type", false) | |
| 477 | 524 | return xDBusSignalInfoGLibType() | |
| 478 | 525 | } | |
| 479 | 526 | ||
| @@ -494,6 +541,8 @@ var xDBusSignalInfoRef func(uintptr) uintptr | |||
| 494 | 541 | // If @info is statically allocated does nothing. Otherwise increases | |
| 495 | 542 | // the reference count. | |
| 496 | 543 | func (x *DBusSignalInfo) Ref() *DBusSignalInfo { | |
| 544 | + | core.LazyRegister(&xDBusSignalInfoRef, "GIO", "g_dbus_signal_info_ref", false) | |
| 545 | + | ||
| 497 | 546 | cret := xDBusSignalInfoRef(x.GoPointer()) | |
| 498 | 547 | if cret == 0 { | |
| 499 | 548 | return nil | |
| @@ -507,6 +556,8 @@ var xDBusSignalInfoUnref func(uintptr) | |||
| 507 | 556 | // the reference count of @info. When its reference count drops to 0, | |
| 508 | 557 | // the memory used is freed. | |
| 509 | 558 | func (x *DBusSignalInfo) Unref() { | |
| 559 | + | core.LazyRegister(&xDBusSignalInfoUnref, "GIO", "g_dbus_signal_info_unref", false) | |
| 560 | + | ||
| 510 | 561 | xDBusSignalInfoUnref(x.GoPointer()) | |
| 511 | 562 | } | |
| 512 | 563 | ||
| @@ -516,6 +567,8 @@ var xDbusAnnotationInfoLookup func(uintptr, string) string | |||
| 516 | 567 | // | |
| 517 | 568 | // The cost of this function is O(n) in number of annotations. | |
| 518 | 569 | func DbusAnnotationInfoLookup(AnnotationsVar uintptr, NameVar string) string { | |
| 570 | + | core.LazyRegister(&xDbusAnnotationInfoLookup, "GIO", "g_dbus_annotation_info_lookup", false) | |
| 571 | + | ||
| 519 | 572 | cret := xDbusAnnotationInfoLookup(AnnotationsVar, NameVar) | |
| 520 | 573 | return cret | |
| 521 | 574 | } | |
| @@ -523,59 +576,4 @@ func DbusAnnotationInfoLookup(AnnotationsVar uintptr, NameVar string) string { | |||
| 523 | 576 | func init() { | |
| 524 | 577 | core.SetPackageName("GIO", "gio-2.0") | |
| 525 | 578 | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0", "libgio-2.0.0.dylib"}) | |
| 526 | - | var libs []uintptr | |
| 527 | - | for _, libPath := range core.GetPaths("GIO") { | |
| 528 | - | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 529 | - | if err != nil { | |
| 530 | - | panic(err) | |
| 531 | - | } | |
| 532 | - | libs = append(libs, lib) | |
| 533 | - | } | |
| 534 | - | ||
| 535 | - | core.PuregoSafeRegister(&xDbusAnnotationInfoLookup, libs, "g_dbus_annotation_info_lookup") | |
| 536 | - | ||
| 537 | - | core.PuregoSafeRegister(&xDBusAnnotationInfoGLibType, libs, "g_dbus_annotation_info_get_type") | |
| 538 | - | ||
| 539 | - | core.PuregoSafeRegister(&xDBusAnnotationInfoRef, libs, "g_dbus_annotation_info_ref") | |
| 540 | - | core.PuregoSafeRegister(&xDBusAnnotationInfoUnref, libs, "g_dbus_annotation_info_unref") | |
| 541 | - | ||
| 542 | - | core.PuregoSafeRegister(&xDBusArgInfoGLibType, libs, "g_dbus_arg_info_get_type") | |
| 543 | - | ||
| 544 | - | core.PuregoSafeRegister(&xDBusArgInfoRef, libs, "g_dbus_arg_info_ref") | |
| 545 | - | core.PuregoSafeRegister(&xDBusArgInfoUnref, libs, "g_dbus_arg_info_unref") | |
| 546 | - | ||
| 547 | - | core.PuregoSafeRegister(&xDBusInterfaceInfoGLibType, libs, "g_dbus_interface_info_get_type") | |
| 548 | - | ||
| 549 | - | core.PuregoSafeRegister(&xDBusInterfaceInfoCacheBuild, libs, "g_dbus_interface_info_cache_build") | |
| 550 | - | core.PuregoSafeRegister(&xDBusInterfaceInfoCacheRelease, libs, "g_dbus_interface_info_cache_release") | |
| 551 | - | core.PuregoSafeRegister(&xDBusInterfaceInfoGenerateXml, libs, "g_dbus_interface_info_generate_xml") | |
| 552 | - | core.PuregoSafeRegister(&xDBusInterfaceInfoLookupMethod, libs, "g_dbus_interface_info_lookup_method") | |
| 553 | - | core.PuregoSafeRegister(&xDBusInterfaceInfoLookupProperty, libs, "g_dbus_interface_info_lookup_property") | |
| 554 | - | core.PuregoSafeRegister(&xDBusInterfaceInfoLookupSignal, libs, "g_dbus_interface_info_lookup_signal") | |
| 555 | - | core.PuregoSafeRegister(&xDBusInterfaceInfoRef, libs, "g_dbus_interface_info_ref") | |
| 556 | - | core.PuregoSafeRegister(&xDBusInterfaceInfoUnref, libs, "g_dbus_interface_info_unref") | |
| 557 | - | ||
| 558 | - | core.PuregoSafeRegister(&xDBusMethodInfoGLibType, libs, "g_dbus_method_info_get_type") | |
| 559 | - | ||
| 560 | - | core.PuregoSafeRegister(&xDBusMethodInfoRef, libs, "g_dbus_method_info_ref") | |
| 561 | - | core.PuregoSafeRegister(&xDBusMethodInfoUnref, libs, "g_dbus_method_info_unref") | |
| 562 | - | ||
| 563 | - | core.PuregoSafeRegister(&xDBusNodeInfoGLibType, libs, "g_dbus_node_info_get_type") | |
| 564 | - | ||
| 565 | - | core.PuregoSafeRegister(&xNewDBusNodeInfoForXml, libs, "g_dbus_node_info_new_for_xml") | |
| 566 | - | ||
| 567 | - | core.PuregoSafeRegister(&xDBusNodeInfoGenerateXml, libs, "g_dbus_node_info_generate_xml") | |
| 568 | - | core.PuregoSafeRegister(&xDBusNodeInfoLookupInterface, libs, "g_dbus_node_info_lookup_interface") | |
| 569 | - | core.PuregoSafeRegister(&xDBusNodeInfoRef, libs, "g_dbus_node_info_ref") | |
| 570 | - | core.PuregoSafeRegister(&xDBusNodeInfoUnref, libs, "g_dbus_node_info_unref") | |
| 571 | - | ||
| 572 | - | core.PuregoSafeRegister(&xDBusPropertyInfoGLibType, libs, "g_dbus_property_info_get_type") | |
| 573 | - | ||
| 574 | - | core.PuregoSafeRegister(&xDBusPropertyInfoRef, libs, "g_dbus_property_info_ref") | |
| 575 | - | core.PuregoSafeRegister(&xDBusPropertyInfoUnref, libs, "g_dbus_property_info_unref") | |
| 576 | - | ||
| 577 | - | core.PuregoSafeRegister(&xDBusSignalInfoGLibType, libs, "g_dbus_signal_info_get_type") | |
| 578 | - | ||
| 579 | - | core.PuregoSafeRegister(&xDBusSignalInfoRef, libs, "g_dbus_signal_info_ref") | |
| 580 | - | core.PuregoSafeRegister(&xDBusSignalInfoUnref, libs, "g_dbus_signal_info_unref") | |
| 581 | 579 | } | |
| @@ -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/glib" | 9 | "github.com/bnema/puregotk/v4/glib" | ||
| 11 | "github.com/bnema/puregotk/v4/gobject/types" | 10 | "github.com/bnema/puregotk/v4/gobject/types" | ||
| @@ -27,6 +26,7 @@ type DBusAnnotationInfo struct { | |||||
| 27 | var xDBusAnnotationInfoGLibType func() types.GType | 26 | var xDBusAnnotationInfoGLibType func() types.GType | ||
| 28 | 27 | ||||
| 29 | func DBusAnnotationInfoGLibType() types.GType { | 28 | func DBusAnnotationInfoGLibType() types.GType { | ||
| 29 | + | core.LazyRegister(&xDBusAnnotationInfoGLibType, "GIO", "g_dbus_annotation_info_get_type", false) | |||
| 30 | return xDBusAnnotationInfoGLibType() | 30 | return xDBusAnnotationInfoGLibType() | ||
| 31 | } | 31 | } | ||
| 32 | 32 | ||||
| @@ -47,6 +47,8 @@ var xDBusAnnotationInfoRef func(uintptr) uintptr | |||||
| 47 | // If @info is statically allocated does nothing. Otherwise increases | 47 | // If @info is statically allocated does nothing. Otherwise increases | ||
| 48 | // the reference count. | 48 | // the reference count. | ||
| 49 | func (x *DBusAnnotationInfo) Ref() *DBusAnnotationInfo { | 49 | func (x *DBusAnnotationInfo) Ref() *DBusAnnotationInfo { | ||
| 50 | + | core.LazyRegister(&xDBusAnnotationInfoRef, "GIO", "g_dbus_annotation_info_ref", false) | |||
| 51 | + | ||||
| 50 | cret := xDBusAnnotationInfoRef(x.GoPointer()) | 52 | cret := xDBusAnnotationInfoRef(x.GoPointer()) | ||
| 51 | if cret == 0 { | 53 | if cret == 0 { | ||
| 52 | return nil | 54 | return nil | ||
| @@ -60,6 +62,8 @@ var xDBusAnnotationInfoUnref func(uintptr) | |||||
| 60 | // the reference count of @info. When its reference count drops to 0, | 62 | // the reference count of @info. When its reference count drops to 0, | ||
| 61 | // the memory used is freed. | 63 | // the memory used is freed. | ||
| 62 | func (x *DBusAnnotationInfo) Unref() { | 64 | func (x *DBusAnnotationInfo) Unref() { | ||
| 65 | + | core.LazyRegister(&xDBusAnnotationInfoUnref, "GIO", "g_dbus_annotation_info_unref", false) | |||
| 66 | + | ||||
| 63 | xDBusAnnotationInfoUnref(x.GoPointer()) | 67 | xDBusAnnotationInfoUnref(x.GoPointer()) | ||
| 64 | } | 68 | } | ||
| 65 | 69 | ||||
| @@ -79,6 +83,7 @@ type DBusArgInfo struct { | |||||
| 79 | var xDBusArgInfoGLibType func() types.GType | 83 | var xDBusArgInfoGLibType func() types.GType | ||
| 80 | 84 | ||||
| 81 | func DBusArgInfoGLibType() types.GType { | 85 | func DBusArgInfoGLibType() types.GType { | ||
| 86 | + | core.LazyRegister(&xDBusArgInfoGLibType, "GIO", "g_dbus_arg_info_get_type", false) | |||
| 82 | return xDBusArgInfoGLibType() | 87 | return xDBusArgInfoGLibType() | ||
| 83 | } | 88 | } | ||
| 84 | 89 | ||||
| @@ -99,6 +104,8 @@ var xDBusArgInfoRef func(uintptr) uintptr | |||||
| 99 | // If @info is statically allocated does nothing. Otherwise increases | 104 | // If @info is statically allocated does nothing. Otherwise increases | ||
| 100 | // the reference count. | 105 | // the reference count. | ||
| 101 | func (x *DBusArgInfo) Ref() *DBusArgInfo { | 106 | func (x *DBusArgInfo) Ref() *DBusArgInfo { | ||
| 107 | + | core.LazyRegister(&xDBusArgInfoRef, "GIO", "g_dbus_arg_info_ref", false) | |||
| 108 | + | ||||
| 102 | cret := xDBusArgInfoRef(x.GoPointer()) | 109 | cret := xDBusArgInfoRef(x.GoPointer()) | ||
| 103 | if cret == 0 { | 110 | if cret == 0 { | ||
| 104 | return nil | 111 | return nil | ||
| @@ -112,6 +119,8 @@ var xDBusArgInfoUnref func(uintptr) | |||||
| 112 | // the reference count of @info. When its reference count drops to 0, | 119 | // the reference count of @info. When its reference count drops to 0, | ||
| 113 | // the memory used is freed. | 120 | // the memory used is freed. | ||
| 114 | func (x *DBusArgInfo) Unref() { | 121 | func (x *DBusArgInfo) Unref() { | ||
| 122 | + | core.LazyRegister(&xDBusArgInfoUnref, "GIO", "g_dbus_arg_info_unref", false) | |||
| 123 | + | ||||
| 115 | xDBusArgInfoUnref(x.GoPointer()) | 124 | xDBusArgInfoUnref(x.GoPointer()) | ||
| 116 | } | 125 | } | ||
| 117 | 126 | ||||
| @@ -135,6 +144,7 @@ type DBusInterfaceInfo struct { | |||||
| 135 | var xDBusInterfaceInfoGLibType func() types.GType | 144 | var xDBusInterfaceInfoGLibType func() types.GType | ||
| 136 | 145 | ||||
| 137 | func DBusInterfaceInfoGLibType() types.GType { | 146 | func DBusInterfaceInfoGLibType() types.GType { | ||
| 147 | + | core.LazyRegister(&xDBusInterfaceInfoGLibType, "GIO", "g_dbus_interface_info_get_type", false) | |||
| 138 | return xDBusInterfaceInfoGLibType() | 148 | return xDBusInterfaceInfoGLibType() | ||
| 139 | } | 149 | } | ||
| 140 | 150 | ||||
| @@ -163,6 +173,8 @@ var xDBusInterfaceInfoCacheBuild func(uintptr) | |||||
| 163 | // Note that @info cannot be modified until | 173 | // Note that @info cannot be modified until | ||
| 164 | // g_dbus_interface_info_cache_release() is called. | 174 | // g_dbus_interface_info_cache_release() is called. | ||
| 165 | func (x *DBusInterfaceInfo) CacheBuild() { | 175 | func (x *DBusInterfaceInfo) CacheBuild() { | ||
| 176 | + | core.LazyRegister(&xDBusInterfaceInfoCacheBuild, "GIO", "g_dbus_interface_info_cache_build", false) | |||
| 177 | + | ||||
| 166 | xDBusInterfaceInfoCacheBuild(x.GoPointer()) | 178 | xDBusInterfaceInfoCacheBuild(x.GoPointer()) | ||
| 167 | } | 179 | } | ||
| 168 | 180 | ||||
| @@ -172,6 +184,8 @@ var xDBusInterfaceInfoCacheRelease func(uintptr) | |||||
| 172 | // g_dbus_interface_info_cache_build() (if any) and frees the | 184 | // g_dbus_interface_info_cache_build() (if any) and frees the | ||
| 173 | // resources used by the cache if the usage count drops to zero. | 185 | // resources used by the cache if the usage count drops to zero. | ||
| 174 | func (x *DBusInterfaceInfo) CacheRelease() { | 186 | func (x *DBusInterfaceInfo) CacheRelease() { | ||
| 187 | + | core.LazyRegister(&xDBusInterfaceInfoCacheRelease, "GIO", "g_dbus_interface_info_cache_release", false) | |||
| 188 | + | ||||
| 175 | xDBusInterfaceInfoCacheRelease(x.GoPointer()) | 189 | xDBusInterfaceInfoCacheRelease(x.GoPointer()) | ||
| 176 | } | 190 | } | ||
| 177 | 191 | ||||
| @@ -184,6 +198,8 @@ var xDBusInterfaceInfoGenerateXml func(uintptr, uint, *glib.String) | |||||
| 184 | // `org.freedesktop.DBus.Introspectable.Introspect` | 198 | // `org.freedesktop.DBus.Introspectable.Introspect` | ||
| 185 | // method. | 199 | // method. | ||
| 186 | func (x *DBusInterfaceInfo) GenerateXml(IndentVar uint, StringBuilderVar *glib.String) { | 200 | func (x *DBusInterfaceInfo) GenerateXml(IndentVar uint, StringBuilderVar *glib.String) { | ||
| 201 | + | core.LazyRegister(&xDBusInterfaceInfoGenerateXml, "GIO", "g_dbus_interface_info_generate_xml", false) | |||
| 202 | + | ||||
| 187 | xDBusInterfaceInfoGenerateXml(x.GoPointer(), IndentVar, StringBuilderVar) | 203 | xDBusInterfaceInfoGenerateXml(x.GoPointer(), IndentVar, StringBuilderVar) | ||
| 188 | } | 204 | } | ||
| 189 | 205 | ||||
| @@ -194,6 +210,8 @@ var xDBusInterfaceInfoLookupMethod func(uintptr, string) uintptr | |||||
| 194 | // The cost of this function is O(n) in number of methods unless | 210 | // The cost of this function is O(n) in number of methods unless | ||
| 195 | // g_dbus_interface_info_cache_build() has been used on @info. | 211 | // g_dbus_interface_info_cache_build() has been used on @info. | ||
| 196 | func (x *DBusInterfaceInfo) LookupMethod(NameVar string) *DBusMethodInfo { | 212 | func (x *DBusInterfaceInfo) LookupMethod(NameVar string) *DBusMethodInfo { | ||
| 213 | + | core.LazyRegister(&xDBusInterfaceInfoLookupMethod, "GIO", "g_dbus_interface_info_lookup_method", false) | |||
| 214 | + | ||||
| 197 | cret := xDBusInterfaceInfoLookupMethod(x.GoPointer(), NameVar) | 215 | cret := xDBusInterfaceInfoLookupMethod(x.GoPointer(), NameVar) | ||
| 198 | if cret == 0 { | 216 | if cret == 0 { | ||
| 199 | return nil | 217 | return nil | ||
| @@ -208,6 +226,8 @@ var xDBusInterfaceInfoLookupProperty func(uintptr, string) uintptr | |||||
| 208 | // The cost of this function is O(n) in number of properties unless | 226 | // The cost of this function is O(n) in number of properties unless | ||
| 209 | // g_dbus_interface_info_cache_build() has been used on @info. | 227 | // g_dbus_interface_info_cache_build() has been used on @info. | ||
| 210 | func (x *DBusInterfaceInfo) LookupProperty(NameVar string) *DBusPropertyInfo { | 228 | func (x *DBusInterfaceInfo) LookupProperty(NameVar string) *DBusPropertyInfo { | ||
| 229 | + | core.LazyRegister(&xDBusInterfaceInfoLookupProperty, "GIO", "g_dbus_interface_info_lookup_property", false) | |||
| 230 | + | ||||
| 211 | cret := xDBusInterfaceInfoLookupProperty(x.GoPointer(), NameVar) | 231 | cret := xDBusInterfaceInfoLookupProperty(x.GoPointer(), NameVar) | ||
| 212 | if cret == 0 { | 232 | if cret == 0 { | ||
| 213 | return nil | 233 | return nil | ||
| @@ -222,6 +242,8 @@ var xDBusInterfaceInfoLookupSignal func(uintptr, string) uintptr | |||||
| 222 | // The cost of this function is O(n) in number of signals unless | 242 | // The cost of this function is O(n) in number of signals unless | ||
| 223 | // g_dbus_interface_info_cache_build() has been used on @info. | 243 | // g_dbus_interface_info_cache_build() has been used on @info. | ||
| 224 | func (x *DBusInterfaceInfo) LookupSignal(NameVar string) *DBusSignalInfo { | 244 | func (x *DBusInterfaceInfo) LookupSignal(NameVar string) *DBusSignalInfo { | ||
| 245 | + | core.LazyRegister(&xDBusInterfaceInfoLookupSignal, "GIO", "g_dbus_interface_info_lookup_signal", false) | |||
| 246 | + | ||||
| 225 | cret := xDBusInterfaceInfoLookupSignal(x.GoPointer(), NameVar) | 247 | cret := xDBusInterfaceInfoLookupSignal(x.GoPointer(), NameVar) | ||
| 226 | if cret == 0 { | 248 | if cret == 0 { | ||
| 227 | return nil | 249 | return nil | ||
| @@ -234,6 +256,8 @@ var xDBusInterfaceInfoRef func(uintptr) uintptr | |||||
| 234 | // If @info is statically allocated does nothing. Otherwise increases | 256 | // If @info is statically allocated does nothing. Otherwise increases | ||
| 235 | // the reference count. | 257 | // the reference count. | ||
| 236 | func (x *DBusInterfaceInfo) Ref() *DBusInterfaceInfo { | 258 | func (x *DBusInterfaceInfo) Ref() *DBusInterfaceInfo { | ||
| 259 | + | core.LazyRegister(&xDBusInterfaceInfoRef, "GIO", "g_dbus_interface_info_ref", false) | |||
| 260 | + | ||||
| 237 | cret := xDBusInterfaceInfoRef(x.GoPointer()) | 261 | cret := xDBusInterfaceInfoRef(x.GoPointer()) | ||
| 238 | if cret == 0 { | 262 | if cret == 0 { | ||
| 239 | return nil | 263 | return nil | ||
| @@ -247,6 +271,8 @@ var xDBusInterfaceInfoUnref func(uintptr) | |||||
| 247 | // the reference count of @info. When its reference count drops to 0, | 271 | // the reference count of @info. When its reference count drops to 0, | ||
| 248 | // the memory used is freed. | 272 | // the memory used is freed. | ||
| 249 | func (x *DBusInterfaceInfo) Unref() { | 273 | func (x *DBusInterfaceInfo) Unref() { | ||
| 274 | + | core.LazyRegister(&xDBusInterfaceInfoUnref, "GIO", "g_dbus_interface_info_unref", false) | |||
| 275 | + | ||||
| 250 | xDBusInterfaceInfoUnref(x.GoPointer()) | 276 | xDBusInterfaceInfoUnref(x.GoPointer()) | ||
| 251 | } | 277 | } | ||
| 252 | 278 | ||||
| @@ -268,6 +294,7 @@ type DBusMethodInfo struct { | |||||
| 268 | var xDBusMethodInfoGLibType func() types.GType | 294 | var xDBusMethodInfoGLibType func() types.GType | ||
| 269 | 295 | ||||
| 270 | func DBusMethodInfoGLibType() types.GType { | 296 | func DBusMethodInfoGLibType() types.GType { | ||
| 297 | + | core.LazyRegister(&xDBusMethodInfoGLibType, "GIO", "g_dbus_method_info_get_type", false) | |||
| 271 | return xDBusMethodInfoGLibType() | 298 | return xDBusMethodInfoGLibType() | ||
| 272 | } | 299 | } | ||
| 273 | 300 | ||||
| @@ -288,6 +315,8 @@ var xDBusMethodInfoRef func(uintptr) uintptr | |||||
| 288 | // If @info is statically allocated does nothing. Otherwise increases | 315 | // If @info is statically allocated does nothing. Otherwise increases | ||
| 289 | // the reference count. | 316 | // the reference count. | ||
| 290 | func (x *DBusMethodInfo) Ref() *DBusMethodInfo { | 317 | func (x *DBusMethodInfo) Ref() *DBusMethodInfo { | ||
| 318 | + | core.LazyRegister(&xDBusMethodInfoRef, "GIO", "g_dbus_method_info_ref", false) | |||
| 319 | + | ||||
| 291 | cret := xDBusMethodInfoRef(x.GoPointer()) | 320 | cret := xDBusMethodInfoRef(x.GoPointer()) | ||
| 292 | if cret == 0 { | 321 | if cret == 0 { | ||
| 293 | return nil | 322 | return nil | ||
| @@ -301,6 +330,8 @@ var xDBusMethodInfoUnref func(uintptr) | |||||
| 301 | // the reference count of @info. When its reference count drops to 0, | 330 | // the reference count of @info. When its reference count drops to 0, | ||
| 302 | // the memory used is freed. | 331 | // the memory used is freed. | ||
| 303 | func (x *DBusMethodInfo) Unref() { | 332 | func (x *DBusMethodInfo) Unref() { | ||
| 333 | + | core.LazyRegister(&xDBusMethodInfoUnref, "GIO", "g_dbus_method_info_unref", false) | |||
| 334 | + | ||||
| 304 | xDBusMethodInfoUnref(x.GoPointer()) | 335 | xDBusMethodInfoUnref(x.GoPointer()) | ||
| 305 | } | 336 | } | ||
| 306 | 337 | ||||
| @@ -322,6 +353,7 @@ type DBusNodeInfo struct { | |||||
| 322 | var xDBusNodeInfoGLibType func() types.GType | 353 | var xDBusNodeInfoGLibType func() types.GType | ||
| 323 | 354 | ||||
| 324 | func DBusNodeInfoGLibType() types.GType { | 355 | func DBusNodeInfoGLibType() types.GType { | ||
| 356 | + | core.LazyRegister(&xDBusNodeInfoGLibType, "GIO", "g_dbus_node_info_get_type", false) | |||
| 325 | return xDBusNodeInfoGLibType() | 357 | return xDBusNodeInfoGLibType() | ||
| 326 | } | 358 | } | ||
| 327 | 359 | ||||
| @@ -348,6 +380,7 @@ var xNewDBusNodeInfoForXml func(string, **glib.Error) uintptr | |||||
| 348 | // [GMarkup](../glib/markup.html)-based | 380 | // [GMarkup](../glib/markup.html)-based | ||
| 349 | // parser that only accepts a subset of valid XML documents. | 381 | // parser that only accepts a subset of valid XML documents. | ||
| 350 | func NewDBusNodeInfoForXml(XmlDataVar string) (*DBusNodeInfo, error) { | 382 | func NewDBusNodeInfoForXml(XmlDataVar string) (*DBusNodeInfo, error) { | ||
| 383 | + | core.LazyRegister(&xNewDBusNodeInfoForXml, "GIO", "g_dbus_node_info_new_for_xml", false) | |||
| 351 | var cerr *glib.Error | 384 | var cerr *glib.Error | ||
| 352 | 385 | ||||
| 353 | cret := xNewDBusNodeInfoForXml(XmlDataVar, &cerr) | 386 | cret := xNewDBusNodeInfoForXml(XmlDataVar, &cerr) | ||
| @@ -367,6 +400,8 @@ var xDBusNodeInfoGenerateXml func(uintptr, uint, *glib.String) | |||||
| 367 | // This function is typically used for generating introspection XML documents at run-time for | 400 | // This function is typically used for generating introspection XML documents at run-time for | ||
| 368 | // handling the `org.freedesktop.DBus.Introspectable.Introspect` method. | 401 | // handling the `org.freedesktop.DBus.Introspectable.Introspect` method. | ||
| 369 | func (x *DBusNodeInfo) GenerateXml(IndentVar uint, StringBuilderVar *glib.String) { | 402 | func (x *DBusNodeInfo) GenerateXml(IndentVar uint, StringBuilderVar *glib.String) { | ||
| 403 | + | core.LazyRegister(&xDBusNodeInfoGenerateXml, "GIO", "g_dbus_node_info_generate_xml", false) | |||
| 404 | + | ||||
| 370 | xDBusNodeInfoGenerateXml(x.GoPointer(), IndentVar, StringBuilderVar) | 405 | xDBusNodeInfoGenerateXml(x.GoPointer(), IndentVar, StringBuilderVar) | ||
| 371 | } | 406 | } | ||
| 372 | 407 | ||||
| @@ -376,6 +411,8 @@ var xDBusNodeInfoLookupInterface func(uintptr, string) uintptr | |||||
| 376 | // | 411 | // | ||
| 377 | // The cost of this function is O(n) in number of interfaces. | 412 | // The cost of this function is O(n) in number of interfaces. | ||
| 378 | func (x *DBusNodeInfo) LookupInterface(NameVar string) *DBusInterfaceInfo { | 413 | func (x *DBusNodeInfo) LookupInterface(NameVar string) *DBusInterfaceInfo { | ||
| 414 | + | core.LazyRegister(&xDBusNodeInfoLookupInterface, "GIO", "g_dbus_node_info_lookup_interface", false) | |||
| 415 | + | ||||
| 379 | cret := xDBusNodeInfoLookupInterface(x.GoPointer(), NameVar) | 416 | cret := xDBusNodeInfoLookupInterface(x.GoPointer(), NameVar) | ||
| 380 | if cret == 0 { | 417 | if cret == 0 { | ||
| 381 | return nil | 418 | return nil | ||
| @@ -388,6 +425,8 @@ var xDBusNodeInfoRef func(uintptr) uintptr | |||||
| 388 | // If @info is statically allocated does nothing. Otherwise increases | 425 | // If @info is statically allocated does nothing. Otherwise increases | ||
| 389 | // the reference count. | 426 | // the reference count. | ||
| 390 | func (x *DBusNodeInfo) Ref() *DBusNodeInfo { | 427 | func (x *DBusNodeInfo) Ref() *DBusNodeInfo { | ||
| 428 | + | core.LazyRegister(&xDBusNodeInfoRef, "GIO", "g_dbus_node_info_ref", false) | |||
| 429 | + | ||||
| 391 | cret := xDBusNodeInfoRef(x.GoPointer()) | 430 | cret := xDBusNodeInfoRef(x.GoPointer()) | ||
| 392 | if cret == 0 { | 431 | if cret == 0 { | ||
| 393 | return nil | 432 | return nil | ||
| @@ -401,6 +440,8 @@ var xDBusNodeInfoUnref func(uintptr) | |||||
| 401 | // the reference count of @info. When its reference count drops to 0, | 440 | // the reference count of @info. When its reference count drops to 0, | ||
| 402 | // the memory used is freed. | 441 | // the memory used is freed. | ||
| 403 | func (x *DBusNodeInfo) Unref() { | 442 | func (x *DBusNodeInfo) Unref() { | ||
| 443 | + | core.LazyRegister(&xDBusNodeInfoUnref, "GIO", "g_dbus_node_info_unref", false) | |||
| 444 | + | ||||
| 404 | xDBusNodeInfoUnref(x.GoPointer()) | 445 | xDBusNodeInfoUnref(x.GoPointer()) | ||
| 405 | } | 446 | } | ||
| 406 | 447 | ||||
| @@ -422,6 +463,7 @@ type DBusPropertyInfo struct { | |||||
| 422 | var xDBusPropertyInfoGLibType func() types.GType | 463 | var xDBusPropertyInfoGLibType func() types.GType | ||
| 423 | 464 | ||||
| 424 | func DBusPropertyInfoGLibType() types.GType { | 465 | func DBusPropertyInfoGLibType() types.GType { | ||
| 466 | + | core.LazyRegister(&xDBusPropertyInfoGLibType, "GIO", "g_dbus_property_info_get_type", false) | |||
| 425 | return xDBusPropertyInfoGLibType() | 467 | return xDBusPropertyInfoGLibType() | ||
| 426 | } | 468 | } | ||
| 427 | 469 | ||||
| @@ -442,6 +484,8 @@ var xDBusPropertyInfoRef func(uintptr) uintptr | |||||
| 442 | // If @info is statically allocated does nothing. Otherwise increases | 484 | // If @info is statically allocated does nothing. Otherwise increases | ||
| 443 | // the reference count. | 485 | // the reference count. | ||
| 444 | func (x *DBusPropertyInfo) Ref() *DBusPropertyInfo { | 486 | func (x *DBusPropertyInfo) Ref() *DBusPropertyInfo { | ||
| 487 | + | core.LazyRegister(&xDBusPropertyInfoRef, "GIO", "g_dbus_property_info_ref", false) | |||
| 488 | + | ||||
| 445 | cret := xDBusPropertyInfoRef(x.GoPointer()) | 489 | cret := xDBusPropertyInfoRef(x.GoPointer()) | ||
| 446 | if cret == 0 { | 490 | if cret == 0 { | ||
| 447 | return nil | 491 | return nil | ||
| @@ -455,6 +499,8 @@ var xDBusPropertyInfoUnref func(uintptr) | |||||
| 455 | // the reference count of @info. When its reference count drops to 0, | 499 | // the reference count of @info. When its reference count drops to 0, | ||
| 456 | // the memory used is freed. | 500 | // the memory used is freed. | ||
| 457 | func (x *DBusPropertyInfo) Unref() { | 501 | func (x *DBusPropertyInfo) Unref() { | ||
| 502 | + | core.LazyRegister(&xDBusPropertyInfoUnref, "GIO", "g_dbus_property_info_unref", false) | |||
| 503 | + | ||||
| 458 | xDBusPropertyInfoUnref(x.GoPointer()) | 504 | xDBusPropertyInfoUnref(x.GoPointer()) | ||
| 459 | } | 505 | } | ||
| 460 | 506 | ||||
| @@ -474,6 +520,7 @@ type DBusSignalInfo struct { | |||||
| 474 | var xDBusSignalInfoGLibType func() types.GType | 520 | var xDBusSignalInfoGLibType func() types.GType | ||
| 475 | 521 | ||||
| 476 | func DBusSignalInfoGLibType() types.GType { | 522 | func DBusSignalInfoGLibType() types.GType { | ||
| 523 | + | core.LazyRegister(&xDBusSignalInfoGLibType, "GIO", "g_dbus_signal_info_get_type", false) | |||
| 477 | return xDBusSignalInfoGLibType() | 524 | return xDBusSignalInfoGLibType() | ||
| 478 | } | 525 | } | ||
| 479 | 526 | ||||
| @@ -494,6 +541,8 @@ var xDBusSignalInfoRef func(uintptr) uintptr | |||||
| 494 | // If @info is statically allocated does nothing. Otherwise increases | 541 | // If @info is statically allocated does nothing. Otherwise increases | ||
| 495 | // the reference count. | 542 | // the reference count. | ||
| 496 | func (x *DBusSignalInfo) Ref() *DBusSignalInfo { | 543 | func (x *DBusSignalInfo) Ref() *DBusSignalInfo { | ||
| 544 | + | core.LazyRegister(&xDBusSignalInfoRef, "GIO", "g_dbus_signal_info_ref", false) | |||
| 545 | + | ||||
| 497 | cret := xDBusSignalInfoRef(x.GoPointer()) | 546 | cret := xDBusSignalInfoRef(x.GoPointer()) | ||
| 498 | if cret == 0 { | 547 | if cret == 0 { | ||
| 499 | return nil | 548 | return nil | ||
| @@ -507,6 +556,8 @@ var xDBusSignalInfoUnref func(uintptr) | |||||
| 507 | // the reference count of @info. When its reference count drops to 0, | 556 | // the reference count of @info. When its reference count drops to 0, | ||
| 508 | // the memory used is freed. | 557 | // the memory used is freed. | ||
| 509 | func (x *DBusSignalInfo) Unref() { | 558 | func (x *DBusSignalInfo) Unref() { | ||
| 559 | + | core.LazyRegister(&xDBusSignalInfoUnref, "GIO", "g_dbus_signal_info_unref", false) | |||
| 560 | + | ||||
| 510 | xDBusSignalInfoUnref(x.GoPointer()) | 561 | xDBusSignalInfoUnref(x.GoPointer()) | ||
| 511 | } | 562 | } | ||
| 512 | 563 | ||||
| @@ -516,6 +567,8 @@ var xDbusAnnotationInfoLookup func(uintptr, string) string | |||||
| 516 | // | 567 | // | ||
| 517 | // The cost of this function is O(n) in number of annotations. | 568 | // The cost of this function is O(n) in number of annotations. | ||
| 518 | func DbusAnnotationInfoLookup(AnnotationsVar uintptr, NameVar string) string { | 569 | func DbusAnnotationInfoLookup(AnnotationsVar uintptr, NameVar string) string { | ||
| 570 | + | core.LazyRegister(&xDbusAnnotationInfoLookup, "GIO", "g_dbus_annotation_info_lookup", false) | |||
| 571 | + | ||||
| 519 | cret := xDbusAnnotationInfoLookup(AnnotationsVar, NameVar) | 572 | cret := xDbusAnnotationInfoLookup(AnnotationsVar, NameVar) | ||
| 520 | return cret | 573 | return cret | ||
| 521 | } | 574 | } | ||
| @@ -523,59 +576,4 @@ func DbusAnnotationInfoLookup(AnnotationsVar uintptr, NameVar string) string { | |||||
| 523 | func init() { | 576 | func init() { | ||
| 524 | core.SetPackageName("GIO", "gio-2.0") | 577 | core.SetPackageName("GIO", "gio-2.0") | ||
| 525 | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0", "libgio-2.0.0.dylib"}) | 578 | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0", "libgio-2.0.0.dylib"}) | ||
| 526 | - | var libs []uintptr | |||
| 527 | - | for _, libPath := range core.GetPaths("GIO") { | |||
| 528 | - | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |||
| 529 | - | if err != nil { | |||
| 530 | - | panic(err) | |||
| 531 | - | } | |||
| 532 | - | libs = append(libs, lib) | |||
| 533 | - | } | |||
| 534 | - | ||||
| 535 | - | core.PuregoSafeRegister(&xDbusAnnotationInfoLookup, libs, "g_dbus_annotation_info_lookup") | |||
| 536 | - | ||||
| 537 | - | core.PuregoSafeRegister(&xDBusAnnotationInfoGLibType, libs, "g_dbus_annotation_info_get_type") | |||
| 538 | - | ||||
| 539 | - | core.PuregoSafeRegister(&xDBusAnnotationInfoRef, libs, "g_dbus_annotation_info_ref") | |||
| 540 | - | core.PuregoSafeRegister(&xDBusAnnotationInfoUnref, libs, "g_dbus_annotation_info_unref") | |||
| 541 | - | ||||
| 542 | - | core.PuregoSafeRegister(&xDBusArgInfoGLibType, libs, "g_dbus_arg_info_get_type") | |||
| 543 | - | ||||
| 544 | - | core.PuregoSafeRegister(&xDBusArgInfoRef, libs, "g_dbus_arg_info_ref") | |||
| 545 | - | core.PuregoSafeRegister(&xDBusArgInfoUnref, libs, "g_dbus_arg_info_unref") | |||
| 546 | - | ||||
| 547 | - | core.PuregoSafeRegister(&xDBusInterfaceInfoGLibType, libs, "g_dbus_interface_info_get_type") | |||
| 548 | - | ||||
| 549 | - | core.PuregoSafeRegister(&xDBusInterfaceInfoCacheBuild, libs, "g_dbus_interface_info_cache_build") | |||
| 550 | - | core.PuregoSafeRegister(&xDBusInterfaceInfoCacheRelease, libs, "g_dbus_interface_info_cache_release") | |||
| 551 | - | core.PuregoSafeRegister(&xDBusInterfaceInfoGenerateXml, libs, "g_dbus_interface_info_generate_xml") | |||
| 552 | - | core.PuregoSafeRegister(&xDBusInterfaceInfoLookupMethod, libs, "g_dbus_interface_info_lookup_method") | |||
| 553 | - | core.PuregoSafeRegister(&xDBusInterfaceInfoLookupProperty, libs, "g_dbus_interface_info_lookup_property") | |||
| 554 | - | core.PuregoSafeRegister(&xDBusInterfaceInfoLookupSignal, libs, "g_dbus_interface_info_lookup_signal") | |||
| 555 | - | core.PuregoSafeRegister(&xDBusInterfaceInfoRef, libs, "g_dbus_interface_info_ref") | |||
| 556 | - | core.PuregoSafeRegister(&xDBusInterfaceInfoUnref, libs, "g_dbus_interface_info_unref") | |||
| 557 | - | ||||
| 558 | - | core.PuregoSafeRegister(&xDBusMethodInfoGLibType, libs, "g_dbus_method_info_get_type") | |||
| 559 | - | ||||
| 560 | - | core.PuregoSafeRegister(&xDBusMethodInfoRef, libs, "g_dbus_method_info_ref") | |||
| 561 | - | core.PuregoSafeRegister(&xDBusMethodInfoUnref, libs, "g_dbus_method_info_unref") | |||
| 562 | - | ||||
| 563 | - | core.PuregoSafeRegister(&xDBusNodeInfoGLibType, libs, "g_dbus_node_info_get_type") | |||
| 564 | - | ||||
| 565 | - | core.PuregoSafeRegister(&xNewDBusNodeInfoForXml, libs, "g_dbus_node_info_new_for_xml") | |||
| 566 | - | ||||
| 567 | - | core.PuregoSafeRegister(&xDBusNodeInfoGenerateXml, libs, "g_dbus_node_info_generate_xml") | |||
| 568 | - | core.PuregoSafeRegister(&xDBusNodeInfoLookupInterface, libs, "g_dbus_node_info_lookup_interface") | |||
| 569 | - | core.PuregoSafeRegister(&xDBusNodeInfoRef, libs, "g_dbus_node_info_ref") | |||
| 570 | - | core.PuregoSafeRegister(&xDBusNodeInfoUnref, libs, "g_dbus_node_info_unref") | |||
| 571 | - | ||||
| 572 | - | core.PuregoSafeRegister(&xDBusPropertyInfoGLibType, libs, "g_dbus_property_info_get_type") | |||
| 573 | - | ||||
| 574 | - | core.PuregoSafeRegister(&xDBusPropertyInfoRef, libs, "g_dbus_property_info_ref") | |||
| 575 | - | core.PuregoSafeRegister(&xDBusPropertyInfoUnref, libs, "g_dbus_property_info_unref") | |||
| 576 | - | ||||
| 577 | - | core.PuregoSafeRegister(&xDBusSignalInfoGLibType, libs, "g_dbus_signal_info_get_type") | |||
| 578 | - | ||||
| 579 | - | core.PuregoSafeRegister(&xDBusSignalInfoRef, libs, "g_dbus_signal_info_ref") | |||
| 580 | - | core.PuregoSafeRegister(&xDBusSignalInfoUnref, libs, "g_dbus_signal_info_unref") | |||
| 581 | } | 579 | } | ||