Updates and workarounds: unstable upstream

3 files changed, 38 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0652a330de1f..6fd26d65f4e7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = pantheon-qq-default-settings-git
 	pkgdesc = Default settings for Pantheon derivatives
-	pkgver = r340.09ae797
-	pkgrel = 2
+	pkgver = r376.7a753ce
+	pkgrel = 1
 	url = https://github.com/elementary/default-settings
 	arch = any
 	groups = pantheon-qq
@@ -13,7 +13,7 @@ pkgbase = pantheon-qq-default-settings-git
 	depends = gnome-themes-standard
 	depends = ttf-droid
 	depends = ttf-opensans
-	depends = ttf-roboto-mono
+	depends = ttf-roboto
 	optdepends = elementary-wallpapers-git
 	provides = pantheon-default-settings
 	provides = pantheon-default-settings-git
@@ -23,7 +23,7 @@ pkgbase = pantheon-qq-default-settings-git
 	source = arch-tweaks.patch
 	source = leave-bg-alone.patch
 	sha256sums = SKIP
-	sha256sums = 742812de8dbbaf641a7cc531d4ab2ad21408db5017dff5ce52dffda474b61a3f
+	sha256sums = 99528c7ed672a5231f4d42d90421cef18d416f2b7aea6e0381db7cea6f9391d3
 	sha256sums = 3732b2209d28c68bb3a11da5726f486db1fca9fcb3776bf58f83c81678b84211
 
 pkgname = pantheon-qq-default-settings-git
diff --git a/PKGBUILD b/PKGBUILD
index 683dfc5cf1dc..77812f2480c8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Que Quotion <quequotion@bugmenot.com>
 
 pkgname=pantheon-qq-default-settings-git
-pkgver=r340.09ae797
-pkgrel=2
+pkgver=r376.7a753ce
+pkgrel=1
 arch=('any')
 url='https://github.com/elementary/default-settings'
 license=('GPL')
@@ -10,7 +10,7 @@ groups=('pantheon-qq' 'pantheon-unstable')
 makedepends=('git' 'meson')
 pkgdesc='Default settings for Pantheon derivatives'
 depends=('elementary-icon-theme' 'gtk-theme-elementary-git'
-         'gnome-themes-standard' ttf-{droid,opensans,roboto-mono})
+         'gnome-themes-standard' ttf-{droid,opensans,roboto})
 optdepends=('elementary-wallpapers-git')
 groups=(pantheon-qq)
 provides=(pantheon-default-settings{,-git})
