From df7a7488950139e3884972e2363294051e33d45d Mon Sep 17 00:00:00 2001
From: infirit <infirit@gmail.com>
Date: Sun, 6 Sep 2015 21:55:35 +0200
Subject: Rework gsettings schema building

 * Bump intltool required version for gsettings support
 * Extract strings with intltool directly
 * Let autoconf generate the xml files
---
 cpufreq/Makefile.am                                  |  9 +++------
 cpufreq/org.mate.panel.applet.cpufreq.gschema.xml.in | 20 ++++++++++++++++++++
 .../org.mate.panel.applet.cpufreq.gschema.xml.in.in  | 20 --------------------
 3 files changed, 23 insertions(+), 26 deletions(-)
 create mode 100644 cpufreq/org.mate.panel.applet.cpufreq.gschema.xml.in
 delete mode 100644 cpufreq/org.mate.panel.applet.cpufreq.gschema.xml.in.in

(limited to 'cpufreq')

diff --git a/cpufreq/Makefile.am b/cpufreq/Makefile.am
index ea9ea2aa..af18f188 100644
--- a/cpufreq/Makefile.am
+++ b/cpufreq/Makefile.am
@@ -1,12 +1,10 @@
 SUBDIRS = help pixmaps src
 
 @INTLTOOL_XML_NOMERGE_RULE@
-gsettings_SCHEMAS = org.mate.panel.applet.cpufreq.gschema.xml
+cpufreq_gschema_in_files = org.mate.panel.applet.cpufreq.gschema.xml.in
+gsettings_SCHEMAS = $(cpufreq_gschema_in_files:.xml.in=.xml)
 @GSETTINGS_RULES@
 
-%.gschema.xml.in: %.gschema.xml.in.in Makefile
-	$(AM_V_GEN) $(SED) -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@
-
 appletdir       = $(datadir)/mate-panel/applets
 applet_in_files = org.mate.applets.CPUFreqApplet.mate-panel-applet.in
 applet_DATA     = $(applet_in_files:.mate-panel-applet.in=.mate-panel-applet)
@@ -37,7 +35,6 @@ CLEANFILES = \
              $(applet_DATA)			\
              $(applet_DATA).in			\
              $(service_DATA)			\
-	     $(gsettings_SCHEMAS_in)            \
 	     $(gsettings_SCHEMAS)               \
 	     *.gschema.valid                    \
 	     *.bak                              \
@@ -46,7 +43,7 @@ CLEANFILES = \
 EXTRA_DIST = \
              org.mate.applets.CPUFreqApplet.mate-panel-applet.in.in	\
              $(service_in_files)				\
-	     $(gsettings_SCHEMAS).in.in				\
+	     $(cpufreq_gschema_in_files)			\
 	     $(builder_DATA)                 			\
 	     $(ui_DATA)
 	     
diff --git a/cpufreq/org.mate.panel.applet.cpufreq.gschema.xml.in b/cpufreq/org.mate.panel.applet.cpufreq.gschema.xml.in
new file mode 100644
index 00000000..7f306a7e
--- /dev/null
+++ b/cpufreq/org.mate.panel.applet.cpufreq.gschema.xml.in
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+  <schema id="org.mate.panel.applet.cpufreq">
+    <key name="cpu" type="i">
+      <default>0</default>
+      <summary>CPU to Monitor</summary>
+      <description>Set the CPU to monitor. In a single processor system you don't have to change it.</description>
+    </key>
+    <key name="show-mode" type="i">
+      <default>2</default>
+      <summary>Mode to show cpu usage</summary>
+      <description>A 0 value means to show the applet in graphic mode (pixmap only), 1 to show the applet in text mode (not to show the pixmap) and 2 to show the applet in graphic and text mode.</description>
+    </key>
+    <key name="show-text-mode" type="i">
+      <default>1</default>
+      <summary>The type of text to display (if the text is enabled).</summary>
+      <description>A 0 value means to show cpu frequency, 1 to show frequency and units, and 2 to show percentage instead of frequency.</description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/cpufreq/org.mate.panel.applet.cpufreq.gschema.xml.in.in b/cpufreq/org.mate.panel.applet.cpufreq.gschema.xml.in.in
deleted file mode 100644
index 7f306a7e..00000000
--- a/cpufreq/org.mate.panel.applet.cpufreq.gschema.xml.in.in
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
-  <schema id="org.mate.panel.applet.cpufreq">
-    <key name="cpu" type="i">
-      <default>0</default>
-      <summary>CPU to Monitor</summary>
-      <description>Set the CPU to monitor. In a single processor system you don't have to change it.</description>
-    </key>
-    <key name="show-mode" type="i">
-      <default>2</default>
-      <summary>Mode to show cpu usage</summary>
-      <description>A 0 value means to show the applet in graphic mode (pixmap only), 1 to show the applet in text mode (not to show the pixmap) and 2 to show the applet in graphic and text mode.</description>
-    </key>
-    <key name="show-text-mode" type="i">
-      <default>1</default>
-      <summary>The type of text to display (if the text is enabled).</summary>
-      <description>A 0 value means to show cpu frequency, 1 to show frequency and units, and 2 to show percentage instead of frequency.</description>
-    </key>
-  </schema>
-</schemalist>
-- 
cgit v1.2.1