GNOME.org
 

[gnome-scan/gnome-scan-0-6: 4/23] Update to GEGL 0.0.21

commit cb0542987588a13e5214efc1f410444b07956305
Author: Ã?tienne Bersac <bersace src gnome org>
Date:   Sat Dec 6 13:43:12 2008 +0000

    Update to GEGL 0.0.21
    
    svn path=/branches/GNOME_SCAN_0_6/; revision=642
---
 ChangeLog                         |   23 +++++++++++++++++++++++
 configure.ac                      |    2 +-
 lib/gnome-scan-job.c              |    2 +-
 lib/gnome-scan-preview-sink.c     |    2 +-
 lib/gnome-scan-processor-common.c |    4 ++--
 modules/gsane-scanner.c           |    2 +-
 modules/gsfile-scanner.c          |    2 +-
 po/ChangeLog                      |   12 ++++++++++++
 po/Makefile.in.in                 |   21 ++++++++++-----------
 src/flegita-gimp-sink.c           |    2 +-
 src/flegita-sink.c                |    2 +-
 tools/gs-scrot.c                  |   28 ++++++++++++++--------------
 12 files changed, 68 insertions(+), 34 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index abd16a8..b2bb720 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+2008-12-06  Ã?tienne BERSAC  <bersace03 laposte net>
+
+	* configure.ac:
+
+	Bump to Gegl 0.0.21
+
+	* lib/gnome-scan-job.c (gsj_build_pipeline):
+	* lib/gnome-scan-preview-sink.c
+	(gnome_scan_preview_sink_get_child_nodes):
+	* lib/gnome-scan-processor-common.c
+	(gnome_scan_processor_common_get_child_nodes):
+	* modules/gsane-scanner.c (gss_get_child_nodes):
+	* modules/gsfile-scanner.c (gsf_get_child_nodes):
+	* src/flegita-gimp-sink.c (fgs_get_child_nodes):
+	* src/flegita-sink.c (fs_get_child_nodes):
+	* tools/gs-scrot.c (scrot_widget_thread): Migrate to Gegl 0.0.21
+	operation naming scheme.
+
+	This change break compatibility and require an unstable version of
+	Gegl, but this is the only way to fix the "black image" bug that
+	make gnome-scan 0.6 completely useless while gnomescan 0.4 needs a
+	successor.
+
 2008-03-09  Ã?tienne Bersac  <bersace03 laposte net>
 
 	* configure.ac: Release 0.6.
diff --git a/configure.ac b/configure.ac
index 995bc67..ca61977 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,7 +60,7 @@ AC_SUBST(LIB_VERSION)
 AC_SUBST(API_VERSION)
 
 
-PKG_CHECK_MODULES(GNOME_SCAN, [gmodule-2.0 gthread-2.0 glib-2.0 gdk-2.0 >= 2.11 gdk-pixbuf-2.0 gtk+-2.0 >= 2.12 gegl >= 0.0.16 gconf-2.0 ])
+PKG_CHECK_MODULES(GNOME_SCAN, [gmodule-2.0 gthread-2.0 glib-2.0 gdk-2.0 >= 2.11 gdk-pixbuf-2.0 gtk+-2.0 >= 2.12 gegl >= 0.0.21 gconf-2.0 ])
 AC_SUBST(GNOME_SCAN_CFLAGS)
 AC_SUBST(GNOME_SCAN_LIBS)
 
diff --git a/lib/gnome-scan-job.c b/lib/gnome-scan-job.c
index e304889..df1fb8e 100644
--- a/lib/gnome-scan-job.c
+++ b/lib/gnome-scan-job.c
@@ -411,7 +411,7 @@ gsj_build_pipeline(GnomeScanJob *job)
 	
 	/* convert */
 	priv->gegl_convert = gegl_node_new_child(root,
-											 "operation", "convert-format",
+											 "operation", "gegl:convert-format",
 											 NULL);
 	node = g_list_append (node, priv->gegl_convert);
 	
