diff options
author | Eli Schwartz | 2019-03-05 16:01:40 -0500 |
---|---|---|
committer | Eli Schwartz | 2019-03-05 16:01:40 -0500 |
commit | fa1ef2f27c0463fa0d86d0a147a48a668e0d11aa (patch) | |
tree | 47c60c95d0c91ee9e97b8724da0ee665c5e0a56d | |
parent | 17099d3293acdb71a1c455b6772629667e6b1e3b (diff) | |
download | aur-fa1ef2f27c0463fa0d86d0a147a48a668e0d11aa.tar.gz |
upgpkg: cinnamon-git 4.0.9.r51.gc1820893f-1
rebase on top of community PKGBUILD
-rw-r--r-- | .AURINFO | 55 | ||||
-rw-r--r-- | .SRCINFO | 78 | ||||
-rw-r--r-- | 0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch | 38 | ||||
-rw-r--r-- | PKGBUILD | 136 | ||||
-rw-r--r-- | cinnamon-git.install | 12 | ||||
-rw-r--r-- | set_wheel.diff (renamed from use-wheel.patch) | 39 |
6 files changed, 162 insertions, 196 deletions
diff --git a/.AURINFO b/.AURINFO deleted file mode 100644 index 72c3d3478895..000000000000 --- a/.AURINFO +++ /dev/null @@ -1,55 +0,0 @@ -pkgbase = cinnamon-git - pkgdesc = A Linux desktop which provides advanced innovative features and a traditional user experience - pkgver = 3910.dfdcb08 - pkgrel = 1 - url = https://github.com/linuxmint/Cinnamon - install = cinnamon-git.install - arch = i686 - arch = x86_64 - license = GPL2 - makedepends = gnome-common - makedepends = intltool - makedepends = git - makedepends = patch - depends = cinnamon-settings-daemon-git - depends = cinnamon-session-git - depends = cinnamon-desktop-git - depends = cinnamon-control-center-git - depends = cjs-git - depends = cinnamon-menus-git - depends = cinnamon-translations-git - depends = muffin-git - depends = cinnamon-screensaver-git - depends = nemo-dev - depends = polkit-gnome - depends = network-manager-applet - depends = gnome-icon-theme - depends = gnome-themes-standard - depends = accountsservice - depends = caribou - depends = clutter-gtk - depends = gconf - depends = libgnomekbd - depends = gnome-themes-standard - depends = gstreamer - depends = libgnome-keyring - depends = librsvg - depends = networkmanager - depends = python2-dbus - depends = python2-pillow - depends = python2-pam - depends = python2-pexpect - depends = python2-pyinotify - depends = python2-lxml - depends = webkitgtk - depends = xorg-server - provides = cinnamon - conflicts = cinnamon - options = !emptydirs - source = cinnamon::git+https://github.com/linuxmint/cinnamon.git - source = set_wheel.patch - sha256sums = SKIP - sha256sums = 3c4c7bb65d9e3b7d5569a14a45ebf08d2326250869645511dfa18d87b8eaf444 - -pkgname = cinnamon-git - @@ -1,55 +1,53 @@ pkgbase = cinnamon-git - pkgdesc = A Linux desktop which provides advanced innovative features and a traditional user experience - pkgver = 6161.3842206a + pkgdesc = Linux desktop which provides advanced innovative features and a traditional user experience + pkgver = 4.0.9.r51.gc1820893f pkgrel = 1 - url = https://github.com/linuxmint/Cinnamon - install = cinnamon-git.install - arch = i686 + url = https://github.com/linuxmint/cinnamon arch = x86_64 license = GPL2 - makedepends = gnome-common - makedepends = intltool makedepends = git - depends = cinnamon-settings-daemon-git - depends = cinnamon-session-git - depends = cinnamon-desktop-git - depends = cinnamon-control-center-git - depends = cjs-git - depends = cinnamon-menus-git - depends = cinnamon-translations-git - depends = muffin-git - depends = cinnamon-screensaver-git - depends = nemo-dev - depends = polkit-gnome - depends = network-manager-applet - depends = gnome-icon-theme - depends = gnome-themes-standard + makedepends = intltool + makedepends = gtk-doc + makedepends = gobject-introspection depends = accountsservice depends = caribou - depends = clutter-gtk - depends = gconf - depends = libgnomekbd - depends = gnome-themes-standard + depends = cinnamon-control-center + depends = cinnamon-menus + depends = cinnamon-screensaver + depends = cinnamon-session + depends = cinnamon-settings-daemon + depends = cjs + depends = gnome-backgrounds + depends = gnome-themes-extra depends = gstreamer - depends = libgnome-keyring + depends = libgnomekbd + depends = libkeybinder3 depends = librsvg - depends = networkmanager - depends = python2-dbus - depends = python2-pillow - depends = python2-pam - depends = python2-pexpect - depends = python2-pyinotify - depends = python2-lxml - depends = webkitgtk - depends = xorg-server - provides = cinnamon - conflicts = cinnamon + depends = muffin>=4.0.6.r16.g566c4f5b8 + depends = network-manager-applet + depends = nemo + depends = polkit-gnome + depends = python-cairo + depends = python-dbus + depends = python-gobject + depends = python-pam + depends = python-pexpect + depends = python-pillow + depends = python-pyinotify + 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 options = !emptydirs - source = cinnamon::git+https://github.com/linuxmint/cinnamon.git - source = use-wheel.patch + source = git+https://github.com/linuxmint/cinnamon.git + source = 0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch + source = set_wheel.diff source = default-theme.patch sha256sums = SKIP - sha256sums = 5c98d0e44c2cc2c11fac42a10a22f999ba60016b06fc6e45416484febe048417 + sha256sums = 024fa59ea6e1e7e6f6307786abf71ddeb1f6add43c832d568ba856bb43bf4dc6 + sha256sums = 7517d651d440361947f9539fe8f42548d5eb43a09c28c9a11f51cfdfdefd042f sha256sums = 566585873f38a79ec248b916645a2e081abec3c6d4df2c34339cde1f35375cc5 pkgname = cinnamon-git diff --git a/0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch b/0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch new file mode 100644 index 000000000000..39b41ada1ab4 --- /dev/null +++ b/0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch @@ -0,0 +1,38 @@ +From ad1e03d6b652b4c7ce0bd9469087b40989824f5c Mon Sep 17 00:00:00 2001 +From: Eli Schwartz <eschwartz93@gmail.com> +Date: Tue, 20 Mar 2018 14:11:02 -0400 +Subject: [PATCH] cinnamon-settings: don't rely on the presence of + cinnamon-control-center + +The existence of the cinnamon-control-center binary does not even tell +us what control center libraries are available. So instead, do the same +thing we did for cinnamon-settings modules, and check if the library +exists. +--- + files/usr/bin/cinnamon-settings | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/files/usr/bin/cinnamon-settings b/files/usr/bin/cinnamon-settings +index fcd1fee9e..e20ba0b78 100755 +--- a/files/usr/bin/cinnamon-settings ++++ b/files/usr/bin/cinnamon-settings +@@ -7,6 +7,7 @@ Usage: cinnamon-settings [optional module name] + + import os + import sys ++import sysconfig + + if len(sys.argv) > 1: + module = sys.argv[1] +@@ -14,7 +15,7 @@ if len(sys.argv) > 1: + os.execvp("/usr/share/cinnamon/cinnamon-settings/xlet-settings.py", (" ", module[0:-1]) + tuple(sys.argv[2:])) + elif os.path.exists("/usr/share/cinnamon/cinnamon-settings/modules/cs_%s.py" % module): + os.execvp("/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py", (" ",) + tuple(sys.argv[1:])) +- elif os.path.exists("/usr/bin/cinnamon-control-center"): ++ elif os.path.exists(os.path.join(sysconfig.get_config_var("LIBDIR"), "cinnamon-control-center-1/panels/lib%s.so" % module)): + os.execvp("/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py", (" ",) + tuple(sys.argv[1:])) + elif os.path.exists("/usr/bin/gnome-control-center"): + print ("Unknown module %s, calling gnome-control-center" % module) +-- +2.20.0 + @@ -1,93 +1,91 @@ -# $Id$ -# Maintainer: Christoph Böhmwalder <christoph@boehmwalder.at> -# Based on cinnamon PKGBUILD - -_pkgname=cinnamon -pkgname=${_pkgname}-git -pkgver=6161.3842206a +# Maintainer: Eli Schwartz <eschwartz@archlinux.org> +# Contributor: Alexandre Filgueira <alexfilgueira@cinnarch.com> +# Contributor: M0Rf30 +# Contributor: unifiedlinux +# Contributor: CReimer + +pkgname=cinnamon-git +pkgver=4.0.9.r51.gc1820893f pkgrel=1 -pkgdesc="A Linux desktop which provides advanced innovative features and a traditional user experience" -arch=('i686' 'x86_64') -url="https://github.com/linuxmint/Cinnamon" +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=('cinnamon-settings-daemon-git' 'cinnamon-session-git' 'cinnamon-desktop-git' - 'cinnamon-control-center-git' 'cjs-git' 'cinnamon-menus-git' - 'cinnamon-translations-git' 'muffin-git' 'cinnamon-screensaver-git' - 'nemo-dev' 'polkit-gnome' - 'network-manager-applet' 'gnome-icon-theme' 'gnome-themes-standard' - 'accountsservice' 'caribou' 'clutter-gtk' 'gconf' 'libgnomekbd' - 'gnome-themes-standard' 'gstreamer' 'libgnome-keyring' - 'librsvg' 'networkmanager' 'python2-dbus' 'python2-pillow' - 'python2-pam' 'python2-pexpect' 'python2-pyinotify' 'python2-lxml' 'webkitgtk' - 'xorg-server') -makedepends=('gnome-common' 'intltool' 'git') +depends=('accountsservice' 'caribou' 'cinnamon-control-center' 'cinnamon-menus' 'cinnamon-screensaver' + 'cinnamon-session' 'cinnamon-settings-daemon' 'cjs' 'gnome-backgrounds' + 'gnome-themes-extra' 'gstreamer' 'libgnomekbd' 'libkeybinder3' 'librsvg' 'muffin>=4.0.6.r16.g566c4f5b8' + 'network-manager-applet' 'nemo' 'polkit-gnome' 'python-cairo' 'python-dbus' + 'python-gobject' 'python-pam' 'python-pexpect' 'python-pillow' 'python-pyinotify' 'xapps') +optdepends=('blueberry: Bluetooth support' + 'cinnamon-translations: i18n' + 'gnome-panel: fallback mode' + 'metacity: fallback mode' + 'system-config-printer: printer settings') +makedepends=('git' 'intltool' 'gtk-doc' 'gobject-introspection') options=('!emptydirs') -conflicts=("${_pkgname}") -provides=("${_pkgname}") -install=${pkgname}.install -source=("${_pkgname}"::git+https://github.com/linuxmint/cinnamon.git - "use-wheel.patch" - "default-theme.patch") +source=("git+${url}.git" + "0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch" + "set_wheel.diff" + "default-theme.patch") sha256sums=('SKIP' - '5c98d0e44c2cc2c11fac42a10a22f999ba60016b06fc6e45416484febe048417' - '566585873f38a79ec248b916645a2e081abec3c6d4df2c34339cde1f35375cc5') + '024fa59ea6e1e7e6f6307786abf71ddeb1f6add43c832d568ba856bb43bf4dc6' + '7517d651d440361947f9539fe8f42548d5eb43a09c28c9a11f51cfdfdefd042f' + '566585873f38a79ec248b916645a2e081abec3c6d4df2c34339cde1f35375cc5') pkgver() { - cd "${srcdir}/${_pkgname}" - echo $(git rev-list --count master).$(git rev-parse --short master) + cd "${srcdir}"/${pkgname%-git} + + git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g' } prepare() { - cd ${srcdir}/cinnamon + cd "${srcdir}"/${pkgname%-git} - # Use wheel group instread of sudo - patch -Np1 -i ../use-wheel.patch + # 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 - # Set default theme to 'cinnamon' - patch -Np1 -i ../default-theme.patch + # Use wheel group instread of sudo (taken from Fedora) + patch -Np1 -i ../set_wheel.diff - # Add polkit agent to required components - sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' files/usr/share/cinnamon-session/sessions/cinnamon*.session + # Set default theme to 'cinnamon' + patch -Np1 -i ../default-theme.patch - # Use pkexec instead of gksu - sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users + # Replace MintInstall with GNOME Software + sed -i 's/mintinstall.desktop/org.gnome.Software.desktop/' data/org.cinnamon.gschema.xml.in - # Check for the cc-panel path, not for the unneeded binary - sed -i 's|/usr/bin/cinnamon-control-center|/usr/lib/cinnamon-control-center-1/panels|' files/usr/bin/cinnamon-settings + # Add polkit agent to required components + sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \ + files/usr/share/cinnamon-session/sessions/cinnamon*.session - # 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 + # https://github.com/linuxmint/Cinnamon/issues/3575#issuecomment-374887122 + # 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 + NOCONFIGURE=1 ./autogen.sh +} - # 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 +build() { + cd "${srcdir}"/${pkgname%-git} - # Replace MintInstall with GNOME Software - sed -i 's/mintinstall.desktop/org.gnome.Software.desktop/' data/org.cinnamon.gschema.xml.in + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib/cinnamon \ + --localstatedir=/var \ + --disable-static \ + --disable-gtk-doc \ + --disable-schemas-compile \ + --enable-compile-warnings=yes - # Remove broken symlink - rm files/etc/xdg/menus/cinnamon-applications-merged -} + # https://bugzilla.gnome.org/show_bug.cgi?id=656231 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool -build() { - cd ${srcdir}/cinnamon - - ./autogen.sh --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib/cinnamon \ - --localstatedir=/var \ - --disable-static \ - --disable-schemas-compile \ - --with-session-tracking=systemd - make + make } package() { - cd "${srcdir}/${_pkgname}" - make DESTDIR="${pkgdir}/" install + cd "${srcdir}"/${pkgname%-git} + + make DESTDIR="${pkgdir}" install } diff --git a/cinnamon-git.install b/cinnamon-git.install deleted file mode 100644 index c0ed9a0d79f8..000000000000 --- a/cinnamon-git.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - glib-compile-schemas usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/use-wheel.patch b/set_wheel.diff index b3f60a36a35a..bd436174d3ad 100644 --- a/use-wheel.patch +++ b/set_wheel.diff @@ -1,20 +1,20 @@ ---- a/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py 2016-12-23 16:59:40.005754000 +1300 -+++ b/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py 2016-12-23 16:57:46.775035000 +1300 -@@ -153,12 +153,11 @@ class EditableEntry (Gtk.Notebook): - +--- a/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py ++++ b/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py +@@ -153,12 +153,11 @@ + class PasswordDialog(Gtk.Dialog): - -- def __init__ (self, user, password_mask, group_mask): -+ def __init__ (self, user, password_mask): - super(PasswordDialog, self).__init__() - + +- def __init__ (self, user, password_mask, group_mask, parent = None): ++ def __init__ (self, user, password_mask, parent = None): + super(PasswordDialog, self).__init__(None, parent) + self.user = user self.password_mask = password_mask - self.group_mask = group_mask - + self.set_modal(True) self.set_skip_taskbar_hint(True) -@@ -224,14 +223,7 @@ class PasswordDialog(Gtk.Dialog): +@@ -224,14 +223,7 @@ def change_password(self): newpass = self.new_password.get_text() self.user.set_password(newpass, "") @@ -25,21 +25,21 @@ - mask.remove("nopasswdlogin") - mask = ", ".join(mask) - self.group_mask.set_text(mask) -- self.password_mask.set_text(u'\u2022\u2022\u2022\u2022\u2022\u2022') -+ self.password_mask.set_text(u'\u2022\u2022\u2022\u2022\u2022\u2022') +- self.password_mask.set_text('\u2022\u2022\u2022\u2022\u2022\u2022') ++ self.password_mask.set_text('\u2022\u2022\u2022\u2022\u2022\u2022') self.destroy() - + def set_passwords_visibility(self): -@@ -569,7 +561,7 @@ class Module: +@@ -563,7 +555,7 @@ model, treeiter = self.users_treeview.get_selection().get_selected() if treeiter != None: user = model[treeiter][INDEX_USER_OBJECT] -- dialog = PasswordDialog(user, self.password_mask, self.groups_label) -+ dialog = PasswordDialog(user, self.password_mask) +- dialog = PasswordDialog(user, self.password_mask, self.groups_label, self.window) ++ dialog = PasswordDialog(user, self.password_mask, self.window) response = dialog.run() - + def _on_groups_button_clicked(self, widget): -@@ -814,11 +806,11 @@ class Module: +@@ -807,11 +799,11 @@ pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size("/usr/share/cinnamon/faces/user-generic.png", 48, 48) description = "<b>%s</b>\n%s" % (fullname, username) piter = self.users.append(None, [new_user, pixbuf, description]) @@ -53,4 +53,3 @@ + subprocess.call(["usermod", username, "-G", "%s" % username]) self.load_groups() dialog.destroy() - |