* add gtkmm host libs + (host-)glademm

git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@7799 33e552b5-05e3-0310-8538-816dae2090ed

10 files changed, 670 insertions, 0 deletions

diff --git a/patches/glademm-2.6.0/generic/autoreconf.diff b/patches/glademm-2.6.0/generic/autoreconf.diff
new file mode 100644
index 000000000..49dc7b308
--- /dev/null
+++ b/patches/glademm-2.6.0/generic/autoreconf.diff
@@ -0,0 +1,126 @@
+---
+ src/writers/Makefile.in |   24 ++++++++++++++++--------
+ 1 file changed, 16 insertions(+), 8 deletions(-)
+
+Index: b/src/writers/Makefile.in
+===================================================================
+--- a/src/writers/Makefile.in
++++ b/src/writers/Makefile.in
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -22,8 +22,6 @@
+ # libwriters.o is now 1M1
+ 
+ 
+-SOURCES = $(libwriters_a_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -61,7 +59,7 @@ ARFLAGS = cru
+ libwriters_a_AR = $(AR) $(ARFLAGS)
+ libwriters_a_LIBADD =
+ am_libwriters_a_OBJECTS = WriterBase.$(OBJEXT) \
+-	WriterBase_matches.$(OBJEXT) Class.$(OBJEXT) \
++	WriterBase_matches.$(OBJEXT) Class.$(OBJEXT) gwt.$(OBJEXT) \
+ 	accellabel.$(OBJEXT) accelgroup.$(OBJEXT) adjustment.$(OBJEXT) \
+ 	alignment.$(OBJEXT) arrow.$(OBJEXT) aspectframe.$(OBJEXT) \
+ 	bbox.$(OBJEXT) bonobo_dock.$(OBJEXT) bonobo_dockitem.$(OBJEXT) \
+@@ -139,6 +137,7 @@ CXXFLAGS = @CXXFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -147,6 +146,7 @@ EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
++GREP = @GREP@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -158,6 +158,7 @@ LIBTOOL = @LIBTOOL@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
++NMEDIT = @NMEDIT@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -167,16 +168,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+ VERSION = @VERSION@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+@@ -193,23 +192,30 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+@@ -230,6 +236,7 @@ noinst_HEADERS = WriterBase.hh adjustmen
+ 	togglebutton.hh toolitem.hh widget.hh window.hh safemap.hh 
+ 
+ libwriters_a_SOURCES = WriterBase.cc WriterBase_matches.cc Class.cc \
++	gwt.cc \
+ 	accellabel.cc \
+ 	accelgroup.cc adjustment.cc alignment.cc arrow.cc \
+ 	aspectframe.cc bbox.cc bonobo_dock.cc bonobo_dockitem.cc \
+@@ -360,6 +367,7 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_numberentry.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_pixmap.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_propertybox.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gwt.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/handlebox.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/image.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imagemenuitem.Po@am__quote@
diff --git a/patches/glademm-2.6.0/generic/box_pack_child_with_responseid.diff b/patches/glademm-2.6.0/generic/box_pack_child_with_responseid.diff
new file mode 100644
index 000000000..e9374541b
--- /dev/null
+++ b/patches/glademm-2.6.0/generic/box_pack_child_with_responseid.diff
@@ -0,0 +1,32 @@
+Subject: children of box with response id will also get packed
+By: Luotao Fu <l.fu@pengutronix.de>
+	Box addchild function returns before adding pack...() call if "response_id"
+	is set in property. This is bad because the most objects have a response_id,
+	though marked to 0. Without this patch we will only be able to see few
+	objects like radiobuttons in a box, most objects don't appear at all. To
+	solve this problem we acquire the property value now and only return if it's
+	not 0. (I'm not quite sure what this response_id is actually for, question to
+	developer is pending)
+
+Signed-off-by: Luotao Fu <l.fu@pengutronix.de>
+---
+ src/writers/box.cc |    6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+Index: b/src/writers/box.cc
+===================================================================
+--- a/src/writers/box.cc
++++ b/src/writers/box.cc
+@@ -55,8 +55,10 @@ void Gtk_Box::AddChild(const Widget &w,C
+    int padding(ch.getIntProperty("padding",0));
+ 
+    // this is for dialog (see there)
+-   if (GTKMM2 && w.hasProperty("response_id")) return;
+-   
++   if (GTKMM2 && w.hasProperty("response_id")) {
++		if (w.getIntProperty("response_id")!=0)
++			return;
++	}
+    f.Statement() << instance 
+         << (pack_end?"pack_end":"pack_start")
+         << '(' << Reference(w);
diff --git a/patches/glademm-2.6.0/generic/configurable_pkgconfig.diff b/patches/glademm-2.6.0/generic/configurable_pkgconfig.diff
new file mode 100644
index 000000000..eeb2d2bab
--- /dev/null
+++ b/patches/glademm-2.6.0/generic/configurable_pkgconfig.diff
@@ -0,0 +1,95 @@
+Subject: make pkg-config binary configurable
+By: Luotao Fu <l.fu@pengutronix.de>
+  glademm calls directly pkg-config in $PATH. We however need that customizable
+  pkg-config to be called, i.E. our host built pkg-config in BSP. Hence we make
+  the path to the pkg-config we want to call configurable via parameter.
+  not determined for upstream
+
+Signed-off-by: Luotao Fu <l.fu@pengutronix.de>
+---
+ src/Configuration.hh |    1 +
+ src/glade--.cc       |   21 ++++++++++++++++-----
+ 2 files changed, 17 insertions(+), 5 deletions(-)
+
+Index: b/src/glade--.cc
+===================================================================
+--- a/src/glade--.cc
++++ b/src/glade--.cc
+@@ -93,7 +93,7 @@ const static struct option options[]=
+   { "verbose",		no_argument,	   NULL, 'v' },
+   { "show-options",	no_argument,	   NULL, SHOW_OPTIONS },
+   { "image-provider",	required_argument, NULL, IMAGE_PROVIDER },
+-  
++  { "pkgconfig",	required_argument, NULL, 'p' },
+   { NULL,		0,		   NULL, 0 }
+ };
+ 
+@@ -134,7 +134,15 @@ static bool CheckVersion(const std::stri
+ {  if (v.source==Pkg_Version::Command_Line) return true;
+    char buf[80];
+    bool result=false;
+-   FILE *f=popen(cmd.c_str(),"r");
++   FILE *f;
++	int i;
++	std::string n_cmd = cmd.c_str();
++	std::string::size_type loc = n_cmd.find("pkg-config", 0);
++	if (Configuration.pkgconfig_bin != "" && loc != std::string::npos) {
++		n_cmd.replace(loc, Configuration.pkgconfig_bin.length(),
++							 Configuration.pkgconfig_bin);
++   }
++   f=popen(n_cmd.c_str(),"r");
+    if (f)
+    {  if (fgets(buf,sizeof(buf),f))
+       {  if (!ignore_letters)
+@@ -144,11 +152,11 @@ static bool CheckVersion(const std::stri
+          // not installed/found
+          if (!strncmp(buf,"Package ",8) && strstr(buf," not ")) result=false;
+          else if (parse_version(buf,v,src,ignore_letters)) result=true;
+-         else std::cerr << cmd << ": strange result '" << buf << "'\n";
++         else std::cerr << n_cmd << ": strange result '" << buf << "'\n";
+       }
+       pclose(f);
+    }
+-   else perror(cmd.c_str());
++   else perror(n_cmd.c_str());
+    return result;
+ }
+ 
+@@ -383,7 +391,7 @@ int main(int argc,char **argv)
+    {  if (i) Configuration.commandline+=' ';
+       Configuration.commandline+=argv[i];
+    }
+-   while ((opt=getopt_long(argc,argv,"d:m:h:c:Vgrs1AwlN",options,NULL))!=EOF) 
++   while ((opt=getopt_long(argc,argv,"d:m:h:c:p:Vgrs1AwlN",options,NULL))!=EOF)
+     switch(opt)
+    {  case 'd': Configuration.destination_directory=optarg;
+          break;
+@@ -393,6 +401,8 @@ int main(int argc,char **argv)
+       	 break;
+       case 'h': Configuration.header_suffix=optarg;
+          break;
++      case 'p': Configuration.pkgconfig_bin=optarg;
++	 break;
+       case 'V': std::cout<< "glademm V"VERSION" (glade to Gtk-- converter)\n";
+          return 0;
+          break;
+@@ -487,6 +497,7 @@ int main(int argc,char **argv)
+ 		 "\t--baseclass\tderive from base class (for class parameters)\n"
+          	 "\t--libglade\tgenerate code skeleton for a libglade-- application.\n"
+          	 "\t--libglade-option\tgenerate infrastructure for libglade without using it.\n"
++				 "\t--pkgconfig\tpath to the pkg-config binary to be used\n"
+          	 "\t--version\tprints 'glademm V"VERSION"'\n";
+          return 1;
+    }
+Index: b/src/Configuration.hh
+===================================================================
+--- a/src/Configuration.hh
++++ b/src/Configuration.hh
+@@ -83,6 +83,7 @@ struct Configuration : public Naming
+    std::string pixmap_dir_relative_to_src;
+    std::string author_name;
+    std::string author_email;
++   std::string pkgconfig_bin;
+    bool debug:1;
+    bool sample_code:1;
+    bool bare_bones:1;
diff --git a/patches/glademm-2.6.0/generic/fix-alignment-writer.diff b/patches/glademm-2.6.0/generic/fix-alignment-writer.diff
new file mode 100644
index 000000000..095630216
--- /dev/null
+++ b/patches/glademm-2.6.0/generic/fix-alignment-writer.diff
@@ -0,0 +1,34 @@
+Subject: fix code generation for Gtk::Alignment
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+  Produce correct code even if some properties have the default values and
+  are not specified in the glade file.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ src/writers/alignment.cc |   13 ++++---------
+ 1 file changed, 4 insertions(+), 9 deletions(-)
+
+Index: b/src/writers/alignment.cc
+===================================================================
+--- a/src/writers/alignment.cc
++++ b/src/writers/alignment.cc
+@@ -43,15 +43,10 @@ const std::string Gtk_Alignment::Include
+ 
+ void Gtk_Alignment::ConstructionArgs(const Widget &w, CxxFile &f) const
+ {
+-   if( w.hasProperty("xalign") && w.hasProperty("yalign") && 
+-       w.hasProperty("xscale") && w.hasProperty("yscale") )
+-   {
+-      f.FunctionArg() << w.getFloatProperty("xalign");
+-      f.FunctionArg() << w.getFloatProperty("yalign");
+-      f.FunctionArg() << w.getFloatProperty("xscale");
+-      f.FunctionArg() << w.getFloatProperty("yscale");
+-   }
+-   else f.FunctionArg();
++   f.FunctionArg() << (w.hasProperty("xalign") ? w.getFloatProperty("xalign") : 0.5);
++   f.FunctionArg() << (w.hasProperty("yalign") ? w.getFloatProperty("yalign") : 0.5);
++   f.FunctionArg() << (w.hasProperty("xscale") ? w.getFloatProperty("xscale") : 1.0);
++   f.FunctionArg() << (w.hasProperty("yscale") ? w.getFloatProperty("yscale") : 1.0);
+ }
+ 
+ Gtk_Alignment::Gtk_Alignment()
diff --git a/patches/glademm-2.6.0/generic/fix-glade-only.diff b/patches/glademm-2.6.0/generic/fix-glade-only.diff
new file mode 100644
index 000000000..6d63a3322
--- /dev/null
+++ b/patches/glademm-2.6.0/generic/fix-glade-only.diff
@@ -0,0 +1,104 @@
+Subject: fix --gladeonly
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+  Don't do things that are not needed to create *_glade.* files.
+  This fixes a crash and various bogus output.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ src/Cxx_Fileset.cc |    6 ++++++
+ src/glade--.cc     |   15 ++++++++++-----
+ 2 files changed, 16 insertions(+), 5 deletions(-)
+
+Index: b/src/Cxx_Fileset.cc
+===================================================================
+--- a/src/Cxx_Fileset.cc
++++ b/src/Cxx_Fileset.cc
+@@ -180,6 +180,8 @@ void Cxx_Fileset::WriteClasses(const Wid
+    }
+    
+    /******* H: class Xyz ******/
++   if (!Configuration.bare_bones) 
++   {
+    if (Configuration.baseclass)
+    {  bc.Definition().Class(Configuration.TypeName(w.Name())+"_base");
+       bc.StartBlock();
+@@ -210,6 +212,7 @@ void Cxx_Fileset::WriteClasses(const Wid
+ 
+    DeclareSignalHandler(top_wr,w,w,true);
+    h.EndBlock();
++   }
+    
+    /****** GC: include, definitions **************/
+    
+@@ -405,6 +408,8 @@ void Cxx_Fileset::WriteClasses(const Wid
+    
+    /****** C: signal handler stubs *******/
+    
++   if (!Configuration.bare_bones) 
++   {
+    if (Configuration.debug) 
+       std::cout << "======== C signal stubs ============\n";
+    for (Widget::const_contained_iterator i=w.begin_contained(Internal_Both);
+@@ -416,6 +421,7 @@ void Cxx_Fileset::WriteClasses(const Wid
+    }
+ 
+    DefineSignalHandler(top_wr,w,w);
++   }
+    
+    /****** other classes/files ********/
+    // recurse
+Index: b/src/glade--.cc
+===================================================================
+--- a/src/glade--.cc
++++ b/src/glade--.cc
+@@ -160,10 +160,8 @@ static bool CheckVersion(const std::stri
+    return result;
+ }
+ 
+-static void call_gtkmm_config()
+-{  CheckVersion("pkg-config --version",Configuration.pc_version,Pkg_Version::Pkg_Config);
+-
+-   if (CheckVersion("automake-1.9 --version",Configuration.automake_version,Pkg_Version::MMVersion,true))
++static void call_autotool_config()
++{  if (CheckVersion("automake-1.9 --version",Configuration.automake_version,Pkg_Version::MMVersion,true))
+       Configuration.automake_name="automake-1.9";
+    else if (CheckVersion("automake-1.8 --version",Configuration.automake_version,Pkg_Version::MMVersion,true))
+       Configuration.automake_name="automake-1.8";
+@@ -189,7 +187,10 @@ static void call_gtkmm_config()
+ //      Configuration.use_autoreconf=true;
+    
+    CheckVersion("gettext --version",Configuration.gettext_version,Pkg_Version::MMVersion,true);
++}
+ 
++static void call_gtkmm_config()
++{  CheckVersion("pkg-config --version",Configuration.pc_version,Pkg_Version::Pkg_Config);
+    // Pkgconfig checks (Gnome 2)
+    if (Configuration.gnome2) {
+       if (!!Configuration.pc_version) {
+@@ -412,6 +413,7 @@ int main(int argc,char **argv)
+       case 's': Configuration.sample_code=true;
+          break;
+       case 'r': Configuration.bare_bones=true;
++                Configuration.no_autoconf=true;
+          break;
+       case 'A': Configuration.no_autoconf=true;
+          break;
+@@ -535,7 +537,8 @@ reopen:
+          else std::cerr << "Warning: strange project tag '" << t.Type() << "'\n";
+       }
+       catch (...)
+-      {  std::cerr << "Warning: no or illegal project file.\n";
++      {  if (!Configuration.bare_bones)
++           std::cerr << "Warning: no or illegal project file.\n";
+          Tag t("glade-project","");
+          // Configuration.in_filename without path and .glade
+          std::string name=Configuration.in_filename;
+@@ -572,6 +575,8 @@ reopen:
+ 
+    if (Configuration.debug) top.debug(depth);
+    call_gtkmm_config();
++   if (!Configuration.no_autoconf)
++     call_autotool_config();
+    
+    // Apply dependant preferences 
+    if (Configuration.gettext_support)
diff --git a/patches/glademm-2.6.0/generic/fix-table-attach.diff b/patches/glademm-2.6.0/generic/fix-table-attach.diff
new file mode 100644
index 000000000..7564bb3ef
--- /dev/null
+++ b/patches/glademm-2.6.0/generic/fix-table-attach.diff
@@ -0,0 +1,49 @@
+Subject: fix code generation for Gtk::Table
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+  Use the correct default values.
+  Note: this may break old glade files (glade-2 and older).
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ src/writers/table.cc |   14 +++++++++-----
+ 1 file changed, 9 insertions(+), 5 deletions(-)
+
+Index: b/src/writers/table.cc
+===================================================================
+--- a/src/writers/table.cc
++++ b/src/writers/table.cc
+@@ -51,7 +51,7 @@ Gtk_Table::Gtk_Table()
+ void Gtk_Table::ConstructionArgs(const Widget &w, CxxFile &f) const
+ {  f.FunctionArg() << w.getIntProperty("rows",2);
+    f.FunctionArg() << w.getIntProperty("columns",2);
+-   f.FunctionArg() << PRINT_BOOL(w.getBoolProperty("homogeneous",true));
++   f.FunctionArg() << PRINT_BOOL(w.getBoolProperty("homogeneous",false));
+ }
+ 
+ std::string getAttachOptions(const ChildParamList& ch, const std::string which)
+@@ -68,6 +68,10 @@ std::string getAttachOptions(const Child
+          if (*i == "fill") options += "|GTK_FILL";
+          else if (*i == "expand") options += "|GTK_EXPAND";
+          else if (*i == "shrink") options += "|GTK_SHRINK";
++         else
++         { options += "|" + ch.getProperty(which+"_options");
++           break;
++         }
+    }
+    else // glade1 style
+    {  if (ch.getBoolProperty(which+"expand",true)) options+="|GTK_EXPAND";
+@@ -86,10 +90,10 @@ std::string getAttachOptions(const Child
+ 
+ void Gtk_Table::AddChild(const Widget &w,CxxFile &f,const std::string &instance) const
+ {  const ChildParamList ch=w.get_Child_params();
+-   int left_attach=ch.getIntProperty("left_attach",-1);
+-   int right_attach=ch.getIntProperty("right_attach",-1);
+-   int top_attach=ch.getIntProperty("top_attach",-1);
+-   int bottom_attach=ch.getIntProperty("bottom_attach",-1);
++   int left_attach=ch.getIntProperty("left_attach",0);
++   int right_attach=ch.getIntProperty("right_attach",1);
++   int top_attach=ch.getIntProperty("top_attach",0);
++   int bottom_attach=ch.getIntProperty("bottom_attach",1);
+ 
+    std::string xoptions = getAttachOptions(ch, "x");
+    std::string yoptions = getAttachOptions(ch, "y");
diff --git a/patches/glademm-2.6.0/generic/fix_double_qualification.diff b/patches/glademm-2.6.0/generic/fix_double_qualification.diff
new file mode 100644
index 000000000..3555428ed
--- /dev/null
+++ b/patches/glademm-2.6.0/generic/fix_double_qualification.diff
@@ -0,0 +1,24 @@
+Subject: take out double qualification of function
+By: Debian packet author
+  IsSubwidget() is double qualified. Newer Compilers(tested with 4.1.2) don't
+  like this and break up with error on this.
+  This patch is taken from debian source packet
+
+Signed-off-by: n.a.
+---
+ src/writers/gnome_app.hh |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: b/src/writers/gnome_app.hh
+===================================================================
+--- a/src/writers/gnome_app.hh
++++ b/src/writers/gnome_app.hh
+@@ -28,7 +28,7 @@ class Gnome_App : public Gtk_Window
+ 	virtual bool NeedExplicitCtor(const Widget &w) const;
+ 	virtual void ConstructionArgs(const Widget &w, CxxFile &f) const;
+ 	virtual void Configure(const Widget &w, CxxFile &f,const std::string &instance) const;
+-	virtual Subwidget Gnome_App::IsSubwidget(const Widget &w,const Widget &ch) const;
++	virtual Subwidget IsSubwidget(const Widget &w,const Widget &ch) const;
+ 	virtual const std::string InternalInstance(const Widget &parent,const Widget &w2) const;
+ 	virtual void AddChildren(const Widget &w,CxxFile &f,const std::string &instance,const WriterBase &writer_for_subw, const Widget &widget_for_subw) const;
+ };
diff --git a/patches/glademm-2.6.0/generic/gettext-param.diff b/patches/glademm-2.6.0/generic/gettext-param.diff
new file mode 100644
index 000000000..5f76b7626
--- /dev/null
+++ b/patches/glademm-2.6.0/generic/gettext-param.diff
@@ -0,0 +1,41 @@
+Subject: add --gettext to enable gettext support
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+  gettext support is usually auto detected. When using --glade-only
+  all autodetection is disabled. This patch allows to manually enable
+  gettext support.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ src/glade--.cc |    5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+Index: b/src/glade--.cc
+===================================================================
+--- a/src/glade--.cc
++++ b/src/glade--.cc
+@@ -94,6 +94,7 @@ const static struct option options[]=
+   { "show-options",	no_argument,	   NULL, SHOW_OPTIONS },
+   { "image-provider",	required_argument, NULL, IMAGE_PROVIDER },
+   { "pkgconfig",	required_argument, NULL, 'p' },
++  { "gettext",		no_argument,	   NULL, 't' },
+   { NULL,		0,		   NULL, 0 }
+ };
+ 
+@@ -404,6 +405,8 @@ int main(int argc,char **argv)
+          break;
+       case 'p': Configuration.pkgconfig_bin=optarg;
+ 	 break;
++      case 't': Configuration.gettext_support=true;
++         break;
+       case 'V': std::cout<< "glademm V"VERSION" (glade to Gtk-- converter)\n";
+          return 0;
+          break;
+@@ -547,7 +550,7 @@ reopen:
+          if (name.substr(name.size()-6,6)==".glade") name=name.substr(0,name.size()-6);
+          t.push_back(Tag("program_name",name));
+          t.push_back(Tag("gnome_support","false"));
+-         t.push_back(Tag("gettext_support","false"));
++         t.push_back(Tag("gettext_support",Configuration.gettext_support ? "true" : "false"));
+          ApplyProject(t);
+       }
+    }
diff --git a/patches/glademm-2.6.0/generic/gwt-support.diff b/patches/glademm-2.6.0/generic/gwt-support.diff
new file mode 100644
index 000000000..17a4bcf7d
--- /dev/null
+++ b/patches/glademm-2.6.0/generic/gwt-support.diff
@@ -0,0 +1,156 @@
+Subject: Add support for gwt
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+  Produce code for all gwt widgets.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ src/writers/Makefile.am   |    1 
+ src/writers/WriterBase.cc |    9 +++--
+ src/writers/WriterBase.hh |    3 +
+ src/writers/gwt.cc        |   80 ++++++++++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 89 insertions(+), 4 deletions(-)
+
+Index: b/src/writers/gwt.cc
+===================================================================
+--- /dev/null
++++ b/src/writers/gwt.cc
+@@ -0,0 +1,80 @@
++// $Id: gwt.cc,v 1.14 2002/05/14 08:25:44 christof Exp $
++/*  glade--: C++ frontend for glade (Gtk+ User Interface Builder)
++ *  Copyright (C) 1998  Christof Petig
++ *  Copyright (C) 1999-2000  Adolf Petig GmbH & Co. KG, written by Christof Petig
++ *
++ *  This program is free software; you can redistribute it and/or modify
++ *  it under the terms of the GNU General Public License as published by
++ *  the Free Software Foundation; either version 2 of the License, or
++ *  (at your option) any later version.
++ *
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ */
++
++#include "drawingarea.hh"
++
++class Gwt_PlotCanvas : public Gtk_DrawingArea
++{public:
++	typedef Gtk_DrawingArea Parent;
++	virtual const std::string TypeName(const Widget &w) const;
++	virtual const std::string IncludeName(const Widget &w) const;
++	Gwt_PlotCanvas();
++	virtual bool NeedExplicitCtor(const Widget &w) const
++	{  return false; }
++	virtual void ConstructionArgs(Widget const &w, CxxFile &f) const
++	{  f.FunctionArg(); }
++};
++
++static Gwt_PlotCanvas Gwt_PlotCanvas;
++
++const std::string Gwt_PlotCanvas::TypeName(const Widget &w) const
++{  return "Gwt::PlotCanvas";
++}
++
++const std::string Gwt_PlotCanvas::IncludeName(const Widget &w) const
++{  return "gwtmm/gwtmm.h";
++}
++
++Gwt_PlotCanvas::Gwt_PlotCanvas()
++{  Writer["GwtPlotCanvas"]=this;
++}
++
++class Gwt_PlotScale : public Gtk_DrawingArea
++{public:
++	typedef Gtk_DrawingArea Parent;
++	virtual const std::string TypeName(const Widget &w) const;
++	virtual const std::string IncludeName(const Widget &w) const;
++	Gwt_PlotScale();
++	virtual void Configure(const Widget &w, CxxFile &f,const std::string &instance) const;
++	virtual bool NeedExplicitCtor(const Widget &w) const
++	{  return false; }
++	virtual void ConstructionArgs(Widget const &w, CxxFile &f) const
++	{  f.FunctionArg(); }
++};
++
++static Gwt_PlotScale Gwt_PlotScale;
++
++const std::string Gwt_PlotScale::TypeName(const Widget &w) const
++{  return "Gwt::PlotScale";
++}
++
++const std::string Gwt_PlotScale::IncludeName(const Widget &w) const
++{  return "gwtmm/gwtmm.h";
++}
++
++Gwt_PlotScale::Gwt_PlotScale()
++{  Writer["GwtPlotScale"]=this;
++}
++
++void Gwt_PlotScale::Configure(const Widget &w, CxxFile &f,const std::string &instance) const
++{  Parent::Configure(w,f,instance);
++   WriteEnumPropertyNS(w,f,instance, "scale_type", false, "type");
++}
++
+Index: b/src/writers/Makefile.am
+===================================================================
+--- a/src/writers/Makefile.am
++++ b/src/writers/Makefile.am
+@@ -25,6 +25,7 @@ noinst_HEADERS = WriterBase.hh adjustmen
+ 	togglebutton.hh toolitem.hh widget.hh window.hh safemap.hh 
+ 
+ libwriters_a_SOURCES = WriterBase.cc WriterBase_matches.cc Class.cc \
++	gwt.cc \
+ 	accellabel.cc \
+ 	accelgroup.cc adjustment.cc alignment.cc arrow.cc \
+ 	aspectframe.cc bbox.cc bonobo_dock.cc bonobo_dockitem.cc \
+Index: b/src/writers/WriterBase.cc
+===================================================================
+--- a/src/writers/WriterBase.cc
++++ b/src/writers/WriterBase.cc
+@@ -322,15 +322,17 @@ void WriterBase::WriteTranslatableProper
+    }
+ }
+ 
+-void WriterBase::WriteEnumPropertyNS(const Widget &w, CxxFile &f, const std::string &instance, const std::string &property, bool only_new)
+-{  if (w.hasProperty(property))
++void WriterBase::WriteEnumPropertyNS(const Widget &w, CxxFile &f, const std::string &instance, const std::string &property,
++	bool only_new, std::string functname)
++{  if (functname.empty()) functname=property;
++   if (w.hasProperty(property))
+    {  f.Statement() << instance;
+       std::string val=Gtkmm2Namespace(w.getProperty(property));
+       if (only_new && GTKMM2)
+       	 f << "property_" << property << "().set_value(" 
+       	 	<< val << ')';
+       else
+-         f << "set_" << property << '(' 
++         f << "set_" << functname << '(' 
+          	<< val << ')';
+    }
+ }
+@@ -436,6 +438,7 @@ std::string WriterBase::Gtkmm2Namespace(
+    std::string res=s;
+    replace_all(res,"GTK_","Gtk::");
+    replace_all(res,"GDK_","Gdk::");
++   replace_all(res,"GWT_","Gwt::");
+    return res;
+ }
+ 
+Index: b/src/writers/WriterBase.hh
+===================================================================
+--- a/src/writers/WriterBase.hh
++++ b/src/writers/WriterBase.hh
+@@ -186,7 +186,8 @@ public: // for new property based code
+ 	static void WriteTranslatableProperty(const Widget &w, CxxFile &f, const std::string &instance, const std::string &property, bool only_new=false);
+ 	static void WriteBoolProperty(const Widget &w, CxxFile &f, const std::string &instance, const std::string &property, 
+ 		bool only_new=false, std::string functname="");
+-	static void WriteEnumPropertyNS(const Widget &w, CxxFile &f, const std::string &instance, const std::string &property, bool only_new=false);
++	static void WriteEnumPropertyNS(const Widget &w, CxxFile &f, const std::string &instance, const std::string &property,
++		bool only_new=false, std::string functname="");
+ 	static void WriteIntProperty(const Widget &w, CxxFile &f, const std::string &instance, const std::string &property, 
+ 		bool only_new=false, std::string functname="");
+ 	static void WriteIntIntProperty(const Widget &w, CxxFile &f, const std::string &instance, 
diff --git a/patches/glademm-2.6.0/generic/series b/patches/glademm-2.6.0/generic/series
new file mode 100644
index 000000000..6f820d836
--- /dev/null
+++ b/patches/glademm-2.6.0/generic/series
@@ -0,0 +1,9 @@
+fix_double_qualification.diff 
+configurable_pkgconfig.diff 
+box_pack_child_with_responseid.diff 
+fix-glade-only.diff
+fix-table-attach.diff
+fix-alignment-writer.diff
+gettext-param.diff
+gwt-support.diff
+autoreconf.diff