updpkgver

7 files changed, 16 insertions, 208 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b7104402237f..a25e5715e1a8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,21 @@
 pkgbase = gsettings-desktop-schemas-ubuntu
 	pkgdesc = Shared GSettings schemas for the desktop
-	pkgver = 3.27.90
+	pkgver = 3.34.0
 	pkgrel = 1
 	url = https://git.gnome.org/browse/gsettings-desktop-schemas
 	arch = any
 	license = GPL
 	makedepends = git
 	makedepends = gobject-introspection
-	makedepends = intltool
+	makedepends = meson
 	depends = glib2
 	depends = dconf
-	provides = gsettings-desktop-schemas
+	provides = gsettings-desktop-schemas=3.34.0
 	conflicts = gsettings-desktop-schemas
-	source = git+https://git.gnome.org/browse/gsettings-desktop-schemas#commit=b452abef71429f92e43a9ce2fb14d50c9edce964
-	source = https://launchpad.net/ubuntu/+archive/primary/+files/gsettings-desktop-schemas_3.27.90-1ubuntu1.debian.tar.xz
+	source = git+https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas#commit=56d24d47b9699ac6c877b93ae0e863f178c17dab
+	source = https://launchpad.net/ubuntu/+archive/primary/+files/gsettings-desktop-schemas_3.34.0-1ubuntu1.debian.tar.xz
 	sha512sums = SKIP
-	sha512sums = a2a2799409be1098f5abe852affbc1cc28b1716c18f38cad7cf4dcf0bb2c97910ec4eb8969298b8f7dab86f093bb527198807ca48f5e2db4c8d7b765829a199d
+	sha512sums = e88e03a47ec9bbd176c96f701e4ad2a40eee9ac6bc32f87891f0ad6e5a5c84041af4f3211f1b28fcb203832faba3569b8477bad5cebd9ecd00ba0a0423b12940
 
 pkgname = gsettings-desktop-schemas-ubuntu
 
diff --git a/PKGBUILD b/PKGBUILD
index 60039fe723a9..3199f9eee91c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,23 +10,23 @@
 # vercheck-gnome: name=${pkgname%-*}, majorver=3.27
 
 pkgname=gsettings-desktop-schemas-ubuntu
-_ubuntu_ver=3.27.90
+_ubuntu_ver=3.34.0
 _ubuntu_rel=1ubuntu1
-pkgver=3.27.90
+pkgver=3.34.0
 pkgrel=1
 pkgdesc="Shared GSettings schemas for the desktop"
 arch=(any)
 url="https://git.gnome.org/browse/gsettings-desktop-schemas"
 license=(GPL)
 depends=(glib2 dconf)
-makedepends=(git gobject-introspection intltool)
-provides=(gsettings-desktop-schemas)
+makedepends=(git gobject-introspection meson)
+provides=(gsettings-desktop-schemas=$pkgver)
 conflicts=(gsettings-desktop-schemas)
-_commit=b452abef71429f92e43a9ce2fb14d50c9edce964  # 3.27.90
-source=("git+https://git.gnome.org/browse/gsettings-desktop-schemas#commit=$_commit"
+_commit=56d24d47b9699ac6c877b93ae0e863f178c17dab  # 3.34.0
+source=("git+https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas#commit=$_commit"
         "https://launchpad.net/ubuntu/+archive/primary/+files/gsettings-desktop-schemas_${_ubuntu_ver:-${pkgver}}-${_ubuntu_rel}.debian.tar.xz")
 sha512sums=('SKIP'
-            'a2a2799409be1098f5abe852affbc1cc28b1716c18f38cad7cf4dcf0bb2c97910ec4eb8969298b8f7dab86f093bb527198807ca48f5e2db4c8d7b765829a199d')
+            'e88e03a47ec9bbd176c96f701e4ad2a40eee9ac6bc32f87891f0ad6e5a5c84041af4f3211f1b28fcb203832faba3569b8477bad5cebd9ecd00ba0a0423b12940')
 
 pkgver(){
   cd ${pkgname%-*}
@@ -42,22 +42,15 @@ prepare() {
         msg "Applying ${i} ..."
         patch -p1 -i "../debian/patches/${i}"
     done
-
-  intltoolize
-  autoreconf -fvi
 }
 
 build() {
-    cd ${pkgname%-*}
+    arch-meson ${pkgname%-*} build
+    ninja -C build
 
-    ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-        --disable-schemas-compile
-    make
 }
-
 package() {
-    cd ${pkgname%-*}
 
-    make DESTDIR="${pkgdir}" install
+    DESTDIR="${pkgdir}" ninja -C build install
 }
 
diff --git a/git_revert_background_key_removal.patch b/git_revert_background_key_removal.patch
deleted file mode 100644
index 76ed2c59fff3..000000000000
--- a/git_revert_background_key_removal.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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
deleted file mode 100644
index 3a34a19483ba..000000000000
--- a/git_revert_menu_icon_key_removal.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-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
deleted file mode 100644
index 9574cce7756c..000000000000
--- a/git_revert_notifications_key_removal.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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
deleted file mode 100644
index d1f437461067..000000000000
--- a/gsettings-desktop-schemas.install
+++ /dev/null
@@ -1,11 +0,0 @@
-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
deleted file mode 100644
index 611091c72ca1..000000000000
--- a/ubuntu_lock-on-suspend.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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>