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
| @@ -5,7 +5,6 @@ import ( | |||
| 5 | 5 | "structs" | |
| 6 | 6 | "unsafe" | |
| 7 | 7 | ||
| 8 | - | "github.com/bnema/purego" | |
| 9 | 8 | "github.com/bnema/puregotk/pkg/core" | |
| 10 | 9 | "github.com/bnema/puregotk/v4/glib" | |
| 11 | 10 | "github.com/bnema/puregotk/v4/gobject" | |
| @@ -37,6 +36,7 @@ type ToastPriority int | |||
| 37 | 36 | var xToastPriorityGLibType func() types.GType | |
| 38 | 37 | ||
| 39 | 38 | func ToastPriorityGLibType() types.GType { | |
| 39 | + | core.LazyRegister(&xToastPriorityGLibType, "ADW", "adw_toast_priority_get_type", false) | |
| 40 | 40 | return xToastPriorityGLibType() | |
| 41 | 41 | } | |
| 42 | 42 | ||
| @@ -191,6 +191,7 @@ type Toast struct { | |||
| 191 | 191 | var xToastGLibType func() types.GType | |
| 192 | 192 | ||
| 193 | 193 | func ToastGLibType() types.GType { | |
| 194 | + | core.LazyRegister(&xToastGLibType, "ADW", "adw_toast_get_type", false) | |
| 194 | 195 | return xToastGLibType() | |
| 195 | 196 | } | |
| 196 | 197 | ||
| @@ -208,6 +209,7 @@ var xNewToast func(string) uintptr | |||
| 208 | 209 | // | |
| 209 | 210 | // @title can be marked up with the Pango text markup language. | |
| 210 | 211 | func NewToast(TitleVar string) *Toast { | |
| 212 | + | core.LazyRegister(&xNewToast, "ADW", "adw_toast_new", false) | |
| 211 | 213 | var cls *Toast | |
| 212 | 214 | ||
| 213 | 215 | cret := xNewToast(TitleVar) | |
| @@ -228,6 +230,7 @@ var xNewToastFormat func(string, ...interface{}) uintptr | |||
| 228 | 230 | // | |
| 229 | 231 | // See also: [ctor@Toast.new] | |
| 230 | 232 | func NewToastFormat(FormatVar string, varArgs ...interface{}) *Toast { | |
| 233 | + | core.LazyRegister(&xNewToastFormat, "ADW", "adw_toast_new_format", false) | |
| 231 | 234 | var cls *Toast | |
| 232 | 235 | ||
| 233 | 236 | cret := xNewToastFormat(FormatVar, varArgs...) | |
| @@ -247,6 +250,8 @@ var xToastDismiss func(uintptr) | |||
| 247 | 250 | // Does nothing if @self has already been dismissed, or hasn't been added to an | |
| 248 | 251 | // [class@ToastOverlay]. | |
| 249 | 252 | func (x *Toast) Dismiss() { | |
| 253 | + | core.LazyRegister(&xToastDismiss, "ADW", "adw_toast_dismiss", false) | |
| 254 | + | ||
| 250 | 255 | xToastDismiss(x.GoPointer()) | |
| 251 | 256 | } | |
| 252 | 257 | ||
| @@ -254,6 +259,8 @@ var xToastGetActionName func(uintptr) string | |||
| 254 | 259 | ||
| 255 | 260 | // Gets the name of the associated action. | |
| 256 | 261 | func (x *Toast) GetActionName() string { | |
| 262 | + | core.LazyRegister(&xToastGetActionName, "ADW", "adw_toast_get_action_name", false) | |
| 263 | + | ||
| 257 | 264 | cret := xToastGetActionName(x.GoPointer()) | |
| 258 | 265 | return cret | |
| 259 | 266 | } | |
| @@ -262,6 +269,8 @@ var xToastGetActionTargetValue func(uintptr) uintptr | |||
| 262 | 269 | ||
| 263 | 270 | // Gets the parameter for action invocations. | |
| 264 | 271 | func (x *Toast) GetActionTargetValue() *glib.Variant { | |
| 272 | + | core.LazyRegister(&xToastGetActionTargetValue, "ADW", "adw_toast_get_action_target_value", false) | |
| 273 | + | ||
| 265 | 274 | cret := xToastGetActionTargetValue(x.GoPointer()) | |
| 266 | 275 | if cret == 0 { | |
| 267 | 276 | return nil | |
| @@ -273,6 +282,8 @@ var xToastGetButtonLabel func(uintptr) string | |||
| 273 | 282 | ||
| 274 | 283 | // Gets the label to show on the button. | |
| 275 | 284 | func (x *Toast) GetButtonLabel() string { | |
| 285 | + | core.LazyRegister(&xToastGetButtonLabel, "ADW", "adw_toast_get_button_label", false) | |
| 286 | + | ||
| 276 | 287 | cret := xToastGetButtonLabel(x.GoPointer()) | |
| 277 | 288 | return cret | |
| 278 | 289 | } | |
| @@ -281,6 +292,7 @@ var xToastGetCustomTitle func(uintptr) uintptr | |||
| 281 | 292 | ||
| 282 | 293 | // Gets the custom title widget of @self. | |
| 283 | 294 | func (x *Toast) GetCustomTitle() *gtk.Widget { | |
| 295 | + | core.LazyRegister(&xToastGetCustomTitle, "ADW", "adw_toast_get_custom_title", false) | |
| 284 | 296 | var cls *gtk.Widget | |
| 285 | 297 | ||
| 286 | 298 | cret := xToastGetCustomTitle(x.GoPointer()) | |
| @@ -298,6 +310,8 @@ var xToastGetPriority func(uintptr) ToastPriority | |||
| 298 | 310 | ||
| 299 | 311 | // Gets priority for @self. | |
| 300 | 312 | func (x *Toast) GetPriority() ToastPriority { | |
| 313 | + | core.LazyRegister(&xToastGetPriority, "ADW", "adw_toast_get_priority", false) | |
| 314 | + | ||
| 301 | 315 | cret := xToastGetPriority(x.GoPointer()) | |
| 302 | 316 | return cret | |
| 303 | 317 | } | |
| @@ -306,6 +320,8 @@ var xToastGetTimeout func(uintptr) uint | |||
| 306 | 320 | ||
| 307 | 321 | // Gets timeout for @self. | |
| 308 | 322 | func (x *Toast) GetTimeout() uint { | |
| 323 | + | core.LazyRegister(&xToastGetTimeout, "ADW", "adw_toast_get_timeout", false) | |
| 324 | + | ||
| 309 | 325 | cret := xToastGetTimeout(x.GoPointer()) | |
| 310 | 326 | return cret | |
| 311 | 327 | } | |
| @@ -317,6 +333,8 @@ var xToastGetTitle func(uintptr) string | |||
| 317 | 333 | // If a custom title has been set with [method@Adw.Toast.set_custom_title] | |
| 318 | 334 | // the return value will be %NULL. | |
| 319 | 335 | func (x *Toast) GetTitle() string { | |
| 336 | + | core.LazyRegister(&xToastGetTitle, "ADW", "adw_toast_get_title", false) | |
| 337 | + | ||
| 320 | 338 | cret := xToastGetTitle(x.GoPointer()) | |
| 321 | 339 | return cret | |
| 322 | 340 | } | |
| @@ -325,6 +343,8 @@ var xToastGetUseMarkup func(uintptr) bool | |||
| 325 | 343 | ||
| 326 | 344 | // Gets whether to use Pango markup for the toast title. | |
| 327 | 345 | func (x *Toast) GetUseMarkup() bool { | |
| 346 | + | core.LazyRegister(&xToastGetUseMarkup, "ADW", "adw_toast_get_use_markup", false) | |
| 347 | + | ||
| 328 | 348 | cret := xToastGetUseMarkup(x.GoPointer()) | |
| 329 | 349 | return cret | |
| 330 | 350 | } | |
| @@ -337,6 +357,8 @@ var xToastSetActionName func(uintptr, uintptr) | |||
| 337 | 357 | // | |
| 338 | 358 | // See [property@Toast:action-target]. | |
| 339 | 359 | func (x *Toast) SetActionName(ActionNameVar *string) { | |
| 360 | + | core.LazyRegister(&xToastSetActionName, "ADW", "adw_toast_set_action_name", false) | |
| 361 | + | ||
| 340 | 362 | ActionNameVarPtr := core.GStrdupNullable(ActionNameVar) | |
| 341 | 363 | defer core.GFreeNullable(ActionNameVarPtr) | |
| 342 | 364 | ||
| @@ -355,6 +377,8 @@ var xToastSetActionTarget func(uintptr, uintptr, ...interface{}) | |||
| 355 | 377 | // the action name at the same time, you can use | |
| 356 | 378 | // [method@Toast.set_detailed_action_name]. | |
| 357 | 379 | func (x *Toast) SetActionTarget(FormatStringVar *string, varArgs ...interface{}) { | |
| 380 | + | core.LazyRegister(&xToastSetActionTarget, "ADW", "adw_toast_set_action_target", false) | |
| 381 | + | ||
| 358 | 382 | FormatStringVarPtr := core.GStrdupNullable(FormatStringVar) | |
| 359 | 383 | defer core.GFreeNullable(FormatStringVarPtr) | |
| 360 | 384 | ||
| @@ -368,6 +392,8 @@ var xToastSetActionTargetValue func(uintptr, *glib.Variant) | |||
| 368 | 392 | // If the @action_target variant has a floating reference this function | |
| 369 | 393 | // will sink it. | |
| 370 | 394 | func (x *Toast) SetActionTargetValue(ActionTargetVar *glib.Variant) { | |
| 395 | + | core.LazyRegister(&xToastSetActionTargetValue, "ADW", "adw_toast_set_action_target_value", false) | |
| 396 | + | ||
| 371 | 397 | xToastSetActionTargetValue(x.GoPointer(), ActionTargetVar) | |
| 372 | 398 | } | |
| 373 | 399 | ||
| @@ -381,6 +407,8 @@ var xToastSetButtonLabel func(uintptr, uintptr) | |||
| 381 | 407 | // | |
| 382 | 408 | // See [property@Toast:action-name]. | |
| 383 | 409 | func (x *Toast) SetButtonLabel(ButtonLabelVar *string) { | |
| 410 | + | core.LazyRegister(&xToastSetButtonLabel, "ADW", "adw_toast_set_button_label", false) | |
| 411 | + | ||
| 384 | 412 | ButtonLabelVarPtr := core.GStrdupNullable(ButtonLabelVar) | |
| 385 | 413 | defer core.GFreeNullable(ButtonLabelVarPtr) | |
| 386 | 414 | ||
| @@ -396,6 +424,8 @@ var xToastSetCustomTitle func(uintptr, uintptr) | |||
| 396 | 424 | // | |
| 397 | 425 | // Setting a custom title will unset [property@Toast:title]. | |
| 398 | 426 | func (x *Toast) SetCustomTitle(WidgetVar *gtk.Widget) { | |
| 427 | + | core.LazyRegister(&xToastSetCustomTitle, "ADW", "adw_toast_set_custom_title", false) | |
| 428 | + | ||
| 399 | 429 | xToastSetCustomTitle(x.GoPointer(), WidgetVar.GoPointer()) | |
| 400 | 430 | } | |
| 401 | 431 | ||
| @@ -406,6 +436,8 @@ var xToastSetDetailedActionName func(uintptr, uintptr) | |||
| 406 | 436 | // @detailed_action_name is a string in the format accepted by | |
| 407 | 437 | // [func@Gio.Action.parse_detailed_name]. | |
| 408 | 438 | func (x *Toast) SetDetailedActionName(DetailedActionNameVar *string) { | |
| 439 | + | core.LazyRegister(&xToastSetDetailedActionName, "ADW", "adw_toast_set_detailed_action_name", false) | |
| 440 | + | ||
| 409 | 441 | DetailedActionNameVarPtr := core.GStrdupNullable(DetailedActionNameVar) | |
| 410 | 442 | defer core.GFreeNullable(DetailedActionNameVarPtr) | |
| 411 | 443 | ||
| @@ -424,6 +456,8 @@ var xToastSetPriority func(uintptr, ToastPriority) | |||
| 424 | 456 | // If @priority is [enum@Adw.ToastPriority.high], the toast will be displayed | |
| 425 | 457 | // immediately, pushing the previous toast into the queue instead. | |
| 426 | 458 | func (x *Toast) SetPriority(PriorityVar ToastPriority) { | |
| 459 | + | core.LazyRegister(&xToastSetPriority, "ADW", "adw_toast_set_priority", false) | |
| 460 | + | ||
| 427 | 461 | xToastSetPriority(x.GoPointer(), PriorityVar) | |
| 428 | 462 | } | |
| 429 | 463 | ||
| @@ -437,6 +471,8 @@ var xToastSetTimeout func(uintptr, uint) | |||
| 437 | 471 | // Toasts cannot disappear while being hovered, pressed (on touchscreen), or | |
| 438 | 472 | // have keyboard focus inside them. | |
| 439 | 473 | func (x *Toast) SetTimeout(TimeoutVar uint) { | |
| 474 | + | core.LazyRegister(&xToastSetTimeout, "ADW", "adw_toast_set_timeout", false) | |
| 475 | + | ||
| 440 | 476 | xToastSetTimeout(x.GoPointer(), TimeoutVar) | |
| 441 | 477 | } | |
| 442 | 478 | ||
| @@ -450,6 +486,8 @@ var xToastSetTitle func(uintptr, string) | |||
| 450 | 486 | // | |
| 451 | 487 | // If [property@Toast:custom-title] is set, it will be used instead. | |
| 452 | 488 | func (x *Toast) SetTitle(TitleVar string) { | |
| 489 | + | core.LazyRegister(&xToastSetTitle, "ADW", "adw_toast_set_title", false) | |
| 490 | + | ||
| 453 | 491 | xToastSetTitle(x.GoPointer(), TitleVar) | |
| 454 | 492 | } | |
| 455 | 493 | ||
| @@ -459,6 +497,8 @@ var xToastSetUseMarkup func(uintptr, bool) | |||
| 459 | 497 | // | |
| 460 | 498 | // See also [func@Pango.parse_markup]. | |
| 461 | 499 | func (x *Toast) SetUseMarkup(UseMarkupVar bool) { | |
| 500 | + | core.LazyRegister(&xToastSetUseMarkup, "ADW", "adw_toast_set_use_markup", false) | |
| 501 | + | ||
| 462 | 502 | xToastSetUseMarkup(x.GoPointer(), UseMarkupVar) | |
| 463 | 503 | } | |
| 464 | 504 | ||
| @@ -674,39 +714,4 @@ func (x *Toast) ConnectDismissed(cb *func(Toast)) uint { | |||
| 674 | 714 | func init() { | |
| 675 | 715 | core.SetPackageName("ADW", "libadwaita-1") | |
| 676 | 716 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | |
| 677 | - | var libs []uintptr | |
| 678 | - | for _, libPath := range core.GetPaths("ADW") { | |
| 679 | - | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 680 | - | if err != nil { | |
| 681 | - | panic(err) | |
| 682 | - | } | |
| 683 | - | libs = append(libs, lib) | |
| 684 | - | } | |
| 685 | - | ||
| 686 | - | core.PuregoSafeRegister(&xToastPriorityGLibType, libs, "adw_toast_priority_get_type") | |
| 687 | - | ||
| 688 | - | core.PuregoSafeRegister(&xToastGLibType, libs, "adw_toast_get_type") | |
| 689 | - | ||
| 690 | - | core.PuregoSafeRegister(&xNewToast, libs, "adw_toast_new") | |
| 691 | - | core.PuregoSafeRegister(&xNewToastFormat, libs, "adw_toast_new_format") | |
| 692 | - | ||
| 693 | - | core.PuregoSafeRegister(&xToastDismiss, libs, "adw_toast_dismiss") | |
| 694 | - | core.PuregoSafeRegister(&xToastGetActionName, libs, "adw_toast_get_action_name") | |
| 695 | - | core.PuregoSafeRegister(&xToastGetActionTargetValue, libs, "adw_toast_get_action_target_value") | |
| 696 | - | core.PuregoSafeRegister(&xToastGetButtonLabel, libs, "adw_toast_get_button_label") | |
| 697 | - | core.PuregoSafeRegister(&xToastGetCustomTitle, libs, "adw_toast_get_custom_title") | |
| 698 | - | core.PuregoSafeRegister(&xToastGetPriority, libs, "adw_toast_get_priority") | |
| 699 | - | core.PuregoSafeRegister(&xToastGetTimeout, libs, "adw_toast_get_timeout") | |
| 700 | - | core.PuregoSafeRegister(&xToastGetTitle, libs, "adw_toast_get_title") | |
| 701 | - | core.PuregoSafeRegister(&xToastGetUseMarkup, libs, "adw_toast_get_use_markup") | |
| 702 | - | core.PuregoSafeRegister(&xToastSetActionName, libs, "adw_toast_set_action_name") | |
| 703 | - | core.PuregoSafeRegister(&xToastSetActionTarget, libs, "adw_toast_set_action_target") | |
| 704 | - | core.PuregoSafeRegister(&xToastSetActionTargetValue, libs, "adw_toast_set_action_target_value") | |
| 705 | - | core.PuregoSafeRegister(&xToastSetButtonLabel, libs, "adw_toast_set_button_label") | |
| 706 | - | core.PuregoSafeRegister(&xToastSetCustomTitle, libs, "adw_toast_set_custom_title") | |
| 707 | - | core.PuregoSafeRegister(&xToastSetDetailedActionName, libs, "adw_toast_set_detailed_action_name") | |
| 708 | - | core.PuregoSafeRegister(&xToastSetPriority, libs, "adw_toast_set_priority") | |
| 709 | - | core.PuregoSafeRegister(&xToastSetTimeout, libs, "adw_toast_set_timeout") | |
| 710 | - | core.PuregoSafeRegister(&xToastSetTitle, libs, "adw_toast_set_title") | |
| 711 | - | core.PuregoSafeRegister(&xToastSetUseMarkup, libs, "adw_toast_set_use_markup") | |
| 712 | 717 | } | |
| @@ -5,7 +5,6 @@ import ( | |||||
| 5 | "structs" | 5 | "structs" | ||
| 6 | "unsafe" | 6 | "unsafe" | ||
| 7 | 7 | ||||
| 8 | - | "github.com/bnema/purego" | |||
| 9 | "github.com/bnema/puregotk/pkg/core" | 8 | "github.com/bnema/puregotk/pkg/core" | ||
| 10 | "github.com/bnema/puregotk/v4/glib" | 9 | "github.com/bnema/puregotk/v4/glib" | ||
| 11 | "github.com/bnema/puregotk/v4/gobject" | 10 | "github.com/bnema/puregotk/v4/gobject" | ||
| @@ -37,6 +36,7 @@ type ToastPriority int | |||||
| 37 | var xToastPriorityGLibType func() types.GType | 36 | var xToastPriorityGLibType func() types.GType | ||
| 38 | 37 | ||||
| 39 | func ToastPriorityGLibType() types.GType { | 38 | func ToastPriorityGLibType() types.GType { | ||
| 39 | + | core.LazyRegister(&xToastPriorityGLibType, "ADW", "adw_toast_priority_get_type", false) | |||
| 40 | return xToastPriorityGLibType() | 40 | return xToastPriorityGLibType() | ||
| 41 | } | 41 | } | ||
| 42 | 42 | ||||
| @@ -191,6 +191,7 @@ type Toast struct { | |||||
| 191 | var xToastGLibType func() types.GType | 191 | var xToastGLibType func() types.GType | ||
| 192 | 192 | ||||
| 193 | func ToastGLibType() types.GType { | 193 | func ToastGLibType() types.GType { | ||
| 194 | + | core.LazyRegister(&xToastGLibType, "ADW", "adw_toast_get_type", false) | |||
| 194 | return xToastGLibType() | 195 | return xToastGLibType() | ||
| 195 | } | 196 | } | ||
| 196 | 197 | ||||
| @@ -208,6 +209,7 @@ var xNewToast func(string) uintptr | |||||
| 208 | // | 209 | // | ||
| 209 | // @title can be marked up with the Pango text markup language. | 210 | // @title can be marked up with the Pango text markup language. | ||
| 210 | func NewToast(TitleVar string) *Toast { | 211 | func NewToast(TitleVar string) *Toast { | ||
| 212 | + | core.LazyRegister(&xNewToast, "ADW", "adw_toast_new", false) | |||
| 211 | var cls *Toast | 213 | var cls *Toast | ||
| 212 | 214 | ||||
| 213 | cret := xNewToast(TitleVar) | 215 | cret := xNewToast(TitleVar) | ||
| @@ -228,6 +230,7 @@ var xNewToastFormat func(string, ...interface{}) uintptr | |||||
| 228 | // | 230 | // | ||
| 229 | // See also: [ctor@Toast.new] | 231 | // See also: [ctor@Toast.new] | ||
| 230 | func NewToastFormat(FormatVar string, varArgs ...interface{}) *Toast { | 232 | func NewToastFormat(FormatVar string, varArgs ...interface{}) *Toast { | ||
| 233 | + | core.LazyRegister(&xNewToastFormat, "ADW", "adw_toast_new_format", false) | |||
| 231 | var cls *Toast | 234 | var cls *Toast | ||
| 232 | 235 | ||||
| 233 | cret := xNewToastFormat(FormatVar, varArgs...) | 236 | cret := xNewToastFormat(FormatVar, varArgs...) | ||
| @@ -247,6 +250,8 @@ var xToastDismiss func(uintptr) | |||||
| 247 | // Does nothing if @self has already been dismissed, or hasn't been added to an | 250 | // Does nothing if @self has already been dismissed, or hasn't been added to an | ||
| 248 | // [class@ToastOverlay]. | 251 | // [class@ToastOverlay]. | ||
| 249 | func (x *Toast) Dismiss() { | 252 | func (x *Toast) Dismiss() { | ||
| 253 | + | core.LazyRegister(&xToastDismiss, "ADW", "adw_toast_dismiss", false) | |||
| 254 | + | ||||
| 250 | xToastDismiss(x.GoPointer()) | 255 | xToastDismiss(x.GoPointer()) | ||
| 251 | } | 256 | } | ||
| 252 | 257 | ||||
| @@ -254,6 +259,8 @@ var xToastGetActionName func(uintptr) string | |||||
| 254 | 259 | ||||
| 255 | // Gets the name of the associated action. | 260 | // Gets the name of the associated action. | ||
| 256 | func (x *Toast) GetActionName() string { | 261 | func (x *Toast) GetActionName() string { | ||
| 262 | + | core.LazyRegister(&xToastGetActionName, "ADW", "adw_toast_get_action_name", false) | |||
| 263 | + | ||||
| 257 | cret := xToastGetActionName(x.GoPointer()) | 264 | cret := xToastGetActionName(x.GoPointer()) | ||
| 258 | return cret | 265 | return cret | ||
| 259 | } | 266 | } | ||
| @@ -262,6 +269,8 @@ var xToastGetActionTargetValue func(uintptr) uintptr | |||||
| 262 | 269 | ||||
| 263 | // Gets the parameter for action invocations. | 270 | // Gets the parameter for action invocations. | ||
| 264 | func (x *Toast) GetActionTargetValue() *glib.Variant { | 271 | func (x *Toast) GetActionTargetValue() *glib.Variant { | ||
| 272 | + | core.LazyRegister(&xToastGetActionTargetValue, "ADW", "adw_toast_get_action_target_value", false) | |||
| 273 | + | ||||
| 265 | cret := xToastGetActionTargetValue(x.GoPointer()) | 274 | cret := xToastGetActionTargetValue(x.GoPointer()) | ||
| 266 | if cret == 0 { | 275 | if cret == 0 { | ||
| 267 | return nil | 276 | return nil | ||
| @@ -273,6 +282,8 @@ var xToastGetButtonLabel func(uintptr) string | |||||
| 273 | 282 | ||||
| 274 | // Gets the label to show on the button. | 283 | // Gets the label to show on the button. | ||
| 275 | func (x *Toast) GetButtonLabel() string { | 284 | func (x *Toast) GetButtonLabel() string { | ||
| 285 | + | core.LazyRegister(&xToastGetButtonLabel, "ADW", "adw_toast_get_button_label", false) | |||
| 286 | + | ||||
| 276 | cret := xToastGetButtonLabel(x.GoPointer()) | 287 | cret := xToastGetButtonLabel(x.GoPointer()) | ||
| 277 | return cret | 288 | return cret | ||
| 278 | } | 289 | } | ||
| @@ -281,6 +292,7 @@ var xToastGetCustomTitle func(uintptr) uintptr | |||||
| 281 | 292 | ||||
| 282 | // Gets the custom title widget of @self. | 293 | // Gets the custom title widget of @self. | ||
| 283 | func (x *Toast) GetCustomTitle() *gtk.Widget { | 294 | func (x *Toast) GetCustomTitle() *gtk.Widget { | ||
| 295 | + | core.LazyRegister(&xToastGetCustomTitle, "ADW", "adw_toast_get_custom_title", false) | |||
| 284 | var cls *gtk.Widget | 296 | var cls *gtk.Widget | ||
| 285 | 297 | ||||
| 286 | cret := xToastGetCustomTitle(x.GoPointer()) | 298 | cret := xToastGetCustomTitle(x.GoPointer()) | ||
| @@ -298,6 +310,8 @@ var xToastGetPriority func(uintptr) ToastPriority | |||||
| 298 | 310 | ||||
| 299 | // Gets priority for @self. | 311 | // Gets priority for @self. | ||
| 300 | func (x *Toast) GetPriority() ToastPriority { | 312 | func (x *Toast) GetPriority() ToastPriority { | ||
| 313 | + | core.LazyRegister(&xToastGetPriority, "ADW", "adw_toast_get_priority", false) | |||
| 314 | + | ||||
| 301 | cret := xToastGetPriority(x.GoPointer()) | 315 | cret := xToastGetPriority(x.GoPointer()) | ||
| 302 | return cret | 316 | return cret | ||
| 303 | } | 317 | } | ||
| @@ -306,6 +320,8 @@ var xToastGetTimeout func(uintptr) uint | |||||
| 306 | 320 | ||||
| 307 | // Gets timeout for @self. | 321 | // Gets timeout for @self. | ||
| 308 | func (x *Toast) GetTimeout() uint { | 322 | func (x *Toast) GetTimeout() uint { | ||
| 323 | + | core.LazyRegister(&xToastGetTimeout, "ADW", "adw_toast_get_timeout", false) | |||
| 324 | + | ||||
| 309 | cret := xToastGetTimeout(x.GoPointer()) | 325 | cret := xToastGetTimeout(x.GoPointer()) | ||
| 310 | return cret | 326 | return cret | ||
| 311 | } | 327 | } | ||
| @@ -317,6 +333,8 @@ var xToastGetTitle func(uintptr) string | |||||
| 317 | // If a custom title has been set with [method@Adw.Toast.set_custom_title] | 333 | // If a custom title has been set with [method@Adw.Toast.set_custom_title] | ||
| 318 | // the return value will be %NULL. | 334 | // the return value will be %NULL. | ||
| 319 | func (x *Toast) GetTitle() string { | 335 | func (x *Toast) GetTitle() string { | ||
| 336 | + | core.LazyRegister(&xToastGetTitle, "ADW", "adw_toast_get_title", false) | |||
| 337 | + | ||||
| 320 | cret := xToastGetTitle(x.GoPointer()) | 338 | cret := xToastGetTitle(x.GoPointer()) | ||
| 321 | return cret | 339 | return cret | ||
| 322 | } | 340 | } | ||
| @@ -325,6 +343,8 @@ var xToastGetUseMarkup func(uintptr) bool | |||||
| 325 | 343 | ||||
| 326 | // Gets whether to use Pango markup for the toast title. | 344 | // Gets whether to use Pango markup for the toast title. | ||
| 327 | func (x *Toast) GetUseMarkup() bool { | 345 | func (x *Toast) GetUseMarkup() bool { | ||
| 346 | + | core.LazyRegister(&xToastGetUseMarkup, "ADW", "adw_toast_get_use_markup", false) | |||
| 347 | + | ||||
| 328 | cret := xToastGetUseMarkup(x.GoPointer()) | 348 | cret := xToastGetUseMarkup(x.GoPointer()) | ||
| 329 | return cret | 349 | return cret | ||
| 330 | } | 350 | } | ||
| @@ -337,6 +357,8 @@ var xToastSetActionName func(uintptr, uintptr) | |||||
| 337 | // | 357 | // | ||
| 338 | // See [property@Toast:action-target]. | 358 | // See [property@Toast:action-target]. | ||
| 339 | func (x *Toast) SetActionName(ActionNameVar *string) { | 359 | func (x *Toast) SetActionName(ActionNameVar *string) { | ||
| 360 | + | core.LazyRegister(&xToastSetActionName, "ADW", "adw_toast_set_action_name", false) | |||
| 361 | + | ||||
| 340 | ActionNameVarPtr := core.GStrdupNullable(ActionNameVar) | 362 | ActionNameVarPtr := core.GStrdupNullable(ActionNameVar) | ||
| 341 | defer core.GFreeNullable(ActionNameVarPtr) | 363 | defer core.GFreeNullable(ActionNameVarPtr) | ||
| 342 | 364 | ||||
| @@ -355,6 +377,8 @@ var xToastSetActionTarget func(uintptr, uintptr, ...interface{}) | |||||
| 355 | // the action name at the same time, you can use | 377 | // the action name at the same time, you can use | ||
| 356 | // [method@Toast.set_detailed_action_name]. | 378 | // [method@Toast.set_detailed_action_name]. | ||
| 357 | func (x *Toast) SetActionTarget(FormatStringVar *string, varArgs ...interface{}) { | 379 | func (x *Toast) SetActionTarget(FormatStringVar *string, varArgs ...interface{}) { | ||
| 380 | + | core.LazyRegister(&xToastSetActionTarget, "ADW", "adw_toast_set_action_target", false) | |||
| 381 | + | ||||
| 358 | FormatStringVarPtr := core.GStrdupNullable(FormatStringVar) | 382 | FormatStringVarPtr := core.GStrdupNullable(FormatStringVar) | ||
| 359 | defer core.GFreeNullable(FormatStringVarPtr) | 383 | defer core.GFreeNullable(FormatStringVarPtr) | ||
| 360 | 384 | ||||
| @@ -368,6 +392,8 @@ var xToastSetActionTargetValue func(uintptr, *glib.Variant) | |||||
| 368 | // If the @action_target variant has a floating reference this function | 392 | // If the @action_target variant has a floating reference this function | ||
| 369 | // will sink it. | 393 | // will sink it. | ||
| 370 | func (x *Toast) SetActionTargetValue(ActionTargetVar *glib.Variant) { | 394 | func (x *Toast) SetActionTargetValue(ActionTargetVar *glib.Variant) { | ||
| 395 | + | core.LazyRegister(&xToastSetActionTargetValue, "ADW", "adw_toast_set_action_target_value", false) | |||
| 396 | + | ||||
| 371 | xToastSetActionTargetValue(x.GoPointer(), ActionTargetVar) | 397 | xToastSetActionTargetValue(x.GoPointer(), ActionTargetVar) | ||
| 372 | } | 398 | } | ||
| 373 | 399 | ||||
| @@ -381,6 +407,8 @@ var xToastSetButtonLabel func(uintptr, uintptr) | |||||
| 381 | // | 407 | // | ||
| 382 | // See [property@Toast:action-name]. | 408 | // See [property@Toast:action-name]. | ||
| 383 | func (x *Toast) SetButtonLabel(ButtonLabelVar *string) { | 409 | func (x *Toast) SetButtonLabel(ButtonLabelVar *string) { | ||
| 410 | + | core.LazyRegister(&xToastSetButtonLabel, "ADW", "adw_toast_set_button_label", false) | |||
| 411 | + | ||||
| 384 | ButtonLabelVarPtr := core.GStrdupNullable(ButtonLabelVar) | 412 | ButtonLabelVarPtr := core.GStrdupNullable(ButtonLabelVar) | ||
| 385 | defer core.GFreeNullable(ButtonLabelVarPtr) | 413 | defer core.GFreeNullable(ButtonLabelVarPtr) | ||
| 386 | 414 | ||||
| @@ -396,6 +424,8 @@ var xToastSetCustomTitle func(uintptr, uintptr) | |||||
| 396 | // | 424 | // | ||
| 397 | // Setting a custom title will unset [property@Toast:title]. | 425 | // Setting a custom title will unset [property@Toast:title]. | ||
| 398 | func (x *Toast) SetCustomTitle(WidgetVar *gtk.Widget) { | 426 | func (x *Toast) SetCustomTitle(WidgetVar *gtk.Widget) { | ||
| 427 | + | core.LazyRegister(&xToastSetCustomTitle, "ADW", "adw_toast_set_custom_title", false) | |||
| 428 | + | ||||
| 399 | xToastSetCustomTitle(x.GoPointer(), WidgetVar.GoPointer()) | 429 | xToastSetCustomTitle(x.GoPointer(), WidgetVar.GoPointer()) | ||
| 400 | } | 430 | } | ||
| 401 | 431 | ||||
| @@ -406,6 +436,8 @@ var xToastSetDetailedActionName func(uintptr, uintptr) | |||||
| 406 | // @detailed_action_name is a string in the format accepted by | 436 | // @detailed_action_name is a string in the format accepted by | ||
| 407 | // [func@Gio.Action.parse_detailed_name]. | 437 | // [func@Gio.Action.parse_detailed_name]. | ||
| 408 | func (x *Toast) SetDetailedActionName(DetailedActionNameVar *string) { | 438 | func (x *Toast) SetDetailedActionName(DetailedActionNameVar *string) { | ||
| 439 | + | core.LazyRegister(&xToastSetDetailedActionName, "ADW", "adw_toast_set_detailed_action_name", false) | |||
| 440 | + | ||||
| 409 | DetailedActionNameVarPtr := core.GStrdupNullable(DetailedActionNameVar) | 441 | DetailedActionNameVarPtr := core.GStrdupNullable(DetailedActionNameVar) | ||
| 410 | defer core.GFreeNullable(DetailedActionNameVarPtr) | 442 | defer core.GFreeNullable(DetailedActionNameVarPtr) | ||
| 411 | 443 | ||||
| @@ -424,6 +456,8 @@ var xToastSetPriority func(uintptr, ToastPriority) | |||||
| 424 | // If @priority is [enum@Adw.ToastPriority.high], the toast will be displayed | 456 | // If @priority is [enum@Adw.ToastPriority.high], the toast will be displayed | ||
| 425 | // immediately, pushing the previous toast into the queue instead. | 457 | // immediately, pushing the previous toast into the queue instead. | ||
| 426 | func (x *Toast) SetPriority(PriorityVar ToastPriority) { | 458 | func (x *Toast) SetPriority(PriorityVar ToastPriority) { | ||
| 459 | + | core.LazyRegister(&xToastSetPriority, "ADW", "adw_toast_set_priority", false) | |||
| 460 | + | ||||
| 427 | xToastSetPriority(x.GoPointer(), PriorityVar) | 461 | xToastSetPriority(x.GoPointer(), PriorityVar) | ||
| 428 | } | 462 | } | ||
| 429 | 463 | ||||
| @@ -437,6 +471,8 @@ var xToastSetTimeout func(uintptr, uint) | |||||
| 437 | // Toasts cannot disappear while being hovered, pressed (on touchscreen), or | 471 | // Toasts cannot disappear while being hovered, pressed (on touchscreen), or | ||
| 438 | // have keyboard focus inside them. | 472 | // have keyboard focus inside them. | ||
| 439 | func (x *Toast) SetTimeout(TimeoutVar uint) { | 473 | func (x *Toast) SetTimeout(TimeoutVar uint) { | ||
| 474 | + | core.LazyRegister(&xToastSetTimeout, "ADW", "adw_toast_set_timeout", false) | |||
| 475 | + | ||||
| 440 | xToastSetTimeout(x.GoPointer(), TimeoutVar) | 476 | xToastSetTimeout(x.GoPointer(), TimeoutVar) | ||
| 441 | } | 477 | } | ||
| 442 | 478 | ||||
| @@ -450,6 +486,8 @@ var xToastSetTitle func(uintptr, string) | |||||
| 450 | // | 486 | // | ||
| 451 | // If [property@Toast:custom-title] is set, it will be used instead. | 487 | // If [property@Toast:custom-title] is set, it will be used instead. | ||
| 452 | func (x *Toast) SetTitle(TitleVar string) { | 488 | func (x *Toast) SetTitle(TitleVar string) { | ||
| 489 | + | core.LazyRegister(&xToastSetTitle, "ADW", "adw_toast_set_title", false) | |||
| 490 | + | ||||
| 453 | xToastSetTitle(x.GoPointer(), TitleVar) | 491 | xToastSetTitle(x.GoPointer(), TitleVar) | ||
| 454 | } | 492 | } | ||
| 455 | 493 | ||||
| @@ -459,6 +497,8 @@ var xToastSetUseMarkup func(uintptr, bool) | |||||
| 459 | // | 497 | // | ||
| 460 | // See also [func@Pango.parse_markup]. | 498 | // See also [func@Pango.parse_markup]. | ||
| 461 | func (x *Toast) SetUseMarkup(UseMarkupVar bool) { | 499 | func (x *Toast) SetUseMarkup(UseMarkupVar bool) { | ||
| 500 | + | core.LazyRegister(&xToastSetUseMarkup, "ADW", "adw_toast_set_use_markup", false) | |||
| 501 | + | ||||
| 462 | xToastSetUseMarkup(x.GoPointer(), UseMarkupVar) | 502 | xToastSetUseMarkup(x.GoPointer(), UseMarkupVar) | ||
| 463 | } | 503 | } | ||
| 464 | 504 | ||||
| @@ -674,39 +714,4 @@ func (x *Toast) ConnectDismissed(cb *func(Toast)) uint { | |||||
| 674 | func init() { | 714 | func init() { | ||
| 675 | core.SetPackageName("ADW", "libadwaita-1") | 715 | core.SetPackageName("ADW", "libadwaita-1") | ||
| 676 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | 716 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | ||
| 677 | - | var libs []uintptr | |||
| 678 | - | for _, libPath := range core.GetPaths("ADW") { | |||
| 679 | - | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |||
| 680 | - | if err != nil { | |||
| 681 | - | panic(err) | |||
| 682 | - | } | |||
| 683 | - | libs = append(libs, lib) | |||
| 684 | - | } | |||
| 685 | - | ||||
| 686 | - | core.PuregoSafeRegister(&xToastPriorityGLibType, libs, "adw_toast_priority_get_type") | |||
| 687 | - | ||||
| 688 | - | core.PuregoSafeRegister(&xToastGLibType, libs, "adw_toast_get_type") | |||
| 689 | - | ||||
| 690 | - | core.PuregoSafeRegister(&xNewToast, libs, "adw_toast_new") | |||
| 691 | - | core.PuregoSafeRegister(&xNewToastFormat, libs, "adw_toast_new_format") | |||
| 692 | - | ||||
| 693 | - | core.PuregoSafeRegister(&xToastDismiss, libs, "adw_toast_dismiss") | |||
| 694 | - | core.PuregoSafeRegister(&xToastGetActionName, libs, "adw_toast_get_action_name") | |||
| 695 | - | core.PuregoSafeRegister(&xToastGetActionTargetValue, libs, "adw_toast_get_action_target_value") | |||
| 696 | - | core.PuregoSafeRegister(&xToastGetButtonLabel, libs, "adw_toast_get_button_label") | |||
| 697 | - | core.PuregoSafeRegister(&xToastGetCustomTitle, libs, "adw_toast_get_custom_title") | |||
| 698 | - | core.PuregoSafeRegister(&xToastGetPriority, libs, "adw_toast_get_priority") | |||
| 699 | - | core.PuregoSafeRegister(&xToastGetTimeout, libs, "adw_toast_get_timeout") | |||
| 700 | - | core.PuregoSafeRegister(&xToastGetTitle, libs, "adw_toast_get_title") | |||
| 701 | - | core.PuregoSafeRegister(&xToastGetUseMarkup, libs, "adw_toast_get_use_markup") | |||
| 702 | - | core.PuregoSafeRegister(&xToastSetActionName, libs, "adw_toast_set_action_name") | |||
| 703 | - | core.PuregoSafeRegister(&xToastSetActionTarget, libs, "adw_toast_set_action_target") | |||
| 704 | - | core.PuregoSafeRegister(&xToastSetActionTargetValue, libs, "adw_toast_set_action_target_value") | |||
| 705 | - | core.PuregoSafeRegister(&xToastSetButtonLabel, libs, "adw_toast_set_button_label") | |||
| 706 | - | core.PuregoSafeRegister(&xToastSetCustomTitle, libs, "adw_toast_set_custom_title") | |||
| 707 | - | core.PuregoSafeRegister(&xToastSetDetailedActionName, libs, "adw_toast_set_detailed_action_name") | |||
| 708 | - | core.PuregoSafeRegister(&xToastSetPriority, libs, "adw_toast_set_priority") | |||
| 709 | - | core.PuregoSafeRegister(&xToastSetTimeout, libs, "adw_toast_set_timeout") | |||
| 710 | - | core.PuregoSafeRegister(&xToastSetTitle, libs, "adw_toast_set_title") | |||
| 711 | - | core.PuregoSafeRegister(&xToastSetUseMarkup, libs, "adw_toast_set_use_markup") | |||
| 712 | } | 717 | } | ||