Initial import

7 files changed, 280 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 000000000000..23fec4a02f35
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,30 @@
+# Generated by mksrcinfo v8
+# Thu Dec 31 23:10:28 UTC 2015
+pkgbase = gsettings-desktop-schemas-ubuntu
+	pkgdesc = Shared GSettings schemas for the desktop
+	pkgver = 3.18.1
+	pkgrel = 1
+	url = http://live.gnome.org/
+	install = gsettings-desktop-schemas.install
+	arch = any
+	license = GPL
+	makedepends = intltool
+	makedepends = gobject-introspection
+	depends = glib2
+	provides = gsettings-desktop-schemas=3.18.1
+	conflicts = gsettings-desktop-schemas
+	source = http://ftp.gnome.org/pub/gnome/sources/gsettings-desktop-schemas/3.18/gsettings-desktop-schemas-3.18.1.tar.xz
+	source = https://launchpad.net/ubuntu/+archive/primary/+files/gsettings-desktop-schemas_3.18.0-0ubuntu1.debian.tar.xz
+	source = git_revert_background_key_removal.patch
+	source = git_revert_menu_icon_key_removal.patch
+	source = git_revert_notifications_key_removal.patch
+	source = ubuntu_lock-on-suspend.patch
+	sha512sums = 8dc3c9890f979860f06efa949c92c699e40f25eedc24eae087d9c70555ec9ef513a873f9a787f10b34208bf11c7be903cbaeecc95a4d93b4e556640be1c21b15
+	sha512sums = 1ff419ad9819b7b9a6d7bab98be51df5fa91f9dc7372e012d1a4be9e6688d7ec6a873194868b028560be457f719eb43b6bad5f1e19e69b9ecc793873ee48672b
+	sha512sums = 423c81fefb2eb1580d703499baee449e0dfe88b0d8bb3cbc5815c2668e859f0334bb352d0f58ba312c7fc3257fd8a78f0935c834429b3c7d3986ee5996b5ae5a
+	sha512sums = cae6c01833043d9d7d889561a6afb7bae5f9186603552e1277b6a8f792148bd585ac19aac41253223cdeeba4d031f51984ac126fae9c02ceca396cb69e4db75f
+	sha512sums = 2af269c096d9f15a7e91440a97ee69d08e778b498fd835194d5abca02630bc7a5dcb2c8a2ad3ae21e95b40cbcf0cd6773f34aeb9a2655d25f4b59d231f478b1d
+	sha512sums = 301830b3f9c9f2aac9e44ea2e2305cfc9d4864f3bd6ac4c5824ce12de45c72329ddca303adfb7948063acbb7ff892b0970767b1b552aff00834c517f25af2c8c
+
+pkgname = gsettings-desktop-schemas-ubuntu
+
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 000000000000..65ac85aeb41d
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,65 @@
+# Maintainer: Michael Healy <horsemanoffaith@gmail.com>
+
+# vercheck-pkgbuild: auto
+# vercheck-ubuntu: name=${pkgname%-*}, repo=wily
+# vercheck-archlinux: name=${pkgname%-*}, repo=extra, arch=x86_64
+# vercheck-gnome: name=${pkgname%-*}, majorver=3.18
+
+pkgname=gsettings-desktop-schemas-ubuntu
+_ubuntu_rel=0ubuntu1
+_ubuntu_ver=3.18.0
+pkgver=3.18.1
+pkgrel=1
+pkgdesc="Shared GSettings schemas for the desktop"
+arch=(any)
+url="http://live.gnome.org/"
+license=(GPL)
+depends=(glib2)
+makedepends=(intltool gobject-introspection)
+provides=("${pkgname%-*}=${pkgver}")
+conflicts=("${pkgname%-*}")
+install=${pkgname%-*}.install
+source=("http://ftp.gnome.org/pub/gnome/sources/${pkgname%-*}/${pkgver%.*}/${pkgname%-*}-${pkgver}.tar.xz"
+        "https://launchpad.net/ubuntu/+archive/primary/+files/gsettings-desktop-schemas_${_ubuntu_ver:-${pkgver}}-${_ubuntu_rel}.debian.tar.xz"
+        git_revert_background_key_removal.patch
+        git_revert_menu_icon_key_removal.patch
+        git_revert_notifications_key_removal.patch
+        ubuntu_lock-on-suspend.patch)
+sha512sums=('8dc3c9890f979860f06efa949c92c699e40f25eedc24eae087d9c70555ec9ef513a873f9a787f10b34208bf11c7be903cbaeecc95a4d93b4e556640be1c21b15'
+            '1ff419ad9819b7b9a6d7bab98be51df5fa91f9dc7372e012d1a4be9e6688d7ec6a873194868b028560be457f719eb43b6bad5f1e19e69b9ecc793873ee48672b'
+            '423c81fefb2eb1580d703499baee449e0dfe88b0d8bb3cbc5815c2668e859f0334bb352d0f58ba312c7fc3257fd8a78f0935c834429b3c7d3986ee5996b5ae5a'
+            'cae6c01833043d9d7d889561a6afb7bae5f9186603552e1277b6a8f792148bd585ac19aac41253223cdeeba4d031f51984ac126fae9c02ceca396cb69e4db75f'
+            '2af269c096d9f15a7e91440a97ee69d08e778b498fd835194d5abca02630bc7a5dcb2c8a2ad3ae21e95b40cbcf0cd6773f34aeb9a2655d25f4b59d231f478b1d'
+            '301830b3f9c9f2aac9e44ea2e2305cfc9d4864f3bd6ac4c5824ce12de45c72329ddca303adfb7948063acbb7ff892b0970767b1b552aff00834c517f25af2c8c')
+
+prepare() {
+  cd "${pkgname%-*}-${pkgver}"
+
+  # Apply Ubuntu's patches
+
+  sed -i '/git_revert_notifications_key_removal.patch/d' ../debian/patches/series
+
+#  for i in $(grep -v '#' ../debian/patches/series); do
+#    msg "Applying ${i} ..."
+#    patch -p1 -i "../debian/patches/${i}"
+#  done
+
+  patch -p1 -i ../git_revert_background_key_removal.patch
+  patch -p1 -i ../git_revert_menu_icon_key_removal.patch
+  patch -p1 -i ../git_revert_notifications_key_removal.patch
+  patch -p1 -i ../ubuntu_lock-on-suspend.patch
+}
+
+build() {
+  cd "${pkgname%-*}-${pkgver}"
+
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+    --disable-schemas-compile
+  make
+}
+
+package() {
+  cd "${pkgname%-*}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/git_revert_background_key_removal.patch b/git_revert_background_key_removal.patch
new file mode 100644
index 000000000000..76ed2c59fff3
--- /dev/null
+++ b/git_revert_background_key_removal.patch
@@ -0,0 +1,27 @@
+From c3c7e06967b4cdb7f7ac2f810578002e42497999 Mon Sep 17 00:00:00 2001
+From: Tim Lunn <tim@feathertop.org>
+Date: Wed, 20 Mar 2013 22:51:35 +1100
+Subject: [PATCH] Revert "schemas: Remove unused "draw-background" key"
+
+This reverts commit a59b45e766a2b3732b3bd2473ee5fbe7607a7f75.
+---
+ schemas/org.gnome.desktop.background.gschema.xml.in | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+--- a/schemas/org.gnome.desktop.background.gschema.xml.in
++++ b/schemas/org.gnome.desktop.background.gschema.xml.in
+@@ -1,5 +1,14 @@
+ <schemalist gettext-domain="gsettings-desktop-schemas">
+   <schema id="org.gnome.desktop.background" path="/org/gnome/desktop/background/">
++    <key name="draw-background" type="b">
++      <default>true</default>
++      <summary>Draw Desktop Background</summary>
++      <description>
++        Have GNOME draw the desktop background.
++
++        DEPRECATED: This key is deprecated and ignored.
++      </description>
++    </key>
+     <key name="picture-options" enum="org.gnome.desktop.GDesktopBackgroundStyle">
+       <default>'zoom'</default>
+       <_summary>Picture Options</_summary>
diff --git a/git_revert_menu_icon_key_removal.patch b/git_revert_menu_icon_key_removal.patch
new file mode 100644
index 000000000000..3a34a19483ba
--- /dev/null
+++ b/git_revert_menu_icon_key_removal.patch
@@ -0,0 +1,95 @@
+From 25329a7b38689c9c855eca19e3733ce39654d9bb Mon Sep 17 00:00:00 2001
+From: Tim Lunn <tim@feathertop.org>
+Date: Sat, 28 Sep 2013 06:05:39 +1000
+Subject: [PATCH] Revert "schemas: Remove settings for deprecated gtk-settings"
+
+This reverts commit 7d48c4ed64bb5f42f1a8a781f06f534903e78d70.
+---
+ schemas/gsettings-desktop-schemas.convert       |  4 +++
+ .../org.gnome.desktop.interface.gschema.xml.in  | 38 ++++++++++++++++++++++
+ 2 files changed, 42 insertions(+)
+
+Index: gsettings-desktop-schemas/schemas/gsettings-desktop-schemas.convert
+===================================================================
+--- gsettings-desktop-schemas.orig/schemas/gsettings-desktop-schemas.convert
++++ gsettings-desktop-schemas/schemas/gsettings-desktop-schemas.convert
+@@ -34,6 +34,8 @@ enable-animations = /desktop/gnome/inter
+ #menus-have-tearoff = /desktop/gnome/interface/menus_have_tearoff
+ #can-change-accels = /desktop/gnome/interface/can_change_accels
+ #toolbar-style = /desktop/gnome/interface/toolbar_style
++#menus-have-icons = /desktop/gnome/interface/menus_have_icons
++#buttons-have-icons = /desktop/gnome/interface/buttons_have_icons
+ #menubar-detachable = /desktop/gnome/interface/menubar_detachable
+ #toolbar-detachable = /desktop/gnome/interface/toolbar_detachable
+ #toolbar-icons-size = /desktop/gnome/interface/toolbar_icons_size
+@@ -54,6 +56,8 @@ gtk-im-module = /desktop/gnome/interface
+ document-font-name = /desktop/gnome/interface/document_font_name
+ monospace-font-name = /desktop/gnome/interface/monospace_font_name
+ menubar-accel = /desktop/gnome/interface/menubar_accel
++show-input-method-menu = /desktop/gnome/interface/show_input_method_menu
++show-unicode-menu = /desktop/gnome/interface/show_unicode_menu
+ cursor-size = /desktop/gnome/peripherals/mouse/cursor_size
+ gtk-color-palette = /desktop/gnome/gtk-color-palette
+ # Disabled as we want users to use the default new theme colors
+Index: gsettings-desktop-schemas/schemas/org.gnome.desktop.interface.gschema.xml.in
+===================================================================
+--- gsettings-desktop-schemas.orig/schemas/org.gnome.desktop.interface.gschema.xml.in
++++ gsettings-desktop-schemas/schemas/org.gnome.desktop.interface.gschema.xml.in
+@@ -38,6 +38,20 @@
+         and "text".
+       </_description>
+     </key>
++    <key name="menus-have-icons" type="b">
++      <default>false</default>
++      <summary>Menus Have Icons</summary>
++      <description>
++        Whether menus may display an icon next to a menu entry.
++      </description>
++    </key>
++    <key name="buttons-have-icons" type="b">
++      <default>false</default>
++      <summary>Buttons Have Icons</summary>
++      <description>
++        Whether buttons may display an icon in addition to the button text.
++      </description>
++    </key>
+     <key name="menubar-detachable" type="b">
+       <default>false</default>
+       <_summary>Menubar Detachable</_summary>
+@@ -169,6 +183,22 @@
+         Keyboard shortcut to open the menu bars.
+       </_description>
+     </key>
++    <key name="show-input-method-menu" type="b">
++      <default>true</default>
++      <summary>Show the 'Input Methods' menu</summary>
++      <description>
++        Whether the context menus of entries and text views should offer to
++        change the input method.
++      </description>
++    </key>
++    <key name="show-unicode-menu" type="b">
++      <default>true</default>
++      <summary>Show the 'Unicode Control Character' menu</summary>
++      <description>
++        Whether the context menus of entries and text views should offer to
++        insert control characters.
++      </description>
++    </key>
+     <key name="cursor-theme" type="s">
+       <default>'Adwaita'</default>
+       <_summary>Cursor theme</_summary>
+@@ -220,5 +250,13 @@
+         If true, display date in the clock, in addition to time.
+       </_description>
+     </key>
++    <key name="automatic-mnemonics" type="b">
++      <default>true</default>
++      <summary>Only show mnemonics on when the Alt key is pressed</summary>
++      <description>
++        Whether mnemonics should be automatically shown and hidden when the user
++        presses the Alt key.
++      </description>
++    </key>
+   </schema>
+ </schemalist>
diff --git a/git_revert_notifications_key_removal.patch b/git_revert_notifications_key_removal.patch
new file mode 100644
index 000000000000..9574cce7756c
--- /dev/null
+++ b/git_revert_notifications_key_removal.patch
@@ -0,0 +1,31 @@
+From 914267443acc5b5ae25a44a44aecd6ee58d0bfbb Mon Sep 17 00:00:00 2001
+From: Giovanni Campagna <gcampagna@src.gnome.org>
+Date: Thu, 31 Jan 2013 12:43:50 +0000
+Subject: Remove a deprecated key
+
+This key has been around for little enough that it is probably safe
+to remove, and removing it reduces confusion in users and developers.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=692944
+---
+Index: gsettings-desktop-schemas-3.8.0/schemas/org.gnome.desktop.screensaver.gschema.xml.in
+===================================================================
+--- gsettings-desktop-schemas-3.8.0.orig/schemas/org.gnome.desktop.screensaver.gschema.xml.in	2013-04-01 22:45:39.565957839 -0400
++++ gsettings-desktop-schemas-3.8.0/schemas/org.gnome.desktop.screensaver.gschema.xml.in	2013-04-01 22:45:39.557957840 -0400
+@@ -20,6 +20,16 @@
+       <_summary>Time before locking</_summary>
+       <_description>The number of seconds after screensaver activation before locking the screen.</_description>
+     </key>
++    <key name="show-notifications" type="b">
++      <default>false</default>
++      <summary>Show notifications in the lock screen</summary>
++      <description>
++        Whether notifications are shown in the lock screen or not. This only affects the standard experience.
++
++        DEPRECATED: This key is deprecated and ignored.
++        It has been superseded by org.gnome.desktop.notifications show-in-lock-screen.
++      </description>
++    </key>
+     <key name="show-full-name-in-top-bar" type="b">
+       <default>true</default>
+       <_summary>Show full name in the lock screen</_summary>
diff --git a/gsettings-desktop-schemas.install b/gsettings-desktop-schemas.install
new file mode 100644
index 000000000000..d1f437461067
--- /dev/null
+++ b/gsettings-desktop-schemas.install
@@ -0,0 +1,11 @@
+post_install() {
+  glib-compile-schemas usr/share/glib-2.0/schemas/
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/ubuntu_lock-on-suspend.patch b/ubuntu_lock-on-suspend.patch
new file mode 100644
index 000000000000..611091c72ca1
--- /dev/null
+++ b/ubuntu_lock-on-suspend.patch
@@ -0,0 +1,21 @@
+Description: Add a new preference to lock the screen when the system suspends.
+Author: Marc Deslauriers <marc.deslauriers@canonical.com>
+Forwarded: No, likely a Ubuntu-specific preference
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/938076
+
+Index: gsettings-desktop-schemas-3.7.2/schemas/org.gnome.desktop.screensaver.gschema.xml.in
+===================================================================
+--- gsettings-desktop-schemas-3.7.2.orig/schemas/org.gnome.desktop.screensaver.gschema.xml.in	2012-11-20 05:19:36.000000000 +1300
++++ gsettings-desktop-schemas-3.7.2/schemas/org.gnome.desktop.screensaver.gschema.xml.in	2012-11-26 13:23:34.173902589 +1300
+@@ -25,6 +25,11 @@
+       <_summary>Show full name in the lock screen</_summary>
+       <_description>Whether the user's full name is shown in the lock screen or not. This only affects the screen shield, the name is always shown in the unlock dialog.</_description>
+     </key>
++    <key name="ubuntu-lock-on-suspend" type="b">
++      <default>true</default>
++      <summary>Lock on suspend</summary>
++      <description>Set this to TRUE to lock the screen when the system suspends.</description>
++    </key>
+     <key name="embedded-keyboard-enabled" type="b">
+       <default>false</default>
+       <_summary>Allow embedding a keyboard into the window</_summary>