muffin downgrade to 3.8
Signed-off-by: guibuilder_pel7x64builder0 <guibuilder@powerel.org>master
guibuilder_pel7x64builder0
parent
5ffccfea2b
commit
feeafa95d8
|
|
@ -0,0 +1,53 @@
|
|||
--- a/src/Makefile.am
|
||||
+++ b/src/Makefile.am
|
||||
@@ -198,7 +198,7 @@ libmuffininclude_HEADERS = \
|
||||
muffin_theme_viewer_SOURCES= \
|
||||
ui/theme-viewer.c
|
||||
|
||||
-bin_PROGRAMS=muffin muffin-theme-viewer
|
||||
+bin_PROGRAMS=muffin-theme-viewer
|
||||
|
||||
muffin_SOURCES = core/muffin.c
|
||||
muffin_LDADD = $(MUFFIN_LIBS) libmuffin.la -lclutter-glx-1.0
|
||||
@@ -258,13 +258,6 @@ testgradient_LDADD = $(MUFFIN_LIBS) libm
|
||||
testasyncgetprop_LDADD = $(MUFFIN_LIBS)
|
||||
|
||||
|
||||
-@INTLTOOL_DESKTOP_RULE@
|
||||
-
|
||||
-desktopfilesdir=$(datadir)/applications
|
||||
-desktopfiles_in_files=muffin.desktop.in
|
||||
-desktopfiles_files=$(desktopfiles_in_files:.desktop.in=.desktop)
|
||||
-desktopfiles_DATA = $(desktopfiles_files)
|
||||
-
|
||||
gsettings_SCHEMAS = org.cinnamon.muffin.gschema.xml
|
||||
@INTLTOOL_XML_NOMERGE_RULE@
|
||||
@GSETTINGS_RULES@
|
||||
@@ -277,7 +270,6 @@ VARIABLES=stock_maximize_data $(srcdir)/
|
||||
BUILT_SOURCES = inlinepixbufs.h
|
||||
CLEANFILES = \
|
||||
inlinepixbufs.h \
|
||||
- muffin.desktop \
|
||||
org.cinnamon.muffin.gschema.xml \
|
||||
$(xml_DATA) \
|
||||
$(muffin_built_sources) \
|
||||
--- a/src/tools/Makefile.am
|
||||
+++ b/src/tools/Makefile.am
|
||||
@@ -20,7 +20,7 @@ muffin_mag_SOURCES= \
|
||||
muffin_grayscale_SOURCES= \
|
||||
muffin-grayscale.c
|
||||
|
||||
-bin_PROGRAMS=muffin-message muffin-window-demo
|
||||
+bin_PROGRAMS=muffin-window-demo
|
||||
|
||||
## cheesy hacks I use, don't really have any business existing. ;-)
|
||||
noinst_PROGRAMS=muffin-mag muffin-grayscale
|
||||
--- a/doc/man/Makefile.am
|
||||
+++ b/doc/man/Makefile.am
|
||||
@@ -1,4 +1,4 @@
|
||||
-man_MANS = muffin.1 muffin-theme-viewer.1 \
|
||||
- muffin-window-demo.1 muffin-message.1
|
||||
+man_MANS = muffin-theme-viewer.1 \
|
||||
+ muffin-window-demo.1
|
||||
|
||||
EXTRA_DIST = $(man_MANS)
|
||||
|
|
@ -1,24 +1,22 @@
|
|||
Name: muffin
|
||||
Version: 4.0.2
|
||||
Version: 3.8.3
|
||||
Release: 1%{?dist}
|
||||
Summary: Window and compositing manager based on Clutter
|
||||
|
||||
License: GPLv2+
|
||||
URL: https://github.com/linuxmint/%{name}
|
||||
Source0: %{url}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||
URL: https://github.com/linuxmint/
|
||||
Source0: %{url}/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||
Source1: muffin-adwaita.txt
|
||||
|
||||
BuildRequires: desktop-file-utils
|
||||
Patch0: remove_muffin_binary.patch
|
||||
|
||||
BuildRequires: pkgconfig(clutter-1.0) >= 1.7.5
|
||||
BuildRequires: pkgconfig(gl)
|
||||
BuildRequires: pkgconfig(json-glib-1.0)
|
||||
BuildRequires: pkgconfig(sm)
|
||||
BuildRequires: pkgconfig(libcanberra)
|
||||
BuildRequires: pkgconfig(cinnamon-desktop) >= 4.0.0
|
||||
BuildRequires: pkgconfig(cinnamon-desktop) >= 3.8.0
|
||||
BuildRequires: pkgconfig(gnome-doc-utils)
|
||||
BuildRequires: pkgconfig(gobject-introspection-1.0)
|
||||
BuildRequires: pkgconfig(xkeyboard-config)
|
||||
BuildRequires: pkgconfig(xkbcommon-x11)
|
||||
BuildRequires: pkgconfig(xtst)
|
||||
BuildRequires: zenity
|
||||
# Bootstrap requirements
|
||||
BuildRequires: pkgconfig(gtk-doc)
|
||||
|
|
@ -55,13 +53,7 @@ NOCONFIGURE=1 ./autogen.sh
|
|||
|
||||
%build
|
||||
%configure --disable-static \
|
||||
--enable-compile-warnings=minimum \
|
||||
--disable-wayland-egl-platform \
|
||||
--disable-wayland-egl-server \
|
||||
--disable-kms-egl-platform \
|
||||
--disable-wayland \
|
||||
--disable-native-backend \
|
||||
--disable-clutter-doc
|
||||
--enable-compile-warnings=minimum
|
||||
|
||||
sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
|
||||
|
||||
|
|
@ -78,38 +70,31 @@ cp %{SOURCE1} %{buildroot}/%{_datadir}/themes/Adwaita/metacity-1/
|
|||
#Remove libtool archives.
|
||||
find %{buildroot} -name '*.la' -exec rm -f {} ';'
|
||||
|
||||
desktop-file-install --delete-original \
|
||||
--dir %{buildroot}%{_datadir}/applications \
|
||||
--add-only-show-in X-Cinnamon \
|
||||
%{buildroot}%{_datadir}/applications/muffin.desktop
|
||||
|
||||
# Remove conflicting cogl html doc
|
||||
rm -rf %{buildroot}%{_datadir}/gtk-doc/html/cogl/
|
||||
|
||||
%find_lang %{name}
|
||||
|
||||
%ldconfig_scriptlets
|
||||
%post
|
||||
/sbin/ldconfig
|
||||
if [ $1 -eq 0 ] ; then
|
||||
/usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
|
||||
fi
|
||||
|
||||
%posttrans
|
||||
/usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
|
||||
|
||||
%postun -p /sbin/ldconfig
|
||||
|
||||
%files -f %{name}.lang
|
||||
%doc README AUTHORS NEWS HACKING doc/theme-format.txt
|
||||
%license COPYING
|
||||
%{_bindir}/muffin
|
||||
%{_libdir}/libmuffin.so.*
|
||||
%{_libdir}/libmuffin-clutter-0.so
|
||||
%{_libdir}/libmuffin-cogl-0.so
|
||||
%{_libdir}/libmuffin-cogl-pango-0.so
|
||||
%{_libdir}/libmuffin-cogl-path-0.so
|
||||
%{_libdir}/muffin/
|
||||
%exclude %{_libdir}/muffin/Meta-Muffin.0.gir
|
||||
%{_datadir}/applications/muffin.desktop
|
||||
%dir %{_datadir}/muffin/
|
||||
%{_datadir}/muffin/theme/
|
||||
%{_datadir}/glib-2.0/schemas/org.cinnamon.muffin.gschema.xml
|
||||
%{_datadir}/themes/Adwaita/metacity-1/
|
||||
%{_mandir}/man1/muffin.1.*
|
||||
|
||||
%files devel
|
||||
%{_bindir}/muffin-message
|
||||
%{_bindir}/muffin-theme-viewer
|
||||
%{_bindir}/muffin-window-demo
|
||||
%{_datadir}/muffin/icons/
|
||||
|
|
@ -121,16 +106,6 @@ rm -rf %{buildroot}%{_datadir}/gtk-doc/html/cogl/
|
|||
%{_mandir}/man1/muffin-*
|
||||
|
||||
%changelog
|
||||
* Tue Nov 20 2018 Leigh Scott <leigh123linux@googlemail.com> - 4.0.2-1
|
||||
- Update to 4.0.2 release
|
||||
|
||||
* Mon Nov 12 2018 Leigh Scott <leigh123linux@googlemail.com> - 4.0.1-1
|
||||
- Update to 4.0.1 release
|
||||
|
||||
* Sat Nov 03 2018 Leigh Scott <leigh123linux@googlemail.com> - 4.0.0-1
|
||||
- Update to 4.0.0 release
|
||||
- Readd muffin binary, useful for debug only
|
||||
|
||||
* Fri Sep 21 2018 Leigh Scott <leigh123linux@googlemail.com> - 3.8.3-1
|
||||
- Update to 3.8.3 release
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue