[cinnamon] add compile fix for F21

leigh123linux leigh123linux at fedoraproject.org
Tue Nov 26 18:38:44 UTC 2013


commit fd891284833707aa44096dac19a2e44b8ff0a242
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Tue Nov 26 18:38:27 2013 +0000

    add compile fix for F21

 cinnamon.spec     |    7 ++++++-
 compile_fix.patch |   18 ++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletions(-)
---
diff --git a/cinnamon.spec b/cinnamon.spec
index 4435eaf..cab1e20 100644
--- a/cinnamon.spec
+++ b/cinnamon.spec
@@ -2,7 +2,7 @@
 
 Name:           cinnamon
 Version:        2.0.14
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Window management and application launching for GNOME
 License:        GPLv2+ and LGPLv2+
 URL:            http://cinnamon.linuxmint.com 
@@ -23,6 +23,7 @@ Patch3:         cinnamon-settings-apps.patch
 Patch4:         keyboard_applet.patch
 Patch5:         input_keybindings.patch
 Patch6:         bluetooth.patch
+Patch7:         compile_fix.patch
 
 %global clutter_version 1.12.2
 %global cjs_version 1.9.1
@@ -149,6 +150,7 @@ The emphasis is put on making users feel at home and providing
 %if 0%{?fedora} < 20
 %patch6 -p1
 %endif
+%patch7 -p1
 NOCONFIGURE=1 ./autogen.sh
 
 %build
@@ -229,6 +231,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Tue Nov 26 2013 Leigh Scott <leigh123linux at googlemail.com> - 2.0.14-2
+- add compile fix for F21
+
 * Tue Nov 26 2013 Leigh Scott <leigh123linux at googlemail.com> - 2.0.14-1
 - update to 2.0.14
 - remove conflicts wallpapoz (bz 1029554)
diff --git a/compile_fix.patch b/compile_fix.patch
new file mode 100644
index 0000000..5294b1c
--- /dev/null
+++ b/compile_fix.patch
@@ -0,0 +1,18 @@
+--- a/src/cinnamon-global.c
++++ b/src/cinnamon-global.c
+@@ -477,12 +477,12 @@ cinnamon_global_class_init (CinnamonGlob
+                                                         G_PARAM_READABLE));
+ }
+ 
+-/**•
+- * _cinnamon_global_init: (skip)•
++/**
++ * _cinnamon_global_init: (skip)
+  * @first_property_name: the name of the first property
+  * @...: the value of the first property, followed optionally by more
+  *  name/value pairs, followed by %NULL
+- *•
++ *
+  * Initializes Cinnamon global singleton with the construction-time
+  * properties.
+  *


More information about the scm-commits mailing list