diff options
| author |   Patrick J Volkerding <volkerdi@slackware.com> | 2019-03-14 21:22:54 +0000 |
|---|---|---|
| committer |   Eric Hameleers <alien@slackware.com> | 2019-03-15 08:59:43 +0100 |
| commit | 2565e7db394cd95a6eaf327026dec6a9748f7235 (patch) | |
| tree | 309183b033066209702eabe29148c50517103db1 /source/l/gsettings-desktop-schemas | |
| parent | 218698dcbc3c5b66fe2189b61d5cc1e274d98ac5 (diff) | |
| download | current-2565e7db394cd95a6eaf327026dec6a9748f7235.tar.gz current-2565e7db394cd95a6eaf327026dec6a9748f7235.tar.xz | |
Thu Mar 14 21:22:54 UTC 201920190314212254
ap/cgmanager-0.42-x86_64-1.txz: Upgraded.
d/cmake-3.14.0-x86_64-1.txz: Upgraded.
l/gexiv2-0.12.0-x86_64-1.txz: Upgraded.
l/gsettings-desktop-schemas-3.32.0-x86_64-2.txz: Rebuilt.
Don't override the system font defaults (especially with fonts that we don't
include). Thanks to Markus Wiesner.
l/libyaml-0.2.2-x86_64-1.txz: Upgraded.
l/libzip-1.5.2-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/l/gsettings-desktop-schemas')
| -rwxr-xr-x | source/l/gsettings-desktop-schemas/gsettings-desktop-schemas.SlackBuild | 5 | ||||
| -rw-r--r-- | source/l/gsettings-desktop-schemas/gsettings-desktop-schemas.font.defaults.diff | 28 |
2 files changed, 32 insertions, 1 deletions
diff --git a/source/l/gsettings-desktop-schemas/gsettings-desktop-schemas.SlackBuild b/source/l/gsettings-desktop-schemas/gsettings-desktop-schemas.SlackBuild index 2e71d8a76..86ed0a680 100755 --- a/source/l/gsettings-desktop-schemas/gsettings-desktop-schemas.SlackBuild +++ b/source/l/gsettings-desktop-schemas/gsettings-desktop-schemas.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gsettings-desktop-schemas VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -77,6 +77,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Don't override font defaults with fonts that we don't have: +zcat $CWD/gsettings-desktop-schemas.font.defaults.diff.gz | patch -p1 --verbose || exit 1 + export CFLAGS="$SLKCFLAGS" export CXXFLAGS="$SLKCFLAGS" mkdir build diff --git a/source/l/gsettings-desktop-schemas/gsettings-desktop-schemas.font.defaults.diff b/source/l/gsettings-desktop-schemas/gsettings-desktop-schemas.font.defaults.diff new file mode 100644 index 000000000..8f0062fdf --- /dev/null +++ b/source/l/gsettings-desktop-schemas/gsettings-desktop-schemas.font.defaults.diff @@ -0,0 +1,28 @@ +--- ./schemas/org.gnome.desktop.interface.gschema.xml.in.orig 2019-03-11 17:33:16.000000000 -0500 ++++ ./schemas/org.gnome.desktop.interface.gschema.xml.in 2019-03-14 15:56:45.071036093 -0500 +@@ -105,7 +105,7 @@ + </description> + </key> + <key name="font-name" type="s"> +- <default>'Cantarell 11'</default> ++ <default>'Sans 11'</default> + <summary>Default font</summary> + <description> + Name of the default font used by gtk+. +@@ -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 |