gtk-css-engine r154 - in trunk: . libccss libccss/cccss libccss/examples

[robsta svn gnome org]

Author: robsta
Date: Thu Oct  2 11:55:42 2008
New Revision: 154
URL: http://svn.gnome.org/viewvc/gtk-css-engine?rev=154&view=rev

Log:
* configure.in:
* libccss/Makefile.am:
* libccss/examples/Makefile.am:
* libccss/examples/example-1.c:
* libccss/examples/example-1.css (added):
* libccss/examples/example-1.c (added):
* libccss/cccss (added):
* libccss/examples/example1.css (deleted):
* libccss/examples/example1.c (deleted):
Clutter integration infrastructure.



Added:
   trunk/libccss/cccss/
   trunk/libccss/examples/example-1.c
      - copied, changed from r153, /trunk/libccss/examples/example1.c
   trunk/libccss/examples/example-1.css
      - copied unchanged from r153, /trunk/libccss/examples/example1.css
Removed:
   trunk/libccss/examples/example1.c
   trunk/libccss/examples/example1.css
Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/libccss/Makefile.am
   trunk/libccss/examples/Makefile.am

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Thu Oct  2 11:55:42 2008
@@ -132,6 +132,7 @@
 # Maybe it would work with gtk+-2.8, the first sporting cairo, right?
 pkgs='gtk+-2.0 >= 2.10.0 libcroco-0.6'
 
+
 # See http://bugzilla.gnome.org/show_bug.cgi?id=553937 .
 PKG_CHECK_EXISTS([ libcroco-0.6 >= 0.6.2 ],
 [
@@ -143,6 +144,7 @@
   AC_DEFINE([CCSS_ENABLE_LIBCROCO_WORKAROUND], [1], [Work around libcroco issue #553937])
 fi
 
+
 # Guessing a version.
 rsvg_req='librsvg-2.0 >= 2.16'
 PKG_CHECK_EXISTS([ $rsvg_req ],
@@ -158,6 +160,7 @@
 fi
 AM_CONDITIONAL([CCSS_WITH_RSVG], [test "$with_rsvg" = "yes"])
 
+
 soup_req='libsoup-2.4'
 PKG_CHECK_EXISTS([ $soup_req ],
 [
@@ -172,6 +175,19 @@
 fi
 AM_CONDITIONAL([CCSS_WITH_SOUP], [test "$with_soup" = "yes"])
 
+
+clutter_req='clutter-0.8'
+PKG_CHECK_EXISTS([ $clutter_req ],
+[
+  with_clutter="yes"
+  pkgs="$pkgs $clutter_req"
+],[
+  with_clutter="no"
+])
+
+AM_CONDITIONAL([CCSS_WITH_CLUTTER], [test "$with_clutter" = "yes"])
+
+
 PKG_CHECK_MODULES(CCSS, $pkgs)
 
 AC_SUBST([CCSS_CFLAGS])
@@ -225,6 +241,7 @@
   doc/Makefile
   libccss/Makefile
   libccss/libccss-1.pc
+  libccss/cccss/Makefile
   libccss/ccss/Makefile
   libccss/doc/Makefile
   libccss/doc/version.xml
@@ -247,6 +264,7 @@
     Standalone libccss           $enable_libccss
     Support for SVG images       $with_rsvg (requires librsvg)
 WIP Support for SVG fragments    $with_soup (requires libsoup)
+WIP Clutter support              ${with_clutter}
 
 Theme engine:
     Rapid development            $enable_rapid_development (WARNING: this breaks theme switching)

Modified: trunk/libccss/Makefile.am
==============================================================================
--- trunk/libccss/Makefile.am	(original)
+++ trunk/libccss/Makefile.am	Thu Oct  2 11:55:42 2008
@@ -1,6 +1,10 @@
 
 SUBDIRS = ccss doc
 
+if CCSS_WITH_CLUTTER
+SUBDIRS += cccss
+endif
+
 if CCSS_WITH_GTK
 SUBDIRS += examples
 endif

Modified: trunk/libccss/examples/Makefile.am
==============================================================================
--- trunk/libccss/examples/Makefile.am	(original)
+++ trunk/libccss/examples/Makefile.am	Thu Oct  2 11:55:42 2008
@@ -8,9 +8,9 @@
 	$(CCSS_LIBS) \
 	../ccss/libccss-1.la
 
-noinst_PROGRAMS = example1
+noinst_PROGRAMS = example-1
 
-example1_SOURCES = example1.c
+example_1_SOURCES = example-1.c
 
 # The `internal' example can't link against the libccss so, because
 # it relies on internal API.
@@ -21,5 +21,5 @@
 endif
 
 EXTRA_DIST = \
-	example1.css
+	example-1.css
 

Copied: trunk/libccss/examples/example-1.c (from r153, /trunk/libccss/examples/example1.c)
==============================================================================
--- /trunk/libccss/examples/example1.c	(original)
+++ trunk/libccss/examples/example-1.c	Thu Oct  2 11:55:42 2008
@@ -44,7 +44,7 @@
 	gtk_init (&argc, &argv);
 
 	/* stylesheet = ccss_stylesheet_new_from_buffer (_css, sizeof (_css)); */
-	stylesheet = ccss_stylesheet_new_from_file ("example1.css");
+	stylesheet = ccss_stylesheet_new_from_file ("example-1.css");
 
 	group = ccss_stylesheet_query_type (stylesheet, "box");
 	g_assert (group);