1 |
commit: 01aad7538fe9da3548b8ff33abcf996e0b58eedc |
2 |
Author: Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Nov 24 18:24:45 2018 +0000 |
4 |
Commit: Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Nov 28 19:56:03 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01aad753 |
7 |
|
8 |
x11-wm/muffin: New upstream version 4.0.2 |
9 |
|
10 |
Signed-off-by: Kristian Fiskerstrand <k_f <AT> gentoo.org> |
11 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
12 |
|
13 |
x11-wm/muffin/Manifest | 1 + |
14 |
.../files/muffin-4.0-clutter-configure.patch | 13 ++++ |
15 |
.../muffin/files/muffin-4.0-cogl-configure.patch | 25 +++++++ |
16 |
x11-wm/muffin/muffin-4.0.3.ebuild | 81 ++++++++++++++++++++++ |
17 |
4 files changed, 120 insertions(+) |
18 |
|
19 |
diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest |
20 |
index 5303533c197..201cd6ec872 100644 |
21 |
--- a/x11-wm/muffin/Manifest |
22 |
+++ b/x11-wm/muffin/Manifest |
23 |
@@ -1,2 +1,3 @@ |
24 |
DIST muffin-3.6.0.tar.gz 2720809 BLAKE2B 9d1b92907d545990b409c15f9e9e3bf7b3871cc545d02234296efcb15f0082fc630c3a06849789c5e5aed4af9253e6893cc29feb7590aaaaaf2eb38843591c8d SHA512 d077f1310d7600754c9b4f77fc2a82377aec43f9a1cc0b95e28118764741922a58f2348418bee309d8c7fd1484b97ddc898d0105fa1a3fcd855d2fcc68f3679e |
25 |
DIST muffin-3.8.2.tar.gz 2723114 BLAKE2B f8218ac1f71ecfa5b74ca7ae8cf76d76e1207e3ce65f715643d477d2fb6429390671f3b05132a64f23a1853297f71563a62c052555f8a26d084469814972a64d SHA512 62dbfb602dd1164779e365e5e6f782431a491a254dcec8faef8a50f27f50cf7b0f8ab958b6df3b75d6b15edcd90c23a2fd6cc18cb11a2a513e669169f09cba05 |
26 |
+DIST muffin-4.0.3.tar.gz 5194156 BLAKE2B 8d58d37f8410ad5384c09a4edabd3ca5bd8a3a612825ded55bf625a9a8c2ba8aba295187e3eb727fc248716b3efe84e9a567a49f95635150c4bda5f309545ed2 SHA512 34a3f152d2701e06498f2de28639af656bd4efa6c7d5c56244fe9002cf769e929fc2360bd036509318fab9c4fe73c976605c3fdb444c9280f52e6db27867a14c |
27 |
|
28 |
diff --git a/x11-wm/muffin/files/muffin-4.0-clutter-configure.patch b/x11-wm/muffin/files/muffin-4.0-clutter-configure.patch |
29 |
new file mode 100644 |
30 |
index 00000000000..f5ab1de9af2 |
31 |
--- /dev/null |
32 |
+++ b/x11-wm/muffin/files/muffin-4.0-clutter-configure.patch |
33 |
@@ -0,0 +1,13 @@ |
34 |
+diff --git a/clutter/configure.ac b/clutter/configure.ac |
35 |
+index 0b3c3e5..9c0e6cd 100644 |
36 |
+--- a/clutter/configure.ac |
37 |
++++ b/clutter/configure.ac |
38 |
+@@ -231,7 +231,7 @@ AC_ARG_ENABLE( |
39 |
+ [wayland-egl-server], |
40 |
+ [AC_HELP_STRING([--enable-wayland-egl-server=@<:@no/yes@:>@], [Enable server side wayland support @<:@default=no@:>@])], |
41 |
+ [], |
42 |
+- enable_wayland_egl_server=yes |
43 |
++ enable_wayland_egl_server=no |
44 |
+ ) |
45 |
+ |
46 |
+ AS_IF([test "x$enable_wayland_egl_server" = "xyes"], |
47 |
|
48 |
diff --git a/x11-wm/muffin/files/muffin-4.0-cogl-configure.patch b/x11-wm/muffin/files/muffin-4.0-cogl-configure.patch |
49 |
new file mode 100644 |
50 |
index 00000000000..1e9721dd1bf |
51 |
--- /dev/null |
52 |
+++ b/x11-wm/muffin/files/muffin-4.0-cogl-configure.patch |
53 |
@@ -0,0 +1,25 @@ |
54 |
+From d3dec860b3390068321c579de85d0ebfab92481a Mon Sep 17 00:00:00 2001 |
55 |
+From: Kristian Fiskerstrand <k_f@g.o> |
56 |
+Date: Wed, 28 Nov 2018 19:57:20 +0100 |
57 |
+Subject: [PATCH] Fix |
58 |
+ |
59 |
+--- |
60 |
+ cogl/configure.ac | 2 +- |
61 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
62 |
+ |
63 |
+diff --git a/cogl/configure.ac b/cogl/configure.ac |
64 |
+index b06677a..209f449 100644 |
65 |
+--- a/cogl/configure.ac |
66 |
++++ b/cogl/configure.ac |
67 |
+@@ -700,7 +700,7 @@ AC_ARG_ENABLE( |
68 |
+ [wayland-egl-server], |
69 |
+ [AC_HELP_STRING([--enable-wayland-egl-server=@<:@no/yes@:>@], [Enable server side wayland support @<:@default=no@:>@])], |
70 |
+ [], |
71 |
+- enable_wayland_egl_server=yes |
72 |
++ enable_wayland_egl_server=no |
73 |
+ ) |
74 |
+ AS_IF([test "x$enable_wayland_egl_server" = "xyes"], |
75 |
+ [ |
76 |
+-- |
77 |
+2.18.1 |
78 |
+ |
79 |
|
80 |
diff --git a/x11-wm/muffin/muffin-4.0.3.ebuild b/x11-wm/muffin/muffin-4.0.3.ebuild |
81 |
new file mode 100644 |
82 |
index 00000000000..1f5bf4aba31 |
83 |
--- /dev/null |
84 |
+++ b/x11-wm/muffin/muffin-4.0.3.ebuild |
85 |
@@ -0,0 +1,81 @@ |
86 |
+# Copyright 1999-2018 Gentoo Authors |
87 |
+# Distributed under the terms of the GNU General Public License v2 |
88 |
+ |
89 |
+EAPI=6 |
90 |
+inherit autotools eutils gnome2 |
91 |
+ |
92 |
+DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon" |
93 |
+HOMEPAGE="http://cinnamon.linuxmint.com/" |
94 |
+SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz" |
95 |
+ |
96 |
+LICENSE="GPL-2+" |
97 |
+SLOT="0" |
98 |
+IUSE="+introspection test xinerama" |
99 |
+KEYWORDS="~amd64 ~x86" |
100 |
+ |
101 |
+RESTRICT="test" |
102 |
+ |
103 |
+COMMON_DEPEND=" |
104 |
+ >=x11-libs/pango-1.2[X,introspection?] |
105 |
+ >=x11-libs/cairo-1.14:=[X] |
106 |
+ x11-libs/gdk-pixbuf:2[introspection?] |
107 |
+ >=x11-libs/gtk+-3.9.12:3[X,introspection?] |
108 |
+ >=dev-libs/glib-2.37.3:2[dbus] |
109 |
+ >=gnome-extra/cinnamon-desktop-2.4:0=[introspection?] |
110 |
+ >=gnome-base/gsettings-desktop-schemas-3.3.0[introspection?] |
111 |
+ >=media-libs/libcanberra-0.26[gtk3] |
112 |
+ >=x11-libs/libXcomposite-0.3 |
113 |
+ >=x11-libs/startup-notification-0.7:= |
114 |
+ |
115 |
+ x11-libs/libICE |
116 |
+ x11-libs/libSM |
117 |
+ x11-libs/libX11 |
118 |
+ x11-libs/libXcomposite |
119 |
+ x11-libs/libXcursor |
120 |
+ x11-libs/libXdamage |
121 |
+ x11-libs/libXext |
122 |
+ x11-libs/libXfixes |
123 |
+ x11-libs/libXrandr |
124 |
+ x11-libs/libXrender |
125 |
+ virtual/opengl |
126 |
+ |
127 |
+ gnome-extra/zenity |
128 |
+ |
129 |
+ introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) |
130 |
+ xinerama? ( x11-libs/libXinerama ) |
131 |
+" |
132 |
+# needs gtk-doc, not just -am, for gtk-doc.make |
133 |
+DEPEND="${COMMON_DEPEND} |
134 |
+ ${PYTHON_DEPS} |
135 |
+ >=app-text/gnome-doc-utils-0.8 |
136 |
+ sys-devel/gettext |
137 |
+ dev-util/gtk-doc |
138 |
+ dev-util/gtk-doc-am |
139 |
+ >=dev-util/intltool-0.35 |
140 |
+ virtual/pkgconfig |
141 |
+ x11-base/xorg-proto |
142 |
+ test? ( app-text/docbook-xml-dtd:4.5 ) |
143 |
+" |
144 |
+RDEPEND="${COMMON_DEPEND} |
145 |
+ !x11-misc/expocity |
146 |
+" |
147 |
+ |
148 |
+src_prepare() { |
149 |
+ eapply "${FILESDIR}"/muffin-4.0-{cogl,clutter}-configure.patch |
150 |
+ eautoreconf |
151 |
+ gnome2_src_prepare |
152 |
+} |
153 |
+ |
154 |
+src_configure() { |
155 |
+ DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* *.txt doc/*.txt" |
156 |
+ gnome2_src_configure \ |
157 |
+ --disable-static \ |
158 |
+ --enable-shape \ |
159 |
+ --enable-sm \ |
160 |
+ --enable-startup-notification \ |
161 |
+ --enable-xsync \ |
162 |
+ --enable-verbose-mode \ |
163 |
+ --with-libcanberra \ |
164 |
+ $(use_enable introspection) \ |
165 |
+ $(use_enable xinerama) |
166 |
+} |