packages: clutter/clutter.spec, clutter/gtkdoc.patch, clutter/missing.patch...

patrys patrys at pld-linux.org
Sat Feb 26 11:27:12 CET 2011 

Author: patrys                       Date: Sat Feb 26 10:27:12 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 1.6.4
- merged from DEVEL

---- Files affected:
packages/clutter:
   clutter.spec (1.40 -> 1.41) , gtkdoc.patch (1.1 -> 1.2) , missing.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/clutter/clutter.spec
diff -u packages/clutter/clutter.spec:1.40 packages/clutter/clutter.spec:1.41
--- packages/clutter/clutter.spec:1.40	Sun Jan  2 20:33:26 2011
+++ packages/clutter/clutter.spec	Sat Feb 26 11:27:07 2011
@@ -2,27 +2,30 @@
 Summary:	Library for rich GUIs
 Summary(pl.UTF-8):	Biblioteka do bogatych graficznych interfejsów użytkownika
 Name:		clutter
-Version:	1.4.2
+Version:	1.6.4
 Release:	1
 License:	LGPL v2+
 Group:		Libraries
-Source0:	http://www.clutter-project.org/sources/clutter/1.4/%{name}-%{version}.tar.bz2
-# Source0-md5:	5a3c6d8414d4e286aba0a936f344c9b1
+Source0:	http://www.clutter-project.org/sources/clutter/1.6/%{name}-%{version}.tar.bz2
+# Source0-md5:	faa6c93e4761bfd47e48106abf9a17ca
+Patch0:		gtkdoc.patch
+Patch1:		missing.patch
 URL:		http://www.clutter-project.org/
 BuildRequires:	OpenGL-GLX-devel
-BuildRequires:	atk-devel >= 1:1.7
+BuildRequires:	atk-devel >= 1.7
 BuildRequires:	autoconf >= 2.63
 BuildRequires:	automake >= 1:1.11
-BuildRequires:	cairo-devel >= 1.6
+BuildRequires:	cairo-devel
+BuildRequires:	cairo-gobject-devel >= 1.10
 BuildRequires:	docbook-dtd412-xml
-BuildRequires:	gdk-pixbuf2-devel >= 2.0
+BuildRequires:	gdk-pixbuf2-devel
 BuildRequires:	gettext-devel >= 0.17
-BuildRequires:	glib2-devel >= 1:2.18.0
+BuildRequires:	glib2-devel >= 1:2.26.0
 BuildRequires:	gobject-introspection-devel >= 0.9.5
 BuildRequires:	gtk-doc >= 1.13
-BuildRequires:	json-glib-devel >= 0.10.4-3
-BuildRequires:	libdrm-devel
-BuildRequires:	libtool >= 2:2.2.6
+BuildRequires:	json-glib-devel >= 0.12
+BuildRequires:	libtool >= 2.2.6
+BuildRequires:	libxslt-progs
 BuildRequires:	pango-devel >= 1:1.20
 BuildRequires:	pkgconfig
 BuildRequires:	python-modules
@@ -32,8 +35,6 @@
 BuildRequires:	xorg-lib-libXext-devel
 BuildRequires:	xorg-lib-libXfixes-devel >= 4
 BuildRequires:	xorg-lib-libXi-devel
-Requires:	glib2 >= 1:2.18.0
-Requires:	json-glib >= 0.10.4-3
 Obsoletes:	clutter-cairo < 1.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -65,12 +66,9 @@
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	OpenGL-GLX-devel
-Requires:	atk-devel >= 1:1.7
-Requires:	glib2-devel >= 1:2.18.0
-Requires:	gdk-pixbuf2-devel >= 2.0
-Requires:	json-glib-devel >= 0.10.4-3
-Requires:	libdrm-devel
-Requires:	pango-devel >= 1:1.20
+Requires:	glib2-devel >= 1:2.26
+Requires:	gtk+2-devel >= 1:2.0
+Requires:	json-glib-devel >= 0.8.0
 Requires:	xorg-lib-libX11-devel
 Requires:	xorg-lib-libXcomposite-devel >= 0.4
 Requires:	xorg-lib-libXdamage-devel
@@ -111,6 +109,8 @@
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
 %{__gtkdocize}
@@ -121,7 +121,8 @@
 %{__automake}
 %configure \
 	--disable-silent-rules \
-	--with-json=system \
+	--with-flavour=glx \
+	--enable-docs \
 	--enable-gtk-doc \
 	--enable-static \
 	--with-html-dir=%{_gtkdocdir}
@@ -133,6 +134,8 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libclutter-glx-1.0.la
+
 %find_lang clutter-1.0
 
 %clean
@@ -143,7 +146,7 @@
 
 %files -f clutter-1.0.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README TODO
+%doc AUTHORS ChangeLog NEWS README
 %attr(755,root,root) %{_libdir}/libclutter-glx-1.0.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libclutter-glx-1.0.so.0
 %{_libdir}/girepository-1.0/Cally-1.0.typelib
@@ -154,7 +157,6 @@
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libclutter-glx-1.0.so
-%{_libdir}/libclutter-glx-1.0.la
 %{_includedir}/clutter-1.0
 %{_datadir}/gir-1.0/Cally-1.0.gir
 %{_datadir}/gir-1.0/Clutter-1.0.gir
@@ -175,6 +177,7 @@
 %defattr(644,root,root,755)
 %{_gtkdocdir}/cally
 %{_gtkdocdir}/clutter
