From 25ae7dfd05b53d9c32e9a8b694ba81506524f0a8 Mon Sep 17 00:00:00 2001
From: Takao Fujiwara <tfujiwar@redhat.com>
Date: Thu, 1 Feb 2018 15:02:09 +0900
Subject: [PATCH 2/2] Move ara(qwerty), sy(ku) layout to extras.xml for Arabic

Arabic people request it.

https://bugs.freedesktop.org/show_bug.cgi?id=104868#c2
---
 rules/base.extras.xml.in | 55 ++++++++++++++++++++++++++++++++++++++++++++++++
 rules/base.xml.in        | 45 ---------------------------------------
 2 files changed, 55 insertions(+), 45 deletions(-)

diff --git a/rules/base.extras.xml.in b/rules/base.extras.xml.in
index 2ab4aac..5688ba4 100644
--- a/rules/base.extras.xml.in
+++ b/rules/base.extras.xml.in
@@ -723,6 +723,18 @@
             <_description>Ugaritic instead of Arabic</_description>
           </configItem>
         </variant>
+        <variant>
+          <configItem>
+            <name>qwerty</name>
+            <_description>Arabic (QWERTY)</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>qwerty_digits</name>
+            <_description>Arabic (qwerty/digits)</_description>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>
@@ -1166,6 +1178,49 @@
         </languageList>
       </configItem>
     </layout>
+    <layout>
+      <configItem>
+        <name>sy</name>
+        <!-- Keyboard indicator for Arabic layouts -->
+        <_shortDescription>ar</_shortDescription>
+        <_description>Arabic (Syria)</_description>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>ku</name>
+            <!-- Keyboard indicator for Kurdish layouts -->
+            <_shortDescription>ku</_shortDescription>
+            <_description>Kurdish (Syria, Latin Q)</_description>
+            <languageList>
+              <iso639Id>kur</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ku_f</name>
+            <!-- Keyboard indicator for Kurdish layouts -->
+            <_shortDescription>ku</_shortDescription>
+            <_description>Kurdish (Syria, F)</_description>
+            <languageList>
+              <iso639Id>kur</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ku_alt</name>
+            <!-- Keyboard indicator for Kurdish layouts -->
+            <_shortDescription>ku</_shortDescription>
+            <_description>Kurdish (Syria, Latin Alt-Q)</_description>
+            <languageList>
+              <iso639Id>kur</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
   </layoutList>
   <optionList>
       <group allowMultipleSelection="true">
diff --git a/rules/base.xml.in b/rules/base.xml.in
index 1079517..da555aa 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -1579,18 +1579,6 @@
             <_description>Arabic (digits)</_description>
           </configItem>
         </variant>
-        <variant>
-          <configItem>
-            <name>qwerty</name>
-            <_description>Arabic (QWERTY)</_description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>qwerty_digits</name>
-            <_description>Arabic (qwerty/digits)</_description>
-          </configItem>
-        </variant>
         <variant>
           <configItem>
             <name>buckwalter</name>
@@ -5034,39 +5022,6 @@
             <_description>Syriac (phonetic)</_description>
           </configItem>
         </variant>
-        <variant>
-          <configItem>
-            <name>ku</name>
-            <!-- Keyboard indicator for Kurdish layouts -->
-            <_shortDescription>ku</_shortDescription>
-            <_description>Kurdish (Syria, Latin Q)</_description>
-            <languageList>
-              <iso639Id>kur</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>ku_f</name>
-            <!-- Keyboard indicator for Kurdish layouts -->
-            <_shortDescription>ku</_shortDescription>
-            <_description>Kurdish (Syria, F)</_description>
-            <languageList>
-              <iso639Id>kur</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>ku_alt</name>
-            <!-- Keyboard indicator for Kurdish layouts -->
-            <_shortDescription>ku</_shortDescription>
-            <_description>Kurdish (Syria, Latin Alt-Q)</_description>
-            <languageList>
-              <iso639Id>kur</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
       </variantList>
     </layout>
     <layout>
-- 
2.14.2