rpms/cairo-dock/devel cairo-dock-plugin-rev1241.diff, NONE, 1.1 cairo-dock-rev1241-plugin-base.diff, NONE, 1.1 .cvsignore, 1.50, 1.51 cairo-dock.spec, 1.65, 1.66 sources, 1.50, 1.51 cairo-dock-rev1235-inf-loop.patch, 1.1, NONE
Mamoru Tasaka (mtasaka)
fedora-extras-commits at redhat.com
Wed Aug 13 04:49:40 UTC 2008
Author: mtasaka
Update of /cvs/extras/rpms/cairo-dock/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29897
Modified Files:
.cvsignore cairo-dock.spec sources
Added Files:
cairo-dock-plugin-rev1241.diff
cairo-dock-rev1241-plugin-base.diff
Removed Files:
cairo-dock-rev1235-inf-loop.patch
Log Message:
* Wed Aug 13 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev. 1241
cairo-dock-plugin-rev1241.diff:
--- NEW FILE cairo-dock-plugin-rev1241.diff ---
Index: plug-ins/musicplayer/src/musicplayer-init.c
===================================================================
--- plug-ins/musicplayer/src/musicplayer-init.c (revision 1241)
+++ plug-ins/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: plug-ins/musicplayer/src/musicplayer-struct.h
===================================================================
--- plug-ins/musicplayer/src/musicplayer-struct.h (revision 1241)
+++ plug-ins/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: plug-ins/weblets/src/applet-widget-itf.cpp
===================================================================
--- plug-ins/weblets/src/applet-widget-itf.cpp (revision 1241)
+++ plug-ins/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>
cairo-dock-rev1241-plugin-base.diff:
--- NEW FILE cairo-dock-rev1241-plugin-base.diff ---
Index: plug-ins/configure.ac
===================================================================
--- plug-ins/configure.ac (revision 1241)
+++ plug-ins/configure.ac (working copy)
@@ -426,6 +426,7 @@
clock/data/themes/I_Clock/Makefile
clock/data/themes/BlueSlim/Makefile
clock/data/themes/zen/Makefile
+ clock/data/themes/AmoraSlim/Makefile
compiz-icon/Makefile
compiz-icon/src/Makefile
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- .cvsignore 10 Aug 2008 09:53:49 -0000 1.50
+++ .cvsignore 13 Aug 2008 04:49:10 -0000 1.51
@@ -1 +1 @@
-cairo-dock-sources-svn1235_trunk.tar.bz2
+cairo-dock-sources-svn1241_trunk.tar.bz2
Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- cairo-dock.spec 10 Aug 2008 15:28:23 -0000 1.65
+++ cairo-dock.spec 13 Aug 2008 04:49:10 -0000 1.66
@@ -7,7 +7,7 @@
# For now build only stable plugin
%define build_other 1
-%define tarballver svn1235_trunk
+%define tarballver svn1241_trunk
%define mainver 1.6.2
%define build_gecko 1
@@ -48,8 +48,9 @@
%else
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
+#Patch0: cairo-dock-rev1235-inf-loop.patch
+Patch1: cairo-dock-plugin-rev1241.diff
+Patch2: cairo-dock-rev1241-plugin-base.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: automake
@@ -160,7 +161,6 @@
%endif
###
###
-%patch0 -p0 -b .infloop
%if 0
find . -type d -name \.svn | sort -r | xargs %{__rm} -rf
@@ -209,7 +209,8 @@
find . -name \*.h -or -name \*.c | xargs %{__chmod} 0644
# source code fix
-%patch1 -p0 -b .misc
+%patch2 -p1 -b .base
+%patch1 -p1 -b .misc
# mail: license conflict
%{__rm} -rf mail/
@@ -604,8 +605,8 @@
%{_libdir}/pkgconfig/*.pc
%changelog
-* Sun Aug 10 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev. 1235
+* Wed Aug 13 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev. 1241
* 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
@@ -613,6 +614,7 @@
* 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)
+ (Fixed in svn 1241)
* Sat Aug 9 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- Build only stable plug-ins for now
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- sources 10 Aug 2008 09:53:49 -0000 1.50
+++ sources 13 Aug 2008 04:49:10 -0000 1.51
@@ -1 +1 @@
-86a9a40519e12c486fd1003aebfc21b3 cairo-dock-sources-svn1235_trunk.tar.bz2
+9cd841808a8cf8e64dff59e95286e5dd cairo-dock-sources-svn1241_trunk.tar.bz2
--- cairo-dock-rev1235-inf-loop.patch DELETED ---
More information about the scm-commits
mailing list