rpms/cairo-dock/devel cairo-dock-plugin-rev1235.diff, NONE, 1.1 cairo-dock.spec, 1.64, 1.65

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

Update of /cvs/extras/rpms/cairo-dock/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27522

Modified Files:
	cairo-dock.spec 
Added Files:
	cairo-dock-plugin-rev1235.diff 
Log Message:
Enable unstable plugin again 

cairo-dock-plugin-rev1235.diff:

--- NEW FILE cairo-dock-plugin-rev1235.diff ---
Index: gauge-test/src/applet-init.c
===================================================================
--- gauge-test/src/applet-init.c	(revision 1235)
+++ gauge-test/src/applet-init.c	(working copy)
@@ -18,7 +18,7 @@
 CD_APPLET_DEFINITION ("gauge-test", 1, 5, 4, CAIRO_DOCK_CATEGORY_ACCESSORY)
 
 
-CD_APPLET_INIT_BEGIN (erreur)
+CD_APPLET_INIT_BEGIN
 	CD_APPLET_REGISTER_FOR_MIDDLE_CLICK_EVENT
 	CD_APPLET_REGISTER_FOR_CLICK_EVENT
 	CD_APPLET_REGISTER_FOR_BUILD_MENU_EVENT
Index: gauge-test/src/applet-struct.h
===================================================================
--- gauge-test/src/applet-struct.h	(revision 1235)
+++ gauge-test/src/applet-struct.h	(working copy)
@@ -4,14 +4,14 @@
 
 #include <cairo-dock.h>
 
-typedef struct {
+struct _AppletConfig {
 	gchar *cThemePath;
-	} AppletConfig;
+	} ;
 
-typedef struct {
+struct _AppletData {
 	double gaugeValue;
 	Gauge *pGauge;
-	} AppletData;
+	} ;
 
 
 #endif
Index: musicplayer/src/musicplayer-init.c
===================================================================
--- musicplayer/src/musicplayer-init.c	(revision 1235)
+++ musicplayer/src/musicplayer-init.c	(working copy)
@@ -28,7 +28,7 @@
 
 
 
-CD_APPLET_INIT_BEGIN (erreur)
+CD_APPLET_INIT_BEGIN
 	if (myDesklet)
 	{
 		CD_APPLET_SET_DESKLET_RENDERER ("Simple");
Index: musicplayer/src/musicplayer-struct.h
===================================================================
--- musicplayer/src/musicplayer-struct.h	(revision 1235)
+++ musicplayer/src/musicplayer-struct.h	(working copy)
@@ -32,7 +32,7 @@
 	PLAYER_NB_STATUS
 } MyAppletPlayerStatus;
 
-typedef struct {
+struct _AppletConfig {
 	gboolean enableDialogs;
 	gboolean enableCover;
 	gdouble timeDialogs;
@@ -42,7 +42,7 @@
 	gchar *defaultTitle;
 	gchar *cUserImage[PLAYER_NB_STATUS];
 	gboolean bStealTaskBarIcon;
-	} AppletConfig;
+	} ;
 	
 typedef struct {
 	gchar *service;
@@ -64,7 +64,7 @@
 	gchar *toggle;
 	} AppletDBus;
 
-typedef struct {
+struct _AppletData {
 	cairo_surface_t *pSurfaces[PLAYER_NB_STATUS];
 	cairo_surface_t *pCover;
 	gchar *run_program;
@@ -89,7 +89,7 @@
 	gchar *full_data;
 	guint iSidCheckCover;
 	AppletDBus DBus_commands;
-	} AppletData;
+	} ;
 	
 
 
Index: weblets/src/applet-widget-itf.cpp
===================================================================
--- weblets/src/applet-widget-itf.cpp	(revision 1235)
+++ weblets/src/applet-widget-itf.cpp	(working copy)
@@ -35,7 +35,7 @@
 #include <nsIDOMWindow.h>
 #include <nsIDOMBarProp.h>
 #include <nsIDOMMouseEvent.h>
-#include <docshell/nsIScrollable.h>
+#include <nsIScrollable.h>
 #include <nsISupports.h>
 #include <nsIServiceManager.h>
 


Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- cairo-dock.spec	10 Aug 2008 09:53:49 -0000	1.64
+++ cairo-dock.spec	10 Aug 2008 15:28:23 -0000	1.65
@@ -5,7 +5,7 @@
 
 %define		released	0
 # For now build only stable plugin
-%define		build_other	0
+%define		build_other	1
 
 %define		tarballver	svn1235_trunk
 %define		mainver		1.6.2
@@ -13,7 +13,7 @@
 
 
 %if 0%{?released} < 1
-%define		fedora_rel	0.1.%{tarballver}
+%define		fedora_rel	0.2.%{tarballver}
 %else
 %define		fedora_rel	1
 %endif
@@ -49,6 +49,7 @@
 Source0:	http://download.berlios.de/cairo-dock/%{name}-sources-%{version}.tar
 %endif
 Patch0:		cairo-dock-rev1235-inf-loop.patch
+Patch1:		cairo-dock-plugin-rev1235.diff
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	automake
@@ -161,8 +162,10 @@
 ###
 %patch0 -p0 -b .infloop
 
+%if 0
 find . -type d -name \.svn | sort -r | xargs %{__rm} -rf
 find . -type d -name \*CVS\* | sort -r | xargs %{__rm} -rf
+%endif
 
 pushd .
 # A. main
@@ -185,8 +188,6 @@
 # B. themes
 cd ../themes
 
-# workaround
-touch _Neon2_/task-indicator.png
 autoreconf -i -f
 
 # C. plug-ins
@@ -207,6 +208,8 @@
 %endif
 find . -name \*.h -or -name \*.c | xargs %{__chmod} 0644
 
+# source code fix
+%patch1 -p0 -b .misc
 
 # mail: license conflict
 %{__rm} -rf mail/
@@ -317,6 +320,7 @@
 unlink cairo-dock || :
 ln -sf src cairo-dock
 export CFLAGS="%optflags -I$(pwd) -I$(pwd)/cairo-dock"
+export CPPFLAGS="%optflags -I$(pwd) -I$(pwd)/cairo-dock"
 export PKG_CONFIG_PATH=$(pwd):${PKG_CONFIG_PATH}
 
 # B themes
@@ -339,7 +343,7 @@
 %{__make} %{?_smp_mflags} -k || :
 %{__make} -k || status=$((status+1))
 
-%if %{build_other} > 1
+%if %{build_other} >= 1
 Subdirs=$(cat Subdirs.list)
 for dir in */
 	do
@@ -467,7 +471,7 @@
 
 	cd $dir
 
-%if %{build_other} > 1
+%if %{build_other} >= 1
 	[ $skip != 1 ] && \
 		%{__make} install \
 		DESTDIR=$RPM_BUILD_ROOT \
@@ -603,7 +607,10 @@
 * Sun Aug 10 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - rev. 1235
 
-* Sun Aug 10 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+* Sun Aug 10 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.2-0.2.svn1235_trunk
+- Enable unstable plugins again
+
+* Sun Aug 10 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.2-0.1.svn1235_trunk
 - Patch to fix infinite loop of function call (this patch is needed
   for rev. 1235 and the released 1.6.1.2)