rpms/cairo-dock/devel xorg-x11-proto-devel-workaround-bz505774.patch, NONE, 1.1 .cvsignore, 1.21, 1.22 cairo-dock.spec, 1.28, 1.29 sources, 1.23, 1.24

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/free/rpms/cairo-dock/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv14476

Modified Files:
	.cvsignore cairo-dock.spec sources 
Added Files:
	xorg-x11-proto-devel-workaround-bz505774.patch 
Log Message:
* Thu Jun 18 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 1826


xorg-x11-proto-devel-workaround-bz505774.patch:

--- NEW FILE xorg-x11-proto-devel-workaround-bz505774.patch ---
--- /usr/include/X11/extensions/XTest.h	2009-06-18 11:14:02.000000000 +0900
+++ usr/include/X11/extensions/XTest.h	2009-06-18 17:05:41.000000000 +0900
@@ -47,7 +47,22 @@
 
 #ifndef _XTEST_SERVER_
 
+#if 0
 #include <X11/extensions/XInput.h>
+#else
+#include <X11/Xlib.h>
+
+typedef struct {
+        unsigned char   input_class;
+        unsigned char   event_type_base;
+} XInputClassInfo;
+
+typedef struct {
+        XID                    device_id;
+        int                    num_classes;
+        XInputClassInfo        *classes;
+} XDevice;
+#endif
 
 _XFUNCPROTOBEGIN
 


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	16 Jun 2009 18:27:08 -0000	1.21
+++ .cvsignore	18 Jun 2009 13:57:36 -0000	1.22
@@ -1 +1 @@
-cairo-dock-sources-svn1823_trunk.tar.bz2
+cairo-dock-sources-svn1826_trunk.tar.bz2


Index: cairo-dock.spec
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- cairo-dock.spec	16 Jun 2009 18:27:08 -0000	1.28
+++ cairo-dock.spec	18 Jun 2009 13:57:36 -0000	1.29
@@ -6,17 +6,13 @@
 # cd trunk
 # tar cjf ../cairo-dock-sources-%%{tag}.tar.bz2 .
 
-# Use -gdwarf-2 until /usr/lib/rpm/debugedit supports -gdwarf-3 (bug 505774)
-%global	optflags_	%optflags
-%global	optflags	%optflags_ -gdwarf-2
-
 %global		released	0
 %undefine		pre_release	
 # Set the below to 1 when building unstable plug-ins
 %global		build_other	1
 
 %global		mainver		2.0.5
-%define		betaver		svn1823_trunk
+%define		betaver		svn1826_trunk
 
 %global		build_themes	0
 
@@ -58,7 +54,7 @@
 
 # plug-ins specific patches
 Patch100:	cairo-dock-rev1677-stacks.patch
-Patch101:	cairo-dock-rev1823-cairodock.patch
+Patch200:	xorg-x11-proto-devel-workaround-bz505774.patch
 
 %if ! %{released}
 BuildRequires:	automake
@@ -205,11 +201,23 @@
 %endif
 
 pushd .
+
+####
+# Workaround for bz 506656
+mkdir -p .%{_includedir}/X11/extensions
+pushd .%{_includedir}/X11/extensions
+cp -p %{_includedir}/X11/extensions/XTest.h .
+%patch200 -p4
+popd
+
+%global optflags_ %{optflags}
+%global optflags %{optflags_} -I%{_builddir}/%{name}-%{version}/%{_includedir}
+####
+
 # A. main
 cd cairo-dock
 
 # Patch
-%patch101 -p1 -b .compile
 
 # permission
 for dir in */
@@ -634,8 +642,17 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
-* Wed Jun 17 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 1823
+* Thu Jun 18 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 1826
+
+* Thu Jun 18 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 1825
+- Remove debugedit workaround as bug 505774 is solved.
+- Workaround for X11/extensions/XTest.h bug 506656
+
+* Mon Jun 15 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 1821
+- Compile with -gdwarf-2 until bug 505774 is resolved.
 
 * Thu Jun 11 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.5-1
 - 2.0.5


Index: sources
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	16 Jun 2009 18:27:08 -0000	1.23
+++ sources	18 Jun 2009 13:57:36 -0000	1.24
@@ -1 +1 @@
-71ec0a4b6a0ba9ccc4a0be928449c185  cairo-dock-sources-svn1823_trunk.tar.bz2
+762c4ba8eaffb5dfdeb12e3038e4f366  cairo-dock-sources-svn1826_trunk.tar.bz2