commit 4b0fe3a03c91b663db5f52864194d0704238d6c7
Author: Jakub Bogusz <[email protected]>
Date: Sat May 16 09:51:19 2020 +0200
- updated to 4.6.0
- updated gir patch
muffin-gir.patch | 10 +++++-----
muffin.spec | 11 ++++-------
2 files changed, 9 insertions(+), 12 deletions(-)
---
diff --git a/muffin.spec b/muffin.spec
index 092e99b..04fb712 100644
--- a/muffin.spec
+++ b/muffin.spec
@@ -1,12 +1,12 @@
Summary: Window and compositing manager based on Clutter
Summary(pl.UTF-8): Zarządca okien i składania oparty na bibliotece Clutter
Name: muffin
-Version: 4.4.3
+Version: 4.6.0
Release: 1
License: GPL v2+
Group: X11/Applications
Source0:
https://github.com/linuxmint/muffin/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: e44e52e7a25cf638852730ec763f0275
+# Source0-md5: d628f7f9fe748f261c94b9dd1f47d0ff
Patch0: %{name}-gir.patch
URL: https://github.com/linuxmint/muffin
BuildRequires: EGL-devel
@@ -21,7 +21,6 @@ BuildRequires: desktop-file-utils
BuildRequires: gettext-devel
BuildRequires: gettext-tools
BuildRequires: glib2-devel >= 1:2.50.3
-BuildRequires: gnome-doc-utils >= 0.8.0
BuildRequires: gobject-introspection-devel >= 0.9.5
BuildRequires: gtk+3-devel >= 3.9.12
BuildRequires: gtk-doc >= 1.15
@@ -29,6 +28,7 @@ BuildRequires: intltool >= 0.35.0
BuildRequires: json-glib-devel
BuildRequires: libcanberra-gtk3-devel >= 0.26
BuildRequires: libtool >= 2:2.2.6
+# scb-randr xcb-res
BuildRequires: libxcb-devel
BuildRequires: pango-devel >= 1:1.14.0
BuildRequires: pkgconfig >= 1:0.21
@@ -47,7 +47,7 @@ BuildRequires: xorg-lib-libXinerama-devel
BuildRequires: xorg-lib-libXrandr-devel
BuildRequires: xorg-lib-libXrender-devel
BuildRequires: xorg-lib-libxkbcommon-devel >= 0.4.3
-BuildRequires: xorg-lib-libxkbcommon-x11
+BuildRequires: xorg-lib-libxkbcommon-x11-devel
BuildRequires: xorg-lib-libxkbfile-devel
Requires: %{name}-libs = %{version}-%{release}
Requires: cinnamon-desktop >= 2.4.0
@@ -178,13 +178,10 @@ cd ../clutter
%{__autoheader}
%{__automake}
cd ..
-# kms-egl-platform and wayland-egl-server are unsupported in cinnamon (and
disabled by default in future versions)
%configure \
ZENITY=%{_bindir}/zenity \
- --disable-kms-egl-platform \
--disable-silent-rules \
--disable-static \
- --disable-wayland-egl-server \
--enable-compile-warnings=minimum \
--with-html-dir=%{_gtkdocdir}
diff --git a/muffin-gir.patch b/muffin-gir.patch
index d4f2e4a..81fd69f 100644
--- a/muffin-gir.patch
+++ b/muffin-gir.patch
@@ -1,11 +1,11 @@
---- muffin-4.4.3/src/Makefile.am.orig 2020-03-21 12:02:02.000000000 +0100
-+++ muffin-4.4.3/src/Makefile.am 2020-05-07 07:21:18.304146460 +0200
-@@ -281,7 +281,7 @@
+--- muffin-4.6.0/src/Makefile.am.orig 2020-05-15 22:05:25.908877961 +0200
++++ muffin-4.6.0/src/Makefile.am 2020-05-15 22:06:05.885328057 +0200
+@@ -282,7 +282,7 @@
muffin-enum-types.h \
$(libmuffininclude_base_headers) \
$(filter %.c,$(libmuffin_la_SOURCES))
--@META_GIR@_SCANNERFLAGS = $(WARN_SCANNERFLAGS) --warn-all --warn-error
-+@META_GIR@_SCANNERFLAGS = $(WARN_SCANNERFLAGS) --warn-all
+-@META_GIR@_SCANNERFLAGS = $(WARN_SCANNERFLAGS) --warn-all --warn-error
--identifier-prefix=Meta
++@META_GIR@_SCANNERFLAGS = $(WARN_SCANNERFLAGS) --warn-all
--identifier-prefix=Meta
endif
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/muffin.git/commitdiff/4b0fe3a03c91b663db5f52864194d0704238d6c7
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