diff --git a/lib/gnome-scan-preview-sink.c b/lib/gnome-scan-preview-sink.c
index eb1cf5c..3feb5dc 100644
--- a/lib/gnome-scan-preview-sink.c
+++ b/lib/gnome-scan-preview-sink.c
@@ -83,7 +83,7 @@ gnome_scan_preview_sink_get_child_nodes (GnomeScanPlugin *plugin,
 	GList *list = NULL;
 
 	priv->save = gegl_node_new_child (root,
-									  "operation", "save-pixbuf",
+									  "operation", "gegl:save-pixbuf",
 									  "pixbuf", &priv->pixbuf,
 									  NULL);
 	list = g_list_append (list,
diff --git a/lib/gnome-scan-processor-common.c b/lib/gnome-scan-processor-common.c
index 5bf3f9e..1ea8096 100644
--- a/lib/gnome-scan-processor-common.c
+++ b/lib/gnome-scan-processor-common.c
@@ -108,14 +108,14 @@ gnome_scan_processor_common_get_child_nodes (GnomeScanPlugin *plugin, GeglNode *
 	GeglNode *op;
 	
 	op = gegl_node_new_child(root,
-							 "operation", "rotate",
+							 "operation", "gegl:rotate",
 							 "degrees", priv->degrees,
 							 NULL);
 	node = g_list_append (node, op);
 	
 	if (priv->enhance) {
 		op = gegl_node_new_child(root,
-								 "operation", "stress",
+								 "operation", "gegl:stress",
 								 /* those value are arbitraty, might
 									be nice to expose this through
 									profile : photo, text, quick,
diff --git a/modules/gsane-scanner.c b/modules/gsane-scanner.c
index 38c1a62..631b0bf 100644
--- a/modules/gsane-scanner.c
+++ b/modules/gsane-scanner.c
@@ -315,7 +315,7 @@ gss_get_child_nodes (GnomeScanPlugin *plugin,
 	GList* list = NULL;
 	
 	priv->load = gegl_node_new_child (root,
-					  "operation", "load-buffer",
+					  "operation", "gegl:load-buffer",
 					  "buffer", priv->buffer,
 					  NULL);
 	list = g_list_append (list, priv->load);
diff --git a/modules/gsfile-scanner.c b/modules/gsfile-scanner.c
index 2e80d1f..a867e59 100644
--- a/modules/gsfile-scanner.c
+++ b/modules/gsfile-scanner.c
@@ -162,7 +162,7 @@ gsf_get_child_nodes (GnomeScanPlugin *plugin,
 	GList *list = NULL;
 	
 	priv->load = gegl_node_new_child (root,
-									  "operation", "load",
+									  "operation", "gegl:load",
 									  NULL);
 	
 	list = g_list_append (list, priv->load);
diff --git a/po/ChangeLog b/po/ChangeLog
index 7de21cc..6374322 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,15 @@
+2008-12-06  Ã?tienne BERSAC  <bersace03 laposte net>
+
+	reviewed by: <delete if not using a buddy>
+
+	* Makefile.in.in:
+
+2008-12-06  Ã?tienne BERSAC  <bersace03 laposte net>
+
+	reviewed by: <delete if not using a buddy>
+
+	* Makefile.in.in:
+
 2008-03-09  Duarte Loreto <happyguy_pt hotmail com>
 
 	* pt.po: Added Portuguese translation by Antonio Lima
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index b630d54..57ef267 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -1,10 +1,10 @@
 # Makefile for program source directory in GNU NLS utilities package.
 # Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper gnu ai mit edu>
+# Copyright (C) 2004-2008 Rodney Dawes <dobey pwns gmail com>
 #
-# This file file be copied and used freely without restrictions.  It can
-# be used in projects which are not available under the GNU Public License
+# This file may be copied and used freely without restrictions.  It may
+# be used in projects which are not available under a GNU Public License,
 # but which still want to provide support for the GNU gettext functionality.
-# Please note that the actual code is *not* freely available.
 #
 # - Modified by Owen Taylor <otaylor redhat com> to use GETTEXT_PACKAGE
 #   instead of PACKAGE and to look for po2tbl in ./ not in intl/
@@ -12,7 +12,7 @@
 # - Modified by jacob berkman <jacob ximian com> to install
 #   Makefile.in.in and po2tbl.sed.in for use with glib-gettextize
 #
-# - Modified by Rodney Dawes <dobey novell com> for use with intltool
+# - Modified by Rodney Dawes <dobey pwns gmail com> for use with intltool
 #
 # We have the following line for use by intltoolize:
 # INTLTOOL_MAKEFILE
@@ -54,16 +54,16 @@ GENPOT   = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDA
 
 ALL_LINGUAS = @ALL_LINGUAS@
 
-PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi)
+PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi)
 
-USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS`" -o -n "`echo $$ALINGUAS|grep ' ?$$lang ?'`"; then printf "$$lang "; fi; done; fi)
+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep ^$$lang$$`"; then printf "$$lang "; fi; done; fi)
 
-USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
+USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
 
-POFILES=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
+POFILES=$(shell LINGUAS="$(PO_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
 
-DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES)
-EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS
+DISTFILES = Makefile.in.in POTFILES.in $(POFILES)
+EXTRA_DISTFILES = ChangeLog POTFILES.skip Makevars LINGUAS
 
 POTFILES = \
 # This comment gets stripped out
@@ -101,7 +101,6 @@ install: install-data
 install-data: install-data- USE_NLS@
 install-data-no: all
 install-data-yes: all
-	$(mkdir_p) $(DESTDIR)$(itlocaledir)
 	linguas="$(USE_LINGUAS)"; \
 	for lang in $$linguas; do \
 	  dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
diff --git a/src/flegita-gimp-sink.c b/src/flegita-gimp-sink.c
index fb7d20a..f3ca5ef 100644
--- a/src/flegita-gimp-sink.c
+++ b/src/flegita-gimp-sink.c
@@ -149,7 +149,7 @@ fgs_get_child_nodes	(GnomeScanPlugin *plugin,
 	FlegitaGimpSinkPrivate *priv = GET_PRIVATE (plugin);
 	GList *list = NULL;
 	priv->save = gegl_node_new_child (root,
-									  "operation", "save-buffer",
+									  "operation", "gegl:save-buffer",
 									  "buffer", &priv->buffer,
 									  NULL);
 	list = g_list_append (list, priv->save);
diff --git a/src/flegita-sink.c b/src/flegita-sink.c
index 6d9d346..1c59f17 100644
--- a/src/flegita-sink.c
+++ b/src/flegita-sink.c
@@ -351,7 +351,7 @@ fs_get_child_nodes	(GnomeScanPlugin *plugin,
   FlegitaSinkPrivate *priv = GET_PRIVATE (plugin);
   GList *list = NULL;
   priv->output = gegl_node_new_child (root,
-				      "operation", "png-save",
+				      "operation", "gegl:png-save",
 				      NULL);
 
   list = g_list_append (list, priv->output);
diff --git a/tools/gs-scrot.c b/tools/gs-scrot.c
index d55d279..d8b04be 100644
--- a/tools/gs-scrot.c
+++ b/tools/gs-scrot.c
@@ -365,12 +365,12 @@ scrot_widget_thread (GtkWidget *widget)
   root = gegl_node_new ();
 	
   color = gegl_node_new_child (root,
-			       "operation", "color",
+			       "operation", "gegl:color",
 			       "value", gegl_color_new ("white"),
 			       NULL);
 	
   crop = gegl_node_new_child (root,
-			      "operation", "crop",
+			      "operation", "gegl:crop",
 			      "x", 0.,
 			      "y", 0.,
 			      "width", W,
@@ -378,15 +378,15 @@ scrot_widget_thread (GtkWidget *widget)
 			      NULL);
 	
   over = gegl_node_new_child (root,
-			      "operation", "over",
+			      "operation", "gegl:over",
 			      NULL);
 	
   over1 = gegl_node_new_child (root,
-			       "operation", "over",
+			       "operation", "gegl:over",
 			       NULL);
 	
   crop1 = gegl_node_new_child (root,
-			       "operation", "crop",
+			       "operation", "gegl:crop",
 			       "x", 0.,
 			       "y", 0.,
 			       "width", W,
@@ -394,14 +394,14 @@ scrot_widget_thread (GtkWidget *widget)
 			       NULL);
 	
   shift = gegl_node_new_child (root,
-			       "operation", "shift",
+			       "operation", "gegl:shift",
 			       "x", LEN,
 			       "y", LEN,
 			       NULL);
 	
 	
   save = gegl_node_new_child (root,
-			      "operation", "png-save",
+			      "operation", "gegl:png-save",
 			      "path", filename,
 			      NULL);
 	
@@ -410,13 +410,13 @@ scrot_widget_thread (GtkWidget *widget)
 	
   /* border */
   bg = gegl_node_new_child (root,
-			    "operation", "color",
+			    "operation", "gegl:color",
 			    NULL);
 	
 	
   if (GTK_IS_WINDOW (widget)) {
     crop2 = gegl_node_new_child (root,
-				 "operation", "crop",
+				 "operation", "gegl:crop",
 				 "x", 0.,
 				 "y", 0.,
 				 "width", (gdouble) w,
@@ -425,7 +425,7 @@ scrot_widget_thread (GtkWidget *widget)
   }
   else {
     crop2 = gegl_node_new_child (root,
-				 "operation", "crop",
+				 "operation", "gegl:crop",
 				 "x", 0.,
 				 "y", 0.,
 				 "width", (gdouble) w + 2.,
@@ -434,7 +434,7 @@ scrot_widget_thread (GtkWidget *widget)
   }
 	
   shadow = gegl_node_new_child (over,
-				"operation", "dropshadow",
+				"operation", "gegl:dropshadow",
 				"opacity", .9,
 				"x", LEN,
 				"y", LEN,
@@ -446,18 +446,18 @@ scrot_widget_thread (GtkWidget *widget)
 	
   /* image */
   load = gegl_node_new_child (over1,
-			      "operation", "pixbuf",
+			      "operation", "gegl:pixbuf",
 			      "pixbuf", screenshot,
 			      NULL);
 	
   if (GTK_IS_WINDOW (widget)) {
     shift1 = gegl_node_new_child (over1,
-				  "operation", "nop",
+				  "operation", "gegl:nop",
 				  NULL);
   }
   else {
     shift1 = gegl_node_new_child (over1,
-				  "operation", "shift",
+				  "operation", "gegl:shift",
 				  "x", 1.,
 				  "y", 1.,
 				  NULL);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]