cinnamon: update to 2.4.6.
This commit is contained in:
Juan RP
parent
0521c348ee
commit
0159bb5063
|
|
@ -1,17 +0,0 @@
|
|||
Index: cinnamon/files/usr/share/cinnamon/applets/calendar@cinnamon.org/applet.js
|
||||
===================================================================
|
||||
--- cinnamon.orig/files/usr/share/cinnamon/applets/calendar@cinnamon.org/applet.js 2014-04-27 11:56:10.582581808 +0200
|
||||
+++ cinnamon/files/usr/share/cinnamon/applets/calendar@cinnamon.org/applet.js 2014-07-14 00:44:37.882215797 +0200
|
||||
@@ -94,7 +94,11 @@
|
||||
|
||||
// https://bugzilla.gnome.org/show_bug.cgi?id=655129
|
||||
this._upClient = new UPowerGlib.Client();
|
||||
- this._upClient.connect('notify-resume', this._updateClockAndDate);
|
||||
+ try {
|
||||
+ this._upClient.connect('notify-resume', this._updateClockAndDate);
|
||||
+ } catch (e) {
|
||||
+ this._upClient.connect('notify::resume', this._updateClockAndDate);
|
||||
+ }
|
||||
|
||||
// Start the clock
|
||||
this.on_settings_changed();
|
||||
|
|
@ -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
|
||||
--- data/org.cinnamon.gschema.xml.in
|
||||
+++ 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
|
||||
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
--- data/theme/cinnamon.css 2014-08-12 13:00:36.000000000 +0200
|
||||
+++ data/theme/cinnamon.css 2014-10-01 02:51:45.859630151 +0200
|
||||
@@ -1445,7 +1445,8 @@
|
||||
.applet-icon:hover,
|
||||
.applet-box:hover > .applet-icon {
|
||||
color: #fff;
|
||||
- icon-shadow: white 0px 0px 3px;
|
||||
+/* Broken with GNOME 3.14 (icon-size is not honoured)
|
||||
+ * icon-shadow: white 0px 0px 3px;*/
|
||||
}
|
||||
|
||||
/* ===================================================================
|
||||
--- files/usr/lib/cinnamon-settings/modules/cs_themes.py 2014-08-12 13:00:36.000000000 +0200
|
||||
+++ files/usr/lib/cinnamon-settings/modules/cs_themes.py 2014-10-01 02:52:56.897767729 +0200
|
||||
@@ -91,7 +91,7 @@
|
||||
|
||||
def _load_icon_themes(self):
|
||||
dirs = ("/usr/share/icons", os.path.join(os.path.expanduser("~"), ".icons"))
|
||||
- valid = walk_directories(dirs, lambda d: os.path.isdir(d) and not os.path.exists(os.path.join(d, "cursors")) and os.path.exists(os.path.join(d, "index.theme")))
|
||||
+ valid = walk_directories(dirs, lambda d: os.path.isdir(d) and os.path.exists(os.path.join(d, "index.theme")))
|
||||
valid.sort(lambda a,b: cmp(a.lower(), b.lower()))
|
||||
res = []
|
||||
for i in valid:
|
||||
|
|
@ -1,31 +1,27 @@
|
|||
# Template file for 'cinnamon'
|
||||
#
|
||||
pkgname=cinnamon
|
||||
version=2.2.16
|
||||
revision=6
|
||||
patch_args="-Np1"
|
||||
version=2.4.6
|
||||
revision=1
|
||||
wrksrc="Cinnamon-${version}"
|
||||
short_desc="GNOME3 fork of Linux Mint with GNOME2 aspect"
|
||||
build_style=gnu-configure
|
||||
configure_args="--disable-static --disable-schemas-compile --enable-compile-warnings=no"
|
||||
hostmakedepends="automake libtool gnome-common pkg-config gobject-introspection
|
||||
gettext-devel intltool xmlto docbook-xml gtk-doc git"
|
||||
gettext-devel glib-devel intltool xmlto docbook-xml gtk-doc git"
|
||||
makedepends="cjs-devel clutter-gtk-devel cinnamon-menus-devel gstreamer1-devel
|
||||
muffin-devel webkitgtk-devel libgnomekbd-devel polkit-devel libcanberra-devel
|
||||
startup-notification-devel pulseaudio-devel dbus-glib-devel GConf-devel
|
||||
libgnome-keyring-devel NetworkManager-devel libcroco-devel"
|
||||
depends="
|
||||
accountsservice caribou cinnamon-settings-daemon cinnamon-session muffin
|
||||
cinnamon-control-center cinnamon-screensaver cinnamon-translations nemo
|
||||
gnome-icon-theme gnome-icon-theme-symbolic gnome-themes-standard librsvg
|
||||
network-manager-applet pygtk python-dbus python-pam python-pexpect
|
||||
python-inotify python-lxml python-Pillow polkit-gnome"
|
||||
accountsservice caribou cinnamon-settings-daemon>=2.4 cinnamon-session>=2.4 muffin>=2.4
|
||||
cinnamon-control-center>=2.4 cinnamon-screensaver>=2.4 cinnamon-translations>=2.4 nemo>=2.4
|
||||
gnome-themes-standard gnome-backgrounds network-manager-applet pygtk python-dbus python-pam
|
||||
python-pexpect python-inotify python-lxml python-Pillow polkit-gnome"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
license="GPL-3"
|
||||
homepage="http://cinnamon.linuxmint.com/"
|
||||
|
||||
do_fetch() {
|
||||
git clone -b ${version} git://github.com/linuxmint/Cinnamon ${pkgname}-${version}
|
||||
}
|
||||
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
|
||||
checksum=f0f8b0c56e8c6ee53daa06bea28c04967960eefed601db2f0ae745ca2abe78e1
|
||||
|
||||
pre_configure() {
|
||||
# Add polkit agent to required components
|
||||
|
|
@ -44,5 +40,9 @@ pre_configure() {
|
|||
sed -i 's|/usr/share/cinnamon-background-properties|/usr/share/gnome-background-properties|' \
|
||||
files/usr/lib/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/lib/cinnamon-settings/cinnamon-settings.py
|
||||
|
||||
NOCONFIGURE=1 ./autogen.sh
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue