diff --git a/srcpkgs/mutter/depends b/srcpkgs/mutter/depends index 6e8d7e9a54..88592da749 100644 --- a/srcpkgs/mutter/depends +++ b/srcpkgs/mutter/depends @@ -1,2 +1,2 @@ -abi_depends=">=2.91.90" +abi_depends=">=3.3.92" api_depends="${abi_depends}" diff --git a/srcpkgs/mutter/mutter-devel.template b/srcpkgs/mutter/mutter-devel.template index 24e518089c..5e803c09bd 100644 --- a/srcpkgs/mutter/mutter-devel.template +++ b/srcpkgs/mutter/mutter-devel.template @@ -5,14 +5,16 @@ long_desc="${long_desc} This package contains files for development, headers, static libs, etc." +Add_dependency run gsettings-desktop-schemas Add_dependency run gtk+3-devel Add_dependency run clutter-devel -Add_dependency run mutter +Add_dependency run libX11-devel +Add_dependency run mutter ">=${version}" -do_install() -{ +noarch=yes + +do_install() { vmove usr/include usr vmove usr/lib/pkgconfig usr/lib - vmove "usr/lib/*.a" usr/lib vmove "usr/lib/mutter/*.gir" usr/share/gir-1.0 } diff --git a/srcpkgs/mutter/mutter.rshlibs b/srcpkgs/mutter/mutter.rshlibs index 8b3468c14d..0e4f768fe4 100644 --- a/srcpkgs/mutter/mutter.rshlibs +++ b/srcpkgs/mutter/mutter.rshlibs @@ -8,28 +8,21 @@ libgdk_pixbuf-2.0.so.0 libgobject-2.0.so.0 libcairo.so.2 libpango-1.0.so.0 -libclutter-glx-1.0.so.0 libcairo-gobject.so.2 libatk-1.0.so.0 libpangocairo-1.0.so.0 libcogl-pango.so.0 libjson-glib-1.0.so.0 -libGL.so.1 -libpangoft2-1.0.so.0 libXi.so.6 -libcogl.so.5 libdrm.so.2 libXext.so.6 libXdamage.so.1 libXcomposite.so.1 libgio-2.0.so.0 -libfreetype.so.6 -libfontconfig.so.1 libgmodule-2.0.so.0 libgthread-2.0.so.0 librt.so.1 libXfixes.so.3 -libgconf-2.so.4 libstartup-notification-1.so.0 libcanberra-gtk3.so.0 libcanberra.so.0 @@ -42,3 +35,5 @@ libSM.so.6 libICE.so.6 libXinerama.so.1 libm.so.6 +libclutter-1.0.so.0 +libcogl.so.9 diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template index 8e4fccbeae..fce0050739 100644 --- a/srcpkgs/mutter/template +++ b/srcpkgs/mutter/template @@ -1,14 +1,12 @@ # Template file for 'mutter' pkgname=mutter -version=3.2.2 -distfiles="${GNOME_SITE}/$pkgname/3.2/$pkgname-$version.tar.xz" +version=3.3.92 +distfiles="${GNOME_SITE}/$pkgname/3.3/$pkgname-$version.tar.xz" build_style=gnu-configure -configure_args="--disable-scrollkeeper ---with-gconf-schema-file-dir=/usr/share/gconf/schemas ---disable-schemas-install" +configure_args="--disable-scrollkeeper --disable-schemas-compile --disable-static" short_desc="Lightweight GTK+3 window manager" maintainer="Juan RP " -checksum=cd5977d86a100d89cfef557c22900b6d061730e2bda66e314e4943505d2bd5a1 +checksum=fd31de6084dd5a11cfed5528af679e71f7a195267c5ac7705f2090c990b5c1f7 long_desc=" Mutter is a small window manager, using GTK+ and Clutter to do everything. @@ -16,7 +14,6 @@ long_desc=" is a 'Boring window manager for the adult in you. Many window managers are like Marshmallow Froot Loops; Metacity is like Cheerios.'" -gconf_schemas="mutter.schemas" subpackages="mutter-devel" Add_dependency build pkg-config @@ -24,7 +21,6 @@ Add_dependency build intltool Add_dependency build gnome-doc-utils Add_dependency build gobject-introspection Add_dependency build gtk+3-devel -Add_dependency build GConf-devel Add_dependency build startup-notification-devel Add_dependency build libcanberra-devel Add_dependency build clutter-devel @@ -34,10 +30,4 @@ Add_dependency build libffi-devel Add_dependency full zenity Add_dependency full desktop-file-utils - -post_install() -{ - mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc} - gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${gconf_schemas} \ - --domain ${pkgname} ${wrksrc}/*.schemas -} +Add_dependency full gsettings-desktop-schemas ">=3.3.92_1"