summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristian Fiskerstrand <k_f@gentoo.org>2018-11-24 19:24:45 +0100
committerKristian Fiskerstrand <k_f@gentoo.org>2018-11-28 20:56:03 +0100
commit01aad7538fe9da3548b8ff33abcf996e0b58eedc (patch)
tree30e6447ef14eb8cd38601240b983cc98399ddf38
parentgnome-extra/cinnamon-screensaver: fix (diff)
downloadgentoo-01aad7538fe9da3548b8ff33abcf996e0b58eedc.tar.gz
gentoo-01aad7538fe9da3548b8ff33abcf996e0b58eedc.tar.bz2
gentoo-01aad7538fe9da3548b8ff33abcf996e0b58eedc.zip
x11-wm/muffin: New upstream version 4.0.2
Signed-off-by: Kristian Fiskerstrand <k_f@gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11
-rw-r--r--x11-wm/muffin/Manifest1
-rw-r--r--x11-wm/muffin/files/muffin-4.0-clutter-configure.patch13
-rw-r--r--x11-wm/muffin/files/muffin-4.0-cogl-configure.patch25
-rw-r--r--x11-wm/muffin/muffin-4.0.3.ebuild81
4 files changed, 120 insertions, 0 deletions
diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest
index 5303533c197..201cd6ec872 100644
--- a/x11-wm/muffin/Manifest
+++ b/x11-wm/muffin/Manifest
@@ -1,2 +1,3 @@
DIST muffin-3.6.0.tar.gz 2720809 BLAKE2B 9d1b92907d545990b409c15f9e9e3bf7b3871cc545d02234296efcb15f0082fc630c3a06849789c5e5aed4af9253e6893cc29feb7590aaaaaf2eb38843591c8d SHA512 d077f1310d7600754c9b4f77fc2a82377aec43f9a1cc0b95e28118764741922a58f2348418bee309d8c7fd1484b97ddc898d0105fa1a3fcd855d2fcc68f3679e
DIST muffin-3.8.2.tar.gz 2723114 BLAKE2B f8218ac1f71ecfa5b74ca7ae8cf76d76e1207e3ce65f715643d477d2fb6429390671f3b05132a64f23a1853297f71563a62c052555f8a26d084469814972a64d SHA512 62dbfb602dd1164779e365e5e6f782431a491a254dcec8faef8a50f27f50cf7b0f8ab958b6df3b75d6b15edcd90c23a2fd6cc18cb11a2a513e669169f09cba05
+DIST muffin-4.0.3.tar.gz 5194156 BLAKE2B 8d58d37f8410ad5384c09a4edabd3ca5bd8a3a612825ded55bf625a9a8c2ba8aba295187e3eb727fc248716b3efe84e9a567a49f95635150c4bda5f309545ed2 SHA512 34a3f152d2701e06498f2de28639af656bd4efa6c7d5c56244fe9002cf769e929fc2360bd036509318fab9c4fe73c976605c3fdb444c9280f52e6db27867a14c
diff --git a/x11-wm/muffin/files/muffin-4.0-clutter-configure.patch b/x11-wm/muffin/files/muffin-4.0-clutter-configure.patch
new file mode 100644
index 00000000000..f5ab1de9af2
--- /dev/null
+++ b/x11-wm/muffin/files/muffin-4.0-clutter-configure.patch
@@ -0,0 +1,13 @@
+diff --git a/clutter/configure.ac b/clutter/configure.ac
+index 0b3c3e5..9c0e6cd 100644
+--- a/clutter/configure.ac
++++ b/clutter/configure.ac
+@@ -231,7 +231,7 @@ AC_ARG_ENABLE(
+ [wayland-egl-server],
+ [AC_HELP_STRING([--enable-wayland-egl-server=@<:@no/yes@:>@], [Enable server side wayland support @<:@default=no@:>@])],
+ [],
+- enable_wayland_egl_server=yes
++ enable_wayland_egl_server=no
+ )
+
+ AS_IF([test "x$enable_wayland_egl_server" = "xyes"],
diff --git a/x11-wm/muffin/files/muffin-4.0-cogl-configure.patch b/x11-wm/muffin/files/muffin-4.0-cogl-configure.patch
new file mode 100644
index 00000000000..1e9721dd1bf
--- /dev/null
+++ b/x11-wm/muffin/files/muffin-4.0-cogl-configure.patch
@@ -0,0 +1,25 @@
+From d3dec860b3390068321c579de85d0ebfab92481a Mon Sep 17 00:00:00 2001
+From: Kristian Fiskerstrand <k_f@gentoo.org>
+Date: Wed, 28 Nov 2018 19:57:20 +0100
+Subject: [PATCH] Fix
+
+---
+ cogl/configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cogl/configure.ac b/cogl/configure.ac
+index b06677a..209f449 100644
+--- a/cogl/configure.ac
++++ b/cogl/configure.ac
+@@ -700,7 +700,7 @@ AC_ARG_ENABLE(
+ [wayland-egl-server],
+ [AC_HELP_STRING([--enable-wayland-egl-server=@<:@no/yes@:>@], [Enable server side wayland support @<:@default=no@:>@])],
+ [],
+- enable_wayland_egl_server=yes
++ enable_wayland_egl_server=no
+ )
+ AS_IF([test "x$enable_wayland_egl_server" = "xyes"],
+ [
+--
+2.18.1
+
diff --git a/x11-wm/muffin/muffin-4.0.3.ebuild b/x11-wm/muffin/muffin-4.0.3.ebuild
new file mode 100644
index 00000000000..1f5bf4aba31
--- /dev/null
+++ b/x11-wm/muffin/muffin-4.0.3.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils gnome2
+
+DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+introspection test xinerama"
+KEYWORDS="~amd64 ~x86"
+
+RESTRICT="test"
+
+COMMON_DEPEND="
+ >=x11-libs/pango-1.2[X,introspection?]
+ >=x11-libs/cairo-1.14:=[X]
+ x11-libs/gdk-pixbuf:2[introspection?]
+ >=x11-libs/gtk+-3.9.12:3[X,introspection?]
+ >=dev-libs/glib-2.37.3:2[dbus]
+ >=gnome-extra/cinnamon-desktop-2.4:0=[introspection?]
+ >=gnome-base/gsettings-desktop-schemas-3.3.0[introspection?]
+ >=media-libs/libcanberra-0.26[gtk3]
+ >=x11-libs/libXcomposite-0.3
+ >=x11-libs/startup-notification-0.7:=
+
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXcomposite
+ x11-libs/libXcursor
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ virtual/opengl
+
+ gnome-extra/zenity
+
+ introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+ xinerama? ( x11-libs/libXinerama )
+"
+# needs gtk-doc, not just -am, for gtk-doc.make
+DEPEND="${COMMON_DEPEND}
+ ${PYTHON_DEPS}
+ >=app-text/gnome-doc-utils-0.8
+ sys-devel/gettext
+ dev-util/gtk-doc
+ dev-util/gtk-doc-am
+ >=dev-util/intltool-0.35
+ virtual/pkgconfig
+ x11-base/xorg-proto
+ test? ( app-text/docbook-xml-dtd:4.5 )
+"
+RDEPEND="${COMMON_DEPEND}
+ !x11-misc/expocity
+"
+
+src_prepare() {
+ eapply "${FILESDIR}"/muffin-4.0-{cogl,clutter}-configure.patch
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_configure() {
+ DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* *.txt doc/*.txt"
+ gnome2_src_configure \
+ --disable-static \
+ --enable-shape \
+ --enable-sm \
+ --enable-startup-notification \
+ --enable-xsync \
+ --enable-verbose-mode \
+ --with-libcanberra \
+ $(use_enable introspection) \
+ $(use_enable xinerama)
+}