diff --git a/srcpkgs/cinnamon/patches/gnome-3.14.patch b/srcpkgs/cinnamon/patches/gnome-3.14.patch deleted file mode 100644 index c374c2cab99..00000000000 --- a/srcpkgs/cinnamon/patches/gnome-3.14.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- 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/share/cinnamon/cinnamon-settings/modules/cs_themes.py.orig 2015-10-30 08:04:07.000000000 -0400 -+++ ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_themes.py 2015-11-08 23:35:36.770662778 -0500 -@@ -262,7 +262,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: diff --git a/srcpkgs/cinnamon/template b/srcpkgs/cinnamon/template index 707ff36c7d6..e97189b6ef2 100644 --- a/srcpkgs/cinnamon/template +++ b/srcpkgs/cinnamon/template @@ -1,18 +1,19 @@ # Template file for 'cinnamon' pkgname=cinnamon -version=2.8.7 -revision=2 +version=3.2.0 +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 glib-devel intltool xmlto docbook-xml gtk-doc git" + gettext-devel glib-devel intltool xmlto docbook-xml gtk-doc git autoconf-archive" 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 gtk+3-devel" + libgnome-keyring-devel NetworkManager-devel libcroco-devel gtk+3-devel + cinnamon-desktop-devel" depends=" accountsservice caribou cinnamon-settings-daemon>=${version%.*} cinnamon-session>=${version%.*} muffin>=${version%.*} cinnamon-control-center>=${version%.*} cinnamon-screensaver>=${version%.*} cinnamon-translations>=${version%.*} nemo>=${version%.*} @@ -23,7 +24,7 @@ maintainer="Juan RP " license="GPL-3" homepage="http://cinnamon.linuxmint.com/" distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz" -checksum=25d4ee63a5c32eef4d1e9fad2c54ab71ebd9f46fbd4cbc6f04b74154ae796aff +checksum=c1473aabb01329c07bf1e28148cb410255700f4dd237195b7790e9bcdb69b89d pycompile_dirs=" /usr/share/cinnamon/cinnamon-slideshow