[gentoo-commits] repo/gentoo:master commit in: gnome-base/gsettings-desktop-schemas/, ...

[Mart Raudsepp]

commit:     d6aea1cccabef4e92af32f8cfee3ddc11b8b1f6c
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  1 17:37:57 2019 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sun Sep  1 17:59:48 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6aea1cc

gnome-base/gsettings-desktop-schemas: bump to 3.32.0 without default fonts change

Package-Manager: Portage-2.3.69, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 gnome-base/gsettings-desktop-schemas/Manifest      |  1 +
 .../files/3.32.0-default-fonts.patch               | 38 ++++++++++++++++++++
 .../gsettings-desktop-schemas-3.32.0.ebuild        | 41 ++++++++++++++++++++++
 3 files changed, 80 insertions(+)

diff --git a/gnome-base/gsettings-desktop-schemas/Manifest b/gnome-base/gsettings-desktop-schemas/Manifest
index bc3902882b2..8af6dc409ae 100644
--- a/gnome-base/gsettings-desktop-schemas/Manifest
+++ b/gnome-base/gsettings-desktop-schemas/Manifest
@@ -1,2 +1,3 @@
 DIST gsettings-desktop-schemas-3.24.1.tar.xz 638780 BLAKE2B c1857636e18c69658458aa9dfd65a7c3983791000f16eba08f706c243a0b804ed20dfde58f9cbe879f41348dc8257ecab86d5111c89bc1aacca1d8b62f2c0332 SHA512 c3970d61cc1c29bf97a39c439b3e0ba5c5d5c0f811e17b8884f106f095b159dd0c43cb90e02561edcc26e15b2b887e960d38de1c0e7498413db0c63102f15833
 DIST gsettings-desktop-schemas-3.28.1.tar.xz 652416 BLAKE2B a9ddf44153a83fa188f873e6bca29499e1abc7dea310c6eda3193233e363607781c93bca64a9ddf2f31137e22e54e23b0f139e90ef99c181aac9a976409b6c94 SHA512 2bf3260e976943e9d1e51feda62ef1e432870a6d9b34881afbdf99ddbe4954e5dd679697e152e793a0b38492dbbc4891018f7aa8cd4e703d05a8647cc5a56785
+DIST gsettings-desktop-schemas-3.32.0.tar.xz 628888 BLAKE2B 7d675597d861ee8ee8258f037d06d6f728e9705c7e121508a811bbad000b1ef10a7e2ef23066cec01c34865648f4f0a204716306643db1a4cbd505801ce939c1 SHA512 cf1d78a8f9f1697e20c995286b50d556c2ecc83bf4b28be19b3258a724494a2827fb9567cabf29cda1c590488fd2645e905072e08321766c8bdddd22ac3710dc

diff --git a/gnome-base/gsettings-desktop-schemas/files/3.32.0-default-fonts.patch b/gnome-base/gsettings-desktop-schemas/files/3.32.0-default-fonts.patch
new file mode 100644
index 00000000000..105ba088f9e
--- /dev/null
+++ b/gnome-base/gsettings-desktop-schemas/files/3.32.0-default-fonts.patch
@@ -0,0 +1,38 @@
+From 63563ee0e65c1d2ae9aa0ae5530035605fed0f1c Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@g.o>
+Date: Sun, 1 Sep 2019 20:34:44 +0300
+Subject: [PATCH] Revert "schemas: change default monospaced and document
+ fonts"
+
+This reverts commit 965062de47f5171727c1e4f7f0aac2ad40e3484a.
+
+It is not GNOME business to override distribution choices for default
+monospace and document font.
+---
+ schemas/org.gnome.desktop.interface.gschema.xml.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/schemas/org.gnome.desktop.interface.gschema.xml.in b/schemas/org.gnome.desktop.interface.gschema.xml.in
+index 22ef50d..1713f25 100644
+--- a/schemas/org.gnome.desktop.interface.gschema.xml.in
++++ b/schemas/org.gnome.desktop.interface.gschema.xml.in
+@@ -149,14 +149,14 @@
+       </description>
+     </key>
+     <key name="document-font-name" type="s">
+-      <default>'Cantarell 11'</default>
++      <default>'Sans 11'</default>
+       <summary>Document font</summary>
+       <description>
+         Name of the default font used for reading documents.
+       </description>
+     </key>
+     <key name="monospace-font-name" type="s">
+-      <default>'Source Code Pro 10'</default>
++      <default>'Monospace 11'</default>
+       <summary>Monospace font</summary>
+       <description>
+         Name of a monospaced (fixed-width) font for use in locations like
+-- 
+2.20.1
+

diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.32.0.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.32.0.ebuild
new file mode 100644
index 00000000000..d03664abab0
--- /dev/null
+++ b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.32.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="Collection of GSettings schemas for GNOME desktop"
+HOMEPAGE="https://git.gnome.org/browse/gsettings-desktop-schemas"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE="+introspection"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
+
+DEPEND="!<gnome-base/gdm-3.8"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# Revert change to 'Source Code Pro 10' and 'Cantarell 11' fonts back to generic sans and monospace aliases
+	"${FILESDIR}"/${PV}-default-fonts.patch
+)
+
+src_configure() {
+	meson_src_configure $(meson_use introspection)
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}