From 85c384de6046b65caddc56ed4dce0d5c9c49ad1d Mon Sep 17 00:00:00 2001
From: raveit65 <chat-to-me@raveit.de>
Date: May 13 2015 10:58:57 +0000
Subject: fix crash if animation plugin is used in f22


---

diff --git a/compiz-plugins-main.spec b/compiz-plugins-main.spec
index 7aabddf..c6aa80e 100644
--- a/compiz-plugins-main.spec
+++ b/compiz-plugins-main.spec
@@ -4,7 +4,7 @@
 
 Name:    compiz-plugins-main
 Version: 0.8.8
-Release: 13%{?dist}
+Release: 14%{?dist}
 Epoch:   1
 Summary: Collection of Compiz Fusion plugins for Compiz      
 Group:   User Interface/Desktops        
@@ -28,6 +28,9 @@ Patch5:  compiz-plugins-main_remove_gconf_usage.patch
 Patch6:  compiz-plugins-main-aarch64.patch
 Patch7:  compiz-plugins-main_automake-1.13.patch
 
+# fix crash if animation plugin is used in f22
+Patch8:  compiz-plugins-main_animation-plugin-x11-wm.patch
+
 # libdrm is not available on these arches
 ExcludeArch:   s390 s390x
 
@@ -76,6 +79,7 @@ This package contain development files required for developing other plugins
 %patch5 -p1 -b .remove_gconf
 %patch6 -p1 -b .aarch64
 %patch7 -p1 -b .automake
