Merge pull request #344 from bnema/chore/upstream-foundations
chore(deps): integrate approved upstream foundations
921 files · +28709 -25527
M docs/first-presentation.md +5 -2
| @@ -46,5 +46,8 @@ labels. Set `DUMBER_MACHINE_GPU_PROFILE` to one of `generic-gpu`, | |||
| 46 | 46 | `integrated-gpu`, `discrete-gpu`, `hybrid-gpu`, `virtual-gpu`, or `unknown-gpu`; | |
| 47 | 47 | do not use a device model or other identifier. Publish only the seven reviewed | |
| 48 | 48 | JSON files to an external Gist. Raw logs and temporary XDG homes are removed and | |
| 49 | - | must not be published. A missing or incomplete timeline, non-DMABUF backend, or | |
| 50 | - | invalid run fails collection. | |
| 49 | + | must not be published. `metadata.json` derives the selected | |
| 50 | + | `github.com/bnema/purego-cef2gtk` pseudo-version and its full immutable Git | |
| 51 | + | origin hash from Go module metadata; branch selectors or missing origin metadata | |
| 52 | + | fail collection. A missing or incomplete timeline, non-DMABUF backend, or invalid | |
| 53 | + | run also fails collection. | |
| @@ -46,5 +46,8 @@ labels. Set `DUMBER_MACHINE_GPU_PROFILE` to one of `generic-gpu`, | |||||
| 46 | `integrated-gpu`, `discrete-gpu`, `hybrid-gpu`, `virtual-gpu`, or `unknown-gpu`; | 46 | `integrated-gpu`, `discrete-gpu`, `hybrid-gpu`, `virtual-gpu`, or `unknown-gpu`; | ||
| 47 | do not use a device model or other identifier. Publish only the seven reviewed | 47 | do not use a device model or other identifier. Publish only the seven reviewed | ||
| 48 | JSON files to an external Gist. Raw logs and temporary XDG homes are removed and | 48 | JSON files to an external Gist. Raw logs and temporary XDG homes are removed and | ||
| 49 | - | must not be published. A missing or incomplete timeline, non-DMABUF backend, or | 49 | + | must not be published. `metadata.json` derives the selected |
| 50 | - | invalid run fails collection. | 50 | + | `github.com/bnema/purego-cef2gtk` pseudo-version and its full immutable Git |
| 51 | + | origin hash from Go module metadata; branch selectors or missing origin metadata | |||
| 52 | + | fail collection. A missing or incomplete timeline, non-DMABUF backend, or invalid | |||
| 53 | + | run also fails collection. | |||
M go.mod +5 -5
| @@ -6,11 +6,11 @@ require ( | |||
| 6 | 6 | github.com/a-h/templ v0.3.1020 | |
| 7 | 7 | github.com/andybalholm/brotli v1.2.2 | |
| 8 | 8 | github.com/bnema/purego v0.11.0-bnema.4 | |
| 9 | - | github.com/bnema/purego-cef v0.13.3 | |
| 10 | - | github.com/bnema/purego-cef2gtk v0.8.4 | |
| 11 | - | github.com/bnema/purego-pipewire v0.1.4 | |
| 12 | - | github.com/bnema/purego-sqlite v0.1.3 | |
| 13 | - | github.com/bnema/puregotk v0.7.0 | |
| 9 | + | github.com/bnema/purego-cef v0.13.4-0.20260714140305-f0b7414af67e | |
| 10 | + | github.com/bnema/purego-cef2gtk v0.8.4-0.20260714160309-bbd397409ebe | |
| 11 | + | github.com/bnema/purego-pipewire v0.1.5-0.20260714124450-6504b9cdf02a | |
| 12 | + | github.com/bnema/purego-sqlite v0.1.4-0.20260714131321-3614fe683b9c | |
| 13 | + | github.com/bnema/puregotk v0.7.1-0.20260714170452-0b6b9b901234 | |
| 14 | 14 | github.com/charmbracelet/bubbles v1.0.0 | |
| 15 | 15 | github.com/charmbracelet/bubbletea v1.3.10 | |
| 16 | 16 | github.com/charmbracelet/lipgloss v1.1.0 | |
| @@ -6,11 +6,11 @@ require ( | |||||
| 6 | github.com/a-h/templ v0.3.1020 | 6 | github.com/a-h/templ v0.3.1020 | ||
| 7 | github.com/andybalholm/brotli v1.2.2 | 7 | github.com/andybalholm/brotli v1.2.2 | ||
| 8 | github.com/bnema/purego v0.11.0-bnema.4 | 8 | github.com/bnema/purego v0.11.0-bnema.4 | ||
| 9 | - | github.com/bnema/purego-cef v0.13.3 | 9 | + | github.com/bnema/purego-cef v0.13.4-0.20260714140305-f0b7414af67e |
| 10 | - | github.com/bnema/purego-cef2gtk v0.8.4 | 10 | + | github.com/bnema/purego-cef2gtk v0.8.4-0.20260714160309-bbd397409ebe |
| 11 | - | github.com/bnema/purego-pipewire v0.1.4 | 11 | + | github.com/bnema/purego-pipewire v0.1.5-0.20260714124450-6504b9cdf02a |
| 12 | - | github.com/bnema/purego-sqlite v0.1.3 | 12 | + | github.com/bnema/purego-sqlite v0.1.4-0.20260714131321-3614fe683b9c |
| 13 | - | github.com/bnema/puregotk v0.7.0 | 13 | + | github.com/bnema/puregotk v0.7.1-0.20260714170452-0b6b9b901234 |
| 14 | github.com/charmbracelet/bubbles v1.0.0 | 14 | github.com/charmbracelet/bubbles v1.0.0 | ||
| 15 | github.com/charmbracelet/bubbletea v1.3.10 | 15 | github.com/charmbracelet/bubbletea v1.3.10 | ||
| 16 | github.com/charmbracelet/lipgloss v1.1.0 | 16 | github.com/charmbracelet/lipgloss v1.1.0 | ||
M go.sum +12 -0 generated file: collapsed
A internal/infrastructure/persistence/sqlite/history_repo_benchmark_test.go +71 -0
| @@ -0,0 +1,71 @@ | |||
| 1 | + | package sqlite_test | |
| 2 | + | ||
| 3 | + | import ( | |
| 4 | + | "fmt" | |
| 5 | + | "path/filepath" | |
| 6 | + | "testing" | |
| 7 | + | ||
| 8 | + | "github.com/bnema/dumber/internal/domain/entity" | |
| 9 | + | "github.com/bnema/dumber/internal/domain/repository" | |
| 10 | + | "github.com/bnema/dumber/internal/infrastructure/persistence/sqlite" | |
| 11 | + | ) | |
| 12 | + | ||
| 13 | + | // newHistoryBenchmarkRepository creates a representative local history corpus | |
| 14 | + | // outside the measured operation. Sidebar reads use GetRecent and omnibox | |
| 15 | + | // history suggestions use Search. | |
| 16 | + | func newHistoryBenchmarkRepository(b *testing.B) (repository.HistoryRepository, func()) { | |
| 17 | + | b.Helper() | |
| 18 | + | ||
| 19 | + | ctx := historyTestCtx() | |
| 20 | + | db, err := sqlite.NewConnection(ctx, filepath.Join(b.TempDir(), "dumber.db")) | |
| 21 | + | if err != nil { | |
| 22 | + | b.Fatal(err) | |
| 23 | + | } | |
| 24 | + | ||
| 25 | + | b.Cleanup(func() { | |
| 26 | + | if err := db.Close(); err != nil { | |
| 27 | + | b.Errorf("close benchmark database: %v", err) | |
| 28 | + | } | |
| 29 | + | }) | |
| 30 | + | ||
| 31 | + | repo := sqlite.NewHistoryRepository(db) | |
| 32 | + | for i := range 200 { | |
| 33 | + | entry := &entity.HistoryEntry{ | |
| 34 | + | URL: fmt.Sprintf("https://example%d.test/dumber/history/%d", i%20, i), | |
| 35 | + | Title: fmt.Sprintf("Dumber history entry %d", i), | |
| 36 | + | } | |
| 37 | + | if err := repo.Save(ctx, entry); err != nil { | |
| 38 | + | b.Fatal(err) | |
| 39 | + | } | |
| 40 | + | } | |
| 41 | + | ||
| 42 | + | return repo, func() {} | |
| 43 | + | } | |
| 44 | + | ||
| 45 | + | func BenchmarkHistorySQLiteSidebarRecent(b *testing.B) { | |
| 46 | + | repo, closeDB := newHistoryBenchmarkRepository(b) | |
| 47 | + | defer closeDB() | |
| 48 | + | ctx := historyTestCtx() | |
| 49 | + | ||
| 50 | + | b.ReportAllocs() | |
| 51 | + | b.ResetTimer() | |
| 52 | + | for range b.N { | |
| 53 | + | if _, err := repo.GetRecent(ctx, 50, 0); err != nil { | |
| 54 | + | b.Fatal(err) | |
| 55 | + | } | |
| 56 | + | } | |
| 57 | + | } | |
| 58 | + | ||
| 59 | + | func BenchmarkHistorySQLiteOmniboxSearch(b *testing.B) { | |
| 60 | + | repo, closeDB := newHistoryBenchmarkRepository(b) | |
| 61 | + | defer closeDB() | |
| 62 | + | ctx := historyTestCtx() | |
| 63 | + | ||
| 64 | + | b.ReportAllocs() | |
| 65 | + | b.ResetTimer() | |
| 66 | + | for range b.N { | |
| 67 | + | if _, err := repo.Search(ctx, "dumber history", 10); err != nil { | |
| 68 | + | b.Fatal(err) | |
| 69 | + | } | |
| 70 | + | } | |
| 71 | + | } | |
| @@ -0,0 +1,71 @@ | |||||
| 1 | + | package sqlite_test | |||
| 2 | + | ||||
| 3 | + | import ( | |||
| 4 | + | "fmt" | |||
| 5 | + | "path/filepath" | |||
| 6 | + | "testing" | |||
| 7 | + | ||||
| 8 | + | "github.com/bnema/dumber/internal/domain/entity" | |||
| 9 | + | "github.com/bnema/dumber/internal/domain/repository" | |||
| 10 | + | "github.com/bnema/dumber/internal/infrastructure/persistence/sqlite" | |||
| 11 | + | ) | |||
| 12 | + | ||||
| 13 | + | // newHistoryBenchmarkRepository creates a representative local history corpus | |||
| 14 | + | // outside the measured operation. Sidebar reads use GetRecent and omnibox | |||
| 15 | + | // history suggestions use Search. | |||
| 16 | + | func newHistoryBenchmarkRepository(b *testing.B) (repository.HistoryRepository, func()) { | |||
| 17 | + | b.Helper() | |||
| 18 | + | ||||
| 19 | + | ctx := historyTestCtx() | |||
| 20 | + | db, err := sqlite.NewConnection(ctx, filepath.Join(b.TempDir(), "dumber.db")) | |||
| 21 | + | if err != nil { | |||
| 22 | + | b.Fatal(err) | |||
| 23 | + | } | |||
| 24 | + | ||||
| 25 | + | b.Cleanup(func() { | |||
| 26 | + | if err := db.Close(); err != nil { | |||
| 27 | + | b.Errorf("close benchmark database: %v", err) | |||
| 28 | + | } | |||
| 29 | + | }) | |||
| 30 | + | ||||
| 31 | + | repo := sqlite.NewHistoryRepository(db) | |||
| 32 | + | for i := range 200 { | |||
| 33 | + | entry := &entity.HistoryEntry{ | |||
| 34 | + | URL: fmt.Sprintf("https://example%d.test/dumber/history/%d", i%20, i), | |||
| 35 | + | Title: fmt.Sprintf("Dumber history entry %d", i), | |||
| 36 | + | } | |||
| 37 | + | if err := repo.Save(ctx, entry); err != nil { | |||
| 38 | + | b.Fatal(err) | |||
| 39 | + | } | |||
| 40 | + | } | |||
| 41 | + | ||||
| 42 | + | return repo, func() {} | |||
| 43 | + | } | |||
| 44 | + | ||||
| 45 | + | func BenchmarkHistorySQLiteSidebarRecent(b *testing.B) { | |||
| 46 | + | repo, closeDB := newHistoryBenchmarkRepository(b) | |||
| 47 | + | defer closeDB() | |||
| 48 | + | ctx := historyTestCtx() | |||
| 49 | + | ||||
| 50 | + | b.ReportAllocs() | |||
| 51 | + | b.ResetTimer() | |||
| 52 | + | for range b.N { | |||
| 53 | + | if _, err := repo.GetRecent(ctx, 50, 0); err != nil { | |||
| 54 | + | b.Fatal(err) | |||
| 55 | + | } | |||
| 56 | + | } | |||
| 57 | + | } | |||
| 58 | + | ||||
| 59 | + | func BenchmarkHistorySQLiteOmniboxSearch(b *testing.B) { | |||
| 60 | + | repo, closeDB := newHistoryBenchmarkRepository(b) | |||
| 61 | + | defer closeDB() | |||
| 62 | + | ctx := historyTestCtx() | |||
| 63 | + | ||||
| 64 | + | b.ReportAllocs() | |||
| 65 | + | b.ResetTimer() | |||
| 66 | + | for range b.N { | |||
| 67 | + | if _, err := repo.Search(ctx, "dumber history", 10); err != nil { | |||
| 68 | + | b.Fatal(err) | |||
| 69 | + | } | |||
| 70 | + | } | |||
| 71 | + | } | |||
M internal/logging/first_presentation_collector_test.go +132 -1
| @@ -2,6 +2,7 @@ package logging | |||
| 2 | 2 | ||
| 3 | 3 | import ( | |
| 4 | 4 | "encoding/json" | |
| 5 | + | "fmt" | |
| 5 | 6 | "os" | |
| 6 | 7 | "os/exec" | |
| 7 | 8 | "path/filepath" | |
| @@ -143,8 +144,9 @@ func TestFirstPresentationCollectorSanitizesMachineLocalValues(t *testing.T) { | |||
| 143 | 144 | } | |
| 144 | 145 | for _, required := range []string{ | |
| 145 | 146 | `"measured_source_revision"`, | |
| 147 | + | `"version": "v0.8.4-0.20260714160309-bbd397409ebe"`, | |
| 146 | 148 | `"tag": "v0.8.4"`, | |
| 147 | - | `"revision": "f217ece342dea3ef2a3f98671fcd16a39ad0037d"`, | |
| 149 | + | `"revision": "bbd397409ebed75a5979c1e4566a2ef319f6a484"`, | |
| 148 | 150 | } { | |
| 149 | 151 | require.Contains(t, artifacts.String(), required) | |
| 150 | 152 | } | |
| @@ -166,6 +168,135 @@ func TestFirstPresentationCollectorSanitizesMachineLocalValues(t *testing.T) { | |||
| 166 | 168 | require.Equal(t, "integrated-gpu", metadata.Comparison.MachineGPUProfile) | |
| 167 | 169 | } | |
| 168 | 170 | ||
| 171 | + | func TestFirstPresentationCollectorDerivesSelectedImmutableModuleProvenance(t *testing.T) { | |
| 172 | + | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | |
| 173 | + | require.NoError(t, err) | |
| 174 | + | temp := t.TempDir() | |
| 175 | + | runtime := filepath.Join(temp, "cef-147-runtime") | |
| 176 | + | require.NoError(t, os.Mkdir(runtime, 0o755)) | |
| 177 | + | binary := filepath.Join(temp, "dumber") | |
| 178 | + | require.NoError(t, os.WriteFile(binary, collectorTestBinary(validFirstPresentationLog), 0o755)) | |
| 179 | + | ||
| 180 | + | // This exact pseudo-version is deliberately newer than the former v0.8.4 | |
| 181 | + | // hardcode; the collector must report what the selected module says. | |
| 182 | + | const version = "v0.8.5-0.20300102030405-bbd397409ebe" | |
| 183 | + | const revision = "bbd397409ebed75a5979c1e4566a2ef319f6a484" | |
| 184 | + | goBin := collectorProvenanceGo(t, temp, version, revision, "") | |
| 185 | + | output := filepath.Join(temp, "artifacts") | |
| 186 | + | cmd := exec.Command(filepath.Join(repoRoot, "scripts", "collect_first_presentation.sh")) | |
| 187 | + | cmd.Dir = repoRoot | |
| 188 | + | cmd.Env = append(os.Environ(), | |
| 189 | + | "DISPLAY=:test", | |
| 190 | + | "DUMBER_CEF_DIR="+runtime, | |
| 191 | + | "DUMBER_FIRST_PRESENTATION_BIN="+binary, | |
| 192 | + | "DUMBER_FIRST_PRESENTATION_OUTPUT="+output, | |
| 193 | + | "DUMBER_FIRST_PRESENTATION_TIMEOUT_SECONDS=1", | |
| 194 | + | "PATH="+filepath.Dir(goBin)+":"+os.Getenv("PATH"), | |
| 195 | + | ) | |
| 196 | + | result, err := cmd.CombinedOutput() | |
| 197 | + | require.NoErrorf(t, err, "collector failed: %s", result) | |
| 198 | + | ||
| 199 | + | var metadata struct { | |
| 200 | + | Upstream struct { | |
| 201 | + | Module string `json:"module"` | |
| 202 | + | Version string `json:"version"` | |
| 203 | + | Tag string `json:"tag"` | |
| 204 | + | Revision string `json:"revision"` | |
| 205 | + | } `json:"upstream"` | |
| 206 | + | } | |
| 207 | + | contents, err := os.ReadFile(filepath.Join(output, "metadata.json")) | |
| 208 | + | require.NoError(t, err) | |
| 209 | + | require.NoError(t, json.Unmarshal(contents, &metadata)) | |
| 210 | + | require.Equal(t, "github.com/bnema/purego-cef2gtk", metadata.Upstream.Module) | |
| 211 | + | require.Equal(t, version, metadata.Upstream.Version) | |
| 212 | + | require.Equal(t, "v0.8.5", metadata.Upstream.Tag) | |
| 213 | + | require.Equal(t, revision, metadata.Upstream.Revision) | |
| 214 | + | ||
| 215 | + | script, err := os.ReadFile(filepath.Join(repoRoot, "scripts", "collect_first_presentation.sh")) | |
| 216 | + | require.NoError(t, err) | |
| 217 | + | require.NotContains(t, string(script), "f217ece342dea3ef2a3f98671fcd16a39ad0037d") | |
| 218 | + | } | |
| 219 | + | ||
| 220 | + | func TestFirstPresentationCollectorRejectsNonImmutableModuleProvenanceWithoutLeaks(t *testing.T) { | |
| 221 | + | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | |
| 222 | + | require.NoError(t, err) | |
| 223 | + | ||
| 224 | + | for _, test := range []struct { | |
| 225 | + | name, version, revision, ref string | |
| 226 | + | }{ | |
| 227 | + | {name: "branch selector", version: "main", ref: "main"}, | |
| 228 | + | {name: "missing origin", version: "v0.8.5-0.20300102030405-bbd397409ebe"}, | |
| 229 | + | {name: "named origin ref", version: "v0.8.5-0.20300102030405-bbd397409ebe", revision: "bbd397409ebed75a5979c1e4566a2ef319f6a484", ref: "main"}, | |
| 230 | + | } { | |
| 231 | + | t.Run(test.name, func(t *testing.T) { | |
| 232 | + | temp := t.TempDir() | |
| 233 | + | runtime := filepath.Join(temp, "cef-147-runtime") | |
| 234 | + | require.NoError(t, os.Mkdir(runtime, 0o755)) | |
| 235 | + | binary := filepath.Join(temp, "dumber") | |
| 236 | + | require.NoError(t, os.WriteFile(binary, collectorTestBinary(validFirstPresentationLog), 0o755)) | |
| 237 | + | ||
| 238 | + | goBin := collectorProvenanceGo(t, temp, test.version, test.revision, test.ref) | |
| 239 | + | output := filepath.Join(temp, "artifacts") | |
| 240 | + | cmd := exec.Command(filepath.Join(repoRoot, "scripts", "collect_first_presentation.sh")) | |
| 241 | + | cmd.Dir = repoRoot | |
| 242 | + | cmd.Env = append(os.Environ(), | |
| 243 | + | "DISPLAY=:test", | |
| 244 | + | "DUMBER_CEF_DIR="+runtime, | |
| 245 | + | "DUMBER_FIRST_PRESENTATION_BIN="+binary, | |
| 246 | + | "DUMBER_FIRST_PRESENTATION_OUTPUT="+output, | |
| 247 | + | "PATH="+filepath.Dir(goBin)+":"+os.Getenv("PATH"), | |
| 248 | + | ) | |
| 249 | + | result, runErr := cmd.CombinedOutput() | |
| 250 | + | require.Errorf(t, runErr, "collector accepted nonimmutable module provenance: %s", result) | |
| 251 | + | require.Contains(t, string(result), "immutable module provenance is unavailable") | |
| 252 | + | require.NotContains(t, string(result), temp) | |
| 253 | + | require.NoFileExists(t, filepath.Join(output, "metadata.json")) | |
| 254 | + | for _, name := range runArtifactNames() { | |
| 255 | + | require.NoFileExists(t, filepath.Join(output, name)) | |
| 256 | + | } | |
| 257 | + | }) | |
| 258 | + | } | |
| 259 | + | } | |
| 260 | + | ||
| 261 | + | func collectorProvenanceGo(t *testing.T, temp, version, revision, ref string) string { | |
| 262 | + | t.Helper() | |
| 263 | + | infoPath := filepath.Join(temp, "module.info") | |
| 264 | + | info := map[string]any{"Version": version} | |
| 265 | + | if revision != "" { | |
| 266 | + | info["Origin"] = map[string]string{ | |
| 267 | + | "VCS": "git", "URL": "https://github.com/bnema/purego-cef2gtk", "Hash": revision, "Ref": ref, | |
| 268 | + | } | |
| 269 | + | } | |
| 270 | + | infoJSON, err := json.Marshal(info) | |
| 271 | + | require.NoError(t, err) | |
| 272 | + | require.NoError(t, os.WriteFile(infoPath, infoJSON, 0o600)) | |
| 273 | + | ||
| 274 | + | selectedJSON, err := json.Marshal(map[string]string{ | |
| 275 | + | "Path": "github.com/bnema/purego-cef2gtk", "Version": version, | |
| 276 | + | }) | |
| 277 | + | require.NoError(t, err) | |
| 278 | + | downloadedJSON, err := json.Marshal(map[string]string{ | |
| 279 | + | "Path": "github.com/bnema/purego-cef2gtk", "Version": version, "Info": infoPath, | |
| 280 | + | }) | |
| 281 | + | require.NoError(t, err) | |
| 282 | + | binDir := filepath.Join(temp, "bin") | |
| 283 | + | require.NoError(t, os.Mkdir(binDir, 0o755)) | |
| 284 | + | goBin := filepath.Join(binDir, "go") | |
| 285 | + | script := fmt.Sprintf(`#!/bin/sh | |
| 286 | + | if [ "$1" = "list" ] && [ "$2" = "-m" ] && [ "$3" = "-json" ] && [ "$4" = "github.com/bnema/purego-cef2gtk" ]; then | |
| 287 | + | printf '%%s\n' '%s' | |
| 288 | + | exit 0 | |
| 289 | + | fi | |
| 290 | + | if [ "$1" = "mod" ] && [ "$2" = "download" ] && [ "$3" = "-json" ] && [ "$4" = "github.com/bnema/purego-cef2gtk@%s" ]; then | |
| 291 | + | printf '%%s\n' '%s' | |
| 292 | + | exit 0 | |
| 293 | + | fi | |
| 294 | + | exit 1 | |
| 295 | + | `, selectedJSON, version, downloadedJSON) | |
| 296 | + | require.NoError(t, os.WriteFile(goBin, []byte(script), 0o755)) | |
| 297 | + | return goBin | |
| 298 | + | } | |
| 299 | + | ||
| 169 | 300 | func TestFirstPresentationCollectorDefaultsToXDGStateEvidenceDirectory(t *testing.T) { | |
| 170 | 301 | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | |
| 171 | 302 | require.NoError(t, err) | |
| @@ -2,6 +2,7 @@ package logging | |||||
| 2 | 2 | ||||
| 3 | import ( | 3 | import ( | ||
| 4 | "encoding/json" | 4 | "encoding/json" | ||
| 5 | + | "fmt" | |||
| 5 | "os" | 6 | "os" | ||
| 6 | "os/exec" | 7 | "os/exec" | ||
| 7 | "path/filepath" | 8 | "path/filepath" | ||
| @@ -143,8 +144,9 @@ func TestFirstPresentationCollectorSanitizesMachineLocalValues(t *testing.T) { | |||||
| 143 | } | 144 | } | ||
| 144 | for _, required := range []string{ | 145 | for _, required := range []string{ | ||
| 145 | `"measured_source_revision"`, | 146 | `"measured_source_revision"`, | ||
| 147 | + | `"version": "v0.8.4-0.20260714160309-bbd397409ebe"`, | |||
| 146 | `"tag": "v0.8.4"`, | 148 | `"tag": "v0.8.4"`, | ||
| 147 | - | `"revision": "f217ece342dea3ef2a3f98671fcd16a39ad0037d"`, | 149 | + | `"revision": "bbd397409ebed75a5979c1e4566a2ef319f6a484"`, |
| 148 | } { | 150 | } { | ||
| 149 | require.Contains(t, artifacts.String(), required) | 151 | require.Contains(t, artifacts.String(), required) | ||
| 150 | } | 152 | } | ||
| @@ -166,6 +168,135 @@ func TestFirstPresentationCollectorSanitizesMachineLocalValues(t *testing.T) { | |||||
| 166 | require.Equal(t, "integrated-gpu", metadata.Comparison.MachineGPUProfile) | 168 | require.Equal(t, "integrated-gpu", metadata.Comparison.MachineGPUProfile) | ||
| 167 | } | 169 | } | ||
| 168 | 170 | ||||
| 171 | + | func TestFirstPresentationCollectorDerivesSelectedImmutableModuleProvenance(t *testing.T) { | |||
| 172 | + | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | |||
| 173 | + | require.NoError(t, err) | |||
| 174 | + | temp := t.TempDir() | |||
| 175 | + | runtime := filepath.Join(temp, "cef-147-runtime") | |||
| 176 | + | require.NoError(t, os.Mkdir(runtime, 0o755)) | |||
| 177 | + | binary := filepath.Join(temp, "dumber") | |||
| 178 | + | require.NoError(t, os.WriteFile(binary, collectorTestBinary(validFirstPresentationLog), 0o755)) | |||
| 179 | + | ||||
| 180 | + | // This exact pseudo-version is deliberately newer than the former v0.8.4 | |||
| 181 | + | // hardcode; the collector must report what the selected module says. | |||
| 182 | + | const version = "v0.8.5-0.20300102030405-bbd397409ebe" | |||
| 183 | + | const revision = "bbd397409ebed75a5979c1e4566a2ef319f6a484" | |||
| 184 | + | goBin := collectorProvenanceGo(t, temp, version, revision, "") | |||
| 185 | + | output := filepath.Join(temp, "artifacts") | |||
| 186 | + | cmd := exec.Command(filepath.Join(repoRoot, "scripts", "collect_first_presentation.sh")) | |||
| 187 | + | cmd.Dir = repoRoot | |||
| 188 | + | cmd.Env = append(os.Environ(), | |||
| 189 | + | "DISPLAY=:test", | |||
| 190 | + | "DUMBER_CEF_DIR="+runtime, | |||
| 191 | + | "DUMBER_FIRST_PRESENTATION_BIN="+binary, | |||
| 192 | + | "DUMBER_FIRST_PRESENTATION_OUTPUT="+output, | |||
| 193 | + | "DUMBER_FIRST_PRESENTATION_TIMEOUT_SECONDS=1", | |||
| 194 | + | "PATH="+filepath.Dir(goBin)+":"+os.Getenv("PATH"), | |||
| 195 | + | ) | |||
| 196 | + | result, err := cmd.CombinedOutput() | |||
| 197 | + | require.NoErrorf(t, err, "collector failed: %s", result) | |||
| 198 | + | ||||
| 199 | + | var metadata struct { | |||
| 200 | + | Upstream struct { | |||
| 201 | + | Module string `json:"module"` | |||
| 202 | + | Version string `json:"version"` | |||
| 203 | + | Tag string `json:"tag"` | |||
| 204 | + | Revision string `json:"revision"` | |||
| 205 | + | } `json:"upstream"` | |||
| 206 | + | } | |||
| 207 | + | contents, err := os.ReadFile(filepath.Join(output, "metadata.json")) | |||
| 208 | + | require.NoError(t, err) | |||
| 209 | + | require.NoError(t, json.Unmarshal(contents, &metadata)) | |||
| 210 | + | require.Equal(t, "github.com/bnema/purego-cef2gtk", metadata.Upstream.Module) | |||
| 211 | + | require.Equal(t, version, metadata.Upstream.Version) | |||
| 212 | + | require.Equal(t, "v0.8.5", metadata.Upstream.Tag) | |||
| 213 | + | require.Equal(t, revision, metadata.Upstream.Revision) | |||
| 214 | + | ||||
| 215 | + | script, err := os.ReadFile(filepath.Join(repoRoot, "scripts", "collect_first_presentation.sh")) | |||
| 216 | + | require.NoError(t, err) | |||
| 217 | + | require.NotContains(t, string(script), "f217ece342dea3ef2a3f98671fcd16a39ad0037d") | |||
| 218 | + | } | |||
| 219 | + | ||||
| 220 | + | func TestFirstPresentationCollectorRejectsNonImmutableModuleProvenanceWithoutLeaks(t *testing.T) { | |||
| 221 | + | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | |||
| 222 | + | require.NoError(t, err) | |||
| 223 | + | ||||
| 224 | + | for _, test := range []struct { | |||
| 225 | + | name, version, revision, ref string | |||
| 226 | + | }{ | |||
| 227 | + | {name: "branch selector", version: "main", ref: "main"}, | |||
| 228 | + | {name: "missing origin", version: "v0.8.5-0.20300102030405-bbd397409ebe"}, | |||
| 229 | + | {name: "named origin ref", version: "v0.8.5-0.20300102030405-bbd397409ebe", revision: "bbd397409ebed75a5979c1e4566a2ef319f6a484", ref: "main"}, | |||
| 230 | + | } { | |||
| 231 | + | t.Run(test.name, func(t *testing.T) { | |||
| 232 | + | temp := t.TempDir() | |||
| 233 | + | runtime := filepath.Join(temp, "cef-147-runtime") | |||
| 234 | + | require.NoError(t, os.Mkdir(runtime, 0o755)) | |||
| 235 | + | binary := filepath.Join(temp, "dumber") | |||
| 236 | + | require.NoError(t, os.WriteFile(binary, collectorTestBinary(validFirstPresentationLog), 0o755)) | |||
| 237 | + | ||||
| 238 | + | goBin := collectorProvenanceGo(t, temp, test.version, test.revision, test.ref) | |||
| 239 | + | output := filepath.Join(temp, "artifacts") | |||
| 240 | + | cmd := exec.Command(filepath.Join(repoRoot, "scripts", "collect_first_presentation.sh")) | |||
| 241 | + | cmd.Dir = repoRoot | |||
| 242 | + | cmd.Env = append(os.Environ(), | |||
| 243 | + | "DISPLAY=:test", | |||
| 244 | + | "DUMBER_CEF_DIR="+runtime, | |||
| 245 | + | "DUMBER_FIRST_PRESENTATION_BIN="+binary, | |||
| 246 | + | "DUMBER_FIRST_PRESENTATION_OUTPUT="+output, | |||
| 247 | + | "PATH="+filepath.Dir(goBin)+":"+os.Getenv("PATH"), | |||
| 248 | + | ) | |||
| 249 | + | result, runErr := cmd.CombinedOutput() | |||
| 250 | + | require.Errorf(t, runErr, "collector accepted nonimmutable module provenance: %s", result) | |||
| 251 | + | require.Contains(t, string(result), "immutable module provenance is unavailable") | |||
| 252 | + | require.NotContains(t, string(result), temp) | |||
| 253 | + | require.NoFileExists(t, filepath.Join(output, "metadata.json")) | |||
| 254 | + | for _, name := range runArtifactNames() { | |||
| 255 | + | require.NoFileExists(t, filepath.Join(output, name)) | |||
| 256 | + | } | |||
| 257 | + | }) | |||
| 258 | + | } | |||
| 259 | + | } | |||
| 260 | + | ||||
| 261 | + | func collectorProvenanceGo(t *testing.T, temp, version, revision, ref string) string { | |||
| 262 | + | t.Helper() | |||
| 263 | + | infoPath := filepath.Join(temp, "module.info") | |||
| 264 | + | info := map[string]any{"Version": version} | |||
| 265 | + | if revision != "" { | |||
| 266 | + | info["Origin"] = map[string]string{ | |||
| 267 | + | "VCS": "git", "URL": "https://github.com/bnema/purego-cef2gtk", "Hash": revision, "Ref": ref, | |||
| 268 | + | } | |||
| 269 | + | } | |||
| 270 | + | infoJSON, err := json.Marshal(info) | |||
| 271 | + | require.NoError(t, err) | |||
| 272 | + | require.NoError(t, os.WriteFile(infoPath, infoJSON, 0o600)) | |||
| 273 | + | ||||
| 274 | + | selectedJSON, err := json.Marshal(map[string]string{ | |||
| 275 | + | "Path": "github.com/bnema/purego-cef2gtk", "Version": version, | |||
| 276 | + | }) | |||
| 277 | + | require.NoError(t, err) | |||
| 278 | + | downloadedJSON, err := json.Marshal(map[string]string{ | |||
| 279 | + | "Path": "github.com/bnema/purego-cef2gtk", "Version": version, "Info": infoPath, | |||
| 280 | + | }) | |||
| 281 | + | require.NoError(t, err) | |||
| 282 | + | binDir := filepath.Join(temp, "bin") | |||
| 283 | + | require.NoError(t, os.Mkdir(binDir, 0o755)) | |||
| 284 | + | goBin := filepath.Join(binDir, "go") | |||
| 285 | + | script := fmt.Sprintf(`#!/bin/sh | |||
| 286 | + | if [ "$1" = "list" ] && [ "$2" = "-m" ] && [ "$3" = "-json" ] && [ "$4" = "github.com/bnema/purego-cef2gtk" ]; then | |||
| 287 | + | printf '%%s\n' '%s' | |||
| 288 | + | exit 0 | |||
| 289 | + | fi | |||
| 290 | + | if [ "$1" = "mod" ] && [ "$2" = "download" ] && [ "$3" = "-json" ] && [ "$4" = "github.com/bnema/purego-cef2gtk@%s" ]; then | |||
| 291 | + | printf '%%s\n' '%s' | |||
| 292 | + | exit 0 | |||
| 293 | + | fi | |||
| 294 | + | exit 1 | |||
| 295 | + | `, selectedJSON, version, downloadedJSON) | |||
| 296 | + | require.NoError(t, os.WriteFile(goBin, []byte(script), 0o755)) | |||
| 297 | + | return goBin | |||
| 298 | + | } | |||
| 299 | + | ||||
| 169 | func TestFirstPresentationCollectorDefaultsToXDGStateEvidenceDirectory(t *testing.T) { | 300 | func TestFirstPresentationCollectorDefaultsToXDGStateEvidenceDirectory(t *testing.T) { | ||
| 170 | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | 301 | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | ||
| 171 | require.NoError(t, err) | 302 | require.NoError(t, err) | ||
M scripts/collect_first_presentation.sh +78 -9
| @@ -31,8 +31,78 @@ else | |||
| 31 | 31 | fi | |
| 32 | 32 | readonly output | |
| 33 | 33 | readonly upstream_module="github.com/bnema/purego-cef2gtk" | |
| 34 | - | readonly upstream_tag="v0.8.4" | |
| 35 | - | readonly upstream_revision="f217ece342dea3ef2a3f98671fcd16a39ad0037d" | |
| 34 | + | ||
| 35 | + | # Resolve the version selected by this checkout, then obtain its immutable VCS | |
| 36 | + | # origin from Go's cached module metadata. Do not infer a revision from a tag, | |
| 37 | + | # a branch, or a truncated pseudo-version suffix. | |
| 38 | + | resolve_upstream_provenance() { | |
| 39 | + | local selected_metadata selected_version downloaded_metadata | |
| 40 | + | ||
| 41 | + | selected_metadata="$(go list -m -json "$upstream_module" 2>/dev/null)" || { | |
| 42 | + | echo "first-presentation: immutable module provenance is unavailable" >&2 | |
| 43 | + | exit 2 | |
| 44 | + | } | |
| 45 | + | selected_version="$(python3 - "$upstream_module" "$selected_metadata" <<'PY' | |
| 46 | + | import json, sys | |
| 47 | + | try: | |
| 48 | + | metadata = json.loads(sys.argv[2]) | |
| 49 | + | if metadata.get("Path") != sys.argv[1] or not isinstance(metadata.get("Version"), str): | |
| 50 | + | raise ValueError | |
| 51 | + | print(metadata["Version"]) | |
| 52 | + | except (AttributeError, TypeError, ValueError, json.JSONDecodeError): | |
| 53 | + | raise SystemExit("first-presentation: immutable module provenance is unavailable") | |
| 54 | + | PY | |
| 55 | + | )" || exit $? | |
| 56 | + | downloaded_metadata="$(go mod download -json "$upstream_module@$selected_version" 2>/dev/null)" || { | |
| 57 | + | echo "first-presentation: immutable module provenance is unavailable" >&2 | |
| 58 | + | exit 2 | |
| 59 | + | } | |
| 60 | + | ||
| 61 | + | python3 - "$upstream_module" "$selected_metadata" "$downloaded_metadata" <<'PY' | |
| 62 | + | import json, re, sys | |
| 63 | + | ||
| 64 | + | module, selected_raw, downloaded_raw = sys.argv[1:] | |
| 65 | + | ||
| 66 | + | def fail(): | |
| 67 | + | # Do not expose Go cache locations or other machine-local values. | |
| 68 | + | raise SystemExit("first-presentation: immutable module provenance is unavailable") | |
| 69 | + | ||
| 70 | + | try: | |
| 71 | + | selected = json.loads(selected_raw) | |
| 72 | + | downloaded = json.loads(downloaded_raw) | |
| 73 | + | version = selected["Version"] | |
| 74 | + | if selected.get("Path") != module or downloaded.get("Path") != module: | |
| 75 | + | fail() | |
| 76 | + | if downloaded.get("Version") != version: | |
| 77 | + | fail() | |
| 78 | + | # A selected pseudo-version is an exact immutable selector, never a branch. | |
| 79 | + | match = re.fullmatch(r"(v\d+\.\d+\.\d+)-0\.\d{14}-([0-9a-f]{12})", version) | |
| 80 | + | if not match: | |
| 81 | + | fail() | |
| 82 | + | info_path = downloaded.get("Info") | |
| 83 | + | if not isinstance(info_path, str) or not info_path: | |
| 84 | + | fail() | |
| 85 | + | with open(info_path, encoding="utf-8") as info_file: | |
| 86 | + | info = json.load(info_file) | |
| 87 | + | origin = info.get("Origin") or downloaded.get("Origin") | |
| 88 | + | if info.get("Version") != version or not isinstance(origin, dict): | |
| 89 | + | fail() | |
| 90 | + | revision = origin.get("Hash") | |
| 91 | + | if origin.get("VCS") != "git" or origin.get("URL") != "https://github.com/bnema/purego-cef2gtk": | |
| 92 | + | fail() | |
| 93 | + | if not isinstance(revision, str) or not re.fullmatch(r"[0-9a-f]{40}", revision): | |
| 94 | + | fail() | |
| 95 | + | if not revision.startswith(match.group(2)): | |
| 96 | + | fail() | |
| 97 | + | # A named ref can move. Only the immutable hash itself is acceptable. | |
| 98 | + | if origin.get("Ref") not in (None, "", revision): | |
| 99 | + | fail() | |
| 100 | + | except (AttributeError, KeyError, OSError, TypeError, ValueError, json.JSONDecodeError): | |
| 101 | + | fail() | |
| 102 | + | ||
| 103 | + | print("\t".join((version, match.group(1), revision))) | |
| 104 | + | PY | |
| 105 | + | } | |
| 36 | 106 | ||
| 37 | 107 | # The artifact destination is caller-controlled. Never empty or recursively | |
| 38 | 108 | # clear it: collection only writes to a newly-created directory whose parent is | |
| @@ -66,10 +136,9 @@ prepare_output | |||
| 66 | 136 | [[ -x "$binary" ]] || { echo "first-presentation: executable not found: $binary" >&2; exit 2; } | |
| 67 | 137 | [[ -d "$runtime" ]] || { echo "first-presentation: CEF runtime not found: $runtime" >&2; exit 2; } | |
| 68 | 138 | [[ -n "${WAYLAND_DISPLAY:-}${DISPLAY:-}" ]] || { echo "first-presentation: a current Wayland/X11 display is required" >&2; exit 2; } | |
| 69 | - | [[ "$(go list -m -f '{{.Version}}' "$upstream_module")" == "$upstream_tag" ]] || { | |
| 70 | - | echo "first-presentation: expected $upstream_module@$upstream_tag" >&2 | |
| 71 | - | exit 2 | |
| 72 | - | } | |
| 139 | + | upstream_provenance="$(resolve_upstream_provenance)" || exit $? | |
| 140 | + | IFS=$'\t' read -r upstream_version upstream_tag upstream_revision <<<"$upstream_provenance" | |
| 141 | + | readonly upstream_version upstream_tag upstream_revision | |
| 73 | 142 | ||
| 74 | 143 | # Raw logs and temporary XDG homes may contain machine-local paths. Keep them | |
| 75 | 144 | # outside the committed artifact directory and always remove them. | |
| @@ -80,9 +149,9 @@ cleanup_work_root() { | |||
| 80 | 149 | rm -rf -- "$work_root" | |
| 81 | 150 | } | |
| 82 | 151 | trap cleanup_work_root EXIT | |
| 83 | - | python3 - "$output/metadata.json" "$binary" "$timeout_seconds" "$upstream_module" "$upstream_tag" "$upstream_revision" <<'PY' | |
| 152 | + | python3 - "$output/metadata.json" "$binary" "$timeout_seconds" "$upstream_module" "$upstream_version" "$upstream_tag" "$upstream_revision" <<'PY' | |
| 84 | 153 | import hashlib, json, os, platform, subprocess, sys | |
| 85 | - | path, binary, timeout, upstream_module, upstream_tag, upstream_revision = sys.argv[1:] | |
| 154 | + | path, binary, timeout, upstream_module, upstream_version, upstream_tag, upstream_revision = sys.argv[1:] | |
| 86 | 155 | with open(binary, "rb") as candidate: | |
| 87 | 156 | binary_sha256 = hashlib.file_digest(candidate, "sha256").hexdigest() | |
| 88 | 157 | ||
| @@ -102,7 +171,7 @@ json.dump({ | |||
| 102 | 171 | "binary": {"label": "dumber", "sha256": binary_sha256}, | |
| 103 | 172 | "timeout_seconds": int(timeout), | |
| 104 | 173 | "measured_source_revision": subprocess.check_output(["git", "-c", f"safe.directory={os.getcwd()}", "rev-parse", "HEAD"], text=True).strip(), | |
| 105 | - | "upstream": {"module": upstream_module, "tag": upstream_tag, "revision": upstream_revision}, | |
| 174 | + | "upstream": {"module": upstream_module, "version": upstream_version, "tag": upstream_tag, "revision": upstream_revision}, | |
| 106 | 175 | "comparison": {"os": os_label, "architecture": architecture, "display_protocol": display_protocol, "machine_gpu_profile": gpu_profile}, | |
| 107 | 176 | "render_configuration": {"backend": "gdk-dmabuf", "buffer_sharing": "dmabuf", "renderer": "vulkan"} | |
| 108 | 177 | }, open(path, "w"), indent=2, sort_keys=True) | |
| @@ -31,8 +31,78 @@ else | |||||
| 31 | fi | 31 | fi | ||
| 32 | readonly output | 32 | readonly output | ||
| 33 | readonly upstream_module="github.com/bnema/purego-cef2gtk" | 33 | readonly upstream_module="github.com/bnema/purego-cef2gtk" | ||
| 34 | - | readonly upstream_tag="v0.8.4" | 34 | + | |
| 35 | - | readonly upstream_revision="f217ece342dea3ef2a3f98671fcd16a39ad0037d" | 35 | + | # Resolve the version selected by this checkout, then obtain its immutable VCS |
| 36 | + | # origin from Go's cached module metadata. Do not infer a revision from a tag, | |||
| 37 | + | # a branch, or a truncated pseudo-version suffix. | |||
| 38 | + | resolve_upstream_provenance() { | |||
| 39 | + | local selected_metadata selected_version downloaded_metadata | |||
| 40 | + | ||||
| 41 | + | selected_metadata="$(go list -m -json "$upstream_module" 2>/dev/null)" || { | |||
| 42 | + | echo "first-presentation: immutable module provenance is unavailable" >&2 | |||
| 43 | + | exit 2 | |||
| 44 | + | } | |||
| 45 | + | selected_version="$(python3 - "$upstream_module" "$selected_metadata" <<'PY' | |||
| 46 | + | import json, sys | |||
| 47 | + | try: | |||
| 48 | + | metadata = json.loads(sys.argv[2]) | |||
| 49 | + | if metadata.get("Path") != sys.argv[1] or not isinstance(metadata.get("Version"), str): | |||
| 50 | + | raise ValueError | |||
| 51 | + | print(metadata["Version"]) | |||
| 52 | + | except (AttributeError, TypeError, ValueError, json.JSONDecodeError): | |||
| 53 | + | raise SystemExit("first-presentation: immutable module provenance is unavailable") | |||
| 54 | + | PY | |||
| 55 | + | )" || exit $? | |||
| 56 | + | downloaded_metadata="$(go mod download -json "$upstream_module@$selected_version" 2>/dev/null)" || { | |||
| 57 | + | echo "first-presentation: immutable module provenance is unavailable" >&2 | |||
| 58 | + | exit 2 | |||
| 59 | + | } | |||
| 60 | + | ||||
| 61 | + | python3 - "$upstream_module" "$selected_metadata" "$downloaded_metadata" <<'PY' | |||
| 62 | + | import json, re, sys | |||
| 63 | + | ||||
| 64 | + | module, selected_raw, downloaded_raw = sys.argv[1:] | |||
| 65 | + | ||||
| 66 | + | def fail(): | |||
| 67 | + | # Do not expose Go cache locations or other machine-local values. | |||
| 68 | + | raise SystemExit("first-presentation: immutable module provenance is unavailable") | |||
| 69 | + | ||||
| 70 | + | try: | |||
| 71 | + | selected = json.loads(selected_raw) | |||
| 72 | + | downloaded = json.loads(downloaded_raw) | |||
| 73 | + | version = selected["Version"] | |||
| 74 | + | if selected.get("Path") != module or downloaded.get("Path") != module: | |||
| 75 | + | fail() | |||
| 76 | + | if downloaded.get("Version") != version: | |||
| 77 | + | fail() | |||
| 78 | + | # A selected pseudo-version is an exact immutable selector, never a branch. | |||
| 79 | + | match = re.fullmatch(r"(v\d+\.\d+\.\d+)-0\.\d{14}-([0-9a-f]{12})", version) | |||
| 80 | + | if not match: | |||
| 81 | + | fail() | |||
| 82 | + | info_path = downloaded.get("Info") | |||
| 83 | + | if not isinstance(info_path, str) or not info_path: | |||
| 84 | + | fail() | |||
| 85 | + | with open(info_path, encoding="utf-8") as info_file: | |||
| 86 | + | info = json.load(info_file) | |||
| 87 | + | origin = info.get("Origin") or downloaded.get("Origin") | |||
| 88 | + | if info.get("Version") != version or not isinstance(origin, dict): | |||
| 89 | + | fail() | |||
| 90 | + | revision = origin.get("Hash") | |||
| 91 | + | if origin.get("VCS") != "git" or origin.get("URL") != "https://github.com/bnema/purego-cef2gtk": | |||
| 92 | + | fail() | |||
| 93 | + | if not isinstance(revision, str) or not re.fullmatch(r"[0-9a-f]{40}", revision): | |||
| 94 | + | fail() | |||
| 95 | + | if not revision.startswith(match.group(2)): | |||
| 96 | + | fail() | |||
| 97 | + | # A named ref can move. Only the immutable hash itself is acceptable. | |||
| 98 | + | if origin.get("Ref") not in (None, "", revision): | |||
| 99 | + | fail() | |||
| 100 | + | except (AttributeError, KeyError, OSError, TypeError, ValueError, json.JSONDecodeError): | |||
| 101 | + | fail() | |||
| 102 | + | ||||
| 103 | + | print("\t".join((version, match.group(1), revision))) | |||
| 104 | + | PY | |||
| 105 | + | } | |||
| 36 | 106 | ||||
| 37 | # The artifact destination is caller-controlled. Never empty or recursively | 107 | # The artifact destination is caller-controlled. Never empty or recursively | ||
| 38 | # clear it: collection only writes to a newly-created directory whose parent is | 108 | # clear it: collection only writes to a newly-created directory whose parent is | ||
| @@ -66,10 +136,9 @@ prepare_output | |||||
| 66 | [[ -x "$binary" ]] || { echo "first-presentation: executable not found: $binary" >&2; exit 2; } | 136 | [[ -x "$binary" ]] || { echo "first-presentation: executable not found: $binary" >&2; exit 2; } | ||
| 67 | [[ -d "$runtime" ]] || { echo "first-presentation: CEF runtime not found: $runtime" >&2; exit 2; } | 137 | [[ -d "$runtime" ]] || { echo "first-presentation: CEF runtime not found: $runtime" >&2; exit 2; } | ||
| 68 | [[ -n "${WAYLAND_DISPLAY:-}${DISPLAY:-}" ]] || { echo "first-presentation: a current Wayland/X11 display is required" >&2; exit 2; } | 138 | [[ -n "${WAYLAND_DISPLAY:-}${DISPLAY:-}" ]] || { echo "first-presentation: a current Wayland/X11 display is required" >&2; exit 2; } | ||
| 69 | - | [[ "$(go list -m -f '{{.Version}}' "$upstream_module")" == "$upstream_tag" ]] || { | 139 | + | upstream_provenance="$(resolve_upstream_provenance)" || exit $? |
| 70 | - | echo "first-presentation: expected $upstream_module@$upstream_tag" >&2 | 140 | + | IFS=$'\t' read -r upstream_version upstream_tag upstream_revision <<<"$upstream_provenance" |
| 71 | - | exit 2 | 141 | + | readonly upstream_version upstream_tag upstream_revision |
| 72 | - | } | |||
| 73 | 142 | ||||
| 74 | # Raw logs and temporary XDG homes may contain machine-local paths. Keep them | 143 | # Raw logs and temporary XDG homes may contain machine-local paths. Keep them | ||
| 75 | # outside the committed artifact directory and always remove them. | 144 | # outside the committed artifact directory and always remove them. | ||
| @@ -80,9 +149,9 @@ cleanup_work_root() { | |||||
| 80 | rm -rf -- "$work_root" | 149 | rm -rf -- "$work_root" | ||
| 81 | } | 150 | } | ||
| 82 | trap cleanup_work_root EXIT | 151 | trap cleanup_work_root EXIT | ||
| 83 | - | python3 - "$output/metadata.json" "$binary" "$timeout_seconds" "$upstream_module" "$upstream_tag" "$upstream_revision" <<'PY' | 152 | + | python3 - "$output/metadata.json" "$binary" "$timeout_seconds" "$upstream_module" "$upstream_version" "$upstream_tag" "$upstream_revision" <<'PY' |
| 84 | import hashlib, json, os, platform, subprocess, sys | 153 | import hashlib, json, os, platform, subprocess, sys | ||
| 85 | - | path, binary, timeout, upstream_module, upstream_tag, upstream_revision = sys.argv[1:] | 154 | + | path, binary, timeout, upstream_module, upstream_version, upstream_tag, upstream_revision = sys.argv[1:] |
| 86 | with open(binary, "rb") as candidate: | 155 | with open(binary, "rb") as candidate: | ||
| 87 | binary_sha256 = hashlib.file_digest(candidate, "sha256").hexdigest() | 156 | binary_sha256 = hashlib.file_digest(candidate, "sha256").hexdigest() | ||
| 88 | 157 | ||||
| @@ -102,7 +171,7 @@ json.dump({ | |||||
| 102 | "binary": {"label": "dumber", "sha256": binary_sha256}, | 171 | "binary": {"label": "dumber", "sha256": binary_sha256}, | ||
| 103 | "timeout_seconds": int(timeout), | 172 | "timeout_seconds": int(timeout), | ||
| 104 | "measured_source_revision": subprocess.check_output(["git", "-c", f"safe.directory={os.getcwd()}", "rev-parse", "HEAD"], text=True).strip(), | 173 | "measured_source_revision": subprocess.check_output(["git", "-c", f"safe.directory={os.getcwd()}", "rev-parse", "HEAD"], text=True).strip(), | ||
| 105 | - | "upstream": {"module": upstream_module, "tag": upstream_tag, "revision": upstream_revision}, | 174 | + | "upstream": {"module": upstream_module, "version": upstream_version, "tag": upstream_tag, "revision": upstream_revision}, |
| 106 | "comparison": {"os": os_label, "architecture": architecture, "display_protocol": display_protocol, "machine_gpu_profile": gpu_profile}, | 175 | "comparison": {"os": os_label, "architecture": architecture, "display_protocol": display_protocol, "machine_gpu_profile": gpu_profile}, | ||
| 107 | "render_configuration": {"backend": "gdk-dmabuf", "buffer_sharing": "dmabuf", "renderer": "vulkan"} | 176 | "render_configuration": {"backend": "gdk-dmabuf", "buffer_sharing": "dmabuf", "renderer": "vulkan"} | ||
| 108 | }, open(path, "w"), indent=2, sort_keys=True) | 177 | }, open(path, "w"), indent=2, sort_keys=True) | ||
M vendor/github.com/bnema/purego-cef/cef/bridge.go +8 -13 generated file: collapsed
M vendor/github.com/bnema/purego-cef2gtk/internal/cefadapter/accelerated_paint.go +34 -37 generated file: collapsed
M vendor/github.com/bnema/purego-cef2gtk/internal/dmabuf/frame.go +38 -19 generated file: collapsed
M vendor/github.com/bnema/purego-cef2gtk/internal/gtkgdk/renderer.go +89 -69 generated file: collapsed
M vendor/github.com/bnema/purego-pipewire/internal/core/player.go +5 -0 generated file: collapsed
M vendor/github.com/bnema/purego-pipewire/internal/core/player_rt.go +10 -6 generated file: collapsed
M vendor/github.com/bnema/purego-pipewire/internal/core/pwbuffer.go +66 -32 generated file: collapsed
M vendor/github.com/bnema/purego-sqlite/driver/driver.go +268 -63 generated file: collapsed
M vendor/github.com/bnema/purego-sqlite/internal/core/db.go +8 -0 generated file: collapsed
M vendor/github.com/bnema/purego-sqlite/internal/core/rows.go +13 -0 generated file: collapsed
M vendor/github.com/bnema/purego-sqlite/internal/loader/loader.go +23 -5 generated file: collapsed
M vendor/github.com/bnema/purego-sqlite/internal/ports/in/ports_gen.go +3 -0 generated file: collapsed
M vendor/github.com/bnema/puregotk/internal/core/core.go +197 -4 generated file: collapsed
M vendor/github.com/bnema/puregotk/pkg/core/core.go +10 -0 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-about-dialog.go +99 -64 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-about-window.go +95 -62 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-accent-color.go +7 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-action-row.go +33 -29 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-alert-dialog.go +66 -47 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-animation-target.go +10 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-animation-util.go +4 -12 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-animation.go +24 -26 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-application-window.go +14 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-application.go +3 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-avatar.go +22 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-banner.go +23 -26 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-bin.go +5 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-bottom-sheet.go +47 -38 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-breakpoint-bin.go +10 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-breakpoint.go +33 -37 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-button-content.go +18 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-button-row.go +10 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-carousel-indicator-dots.go +5 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-carousel-indicator-lines.go +5 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-carousel.go +47 -37 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-clamp-layout.go +14 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-clamp-scrollable.go +17 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-clamp.go +17 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-combo-row.go +34 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-dialog.go +45 -38 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-easing.go +3 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-entry-row.go +40 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-enum-list-model.go +13 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-expander-row.go +40 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-flap.go +61 -48 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-fold-threshold-policy.go +10 -1 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-header-bar.go +36 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-inline-view-switcher.go +18 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-layout-slot.go +4 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-layout.go +7 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-leaflet.go +69 -56 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-length-unit.go +5 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-main.go +5 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-message-dialog.go +63 -44 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-multi-layout-view.go +17 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-navigation-direction.go +10 -1 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-navigation-split-view.go +36 -32 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-navigation-view.go +60 -49 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-overlay-split-view.go +48 -38 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-password-entry-row.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-dialog.go +23 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-group.go +24 -26 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-page.go +38 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-row.go +18 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-window.go +31 -29 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-shortcut-label.go +10 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-shortcuts-dialog.go +4 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-shortcuts-item.go +23 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-shortcuts-section.go +8 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-sidebar-item.go +45 -37 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-sidebar-section.go +24 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-sidebar.go +41 -39 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spin-row.go +40 -34 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spinner-paintable.go +5 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spinner.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-split-button.go +39 -34 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spring-animation.go +34 -30 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spring-params.go +17 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-squeezer.go +49 -44 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-status-page.go +20 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-style-manager.go +25 -28 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-swipe-tracker.go +33 -30 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-swipeable.go +33 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-switch-row.go +6 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-tab-bar.go +35 -32 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-tab-button.go +5 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-tab-overview.go +45 -37 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-tab-view.go +123 -87 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-timed-animation.go +30 -28 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-toast-overlay.go +9 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-toast.go +41 -36 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-toggle-group.go +64 -51 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-toolbar-view.go +40 -35 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-version.go +7 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-stack.go +78 -62 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-switcher-bar.go +9 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-switcher-sidebar.go +15 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-switcher-title.go +19 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-switcher.go +10 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-window-title.go +10 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-window.go +14 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-wrap-box.go +66 -46 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-wrap-layout.go +57 -46 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/cairo/main.go +36 -79 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkapplaunchcontext.go +10 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcairo.go +12 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcairocontext.go +3 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcicpparams.go +20 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkclipboard.go +34 -32 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcolorstate.go +12 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcontentdeserializer.go +26 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcontentformats.go +28 -31 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcontentprovider.go +23 -28 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcontentserializer.go +26 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcursor.go +12 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdevice.go +36 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdevicepad.go +27 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdevicetool.go +10 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdisplay.go +51 -43 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdisplaymanager.go +10 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdmabuftexture.go +3 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdmabuftexturebuilder.go +53 -41 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdrag.go +20 -28 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdragsurface.go +6 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdragsurfacesize.go +3 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdrawcontext.go +11 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdrop.go +19 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkenums.go +21 -1 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkevents.go +120 -118 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkframeclock.go +22 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkframetimings.go +17 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkglcontext.go +40 -36 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkgltexture.go +4 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkgltexturebuilder.go +41 -35 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkkeys.go +19 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkmemorytexture.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkmemorytexturebuilder.go +42 -35 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkmonitor.go +27 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkpaintable.go +63 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkpango.go +4 -12 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkpixbuf.go +2 -12 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkpopup.go +47 -26 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkpopuplayout.go +36 -32 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkrgba.go +19 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkseat.go +11 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdksnapshot.go +7 -0 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdksurface.go +46 -40 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdktexture.go +27 -31 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdktoplevel.go +157 -66 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdktoplevellayout.go +24 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdktoplevelsize.go +9 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdktypes.go +95 -72 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkvulkancontext.go +3 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdkpixbuf/gdk-pixbuf-animation.go +26 -32 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdkpixbuf/gdk-pixbuf-core.go +9 -0 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdkpixbuf/gdk-pixbuf-io.go +25 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdkpixbuf/gdk-pixbuf-loader.go +13 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdkpixbuf/gdk-pixbuf-simple-anim.go +8 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdkpixbuf/gdk-pixbuf-transform.go +11 -1 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdkpixbuf/gdk-pixbuf.go +102 -79 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdkpixbuf/main.go +5 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gaction.go +59 -31 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gactiongroup.go +96 -39 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gactionmap.go +33 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gappinfo.go +244 -116 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gapplication.go +79 -55 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gapplicationcommandline.go +31 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gasyncinitable.go +25 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gasyncresult.go +26 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gbufferedinputstream.go +26 -29 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gbufferedoutputstream.go +11 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gbytesicon.go +4 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gcancellable.go +26 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gcharsetconverter.go +8 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gcontenttype.go +30 -26 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gconverter.go +23 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gconverterinputstream.go +3 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gconverteroutputstream.go +3 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gcredentials.go +12 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdatagrambased.go +45 -30 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdatainputstream.go +31 -35 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdataoutputstream.go +14 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusactiongroup.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusaddress.go +10 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusauthobserver.go +6 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusconnection.go +77 -66 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbuserror.go +16 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusinterface.go +26 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusinterfaceskeleton.go +25 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusintrospection.go +54 -56 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusmenumodel.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusmessage.go +88 -64 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusmethodinvocation.go +35 -30 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusnameowning.go +10 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusnamewatching.go +10 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusobject.go +19 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusobjectmanager.go +26 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusobjectmanagerclient.go +16 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusobjectmanagerserver.go +13 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusobjectproxy.go +3 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusobjectskeleton.go +12 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusproxy.go +42 -38 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusserver.go +14 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusutils.go +24 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdebugcontroller.go +12 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdebugcontrollerdbus.go +4 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdrive.go +214 -82 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdtlsclientconnection.go +34 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdtlsconnection.go +207 -80 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdtlsserverconnection.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gemblem.go +6 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gemblemedicon.go +9 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfile.go +1148 -450 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfileattribute.go +13 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfileenumerator.go +34 -35 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfileicon.go +3 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfileinfo.go +138 -84 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfileinputstream.go +17 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfileiostream.go +23 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfilemonitor.go +9 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfilenamecompleter.go +8 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfileoutputstream.go +23 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfilterinputstream.go +6 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfilteroutputstream.go +6 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gicon.go +32 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/ginetaddress.go +40 -34 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/ginetaddressmask.go +14 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/ginetsocketaddress.go +10 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/ginitable.go +11 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/ginputstream.go +52 -48 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gioenums.go +90 -1 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gioerror.go +6 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/giomodule.go +26 -29 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gioscheduler.go +4 -12 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/giostream.go +25 -29 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/giotypes.go +70 -60 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/giptosmessage.go +6 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gipv6tclassmessage.go +6 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/glistmodel.go +33 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gliststore.go +22 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gloadableicon.go +27 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gmemoryinputstream.go +8 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gmemorymonitor.go +2 -12 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gmemoryoutputstream.go +13 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gmenu.go +62 -50 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gmenumodel.go +31 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gmount.go +215 -86 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gmountoperation.go +40 -32 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gnativesocketaddress.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gnativevolumemonitor.go +7 -0 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gnetworkaddress.go +11 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gnetworking.go +3 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gnetworkmonitor.go +49 -31 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gnetworkservice.go +12 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gnotification.go +26 -26 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/goutputstream.go +86 -72 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gpermission.go +33 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gpollableinputstream.go +30 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gpollableoutputstream.go +41 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gpollableutils.go +7 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gpowerprofilemonitor.go +7 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gpropertyaction.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gproxy.go +35 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gproxyaddress.go +16 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gproxyaddressenumerator.go +7 -0 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gproxyresolver.go +35 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gremoteactiongroup.go +12 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gresolver.go +75 -67 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gresource.go +19 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gseekable.go +41 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsettings.go +99 -67 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsettingsbackend.go +19 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsettingsschema.go +48 -43 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsimpleaction.go +9 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsimpleactiongroup.go +9 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsimpleasyncresult.go +46 -40 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsimpleiostream.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsimplepermission.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsimpleproxyresolver.go +8 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsocket.go +87 -72 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsocketaddress.go +11 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsocketaddressenumerator.go +13 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsocketclient.go +54 -44 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsocketconnectable.go +19 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsocketconnection.go +14 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsocketcontrolmessage.go +10 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsocketlistener.go +18 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsocketservice.go +8 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsrvtarget.go +2 -11 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsubprocess.go +40 -39 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsubprocesslauncher.go +34 -31 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gtask.go +70 -52 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gtcpconnection.go +5 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gtcpwrapperconnection.go +3 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gtestdbus.go +16 -22 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gthemedicon.go +10 -19 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gthreadedresolver.go +7 -0 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gthreadedsocketservice.go +2 -12 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gtlsbackend.go +69 -33 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gtlscertificate.go +25 -29 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gtlsclientconnection.go +55 -29 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gtlsconnection.go +56 -46 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gtlsdatabase.go +51 -48 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gtlsfiledatabase.go +2 -13 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gtlsinteraction.go +27 -31 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gtlspassword.go +20 -22 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gtlsserverconnection.go +2 -13 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gunixconnection.go +11 -20 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gunixcredentialsmessage.go +6 -17 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gunixfdlist.go +11 -19 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gunixsocketaddress.go +14 -22 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gvfs.go +18 -24 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gvolume.go +143 -58 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gvolumemonitor.go +11 -19 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gzlibcompressor.go +9 -18 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gzlibdecompressor.go +3 -15 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/main.go +2 -11 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gallocator.go +32 -28 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/garray.go +82 -59 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gasyncqueue.go +56 -39 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gatomic.go +43 -34 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gbacktrace.go +5 -15 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gbase64.go +13 -19 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gbitlock.go +23 -24 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gbookmarkfile.go +69 -61 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gcache.go +10 -15 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gcharset.go +13 -19 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gchecksum.go +23 -25 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gcompletion.go +14 -17 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gconvert.go +25 -28 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gdataset.go +36 -28 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gdate.go +103 -65 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gdatetime.go +107 -66 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gdir.go +12 -19 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/genviron.go +17 -21 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gerror.go +30 -29 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gfileutils.go +45 -38 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/ggettext.go +13 -19 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/ghash.go +81 -53 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/ghmac.go +21 -24 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/ghook.go +28 -26 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/ghostutils.go +11 -18 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/giochannel.go +83 -67 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gkeyfile.go +72 -62 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/glib-types.go +4 -12 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/glist.go +2 -11 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gmain.go +181 -117 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gmappedfile.go +15 -21 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gmarkup.go +51 -43 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gmem.go +44 -31 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gmessages.go +70 -45 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gnode.go +50 -35 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/goption.go +57 -43 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gpathbuf.go +26 -24 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gpattern.go +19 -23 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gpoll.go +3 -13 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gprimes.go +3 -14 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gprintf.go +15 -20 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gqsort.go +5 -15 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gquark.go +13 -19 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gqueue.go +84 -52 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/grand.go +33 -30 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/grcbox.go +29 -27 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/grefcount.go +17 -21 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/grefstring.go +15 -20 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gregex.go +72 -57 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/grel.go +20 -21 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gscanner.go +40 -30 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gsequence.go +74 -49 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gshell.go +5 -16 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gslice.go +17 -21 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gslist.go +2 -11 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gspawn.go +12 -23 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gstdio.go +33 -27 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gstrfuncs.go +115 -71 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gstring.go +77 -51 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gstringchunk.go +10 -15 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gstrvbuilder.go +19 -22 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gtestutils.go +132 -80 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gthread.go +146 -97 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gthreadpool.go +26 -25 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gtimer.go +18 -20 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gtimezone.go +27 -26 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gtrashstack.go +8 -14 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gtree.go +63 -45 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gtypes.go +4 -12 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gunicode.go +132 -85 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/guri.go +63 -50 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gutils.go +62 -41
| @@ -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 | ) | |
| 11 | 10 | ||
| @@ -128,6 +127,8 @@ var xAtexit func(uintptr) | |||
| 128 | 127 | // calling g_atexit() (or atexit()) except in the main executable of a | |
| 129 | 128 | // program. | |
| 130 | 129 | func Atexit(FuncVar *VoidFunc) { | |
| 130 | + | core.LazyRegister(&xAtexit, "GLIB", "g_atexit", false) | |
| 131 | + | ||
| 131 | 132 | xAtexit(NewCallback(FuncVar)) | |
| 132 | 133 | } | |
| 133 | 134 | ||
| @@ -138,6 +139,8 @@ var xBitNthLsf func(uint, int) int | |||
| 138 | 139 | // from 0 (least significant) to sizeof(#gulong) * 8 - 1 (31 or 63, | |
| 139 | 140 | // usually). To start searching from the 0th bit, set @nth_bit to -1. | |
| 140 | 141 | func BitNthLsf(MaskVar uint, NthBitVar int) int { | |
| 142 | + | core.LazyRegister(&xBitNthLsf, "GLIB", "g_bit_nth_lsf", false) | |
| 143 | + | ||
| 141 | 144 | cret := xBitNthLsf(MaskVar, NthBitVar) | |
| 142 | 145 | return cret | |
| 143 | 146 | } | |
| @@ -150,6 +153,8 @@ var xBitNthMsf func(uint, int) int | |||
| 150 | 153 | // usually). To start searching from the last bit, set @nth_bit to | |
| 151 | 154 | // -1 or GLIB_SIZEOF_LONG * 8. | |
| 152 | 155 | func BitNthMsf(MaskVar uint, NthBitVar int) int { | |
| 156 | + | core.LazyRegister(&xBitNthMsf, "GLIB", "g_bit_nth_msf", false) | |
| 157 | + | ||
| 153 | 158 | cret := xBitNthMsf(MaskVar, NthBitVar) | |
| 154 | 159 | return cret | |
| 155 | 160 | } | |
| @@ -159,6 +164,8 @@ var xBitStorage func(uint) uint | |||
| 159 | 164 | // Gets the number of bits used to hold @number, | |
| 160 | 165 | // e.g. if @number is 4, 3 bits are needed. | |
| 161 | 166 | func BitStorage(NumberVar uint) uint { | |
| 167 | + | core.LazyRegister(&xBitStorage, "GLIB", "g_bit_storage", false) | |
| 168 | + | ||
| 162 | 169 | cret := xBitStorage(NumberVar) | |
| 163 | 170 | return cret | |
| 164 | 171 | } | |
| @@ -183,6 +190,8 @@ var xFindProgramInPath func(string) string | |||
| 183 | 190 | // the program is found, the return value contains the full name | |
| 184 | 191 | // including the type suffix. | |
| 185 | 192 | func FindProgramInPath(ProgramVar string) string { | |
| 193 | + | core.LazyRegister(&xFindProgramInPath, "GLIB", "g_find_program_in_path", false) | |
| 194 | + | ||
| 186 | 195 | cret := xFindProgramInPath(ProgramVar) | |
| 187 | 196 | return cret | |
| 188 | 197 | } | |
| @@ -203,6 +212,8 @@ var xFormatSize func(uint64) string | |||
| 203 | 212 | // See g_format_size_full() for more options about how the size might be | |
| 204 | 213 | // formatted. | |
| 205 | 214 | func FormatSize(SizeVar uint64) string { | |
| 215 | + | core.LazyRegister(&xFormatSize, "GLIB", "g_format_size", false) | |
| 216 | + | ||
| 206 | 217 | cret := xFormatSize(SizeVar) | |
| 207 | 218 | return cret | |
| 208 | 219 | } | |
| @@ -219,6 +230,8 @@ var xFormatSizeForDisplay func(int64) string | |||
| 219 | 230 | // | |
| 220 | 231 | // This string should be freed with g_free() when not needed any longer. | |
| 221 | 232 | func FormatSizeForDisplay(SizeVar int64) string { | |
| 233 | + | core.LazyRegister(&xFormatSizeForDisplay, "GLIB", "g_format_size_for_display", false) | |
| 234 | + | ||
| 222 | 235 | cret := xFormatSizeForDisplay(SizeVar) | |
| 223 | 236 | return cret | |
| 224 | 237 | } | |
| @@ -230,6 +243,8 @@ var xFormatSizeFull func(uint64, FormatSizeFlags) string | |||
| 230 | 243 | // This function is similar to g_format_size() but allows for flags | |
| 231 | 244 | // that modify the output. See #GFormatSizeFlags. | |
| 232 | 245 | func FormatSizeFull(SizeVar uint64, FlagsVar FormatSizeFlags) string { | |
| 246 | + | core.LazyRegister(&xFormatSizeFull, "GLIB", "g_format_size_full", false) | |
| 247 | + | ||
| 233 | 248 | cret := xFormatSizeFull(SizeVar, FlagsVar) | |
| 234 | 249 | return cret | |
| 235 | 250 | } | |
| @@ -244,6 +259,8 @@ var xGetApplicationName func() string | |||
| 244 | 259 | // g_get_prgname() (which may be %NULL if g_set_prgname() has also not | |
| 245 | 260 | // been called). | |
| 246 | 261 | func GetApplicationName() string { | |
| 262 | + | core.LazyRegister(&xGetApplicationName, "GLIB", "g_get_application_name", false) | |
| 263 | + | ||
| 247 | 264 | cret := xGetApplicationName() | |
| 248 | 265 | return cret | |
| 249 | 266 | } | |
| @@ -271,6 +288,8 @@ var xGetHomeDir func() string | |||
| 271 | 288 | // should either directly check the `HOME` environment variable yourself | |
| 272 | 289 | // or unset it before calling any functions in GLib. | |
| 273 | 290 | func GetHomeDir() string { | |
| 291 | + | core.LazyRegister(&xGetHomeDir, "GLIB", "g_get_home_dir", false) | |
| 292 | + | ||
| 274 | 293 | cret := xGetHomeDir() | |
| 275 | 294 | return cret | |
| 276 | 295 | } | |
| @@ -292,6 +311,8 @@ var xGetHostName func() string | |||
| 292 | 311 | // | |
| 293 | 312 | // The encoding of the returned string is UTF-8. | |
| 294 | 313 | func GetHostName() string { | |
| 314 | + | core.LazyRegister(&xGetHostName, "GLIB", "g_get_host_name", false) | |
| 315 | + | ||
| 295 | 316 | cret := xGetHostName() | |
| 296 | 317 | return cret | |
| 297 | 318 | } | |
| @@ -307,6 +328,8 @@ var xGetOsInfo func(string) string | |||
| 307 | 328 | // be useful. No key is guaranteed to be provided, so the caller should always | |
| 308 | 329 | // check if the result is %NULL. | |
| 309 | 330 | func GetOsInfo(KeyNameVar string) string { | |
| 331 | + | core.LazyRegister(&xGetOsInfo, "GLIB", "g_get_os_info", false) | |
| 332 | + | ||
| 310 | 333 | cret := xGetOsInfo(KeyNameVar) | |
| 311 | 334 | return cret | |
| 312 | 335 | } | |
| @@ -322,6 +345,8 @@ var xGetPrgname func() string | |||
| 322 | 345 | // #GtkApplication::startup handler. The program name is found by | |
| 323 | 346 | // taking the last component of @argv[0]. | |
| 324 | 347 | func GetPrgname() string { | |
| 348 | + | core.LazyRegister(&xGetPrgname, "GLIB", "g_get_prgname", false) | |
| 349 | + | ||
| 325 | 350 | cret := xGetPrgname() | |
| 326 | 351 | return cret | |
| 327 | 352 | } | |
| @@ -334,6 +359,8 @@ var xGetRealName func() string | |||
| 334 | 359 | // real user name cannot be determined, the string "Unknown" is | |
| 335 | 360 | // returned. | |
| 336 | 361 | func GetRealName() string { | |
| 362 | + | core.LazyRegister(&xGetRealName, "GLIB", "g_get_real_name", false) | |
| 363 | + | ||
| 337 | 364 | cret := xGetRealName() | |
| 338 | 365 | return cret | |
| 339 | 366 | } | |
| @@ -361,6 +388,8 @@ var xGetSystemConfigDirs func() []string | |||
| 361 | 388 | // The return value is cached and modifying it at runtime is not supported, as | |
| 362 | 389 | // it’s not thread-safe to modify environment variables at runtime. | |
| 363 | 390 | func GetSystemConfigDirs() []string { | |
| 391 | + | core.LazyRegister(&xGetSystemConfigDirs, "GLIB", "g_get_system_config_dirs", false) | |
| 392 | + | ||
| 364 | 393 | cret := xGetSystemConfigDirs() | |
| 365 | 394 | return cret | |
| 366 | 395 | } | |
| @@ -402,6 +431,8 @@ var xGetSystemDataDirs func() []string | |||
| 402 | 431 | // The return value is cached and modifying it at runtime is not supported, as | |
| 403 | 432 | // it’s not thread-safe to modify environment variables at runtime. | |
| 404 | 433 | func GetSystemDataDirs() []string { | |
| 434 | + | core.LazyRegister(&xGetSystemDataDirs, "GLIB", "g_get_system_data_dirs", false) | |
| 435 | + | ||
| 405 | 436 | cret := xGetSystemDataDirs() | |
| 406 | 437 | return cret | |
| 407 | 438 | } | |
| @@ -423,6 +454,8 @@ var xGetTmpDir func() string | |||
| 423 | 454 | // it is always UTF-8. The return value is never %NULL or the empty | |
| 424 | 455 | // string. | |
| 425 | 456 | func GetTmpDir() string { | |
| 457 | + | core.LazyRegister(&xGetTmpDir, "GLIB", "g_get_tmp_dir", false) | |
| 458 | + | ||
| 426 | 459 | cret := xGetTmpDir() | |
| 427 | 460 | return cret | |
| 428 | 461 | } | |
| @@ -446,6 +479,8 @@ var xGetUserCacheDir func() string | |||
| 446 | 479 | // The return value is cached and modifying it at runtime is not supported, as | |
| 447 | 480 | // it’s not thread-safe to modify environment variables at runtime. | |
| 448 | 481 | func GetUserCacheDir() string { | |
| 482 | + | core.LazyRegister(&xGetUserCacheDir, "GLIB", "g_get_user_cache_dir", false) | |
| 483 | + | ||
| 449 | 484 | cret := xGetUserCacheDir() | |
| 450 | 485 | return cret | |
| 451 | 486 | } | |
| @@ -470,6 +505,8 @@ var xGetUserConfigDir func() string | |||
| 470 | 505 | // The return value is cached and modifying it at runtime is not supported, as | |
| 471 | 506 | // it’s not thread-safe to modify environment variables at runtime. | |
| 472 | 507 | func GetUserConfigDir() string { | |
| 508 | + | core.LazyRegister(&xGetUserConfigDir, "GLIB", "g_get_user_config_dir", false) | |
| 509 | + | ||
| 473 | 510 | cret := xGetUserConfigDir() | |
| 474 | 511 | return cret | |
| 475 | 512 | } | |
| @@ -494,6 +531,8 @@ var xGetUserDataDir func() string | |||
| 494 | 531 | // The return value is cached and modifying it at runtime is not supported, as | |
| 495 | 532 | // it’s not thread-safe to modify environment variables at runtime. | |
| 496 | 533 | func GetUserDataDir() string { | |
| 534 | + | core.LazyRegister(&xGetUserDataDir, "GLIB", "g_get_user_data_dir", false) | |
| 535 | + | ||
| 497 | 536 | cret := xGetUserDataDir() | |
| 498 | 537 | return cret | |
| 499 | 538 | } | |
| @@ -505,6 +544,8 @@ var xGetUserName func() string | |||
| 505 | 544 | // encoding, or something else, and there is no guarantee that it is even | |
| 506 | 545 | // consistent on a machine. On Windows, it is always UTF-8. | |
| 507 | 546 | func GetUserName() string { | |
| 547 | + | core.LazyRegister(&xGetUserName, "GLIB", "g_get_user_name", false) | |
| 548 | + | ||
| 508 | 549 | cret := xGetUserName() | |
| 509 | 550 | return cret | |
| 510 | 551 | } | |
| @@ -525,6 +566,8 @@ var xGetUserRuntimeDir func() string | |||
| 525 | 566 | // The return value is cached and modifying it at runtime is not supported, as | |
| 526 | 567 | // it’s not thread-safe to modify environment variables at runtime. | |
| 527 | 568 | func GetUserRuntimeDir() string { | |
| 569 | + | core.LazyRegister(&xGetUserRuntimeDir, "GLIB", "g_get_user_runtime_dir", false) | |
| 570 | + | ||
| 528 | 571 | cret := xGetUserRuntimeDir() | |
| 529 | 572 | return cret | |
| 530 | 573 | } | |
| @@ -542,6 +585,8 @@ var xGetUserSpecialDir func(UserDirectory) string | |||
| 542 | 585 | // of the special directory without requiring the session to restart; GLib | |
| 543 | 586 | // will not reflect any change once the special directories are loaded. | |
| 544 | 587 | func GetUserSpecialDir(DirectoryVar UserDirectory) string { | |
| 588 | + | core.LazyRegister(&xGetUserSpecialDir, "GLIB", "g_get_user_special_dir", false) | |
| 589 | + | ||
| 545 | 590 | cret := xGetUserSpecialDir(DirectoryVar) | |
| 546 | 591 | return cret | |
| 547 | 592 | } | |
| @@ -566,6 +611,8 @@ var xGetUserStateDir func() string | |||
| 566 | 611 | // The return value is cached and modifying it at runtime is not supported, as | |
| 567 | 612 | // it’s not thread-safe to modify environment variables at runtime. | |
| 568 | 613 | func GetUserStateDir() string { | |
| 614 | + | core.LazyRegister(&xGetUserStateDir, "GLIB", "g_get_user_state_dir", false) | |
| 615 | + | ||
| 569 | 616 | cret := xGetUserStateDir() | |
| 570 | 617 | return cret | |
| 571 | 618 | } | |
| @@ -574,6 +621,8 @@ var xNullifyPointer func(uintptr) | |||
| 574 | 621 | ||
| 575 | 622 | // Set the pointer at the specified location to %NULL. | |
| 576 | 623 | func NullifyPointer(NullifyLocationVar uintptr) { | |
| 624 | + | core.LazyRegister(&xNullifyPointer, "GLIB", "g_nullify_pointer", false) | |
| 625 | + | ||
| 577 | 626 | xNullifyPointer(NullifyLocationVar) | |
| 578 | 627 | } | |
| 579 | 628 | ||
| @@ -592,6 +641,8 @@ var xParseDebugString func(uintptr, []DebugKey, uint) uint | |||
| 592 | 641 | // If @string is equal to "help", all the available keys in @keys | |
| 593 | 642 | // are printed out to standard error. | |
| 594 | 643 | func ParseDebugString(StringVar *string, KeysVar []DebugKey, NkeysVar uint) uint { | |
| 644 | + | core.LazyRegister(&xParseDebugString, "GLIB", "g_parse_debug_string", false) | |
| 645 | + | ||
| 595 | 646 | StringVarPtr := core.GStrdupNullable(StringVar) | |
| 596 | 647 | defer core.GFreeNullable(StringVarPtr) | |
| 597 | 648 | ||
| @@ -610,6 +661,8 @@ var xReloadUserSpecialDirsCache func() | |||
| 610 | 661 | // that can't be freed. We ensure to only leak the data for | |
| 611 | 662 | // the directories that actually changed value though. | |
| 612 | 663 | func ReloadUserSpecialDirsCache() { | |
| 664 | + | core.LazyRegister(&xReloadUserSpecialDirsCache, "GLIB", "g_reload_user_special_dirs_cache", false) | |
| 665 | + | ||
| 613 | 666 | xReloadUserSpecialDirsCache() | |
| 614 | 667 | } | |
| 615 | 668 | ||
| @@ -627,6 +680,8 @@ var xSetApplicationName func(string) | |||
| 627 | 680 | // The application name will be used in contexts such as error messages, | |
| 628 | 681 | // or when displaying an application's name in the task list. | |
| 629 | 682 | func SetApplicationName(ApplicationNameVar string) { | |
| 683 | + | core.LazyRegister(&xSetApplicationName, "GLIB", "g_set_application_name", false) | |
| 684 | + | ||
| 630 | 685 | xSetApplicationName(ApplicationNameVar) | |
| 631 | 686 | } | |
| 632 | 687 | ||
| @@ -648,6 +703,8 @@ var xSetPrgname func(string) | |||
| 648 | 703 | // See the [GTK documentation](https://docs.gtk.org/gtk4/migrating-3to4.html#set-a-proper-application-id) | |
| 649 | 704 | // for requirements on integrating g_set_prgname() with GTK applications. | |
| 650 | 705 | func SetPrgname(PrgnameVar string) { | |
| 706 | + | core.LazyRegister(&xSetPrgname, "GLIB", "g_set_prgname", false) | |
| 707 | + | ||
| 651 | 708 | xSetPrgname(PrgnameVar) | |
| 652 | 709 | } | |
| 653 | 710 | ||
| @@ -671,6 +728,8 @@ var xSnprintf func(string, uint, string, ...interface{}) int | |||
| 671 | 728 | // The format string may contain positional parameters, as specified in | |
| 672 | 729 | // the Single Unix Specification. | |
| 673 | 730 | func Snprintf(StringVar string, NVar uint, FormatVar string, varArgs ...interface{}) int { | |
| 731 | + | core.LazyRegister(&xSnprintf, "GLIB", "g_snprintf", false) | |
| 732 | + | ||
| 674 | 733 | cret := xSnprintf(StringVar, NVar, FormatVar, varArgs...) | |
| 675 | 734 | return cret | |
| 676 | 735 | } | |
| @@ -695,6 +754,8 @@ var xVsnprintf func(string, uint, string, []interface{}) int | |||
| 695 | 754 | // The format string may contain positional parameters, as specified in | |
| 696 | 755 | // the Single Unix Specification. | |
| 697 | 756 | func Vsnprintf(StringVar string, NVar uint, FormatVar string, ArgsVar []interface{}) int { | |
| 757 | + | core.LazyRegister(&xVsnprintf, "GLIB", "g_vsnprintf", false) | |
| 758 | + | ||
| 698 | 759 | cret := xVsnprintf(StringVar, NVar, FormatVar, ArgsVar) | |
| 699 | 760 | return cret | |
| 700 | 761 | } | |
| @@ -702,44 +763,4 @@ func Vsnprintf(StringVar string, NVar uint, FormatVar string, ArgsVar []interfac | |||
| 702 | 763 | func init() { | |
| 703 | 764 | core.SetPackageName("GLIB", "glib-2.0") | |
| 704 | 765 | core.SetSharedLibraries("GLIB", []string{"libgobject-2.0.so.0", "libglib-2.0.so.0", "libgobject-2.0.0.dylib", "libglib-2.0.0.dylib"}) | |
| 705 | - | var libs []uintptr | |
| 706 | - | for _, libPath := range core.GetPaths("GLIB") { | |
| 707 | - | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 708 | - | if err != nil { | |
| 709 | - | panic(err) | |
| 710 | - | } | |
| 711 | - | libs = append(libs, lib) | |
| 712 | - | } | |
| 713 | - | ||
| 714 | - | core.PuregoSafeRegister(&xAtexit, libs, "g_atexit") | |
| 715 | - | core.PuregoSafeRegister(&xBitNthLsf, libs, "g_bit_nth_lsf") | |
| 716 | - | core.PuregoSafeRegister(&xBitNthMsf, libs, "g_bit_nth_msf") | |
| 717 | - | core.PuregoSafeRegister(&xBitStorage, libs, "g_bit_storage") | |
| 718 | - | core.PuregoSafeRegister(&xFindProgramInPath, libs, "g_find_program_in_path") | |
| 719 | - | core.PuregoSafeRegister(&xFormatSize, libs, "g_format_size") | |
| 720 | - | core.PuregoSafeRegister(&xFormatSizeForDisplay, libs, "g_format_size_for_display") | |
| 721 | - | core.PuregoSafeRegister(&xFormatSizeFull, libs, "g_format_size_full") | |
| 722 | - | core.PuregoSafeRegister(&xGetApplicationName, libs, "g_get_application_name") | |
| 723 | - | core.PuregoSafeRegister(&xGetHomeDir, libs, "g_get_home_dir") | |
| 724 | - | core.PuregoSafeRegister(&xGetHostName, libs, "g_get_host_name") | |
| 725 | - | core.PuregoSafeRegister(&xGetOsInfo, libs, "g_get_os_info") | |
| 726 | - | core.PuregoSafeRegister(&xGetPrgname, libs, "g_get_prgname") | |
| 727 | - | core.PuregoSafeRegister(&xGetRealName, libs, "g_get_real_name") | |
| 728 | - | core.PuregoSafeRegister(&xGetSystemConfigDirs, libs, "g_get_system_config_dirs") | |
| 729 | - | core.PuregoSafeRegister(&xGetSystemDataDirs, libs, "g_get_system_data_dirs") | |
| 730 | - | core.PuregoSafeRegister(&xGetTmpDir, libs, "g_get_tmp_dir") | |
| 731 | - | core.PuregoSafeRegister(&xGetUserCacheDir, libs, "g_get_user_cache_dir") | |
| 732 | - | core.PuregoSafeRegister(&xGetUserConfigDir, libs, "g_get_user_config_dir") | |
| 733 | - | core.PuregoSafeRegister(&xGetUserDataDir, libs, "g_get_user_data_dir") | |
| 734 | - | core.PuregoSafeRegister(&xGetUserName, libs, "g_get_user_name") | |
| 735 | - | core.PuregoSafeRegister(&xGetUserRuntimeDir, libs, "g_get_user_runtime_dir") | |
| 736 | - | core.PuregoSafeRegister(&xGetUserSpecialDir, libs, "g_get_user_special_dir") | |
| 737 | - | core.PuregoSafeRegister(&xGetUserStateDir, libs, "g_get_user_state_dir") | |
| 738 | - | core.PuregoSafeRegister(&xNullifyPointer, libs, "g_nullify_pointer") | |
| 739 | - | core.PuregoSafeRegister(&xParseDebugString, libs, "g_parse_debug_string") | |
| 740 | - | core.PuregoSafeRegister(&xReloadUserSpecialDirsCache, libs, "g_reload_user_special_dirs_cache") | |
| 741 | - | core.PuregoSafeRegister(&xSetApplicationName, libs, "g_set_application_name") | |
| 742 | - | core.PuregoSafeRegister(&xSetPrgname, libs, "g_set_prgname") | |
| 743 | - | core.PuregoSafeRegister(&xSnprintf, libs, "g_snprintf") | |
| 744 | - | core.PuregoSafeRegister(&xVsnprintf, libs, "g_vsnprintf") | |
| 745 | 766 | } | |
| @@ -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 | ) | 9 | ) | ||
| 11 | 10 | ||||
| @@ -128,6 +127,8 @@ var xAtexit func(uintptr) | |||||
| 128 | // calling g_atexit() (or atexit()) except in the main executable of a | 127 | // calling g_atexit() (or atexit()) except in the main executable of a | ||
| 129 | // program. | 128 | // program. | ||
| 130 | func Atexit(FuncVar *VoidFunc) { | 129 | func Atexit(FuncVar *VoidFunc) { | ||
| 130 | + | core.LazyRegister(&xAtexit, "GLIB", "g_atexit", false) | |||
| 131 | + | ||||
| 131 | xAtexit(NewCallback(FuncVar)) | 132 | xAtexit(NewCallback(FuncVar)) | ||
| 132 | } | 133 | } | ||
| 133 | 134 | ||||
| @@ -138,6 +139,8 @@ var xBitNthLsf func(uint, int) int | |||||
| 138 | // from 0 (least significant) to sizeof(#gulong) * 8 - 1 (31 or 63, | 139 | // from 0 (least significant) to sizeof(#gulong) * 8 - 1 (31 or 63, | ||
| 139 | // usually). To start searching from the 0th bit, set @nth_bit to -1. | 140 | // usually). To start searching from the 0th bit, set @nth_bit to -1. | ||
| 140 | func BitNthLsf(MaskVar uint, NthBitVar int) int { | 141 | func BitNthLsf(MaskVar uint, NthBitVar int) int { | ||
| 142 | + | core.LazyRegister(&xBitNthLsf, "GLIB", "g_bit_nth_lsf", false) | |||
| 143 | + | ||||
| 141 | cret := xBitNthLsf(MaskVar, NthBitVar) | 144 | cret := xBitNthLsf(MaskVar, NthBitVar) | ||
| 142 | return cret | 145 | return cret | ||
| 143 | } | 146 | } | ||
| @@ -150,6 +153,8 @@ var xBitNthMsf func(uint, int) int | |||||
| 150 | // usually). To start searching from the last bit, set @nth_bit to | 153 | // usually). To start searching from the last bit, set @nth_bit to | ||
| 151 | // -1 or GLIB_SIZEOF_LONG * 8. | 154 | // -1 or GLIB_SIZEOF_LONG * 8. | ||
| 152 | func BitNthMsf(MaskVar uint, NthBitVar int) int { | 155 | func BitNthMsf(MaskVar uint, NthBitVar int) int { | ||
| 156 | + | core.LazyRegister(&xBitNthMsf, "GLIB", "g_bit_nth_msf", false) | |||
| 157 | + | ||||
| 153 | cret := xBitNthMsf(MaskVar, NthBitVar) | 158 | cret := xBitNthMsf(MaskVar, NthBitVar) | ||
| 154 | return cret | 159 | return cret | ||
| 155 | } | 160 | } | ||
| @@ -159,6 +164,8 @@ var xBitStorage func(uint) uint | |||||
| 159 | // Gets the number of bits used to hold @number, | 164 | // Gets the number of bits used to hold @number, | ||
| 160 | // e.g. if @number is 4, 3 bits are needed. | 165 | // e.g. if @number is 4, 3 bits are needed. | ||
| 161 | func BitStorage(NumberVar uint) uint { | 166 | func BitStorage(NumberVar uint) uint { | ||
| 167 | + | core.LazyRegister(&xBitStorage, "GLIB", "g_bit_storage", false) | |||
| 168 | + | ||||
| 162 | cret := xBitStorage(NumberVar) | 169 | cret := xBitStorage(NumberVar) | ||
| 163 | return cret | 170 | return cret | ||
| 164 | } | 171 | } | ||
| @@ -183,6 +190,8 @@ var xFindProgramInPath func(string) string | |||||
| 183 | // the program is found, the return value contains the full name | 190 | // the program is found, the return value contains the full name | ||
| 184 | // including the type suffix. | 191 | // including the type suffix. | ||
| 185 | func FindProgramInPath(ProgramVar string) string { | 192 | func FindProgramInPath(ProgramVar string) string { | ||
| 193 | + | core.LazyRegister(&xFindProgramInPath, "GLIB", "g_find_program_in_path", false) | |||
| 194 | + | ||||
| 186 | cret := xFindProgramInPath(ProgramVar) | 195 | cret := xFindProgramInPath(ProgramVar) | ||
| 187 | return cret | 196 | return cret | ||
| 188 | } | 197 | } | ||
| @@ -203,6 +212,8 @@ var xFormatSize func(uint64) string | |||||
| 203 | // See g_format_size_full() for more options about how the size might be | 212 | // See g_format_size_full() for more options about how the size might be | ||
| 204 | // formatted. | 213 | // formatted. | ||
| 205 | func FormatSize(SizeVar uint64) string { | 214 | func FormatSize(SizeVar uint64) string { | ||
| 215 | + | core.LazyRegister(&xFormatSize, "GLIB", "g_format_size", false) | |||
| 216 | + | ||||
| 206 | cret := xFormatSize(SizeVar) | 217 | cret := xFormatSize(SizeVar) | ||
| 207 | return cret | 218 | return cret | ||
| 208 | } | 219 | } | ||
| @@ -219,6 +230,8 @@ var xFormatSizeForDisplay func(int64) string | |||||
| 219 | // | 230 | // | ||
| 220 | // This string should be freed with g_free() when not needed any longer. | 231 | // This string should be freed with g_free() when not needed any longer. | ||
| 221 | func FormatSizeForDisplay(SizeVar int64) string { | 232 | func FormatSizeForDisplay(SizeVar int64) string { | ||
| 233 | + | core.LazyRegister(&xFormatSizeForDisplay, "GLIB", "g_format_size_for_display", false) | |||
| 234 | + | ||||
| 222 | cret := xFormatSizeForDisplay(SizeVar) | 235 | cret := xFormatSizeForDisplay(SizeVar) | ||
| 223 | return cret | 236 | return cret | ||
| 224 | } | 237 | } | ||
| @@ -230,6 +243,8 @@ var xFormatSizeFull func(uint64, FormatSizeFlags) string | |||||
| 230 | // This function is similar to g_format_size() but allows for flags | 243 | // This function is similar to g_format_size() but allows for flags | ||
| 231 | // that modify the output. See #GFormatSizeFlags. | 244 | // that modify the output. See #GFormatSizeFlags. | ||
| 232 | func FormatSizeFull(SizeVar uint64, FlagsVar FormatSizeFlags) string { | 245 | func FormatSizeFull(SizeVar uint64, FlagsVar FormatSizeFlags) string { | ||
| 246 | + | core.LazyRegister(&xFormatSizeFull, "GLIB", "g_format_size_full", false) | |||
| 247 | + | ||||
| 233 | cret := xFormatSizeFull(SizeVar, FlagsVar) | 248 | cret := xFormatSizeFull(SizeVar, FlagsVar) | ||
| 234 | return cret | 249 | return cret | ||
| 235 | } | 250 | } | ||
| @@ -244,6 +259,8 @@ var xGetApplicationName func() string | |||||
| 244 | // g_get_prgname() (which may be %NULL if g_set_prgname() has also not | 259 | // g_get_prgname() (which may be %NULL if g_set_prgname() has also not | ||
| 245 | // been called). | 260 | // been called). | ||
| 246 | func GetApplicationName() string { | 261 | func GetApplicationName() string { | ||
| 262 | + | core.LazyRegister(&xGetApplicationName, "GLIB", "g_get_application_name", false) | |||
| 263 | + | ||||
| 247 | cret := xGetApplicationName() | 264 | cret := xGetApplicationName() | ||
| 248 | return cret | 265 | return cret | ||
| 249 | } | 266 | } | ||
| @@ -271,6 +288,8 @@ var xGetHomeDir func() string | |||||
| 271 | // should either directly check the `HOME` environment variable yourself | 288 | // should either directly check the `HOME` environment variable yourself | ||
| 272 | // or unset it before calling any functions in GLib. | 289 | // or unset it before calling any functions in GLib. | ||
| 273 | func GetHomeDir() string { | 290 | func GetHomeDir() string { | ||
| 291 | + | core.LazyRegister(&xGetHomeDir, "GLIB", "g_get_home_dir", false) | |||
| 292 | + | ||||
| 274 | cret := xGetHomeDir() | 293 | cret := xGetHomeDir() | ||
| 275 | return cret | 294 | return cret | ||
| 276 | } | 295 | } | ||
| @@ -292,6 +311,8 @@ var xGetHostName func() string | |||||
| 292 | // | 311 | // | ||
| 293 | // The encoding of the returned string is UTF-8. | 312 | // The encoding of the returned string is UTF-8. | ||
| 294 | func GetHostName() string { | 313 | func GetHostName() string { | ||
| 314 | + | core.LazyRegister(&xGetHostName, "GLIB", "g_get_host_name", false) | |||
| 315 | + | ||||
| 295 | cret := xGetHostName() | 316 | cret := xGetHostName() | ||
| 296 | return cret | 317 | return cret | ||
| 297 | } | 318 | } | ||
| @@ -307,6 +328,8 @@ var xGetOsInfo func(string) string | |||||
| 307 | // be useful. No key is guaranteed to be provided, so the caller should always | 328 | // be useful. No key is guaranteed to be provided, so the caller should always | ||
| 308 | // check if the result is %NULL. | 329 | // check if the result is %NULL. | ||
| 309 | func GetOsInfo(KeyNameVar string) string { | 330 | func GetOsInfo(KeyNameVar string) string { | ||
| 331 | + | core.LazyRegister(&xGetOsInfo, "GLIB", "g_get_os_info", false) | |||
| 332 | + | ||||
| 310 | cret := xGetOsInfo(KeyNameVar) | 333 | cret := xGetOsInfo(KeyNameVar) | ||
| 311 | return cret | 334 | return cret | ||
| 312 | } | 335 | } | ||
| @@ -322,6 +345,8 @@ var xGetPrgname func() string | |||||
| 322 | // #GtkApplication::startup handler. The program name is found by | 345 | // #GtkApplication::startup handler. The program name is found by | ||
| 323 | // taking the last component of @argv[0]. | 346 | // taking the last component of @argv[0]. | ||
| 324 | func GetPrgname() string { | 347 | func GetPrgname() string { | ||
| 348 | + | core.LazyRegister(&xGetPrgname, "GLIB", "g_get_prgname", false) | |||
| 349 | + | ||||
| 325 | cret := xGetPrgname() | 350 | cret := xGetPrgname() | ||
| 326 | return cret | 351 | return cret | ||
| 327 | } | 352 | } | ||
| @@ -334,6 +359,8 @@ var xGetRealName func() string | |||||
| 334 | // real user name cannot be determined, the string "Unknown" is | 359 | // real user name cannot be determined, the string "Unknown" is | ||
| 335 | // returned. | 360 | // returned. | ||
| 336 | func GetRealName() string { | 361 | func GetRealName() string { | ||
| 362 | + | core.LazyRegister(&xGetRealName, "GLIB", "g_get_real_name", false) | |||
| 363 | + | ||||
| 337 | cret := xGetRealName() | 364 | cret := xGetRealName() | ||
| 338 | return cret | 365 | return cret | ||
| 339 | } | 366 | } | ||
| @@ -361,6 +388,8 @@ var xGetSystemConfigDirs func() []string | |||||
| 361 | // The return value is cached and modifying it at runtime is not supported, as | 388 | // The return value is cached and modifying it at runtime is not supported, as | ||
| 362 | // it’s not thread-safe to modify environment variables at runtime. | 389 | // it’s not thread-safe to modify environment variables at runtime. | ||
| 363 | func GetSystemConfigDirs() []string { | 390 | func GetSystemConfigDirs() []string { | ||
| 391 | + | core.LazyRegister(&xGetSystemConfigDirs, "GLIB", "g_get_system_config_dirs", false) | |||
| 392 | + | ||||
| 364 | cret := xGetSystemConfigDirs() | 393 | cret := xGetSystemConfigDirs() | ||
| 365 | return cret | 394 | return cret | ||
| 366 | } | 395 | } | ||
| @@ -402,6 +431,8 @@ var xGetSystemDataDirs func() []string | |||||
| 402 | // The return value is cached and modifying it at runtime is not supported, as | 431 | // The return value is cached and modifying it at runtime is not supported, as | ||
| 403 | // it’s not thread-safe to modify environment variables at runtime. | 432 | // it’s not thread-safe to modify environment variables at runtime. | ||
| 404 | func GetSystemDataDirs() []string { | 433 | func GetSystemDataDirs() []string { | ||
| 434 | + | core.LazyRegister(&xGetSystemDataDirs, "GLIB", "g_get_system_data_dirs", false) | |||
| 435 | + | ||||
| 405 | cret := xGetSystemDataDirs() | 436 | cret := xGetSystemDataDirs() | ||
| 406 | return cret | 437 | return cret | ||
| 407 | } | 438 | } | ||
| @@ -423,6 +454,8 @@ var xGetTmpDir func() string | |||||
| 423 | // it is always UTF-8. The return value is never %NULL or the empty | 454 | // it is always UTF-8. The return value is never %NULL or the empty | ||
| 424 | // string. | 455 | // string. | ||
| 425 | func GetTmpDir() string { | 456 | func GetTmpDir() string { | ||
| 457 | + | core.LazyRegister(&xGetTmpDir, "GLIB", "g_get_tmp_dir", false) | |||
| 458 | + | ||||
| 426 | cret := xGetTmpDir() | 459 | cret := xGetTmpDir() | ||
| 427 | return cret | 460 | return cret | ||
| 428 | } | 461 | } | ||
| @@ -446,6 +479,8 @@ var xGetUserCacheDir func() string | |||||
| 446 | // The return value is cached and modifying it at runtime is not supported, as | 479 | // The return value is cached and modifying it at runtime is not supported, as | ||
| 447 | // it’s not thread-safe to modify environment variables at runtime. | 480 | // it’s not thread-safe to modify environment variables at runtime. | ||
| 448 | func GetUserCacheDir() string { | 481 | func GetUserCacheDir() string { | ||
| 482 | + | core.LazyRegister(&xGetUserCacheDir, "GLIB", "g_get_user_cache_dir", false) | |||
| 483 | + | ||||
| 449 | cret := xGetUserCacheDir() | 484 | cret := xGetUserCacheDir() | ||
| 450 | return cret | 485 | return cret | ||
| 451 | } | 486 | } | ||
| @@ -470,6 +505,8 @@ var xGetUserConfigDir func() string | |||||
| 470 | // The return value is cached and modifying it at runtime is not supported, as | 505 | // The return value is cached and modifying it at runtime is not supported, as | ||
| 471 | // it’s not thread-safe to modify environment variables at runtime. | 506 | // it’s not thread-safe to modify environment variables at runtime. | ||
| 472 | func GetUserConfigDir() string { | 507 | func GetUserConfigDir() string { | ||
| 508 | + | core.LazyRegister(&xGetUserConfigDir, "GLIB", "g_get_user_config_dir", false) | |||
| 509 | + | ||||
| 473 | cret := xGetUserConfigDir() | 510 | cret := xGetUserConfigDir() | ||
| 474 | return cret | 511 | return cret | ||
| 475 | } | 512 | } | ||
| @@ -494,6 +531,8 @@ var xGetUserDataDir func() string | |||||
| 494 | // The return value is cached and modifying it at runtime is not supported, as | 531 | // The return value is cached and modifying it at runtime is not supported, as | ||
| 495 | // it’s not thread-safe to modify environment variables at runtime. | 532 | // it’s not thread-safe to modify environment variables at runtime. | ||
| 496 | func GetUserDataDir() string { | 533 | func GetUserDataDir() string { | ||
| 534 | + | core.LazyRegister(&xGetUserDataDir, "GLIB", "g_get_user_data_dir", false) | |||
| 535 | + | ||||
| 497 | cret := xGetUserDataDir() | 536 | cret := xGetUserDataDir() | ||
| 498 | return cret | 537 | return cret | ||
| 499 | } | 538 | } | ||
| @@ -505,6 +544,8 @@ var xGetUserName func() string | |||||
| 505 | // encoding, or something else, and there is no guarantee that it is even | 544 | // encoding, or something else, and there is no guarantee that it is even | ||
| 506 | // consistent on a machine. On Windows, it is always UTF-8. | 545 | // consistent on a machine. On Windows, it is always UTF-8. | ||
| 507 | func GetUserName() string { | 546 | func GetUserName() string { | ||
| 547 | + | core.LazyRegister(&xGetUserName, "GLIB", "g_get_user_name", false) | |||
| 548 | + | ||||
| 508 | cret := xGetUserName() | 549 | cret := xGetUserName() | ||
| 509 | return cret | 550 | return cret | ||
| 510 | } | 551 | } | ||
| @@ -525,6 +566,8 @@ var xGetUserRuntimeDir func() string | |||||
| 525 | // The return value is cached and modifying it at runtime is not supported, as | 566 | // The return value is cached and modifying it at runtime is not supported, as | ||
| 526 | // it’s not thread-safe to modify environment variables at runtime. | 567 | // it’s not thread-safe to modify environment variables at runtime. | ||
| 527 | func GetUserRuntimeDir() string { | 568 | func GetUserRuntimeDir() string { | ||
| 569 | + | core.LazyRegister(&xGetUserRuntimeDir, "GLIB", "g_get_user_runtime_dir", false) | |||
| 570 | + | ||||
| 528 | cret := xGetUserRuntimeDir() | 571 | cret := xGetUserRuntimeDir() | ||
| 529 | return cret | 572 | return cret | ||
| 530 | } | 573 | } | ||
| @@ -542,6 +585,8 @@ var xGetUserSpecialDir func(UserDirectory) string | |||||
| 542 | // of the special directory without requiring the session to restart; GLib | 585 | // of the special directory without requiring the session to restart; GLib | ||
| 543 | // will not reflect any change once the special directories are loaded. | 586 | // will not reflect any change once the special directories are loaded. | ||
| 544 | func GetUserSpecialDir(DirectoryVar UserDirectory) string { | 587 | func GetUserSpecialDir(DirectoryVar UserDirectory) string { | ||
| 588 | + | core.LazyRegister(&xGetUserSpecialDir, "GLIB", "g_get_user_special_dir", false) | |||
| 589 | + | ||||
| 545 | cret := xGetUserSpecialDir(DirectoryVar) | 590 | cret := xGetUserSpecialDir(DirectoryVar) | ||
| 546 | return cret | 591 | return cret | ||
| 547 | } | 592 | } | ||
| @@ -566,6 +611,8 @@ var xGetUserStateDir func() string | |||||
| 566 | // The return value is cached and modifying it at runtime is not supported, as | 611 | // The return value is cached and modifying it at runtime is not supported, as | ||
| 567 | // it’s not thread-safe to modify environment variables at runtime. | 612 | // it’s not thread-safe to modify environment variables at runtime. | ||
| 568 | func GetUserStateDir() string { | 613 | func GetUserStateDir() string { | ||
| 614 | + | core.LazyRegister(&xGetUserStateDir, "GLIB", "g_get_user_state_dir", false) | |||
| 615 | + | ||||
| 569 | cret := xGetUserStateDir() | 616 | cret := xGetUserStateDir() | ||
| 570 | return cret | 617 | return cret | ||
| 571 | } | 618 | } | ||
| @@ -574,6 +621,8 @@ var xNullifyPointer func(uintptr) | |||||
| 574 | 621 | ||||
| 575 | // Set the pointer at the specified location to %NULL. | 622 | // Set the pointer at the specified location to %NULL. | ||
| 576 | func NullifyPointer(NullifyLocationVar uintptr) { | 623 | func NullifyPointer(NullifyLocationVar uintptr) { | ||
| 624 | + | core.LazyRegister(&xNullifyPointer, "GLIB", "g_nullify_pointer", false) | |||
| 625 | + | ||||
| 577 | xNullifyPointer(NullifyLocationVar) | 626 | xNullifyPointer(NullifyLocationVar) | ||
| 578 | } | 627 | } | ||
| 579 | 628 | ||||
| @@ -592,6 +641,8 @@ var xParseDebugString func(uintptr, []DebugKey, uint) uint | |||||
| 592 | // If @string is equal to "help", all the available keys in @keys | 641 | // If @string is equal to "help", all the available keys in @keys | ||
| 593 | // are printed out to standard error. | 642 | // are printed out to standard error. | ||
| 594 | func ParseDebugString(StringVar *string, KeysVar []DebugKey, NkeysVar uint) uint { | 643 | func ParseDebugString(StringVar *string, KeysVar []DebugKey, NkeysVar uint) uint { | ||
| 644 | + | core.LazyRegister(&xParseDebugString, "GLIB", "g_parse_debug_string", false) | |||
| 645 | + | ||||
| 595 | StringVarPtr := core.GStrdupNullable(StringVar) | 646 | StringVarPtr := core.GStrdupNullable(StringVar) | ||
| 596 | defer core.GFreeNullable(StringVarPtr) | 647 | defer core.GFreeNullable(StringVarPtr) | ||
| 597 | 648 | ||||
| @@ -610,6 +661,8 @@ var xReloadUserSpecialDirsCache func() | |||||
| 610 | // that can't be freed. We ensure to only leak the data for | 661 | // that can't be freed. We ensure to only leak the data for | ||
| 611 | // the directories that actually changed value though. | 662 | // the directories that actually changed value though. | ||
| 612 | func ReloadUserSpecialDirsCache() { | 663 | func ReloadUserSpecialDirsCache() { | ||
| 664 | + | core.LazyRegister(&xReloadUserSpecialDirsCache, "GLIB", "g_reload_user_special_dirs_cache", false) | |||
| 665 | + | ||||
| 613 | xReloadUserSpecialDirsCache() | 666 | xReloadUserSpecialDirsCache() | ||
| 614 | } | 667 | } | ||
| 615 | 668 | ||||
| @@ -627,6 +680,8 @@ var xSetApplicationName func(string) | |||||
| 627 | // The application name will be used in contexts such as error messages, | 680 | // The application name will be used in contexts such as error messages, | ||
| 628 | // or when displaying an application's name in the task list. | 681 | // or when displaying an application's name in the task list. | ||
| 629 | func SetApplicationName(ApplicationNameVar string) { | 682 | func SetApplicationName(ApplicationNameVar string) { | ||
| 683 | + | core.LazyRegister(&xSetApplicationName, "GLIB", "g_set_application_name", false) | |||
| 684 | + | ||||
| 630 | xSetApplicationName(ApplicationNameVar) | 685 | xSetApplicationName(ApplicationNameVar) | ||
| 631 | } | 686 | } | ||
| 632 | 687 | ||||
| @@ -648,6 +703,8 @@ var xSetPrgname func(string) | |||||
| 648 | // See the [GTK documentation](https://docs.gtk.org/gtk4/migrating-3to4.html#set-a-proper-application-id) | 703 | // See the [GTK documentation](https://docs.gtk.org/gtk4/migrating-3to4.html#set-a-proper-application-id) | ||
| 649 | // for requirements on integrating g_set_prgname() with GTK applications. | 704 | // for requirements on integrating g_set_prgname() with GTK applications. | ||
| 650 | func SetPrgname(PrgnameVar string) { | 705 | func SetPrgname(PrgnameVar string) { | ||
| 706 | + | core.LazyRegister(&xSetPrgname, "GLIB", "g_set_prgname", false) | |||
| 707 | + | ||||
| 651 | xSetPrgname(PrgnameVar) | 708 | xSetPrgname(PrgnameVar) | ||
| 652 | } | 709 | } | ||
| 653 | 710 | ||||
| @@ -671,6 +728,8 @@ var xSnprintf func(string, uint, string, ...interface{}) int | |||||
| 671 | // The format string may contain positional parameters, as specified in | 728 | // The format string may contain positional parameters, as specified in | ||
| 672 | // the Single Unix Specification. | 729 | // the Single Unix Specification. | ||
| 673 | func Snprintf(StringVar string, NVar uint, FormatVar string, varArgs ...interface{}) int { | 730 | func Snprintf(StringVar string, NVar uint, FormatVar string, varArgs ...interface{}) int { | ||
| 731 | + | core.LazyRegister(&xSnprintf, "GLIB", "g_snprintf", false) | |||
| 732 | + | ||||
| 674 | cret := xSnprintf(StringVar, NVar, FormatVar, varArgs...) | 733 | cret := xSnprintf(StringVar, NVar, FormatVar, varArgs...) | ||
| 675 | return cret | 734 | return cret | ||
| 676 | } | 735 | } | ||
| @@ -695,6 +754,8 @@ var xVsnprintf func(string, uint, string, []interface{}) int | |||||
| 695 | // The format string may contain positional parameters, as specified in | 754 | // The format string may contain positional parameters, as specified in | ||
| 696 | // the Single Unix Specification. | 755 | // the Single Unix Specification. | ||
| 697 | func Vsnprintf(StringVar string, NVar uint, FormatVar string, ArgsVar []interface{}) int { | 756 | func Vsnprintf(StringVar string, NVar uint, FormatVar string, ArgsVar []interface{}) int { | ||
| 757 | + | core.LazyRegister(&xVsnprintf, "GLIB", "g_vsnprintf", false) | |||
| 758 | + | ||||
| 698 | cret := xVsnprintf(StringVar, NVar, FormatVar, ArgsVar) | 759 | cret := xVsnprintf(StringVar, NVar, FormatVar, ArgsVar) | ||
| 699 | return cret | 760 | return cret | ||
| 700 | } | 761 | } | ||
| @@ -702,44 +763,4 @@ func Vsnprintf(StringVar string, NVar uint, FormatVar string, ArgsVar []interfac | |||||
| 702 | func init() { | 763 | func init() { | ||
| 703 | core.SetPackageName("GLIB", "glib-2.0") | 764 | core.SetPackageName("GLIB", "glib-2.0") | ||
| 704 | core.SetSharedLibraries("GLIB", []string{"libgobject-2.0.so.0", "libglib-2.0.so.0", "libgobject-2.0.0.dylib", "libglib-2.0.0.dylib"}) | 765 | core.SetSharedLibraries("GLIB", []string{"libgobject-2.0.so.0", "libglib-2.0.so.0", "libgobject-2.0.0.dylib", "libglib-2.0.0.dylib"}) | ||
| 705 | - | var libs []uintptr | |||
| 706 | - | for _, libPath := range core.GetPaths("GLIB") { | |||
| 707 | - | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |||
| 708 | - | if err != nil { | |||
| 709 | - | panic(err) | |||
| 710 | - | } | |||
| 711 | - | libs = append(libs, lib) | |||
| 712 | - | } | |||
| 713 | - | ||||
| 714 | - | core.PuregoSafeRegister(&xAtexit, libs, "g_atexit") | |||
| 715 | - | core.PuregoSafeRegister(&xBitNthLsf, libs, "g_bit_nth_lsf") | |||
| 716 | - | core.PuregoSafeRegister(&xBitNthMsf, libs, "g_bit_nth_msf") | |||
| 717 | - | core.PuregoSafeRegister(&xBitStorage, libs, "g_bit_storage") | |||
| 718 | - | core.PuregoSafeRegister(&xFindProgramInPath, libs, "g_find_program_in_path") | |||
| 719 | - | core.PuregoSafeRegister(&xFormatSize, libs, "g_format_size") | |||
| 720 | - | core.PuregoSafeRegister(&xFormatSizeForDisplay, libs, "g_format_size_for_display") | |||
| 721 | - | core.PuregoSafeRegister(&xFormatSizeFull, libs, "g_format_size_full") | |||
| 722 | - | core.PuregoSafeRegister(&xGetApplicationName, libs, "g_get_application_name") | |||
| 723 | - | core.PuregoSafeRegister(&xGetHomeDir, libs, "g_get_home_dir") | |||
| 724 | - | core.PuregoSafeRegister(&xGetHostName, libs, "g_get_host_name") | |||
| 725 | - | core.PuregoSafeRegister(&xGetOsInfo, libs, "g_get_os_info") | |||
| 726 | - | core.PuregoSafeRegister(&xGetPrgname, libs, "g_get_prgname") | |||
| 727 | - | core.PuregoSafeRegister(&xGetRealName, libs, "g_get_real_name") | |||
| 728 | - | core.PuregoSafeRegister(&xGetSystemConfigDirs, libs, "g_get_system_config_dirs") | |||
| 729 | - | core.PuregoSafeRegister(&xGetSystemDataDirs, libs, "g_get_system_data_dirs") | |||
| 730 | - | core.PuregoSafeRegister(&xGetTmpDir, libs, "g_get_tmp_dir") | |||
| 731 | - | core.PuregoSafeRegister(&xGetUserCacheDir, libs, "g_get_user_cache_dir") | |||
| 732 | - | core.PuregoSafeRegister(&xGetUserConfigDir, libs, "g_get_user_config_dir") | |||
| 733 | - | core.PuregoSafeRegister(&xGetUserDataDir, libs, "g_get_user_data_dir") | |||
| 734 | - | core.PuregoSafeRegister(&xGetUserName, libs, "g_get_user_name") | |||
| 735 | - | core.PuregoSafeRegister(&xGetUserRuntimeDir, libs, "g_get_user_runtime_dir") | |||
| 736 | - | core.PuregoSafeRegister(&xGetUserSpecialDir, libs, "g_get_user_special_dir") | |||
| 737 | - | core.PuregoSafeRegister(&xGetUserStateDir, libs, "g_get_user_state_dir") | |||
| 738 | - | core.PuregoSafeRegister(&xNullifyPointer, libs, "g_nullify_pointer") | |||
| 739 | - | core.PuregoSafeRegister(&xParseDebugString, libs, "g_parse_debug_string") | |||
| 740 | - | core.PuregoSafeRegister(&xReloadUserSpecialDirsCache, libs, "g_reload_user_special_dirs_cache") | |||
| 741 | - | core.PuregoSafeRegister(&xSetApplicationName, libs, "g_set_application_name") | |||
| 742 | - | core.PuregoSafeRegister(&xSetPrgname, libs, "g_set_prgname") | |||
| 743 | - | core.PuregoSafeRegister(&xSnprintf, libs, "g_snprintf") | |||
| 744 | - | core.PuregoSafeRegister(&xVsnprintf, libs, "g_vsnprintf") | |||
| 745 | } | 766 | } | ||