GIR: Remove default library names and `pkg-config` names since those are populated dynamically now
Signed-off-by: Felicitas Pojtinger <felicitas@pojtinger.com>
- commit
- 5cfa9675148687209a4a3ef425bd4793c774ac15
- author
- Felicitas Pojtinger · · 2025-10-17 06:20 UTC
- committer
- Jeroen Wijenbergh · · 2025-10-22 07:42 UTC
- parent
- 2180974
- signature
- unsigned
1 file · +4 -28
M internal/core/core.go +4 -28
| @@ -38,36 +38,12 @@ var paths = map[string][]string{ | |||
| 38 | 38 | } | |
| 39 | 39 | ||
| 40 | 40 | // names is a lookup from library names to shared object filenames | |
| 41 | - | // This is populated dynamically via SetSharedLibrary and has defaults for common libraries | |
| 42 | - | var names = map[string][]string{ | |
| 43 | - | "ADW": {"libadwaita-1.so"}, | |
| 44 | - | "CAIRO": {"libcairo.so"}, | |
| 45 | - | "GDKPIXBUF": {"libgdk_pixbuf-2.0.so"}, | |
| 46 | - | "GIO": {"libgio-2.0.so"}, | |
| 47 | - | "GLIB": {"libglib-2.0.so", "libgobject-2.0.so"}, | |
| 48 | - | "GMODULE": {"libgmodule-2.0.so"}, | |
| 49 | - | "GOBJECT": {"libgobject-2.0.so"}, | |
| 50 | - | "GRAPHENE": {"libgraphene-1.0.so"}, | |
| 51 | - | "GTK": {"libgtk-4.so"}, | |
| 52 | - | "PANGO": {"libpango-1.0.so"}, | |
| 53 | - | "PANGOCAIRO": {"libpangocairo-1.0.so"}, | |
| 54 | - | } | |
| 41 | + | // This is populated dynamically via SetSharedLibrary | |
| 42 | + | var names = map[string][]string{} | |
| 55 | 43 | ||
| 56 | 44 | // pkgConfNames is a lookup from library names to pkg-config library names | |
| 57 | - | // This is populated dynamically via SetPackageName and has defaults for common libraries | |
| 58 | - | var pkgConfNames = map[string]string{ | |
| 59 | - | "ADW": "libadwaita-1", | |
| 60 | - | "CAIRO": "cairo", | |
| 61 | - | "GDKPIXBUF": "gdk-pixbuf-2.0", | |
| 62 | - | "GIO": "gio-2.0", | |
| 63 | - | "GLIB": "glib-2.0", | |
| 64 | - | "GMODULE": "gmodule-2.0", | |
| 65 | - | "GOBJECT": "gobject-2.0", | |
| 66 | - | "GRAPHENE": "graphene-gobject-1.0", | |
| 67 | - | "GTK": "gtk4", | |
| 68 | - | "PANGO": "pango", | |
| 69 | - | "PANGOCAIRO": "pangocairo", | |
| 70 | - | } | |
| 45 | + | // This is populated dynamically via SetPackageName | |
| 46 | + | var pkgConfNames = map[string]string{} | |
| 71 | 47 | ||
| 72 | 48 | // SetPackageName registers a pkg-config package name for a library. | |
| 73 | 49 | // This is used by the code generator to set package names from GIR files. | |
| @@ -38,36 +38,12 @@ var paths = map[string][]string{ | |||||
| 38 | } | 38 | } | ||
| 39 | 39 | ||||
| 40 | // names is a lookup from library names to shared object filenames | 40 | // names is a lookup from library names to shared object filenames | ||
| 41 | - | // This is populated dynamically via SetSharedLibrary and has defaults for common libraries | 41 | + | // This is populated dynamically via SetSharedLibrary |
| 42 | - | var names = map[string][]string{ | 42 | + | var names = map[string][]string{} |
| 43 | - | "ADW": {"libadwaita-1.so"}, | |||
| 44 | - | "CAIRO": {"libcairo.so"}, | |||
| 45 | - | "GDKPIXBUF": {"libgdk_pixbuf-2.0.so"}, | |||
| 46 | - | "GIO": {"libgio-2.0.so"}, | |||
| 47 | - | "GLIB": {"libglib-2.0.so", "libgobject-2.0.so"}, | |||
| 48 | - | "GMODULE": {"libgmodule-2.0.so"}, | |||
| 49 | - | "GOBJECT": {"libgobject-2.0.so"}, | |||
| 50 | - | "GRAPHENE": {"libgraphene-1.0.so"}, | |||
| 51 | - | "GTK": {"libgtk-4.so"}, | |||
| 52 | - | "PANGO": {"libpango-1.0.so"}, | |||
| 53 | - | "PANGOCAIRO": {"libpangocairo-1.0.so"}, | |||
| 54 | - | } | |||
| 55 | 43 | ||||
| 56 | // pkgConfNames is a lookup from library names to pkg-config library names | 44 | // pkgConfNames is a lookup from library names to pkg-config library names | ||
| 57 | - | // This is populated dynamically via SetPackageName and has defaults for common libraries | 45 | + | // This is populated dynamically via SetPackageName |
| 58 | - | var pkgConfNames = map[string]string{ | 46 | + | var pkgConfNames = map[string]string{} |
| 59 | - | "ADW": "libadwaita-1", | |||
| 60 | - | "CAIRO": "cairo", | |||
| 61 | - | "GDKPIXBUF": "gdk-pixbuf-2.0", | |||
| 62 | - | "GIO": "gio-2.0", | |||
| 63 | - | "GLIB": "glib-2.0", | |||
| 64 | - | "GMODULE": "gmodule-2.0", | |||
| 65 | - | "GOBJECT": "gobject-2.0", | |||
| 66 | - | "GRAPHENE": "graphene-gobject-1.0", | |||
| 67 | - | "GTK": "gtk4", | |||
| 68 | - | "PANGO": "pango", | |||
| 69 | - | "PANGOCAIRO": "pangocairo", | |||
| 70 | - | } | |||
| 71 | 47 | ||||
| 72 | // SetPackageName registers a pkg-config package name for a library. | 48 | // SetPackageName registers a pkg-config package name for a library. | ||
| 73 | // This is used by the code generator to set package names from GIR files. | 49 | // This is used by the code generator to set package names from GIR files. | ||