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
| @@ -5,7 +5,6 @@ import ( | |||
| 5 | 5 | "structs" | |
| 6 | 6 | "unsafe" | |
| 7 | 7 | ||
| 8 | - | "github.com/bnema/purego" | |
| 9 | 8 | "github.com/bnema/puregotk/pkg/core" | |
| 10 | 9 | "github.com/bnema/puregotk/v4/gobject/types" | |
| 11 | 10 | ) | |
| @@ -17,6 +16,7 @@ type Context struct { | |||
| 17 | 16 | var xContextGLibType func() types.GType | |
| 18 | 17 | ||
| 19 | 18 | func ContextGLibType() types.GType { | |
| 19 | + | core.LazyRegister(&xContextGLibType, "CAIRO", "cairo_gobject_context_get_type", false) | |
| 20 | 20 | return xContextGLibType() | |
| 21 | 21 | } | |
| 22 | 22 | ||
| @@ -39,6 +39,7 @@ type Device struct { | |||
| 39 | 39 | var xDeviceGLibType func() types.GType | |
| 40 | 40 | ||
| 41 | 41 | func DeviceGLibType() types.GType { | |
| 42 | + | core.LazyRegister(&xDeviceGLibType, "CAIRO", "cairo_gobject_device_get_type", false) | |
| 42 | 43 | return xDeviceGLibType() | |
| 43 | 44 | } | |
| 44 | 45 | ||
| @@ -61,6 +62,7 @@ type Surface struct { | |||
| 61 | 62 | var xSurfaceGLibType func() types.GType | |
| 62 | 63 | ||
| 63 | 64 | func SurfaceGLibType() types.GType { | |
| 65 | + | core.LazyRegister(&xSurfaceGLibType, "CAIRO", "cairo_gobject_surface_get_type", false) | |
| 64 | 66 | return xSurfaceGLibType() | |
| 65 | 67 | } | |
| 66 | 68 | ||
| @@ -99,6 +101,7 @@ type Pattern struct { | |||
| 99 | 101 | var xPatternGLibType func() types.GType | |
| 100 | 102 | ||
| 101 | 103 | func PatternGLibType() types.GType { | |
| 104 | + | core.LazyRegister(&xPatternGLibType, "CAIRO", "cairo_gobject_pattern_get_type", false) | |
| 102 | 105 | return xPatternGLibType() | |
| 103 | 106 | } | |
| 104 | 107 | ||
| @@ -121,6 +124,7 @@ type Region struct { | |||
| 121 | 124 | var xRegionGLibType func() types.GType | |
| 122 | 125 | ||
| 123 | 126 | func RegionGLibType() types.GType { | |
| 127 | + | core.LazyRegister(&xRegionGLibType, "CAIRO", "cairo_gobject_region_get_type", false) | |
| 124 | 128 | return xRegionGLibType() | |
| 125 | 129 | } | |
| 126 | 130 | ||
| @@ -143,6 +147,7 @@ type FontOptions struct { | |||
| 143 | 147 | var xFontOptionsGLibType func() types.GType | |
| 144 | 148 | ||
| 145 | 149 | func FontOptionsGLibType() types.GType { | |
| 150 | + | core.LazyRegister(&xFontOptionsGLibType, "CAIRO", "cairo_gobject_font_options_get_type", false) | |
| 146 | 151 | return xFontOptionsGLibType() | |
| 147 | 152 | } | |
| 148 | 153 | ||
| @@ -165,6 +170,7 @@ type FontFace struct { | |||
| 165 | 170 | var xFontFaceGLibType func() types.GType | |
| 166 | 171 | ||
| 167 | 172 | func FontFaceGLibType() types.GType { | |
| 173 | + | core.LazyRegister(&xFontFaceGLibType, "CAIRO", "cairo_gobject_font_face_get_type", false) | |
| 168 | 174 | return xFontFaceGLibType() | |
| 169 | 175 | } | |
| 170 | 176 | ||
| @@ -187,6 +193,7 @@ type ScaledFont struct { | |||
| 187 | 193 | var xScaledFontGLibType func() types.GType | |
| 188 | 194 | ||
| 189 | 195 | func ScaledFontGLibType() types.GType { | |
| 196 | + | core.LazyRegister(&xScaledFontGLibType, "CAIRO", "cairo_gobject_scaled_font_get_type", false) | |
| 190 | 197 | return xScaledFontGLibType() | |
| 191 | 198 | } | |
| 192 | 199 | ||
| @@ -233,6 +240,7 @@ type Rectangle struct { | |||
| 233 | 240 | var xRectangleGLibType func() types.GType | |
| 234 | 241 | ||
| 235 | 242 | func RectangleGLibType() types.GType { | |
| 243 | + | core.LazyRegister(&xRectangleGLibType, "CAIRO", "cairo_gobject_rectangle_get_type", false) | |
| 236 | 244 | return xRectangleGLibType() | |
| 237 | 245 | } | |
| 238 | 246 | ||
| @@ -263,6 +271,7 @@ type RectangleInt struct { | |||
| 263 | 271 | var xRectangleIntGLibType func() types.GType | |
| 264 | 272 | ||
| 265 | 273 | func RectangleIntGLibType() types.GType { | |
| 274 | + | core.LazyRegister(&xRectangleIntGLibType, "CAIRO", "cairo_gobject_rectangle_int_get_type", false) | |
| 266 | 275 | return xRectangleIntGLibType() | |
| 267 | 276 | } | |
| 268 | 277 | ||
| @@ -291,6 +300,7 @@ type Glyph struct { | |||
| 291 | 300 | var xGlyphGLibType func() types.GType | |
| 292 | 301 | ||
| 293 | 302 | func GlyphGLibType() types.GType { | |
| 303 | + | core.LazyRegister(&xGlyphGLibType, "CAIRO", "cairo_gobject_glyph_get_type", false) | |
| 294 | 304 | return xGlyphGLibType() | |
| 295 | 305 | } | |
| 296 | 306 | ||
| @@ -317,6 +327,7 @@ type TextCluster struct { | |||
| 317 | 327 | var xTextClusterGLibType func() types.GType | |
| 318 | 328 | ||
| 319 | 329 | func TextClusterGLibType() types.GType { | |
| 330 | + | core.LazyRegister(&xTextClusterGLibType, "CAIRO", "cairo_gobject_text_cluster_get_type", false) | |
| 320 | 331 | return xTextClusterGLibType() | |
| 321 | 332 | } | |
| 322 | 333 | ||
| @@ -337,6 +348,7 @@ type Status int | |||
| 337 | 348 | var xStatusGLibType func() types.GType | |
| 338 | 349 | ||
| 339 | 350 | func StatusGLibType() types.GType { | |
| 351 | + | core.LazyRegister(&xStatusGLibType, "CAIRO", "cairo_gobject_status_get_type", false) | |
| 340 | 352 | return xStatusGLibType() | |
| 341 | 353 | } | |
| 342 | 354 | ||
| @@ -425,6 +437,7 @@ type Content int | |||
| 425 | 437 | var xContentGLibType func() types.GType | |
| 426 | 438 | ||
| 427 | 439 | func ContentGLibType() types.GType { | |
| 440 | + | core.LazyRegister(&xContentGLibType, "CAIRO", "cairo_gobject_content_get_type", false) | |
| 428 | 441 | return xContentGLibType() | |
| 429 | 442 | } | |
| 430 | 443 | ||
| @@ -441,6 +454,7 @@ type Operator int | |||
| 441 | 454 | var xOperatorGLibType func() types.GType | |
| 442 | 455 | ||
| 443 | 456 | func OperatorGLibType() types.GType { | |
| 457 | + | core.LazyRegister(&xOperatorGLibType, "CAIRO", "cairo_gobject_operator_get_type", false) | |
| 444 | 458 | return xOperatorGLibType() | |
| 445 | 459 | } | |
| 446 | 460 | ||
| @@ -509,6 +523,7 @@ type Antialias int | |||
| 509 | 523 | var xAntialiasGLibType func() types.GType | |
| 510 | 524 | ||
| 511 | 525 | func AntialiasGLibType() types.GType { | |
| 526 | + | core.LazyRegister(&xAntialiasGLibType, "CAIRO", "cairo_gobject_antialias_get_type", false) | |
| 512 | 527 | return xAntialiasGLibType() | |
| 513 | 528 | } | |
| 514 | 529 | ||
| @@ -533,6 +548,7 @@ type FillRule int | |||
| 533 | 548 | var xFillRuleGLibType func() types.GType | |
| 534 | 549 | ||
| 535 | 550 | func FillRuleGLibType() types.GType { | |
| 551 | + | core.LazyRegister(&xFillRuleGLibType, "CAIRO", "cairo_gobject_fill_rule_get_type", false) | |
| 536 | 552 | return xFillRuleGLibType() | |
| 537 | 553 | } | |
| 538 | 554 | ||
| @@ -547,6 +563,7 @@ type LineCap int | |||
| 547 | 563 | var xLineCapGLibType func() types.GType | |
| 548 | 564 | ||
| 549 | 565 | func LineCapGLibType() types.GType { | |
| 566 | + | core.LazyRegister(&xLineCapGLibType, "CAIRO", "cairo_gobject_line_cap_get_type", false) | |
| 550 | 567 | return xLineCapGLibType() | |
| 551 | 568 | } | |
| 552 | 569 | ||
| @@ -563,6 +580,7 @@ type LineJoin int | |||
| 563 | 580 | var xLineJoinGLibType func() types.GType | |
| 564 | 581 | ||
| 565 | 582 | func LineJoinGLibType() types.GType { | |
| 583 | + | core.LazyRegister(&xLineJoinGLibType, "CAIRO", "cairo_gobject_line_join_get_type", false) | |
| 566 | 584 | return xLineJoinGLibType() | |
| 567 | 585 | } | |
| 568 | 586 | ||
| @@ -579,6 +597,7 @@ type TextClusterFlags int | |||
| 579 | 597 | var xTextClusterFlagsGLibType func() types.GType | |
| 580 | 598 | ||
| 581 | 599 | func TextClusterFlagsGLibType() types.GType { | |
| 600 | + | core.LazyRegister(&xTextClusterFlagsGLibType, "CAIRO", "cairo_gobject_text_cluster_flags_get_type", false) | |
| 582 | 601 | return xTextClusterFlagsGLibType() | |
| 583 | 602 | } | |
| 584 | 603 | ||
| @@ -591,6 +610,7 @@ type FontSlant int | |||
| 591 | 610 | var xFontSlantGLibType func() types.GType | |
| 592 | 611 | ||
| 593 | 612 | func FontSlantGLibType() types.GType { | |
| 613 | + | core.LazyRegister(&xFontSlantGLibType, "CAIRO", "cairo_gobject_font_slant_get_type", false) | |
| 594 | 614 | return xFontSlantGLibType() | |
| 595 | 615 | } | |
| 596 | 616 | ||
| @@ -607,6 +627,7 @@ type FontWeight int | |||
| 607 | 627 | var xFontWeightGLibType func() types.GType | |
| 608 | 628 | ||
| 609 | 629 | func FontWeightGLibType() types.GType { | |
| 630 | + | core.LazyRegister(&xFontWeightGLibType, "CAIRO", "cairo_gobject_font_weight_get_type", false) | |
| 610 | 631 | return xFontWeightGLibType() | |
| 611 | 632 | } | |
| 612 | 633 | ||
| @@ -621,6 +642,7 @@ type SubpixelOrder int | |||
| 621 | 642 | var xSubpixelOrderGLibType func() types.GType | |
| 622 | 643 | ||
| 623 | 644 | func SubpixelOrderGLibType() types.GType { | |
| 645 | + | core.LazyRegister(&xSubpixelOrderGLibType, "CAIRO", "cairo_gobject_subpixel_order_get_type", false) | |
| 624 | 646 | return xSubpixelOrderGLibType() | |
| 625 | 647 | } | |
| 626 | 648 | ||
| @@ -641,6 +663,7 @@ type HintStyle int | |||
| 641 | 663 | var xHintStyleGLibType func() types.GType | |
| 642 | 664 | ||
| 643 | 665 | func HintStyleGLibType() types.GType { | |
| 666 | + | core.LazyRegister(&xHintStyleGLibType, "CAIRO", "cairo_gobject_hint_style_get_type", false) | |
| 644 | 667 | return xHintStyleGLibType() | |
| 645 | 668 | } | |
| 646 | 669 | ||
| @@ -661,6 +684,7 @@ type HintMetrics int | |||
| 661 | 684 | var xHintMetricsGLibType func() types.GType | |
| 662 | 685 | ||
| 663 | 686 | func HintMetricsGLibType() types.GType { | |
| 687 | + | core.LazyRegister(&xHintMetricsGLibType, "CAIRO", "cairo_gobject_hint_metrics_get_type", false) | |
| 664 | 688 | return xHintMetricsGLibType() | |
| 665 | 689 | } | |
| 666 | 690 | ||
| @@ -677,6 +701,7 @@ type FontType int | |||
| 677 | 701 | var xFontTypeGLibType func() types.GType | |
| 678 | 702 | ||
| 679 | 703 | func FontTypeGLibType() types.GType { | |
| 704 | + | core.LazyRegister(&xFontTypeGLibType, "CAIRO", "cairo_gobject_font_type_get_type", false) | |
| 680 | 705 | return xFontTypeGLibType() | |
| 681 | 706 | } | |
| 682 | 707 | ||
| @@ -697,6 +722,7 @@ type PathDataType int | |||
| 697 | 722 | var xPathDataTypeGLibType func() types.GType | |
| 698 | 723 | ||
| 699 | 724 | func PathDataTypeGLibType() types.GType { | |
| 725 | + | core.LazyRegister(&xPathDataTypeGLibType, "CAIRO", "cairo_gobject_path_data_type_get_type", false) | |
| 700 | 726 | return xPathDataTypeGLibType() | |
| 701 | 727 | } | |
| 702 | 728 | ||
| @@ -715,6 +741,7 @@ type DeviceType int | |||
| 715 | 741 | var xDeviceTypeGLibType func() types.GType | |
| 716 | 742 | ||
| 717 | 743 | func DeviceTypeGLibType() types.GType { | |
| 744 | + | core.LazyRegister(&xDeviceTypeGLibType, "CAIRO", "cairo_gobject_device_type_get_type", false) | |
| 718 | 745 | return xDeviceTypeGLibType() | |
| 719 | 746 | } | |
| 720 | 747 | ||
| @@ -743,6 +770,7 @@ type SurfaceType int | |||
| 743 | 770 | var xSurfaceTypeGLibType func() types.GType | |
| 744 | 771 | ||
| 745 | 772 | func SurfaceTypeGLibType() types.GType { | |
| 773 | + | core.LazyRegister(&xSurfaceTypeGLibType, "CAIRO", "cairo_gobject_surface_type_get_type", false) | |
| 746 | 774 | return xSurfaceTypeGLibType() | |
| 747 | 775 | } | |
| 748 | 776 | ||
| @@ -803,6 +831,7 @@ type Format int | |||
| 803 | 831 | var xFormatGLibType func() types.GType | |
| 804 | 832 | ||
| 805 | 833 | func FormatGLibType() types.GType { | |
| 834 | + | core.LazyRegister(&xFormatGLibType, "CAIRO", "cairo_gobject_format_get_type", false) | |
| 806 | 835 | return xFormatGLibType() | |
| 807 | 836 | } | |
| 808 | 837 | ||
| @@ -827,6 +856,7 @@ type PatternType int | |||
| 827 | 856 | var xPatternTypeGLibType func() types.GType | |
| 828 | 857 | ||
| 829 | 858 | func PatternTypeGLibType() types.GType { | |
| 859 | + | core.LazyRegister(&xPatternTypeGLibType, "CAIRO", "cairo_gobject_pattern_type_get_type", false) | |
| 830 | 860 | return xPatternTypeGLibType() | |
| 831 | 861 | } | |
| 832 | 862 | ||
| @@ -849,6 +879,7 @@ type Extend int | |||
| 849 | 879 | var xExtendGLibType func() types.GType | |
| 850 | 880 | ||
| 851 | 881 | func ExtendGLibType() types.GType { | |
| 882 | + | core.LazyRegister(&xExtendGLibType, "CAIRO", "cairo_gobject_extend_get_type", false) | |
| 852 | 883 | return xExtendGLibType() | |
| 853 | 884 | } | |
| 854 | 885 | ||
| @@ -867,6 +898,7 @@ type Filter int | |||
| 867 | 898 | var xFilterGLibType func() types.GType | |
| 868 | 899 | ||
| 869 | 900 | func FilterGLibType() types.GType { | |
| 901 | + | core.LazyRegister(&xFilterGLibType, "CAIRO", "cairo_gobject_filter_get_type", false) | |
| 870 | 902 | return xFilterGLibType() | |
| 871 | 903 | } | |
| 872 | 904 | ||
| @@ -889,6 +921,7 @@ type RegionOverlap int | |||
| 889 | 921 | var xRegionOverlapGLibType func() types.GType | |
| 890 | 922 | ||
| 891 | 923 | func RegionOverlapGLibType() types.GType { | |
| 924 | + | core.LazyRegister(&xRegionOverlapGLibType, "CAIRO", "cairo_gobject_region_overlap_get_type", false) | |
| 892 | 925 | return xRegionOverlapGLibType() | |
| 893 | 926 | } | |
| 894 | 927 | ||
| @@ -903,88 +936,12 @@ const ( | |||
| 903 | 936 | var xImageSurfaceCreate func() | |
| 904 | 937 | ||
| 905 | 938 | func ImageSurfaceCreate() { | |
| 939 | + | core.LazyRegister(&xImageSurfaceCreate, "CAIRO", "cairo_image_surface_create", false) | |
| 940 | + | ||
| 906 | 941 | xImageSurfaceCreate() | |
| 907 | 942 | } | |
| 908 | 943 | ||
| 909 | 944 | func init() { | |
| 910 | 945 | core.SetPackageName("CAIRO", "cairo-gobject") | |
| 911 | 946 | core.SetSharedLibraries("CAIRO", []string{"libcairo-gobject.so.2", "libcairo-gobject.2.dylib"}) | |
| 912 | - | var libs []uintptr | |
| 913 | - | for _, libPath := range core.GetPaths("CAIRO") { | |
| 914 | - | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 915 | - | if err != nil { | |
| 916 | - | panic(err) | |
| 917 | - | } | |
| 918 | - | libs = append(libs, lib) | |
| 919 | - | } | |
| 920 | - | ||
| 921 | - | core.PuregoSafeRegister(&xStatusGLibType, libs, "cairo_gobject_status_get_type") | |
| 922 | - | ||
| 923 | - | core.PuregoSafeRegister(&xContentGLibType, libs, "cairo_gobject_content_get_type") | |
| 924 | - | ||
| 925 | - | core.PuregoSafeRegister(&xOperatorGLibType, libs, "cairo_gobject_operator_get_type") | |
| 926 | - | ||
| 927 | - | core.PuregoSafeRegister(&xAntialiasGLibType, libs, "cairo_gobject_antialias_get_type") | |
| 928 | - | ||
| 929 | - | core.PuregoSafeRegister(&xFillRuleGLibType, libs, "cairo_gobject_fill_rule_get_type") | |
| 930 | - | ||
| 931 | - | core.PuregoSafeRegister(&xLineCapGLibType, libs, "cairo_gobject_line_cap_get_type") | |
| 932 | - | ||
| 933 | - | core.PuregoSafeRegister(&xLineJoinGLibType, libs, "cairo_gobject_line_join_get_type") | |
| 934 | - | ||
| 935 | - | core.PuregoSafeRegister(&xTextClusterFlagsGLibType, libs, "cairo_gobject_text_cluster_flags_get_type") | |
| 936 | - | ||
| 937 | - | core.PuregoSafeRegister(&xFontSlantGLibType, libs, "cairo_gobject_font_slant_get_type") | |
| 938 | - | ||
| 939 | - | core.PuregoSafeRegister(&xFontWeightGLibType, libs, "cairo_gobject_font_weight_get_type") | |
| 940 | - | ||
| 941 | - | core.PuregoSafeRegister(&xSubpixelOrderGLibType, libs, "cairo_gobject_subpixel_order_get_type") | |
| 942 | - | ||
| 943 | - | core.PuregoSafeRegister(&xHintStyleGLibType, libs, "cairo_gobject_hint_style_get_type") | |
| 944 | - | ||
| 945 | - | core.PuregoSafeRegister(&xHintMetricsGLibType, libs, "cairo_gobject_hint_metrics_get_type") | |
| 946 | - | ||
| 947 | - | core.PuregoSafeRegister(&xFontTypeGLibType, libs, "cairo_gobject_font_type_get_type") | |
| 948 | - | ||
| 949 | - | core.PuregoSafeRegister(&xPathDataTypeGLibType, libs, "cairo_gobject_path_data_type_get_type") | |
| 950 | - | ||
| 951 | - | core.PuregoSafeRegister(&xDeviceTypeGLibType, libs, "cairo_gobject_device_type_get_type") | |
| 952 | - | ||
| 953 | - | core.PuregoSafeRegister(&xSurfaceTypeGLibType, libs, "cairo_gobject_surface_type_get_type") | |
| 954 | - | ||
| 955 | - | core.PuregoSafeRegister(&xFormatGLibType, libs, "cairo_gobject_format_get_type") | |
| 956 | - | ||
| 957 | - | core.PuregoSafeRegister(&xPatternTypeGLibType, libs, "cairo_gobject_pattern_type_get_type") | |
| 958 | - | ||
| 959 | - | core.PuregoSafeRegister(&xExtendGLibType, libs, "cairo_gobject_extend_get_type") | |
| 960 | - | ||
| 961 | - | core.PuregoSafeRegister(&xFilterGLibType, libs, "cairo_gobject_filter_get_type") | |
| 962 | - | ||
| 963 | - | core.PuregoSafeRegister(&xRegionOverlapGLibType, libs, "cairo_gobject_region_overlap_get_type") | |
| 964 | - | ||
| 965 | - | core.PuregoSafeRegister(&xImageSurfaceCreate, libs, "cairo_image_surface_create") | |
| 966 | - | ||
| 967 | - | core.PuregoSafeRegister(&xContextGLibType, libs, "cairo_gobject_context_get_type") | |
| 968 | - | ||
| 969 | - | core.PuregoSafeRegister(&xDeviceGLibType, libs, "cairo_gobject_device_get_type") | |
| 970 | - | ||
| 971 | - | core.PuregoSafeRegister(&xSurfaceGLibType, libs, "cairo_gobject_surface_get_type") | |
| 972 | - | ||
| 973 | - | core.PuregoSafeRegister(&xPatternGLibType, libs, "cairo_gobject_pattern_get_type") | |
| 974 | - | ||
| 975 | - | core.PuregoSafeRegister(&xRegionGLibType, libs, "cairo_gobject_region_get_type") | |
| 976 | - | ||
| 977 | - | core.PuregoSafeRegister(&xFontOptionsGLibType, libs, "cairo_gobject_font_options_get_type") | |
| 978 | - | ||
| 979 | - | core.PuregoSafeRegister(&xFontFaceGLibType, libs, "cairo_gobject_font_face_get_type") | |
| 980 | - | ||
| 981 | - | core.PuregoSafeRegister(&xScaledFontGLibType, libs, "cairo_gobject_scaled_font_get_type") | |
| 982 | - | ||
| 983 | - | core.PuregoSafeRegister(&xRectangleGLibType, libs, "cairo_gobject_rectangle_get_type") | |
| 984 | - | ||
| 985 | - | core.PuregoSafeRegister(&xRectangleIntGLibType, libs, "cairo_gobject_rectangle_int_get_type") | |
| 986 | - | ||
| 987 | - | core.PuregoSafeRegister(&xGlyphGLibType, libs, "cairo_gobject_glyph_get_type") | |
| 988 | - | ||
| 989 | - | core.PuregoSafeRegister(&xTextClusterGLibType, libs, "cairo_gobject_text_cluster_get_type") | |
| 990 | 947 | } | |
| @@ -5,7 +5,6 @@ import ( | |||||
| 5 | "structs" | 5 | "structs" | ||
| 6 | "unsafe" | 6 | "unsafe" | ||
| 7 | 7 | ||||
| 8 | - | "github.com/bnema/purego" | |||
| 9 | "github.com/bnema/puregotk/pkg/core" | 8 | "github.com/bnema/puregotk/pkg/core" | ||
| 10 | "github.com/bnema/puregotk/v4/gobject/types" | 9 | "github.com/bnema/puregotk/v4/gobject/types" | ||
| 11 | ) | 10 | ) | ||
| @@ -17,6 +16,7 @@ type Context struct { | |||||
| 17 | var xContextGLibType func() types.GType | 16 | var xContextGLibType func() types.GType | ||
| 18 | 17 | ||||
| 19 | func ContextGLibType() types.GType { | 18 | func ContextGLibType() types.GType { | ||
| 19 | + | core.LazyRegister(&xContextGLibType, "CAIRO", "cairo_gobject_context_get_type", false) | |||
| 20 | return xContextGLibType() | 20 | return xContextGLibType() | ||
| 21 | } | 21 | } | ||
| 22 | 22 | ||||
| @@ -39,6 +39,7 @@ type Device struct { | |||||
| 39 | var xDeviceGLibType func() types.GType | 39 | var xDeviceGLibType func() types.GType | ||
| 40 | 40 | ||||
| 41 | func DeviceGLibType() types.GType { | 41 | func DeviceGLibType() types.GType { | ||
| 42 | + | core.LazyRegister(&xDeviceGLibType, "CAIRO", "cairo_gobject_device_get_type", false) | |||
| 42 | return xDeviceGLibType() | 43 | return xDeviceGLibType() | ||
| 43 | } | 44 | } | ||
| 44 | 45 | ||||
| @@ -61,6 +62,7 @@ type Surface struct { | |||||
| 61 | var xSurfaceGLibType func() types.GType | 62 | var xSurfaceGLibType func() types.GType | ||
| 62 | 63 | ||||
| 63 | func SurfaceGLibType() types.GType { | 64 | func SurfaceGLibType() types.GType { | ||
| 65 | + | core.LazyRegister(&xSurfaceGLibType, "CAIRO", "cairo_gobject_surface_get_type", false) | |||
| 64 | return xSurfaceGLibType() | 66 | return xSurfaceGLibType() | ||
| 65 | } | 67 | } | ||
| 66 | 68 | ||||
| @@ -99,6 +101,7 @@ type Pattern struct { | |||||
| 99 | var xPatternGLibType func() types.GType | 101 | var xPatternGLibType func() types.GType | ||
| 100 | 102 | ||||
| 101 | func PatternGLibType() types.GType { | 103 | func PatternGLibType() types.GType { | ||
| 104 | + | core.LazyRegister(&xPatternGLibType, "CAIRO", "cairo_gobject_pattern_get_type", false) | |||
| 102 | return xPatternGLibType() | 105 | return xPatternGLibType() | ||
| 103 | } | 106 | } | ||
| 104 | 107 | ||||
| @@ -121,6 +124,7 @@ type Region struct { | |||||
| 121 | var xRegionGLibType func() types.GType | 124 | var xRegionGLibType func() types.GType | ||
| 122 | 125 | ||||
| 123 | func RegionGLibType() types.GType { | 126 | func RegionGLibType() types.GType { | ||
| 127 | + | core.LazyRegister(&xRegionGLibType, "CAIRO", "cairo_gobject_region_get_type", false) | |||
| 124 | return xRegionGLibType() | 128 | return xRegionGLibType() | ||
| 125 | } | 129 | } | ||
| 126 | 130 | ||||
| @@ -143,6 +147,7 @@ type FontOptions struct { | |||||
| 143 | var xFontOptionsGLibType func() types.GType | 147 | var xFontOptionsGLibType func() types.GType | ||
| 144 | 148 | ||||
| 145 | func FontOptionsGLibType() types.GType { | 149 | func FontOptionsGLibType() types.GType { | ||
| 150 | + | core.LazyRegister(&xFontOptionsGLibType, "CAIRO", "cairo_gobject_font_options_get_type", false) | |||
| 146 | return xFontOptionsGLibType() | 151 | return xFontOptionsGLibType() | ||
| 147 | } | 152 | } | ||
| 148 | 153 | ||||
| @@ -165,6 +170,7 @@ type FontFace struct { | |||||
| 165 | var xFontFaceGLibType func() types.GType | 170 | var xFontFaceGLibType func() types.GType | ||
| 166 | 171 | ||||
| 167 | func FontFaceGLibType() types.GType { | 172 | func FontFaceGLibType() types.GType { | ||
| 173 | + | core.LazyRegister(&xFontFaceGLibType, "CAIRO", "cairo_gobject_font_face_get_type", false) | |||
| 168 | return xFontFaceGLibType() | 174 | return xFontFaceGLibType() | ||
| 169 | } | 175 | } | ||
| 170 | 176 | ||||
| @@ -187,6 +193,7 @@ type ScaledFont struct { | |||||
| 187 | var xScaledFontGLibType func() types.GType | 193 | var xScaledFontGLibType func() types.GType | ||
| 188 | 194 | ||||
| 189 | func ScaledFontGLibType() types.GType { | 195 | func ScaledFontGLibType() types.GType { | ||
| 196 | + | core.LazyRegister(&xScaledFontGLibType, "CAIRO", "cairo_gobject_scaled_font_get_type", false) | |||
| 190 | return xScaledFontGLibType() | 197 | return xScaledFontGLibType() | ||
| 191 | } | 198 | } | ||
| 192 | 199 | ||||
| @@ -233,6 +240,7 @@ type Rectangle struct { | |||||
| 233 | var xRectangleGLibType func() types.GType | 240 | var xRectangleGLibType func() types.GType | ||
| 234 | 241 | ||||
| 235 | func RectangleGLibType() types.GType { | 242 | func RectangleGLibType() types.GType { | ||
| 243 | + | core.LazyRegister(&xRectangleGLibType, "CAIRO", "cairo_gobject_rectangle_get_type", false) | |||
| 236 | return xRectangleGLibType() | 244 | return xRectangleGLibType() | ||
| 237 | } | 245 | } | ||
| 238 | 246 | ||||
| @@ -263,6 +271,7 @@ type RectangleInt struct { | |||||
| 263 | var xRectangleIntGLibType func() types.GType | 271 | var xRectangleIntGLibType func() types.GType | ||
| 264 | 272 | ||||
| 265 | func RectangleIntGLibType() types.GType { | 273 | func RectangleIntGLibType() types.GType { | ||
| 274 | + | core.LazyRegister(&xRectangleIntGLibType, "CAIRO", "cairo_gobject_rectangle_int_get_type", false) | |||
| 266 | return xRectangleIntGLibType() | 275 | return xRectangleIntGLibType() | ||
| 267 | } | 276 | } | ||
| 268 | 277 | ||||
| @@ -291,6 +300,7 @@ type Glyph struct { | |||||
| 291 | var xGlyphGLibType func() types.GType | 300 | var xGlyphGLibType func() types.GType | ||
| 292 | 301 | ||||
| 293 | func GlyphGLibType() types.GType { | 302 | func GlyphGLibType() types.GType { | ||
| 303 | + | core.LazyRegister(&xGlyphGLibType, "CAIRO", "cairo_gobject_glyph_get_type", false) | |||
| 294 | return xGlyphGLibType() | 304 | return xGlyphGLibType() | ||
| 295 | } | 305 | } | ||
| 296 | 306 | ||||
| @@ -317,6 +327,7 @@ type TextCluster struct { | |||||
| 317 | var xTextClusterGLibType func() types.GType | 327 | var xTextClusterGLibType func() types.GType | ||
| 318 | 328 | ||||
| 319 | func TextClusterGLibType() types.GType { | 329 | func TextClusterGLibType() types.GType { | ||
| 330 | + | core.LazyRegister(&xTextClusterGLibType, "CAIRO", "cairo_gobject_text_cluster_get_type", false) | |||
| 320 | return xTextClusterGLibType() | 331 | return xTextClusterGLibType() | ||
| 321 | } | 332 | } | ||
| 322 | 333 | ||||
| @@ -337,6 +348,7 @@ type Status int | |||||
| 337 | var xStatusGLibType func() types.GType | 348 | var xStatusGLibType func() types.GType | ||
| 338 | 349 | ||||
| 339 | func StatusGLibType() types.GType { | 350 | func StatusGLibType() types.GType { | ||
| 351 | + | core.LazyRegister(&xStatusGLibType, "CAIRO", "cairo_gobject_status_get_type", false) | |||
| 340 | return xStatusGLibType() | 352 | return xStatusGLibType() | ||
| 341 | } | 353 | } | ||
| 342 | 354 | ||||
| @@ -425,6 +437,7 @@ type Content int | |||||
| 425 | var xContentGLibType func() types.GType | 437 | var xContentGLibType func() types.GType | ||
| 426 | 438 | ||||
| 427 | func ContentGLibType() types.GType { | 439 | func ContentGLibType() types.GType { | ||
| 440 | + | core.LazyRegister(&xContentGLibType, "CAIRO", "cairo_gobject_content_get_type", false) | |||
| 428 | return xContentGLibType() | 441 | return xContentGLibType() | ||
| 429 | } | 442 | } | ||
| 430 | 443 | ||||
| @@ -441,6 +454,7 @@ type Operator int | |||||
| 441 | var xOperatorGLibType func() types.GType | 454 | var xOperatorGLibType func() types.GType | ||
| 442 | 455 | ||||
| 443 | func OperatorGLibType() types.GType { | 456 | func OperatorGLibType() types.GType { | ||
| 457 | + | core.LazyRegister(&xOperatorGLibType, "CAIRO", "cairo_gobject_operator_get_type", false) | |||
| 444 | return xOperatorGLibType() | 458 | return xOperatorGLibType() | ||
| 445 | } | 459 | } | ||
| 446 | 460 | ||||
| @@ -509,6 +523,7 @@ type Antialias int | |||||
| 509 | var xAntialiasGLibType func() types.GType | 523 | var xAntialiasGLibType func() types.GType | ||
| 510 | 524 | ||||
| 511 | func AntialiasGLibType() types.GType { | 525 | func AntialiasGLibType() types.GType { | ||
| 526 | + | core.LazyRegister(&xAntialiasGLibType, "CAIRO", "cairo_gobject_antialias_get_type", false) | |||
| 512 | return xAntialiasGLibType() | 527 | return xAntialiasGLibType() | ||
| 513 | } | 528 | } | ||
| 514 | 529 | ||||
| @@ -533,6 +548,7 @@ type FillRule int | |||||
| 533 | var xFillRuleGLibType func() types.GType | 548 | var xFillRuleGLibType func() types.GType | ||
| 534 | 549 | ||||
| 535 | func FillRuleGLibType() types.GType { | 550 | func FillRuleGLibType() types.GType { | ||
| 551 | + | core.LazyRegister(&xFillRuleGLibType, "CAIRO", "cairo_gobject_fill_rule_get_type", false) | |||
| 536 | return xFillRuleGLibType() | 552 | return xFillRuleGLibType() | ||
| 537 | } | 553 | } | ||
| 538 | 554 | ||||
| @@ -547,6 +563,7 @@ type LineCap int | |||||
| 547 | var xLineCapGLibType func() types.GType | 563 | var xLineCapGLibType func() types.GType | ||
| 548 | 564 | ||||
| 549 | func LineCapGLibType() types.GType { | 565 | func LineCapGLibType() types.GType { | ||
| 566 | + | core.LazyRegister(&xLineCapGLibType, "CAIRO", "cairo_gobject_line_cap_get_type", false) | |||
| 550 | return xLineCapGLibType() | 567 | return xLineCapGLibType() | ||
| 551 | } | 568 | } | ||
| 552 | 569 | ||||
| @@ -563,6 +580,7 @@ type LineJoin int | |||||
| 563 | var xLineJoinGLibType func() types.GType | 580 | var xLineJoinGLibType func() types.GType | ||
| 564 | 581 | ||||
| 565 | func LineJoinGLibType() types.GType { | 582 | func LineJoinGLibType() types.GType { | ||
| 583 | + | core.LazyRegister(&xLineJoinGLibType, "CAIRO", "cairo_gobject_line_join_get_type", false) | |||
| 566 | return xLineJoinGLibType() | 584 | return xLineJoinGLibType() | ||
| 567 | } | 585 | } | ||
| 568 | 586 | ||||
| @@ -579,6 +597,7 @@ type TextClusterFlags int | |||||
| 579 | var xTextClusterFlagsGLibType func() types.GType | 597 | var xTextClusterFlagsGLibType func() types.GType | ||
| 580 | 598 | ||||
| 581 | func TextClusterFlagsGLibType() types.GType { | 599 | func TextClusterFlagsGLibType() types.GType { | ||
| 600 | + | core.LazyRegister(&xTextClusterFlagsGLibType, "CAIRO", "cairo_gobject_text_cluster_flags_get_type", false) | |||
| 582 | return xTextClusterFlagsGLibType() | 601 | return xTextClusterFlagsGLibType() | ||
| 583 | } | 602 | } | ||
| 584 | 603 | ||||
| @@ -591,6 +610,7 @@ type FontSlant int | |||||
| 591 | var xFontSlantGLibType func() types.GType | 610 | var xFontSlantGLibType func() types.GType | ||
| 592 | 611 | ||||
| 593 | func FontSlantGLibType() types.GType { | 612 | func FontSlantGLibType() types.GType { | ||
| 613 | + | core.LazyRegister(&xFontSlantGLibType, "CAIRO", "cairo_gobject_font_slant_get_type", false) | |||
| 594 | return xFontSlantGLibType() | 614 | return xFontSlantGLibType() | ||
| 595 | } | 615 | } | ||
| 596 | 616 | ||||
| @@ -607,6 +627,7 @@ type FontWeight int | |||||
| 607 | var xFontWeightGLibType func() types.GType | 627 | var xFontWeightGLibType func() types.GType | ||
| 608 | 628 | ||||
| 609 | func FontWeightGLibType() types.GType { | 629 | func FontWeightGLibType() types.GType { | ||
| 630 | + | core.LazyRegister(&xFontWeightGLibType, "CAIRO", "cairo_gobject_font_weight_get_type", false) | |||
| 610 | return xFontWeightGLibType() | 631 | return xFontWeightGLibType() | ||
| 611 | } | 632 | } | ||
| 612 | 633 | ||||
| @@ -621,6 +642,7 @@ type SubpixelOrder int | |||||
| 621 | var xSubpixelOrderGLibType func() types.GType | 642 | var xSubpixelOrderGLibType func() types.GType | ||
| 622 | 643 | ||||
| 623 | func SubpixelOrderGLibType() types.GType { | 644 | func SubpixelOrderGLibType() types.GType { | ||
| 645 | + | core.LazyRegister(&xSubpixelOrderGLibType, "CAIRO", "cairo_gobject_subpixel_order_get_type", false) | |||
| 624 | return xSubpixelOrderGLibType() | 646 | return xSubpixelOrderGLibType() | ||
| 625 | } | 647 | } | ||
| 626 | 648 | ||||
| @@ -641,6 +663,7 @@ type HintStyle int | |||||
| 641 | var xHintStyleGLibType func() types.GType | 663 | var xHintStyleGLibType func() types.GType | ||
| 642 | 664 | ||||
| 643 | func HintStyleGLibType() types.GType { | 665 | func HintStyleGLibType() types.GType { | ||
| 666 | + | core.LazyRegister(&xHintStyleGLibType, "CAIRO", "cairo_gobject_hint_style_get_type", false) | |||
| 644 | return xHintStyleGLibType() | 667 | return xHintStyleGLibType() | ||
| 645 | } | 668 | } | ||
| 646 | 669 | ||||
| @@ -661,6 +684,7 @@ type HintMetrics int | |||||
| 661 | var xHintMetricsGLibType func() types.GType | 684 | var xHintMetricsGLibType func() types.GType | ||
| 662 | 685 | ||||
| 663 | func HintMetricsGLibType() types.GType { | 686 | func HintMetricsGLibType() types.GType { | ||
| 687 | + | core.LazyRegister(&xHintMetricsGLibType, "CAIRO", "cairo_gobject_hint_metrics_get_type", false) | |||
| 664 | return xHintMetricsGLibType() | 688 | return xHintMetricsGLibType() | ||
| 665 | } | 689 | } | ||
| 666 | 690 | ||||
| @@ -677,6 +701,7 @@ type FontType int | |||||
| 677 | var xFontTypeGLibType func() types.GType | 701 | var xFontTypeGLibType func() types.GType | ||
| 678 | 702 | ||||
| 679 | func FontTypeGLibType() types.GType { | 703 | func FontTypeGLibType() types.GType { | ||
| 704 | + | core.LazyRegister(&xFontTypeGLibType, "CAIRO", "cairo_gobject_font_type_get_type", false) | |||
| 680 | return xFontTypeGLibType() | 705 | return xFontTypeGLibType() | ||
| 681 | } | 706 | } | ||
| 682 | 707 | ||||
| @@ -697,6 +722,7 @@ type PathDataType int | |||||
| 697 | var xPathDataTypeGLibType func() types.GType | 722 | var xPathDataTypeGLibType func() types.GType | ||
| 698 | 723 | ||||
| 699 | func PathDataTypeGLibType() types.GType { | 724 | func PathDataTypeGLibType() types.GType { | ||
| 725 | + | core.LazyRegister(&xPathDataTypeGLibType, "CAIRO", "cairo_gobject_path_data_type_get_type", false) | |||
| 700 | return xPathDataTypeGLibType() | 726 | return xPathDataTypeGLibType() | ||
| 701 | } | 727 | } | ||
| 702 | 728 | ||||
| @@ -715,6 +741,7 @@ type DeviceType int | |||||
| 715 | var xDeviceTypeGLibType func() types.GType | 741 | var xDeviceTypeGLibType func() types.GType | ||
| 716 | 742 | ||||
| 717 | func DeviceTypeGLibType() types.GType { | 743 | func DeviceTypeGLibType() types.GType { | ||
| 744 | + | core.LazyRegister(&xDeviceTypeGLibType, "CAIRO", "cairo_gobject_device_type_get_type", false) | |||
| 718 | return xDeviceTypeGLibType() | 745 | return xDeviceTypeGLibType() | ||
| 719 | } | 746 | } | ||
| 720 | 747 | ||||
| @@ -743,6 +770,7 @@ type SurfaceType int | |||||
| 743 | var xSurfaceTypeGLibType func() types.GType | 770 | var xSurfaceTypeGLibType func() types.GType | ||
| 744 | 771 | ||||
| 745 | func SurfaceTypeGLibType() types.GType { | 772 | func SurfaceTypeGLibType() types.GType { | ||
| 773 | + | core.LazyRegister(&xSurfaceTypeGLibType, "CAIRO", "cairo_gobject_surface_type_get_type", false) | |||
| 746 | return xSurfaceTypeGLibType() | 774 | return xSurfaceTypeGLibType() | ||
| 747 | } | 775 | } | ||
| 748 | 776 | ||||
| @@ -803,6 +831,7 @@ type Format int | |||||
| 803 | var xFormatGLibType func() types.GType | 831 | var xFormatGLibType func() types.GType | ||
| 804 | 832 | ||||
| 805 | func FormatGLibType() types.GType { | 833 | func FormatGLibType() types.GType { | ||
| 834 | + | core.LazyRegister(&xFormatGLibType, "CAIRO", "cairo_gobject_format_get_type", false) | |||
| 806 | return xFormatGLibType() | 835 | return xFormatGLibType() | ||
| 807 | } | 836 | } | ||
| 808 | 837 | ||||
| @@ -827,6 +856,7 @@ type PatternType int | |||||
| 827 | var xPatternTypeGLibType func() types.GType | 856 | var xPatternTypeGLibType func() types.GType | ||
| 828 | 857 | ||||
| 829 | func PatternTypeGLibType() types.GType { | 858 | func PatternTypeGLibType() types.GType { | ||
| 859 | + | core.LazyRegister(&xPatternTypeGLibType, "CAIRO", "cairo_gobject_pattern_type_get_type", false) | |||
| 830 | return xPatternTypeGLibType() | 860 | return xPatternTypeGLibType() | ||
| 831 | } | 861 | } | ||
| 832 | 862 | ||||
| @@ -849,6 +879,7 @@ type Extend int | |||||
| 849 | var xExtendGLibType func() types.GType | 879 | var xExtendGLibType func() types.GType | ||
| 850 | 880 | ||||
| 851 | func ExtendGLibType() types.GType { | 881 | func ExtendGLibType() types.GType { | ||
| 882 | + | core.LazyRegister(&xExtendGLibType, "CAIRO", "cairo_gobject_extend_get_type", false) | |||
| 852 | return xExtendGLibType() | 883 | return xExtendGLibType() | ||
| 853 | } | 884 | } | ||
| 854 | 885 | ||||
| @@ -867,6 +898,7 @@ type Filter int | |||||
| 867 | var xFilterGLibType func() types.GType | 898 | var xFilterGLibType func() types.GType | ||
| 868 | 899 | ||||
| 869 | func FilterGLibType() types.GType { | 900 | func FilterGLibType() types.GType { | ||
| 901 | + | core.LazyRegister(&xFilterGLibType, "CAIRO", "cairo_gobject_filter_get_type", false) | |||
| 870 | return xFilterGLibType() | 902 | return xFilterGLibType() | ||
| 871 | } | 903 | } | ||
| 872 | 904 | ||||
| @@ -889,6 +921,7 @@ type RegionOverlap int | |||||
| 889 | var xRegionOverlapGLibType func() types.GType | 921 | var xRegionOverlapGLibType func() types.GType | ||
| 890 | 922 | ||||
| 891 | func RegionOverlapGLibType() types.GType { | 923 | func RegionOverlapGLibType() types.GType { | ||
| 924 | + | core.LazyRegister(&xRegionOverlapGLibType, "CAIRO", "cairo_gobject_region_overlap_get_type", false) | |||
| 892 | return xRegionOverlapGLibType() | 925 | return xRegionOverlapGLibType() | ||
| 893 | } | 926 | } | ||
| 894 | 927 | ||||
| @@ -903,88 +936,12 @@ const ( | |||||
| 903 | var xImageSurfaceCreate func() | 936 | var xImageSurfaceCreate func() | ||
| 904 | 937 | ||||
| 905 | func ImageSurfaceCreate() { | 938 | func ImageSurfaceCreate() { | ||
| 939 | + | core.LazyRegister(&xImageSurfaceCreate, "CAIRO", "cairo_image_surface_create", false) | |||
| 940 | + | ||||
| 906 | xImageSurfaceCreate() | 941 | xImageSurfaceCreate() | ||
| 907 | } | 942 | } | ||
| 908 | 943 | ||||
| 909 | func init() { | 944 | func init() { | ||
| 910 | core.SetPackageName("CAIRO", "cairo-gobject") | 945 | core.SetPackageName("CAIRO", "cairo-gobject") | ||
| 911 | core.SetSharedLibraries("CAIRO", []string{"libcairo-gobject.so.2", "libcairo-gobject.2.dylib"}) | 946 | core.SetSharedLibraries("CAIRO", []string{"libcairo-gobject.so.2", "libcairo-gobject.2.dylib"}) | ||
| 912 | - | var libs []uintptr | |||
| 913 | - | for _, libPath := range core.GetPaths("CAIRO") { | |||
| 914 | - | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |||
| 915 | - | if err != nil { | |||
| 916 | - | panic(err) | |||
| 917 | - | } | |||
| 918 | - | libs = append(libs, lib) | |||
| 919 | - | } | |||
| 920 | - | ||||
| 921 | - | core.PuregoSafeRegister(&xStatusGLibType, libs, "cairo_gobject_status_get_type") | |||
| 922 | - | ||||
| 923 | - | core.PuregoSafeRegister(&xContentGLibType, libs, "cairo_gobject_content_get_type") | |||
| 924 | - | ||||
| 925 | - | core.PuregoSafeRegister(&xOperatorGLibType, libs, "cairo_gobject_operator_get_type") | |||
| 926 | - | ||||
| 927 | - | core.PuregoSafeRegister(&xAntialiasGLibType, libs, "cairo_gobject_antialias_get_type") | |||
| 928 | - | ||||
| 929 | - | core.PuregoSafeRegister(&xFillRuleGLibType, libs, "cairo_gobject_fill_rule_get_type") | |||
| 930 | - | ||||
| 931 | - | core.PuregoSafeRegister(&xLineCapGLibType, libs, "cairo_gobject_line_cap_get_type") | |||
| 932 | - | ||||
| 933 | - | core.PuregoSafeRegister(&xLineJoinGLibType, libs, "cairo_gobject_line_join_get_type") | |||
| 934 | - | ||||
| 935 | - | core.PuregoSafeRegister(&xTextClusterFlagsGLibType, libs, "cairo_gobject_text_cluster_flags_get_type") | |||
| 936 | - | ||||
| 937 | - | core.PuregoSafeRegister(&xFontSlantGLibType, libs, "cairo_gobject_font_slant_get_type") | |||
| 938 | - | ||||
| 939 | - | core.PuregoSafeRegister(&xFontWeightGLibType, libs, "cairo_gobject_font_weight_get_type") | |||
| 940 | - | ||||
| 941 | - | core.PuregoSafeRegister(&xSubpixelOrderGLibType, libs, "cairo_gobject_subpixel_order_get_type") | |||
| 942 | - | ||||
| 943 | - | core.PuregoSafeRegister(&xHintStyleGLibType, libs, "cairo_gobject_hint_style_get_type") | |||
| 944 | - | ||||
| 945 | - | core.PuregoSafeRegister(&xHintMetricsGLibType, libs, "cairo_gobject_hint_metrics_get_type") | |||
| 946 | - | ||||
| 947 | - | core.PuregoSafeRegister(&xFontTypeGLibType, libs, "cairo_gobject_font_type_get_type") | |||
| 948 | - | ||||
| 949 | - | core.PuregoSafeRegister(&xPathDataTypeGLibType, libs, "cairo_gobject_path_data_type_get_type") | |||
| 950 | - | ||||
| 951 | - | core.PuregoSafeRegister(&xDeviceTypeGLibType, libs, "cairo_gobject_device_type_get_type") | |||
| 952 | - | ||||
| 953 | - | core.PuregoSafeRegister(&xSurfaceTypeGLibType, libs, "cairo_gobject_surface_type_get_type") | |||
| 954 | - | ||||
| 955 | - | core.PuregoSafeRegister(&xFormatGLibType, libs, "cairo_gobject_format_get_type") | |||
| 956 | - | ||||
| 957 | - | core.PuregoSafeRegister(&xPatternTypeGLibType, libs, "cairo_gobject_pattern_type_get_type") | |||
| 958 | - | ||||
| 959 | - | core.PuregoSafeRegister(&xExtendGLibType, libs, "cairo_gobject_extend_get_type") | |||
| 960 | - | ||||
| 961 | - | core.PuregoSafeRegister(&xFilterGLibType, libs, "cairo_gobject_filter_get_type") | |||
| 962 | - | ||||
| 963 | - | core.PuregoSafeRegister(&xRegionOverlapGLibType, libs, "cairo_gobject_region_overlap_get_type") | |||
| 964 | - | ||||
| 965 | - | core.PuregoSafeRegister(&xImageSurfaceCreate, libs, "cairo_image_surface_create") | |||
| 966 | - | ||||
| 967 | - | core.PuregoSafeRegister(&xContextGLibType, libs, "cairo_gobject_context_get_type") | |||
| 968 | - | ||||
| 969 | - | core.PuregoSafeRegister(&xDeviceGLibType, libs, "cairo_gobject_device_get_type") | |||
| 970 | - | ||||
| 971 | - | core.PuregoSafeRegister(&xSurfaceGLibType, libs, "cairo_gobject_surface_get_type") | |||
| 972 | - | ||||
| 973 | - | core.PuregoSafeRegister(&xPatternGLibType, libs, "cairo_gobject_pattern_get_type") | |||
| 974 | - | ||||
| 975 | - | core.PuregoSafeRegister(&xRegionGLibType, libs, "cairo_gobject_region_get_type") | |||
| 976 | - | ||||
| 977 | - | core.PuregoSafeRegister(&xFontOptionsGLibType, libs, "cairo_gobject_font_options_get_type") | |||
| 978 | - | ||||
| 979 | - | core.PuregoSafeRegister(&xFontFaceGLibType, libs, "cairo_gobject_font_face_get_type") | |||
| 980 | - | ||||
| 981 | - | core.PuregoSafeRegister(&xScaledFontGLibType, libs, "cairo_gobject_scaled_font_get_type") | |||
| 982 | - | ||||
| 983 | - | core.PuregoSafeRegister(&xRectangleGLibType, libs, "cairo_gobject_rectangle_get_type") | |||
| 984 | - | ||||
| 985 | - | core.PuregoSafeRegister(&xRectangleIntGLibType, libs, "cairo_gobject_rectangle_int_get_type") | |||
| 986 | - | ||||
| 987 | - | core.PuregoSafeRegister(&xGlyphGLibType, libs, "cairo_gobject_glyph_get_type") | |||
| 988 | - | ||||
| 989 | - | core.PuregoSafeRegister(&xTextClusterGLibType, libs, "cairo_gobject_text_cluster_get_type") | |||
| 990 | } | 947 | } | ||