Date: Friday, September 27, 2013 @ 20:17:08 Author: bgyorgy Revision: 97707
upgpkg: cinnamon 1.8.8-6 Rebuild for GNOME 3.10 Added: cinnamon/trunk/js17.patch Modified: cinnamon/trunk/PKGBUILD ------------+ PKGBUILD | 25 +++++++++++++++++-------- js17.patch | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 8 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-09-27 18:15:11 UTC (rev 97706) +++ PKGBUILD 2013-09-27 18:17:08 UTC (rev 97707) @@ -6,7 +6,7 @@ pkgname=cinnamon pkgver=1.8.8 -pkgrel=5 +pkgrel=6 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience" arch=('i686' 'x86_64') url="http://cinnamon.linuxmint.com/" @@ -14,7 +14,7 @@ depends=('accountsservice' 'caribou' 'clutter-gtk' 'gjs' 'gnome-bluetooth' 'gnome-icon-theme' 'gnome-menus' 'gnome-settings-daemon' 'gnome-session' 'gnome-themes-standard' 'gstreamer0.10' 'libgnome-keyring' 'librsvg' - 'networkmanager' 'muffin' 'pygtk' 'python2-dbus' 'python2-pillow' + 'networkmanager' 'muffin' 'pygtk' 'python2-dbus' 'python2-imaging' 'python2-pyinotify' 'python2-lxml' 'webkitgtk3' 'gnome-settings-daemon-compat' 'gnome-panel') makedepends=('gnome-common' 'intltool') @@ -35,7 +35,8 @@ "idle-dim.patch" "background.patch" "bluetooth_obex_transfer.patch" - "disable-mpris-support.patch") + "disable-mpris-support.patch" + "js17.patch") sha256sums=('1bce982e6333e7bd27a1df9f37eb9139360c2fef667c7a998a79f216d4a0921d' '3d362efd15f8cfeca1713f5bcf88d4be787b39d7c7f24b73cd13f867af33a680' 'a0c05c995102b16f1060cbd43931eeaefeafd0265a0335e4ca14a143bd4c8c30' @@ -46,9 +47,10 @@ 'b34c30299fb88228c59f36fced90d56346847019a080bc7b8157b72caa659100' '373d80cdb23250fbde846ed493ba422672cc42b03a111c2ce044467ee782df7f' '4497f3e0a97c364845d8a3a3b3b75e7dc9d475dc39f56b2106f8c4b9e5111ac2' - 'f1eb8110718434e1dc2cf0a308757a787390382dfccd1c8cc80488b93cf6a9f7') + 'f1eb8110718434e1dc2cf0a308757a787390382dfccd1c8cc80488b93cf6a9f7' + '4c5cad08c9cf2b32e32f9704af1c72a470e24ac4ff9f14afd6037f8fa70e526a') -build() { +prepare() { cd ${srcdir}/Cinnamon* # Python2 fix @@ -88,6 +90,16 @@ # Disable MPRIS support (workaround for FS#35282) patch -Np1 -i ../disable-mpris-support.patch + # Fix build error so cinnamon compiles with mozjs-17 + patch -Np1 -i ../js17.patch + + # Prefix 'System Settings' with 'Cinnamon' to avoid confusion with gnome-control-center + sed -i 's/^Name\(.*\)=\(.*\)/Name\1=Cinnamon \2/' files/usr/share/applications/cinnamon-settings.desktop +} + +build() { + cd ${srcdir}/Cinnamon* + ./autogen.sh --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib/cinnamon \ @@ -105,7 +117,4 @@ # Remove leftover files after patching find "$pkgdir" -type f -name *.orig | xargs rm - - # Prefix 'System Settings' with 'Cinnamon' to avoid confusion with gnome-control-center - sed -i 's/^Name\(.*\)=\(.*\)/Name\1=Cinnamon \2/' "$pkgdir/usr/share/applications/cinnamon-settings.desktop" } Added: js17.patch =================================================================== --- js17.patch (rev 0) +++ js17.patch 2013-09-27 18:17:08 UTC (rev 97707) @@ -0,0 +1,36 @@ +From 914d7da8baea24b1b31e2bcf982d12996f86694a Mon Sep 17 00:00:00 2001 +From: leigh123linux <leigh123li...@fedoraproject.org> +Date: Tue, 4 Jun 2013 14:02:15 +0200 +Subject: [PATCH] Fix build error so cinnamon compiles with mozjs-17 + +https://mail.gnome.org/archives/desktop-devel-list/2013-March/msg00135.html + +Fixes #2113 +--- + src/cinnamon-global.c | 7 ++----- + 1 file changed, 2 insertions(+), 5 deletions(-) + +diff --git a/src/cinnamon-global.c b/src/cinnamon-global.c +index ab5d5d4..69958d3 100644 +--- a/src/cinnamon-global.c ++++ b/src/cinnamon-global.c +@@ -1237,14 +1237,11 @@ enum + 0, + &target_object)) + { +- char *message; +- gjs_log_exception(context, +- &message); ++ gjs_log_exception(context); + g_set_error(error, + G_IO_ERROR, + G_IO_ERROR_FAILED, +- "%s", message ? message : "(unknown)"); +- g_free(message); ++ "Unable to import %s", target_object_script); + goto out_error; + } + +-- +1.8.4 +