From ab480a64a467a95876c5c476ce7b040d88c88cd9 Mon Sep 17 00:00:00 2001 From: Kolan Sh Date: Tue, 29 Sep 2015 19:44:33 +0300 Subject: [PATCH] Completed ;-) --- CMakeLists.txt | 2 +- INSTALL | 7 +------ cmake/backbone | 2 +- config/CMakeLists.txt | 6 ++---- pkgs/gentoo/app-misc/gschema-test/Manifest | 1 + .../app-misc/gschema-test/gschema-test-9999.ebuild | 14 +++++++++++++- src/GLib.Settings.vala | 6 ++++-- 7 files changed, 23 insertions(+), 15 deletions(-) create mode 100644 pkgs/gentoo/app-misc/gschema-test/Manifest diff --git a/CMakeLists.txt b/CMakeLists.txt index 7b100ae..be92415 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -PROJECT (LAviewCore C) +PROJECT (GSchemaTest C) CMAKE_MINIMUM_REQUIRED (VERSION 2.8) diff --git a/INSTALL b/INSTALL index 240ca5f..e95e5e2 100644 --- a/INSTALL +++ b/INSTALL @@ -4,17 +4,12 @@ Build-Time Dependencies Vala: https://wiki.gnome.org/Projects/Vala -Gee: https://wiki.gnome.org/Projects/Libgee -LAview-LaTeX-Struct: https://redmine.backbone.ws/projects/latex-struct -GObject-Plugin: https://redmine.backbone.ws/projects/plugin CMake: http://www.cmake.org NSIS (W32): http://nsis.sourceforge.net Run-Time Dependencies -Gee: https://wiki.gnome.org/Projects/Libgee -LAview-LaTeX-Struct: https://redmine.backbone.ws/projects/latex-struct -GObject-Plugin: https://redmine.backbone.ws/projects/plugin +-- Operation Systems diff --git a/cmake/backbone b/cmake/backbone index bcf06be..e294fa0 160000 --- a/cmake/backbone +++ b/cmake/backbone @@ -1 +1 @@ -Subproject commit bcf06bedc568533eabcbb22d284090433a9766f5 +Subproject commit e294fa055e6107a337369fdedb0f16ae575ec64b diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt index a88eaf6..c128bbd 100644 --- a/config/CMakeLists.txt +++ b/config/CMakeLists.txt @@ -1,4 +1,2 @@ -install (FILES "ws.backbone.gsettings.glib.gschema.xml" - DESTINATION "share/glib-2.0/schemas") -execute_process (COMMAND glib-compile-schemas "${CMAKE_INSTALL_PREFIX}/share/glib-2.0/schemas") -install (SCRIPT "compile-schemas.cmake") +SET (GSchemaFile "ws.backbone.gsettings.glib.gschema.xml") +INCLUDE (GSchemaCommonRules) diff --git a/pkgs/gentoo/app-misc/gschema-test/Manifest b/pkgs/gentoo/app-misc/gschema-test/Manifest new file mode 100644 index 0000000..7fd48eb --- /dev/null +++ b/pkgs/gentoo/app-misc/gschema-test/Manifest @@ -0,0 +1 @@ +EBUILD gschema-test-9999.ebuild 907 SHA256 9268cc5e331712ec37af586f933ab38ec5f8883b05bf5aa6a1fcf025456abc56 SHA512 05cea0ef815e6bc4ddb5db5b935dc7dd57109544b31a0a0b0252fc57384887a32989bc726ac51b1edbe182cd8ce0635f909d500954196b401676c4eaa218c325 WHIRLPOOL 45df671d5a995a2ee0ee95c03f00cdea1cdcd3fd864fe400227f22506be5eb7f10a84a01e8efb13de995315135490921d8fc9d417b9953b54bb1c24b07877c07 diff --git a/pkgs/gentoo/app-misc/gschema-test/gschema-test-9999.ebuild b/pkgs/gentoo/app-misc/gschema-test/gschema-test-9999.ebuild index 8aa21a9..d0b8ff2 100644 --- a/pkgs/gentoo/app-misc/gschema-test/gschema-test-9999.ebuild +++ b/pkgs/gentoo/app-misc/gschema-test/gschema-test-9999.ebuild @@ -4,7 +4,7 @@ EAPI=5 -inherit cmake-utils +inherit gnome2-utils cmake-utils if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI=${EGIT_REPO_URI:-"git://git.backbone.ws/dev/gschema-test.git"} @@ -32,3 +32,15 @@ DEPEND=">=dev-lang/vala-0.26 >=dev-libs/libgee-0.16" RDEPEND="${DEPEND}" + +pkg_preinst() { + gnome2_schemas_savelist +} + +pkg_postinst() { + gnome2_schemas_update +} + +pkg_posrm() { + gnome2_schemas_update +} diff --git a/src/GLib.Settings.vala b/src/GLib.Settings.vala index 4053eb8..0093d42 100644 --- a/src/GLib.Settings.vala +++ b/src/GLib.Settings.vala @@ -1,7 +1,9 @@ public static int main (string[] args) { try { // Custom location: - string settings_dir = Path.get_dirname (args[0]); + File exec_file = File.new_for_path (Environment.find_program_in_path (args[0])); + string settings_dir = Path.build_path (Path.DIR_SEPARATOR_S, exec_file.get_parent().get_parent().get_path(), "share/glib-2.0/schemas"); + SettingsSchemaSource sss = new SettingsSchemaSource.from_directory (settings_dir, null, false); SettingsSchema schema = sss.lookup ("org.example.glib-settings-schema-source", false); if (sss.lookup == null) { @@ -14,7 +16,7 @@ public static int main (string[] args) { // Default location: (XDG_DATA_DIRS) // Settings settings = new Settings ("org.example.glib-settings-schema-source"); - + // Output: ``Hello, earthlings`` string greeting = settings.get_string ("greeting");