From f71e4a9caf6d07362475f672d9bf5184f2a8ec24 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 27 Sep 2012 14:30:38 +0200 Subject: [PATCH] cinnamon: rebuild against cogl-1.12. --- srcpkgs/cinnamon/cinnamon.rshlibs | 8 +++----- srcpkgs/cinnamon/template | 15 ++++++++------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/srcpkgs/cinnamon/cinnamon.rshlibs b/srcpkgs/cinnamon/cinnamon.rshlibs index 8ce952d91c..e5a802e3c4 100644 --- a/srcpkgs/cinnamon/cinnamon.rshlibs +++ b/srcpkgs/cinnamon/cinnamon.rshlibs @@ -22,8 +22,6 @@ libgconf-2.so.4 libsoup-2.4.so.1 libGL.so.1 libstartup-notification-1.so.0 -libgthread-2.0.so.0 -libffi.so.5 libcanberra.so.0 libpolkit-agent-1.so.0 libpolkit-gobject-1.so.0 @@ -37,8 +35,7 @@ libclutter-1.0.so.0 libcogl-pango.so.0 libjson-glib-1.0.so.0 libXi.so.6 -libcogl.so.9 -libdrm.so.2 +libcogl.so.11 libXext.so.6 libXdamage.so.1 libXcomposite.so.1 @@ -47,10 +44,11 @@ librt.so.1 libXfixes.so.3 libcroco-0.6.so.3 libxml2.so.2 -libgnome-desktop-3.so.2 +libgnome-desktop-3.so.4 libatk-1.0.so.0 libpangocairo-1.0.so.0 libcairo-gobject.so.2 libpango-1.0.so.0 +libgthread-2.0.so.0 libpulse-mainloop-glib.so.0 libpulse.so.0 diff --git a/srcpkgs/cinnamon/template b/srcpkgs/cinnamon/template index f15807e0b3..7cdf71a6fb 100644 --- a/srcpkgs/cinnamon/template +++ b/srcpkgs/cinnamon/template @@ -1,18 +1,18 @@ # Template file for 'cinnamon' pkgname=cinnamon version=1.6.0 -revision=5 +revision=6 wrksrc="linuxmint-Cinnamon-bd02368" build_style=gnu-configure configure_args="--disable-schemas-compile --enable-compile-warnings=yes --disable-static --with-ca-certificates=/etc/ssl/certs/ca-certificates.crt" makedepends="which gnome-common gettext-devel automake gnome-doc-utils -pkg-config intltool glib-devel dbus-glib-devel libxml2-devel gtk+3-devel -libmuffin-devel gjs-devel gnome-menus-devel GConf-devel libsoup-devel -MesaLib-devel clutter-devel startup-notification-devel libcanberra-devel -polkit-devel NetworkManager-devel libgnome-keyring-devel libcroco-devel -gnome-desktop-devel gnome-bluetooth-devel pulseaudio-devel gobject-introspection" -depends="desktop-file-utils caribou pulseaudio mesa-demos muffin>=1.0.6 +pkg-config intltool glib-devel dbus-glib-devel libxml2-devel gtk+3-devel>=3.6.0_2 +libmuffin-devel>=1.1.0_2 gjs-devel gnome-menus-devel>=3.6.0 GConf-devel libsoup-devel +MesaLib-devel cogl-devel>=1.12 clutter-devel>=1.12 startup-notification-devel libcanberra-devel +polkit-devel NetworkManager-devel libgnome-keyring-devel>=3.6.0 libcroco-devel +gnome-desktop-devel>=3.6.0 gnome-bluetooth-devel>=3.6.0 pulseaudio-devel gobject-introspection" +depends="desktop-file-utils caribou pulseaudio mesa-demos muffin>=1.1.0 python-gconf python-lxml python-imaging" fulldepends="gsettings-desktop-schemas" short_desc="The Cinnamon desktop (gnome-shell fork)" @@ -31,6 +31,7 @@ long_desc=" easy to use and comfortable desktop experience." pycompile_dirs="usr/lib/cinnamon-settings usr/lib/cinnamon-menu-editor" +LDFLAGS="-lgthread-2.0" pre_configure() { _cur="/usr/lib/gnome-session/gnome-session-check-accelerated"