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
| @@ -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 | ||
| @@ -36,6 +35,8 @@ var xSequenceAppend func(uintptr, uintptr) uintptr | |||
| 36 | 35 | ||
| 37 | 36 | // Adds a new item to the end of @seq. | |
| 38 | 37 | func (x *Sequence) Append(DataVar uintptr) *SequenceIter { | |
| 38 | + | core.LazyRegister(&xSequenceAppend, "GLIB", "g_sequence_append", false) | |
| 39 | + | ||
| 39 | 40 | cret := xSequenceAppend(x.GoPointer(), DataVar) | |
| 40 | 41 | if cret == 0 { | |
| 41 | 42 | return nil | |
| @@ -48,6 +49,8 @@ var xSequenceForeach func(uintptr, uintptr, uintptr) | |||
| 48 | 49 | // Calls @func for each item in the sequence passing @user_data | |
| 49 | 50 | // to the function. @func must not modify the sequence itself. | |
| 50 | 51 | func (x *Sequence) Foreach(FuncVar *Func, UserDataVar uintptr) { | |
| 52 | + | core.LazyRegister(&xSequenceForeach, "GLIB", "g_sequence_foreach", false) | |
| 53 | + | ||
| 51 | 54 | xSequenceForeach(x.GoPointer(), NewCallback(FuncVar), UserDataVar) | |
| 52 | 55 | } | |
| 53 | 56 | ||
| @@ -57,6 +60,8 @@ var xSequenceFree func(uintptr) | |||
| 57 | 60 | // function associated with it, that function is called on all items | |
| 58 | 61 | // in @seq. | |
| 59 | 62 | func (x *Sequence) Free() { | |
| 63 | + | core.LazyRegister(&xSequenceFree, "GLIB", "g_sequence_free", false) | |
| 64 | + | ||
| 60 | 65 | xSequenceFree(x.GoPointer()) | |
| 61 | 66 | } | |
| 62 | 67 | ||
| @@ -64,6 +69,8 @@ var xSequenceGetBeginIter func(uintptr) uintptr | |||
| 64 | 69 | ||
| 65 | 70 | // Returns the begin iterator for @seq. | |
| 66 | 71 | func (x *Sequence) GetBeginIter() *SequenceIter { | |
| 72 | + | core.LazyRegister(&xSequenceGetBeginIter, "GLIB", "g_sequence_get_begin_iter", false) | |
| 73 | + | ||
| 67 | 74 | cret := xSequenceGetBeginIter(x.GoPointer()) | |
| 68 | 75 | if cret == 0 { | |
| 69 | 76 | return nil | |
| @@ -75,6 +82,8 @@ var xSequenceGetEndIter func(uintptr) uintptr | |||
| 75 | 82 | ||
| 76 | 83 | // Returns the end iterator for @seg | |
| 77 | 84 | func (x *Sequence) GetEndIter() *SequenceIter { | |
| 85 | + | core.LazyRegister(&xSequenceGetEndIter, "GLIB", "g_sequence_get_end_iter", false) | |
| 86 | + | ||
| 78 | 87 | cret := xSequenceGetEndIter(x.GoPointer()) | |
| 79 | 88 | if cret == 0 { | |
| 80 | 89 | return nil | |
| @@ -87,6 +96,8 @@ var xSequenceGetIterAtPos func(uintptr, int) uintptr | |||
| 87 | 96 | // Returns the iterator at position @pos. If @pos is negative or larger | |
| 88 | 97 | // than the number of items in @seq, the end iterator is returned. | |
| 89 | 98 | func (x *Sequence) GetIterAtPos(PosVar int) *SequenceIter { | |
| 99 | + | core.LazyRegister(&xSequenceGetIterAtPos, "GLIB", "g_sequence_get_iter_at_pos", false) | |
| 100 | + | ||
| 90 | 101 | cret := xSequenceGetIterAtPos(x.GoPointer(), PosVar) | |
| 91 | 102 | if cret == 0 { | |
| 92 | 103 | return nil | |
| @@ -100,6 +111,8 @@ var xSequenceGetLength func(uintptr) int | |||
| 100 | 111 | // O(h) where `h' is the height of the tree. It is thus more efficient | |
| 101 | 112 | // to use g_sequence_is_empty() when comparing the length to zero. | |
| 102 | 113 | func (x *Sequence) GetLength() int { | |
| 114 | + | core.LazyRegister(&xSequenceGetLength, "GLIB", "g_sequence_get_length", false) | |
| 115 | + | ||
| 103 | 116 | cret := xSequenceGetLength(x.GoPointer()) | |
| 104 | 117 | return cret | |
| 105 | 118 | } | |
| @@ -119,6 +132,8 @@ var xSequenceInsertSorted func(uintptr, uintptr, uintptr, uintptr) uintptr | |||
| 119 | 132 | // it is more efficient to do unsorted insertions and then call | |
| 120 | 133 | // g_sequence_sort() or g_sequence_sort_iter(). | |
| 121 | 134 | func (x *Sequence) InsertSorted(DataVar uintptr, CmpFuncVar *CompareDataFunc, CmpDataVar uintptr) *SequenceIter { | |
| 135 | + | core.LazyRegister(&xSequenceInsertSorted, "GLIB", "g_sequence_insert_sorted", false) | |
| 136 | + | ||
| 122 | 137 | cret := xSequenceInsertSorted(x.GoPointer(), DataVar, NewCallback(CmpFuncVar), CmpDataVar) | |
| 123 | 138 | if cret == 0 { | |
| 124 | 139 | return nil | |
| @@ -141,6 +156,8 @@ var xSequenceInsertSortedIter func(uintptr, uintptr, uintptr, uintptr) uintptr | |||
| 141 | 156 | // it is more efficient to do unsorted insertions and then call | |
| 142 | 157 | // g_sequence_sort() or g_sequence_sort_iter(). | |
| 143 | 158 | func (x *Sequence) InsertSortedIter(DataVar uintptr, IterCmpVar *SequenceIterCompareFunc, CmpDataVar uintptr) *SequenceIter { | |
| 159 | + | core.LazyRegister(&xSequenceInsertSortedIter, "GLIB", "g_sequence_insert_sorted_iter", false) | |
| 160 | + | ||
| 144 | 161 | cret := xSequenceInsertSortedIter(x.GoPointer(), DataVar, NewCallback(IterCmpVar), CmpDataVar) | |
| 145 | 162 | if cret == 0 { | |
| 146 | 163 | return nil | |
| @@ -156,6 +173,8 @@ var xSequenceIsEmpty func(uintptr) bool | |||
| 156 | 173 | // g_sequence_get_length() being equal to zero. However this function is | |
| 157 | 174 | // implemented in O(1) running time. | |
| 158 | 175 | func (x *Sequence) IsEmpty() bool { | |
| 176 | + | core.LazyRegister(&xSequenceIsEmpty, "GLIB", "g_sequence_is_empty", false) | |
| 177 | + | ||
| 159 | 178 | cret := xSequenceIsEmpty(x.GoPointer()) | |
| 160 | 179 | return cret | |
| 161 | 180 | } | |
| @@ -176,6 +195,8 @@ var xSequenceLookup func(uintptr, uintptr, uintptr, uintptr) uintptr | |||
| 176 | 195 | // This function will fail if the data contained in the sequence is | |
| 177 | 196 | // unsorted. | |
| 178 | 197 | func (x *Sequence) Lookup(DataVar uintptr, CmpFuncVar *CompareDataFunc, CmpDataVar uintptr) *SequenceIter { | |
| 198 | + | core.LazyRegister(&xSequenceLookup, "GLIB", "g_sequence_lookup", false) | |
| 199 | + | ||
| 179 | 200 | cret := xSequenceLookup(x.GoPointer(), DataVar, NewCallback(CmpFuncVar), CmpDataVar) | |
| 180 | 201 | if cret == 0 { | |
| 181 | 202 | return nil | |
| @@ -196,6 +217,8 @@ var xSequenceLookupIter func(uintptr, uintptr, uintptr, uintptr) uintptr | |||
| 196 | 217 | // This function will fail if the data contained in the sequence is | |
| 197 | 218 | // unsorted. | |
| 198 | 219 | func (x *Sequence) LookupIter(DataVar uintptr, IterCmpVar *SequenceIterCompareFunc, CmpDataVar uintptr) *SequenceIter { | |
| 220 | + | core.LazyRegister(&xSequenceLookupIter, "GLIB", "g_sequence_lookup_iter", false) | |
| 221 | + | ||
| 199 | 222 | cret := xSequenceLookupIter(x.GoPointer(), DataVar, NewCallback(IterCmpVar), CmpDataVar) | |
| 200 | 223 | if cret == 0 { | |
| 201 | 224 | return nil | |
| @@ -207,6 +230,8 @@ var xSequencePrepend func(uintptr, uintptr) uintptr | |||
| 207 | 230 | ||
| 208 | 231 | // Adds a new item to the front of @seq | |
| 209 | 232 | func (x *Sequence) Prepend(DataVar uintptr) *SequenceIter { | |
| 233 | + | core.LazyRegister(&xSequencePrepend, "GLIB", "g_sequence_prepend", false) | |
| 234 | + | ||
| 210 | 235 | cret := xSequencePrepend(x.GoPointer(), DataVar) | |
| 211 | 236 | if cret == 0 { | |
| 212 | 237 | return nil | |
| @@ -230,6 +255,8 @@ var xSequenceSearch func(uintptr, uintptr, uintptr, uintptr) uintptr | |||
| 230 | 255 | // This function will fail if the data contained in the sequence is | |
| 231 | 256 | // unsorted. | |
| 232 | 257 | func (x *Sequence) Search(DataVar uintptr, CmpFuncVar *CompareDataFunc, CmpDataVar uintptr) *SequenceIter { | |
| 258 | + | core.LazyRegister(&xSequenceSearch, "GLIB", "g_sequence_search", false) | |
| 259 | + | ||
| 233 | 260 | cret := xSequenceSearch(x.GoPointer(), DataVar, NewCallback(CmpFuncVar), CmpDataVar) | |
| 234 | 261 | if cret == 0 { | |
| 235 | 262 | return nil | |
| @@ -253,6 +280,8 @@ var xSequenceSearchIter func(uintptr, uintptr, uintptr, uintptr) uintptr | |||
| 253 | 280 | // This function will fail if the data contained in the sequence is | |
| 254 | 281 | // unsorted. | |
| 255 | 282 | func (x *Sequence) SearchIter(DataVar uintptr, IterCmpVar *SequenceIterCompareFunc, CmpDataVar uintptr) *SequenceIter { | |
| 283 | + | core.LazyRegister(&xSequenceSearchIter, "GLIB", "g_sequence_search_iter", false) | |
| 284 | + | ||
| 256 | 285 | cret := xSequenceSearchIter(x.GoPointer(), DataVar, NewCallback(IterCmpVar), CmpDataVar) | |
| 257 | 286 | if cret == 0 { | |
| 258 | 287 | return nil | |
| @@ -269,6 +298,8 @@ var xSequenceSort func(uintptr, uintptr, uintptr) | |||
| 269 | 298 | // first comes before the second, and a positive value | |
| 270 | 299 | // if the second comes before the first. | |
| 271 | 300 | func (x *Sequence) Sort(CmpFuncVar *CompareDataFunc, CmpDataVar uintptr) { | |
| 301 | + | core.LazyRegister(&xSequenceSort, "GLIB", "g_sequence_sort", false) | |
| 302 | + | ||
| 272 | 303 | xSequenceSort(x.GoPointer(), NewCallback(CmpFuncVar), CmpDataVar) | |
| 273 | 304 | } | |
| 274 | 305 | ||
| @@ -282,6 +313,8 @@ var xSequenceSortIter func(uintptr, uintptr, uintptr) | |||
| 282 | 313 | // iterator comes before the second, and a positive value if the second | |
| 283 | 314 | // iterator comes before the first. | |
| 284 | 315 | func (x *Sequence) SortIter(CmpFuncVar *SequenceIterCompareFunc, CmpDataVar uintptr) { | |
| 316 | + | core.LazyRegister(&xSequenceSortIter, "GLIB", "g_sequence_sort_iter", false) | |
| 317 | + | ||
| 285 | 318 | xSequenceSortIter(x.GoPointer(), NewCallback(CmpFuncVar), CmpDataVar) | |
| 286 | 319 | } | |
| 287 | 320 | ||
| @@ -310,6 +343,8 @@ var xSequenceIterCompare func(uintptr, *SequenceIter) int | |||
| 310 | 343 | // | |
| 311 | 344 | // The @a and @b iterators must point into the same sequence. | |
| 312 | 345 | func (x *SequenceIter) Compare(BVar *SequenceIter) int { | |
| 346 | + | core.LazyRegister(&xSequenceIterCompare, "GLIB", "g_sequence_iter_compare", false) | |
| 347 | + | ||
| 313 | 348 | cret := xSequenceIterCompare(x.GoPointer(), BVar) | |
| 314 | 349 | return cret | |
| 315 | 350 | } | |
| @@ -318,6 +353,8 @@ var xSequenceIterGetPosition func(uintptr) int | |||
| 318 | 353 | ||
| 319 | 354 | // Returns the position of @iter | |
| 320 | 355 | func (x *SequenceIter) GetPosition() int { | |
| 356 | + | core.LazyRegister(&xSequenceIterGetPosition, "GLIB", "g_sequence_iter_get_position", false) | |
| 357 | + | ||
| 321 | 358 | cret := xSequenceIterGetPosition(x.GoPointer()) | |
| 322 | 359 | return cret | |
| 323 | 360 | } | |
| @@ -326,6 +363,8 @@ var xSequenceIterGetSequence func(uintptr) uintptr | |||
| 326 | 363 | ||
| 327 | 364 | // Returns the #GSequence that @iter points into. | |
| 328 | 365 | func (x *SequenceIter) GetSequence() *Sequence { | |
| 366 | + | core.LazyRegister(&xSequenceIterGetSequence, "GLIB", "g_sequence_iter_get_sequence", false) | |
| 367 | + | ||
| 329 | 368 | cret := xSequenceIterGetSequence(x.GoPointer()) | |
| 330 | 369 | if cret == 0 { | |
| 331 | 370 | return nil | |
| @@ -337,6 +376,8 @@ var xSequenceIterIsBegin func(uintptr) bool | |||
| 337 | 376 | ||
| 338 | 377 | // Returns whether @iter is the begin iterator | |
| 339 | 378 | func (x *SequenceIter) IsBegin() bool { | |
| 379 | + | core.LazyRegister(&xSequenceIterIsBegin, "GLIB", "g_sequence_iter_is_begin", false) | |
| 380 | + | ||
| 340 | 381 | cret := xSequenceIterIsBegin(x.GoPointer()) | |
| 341 | 382 | return cret | |
| 342 | 383 | } | |
| @@ -345,6 +386,8 @@ var xSequenceIterIsEnd func(uintptr) bool | |||
| 345 | 386 | ||
| 346 | 387 | // Returns whether @iter is the end iterator | |
| 347 | 388 | func (x *SequenceIter) IsEnd() bool { | |
| 389 | + | core.LazyRegister(&xSequenceIterIsEnd, "GLIB", "g_sequence_iter_is_end", false) | |
| 390 | + | ||
| 348 | 391 | cret := xSequenceIterIsEnd(x.GoPointer()) | |
| 349 | 392 | return cret | |
| 350 | 393 | } | |
| @@ -356,6 +399,8 @@ var xSequenceIterMove func(uintptr, int) uintptr | |||
| 356 | 399 | // the begin iterator is returned. If @iter is closer than @delta positions | |
| 357 | 400 | // to the end of the sequence, the end iterator is returned. | |
| 358 | 401 | func (x *SequenceIter) Move(DeltaVar int) *SequenceIter { | |
| 402 | + | core.LazyRegister(&xSequenceIterMove, "GLIB", "g_sequence_iter_move", false) | |
| 403 | + | ||
| 359 | 404 | cret := xSequenceIterMove(x.GoPointer(), DeltaVar) | |
| 360 | 405 | if cret == 0 { | |
| 361 | 406 | return nil | |
| @@ -368,6 +413,8 @@ var xSequenceIterNext func(uintptr) uintptr | |||
| 368 | 413 | // Returns an iterator pointing to the next position after @iter. | |
| 369 | 414 | // If @iter is the end iterator, the end iterator is returned. | |
| 370 | 415 | func (x *SequenceIter) Next() *SequenceIter { | |
| 416 | + | core.LazyRegister(&xSequenceIterNext, "GLIB", "g_sequence_iter_next", false) | |
| 417 | + | ||
| 371 | 418 | cret := xSequenceIterNext(x.GoPointer()) | |
| 372 | 419 | if cret == 0 { | |
| 373 | 420 | return nil | |
| @@ -380,6 +427,8 @@ var xSequenceIterPrev func(uintptr) uintptr | |||
| 380 | 427 | // Returns an iterator pointing to the previous position before @iter. | |
| 381 | 428 | // If @iter is the begin iterator, the begin iterator is returned. | |
| 382 | 429 | func (x *SequenceIter) Prev() *SequenceIter { | |
| 430 | + | core.LazyRegister(&xSequenceIterPrev, "GLIB", "g_sequence_iter_prev", false) | |
| 431 | + | ||
| 383 | 432 | cret := xSequenceIterPrev(x.GoPointer()) | |
| 384 | 433 | if cret == 0 { | |
| 385 | 434 | return nil | |
| @@ -393,6 +442,8 @@ var xSequenceForeachRange func(*SequenceIter, *SequenceIter, uintptr, uintptr) | |||
| 393 | 442 | // @user_data to the function. @func must not modify the sequence | |
| 394 | 443 | // itself. | |
| 395 | 444 | func SequenceForeachRange(BeginVar *SequenceIter, EndVar *SequenceIter, FuncVar *Func, UserDataVar uintptr) { | |
| 445 | + | core.LazyRegister(&xSequenceForeachRange, "GLIB", "g_sequence_foreach_range", false) | |
| 446 | + | ||
| 396 | 447 | xSequenceForeachRange(BeginVar, EndVar, NewCallback(FuncVar), UserDataVar) | |
| 397 | 448 | } | |
| 398 | 449 | ||
| @@ -400,6 +451,8 @@ var xSequenceGet func(*SequenceIter) uintptr | |||
| 400 | 451 | ||
| 401 | 452 | // Returns the data that @iter points to. | |
| 402 | 453 | func SequenceGet(IterVar *SequenceIter) uintptr { | |
| 454 | + | core.LazyRegister(&xSequenceGet, "GLIB", "g_sequence_get", false) | |
| 455 | + | ||
| 403 | 456 | cret := xSequenceGet(IterVar) | |
| 404 | 457 | return cret | |
| 405 | 458 | } | |
| @@ -408,6 +461,8 @@ var xSequenceInsertBefore func(*SequenceIter, uintptr) uintptr | |||
| 408 | 461 | ||
| 409 | 462 | // Inserts a new item just before the item pointed to by @iter. | |
| 410 | 463 | func SequenceInsertBefore(IterVar *SequenceIter, DataVar uintptr) *SequenceIter { | |
| 464 | + | core.LazyRegister(&xSequenceInsertBefore, "GLIB", "g_sequence_insert_before", false) | |
| 465 | + | ||
| 411 | 466 | cret := xSequenceInsertBefore(IterVar, DataVar) | |
| 412 | 467 | if cret == 0 { | |
| 413 | 468 | return nil | |
| @@ -422,6 +477,8 @@ var xSequenceMove func(*SequenceIter, *SequenceIter) | |||
| 422 | 477 | // after @src. It is allowed for @src and @dest to point into different | |
| 423 | 478 | // sequences. | |
| 424 | 479 | func SequenceMove(SrcVar *SequenceIter, DestVar *SequenceIter) { | |
| 480 | + | core.LazyRegister(&xSequenceMove, "GLIB", "g_sequence_move", false) | |
| 481 | + | ||
| 425 | 482 | xSequenceMove(SrcVar, DestVar) | |
| 426 | 483 | } | |
| 427 | 484 | ||
| @@ -436,6 +493,8 @@ var xSequenceMoveRange func(*SequenceIter, *SequenceIter, *SequenceIter) | |||
| 436 | 493 | // removed from the sequence. If @dest points to a place within | |
| 437 | 494 | // the (@begin, @end) range, the range does not move. | |
| 438 | 495 | func SequenceMoveRange(DestVar *SequenceIter, BeginVar *SequenceIter, EndVar *SequenceIter) { | |
| 496 | + | core.LazyRegister(&xSequenceMoveRange, "GLIB", "g_sequence_move_range", false) | |
| 497 | + | ||
| 439 | 498 | xSequenceMoveRange(DestVar, BeginVar, EndVar) | |
| 440 | 499 | } | |
| 441 | 500 | ||
| @@ -448,6 +507,8 @@ var xSequenceRangeGetMidpoint func(*SequenceIter, *SequenceIter) uintptr | |||
| 448 | 507 | // The @begin and @end iterators must both point to the same sequence | |
| 449 | 508 | // and @begin must come before or be equal to @end in the sequence. | |
| 450 | 509 | func SequenceRangeGetMidpoint(BeginVar *SequenceIter, EndVar *SequenceIter) *SequenceIter { | |
| 510 | + | core.LazyRegister(&xSequenceRangeGetMidpoint, "GLIB", "g_sequence_range_get_midpoint", false) | |
| 511 | + | ||
| 451 | 512 | cret := xSequenceRangeGetMidpoint(BeginVar, EndVar) | |
| 452 | 513 | if cret == 0 { | |
| 453 | 514 | return nil | |
| @@ -463,6 +524,8 @@ var xSequenceRemove func(*SequenceIter) | |||
| 463 | 524 | // If the sequence has a data destroy function associated with it, this | |
| 464 | 525 | // function is called on the data for the removed item. | |
| 465 | 526 | func SequenceRemove(IterVar *SequenceIter) { | |
| 527 | + | core.LazyRegister(&xSequenceRemove, "GLIB", "g_sequence_remove", false) | |
| 528 | + | ||
| 466 | 529 | xSequenceRemove(IterVar) | |
| 467 | 530 | } | |
| 468 | 531 | ||
| @@ -473,6 +536,8 @@ var xSequenceRemoveRange func(*SequenceIter, *SequenceIter) | |||
| 473 | 536 | // If the sequence has a data destroy function associated with it, this | |
| 474 | 537 | // function is called on the data for the removed items. | |
| 475 | 538 | func SequenceRemoveRange(BeginVar *SequenceIter, EndVar *SequenceIter) { | |
| 539 | + | core.LazyRegister(&xSequenceRemoveRange, "GLIB", "g_sequence_remove_range", false) | |
| 540 | + | ||
| 476 | 541 | xSequenceRemoveRange(BeginVar, EndVar) | |
| 477 | 542 | } | |
| 478 | 543 | ||
| @@ -482,6 +547,8 @@ var xSequenceSet func(*SequenceIter, uintptr) | |||
| 482 | 547 | // the sequence has a data destroy function associated with it, that | |
| 483 | 548 | // function is called on the existing data that @iter pointed to. | |
| 484 | 549 | func SequenceSet(IterVar *SequenceIter, DataVar uintptr) { | |
| 550 | + | core.LazyRegister(&xSequenceSet, "GLIB", "g_sequence_set", false) | |
| 551 | + | ||
| 485 | 552 | xSequenceSet(IterVar, DataVar) | |
| 486 | 553 | } | |
| 487 | 554 | ||
| @@ -498,6 +565,8 @@ var xSequenceSortChanged func(*SequenceIter, uintptr, uintptr) | |||
| 498 | 565 | // the first item comes before the second, and a positive value if | |
| 499 | 566 | // the second item comes before the first. | |
| 500 | 567 | func SequenceSortChanged(IterVar *SequenceIter, CmpFuncVar *CompareDataFunc, CmpDataVar uintptr) { | |
| 568 | + | core.LazyRegister(&xSequenceSortChanged, "GLIB", "g_sequence_sort_changed", false) | |
| 569 | + | ||
| 501 | 570 | xSequenceSortChanged(IterVar, NewCallback(CmpFuncVar), CmpDataVar) | |
| 502 | 571 | } | |
| 503 | 572 | ||
| @@ -513,6 +582,8 @@ var xSequenceSortChangedIter func(*SequenceIter, uintptr, uintptr) | |||
| 513 | 582 | // iterator comes before the second, and a positive value if the second | |
| 514 | 583 | // iterator comes before the first. | |
| 515 | 584 | func SequenceSortChangedIter(IterVar *SequenceIter, IterCmpVar *SequenceIterCompareFunc, CmpDataVar uintptr) { | |
| 585 | + | core.LazyRegister(&xSequenceSortChangedIter, "GLIB", "g_sequence_sort_changed_iter", false) | |
| 586 | + | ||
| 516 | 587 | xSequenceSortChangedIter(IterVar, NewCallback(IterCmpVar), CmpDataVar) | |
| 517 | 588 | } | |
| 518 | 589 | ||
| @@ -521,58 +592,12 @@ var xSequenceSwap func(*SequenceIter, *SequenceIter) | |||
| 521 | 592 | // Swaps the items pointed to by @a and @b. It is allowed for @a and @b | |
| 522 | 593 | // to point into difference sequences. | |
| 523 | 594 | func SequenceSwap(AVar *SequenceIter, BVar *SequenceIter) { | |
| 595 | + | core.LazyRegister(&xSequenceSwap, "GLIB", "g_sequence_swap", false) | |
| 596 | + | ||
| 524 | 597 | xSequenceSwap(AVar, BVar) | |
| 525 | 598 | } | |
| 526 | 599 | ||
| 527 | 600 | func init() { | |
| 528 | 601 | core.SetPackageName("GLIB", "glib-2.0") | |
| 529 | 602 | core.SetSharedLibraries("GLIB", []string{"libgobject-2.0.so.0", "libglib-2.0.so.0", "libgobject-2.0.0.dylib", "libglib-2.0.0.dylib"}) | |
| 530 | - | var libs []uintptr | |
| 531 | - | for _, libPath := range core.GetPaths("GLIB") { | |
| 532 | - | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 533 | - | if err != nil { | |
| 534 | - | panic(err) | |
| 535 | - | } | |
| 536 | - | libs = append(libs, lib) | |
| 537 | - | } | |
| 538 | - | ||
| 539 | - | core.PuregoSafeRegister(&xSequenceForeachRange, libs, "g_sequence_foreach_range") | |
| 540 | - | core.PuregoSafeRegister(&xSequenceGet, libs, "g_sequence_get") | |
| 541 | - | core.PuregoSafeRegister(&xSequenceInsertBefore, libs, "g_sequence_insert_before") | |
| 542 | - | core.PuregoSafeRegister(&xSequenceMove, libs, "g_sequence_move") | |
| 543 | - | core.PuregoSafeRegister(&xSequenceMoveRange, libs, "g_sequence_move_range") | |
| 544 | - | core.PuregoSafeRegister(&xSequenceRangeGetMidpoint, libs, "g_sequence_range_get_midpoint") | |
| 545 | - | core.PuregoSafeRegister(&xSequenceRemove, libs, "g_sequence_remove") | |
| 546 | - | core.PuregoSafeRegister(&xSequenceRemoveRange, libs, "g_sequence_remove_range") | |
| 547 | - | core.PuregoSafeRegister(&xSequenceSet, libs, "g_sequence_set") | |
| 548 | - | core.PuregoSafeRegister(&xSequenceSortChanged, libs, "g_sequence_sort_changed") | |
| 549 | - | core.PuregoSafeRegister(&xSequenceSortChangedIter, libs, "g_sequence_sort_changed_iter") | |
| 550 | - | core.PuregoSafeRegister(&xSequenceSwap, libs, "g_sequence_swap") | |
| 551 | - | ||
| 552 | - | core.PuregoSafeRegister(&xSequenceAppend, libs, "g_sequence_append") | |
| 553 | - | core.PuregoSafeRegister(&xSequenceForeach, libs, "g_sequence_foreach") | |
| 554 | - | core.PuregoSafeRegister(&xSequenceFree, libs, "g_sequence_free") | |
| 555 | - | core.PuregoSafeRegister(&xSequenceGetBeginIter, libs, "g_sequence_get_begin_iter") | |
| 556 | - | core.PuregoSafeRegister(&xSequenceGetEndIter, libs, "g_sequence_get_end_iter") | |
| 557 | - | core.PuregoSafeRegister(&xSequenceGetIterAtPos, libs, "g_sequence_get_iter_at_pos") | |
| 558 | - | core.PuregoSafeRegister(&xSequenceGetLength, libs, "g_sequence_get_length") | |
| 559 | - | core.PuregoSafeRegister(&xSequenceInsertSorted, libs, "g_sequence_insert_sorted") | |
| 560 | - | core.PuregoSafeRegister(&xSequenceInsertSortedIter, libs, "g_sequence_insert_sorted_iter") | |
| 561 | - | core.PuregoSafeRegister(&xSequenceIsEmpty, libs, "g_sequence_is_empty") | |
| 562 | - | core.PuregoSafeRegister(&xSequenceLookup, libs, "g_sequence_lookup") | |
| 563 | - | core.PuregoSafeRegister(&xSequenceLookupIter, libs, "g_sequence_lookup_iter") | |
| 564 | - | core.PuregoSafeRegister(&xSequencePrepend, libs, "g_sequence_prepend") | |
| 565 | - | core.PuregoSafeRegister(&xSequenceSearch, libs, "g_sequence_search") | |
| 566 | - | core.PuregoSafeRegister(&xSequenceSearchIter, libs, "g_sequence_search_iter") | |
| 567 | - | core.PuregoSafeRegister(&xSequenceSort, libs, "g_sequence_sort") | |
| 568 | - | core.PuregoSafeRegister(&xSequenceSortIter, libs, "g_sequence_sort_iter") | |
| 569 | - | ||
| 570 | - | core.PuregoSafeRegister(&xSequenceIterCompare, libs, "g_sequence_iter_compare") | |
| 571 | - | core.PuregoSafeRegister(&xSequenceIterGetPosition, libs, "g_sequence_iter_get_position") | |
| 572 | - | core.PuregoSafeRegister(&xSequenceIterGetSequence, libs, "g_sequence_iter_get_sequence") | |
| 573 | - | core.PuregoSafeRegister(&xSequenceIterIsBegin, libs, "g_sequence_iter_is_begin") | |
| 574 | - | core.PuregoSafeRegister(&xSequenceIterIsEnd, libs, "g_sequence_iter_is_end") | |
| 575 | - | core.PuregoSafeRegister(&xSequenceIterMove, libs, "g_sequence_iter_move") | |
| 576 | - | core.PuregoSafeRegister(&xSequenceIterNext, libs, "g_sequence_iter_next") | |
| 577 | - | core.PuregoSafeRegister(&xSequenceIterPrev, libs, "g_sequence_iter_prev") | |
| 578 | 603 | } | |
| @@ -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 | ||||
| @@ -36,6 +35,8 @@ var xSequenceAppend func(uintptr, uintptr) uintptr | |||||
| 36 | 35 | ||||
| 37 | // Adds a new item to the end of @seq. | 36 | // Adds a new item to the end of @seq. | ||
| 38 | func (x *Sequence) Append(DataVar uintptr) *SequenceIter { | 37 | func (x *Sequence) Append(DataVar uintptr) *SequenceIter { | ||
| 38 | + | core.LazyRegister(&xSequenceAppend, "GLIB", "g_sequence_append", false) | |||
| 39 | + | ||||
| 39 | cret := xSequenceAppend(x.GoPointer(), DataVar) | 40 | cret := xSequenceAppend(x.GoPointer(), DataVar) | ||
| 40 | if cret == 0 { | 41 | if cret == 0 { | ||
| 41 | return nil | 42 | return nil | ||
| @@ -48,6 +49,8 @@ var xSequenceForeach func(uintptr, uintptr, uintptr) | |||||
| 48 | // Calls @func for each item in the sequence passing @user_data | 49 | // Calls @func for each item in the sequence passing @user_data | ||
| 49 | // to the function. @func must not modify the sequence itself. | 50 | // to the function. @func must not modify the sequence itself. | ||
| 50 | func (x *Sequence) Foreach(FuncVar *Func, UserDataVar uintptr) { | 51 | func (x *Sequence) Foreach(FuncVar *Func, UserDataVar uintptr) { | ||
| 52 | + | core.LazyRegister(&xSequenceForeach, "GLIB", "g_sequence_foreach", false) | |||
| 53 | + | ||||
| 51 | xSequenceForeach(x.GoPointer(), NewCallback(FuncVar), UserDataVar) | 54 | xSequenceForeach(x.GoPointer(), NewCallback(FuncVar), UserDataVar) | ||
| 52 | } | 55 | } | ||
| 53 | 56 | ||||
| @@ -57,6 +60,8 @@ var xSequenceFree func(uintptr) | |||||
| 57 | // function associated with it, that function is called on all items | 60 | // function associated with it, that function is called on all items | ||
| 58 | // in @seq. | 61 | // in @seq. | ||
| 59 | func (x *Sequence) Free() { | 62 | func (x *Sequence) Free() { | ||
| 63 | + | core.LazyRegister(&xSequenceFree, "GLIB", "g_sequence_free", false) | |||
| 64 | + | ||||
| 60 | xSequenceFree(x.GoPointer()) | 65 | xSequenceFree(x.GoPointer()) | ||
| 61 | } | 66 | } | ||
| 62 | 67 | ||||
| @@ -64,6 +69,8 @@ var xSequenceGetBeginIter func(uintptr) uintptr | |||||
| 64 | 69 | ||||
| 65 | // Returns the begin iterator for @seq. | 70 | // Returns the begin iterator for @seq. | ||
| 66 | func (x *Sequence) GetBeginIter() *SequenceIter { | 71 | func (x *Sequence) GetBeginIter() *SequenceIter { | ||
| 72 | + | core.LazyRegister(&xSequenceGetBeginIter, "GLIB", "g_sequence_get_begin_iter", false) | |||
| 73 | + | ||||
| 67 | cret := xSequenceGetBeginIter(x.GoPointer()) | 74 | cret := xSequenceGetBeginIter(x.GoPointer()) | ||
| 68 | if cret == 0 { | 75 | if cret == 0 { | ||
| 69 | return nil | 76 | return nil | ||
| @@ -75,6 +82,8 @@ var xSequenceGetEndIter func(uintptr) uintptr | |||||
| 75 | 82 | ||||
| 76 | // Returns the end iterator for @seg | 83 | // Returns the end iterator for @seg | ||
| 77 | func (x *Sequence) GetEndIter() *SequenceIter { | 84 | func (x *Sequence) GetEndIter() *SequenceIter { | ||
| 85 | + | core.LazyRegister(&xSequenceGetEndIter, "GLIB", "g_sequence_get_end_iter", false) | |||
| 86 | + | ||||
| 78 | cret := xSequenceGetEndIter(x.GoPointer()) | 87 | cret := xSequenceGetEndIter(x.GoPointer()) | ||
| 79 | if cret == 0 { | 88 | if cret == 0 { | ||
| 80 | return nil | 89 | return nil | ||
| @@ -87,6 +96,8 @@ var xSequenceGetIterAtPos func(uintptr, int) uintptr | |||||
| 87 | // Returns the iterator at position @pos. If @pos is negative or larger | 96 | // Returns the iterator at position @pos. If @pos is negative or larger | ||
| 88 | // than the number of items in @seq, the end iterator is returned. | 97 | // than the number of items in @seq, the end iterator is returned. | ||
| 89 | func (x *Sequence) GetIterAtPos(PosVar int) *SequenceIter { | 98 | func (x *Sequence) GetIterAtPos(PosVar int) *SequenceIter { | ||
| 99 | + | core.LazyRegister(&xSequenceGetIterAtPos, "GLIB", "g_sequence_get_iter_at_pos", false) | |||
| 100 | + | ||||
| 90 | cret := xSequenceGetIterAtPos(x.GoPointer(), PosVar) | 101 | cret := xSequenceGetIterAtPos(x.GoPointer(), PosVar) | ||
| 91 | if cret == 0 { | 102 | if cret == 0 { | ||
| 92 | return nil | 103 | return nil | ||
| @@ -100,6 +111,8 @@ var xSequenceGetLength func(uintptr) int | |||||
| 100 | // O(h) where `h' is the height of the tree. It is thus more efficient | 111 | // O(h) where `h' is the height of the tree. It is thus more efficient | ||
| 101 | // to use g_sequence_is_empty() when comparing the length to zero. | 112 | // to use g_sequence_is_empty() when comparing the length to zero. | ||
| 102 | func (x *Sequence) GetLength() int { | 113 | func (x *Sequence) GetLength() int { | ||
| 114 | + | core.LazyRegister(&xSequenceGetLength, "GLIB", "g_sequence_get_length", false) | |||
| 115 | + | ||||
| 103 | cret := xSequenceGetLength(x.GoPointer()) | 116 | cret := xSequenceGetLength(x.GoPointer()) | ||
| 104 | return cret | 117 | return cret | ||
| 105 | } | 118 | } | ||
| @@ -119,6 +132,8 @@ var xSequenceInsertSorted func(uintptr, uintptr, uintptr, uintptr) uintptr | |||||
| 119 | // it is more efficient to do unsorted insertions and then call | 132 | // it is more efficient to do unsorted insertions and then call | ||
| 120 | // g_sequence_sort() or g_sequence_sort_iter(). | 133 | // g_sequence_sort() or g_sequence_sort_iter(). | ||
| 121 | func (x *Sequence) InsertSorted(DataVar uintptr, CmpFuncVar *CompareDataFunc, CmpDataVar uintptr) *SequenceIter { | 134 | func (x *Sequence) InsertSorted(DataVar uintptr, CmpFuncVar *CompareDataFunc, CmpDataVar uintptr) *SequenceIter { | ||
| 135 | + | core.LazyRegister(&xSequenceInsertSorted, "GLIB", "g_sequence_insert_sorted", false) | |||
| 136 | + | ||||
| 122 | cret := xSequenceInsertSorted(x.GoPointer(), DataVar, NewCallback(CmpFuncVar), CmpDataVar) | 137 | cret := xSequenceInsertSorted(x.GoPointer(), DataVar, NewCallback(CmpFuncVar), CmpDataVar) | ||
| 123 | if cret == 0 { | 138 | if cret == 0 { | ||
| 124 | return nil | 139 | return nil | ||
| @@ -141,6 +156,8 @@ var xSequenceInsertSortedIter func(uintptr, uintptr, uintptr, uintptr) uintptr | |||||
| 141 | // it is more efficient to do unsorted insertions and then call | 156 | // it is more efficient to do unsorted insertions and then call | ||
| 142 | // g_sequence_sort() or g_sequence_sort_iter(). | 157 | // g_sequence_sort() or g_sequence_sort_iter(). | ||
| 143 | func (x *Sequence) InsertSortedIter(DataVar uintptr, IterCmpVar *SequenceIterCompareFunc, CmpDataVar uintptr) *SequenceIter { | 158 | func (x *Sequence) InsertSortedIter(DataVar uintptr, IterCmpVar *SequenceIterCompareFunc, CmpDataVar uintptr) *SequenceIter { | ||
| 159 | + | core.LazyRegister(&xSequenceInsertSortedIter, "GLIB", "g_sequence_insert_sorted_iter", false) | |||
| 160 | + | ||||
| 144 | cret := xSequenceInsertSortedIter(x.GoPointer(), DataVar, NewCallback(IterCmpVar), CmpDataVar) | 161 | cret := xSequenceInsertSortedIter(x.GoPointer(), DataVar, NewCallback(IterCmpVar), CmpDataVar) | ||
| 145 | if cret == 0 { | 162 | if cret == 0 { | ||
| 146 | return nil | 163 | return nil | ||
| @@ -156,6 +173,8 @@ var xSequenceIsEmpty func(uintptr) bool | |||||
| 156 | // g_sequence_get_length() being equal to zero. However this function is | 173 | // g_sequence_get_length() being equal to zero. However this function is | ||
| 157 | // implemented in O(1) running time. | 174 | // implemented in O(1) running time. | ||
| 158 | func (x *Sequence) IsEmpty() bool { | 175 | func (x *Sequence) IsEmpty() bool { | ||
| 176 | + | core.LazyRegister(&xSequenceIsEmpty, "GLIB", "g_sequence_is_empty", false) | |||
| 177 | + | ||||
| 159 | cret := xSequenceIsEmpty(x.GoPointer()) | 178 | cret := xSequenceIsEmpty(x.GoPointer()) | ||
| 160 | return cret | 179 | return cret | ||
| 161 | } | 180 | } | ||
| @@ -176,6 +195,8 @@ var xSequenceLookup func(uintptr, uintptr, uintptr, uintptr) uintptr | |||||
| 176 | // This function will fail if the data contained in the sequence is | 195 | // This function will fail if the data contained in the sequence is | ||
| 177 | // unsorted. | 196 | // unsorted. | ||
| 178 | func (x *Sequence) Lookup(DataVar uintptr, CmpFuncVar *CompareDataFunc, CmpDataVar uintptr) *SequenceIter { | 197 | func (x *Sequence) Lookup(DataVar uintptr, CmpFuncVar *CompareDataFunc, CmpDataVar uintptr) *SequenceIter { | ||
| 198 | + | core.LazyRegister(&xSequenceLookup, "GLIB", "g_sequence_lookup", false) | |||
| 199 | + | ||||
| 179 | cret := xSequenceLookup(x.GoPointer(), DataVar, NewCallback(CmpFuncVar), CmpDataVar) | 200 | cret := xSequenceLookup(x.GoPointer(), DataVar, NewCallback(CmpFuncVar), CmpDataVar) | ||
| 180 | if cret == 0 { | 201 | if cret == 0 { | ||
| 181 | return nil | 202 | return nil | ||
| @@ -196,6 +217,8 @@ var xSequenceLookupIter func(uintptr, uintptr, uintptr, uintptr) uintptr | |||||
| 196 | // This function will fail if the data contained in the sequence is | 217 | // This function will fail if the data contained in the sequence is | ||
| 197 | // unsorted. | 218 | // unsorted. | ||
| 198 | func (x *Sequence) LookupIter(DataVar uintptr, IterCmpVar *SequenceIterCompareFunc, CmpDataVar uintptr) *SequenceIter { | 219 | func (x *Sequence) LookupIter(DataVar uintptr, IterCmpVar *SequenceIterCompareFunc, CmpDataVar uintptr) *SequenceIter { | ||
| 220 | + | core.LazyRegister(&xSequenceLookupIter, "GLIB", "g_sequence_lookup_iter", false) | |||
| 221 | + | ||||
| 199 | cret := xSequenceLookupIter(x.GoPointer(), DataVar, NewCallback(IterCmpVar), CmpDataVar) | 222 | cret := xSequenceLookupIter(x.GoPointer(), DataVar, NewCallback(IterCmpVar), CmpDataVar) | ||
| 200 | if cret == 0 { | 223 | if cret == 0 { | ||
| 201 | return nil | 224 | return nil | ||
| @@ -207,6 +230,8 @@ var xSequencePrepend func(uintptr, uintptr) uintptr | |||||
| 207 | 230 | ||||
| 208 | // Adds a new item to the front of @seq | 231 | // Adds a new item to the front of @seq | ||
| 209 | func (x *Sequence) Prepend(DataVar uintptr) *SequenceIter { | 232 | func (x *Sequence) Prepend(DataVar uintptr) *SequenceIter { | ||
| 233 | + | core.LazyRegister(&xSequencePrepend, "GLIB", "g_sequence_prepend", false) | |||
| 234 | + | ||||
| 210 | cret := xSequencePrepend(x.GoPointer(), DataVar) | 235 | cret := xSequencePrepend(x.GoPointer(), DataVar) | ||
| 211 | if cret == 0 { | 236 | if cret == 0 { | ||
| 212 | return nil | 237 | return nil | ||
| @@ -230,6 +255,8 @@ var xSequenceSearch func(uintptr, uintptr, uintptr, uintptr) uintptr | |||||
| 230 | // This function will fail if the data contained in the sequence is | 255 | // This function will fail if the data contained in the sequence is | ||
| 231 | // unsorted. | 256 | // unsorted. | ||
| 232 | func (x *Sequence) Search(DataVar uintptr, CmpFuncVar *CompareDataFunc, CmpDataVar uintptr) *SequenceIter { | 257 | func (x *Sequence) Search(DataVar uintptr, CmpFuncVar *CompareDataFunc, CmpDataVar uintptr) *SequenceIter { | ||
| 258 | + | core.LazyRegister(&xSequenceSearch, "GLIB", "g_sequence_search", false) | |||
| 259 | + | ||||
| 233 | cret := xSequenceSearch(x.GoPointer(), DataVar, NewCallback(CmpFuncVar), CmpDataVar) | 260 | cret := xSequenceSearch(x.GoPointer(), DataVar, NewCallback(CmpFuncVar), CmpDataVar) | ||
| 234 | if cret == 0 { | 261 | if cret == 0 { | ||
| 235 | return nil | 262 | return nil | ||
| @@ -253,6 +280,8 @@ var xSequenceSearchIter func(uintptr, uintptr, uintptr, uintptr) uintptr | |||||
| 253 | // This function will fail if the data contained in the sequence is | 280 | // This function will fail if the data contained in the sequence is | ||
| 254 | // unsorted. | 281 | // unsorted. | ||
| 255 | func (x *Sequence) SearchIter(DataVar uintptr, IterCmpVar *SequenceIterCompareFunc, CmpDataVar uintptr) *SequenceIter { | 282 | func (x *Sequence) SearchIter(DataVar uintptr, IterCmpVar *SequenceIterCompareFunc, CmpDataVar uintptr) *SequenceIter { | ||
| 283 | + | core.LazyRegister(&xSequenceSearchIter, "GLIB", "g_sequence_search_iter", false) | |||
| 284 | + | ||||
| 256 | cret := xSequenceSearchIter(x.GoPointer(), DataVar, NewCallback(IterCmpVar), CmpDataVar) | 285 | cret := xSequenceSearchIter(x.GoPointer(), DataVar, NewCallback(IterCmpVar), CmpDataVar) | ||
| 257 | if cret == 0 { | 286 | if cret == 0 { | ||
| 258 | return nil | 287 | return nil | ||
| @@ -269,6 +298,8 @@ var xSequenceSort func(uintptr, uintptr, uintptr) | |||||
| 269 | // first comes before the second, and a positive value | 298 | // first comes before the second, and a positive value | ||
| 270 | // if the second comes before the first. | 299 | // if the second comes before the first. | ||
| 271 | func (x *Sequence) Sort(CmpFuncVar *CompareDataFunc, CmpDataVar uintptr) { | 300 | func (x *Sequence) Sort(CmpFuncVar *CompareDataFunc, CmpDataVar uintptr) { | ||
| 301 | + | core.LazyRegister(&xSequenceSort, "GLIB", "g_sequence_sort", false) | |||
| 302 | + | ||||
| 272 | xSequenceSort(x.GoPointer(), NewCallback(CmpFuncVar), CmpDataVar) | 303 | xSequenceSort(x.GoPointer(), NewCallback(CmpFuncVar), CmpDataVar) | ||
| 273 | } | 304 | } | ||
| 274 | 305 | ||||
| @@ -282,6 +313,8 @@ var xSequenceSortIter func(uintptr, uintptr, uintptr) | |||||
| 282 | // iterator comes before the second, and a positive value if the second | 313 | // iterator comes before the second, and a positive value if the second | ||
| 283 | // iterator comes before the first. | 314 | // iterator comes before the first. | ||
| 284 | func (x *Sequence) SortIter(CmpFuncVar *SequenceIterCompareFunc, CmpDataVar uintptr) { | 315 | func (x *Sequence) SortIter(CmpFuncVar *SequenceIterCompareFunc, CmpDataVar uintptr) { | ||
| 316 | + | core.LazyRegister(&xSequenceSortIter, "GLIB", "g_sequence_sort_iter", false) | |||
| 317 | + | ||||
| 285 | xSequenceSortIter(x.GoPointer(), NewCallback(CmpFuncVar), CmpDataVar) | 318 | xSequenceSortIter(x.GoPointer(), NewCallback(CmpFuncVar), CmpDataVar) | ||
| 286 | } | 319 | } | ||
| 287 | 320 | ||||
| @@ -310,6 +343,8 @@ var xSequenceIterCompare func(uintptr, *SequenceIter) int | |||||
| 310 | // | 343 | // | ||
| 311 | // The @a and @b iterators must point into the same sequence. | 344 | // The @a and @b iterators must point into the same sequence. | ||
| 312 | func (x *SequenceIter) Compare(BVar *SequenceIter) int { | 345 | func (x *SequenceIter) Compare(BVar *SequenceIter) int { | ||
| 346 | + | core.LazyRegister(&xSequenceIterCompare, "GLIB", "g_sequence_iter_compare", false) | |||
| 347 | + | ||||
| 313 | cret := xSequenceIterCompare(x.GoPointer(), BVar) | 348 | cret := xSequenceIterCompare(x.GoPointer(), BVar) | ||
| 314 | return cret | 349 | return cret | ||
| 315 | } | 350 | } | ||
| @@ -318,6 +353,8 @@ var xSequenceIterGetPosition func(uintptr) int | |||||
| 318 | 353 | ||||
| 319 | // Returns the position of @iter | 354 | // Returns the position of @iter | ||
| 320 | func (x *SequenceIter) GetPosition() int { | 355 | func (x *SequenceIter) GetPosition() int { | ||
| 356 | + | core.LazyRegister(&xSequenceIterGetPosition, "GLIB", "g_sequence_iter_get_position", false) | |||
| 357 | + | ||||
| 321 | cret := xSequenceIterGetPosition(x.GoPointer()) | 358 | cret := xSequenceIterGetPosition(x.GoPointer()) | ||
| 322 | return cret | 359 | return cret | ||
| 323 | } | 360 | } | ||
| @@ -326,6 +363,8 @@ var xSequenceIterGetSequence func(uintptr) uintptr | |||||
| 326 | 363 | ||||
| 327 | // Returns the #GSequence that @iter points into. | 364 | // Returns the #GSequence that @iter points into. | ||
| 328 | func (x *SequenceIter) GetSequence() *Sequence { | 365 | func (x *SequenceIter) GetSequence() *Sequence { | ||
| 366 | + | core.LazyRegister(&xSequenceIterGetSequence, "GLIB", "g_sequence_iter_get_sequence", false) | |||
| 367 | + | ||||
| 329 | cret := xSequenceIterGetSequence(x.GoPointer()) | 368 | cret := xSequenceIterGetSequence(x.GoPointer()) | ||
| 330 | if cret == 0 { | 369 | if cret == 0 { | ||
| 331 | return nil | 370 | return nil | ||
| @@ -337,6 +376,8 @@ var xSequenceIterIsBegin func(uintptr) bool | |||||
| 337 | 376 | ||||
| 338 | // Returns whether @iter is the begin iterator | 377 | // Returns whether @iter is the begin iterator | ||
| 339 | func (x *SequenceIter) IsBegin() bool { | 378 | func (x *SequenceIter) IsBegin() bool { | ||
| 379 | + | core.LazyRegister(&xSequenceIterIsBegin, "GLIB", "g_sequence_iter_is_begin", false) | |||
| 380 | + | ||||
| 340 | cret := xSequenceIterIsBegin(x.GoPointer()) | 381 | cret := xSequenceIterIsBegin(x.GoPointer()) | ||
| 341 | return cret | 382 | return cret | ||
| 342 | } | 383 | } | ||
| @@ -345,6 +386,8 @@ var xSequenceIterIsEnd func(uintptr) bool | |||||
| 345 | 386 | ||||
| 346 | // Returns whether @iter is the end iterator | 387 | // Returns whether @iter is the end iterator | ||
| 347 | func (x *SequenceIter) IsEnd() bool { | 388 | func (x *SequenceIter) IsEnd() bool { | ||
| 389 | + | core.LazyRegister(&xSequenceIterIsEnd, "GLIB", "g_sequence_iter_is_end", false) | |||
| 390 | + | ||||
| 348 | cret := xSequenceIterIsEnd(x.GoPointer()) | 391 | cret := xSequenceIterIsEnd(x.GoPointer()) | ||
| 349 | return cret | 392 | return cret | ||
| 350 | } | 393 | } | ||
| @@ -356,6 +399,8 @@ var xSequenceIterMove func(uintptr, int) uintptr | |||||
| 356 | // the begin iterator is returned. If @iter is closer than @delta positions | 399 | // the begin iterator is returned. If @iter is closer than @delta positions | ||
| 357 | // to the end of the sequence, the end iterator is returned. | 400 | // to the end of the sequence, the end iterator is returned. | ||
| 358 | func (x *SequenceIter) Move(DeltaVar int) *SequenceIter { | 401 | func (x *SequenceIter) Move(DeltaVar int) *SequenceIter { | ||
| 402 | + | core.LazyRegister(&xSequenceIterMove, "GLIB", "g_sequence_iter_move", false) | |||
| 403 | + | ||||
| 359 | cret := xSequenceIterMove(x.GoPointer(), DeltaVar) | 404 | cret := xSequenceIterMove(x.GoPointer(), DeltaVar) | ||
| 360 | if cret == 0 { | 405 | if cret == 0 { | ||
| 361 | return nil | 406 | return nil | ||
| @@ -368,6 +413,8 @@ var xSequenceIterNext func(uintptr) uintptr | |||||
| 368 | // Returns an iterator pointing to the next position after @iter. | 413 | // Returns an iterator pointing to the next position after @iter. | ||
| 369 | // If @iter is the end iterator, the end iterator is returned. | 414 | // If @iter is the end iterator, the end iterator is returned. | ||
| 370 | func (x *SequenceIter) Next() *SequenceIter { | 415 | func (x *SequenceIter) Next() *SequenceIter { | ||
| 416 | + | core.LazyRegister(&xSequenceIterNext, "GLIB", "g_sequence_iter_next", false) | |||
| 417 | + | ||||
| 371 | cret := xSequenceIterNext(x.GoPointer()) | 418 | cret := xSequenceIterNext(x.GoPointer()) | ||
| 372 | if cret == 0 { | 419 | if cret == 0 { | ||
| 373 | return nil | 420 | return nil | ||
| @@ -380,6 +427,8 @@ var xSequenceIterPrev func(uintptr) uintptr | |||||
| 380 | // Returns an iterator pointing to the previous position before @iter. | 427 | // Returns an iterator pointing to the previous position before @iter. | ||
| 381 | // If @iter is the begin iterator, the begin iterator is returned. | 428 | // If @iter is the begin iterator, the begin iterator is returned. | ||
| 382 | func (x *SequenceIter) Prev() *SequenceIter { | 429 | func (x *SequenceIter) Prev() *SequenceIter { | ||
| 430 | + | core.LazyRegister(&xSequenceIterPrev, "GLIB", "g_sequence_iter_prev", false) | |||
| 431 | + | ||||
| 383 | cret := xSequenceIterPrev(x.GoPointer()) | 432 | cret := xSequenceIterPrev(x.GoPointer()) | ||
| 384 | if cret == 0 { | 433 | if cret == 0 { | ||
| 385 | return nil | 434 | return nil | ||
| @@ -393,6 +442,8 @@ var xSequenceForeachRange func(*SequenceIter, *SequenceIter, uintptr, uintptr) | |||||
| 393 | // @user_data to the function. @func must not modify the sequence | 442 | // @user_data to the function. @func must not modify the sequence | ||
| 394 | // itself. | 443 | // itself. | ||
| 395 | func SequenceForeachRange(BeginVar *SequenceIter, EndVar *SequenceIter, FuncVar *Func, UserDataVar uintptr) { | 444 | func SequenceForeachRange(BeginVar *SequenceIter, EndVar *SequenceIter, FuncVar *Func, UserDataVar uintptr) { | ||
| 445 | + | core.LazyRegister(&xSequenceForeachRange, "GLIB", "g_sequence_foreach_range", false) | |||
| 446 | + | ||||
| 396 | xSequenceForeachRange(BeginVar, EndVar, NewCallback(FuncVar), UserDataVar) | 447 | xSequenceForeachRange(BeginVar, EndVar, NewCallback(FuncVar), UserDataVar) | ||
| 397 | } | 448 | } | ||
| 398 | 449 | ||||
| @@ -400,6 +451,8 @@ var xSequenceGet func(*SequenceIter) uintptr | |||||
| 400 | 451 | ||||
| 401 | // Returns the data that @iter points to. | 452 | // Returns the data that @iter points to. | ||
| 402 | func SequenceGet(IterVar *SequenceIter) uintptr { | 453 | func SequenceGet(IterVar *SequenceIter) uintptr { | ||
| 454 | + | core.LazyRegister(&xSequenceGet, "GLIB", "g_sequence_get", false) | |||
| 455 | + | ||||
| 403 | cret := xSequenceGet(IterVar) | 456 | cret := xSequenceGet(IterVar) | ||
| 404 | return cret | 457 | return cret | ||
| 405 | } | 458 | } | ||
| @@ -408,6 +461,8 @@ var xSequenceInsertBefore func(*SequenceIter, uintptr) uintptr | |||||
| 408 | 461 | ||||
| 409 | // Inserts a new item just before the item pointed to by @iter. | 462 | // Inserts a new item just before the item pointed to by @iter. | ||
| 410 | func SequenceInsertBefore(IterVar *SequenceIter, DataVar uintptr) *SequenceIter { | 463 | func SequenceInsertBefore(IterVar *SequenceIter, DataVar uintptr) *SequenceIter { | ||
| 464 | + | core.LazyRegister(&xSequenceInsertBefore, "GLIB", "g_sequence_insert_before", false) | |||
| 465 | + | ||||
| 411 | cret := xSequenceInsertBefore(IterVar, DataVar) | 466 | cret := xSequenceInsertBefore(IterVar, DataVar) | ||
| 412 | if cret == 0 { | 467 | if cret == 0 { | ||
| 413 | return nil | 468 | return nil | ||
| @@ -422,6 +477,8 @@ var xSequenceMove func(*SequenceIter, *SequenceIter) | |||||
| 422 | // after @src. It is allowed for @src and @dest to point into different | 477 | // after @src. It is allowed for @src and @dest to point into different | ||
| 423 | // sequences. | 478 | // sequences. | ||
| 424 | func SequenceMove(SrcVar *SequenceIter, DestVar *SequenceIter) { | 479 | func SequenceMove(SrcVar *SequenceIter, DestVar *SequenceIter) { | ||
| 480 | + | core.LazyRegister(&xSequenceMove, "GLIB", "g_sequence_move", false) | |||
| 481 | + | ||||
| 425 | xSequenceMove(SrcVar, DestVar) | 482 | xSequenceMove(SrcVar, DestVar) | ||
| 426 | } | 483 | } | ||
| 427 | 484 | ||||
| @@ -436,6 +493,8 @@ var xSequenceMoveRange func(*SequenceIter, *SequenceIter, *SequenceIter) | |||||
| 436 | // removed from the sequence. If @dest points to a place within | 493 | // removed from the sequence. If @dest points to a place within | ||
| 437 | // the (@begin, @end) range, the range does not move. | 494 | // the (@begin, @end) range, the range does not move. | ||
| 438 | func SequenceMoveRange(DestVar *SequenceIter, BeginVar *SequenceIter, EndVar *SequenceIter) { | 495 | func SequenceMoveRange(DestVar *SequenceIter, BeginVar *SequenceIter, EndVar *SequenceIter) { | ||
| 496 | + | core.LazyRegister(&xSequenceMoveRange, "GLIB", "g_sequence_move_range", false) | |||
| 497 | + | ||||
| 439 | xSequenceMoveRange(DestVar, BeginVar, EndVar) | 498 | xSequenceMoveRange(DestVar, BeginVar, EndVar) | ||
| 440 | } | 499 | } | ||
| 441 | 500 | ||||
| @@ -448,6 +507,8 @@ var xSequenceRangeGetMidpoint func(*SequenceIter, *SequenceIter) uintptr | |||||
| 448 | // The @begin and @end iterators must both point to the same sequence | 507 | // The @begin and @end iterators must both point to the same sequence | ||
| 449 | // and @begin must come before or be equal to @end in the sequence. | 508 | // and @begin must come before or be equal to @end in the sequence. | ||
| 450 | func SequenceRangeGetMidpoint(BeginVar *SequenceIter, EndVar *SequenceIter) *SequenceIter { | 509 | func SequenceRangeGetMidpoint(BeginVar *SequenceIter, EndVar *SequenceIter) *SequenceIter { | ||
| 510 | + | core.LazyRegister(&xSequenceRangeGetMidpoint, "GLIB", "g_sequence_range_get_midpoint", false) | |||
| 511 | + | ||||
| 451 | cret := xSequenceRangeGetMidpoint(BeginVar, EndVar) | 512 | cret := xSequenceRangeGetMidpoint(BeginVar, EndVar) | ||
| 452 | if cret == 0 { | 513 | if cret == 0 { | ||
| 453 | return nil | 514 | return nil | ||
| @@ -463,6 +524,8 @@ var xSequenceRemove func(*SequenceIter) | |||||
| 463 | // If the sequence has a data destroy function associated with it, this | 524 | // If the sequence has a data destroy function associated with it, this | ||
| 464 | // function is called on the data for the removed item. | 525 | // function is called on the data for the removed item. | ||
| 465 | func SequenceRemove(IterVar *SequenceIter) { | 526 | func SequenceRemove(IterVar *SequenceIter) { | ||
| 527 | + | core.LazyRegister(&xSequenceRemove, "GLIB", "g_sequence_remove", false) | |||
| 528 | + | ||||
| 466 | xSequenceRemove(IterVar) | 529 | xSequenceRemove(IterVar) | ||
| 467 | } | 530 | } | ||
| 468 | 531 | ||||
| @@ -473,6 +536,8 @@ var xSequenceRemoveRange func(*SequenceIter, *SequenceIter) | |||||
| 473 | // If the sequence has a data destroy function associated with it, this | 536 | // If the sequence has a data destroy function associated with it, this | ||
| 474 | // function is called on the data for the removed items. | 537 | // function is called on the data for the removed items. | ||
| 475 | func SequenceRemoveRange(BeginVar *SequenceIter, EndVar *SequenceIter) { | 538 | func SequenceRemoveRange(BeginVar *SequenceIter, EndVar *SequenceIter) { | ||
| 539 | + | core.LazyRegister(&xSequenceRemoveRange, "GLIB", "g_sequence_remove_range", false) | |||
| 540 | + | ||||
| 476 | xSequenceRemoveRange(BeginVar, EndVar) | 541 | xSequenceRemoveRange(BeginVar, EndVar) | ||
| 477 | } | 542 | } | ||
| 478 | 543 | ||||
| @@ -482,6 +547,8 @@ var xSequenceSet func(*SequenceIter, uintptr) | |||||
| 482 | // the sequence has a data destroy function associated with it, that | 547 | // the sequence has a data destroy function associated with it, that | ||
| 483 | // function is called on the existing data that @iter pointed to. | 548 | // function is called on the existing data that @iter pointed to. | ||
| 484 | func SequenceSet(IterVar *SequenceIter, DataVar uintptr) { | 549 | func SequenceSet(IterVar *SequenceIter, DataVar uintptr) { | ||
| 550 | + | core.LazyRegister(&xSequenceSet, "GLIB", "g_sequence_set", false) | |||
| 551 | + | ||||
| 485 | xSequenceSet(IterVar, DataVar) | 552 | xSequenceSet(IterVar, DataVar) | ||
| 486 | } | 553 | } | ||
| 487 | 554 | ||||
| @@ -498,6 +565,8 @@ var xSequenceSortChanged func(*SequenceIter, uintptr, uintptr) | |||||
| 498 | // the first item comes before the second, and a positive value if | 565 | // the first item comes before the second, and a positive value if | ||
| 499 | // the second item comes before the first. | 566 | // the second item comes before the first. | ||
| 500 | func SequenceSortChanged(IterVar *SequenceIter, CmpFuncVar *CompareDataFunc, CmpDataVar uintptr) { | 567 | func SequenceSortChanged(IterVar *SequenceIter, CmpFuncVar *CompareDataFunc, CmpDataVar uintptr) { | ||
| 568 | + | core.LazyRegister(&xSequenceSortChanged, "GLIB", "g_sequence_sort_changed", false) | |||
| 569 | + | ||||
| 501 | xSequenceSortChanged(IterVar, NewCallback(CmpFuncVar), CmpDataVar) | 570 | xSequenceSortChanged(IterVar, NewCallback(CmpFuncVar), CmpDataVar) | ||
| 502 | } | 571 | } | ||
| 503 | 572 | ||||
| @@ -513,6 +582,8 @@ var xSequenceSortChangedIter func(*SequenceIter, uintptr, uintptr) | |||||
| 513 | // iterator comes before the second, and a positive value if the second | 582 | // iterator comes before the second, and a positive value if the second | ||
| 514 | // iterator comes before the first. | 583 | // iterator comes before the first. | ||
| 515 | func SequenceSortChangedIter(IterVar *SequenceIter, IterCmpVar *SequenceIterCompareFunc, CmpDataVar uintptr) { | 584 | func SequenceSortChangedIter(IterVar *SequenceIter, IterCmpVar *SequenceIterCompareFunc, CmpDataVar uintptr) { | ||
| 585 | + | core.LazyRegister(&xSequenceSortChangedIter, "GLIB", "g_sequence_sort_changed_iter", false) | |||
| 586 | + | ||||
| 516 | xSequenceSortChangedIter(IterVar, NewCallback(IterCmpVar), CmpDataVar) | 587 | xSequenceSortChangedIter(IterVar, NewCallback(IterCmpVar), CmpDataVar) | ||
| 517 | } | 588 | } | ||
| 518 | 589 | ||||
| @@ -521,58 +592,12 @@ var xSequenceSwap func(*SequenceIter, *SequenceIter) | |||||
| 521 | // Swaps the items pointed to by @a and @b. It is allowed for @a and @b | 592 | // Swaps the items pointed to by @a and @b. It is allowed for @a and @b | ||
| 522 | // to point into difference sequences. | 593 | // to point into difference sequences. | ||
| 523 | func SequenceSwap(AVar *SequenceIter, BVar *SequenceIter) { | 594 | func SequenceSwap(AVar *SequenceIter, BVar *SequenceIter) { | ||
| 595 | + | core.LazyRegister(&xSequenceSwap, "GLIB", "g_sequence_swap", false) | |||
| 596 | + | ||||
| 524 | xSequenceSwap(AVar, BVar) | 597 | xSequenceSwap(AVar, BVar) | ||
| 525 | } | 598 | } | ||
| 526 | 599 | ||||
| 527 | func init() { | 600 | func init() { | ||
| 528 | core.SetPackageName("GLIB", "glib-2.0") | 601 | core.SetPackageName("GLIB", "glib-2.0") | ||
| 529 | core.SetSharedLibraries("GLIB", []string{"libgobject-2.0.so.0", "libglib-2.0.so.0", "libgobject-2.0.0.dylib", "libglib-2.0.0.dylib"}) | 602 | core.SetSharedLibraries("GLIB", []string{"libgobject-2.0.so.0", "libglib-2.0.so.0", "libgobject-2.0.0.dylib", "libglib-2.0.0.dylib"}) | ||
| 530 | - | var libs []uintptr | |||
| 531 | - | for _, libPath := range core.GetPaths("GLIB") { | |||
| 532 | - | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |||
| 533 | - | if err != nil { | |||
| 534 | - | panic(err) | |||
| 535 | - | } | |||
| 536 | - | libs = append(libs, lib) | |||
| 537 | - | } | |||
| 538 | - | ||||
| 539 | - | core.PuregoSafeRegister(&xSequenceForeachRange, libs, "g_sequence_foreach_range") | |||
| 540 | - | core.PuregoSafeRegister(&xSequenceGet, libs, "g_sequence_get") | |||
| 541 | - | core.PuregoSafeRegister(&xSequenceInsertBefore, libs, "g_sequence_insert_before") | |||
| 542 | - | core.PuregoSafeRegister(&xSequenceMove, libs, "g_sequence_move") | |||
| 543 | - | core.PuregoSafeRegister(&xSequenceMoveRange, libs, "g_sequence_move_range") | |||
| 544 | - | core.PuregoSafeRegister(&xSequenceRangeGetMidpoint, libs, "g_sequence_range_get_midpoint") | |||
| 545 | - | core.PuregoSafeRegister(&xSequenceRemove, libs, "g_sequence_remove") | |||
| 546 | - | core.PuregoSafeRegister(&xSequenceRemoveRange, libs, "g_sequence_remove_range") | |||
| 547 | - | core.PuregoSafeRegister(&xSequenceSet, libs, "g_sequence_set") | |||
| 548 | - | core.PuregoSafeRegister(&xSequenceSortChanged, libs, "g_sequence_sort_changed") | |||
| 549 | - | core.PuregoSafeRegister(&xSequenceSortChangedIter, libs, "g_sequence_sort_changed_iter") | |||
| 550 | - | core.PuregoSafeRegister(&xSequenceSwap, libs, "g_sequence_swap") | |||
| 551 | - | ||||
| 552 | - | core.PuregoSafeRegister(&xSequenceAppend, libs, "g_sequence_append") | |||
| 553 | - | core.PuregoSafeRegister(&xSequenceForeach, libs, "g_sequence_foreach") | |||
| 554 | - | core.PuregoSafeRegister(&xSequenceFree, libs, "g_sequence_free") | |||
| 555 | - | core.PuregoSafeRegister(&xSequenceGetBeginIter, libs, "g_sequence_get_begin_iter") | |||
| 556 | - | core.PuregoSafeRegister(&xSequenceGetEndIter, libs, "g_sequence_get_end_iter") | |||
| 557 | - | core.PuregoSafeRegister(&xSequenceGetIterAtPos, libs, "g_sequence_get_iter_at_pos") | |||
| 558 | - | core.PuregoSafeRegister(&xSequenceGetLength, libs, "g_sequence_get_length") | |||
| 559 | - | core.PuregoSafeRegister(&xSequenceInsertSorted, libs, "g_sequence_insert_sorted") | |||
| 560 | - | core.PuregoSafeRegister(&xSequenceInsertSortedIter, libs, "g_sequence_insert_sorted_iter") | |||
| 561 | - | core.PuregoSafeRegister(&xSequenceIsEmpty, libs, "g_sequence_is_empty") | |||
| 562 | - | core.PuregoSafeRegister(&xSequenceLookup, libs, "g_sequence_lookup") | |||
| 563 | - | core.PuregoSafeRegister(&xSequenceLookupIter, libs, "g_sequence_lookup_iter") | |||
| 564 | - | core.PuregoSafeRegister(&xSequencePrepend, libs, "g_sequence_prepend") | |||
| 565 | - | core.PuregoSafeRegister(&xSequenceSearch, libs, "g_sequence_search") | |||
| 566 | - | core.PuregoSafeRegister(&xSequenceSearchIter, libs, "g_sequence_search_iter") | |||
| 567 | - | core.PuregoSafeRegister(&xSequenceSort, libs, "g_sequence_sort") | |||
| 568 | - | core.PuregoSafeRegister(&xSequenceSortIter, libs, "g_sequence_sort_iter") | |||
| 569 | - | ||||
| 570 | - | core.PuregoSafeRegister(&xSequenceIterCompare, libs, "g_sequence_iter_compare") | |||
| 571 | - | core.PuregoSafeRegister(&xSequenceIterGetPosition, libs, "g_sequence_iter_get_position") | |||
| 572 | - | core.PuregoSafeRegister(&xSequenceIterGetSequence, libs, "g_sequence_iter_get_sequence") | |||
| 573 | - | core.PuregoSafeRegister(&xSequenceIterIsBegin, libs, "g_sequence_iter_is_begin") | |||
| 574 | - | core.PuregoSafeRegister(&xSequenceIterIsEnd, libs, "g_sequence_iter_is_end") | |||
| 575 | - | core.PuregoSafeRegister(&xSequenceIterMove, libs, "g_sequence_iter_move") | |||
| 576 | - | core.PuregoSafeRegister(&xSequenceIterNext, libs, "g_sequence_iter_next") | |||
| 577 | - | core.PuregoSafeRegister(&xSequenceIterPrev, libs, "g_sequence_iter_prev") | |||
| 578 | } | 603 | } | ||