[cinnamon] rebase for cinnamon next
leigh123linux
leigh123linux at fedoraproject.org
Tue Jul 23 21:13:04 UTC 2013
commit e4d7317572caaeb3e0c0018342365e029d16edb0
Author: leigh123linux <leigh123linux at googlemail.com>
Date: Tue Jul 23 22:12:54 2013 +0100
rebase for cinnamon next
.gitignore | 1 +
autostart_nemo.patch | 20 +-
cinnamon-screensaver.desktop | 15 -
cinnamon.spec | 92 +-
cinnamon2d-screensaver.desktop | 15 -
disable_xinput.patch | 15 +
gjs.patch | 19 -
gnome-3.8-compat.patch | 3573 ----------------------------------------
input-source-switcher.desktop | 6 -
remove_GC.patch | 124 --
sources | 3 +-
11 files changed, 55 insertions(+), 3828 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9f451a2..90f0dd1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
/cinnamon-1.9.1.tar.gz
/gnome-settings-daemon-compat-3.6.4.tar.xz
/gnome-settings-daemon-compat-3.6.4-1.tar.xz
+/cinnamon-1.9.2.gitc321232.tar.gz
diff --git a/autostart_nemo.patch b/autostart_nemo.patch
index 071a7c2..f98eda6 100644
--- a/autostart_nemo.patch
+++ b/autostart_nemo.patch
@@ -1,18 +1,18 @@
---- a/files/usr/share/gnome-session/sessions/cinnamon.session
-+++ b/files/usr/share/gnome-session/sessions/cinnamon.session
+--- a/files/usr/share/cinnamon-session/sessions/cinnamon.session
++++ b/files/usr/share/cinnamon-session/sessions/cinnamon.session
@@ -1,5 +1,5 @@
- [GNOME Session]
+ [Cinnamon Session]
Name=Cinnamon
--RequiredComponents=cinnamon;gnome-settings-daemon;
-+RequiredComponents=cinnamon;gnome-settings-daemon;nemo-autostart;cinnamon-screensaver;gnome-fallback-media-keys-helper;gnome-fallback-mount-helper;
+-RequiredComponents=cinnamon;cinnamon-settings-daemon;
++RequiredComponents=cinnamon;cinnamon-settings-daemon;nemo-autostart;
DesktopName=GNOME
---- a/files/usr/share/gnome-session/sessions/cinnamon2d.session
-+++ b/files/usr/share/gnome-session/sessions/cinnamon2d.session
+--- a/files/usr/share/cinnamon-session/sessions/cinnamon2d.session
++++ b/files/usr/share/cinnamon-session/sessions/cinnamon2d.session
@@ -1,5 +1,5 @@
- [GNOME Session]
+ [Cinnamon Session]
Name=Cinnamon (Software Rendering)
--RequiredComponents=cinnamon2d;gnome-settings-daemon;
-+RequiredComponents=cinnamon2d;gnome-settings-daemon;nemo-autostart;cinnamon2d-screensaver;gnome-fallback-media-keys-helper;gnome-fallback-mount-helper;
+-RequiredComponents=cinnamon2d;cinnamon-settings-daemon;
++RequiredComponents=cinnamon2d;cinnamon-settings-daemon;nemo-autostart;
DesktopName=GNOME
diff --git a/cinnamon.spec b/cinnamon.spec
index 898a7aa..4111281 100644
--- a/cinnamon.spec
+++ b/cinnamon.spec
@@ -1,39 +1,37 @@
+%global _internal_version c321232
+
Name: cinnamon
-Version: 1.9.1
-Release: 19%{?dist}
+Version: 1.9.2
+Release: 0.1.git%{_internal_version}%{?dist}
Summary: Window management and application launching for GNOME
License: GPLv2+ and LGPLv2+
URL: http://cinnamon.linuxmint.com
#Because linuxmint upstream refuses to host pristine upstream tarballs
-Source0: http://leigh123linux.fedorapeople.org/pub/%{name}/source/%{name}-%{version}.tar.gz
-#wget https://github.com/linuxmint/Cinnamon/archive/%{version}.tar.gz -O %{name}-%{version}.tar.gz
-
+# To generate tarball
+# wget https://github.com/linuxmint/Cinnamon/archive/%%{version}.tar.gz -O cinnamon-%%{version}.tar.gz
+# for git
+# wget https://github.com/linuxmint/Cinnamon/tarball/%%{_internal_version} -O cinnamon-%%{version}.git%%{_internal_version}.tar.gz
+Source0: http://leigh123linux.fedorapeople.org/pub/%{name}/source/%{name}-%{version}.git%{_internal_version}.tar.gz
Source1: cinnamon-fedora.gschema.override
-Source2: cinnamon-screensaver.desktop
-Source3: cinnamon2d-screensaver.desktop
-Source4: http://leigh123linux.fedorapeople.org/pub/gnome-settings-daemon-compat/source/gnome-settings-daemon-compat-3.6.4-1.tar.xz
-Source5: input-source-switcher.desktop
-Patch0: gnome-3.8-compat.patch
+
+Patch0: disable_xinput.patch
Patch1: background.patch
-Patch2: idle-dim.patch
-Patch3: keyboard_applet.patch
-Patch4: gjs.patch
-Patch5: screensaver.patch
-Patch6: bluetooth_obex_transfer.patch
-Patch7: autostart_nemo.patch
-Patch8: remove_GC.patch
-Patch9: menu_editor.patch
+Patch2: bluetooth_obex_transfer.patch
+Patch3: autostart_nemo.patch
+Patch4: menu_editor.patch
+Patch5: keyboard_applet.patch
+Patch6: idle-dim.patch
%global clutter_version 1.12.2
%global gobject_introspection_version 1.34.2
-%global muffin_version 1.8.2
+%global muffin_version 1.8.3
%global json_glib_version 0.13.2
BuildRequires: clutter-devel >= %{clutter_version}
BuildRequires: dbus-glib-devel
BuildRequires: desktop-file-utils
-BuildRequires: gjs-devel >= 1.32.0
+BuildRequires: cjs-devel >= 1.32.0
BuildRequires: glib2-devel
BuildRequires: GConf2-devel
BuildRequires: gnome-menus-devel
@@ -88,7 +86,7 @@ Requires: json-glib%{?_isa} >= %{json_glib_version}
Requires: upower%{?_isa}
Requires: polkit%{?_isa} >= 0.100
# needed for session files
-Requires: gnome-session
+Requires: cinnamon-session
# needed for schemas
Requires: at-spi2-atk%{?_isa}
# needed for on-screen keyboard
@@ -105,7 +103,7 @@ Requires: python-pillow
# nemo is a RequiredComponents in the session files
Requires: nemo
# gnome-screensaver is a RequiredComponents in the session files
-Requires: gnome-screensaver
+Requires: cinnamon-screensaver
Obsoletes: cinnamon-2d
Obsoletes: cinnamon-settings
@@ -123,18 +121,14 @@ The emphasis is put on making users feel at home and providing
them with an easy to use and comfortable desktop experience.
%prep
-%setup -q -T -b4 -n gnome-settings-daemon-compat-3.6.4-1
-%setup -q -n Cinnamon-%{version}
+%setup -q -n linuxmint-Cinnamon-%{_internal_version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
+#patch5 -p1
+#patch6 -p1
NOCONFIGURE=1 ./autogen.sh
%build
@@ -147,54 +141,22 @@ NOCONFIGURE=1 ./autogen.sh
make %{?_smp_mflags} V=1
-# media-keys-helper
-cd ../gnome-settings-daemon-compat-3.6.4-1
-autoreconf -fi
-%configure --libexecdir=%{_libexecdir}/%{name} --disable-static --disable-ibus \
- --disable-cups --disable-smartcard-support --disable-packagekit
-make %{?_smp_mflags} V=1 -C plugins/common
-make %{?_smp_mflags} V=1 -C plugins/media-keys
-make %{?_smp_mflags} V=1 -C plugins/keyboard
-make %{?_smp_mflags} V=1 -C plugins/automount
-
%install
%{make_install} INSTALL='install -p'
-pushd ../gnome-settings-daemon-compat-3.6.4-1
-%{make_install} -C plugins/media-keys INSTALL='install -p'
-%{make_install} -C plugins/keyboard INSTALL='install -p'
-%{make_install} -C plugins/automount INSTALL='install -p'
-popd
-
# Remove .la file
rm -rf $RPM_BUILD_ROOT/%{_libdir}/cinnamon/libcinnamon.la
-# Remove the unwanted keyboard bits
-rm -rf $RPM_BUILD_ROOT/%{_libdir}/gnome-settings-daemon-3.0/
-rm -rf $RPM_BUILD_ROOT/%{_datadir}/gnome-settings-daemon/
-
install -D -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/glib-2.0/schemas/cinnamon-fedora.gschema.override
-# Add autostart files for gnome-screensaver
-install -pm 0644 %{SOURCE2} %{SOURCE3} $RPM_BUILD_ROOT/%{_datadir}/applications/
-
-# Add autostart files for input-source-switcher
-install -m 0755 -d $RPM_BUILD_ROOT/%{_sysconfdir}/xdg/autostart/
-install -pm 0644 %{SOURCE5} $RPM_BUILD_ROOT/%{_sysconfdir}/xdg/autostart/
-
# Fix permission
chmod +x $RPM_BUILD_ROOT/%{_bindir}/cinnamon-launcher-creator
-chmod +x $RPM_BUILD_ROOT/%{_bindir}/cinnamon3d
-desktop-file-validate $RPM_BUILD_ROOT/%{_sysconfdir}/xdg/autostart/input-source-switcher.desktop
+
desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/cinnamon.desktop
desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/cinnamon2d.desktop
desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/cinnamon-add-panel-launcher.desktop
desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/cinnamon-menu-editor.desktop
-desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/cinnamon-screensaver.desktop
-desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/cinnamon2d-screensaver.desktop
-desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/gnome-fallback-media-keys-helper.desktop
-desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/gnome-fallback-mount-helper.desktop
desktop-file-install \
--add-category="Utility" \
@@ -219,13 +181,12 @@ fi
%doc COPYING README
%{_bindir}/*
%{_sysconfdir}/xdg/menus/*
-%{_sysconfdir}/xdg/autostart/*
%{_datadir}/applications/*
%{_datadir}/dbus-1/services/org.Cinnamon.HotplugSniffer.service
%{_datadir}/desktop-directories/*
%{_datadir}/glib-2.0/schemas/org.cinnamon.gschema.xml
%{_datadir}/glib-2.0/schemas/cinnamon-fedora.gschema.override
-%{_datadir}/gnome-session/sessions/*
+%{_datadir}/cinnamon-session/sessions/*
%{_datadir}/xsessions/*
%{_datadir}/cinnamon/
%{_libdir}/cinnamon/
@@ -235,6 +196,9 @@ fi
%{_mandir}/man1/*
%changelog
+* Tue Jul 23 2013 Leigh Scott <leigh123linux at googlemail.com> - 1.9.2-0.1.gitc321232
+- rebase for cinnamon next
+
* Tue Jul 23 2013 Leigh Scott <leigh123linux at googlemail.com> - 1.9.1-19
- fix permissions on cinnamon3d
diff --git a/disable_xinput.patch b/disable_xinput.patch
new file mode 100644
index 0000000..c1796ec
--- /dev/null
+++ b/disable_xinput.patch
@@ -0,0 +1,15 @@
+diff -uNr a/files/usr/bin/cinnamon2d b/files/usr/bin/cinnamon2d
+--- a/files/usr/bin/cinnamon2d 2013-05-22 17:35:08.000000000 +0100
++++ b/files/usr/bin/cinnamon2d 2013-05-22 21:36:04.000000000 +0100
+@@ -1,2 +1,2 @@
+ #!/bin/bash
+-CLUTTER_PAINT=disable-clipped-redraws:disable-culling LIBGL_ALWAYS_SOFTWARE=1 CINNAMON_SOFTWARE_RENDERING=1 CINNAMON_2D=1 CINNAMON_SLOWDOWN_FACTOR=0.0001 MUFFIN_NO_SHADOWS=1 CLUTTER_DEFAULT_FPS=15 cinnamon $@
++CLUTTER_DISABLE_XINPUT=1 CLUTTER_PAINT=disable-clipped-redraws:disable-culling LIBGL_ALWAYS_SOFTWARE=1 CINNAMON_SOFTWARE_RENDERING=1 CINNAMON_2D=1 CINNAMON_SLOWDOWN_FACTOR=0.0001 MUFFIN_NO_SHADOWS=1 CLUTTER_DEFAULT_FPS=15 cinnamon $@
+diff -uNr a/files/usr/bin/gnome-session-cinnamon b/files/usr/bin/gnome-session-cinnamon
+--- a/files/usr/bin/cinnamon-session-cinnamon 2013-05-22 17:35:08.000000000 +0100
++++ b/files/usr/bin/cinnamon-session-cinnamon 2013-05-22 21:36:04.000000000 +0100
+@@ -1,3 +1,3 @@
+ #! /bin/sh
+-exec cinnamon-session --session cinnamon "$@"
++CLUTTER_DISABLE_XINPUT=1 exec cinnamon-session --session cinnamon "$@"
+
diff --git a/sources b/sources
index bf01b9f..bd97d6a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-9e9b19adaaf1fb4fa3595a422bf69eee cinnamon-1.9.1.tar.gz
-139412a4247c323699c22b3c72992307 gnome-settings-daemon-compat-3.6.4-1.tar.xz
+355ca8a3f87306b6f56718f2a3206f73 cinnamon-1.9.2.gitc321232.tar.gz
More information about the scm-commits
mailing list