@@ -19,7 +19,7 @@ source=('pantheon-default-settings::git+https://github.com/elementary/default-se
         'arch-tweaks.patch'
         'leave-bg-alone.patch')
 sha256sums=('SKIP'
-            '742812de8dbbaf641a7cc531d4ab2ad21408db5017dff5ce52dffda474b61a3f'
+            '99528c7ed672a5231f4d42d90421cef18d416f2b7aea6e0381db7cea6f9391d3'
             '3732b2209d28c68bb3a11da5726f486db1fca9fcb3776bf58f83c81678b84211')
 
 pkgver() {
@@ -50,8 +50,8 @@ package() {
 
     install -dm 755 "${pkgdir}"/usr/share/glib-2.0/schemas
     install -m 644 debian/elementary-default-settings.gsettings-override "${pkgdir}"/usr/share/glib-2.0/schemas/25_pantheon-default-settings.gschema.override
-    install -Dm 644 $pkgdir/etc/lightdm/lightdm.conf $pkgdir/etc/skel/.config/lightdm/lightdm.conf
-    rm $pkgdir/etc/lightdm/lightdm.conf
+    #install -Dm 644 $pkgdir/etc/lightdm/lightdm.conf $pkgdir/etc/skel/.config/lightdm/lightdm.conf
+    #rm $pkgdir/etc/lightdm/lightdm.conf
     install -Dm 644 $pkgdir/etc/gtk-3.0/settings.ini $pkgdir/etc/skel/.config/gtk-3.0/settings.ini
     rm $pkgdir/etc/gtk-3.0/settings.ini
     rm $pkgdir/usr/share/cups/data/default-testpage.pdf
diff --git a/arch-tweaks.patch b/arch-tweaks.patch
index 0be2e5e8f510..8a6835ef1c58 100644
--- a/arch-tweaks.patch
+++ b/arch-tweaks.patch
@@ -1,25 +1,11 @@
-From 16535e94322a8561c89b0d0d2e854124d3ba1745 Mon Sep 17 00:00:00 2001
-From: Solomon Choina <shlomochoina@gmail.com>
-Date: Wed, 13 Dec 2017 07:13:52 -0500
-Subject: [PATCH] arch tweaks
-
----
- debian/elementary-default-settings.gsettings-override  | 4 +---
- meson.build                                            | 1 -
- plank/dock1/launchers/io.elementary.appcenter.dockitem | 4 ----
- policykit.desktop                                      | 2 +-
- settings.ini                                           | 2 +-
- 5 files changed, 3 insertions(+), 10 deletions(-)
- delete mode 100644 plank/dock1/launchers/io.elementary.appcenter.dockitem
-
 diff --git a/debian/elementary-default-settings.gsettings-override b/debian/elementary-default-settings.gsettings-override
 index da55ae6..ff3d55a 100644
 --- a/debian/elementary-default-settings.gsettings-override
 +++ b/debian/elementary-default-settings.gsettings-override
 @@ -1,5 +1,5 @@
  [net.launchpad.plank.dock.settings]
--dock-items=['gala-multitaskingview.dockitem','epiphany.dockitem','org.pantheon.mail.dockitem','io.elementary.calendar.dockitem','io.elementary.music.dockitem','io.elementary.videos.dockitem','io.elementary.photos.dockitem','org.pantheon.switchboard.dockitem','io.elementary.appcenter.dockitem']
-+dock-items=['gala-multitaskingview.dockitem','epiphany.dockitem','org.pantheon.mail.dockitem','io.elementary.calendar.dockitem','io.elementary.music.dockitem','io.elementary.videos.dockitem','io.elementary.photos.dockitem','org.pantheon.switchboard.dockitem']
+-dock-items=['gala-multitaskingview.dockitem','org.gnome.Epiphany.dockitem','org.pantheon.mail.dockitem','io.elementary.calendar.dockitem','io.elementary.music.dockitem','io.elementary.videos.dockitem','io.elementary.photos.dockitem','io.elementary.switchboard.dockitem','io.elementary.appcenter.dockitem']
++dock-items=['gala-multitaskingview.dockitem','org.gnome.Epiphany.dockitem','org.pantheon.mail.dockitem','io.elementary.calendar.dockitem','io.elementary.music.dockitem','io.elementary.videos.dockitem','io.elementary.photos.dockitem','io.elementary.switchboard.dockitem']
  hide-delay=250
  hide-mode='window-dodge'
  show-dock-item=false
@@ -61,18 +47,29 @@ index c9e2372..0000000
 -Launcher=file:///usr/share/applications/io.elementary.appcenter.desktop
 -
 -
-diff --git a/settings.ini b/settings.ini
-index 0d10895..716aad2 100644
---- a/settings.ini
-+++ b/settings.ini
-@@ -2,6 +2,6 @@
- gtk-theme-name = elementary
- gtk-icon-theme-name = elementary
- gtk-fallback-icon-theme = gnome
--gtk-sound-theme-name = ubuntu
-+gtk-sound-theme-name = freedesktop
- gtk-icon-sizes = panel-menu-bar=24,24
- gtk-font-name = Open Sans 9
--- 
-2.15.1
-
+--- a/meson.build	2019-08-17 01:58:19.554216192 +0900
++++ b/meson.build	2019-08-17 02:18:10.548389124 +0900
+@@ -9,12 +9,6 @@
+     install_dir: join_paths(get_option('datadir'), 'cups', 'data')
+ )
+ 
+-# Installer session lightdm.conf
+-install_data(
+-    'lightdm.conf',
+-    install_dir: join_paths(get_option('sysconfdir'), 'lightdm')
+-)
+-
+ install_data(
+     'settings.ini',
+     install_dir: join_paths(get_option('sysconfdir'), 'gtk-3.0')
+--- a/meson.build	2019-08-17 02:21:02.247682193 +0900
++++ b/meson.build	2019-08-17 02:30:05.087644804 +0900
+@@ -41,7 +41,7 @@
+     join_paths('.', 'plank', 'dock1', 'launchers', 'io.elementary.calendar.dockitem'),
+     join_paths('.', 'plank', 'dock1', 'launchers', 'io.elementary.music.dockitem'),
+     join_paths('.', 'plank', 'dock1', 'launchers', 'io.elementary.photos.dockitem'),
+-    join_paths('.', 'plank', 'dock1', 'launchers', 'org.pantheon.switchboard.dockitem'),
++    join_paths('.', 'plank', 'dock1', 'launchers', 'io.elementary.switchboard.dockitem'),
+ ]
+ 
+ install_data(