+%patch8 -p1 -b .animation-plugin-x11-wm
 mv images/Gnome/*.png images/Default/
 rm -rf images/Gnome
 rm -rf images/Mate
@@ -120,6 +124,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/compiz/Oxygen
 
 
 %changelog
+* Wed May 13 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1:0.8.8-14
+- fix crash if animation plugin is used in f22
+
 * Wed Mar 18 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1:0.8.8-13
 - rebuild for f22
 
diff --git a/compiz-plugins-main_animation-plugin-x11-wm.patch b/compiz-plugins-main_animation-plugin-x11-wm.patch
new file mode 100644
index 0000000..5f68b3d
--- /dev/null
+++ b/compiz-plugins-main_animation-plugin-x11-wm.patch
@@ -0,0 +1,127 @@
+diff -upr compiz-plugins-main-0.8.8-orig/include/compiz-animation.h compiz-plugins-main-0.8.8/include/compiz-animation.h
+--- compiz-plugins-main-0.8.8-orig/include/compiz-animation.h	2011-04-21 12:20:09.000000000 +0200
++++ compiz-plugins-main-0.8.8/include/compiz-animation.h	2015-05-13 11:31:11.970670459 +0200
+@@ -215,7 +215,7 @@ typedef struct _AnimBaseFunctions {
+ 
+ #define OPTION_GETTERS(extensionBaseFunctions,				\
+ 		       extensionPluginInfo, firstEffectOption)		\
+-static inline CompOptionValue *						\
++extern inline CompOptionValue *						\
+ animGetOptVal (CompWindow *w,						\
+ 	       int optionId)						\
+ {									\
+@@ -223,35 +223,35 @@ animGetOptVal (CompWindow *w,						\
+     	(w, (extensionPluginInfo), optionId - (firstEffectOption));	\
+ }						\
+ 						\
+-inline Bool					\
++extern inline Bool				\
+ animGetB (CompWindow *w,			\
+ 	  int optionId)				\
+ {						\
+     return animGetOptVal (w, optionId)->b;	\
+ }						\
+ 						\
+-inline int					\
++extern inline int				\
+ animGetI (CompWindow *w,			\
+ 	  int optionId)				\
+ {						\
+     return animGetOptVal (w, optionId)->i;	\
+ }						\
+ 						\
+-inline float					\
++extern inline float				\
+ animGetF (CompWindow *w,			\
+ 	  int optionId)				\
+ {						\
+     return animGetOptVal (w, optionId)->f;	\
+ }						\
+ 						\
+-inline char *					\
++extern inline char *				\
+ animGetS (CompWindow *w,			\
+ 	  int optionId)				\
+ {						\
+     return animGetOptVal (w, optionId)->s;	\
+ }						\
+ 						\
+-inline unsigned short *				\
++extern inline unsigned short *			\
+ animGetC (CompWindow *w,			\
+ 	  int optionId)				\
+ {						\
+@@ -260,23 +260,23 @@ animGetC (CompWindow *w,			\
+ 
+ #define OPTION_GETTERS_HDR			\
+ 						\
+-inline Bool					\
++extern inline Bool				\
+ animGetB (CompWindow *w,			\
+ 	  int optionId);			\
+ 						\
+-inline int					\
++extern inline int				\
+ animGetI (CompWindow *w,			\
+ 	  int optionId);			\
+ 						\
+-inline float					\
++extern inline float				\
+ animGetF (CompWindow *w,			\
+ 	  int optionId);			\
+ 						\
+-inline char *					\
++extern inline char *				\
+ animGetS (CompWindow *w,			\
+ 	  int optionId);			\
+ 						\
+-inline unsigned short *				\
++extern inline unsigned short *			\
+ animGetC (CompWindow *w,			\
+ 	  int optionId);
+ 
+diff -upr compiz-plugins-main-0.8.8-orig/src/animation/animation.c compiz-plugins-main-0.8.8/src/animation/animation.c
+--- compiz-plugins-main-0.8.8-orig/src/animation/animation.c	2011-04-21 12:20:09.000000000 +0200
++++ compiz-plugins-main-0.8.8/src/animation/animation.c	2015-05-13 11:34:57.181935016 +0200
+@@ -742,7 +742,7 @@ defaultUpdateWindowTransform (CompWindow
+ }
+ 
+ // Apply transform to wTransform
+-inline void
++extern inline void
+ applyTransform (CompTransform *wTransform,
+ 		CompTransform *transform)
+ {
+diff -upr compiz-plugins-main-0.8.8-orig/src/animation/animation-internal.h compiz-plugins-main-0.8.8/src/animation/animation-internal.h
+--- compiz-plugins-main-0.8.8-orig/src/animation/animation-internal.h	2011-04-21 12:20:09.000000000 +0200
++++ compiz-plugins-main-0.8.8/src/animation/animation-internal.h	2015-05-13 11:34:06.853428950 +0200
+@@ -429,7 +429,7 @@ applyPerspectiveSkew (CompOutput *output
+ 		      CompTransform *transform,
+ 		      Point *center);
+ 
+-inline void
++extern inline void
+ applyTransform (CompTransform *wTransform,
+ 		CompTransform *transform);
+ 
+@@ -616,7 +616,7 @@ fxZoomInit (CompWindow * w);
+ void
+ applyZoomTransform (CompWindow * w);
+ 
+-void
++extern inline void
+ getZoomCenterScale (CompWindow *w,
+ 		    Point *pCurCenter, Point *pCurScale);
+ 
+diff -upr compiz-plugins-main-0.8.8-orig/src/animation/zoomside.c compiz-plugins-main-0.8.8/src/animation/zoomside.c
+--- compiz-plugins-main-0.8.8-orig/src/animation/zoomside.c	2011-04-21 12:20:09.000000000 +0200
++++ compiz-plugins-main-0.8.8/src/animation/zoomside.c	2015-05-13 11:36:15.021717714 +0200
+@@ -303,7 +303,7 @@ getZoomCenterScaleFull (CompWindow *w,
+ 	*pRotateProgress = rotateProgress;
+ }
+ 
+-inline void
++extern inline void
+ getZoomCenterScale (CompWindow *w,
+ 		    Point *pCurCenter, Point *pCurScale)
+ {