[gnome-builder/wip/gtk4-port: 1265/1774] build: install style schemes to pkgdatadir




commit ff95b315a6ac1cde74b2612e535c097338af90e1
Author: Christian Hergert <chergert redhat com>
Date:   Wed Jun 1 00:12:16 2022 -0700

    build: install style schemes to pkgdatadir
    
    This allows us to ship private things that don't collide with the system
    installation. In particular, we'll probably ship some private GtkSourceView
    style schemes that make sense for us.

 data/meson.build                                    | 2 +-
 data/style-schemes/meson.build                      | 4 ----
 data/{style-schemes => styles}/builder-dark.xml     | 0
 data/{style-schemes => styles}/builder.xml          | 0
 data/{style-schemes => styles}/its/style-scheme.its | 0
 data/{style-schemes => styles}/its/style-scheme.loc | 0
 data/styles/meson.build                             | 4 ++++
 src/libide/gui/ide-application.c                    | 2 +-
 8 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index 5afb6f81d..a5eea109a 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -2,7 +2,7 @@ subdir('appdata')
 subdir('fonts')
 subdir('gsettings')
 subdir('icons')
-subdir('style-schemes')
+subdir('styles')
 
 # Desktop launcher and description file.
 desktop_file = i18n.merge_file(
diff --git a/data/style-schemes/builder-dark.xml b/data/styles/builder-dark.xml
similarity index 100%
rename from data/style-schemes/builder-dark.xml
rename to data/styles/builder-dark.xml
diff --git a/data/style-schemes/builder.xml b/data/styles/builder.xml
similarity index 100%
rename from data/style-schemes/builder.xml
rename to data/styles/builder.xml
diff --git a/data/style-schemes/its/style-scheme.its b/data/styles/its/style-scheme.its
similarity index 100%
rename from data/style-schemes/its/style-scheme.its
rename to data/styles/its/style-scheme.its
diff --git a/data/style-schemes/its/style-scheme.loc b/data/styles/its/style-scheme.loc
similarity index 100%
rename from data/style-schemes/its/style-scheme.loc
rename to data/styles/its/style-scheme.loc
diff --git a/data/styles/meson.build b/data/styles/meson.build
new file mode 100644
index 000000000..53f6cd7e8
--- /dev/null
+++ b/data/styles/meson.build
@@ -0,0 +1,4 @@
+install_data([
+  'builder.xml',
+  'builder-dark.xml',
+], install_dir: join_paths(get_option('datadir'), 'gnome-builder/styles'))
diff --git a/src/libide/gui/ide-application.c b/src/libide/gui/ide-application.c
index 972bee884..bd5f9e93b 100644
--- a/src/libide/gui/ide-application.c
+++ b/src/libide/gui/ide-application.c
@@ -173,7 +173,7 @@ ide_application_startup (GApplication *app)
   styles = gtk_source_style_scheme_manager_get_default ();
   style_path = g_build_filename (g_get_home_dir (), ".local", "share", "gtksourceview-5", "styles", NULL);
   gtk_source_style_scheme_manager_append_search_path (styles, style_path);
-  gtk_source_style_scheme_manager_append_search_path (styles, PACKAGE_DATADIR"/gtksourceview-5/styles/");
+  gtk_source_style_scheme_manager_append_search_path (styles, PACKAGE_DATADIR"/gnome-builder/styles/");
 
   /* Add custom locations for language specs */
   langs = gtk_source_language_manager_get_default ();


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]