summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Schwartz2020-04-23 20:15:14 -0400
committerEli Schwartz2020-04-23 20:15:14 -0400
commit74967a0035ef1ff4d183ddc85bc7466cbaea0872 (patch)
tree82b54a6509987dfd04787bc6d3f1050426b609dc
parent5046b82acfcd1d60e6ce9ee22baa8c4a6e3d0269 (diff)
downloadaur-74967a0035ef1ff4d183ddc85bc7466cbaea0872.tar.gz
upgpkg: cinnamon-git 4.4.8.r70.g14e5ccee8-1
sync several fixes with community/cinnamon also git master is ported to use tinycss2, so yay (and also switch this) also libcroco is a somewhat obscure dependency and its indirect use in base->gettext is not really so nice; hoist it up directly here
-rw-r--r--.SRCINFO14
-rw-r--r--PKGBUILD12
2 files changed, 15 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 33851622c2c..c78c7943111 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = cinnamon-git
pkgdesc = Linux desktop which provides advanced innovative features and a traditional user experience
- pkgver = 4.2.0.r3.g4d1da807e
+ pkgver = 4.4.8.r70.g14e5ccee8
pkgrel = 1
url = https://github.com/linuxmint/cinnamon
arch = x86_64
@@ -15,15 +15,16 @@ pkgbase = cinnamon-git
depends = cinnamon-menus
depends = cinnamon-screensaver
depends = cinnamon-session
- depends = cinnamon-settings-daemon>=4.2.0
+ depends = cinnamon-settings-daemon
depends = cjs
depends = gnome-backgrounds
depends = gnome-themes-extra
depends = gstreamer
+ depends = libcroco
depends = libgnomekbd
depends = libkeybinder3
depends = librsvg
- depends = muffin>=4.2.0
+ depends = muffin
depends = network-manager-applet
depends = nemo
depends = polkit-gnome
@@ -34,14 +35,17 @@ pkgbase = cinnamon-git
depends = python-pexpect
depends = python-pillow
depends = python-pyinotify
- depends = python-tinycss
+ depends = python-pytz
+ depends = python-tinycss2
+ depends = python-xapp
+ depends = timezonemap
depends = xapps
optdepends = blueberry: Bluetooth support
optdepends = cinnamon-translations: i18n
optdepends = gnome-panel: fallback mode
optdepends = metacity: fallback mode
optdepends = system-config-printer: printer settings
- provides = cinnamon=4.2.0.r3.g4d1da807e
+ provides = cinnamon=4.4.8.r70.g14e5ccee8
conflicts = cinnamon
options = !emptydirs
source = git+https://github.com/linuxmint/cinnamon.git
diff --git a/PKGBUILD b/PKGBUILD
index 65576d44332..1d41b080b4e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,18 +5,18 @@
# Contributor: CReimer
pkgname=cinnamon-git
-pkgver=4.2.0.r3.g4d1da807e
+pkgver=4.4.8.r70.g14e5ccee8
pkgrel=1
pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience"
arch=('x86_64')
url="https://github.com/linuxmint/${pkgname%-git}"
license=('GPL2')
depends=('accountsservice' 'caribou' 'cinnamon-control-center' 'cinnamon-menus' 'cinnamon-screensaver'
- 'cinnamon-session' 'cinnamon-settings-daemon>=4.2.0' 'cjs' 'gnome-backgrounds'
- 'gnome-themes-extra' 'gstreamer' 'libgnomekbd' 'libkeybinder3' 'librsvg' 'muffin>=4.2.0'
+ 'cinnamon-session' 'cinnamon-settings-daemon' 'cjs' 'gnome-backgrounds'
+ 'gnome-themes-extra' 'gstreamer' 'libcroco' 'libgnomekbd' 'libkeybinder3' 'librsvg' 'muffin'
'network-manager-applet' 'nemo' 'polkit-gnome' 'python-cairo' 'python-dbus'
'python-gobject' 'python-pam' 'python-pexpect' 'python-pillow' 'python-pyinotify'
- 'python-tinycss' 'xapps')
+ 'python-pytz' 'python-tinycss2' 'python-xapp' 'timezonemap' 'xapps')
optdepends=('blueberry: Bluetooth support'
'cinnamon-translations: i18n'
'gnome-panel: fallback mode'
@@ -46,7 +46,7 @@ prepare() {
# Check for the cc-panel module path, not for the irrelevant binary
# https://github.com/linuxmint/Cinnamon/pull/7382
- patch -p1 -i ../0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch
+ patch --no-backup-if-mismatch -p1 -i ../0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch
# Use wheel group instread of sudo (taken from Fedora)
patch -Np1 -i ../set_wheel.diff
@@ -59,7 +59,7 @@ prepare() {
# Add polkit agent to required components
sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \
- files/usr/share/cinnamon-session/sessions/cinnamon*.session
+ files/cinnamon*.session.in
# https://github.com/linuxmint/Cinnamon/issues/3575#issuecomment-374887122
# Cinnamon has no upstream backgrounds, use GNOME backgrounds instead