summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Böhmwalder2017-05-27 23:50:24 +0200
committerChristoph Böhmwalder2017-05-27 23:50:24 +0200
commit27cc3eb70b2e39e6c504c6ea773744eb3ca2eca9 (patch)
treee119232e34efc43f95a08498113136171c198c99
parente3b4e9befa7f2becc6c928e4f91ccc84d8d861ce (diff)
downloadaur-27cc3eb70b2e39e6c504c6ea773744eb3ca2eca9.tar.gz
add patch for default theme
-rw-r--r--PKGBUILD25
-rw-r--r--default-theme.patch25
-rw-r--r--use-wheel.patch2
3 files changed, 48 insertions, 4 deletions
diff --git a/PKGBUILD b/PKGBUILD
index d71d8d5f993..cb8b62a8b6f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
_pkgname=cinnamon
pkgname=${_pkgname}-git
-pkgver=6157.e9905a09
+pkgver=6161.3842206a
pkgrel=1
pkgdesc="A Linux desktop which provides advanced innovative features and a traditional user experience"
arch=('i686' 'x86_64')
@@ -26,9 +26,11 @@ conflicts=("${_pkgname}")
provides=("${_pkgname}")
install=${pkgname}.install
source=("${_pkgname}"::git+https://github.com/linuxmint/cinnamon.git
- "use-wheel.patch")
+ "use-wheel.patch"
+ "default-theme.patch")
sha256sums=('SKIP'
- 'f2d86a98fa27e90030bc152c5a591f118acd1fa6a506bfbbffd7a5896e2e49cb')
+ '5c98d0e44c2cc2c11fac42a10a22f999ba60016b06fc6e45416484febe048417'
+ '566585873f38a79ec248b916645a2e081abec3c6d4df2c34339cde1f35375cc5')
pkgver() {
cd "${srcdir}/${_pkgname}"
@@ -41,6 +43,9 @@ prepare() {
# Use wheel group instread of sudo
patch -Np1 -i ../use-wheel.patch
+ # Set default theme to 'cinnamon'
+ patch -Np1 -i ../default-theme.patch
+
# Add polkit agent to required components
sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' files/usr/share/cinnamon-session/sessions/cinnamon*.session
@@ -53,6 +58,20 @@ prepare() {
# Cinnamon has no upstream backgrounds, use GNOME backgrounds instead
sed -i 's|/usr/share/cinnamon-background-properties|/usr/share/gnome-background-properties|' \
files/usr/share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py
+
+ # Fix selected background color in Cinnamon Settings for Adwaita theme
+ sed -i 's/@selected_bg_color;/@theme_selected_bg_color;/' \
+ files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py
+
+ # GNOME Terminal desktop file was renamed in GNOME 3.20
+ sed -i 's/gnome-terminal.desktop/org.gnome.Terminal.desktop/' data/org.cinnamon.gschema.xml.in \
+ files/usr/share/cinnamon/applets/panel-launchers@cinnamon.org/settings-schema.json
+
+ # Replace MintInstall with GNOME Software
+ sed -i 's/mintinstall.desktop/org.gnome.Software.desktop/' data/org.cinnamon.gschema.xml.in
+
+ # Remove broken symlink
+ rm files/etc/xdg/menus/cinnamon-applications-merged
}
build() {
diff --git a/default-theme.patch b/default-theme.patch
new file mode 100644
index 00000000000..8817710f0ee
--- /dev/null
+++ b/default-theme.patch
@@ -0,0 +1,25 @@
+From 36af45f699daa886a3c3fc3187e0b24b193294ad Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Sat, 22 Nov 2014 22:39:39 +0100
+Subject: [PATCH] Set default theme to 'cinnamon'
+
+---
+ data/org.cinnamon.gschema.xml.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/org.cinnamon.gschema.xml.in b/data/org.cinnamon.gschema.xml.in
+index 91fa171..9f56e4c 100644
+--- a/data/org.cinnamon.gschema.xml.in
++++ b/data/org.cinnamon.gschema.xml.in
+@@ -581,7 +581,7 @@
+ <schema id="org.cinnamon.theme" path="/org/cinnamon/theme/"
+ gettext-domain="@GETTEXT_PACKAGE@">
+ <key name="name" type="s">
+- <default>""</default>
++ <default>"cinnamon"</default>
+ <_summary>Theme name</_summary>
+ <_description>
+ The name of the theme
+--
+2.1.3
+
diff --git a/use-wheel.patch b/use-wheel.patch
index b878202dc15..b3f60a36a35 100644
--- a/use-wheel.patch
+++ b/use-wheel.patch
@@ -53,4 +53,4 @@
+ subprocess.call(["usermod", username, "-G", "%s" % username])
self.load_groups()
dialog.destroy()
- \ No newline at end of file
+