+%{_gtkdocdir}/clutter-cookbook
 %{_gtkdocdir}/cogl
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -183,6 +186,22 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.41  2011/02/26 10:27:07  patrys
+- 1.6.4
+- merged from DEVEL
+
+Revision 1.37.2.4  2011/02/16 21:48:01  wiget
+- up to 1.6.4
+
+Revision 1.37.2.3  2011/02/03 14:31:21  wiget
+- up to stable 1.6.0
+- added missing.patch (cb_button.h missed in tarball)
+- updated BRs (based on configure.ac)
+- drop libtool file
+
+Revision 1.37.2.2  2011/01/13 20:58:23  wiget
+- 1.5.12
+
 Revision 1.40  2011/01/02 19:33:26  qboosh
 - verbose gir files
 - updated BRs/-devel Rs
@@ -192,6 +211,9 @@
 
 Revision 1.38  2010/12/17 10:19:36  caleb
 - Up to 1.4.2
+
+Revision 1.37.2.1  2010/12/02 19:15:16  wiget
+- 1.5.8 NFY
 
 Revision 1.37  2010/09/25 13:56:23  patrys
 - 1.4.0

================================================================
Index: packages/clutter/gtkdoc.patch
diff -u /dev/null packages/clutter/gtkdoc.patch:1.2
--- /dev/null	Sat Feb 26 11:27:12 2011
+++ packages/clutter/gtkdoc.patch	Sat Feb 26 11:27:07 2011
@@ -0,0 +1,10 @@
+--- clutter-1.5.12/doc/cookbook/Makefile.am.wiget	2011-01-13 21:36:43.193867420 +0100
++++ clutter-1.5.12/doc/cookbook/Makefile.am	2011-01-13 21:37:00.204413186 +0100
+@@ -4,7 +4,6 @@ SUBDIRS = examples
+ 
+ NULL =
+ 
+-HTML_DIR = $(datadir)/gtk-doc/html
+ TARGET_DIR = $(HTML_DIR)/clutter-cookbook
+ 
+ XML_FILES = \

================================================================
Index: packages/clutter/missing.patch
diff -u /dev/null packages/clutter/missing.patch:1.2
--- /dev/null	Sat Feb 26 11:27:12 2011
+++ packages/clutter/missing.patch	Sat Feb 26 11:27:07 2011
@@ -0,0 +1,87 @@
+--- clutter-1.6.0/doc/cookbook/examples/cb-button.h.wiget	2011-02-03 14:52:55.838124992 +0100
++++ clutter-1.6.0/doc/cookbook/examples/cb-button.h	2011-02-03 14:53:12.305129788 +0100
+@@ -0,0 +1,84 @@
++/* inclusion guard */
++#ifndef __CB_BUTTON_H__
++#define __CB_BUTTON_H__
++
++/* include any dependencies */
++#include <clutter/clutter.h>
++
++/* GObject implementation */
++
++/* declare this function signature to remove compilation errors with -Wall;
++ * the cb_button_get_type() function is actually added via the
++ * G_DEFINE_TYPE macro in the .c file
++ */
++GType cb_button_get_type (void);
++
++/* GObject type macros */
++/* returns the class type identifier (GType) for CbButton */
++#define CB_TYPE_BUTTON            (cb_button_get_type ())
++
++/* cast obj to a CbButton object structure*/
++#define CB_BUTTON(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), CB_TYPE_BUTTON, CbButton))
++
++/* check whether obj is a CbButton */
++#define CB_IS_BUTTON(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CB_TYPE_BUTTON))
++
++/* cast klass to CbButtonClass class structure */
++#define CB_BUTTON_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), CB_TYPE_BUTTON, CbButtonClass))
++
++/* check whether klass is a member of the CbButtonClass */
++#define CB_IS_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CB_TYPE_BUTTON))
++
++/* get the CbButtonClass structure for a CbButton obj */
++#define CB_BUTTON_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), CB_TYPE_BUTTON, CbButtonClass))
++
++/*
++ * Private instance fields; see
++ * http://www.gotw.ca/gotw/024.htm for the rationale
++ */
++typedef struct _CbButtonPrivate CbButtonPrivate;
++typedef struct _CbButton        CbButton;
++typedef struct _CbButtonClass   CbButtonClass;
++
++/* object structure */
++struct _CbButton
++{
++  /*<private>*/
++  ClutterActor parent_instance;
++
++  /* structure containing private members */
++  /*<private>*/
++  CbButtonPrivate *priv;
++};
++
++/* class structure */
++struct _CbButtonClass
++{
++  /* signals */
++  void (* clicked)(CbButton *button);
++
++  /*<private>*/
++  ClutterActorClass parent_class;
++};
++
++/* public API */
++
++/* constructor - note this returns a ClutterActor instance */
++ClutterActor *cb_button_new (void);
++
++/* getter */
++G_CONST_RETURN gchar * cb_button_get_text (CbButton *self);
++
++/* setters - these are wrappers round functions
++ * which change properties of the internal actors
++ */
++void cb_button_set_text (CbButton    *self,
++                         const gchar *text);
++
++void cb_button_set_background_color (CbButton           *self,
++                                     const ClutterColor *color);
++
++void cb_button_set_text_color (CbButton           *self,
++                               const ClutterColor *color);
++
++#endif /* __CB_BUTTON_H__ */
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/clutter/clutter.spec?r1=1.40&r2=1.41&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/clutter/gtkdoc.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/clutter/missing.patch?r1=1.1&r2=1.2&f=u

More information about the pld-cvs-commit mailing list