From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: From: Robert Schwebel Date: Sun, 30 Oct 2011 23:00:56 +0100 Message-Id: <1320012059-24971-25-git-send-email-r.schwebel@pengutronix.de> In-Reply-To: <1320012059-24971-1-git-send-email-r.schwebel@pengutronix.de> References: <20111030220011.GK14918@pengutronix.de> <1320012059-24971-1-git-send-email-r.schwebel@pengutronix.de> Subject: [ptxdist] [PATCH 25/28] glademm: clean up patches Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: ptxdist@pengutronix.de Cc: Robert Schwebel Signed-off-by: Robert Schwebel --- ...take-out-double-qualification-of-function.patch | 26 +++ .../0002-make-pkg-config-binary-configurable.patch | 96 ++++++++++++ ...-box-with-response-id-will-also-get-packe.patch | 30 ++++ patches/glademm-2.6.0/0004-fix-gladeonly.patch | 107 +++++++++++++ .../0005-fix-code-generation-for-Gtk-Table.patch | 52 ++++++ ...006-fix-code-generation-for-Gtk-Alignment.patch | 37 +++++ ...007-add-gettext-to-enable-gettext-support.patch | 43 +++++ .../glademm-2.6.0/0008-Add-support-for-gwt.patch | 163 ++++++++++++++++++++ ...d-namespace-fixes-for-a-stricter-compiler.patch | 83 ++++++++++ .../box_pack_child_with_responseid.diff | 32 ---- patches/glademm-2.6.0/configurable_pkgconfig.diff | 95 ------------ patches/glademm-2.6.0/fix-alignment-writer.diff | 34 ---- patches/glademm-2.6.0/fix-for-new-gcc.diff | 78 ---------- patches/glademm-2.6.0/fix-glade-only.diff | 104 ------------- patches/glademm-2.6.0/fix-table-attach.diff | 49 ------ .../glademm-2.6.0/fix_double_qualification.diff | 24 --- patches/glademm-2.6.0/gettext-param.diff | 41 ----- patches/glademm-2.6.0/gwt-support.diff | 156 ------------------- patches/glademm-2.6.0/series | 9 - 19 files changed, 637 insertions(+), 622 deletions(-) create mode 100644 patches/glademm-2.6.0/0001-take-out-double-qualification-of-function.patch create mode 100644 patches/glademm-2.6.0/0002-make-pkg-config-binary-configurable.patch create mode 100644 patches/glademm-2.6.0/0003-children-of-box-with-response-id-will-also-get-packe.patch create mode 100644 patches/glademm-2.6.0/0004-fix-gladeonly.patch create mode 100644 patches/glademm-2.6.0/0005-fix-code-generation-for-Gtk-Table.patch create mode 100644 patches/glademm-2.6.0/0006-fix-code-generation-for-Gtk-Alignment.patch create mode 100644 patches/glademm-2.6.0/0007-add-gettext-to-enable-gettext-support.patch create mode 100644 patches/glademm-2.6.0/0008-Add-support-for-gwt.patch create mode 100644 patches/glademm-2.6.0/0009-include-and-namespace-fixes-for-a-stricter-compiler.patch delete mode 100644 patches/glademm-2.6.0/box_pack_child_with_responseid.diff delete mode 100644 patches/glademm-2.6.0/configurable_pkgconfig.diff delete mode 100644 patches/glademm-2.6.0/fix-alignment-writer.diff delete mode 100644 patches/glademm-2.6.0/fix-for-new-gcc.diff delete mode 100644 patches/glademm-2.6.0/fix-glade-only.diff delete mode 100644 patches/glademm-2.6.0/fix-table-attach.diff delete mode 100644 patches/glademm-2.6.0/fix_double_qualification.diff delete mode 100644 patches/glademm-2.6.0/gettext-param.diff delete mode 100644 patches/glademm-2.6.0/gwt-support.diff delete mode 100644 patches/glademm-2.6.0/series diff --git a/patches/glademm-2.6.0/0001-take-out-double-qualification-of-function.patch b/patches/glademm-2.6.0/0001-take-out-double-qualification-of-function.patch new file mode 100644 index 0000000..7b9cac4 --- /dev/null +++ b/patches/glademm-2.6.0/0001-take-out-double-qualification-of-function.patch @@ -0,0 +1,26 @@ +From 9eb4ef932422c8c80a3799f161f208dcaad9063e Mon Sep 17 00:00:00 2001 +From: unknown author +Date: Sun, 30 Oct 2011 22:29:02 +0100 +Subject: [PATCH 1/9] take out double qualification of function + +Signed-off-by: n.a. +--- + src/writers/gnome_app.hh | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/writers/gnome_app.hh b/src/writers/gnome_app.hh +index 401e7f9..0c22210 100644 +--- 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; + }; +-- +1.7.7 + diff --git a/patches/glademm-2.6.0/0002-make-pkg-config-binary-configurable.patch b/patches/glademm-2.6.0/0002-make-pkg-config-binary-configurable.patch new file mode 100644 index 0000000..bb052e0 --- /dev/null +++ b/patches/glademm-2.6.0/0002-make-pkg-config-binary-configurable.patch @@ -0,0 +1,96 @@ +From 66799bb9700ec14c2f185015722ab14712e468da Mon Sep 17 00:00:00 2001 +From: unknown author +Date: Sun, 30 Oct 2011 22:29:02 +0100 +Subject: [PATCH 2/9] make pkg-config binary configurable + +Signed-off-by: Luotao Fu +--- + src/Configuration.hh | 1 + + src/glade--.cc | 21 ++++++++++++++++----- + 2 files changed, 17 insertions(+), 5 deletions(-) + +diff --git a/src/Configuration.hh b/src/Configuration.hh +index e6c3698..bd4d5dc 100644 +--- 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/src/glade--.cc b/src/glade--.cc +index 0347d97..662df30 100644 +--- 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::string &cmd, Pkg_Version &v, Pkg_Version::So + { 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::string &cmd, Pkg_Version &v, Pkg_Version::So + // 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; + } +-- +1.7.7 + diff --git a/patches/glademm-2.6.0/0003-children-of-box-with-response-id-will-also-get-packe.patch b/patches/glademm-2.6.0/0003-children-of-box-with-response-id-will-also-get-packe.patch new file mode 100644 index 0000000..1b3bb93 --- /dev/null +++ b/patches/glademm-2.6.0/0003-children-of-box-with-response-id-will-also-get-packe.patch @@ -0,0 +1,30 @@ +From 28490617a4df5f9f65294d0b1f745e536541aa93 Mon Sep 17 00:00:00 2001 +From: unknown author +Date: Sun, 30 Oct 2011 22:29:02 +0100 +Subject: [PATCH 3/9] children of box with response id will also get packed + +Signed-off-by: Luotao Fu +--- + src/writers/box.cc | 6 ++++-- + 1 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/writers/box.cc b/src/writers/box.cc +index e7e070a..b86629b 100644 +--- a/src/writers/box.cc ++++ b/src/writers/box.cc +@@ -55,8 +55,10 @@ void Gtk_Box::AddChild(const Widget &w,CxxFile &f,const std::string &instance) 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); +-- +1.7.7 + diff --git a/patches/glademm-2.6.0/0004-fix-gladeonly.patch b/patches/glademm-2.6.0/0004-fix-gladeonly.patch new file mode 100644 index 0000000..2221bf1 --- /dev/null +++ b/patches/glademm-2.6.0/0004-fix-gladeonly.patch @@ -0,0 +1,107 @@ +From e446a027a0210b0e91cc66c252d53509c63f8b99 Mon Sep 17 00:00:00 2001 +From: "m.olbrich@pengutronix.de" +Date: Sun, 30 Oct 2011 22:29:02 +0100 +Subject: [PATCH 4/9] fix --gladeonly + +Signed-off-by: Michael Olbrich +--- + src/Cxx_Fileset.cc | 6 ++++++ + src/glade--.cc | 15 ++++++++++----- + 2 files changed, 16 insertions(+), 5 deletions(-) + +diff --git a/src/Cxx_Fileset.cc b/src/Cxx_Fileset.cc +index 17d84cd..616c304 100644 +--- a/src/Cxx_Fileset.cc ++++ b/src/Cxx_Fileset.cc +@@ -180,6 +180,8 @@ void Cxx_Fileset::WriteClasses(const Widget &w) + } + + /******* 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 Widget &w) + + DeclareSignalHandler(top_wr,w,w,true); + h.EndBlock(); ++ } + + /****** GC: include, definitions **************/ + +@@ -405,6 +408,8 @@ void Cxx_Fileset::WriteClasses(const Widget &w) + + /****** 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 Widget &w) + } + + DefineSignalHandler(top_wr,w,w); ++ } + + /****** other classes/files ********/ + // recurse +diff --git a/src/glade--.cc b/src/glade--.cc +index 662df30..d13238e 100644 +--- a/src/glade--.cc ++++ b/src/glade--.cc +@@ -160,10 +160,8 @@ static bool CheckVersion(const std::string &cmd, Pkg_Version &v, Pkg_Version::So + 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) +-- +1.7.7 + diff --git a/patches/glademm-2.6.0/0005-fix-code-generation-for-Gtk-Table.patch b/patches/glademm-2.6.0/0005-fix-code-generation-for-Gtk-Table.patch new file mode 100644 index 0000000..7731c2b --- /dev/null +++ b/patches/glademm-2.6.0/0005-fix-code-generation-for-Gtk-Table.patch @@ -0,0 +1,52 @@ +From 96cc93ef8378d21bc94c9bac37646d0b22b4c454 Mon Sep 17 00:00:00 2001 +From: "m.olbrich@pengutronix.de" +Date: Sun, 30 Oct 2011 22:29:02 +0100 +Subject: [PATCH 5/9] fix code generation for Gtk::Table + +Signed-off-by: Michael Olbrich +--- + src/writers/table.cc | 14 +++++++++----- + 1 files changed, 9 insertions(+), 5 deletions(-) + +diff --git a/src/writers/table.cc b/src/writers/table.cc +index 69b530a..5092fc7 100644 +--- 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 ChildParamList& ch, const std::string which) + 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 ChildParamList& ch, const std::string which) + + 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"); +-- +1.7.7 + diff --git a/patches/glademm-2.6.0/0006-fix-code-generation-for-Gtk-Alignment.patch b/patches/glademm-2.6.0/0006-fix-code-generation-for-Gtk-Alignment.patch new file mode 100644 index 0000000..cf793d0 --- /dev/null +++ b/patches/glademm-2.6.0/0006-fix-code-generation-for-Gtk-Alignment.patch @@ -0,0 +1,37 @@ +From 7a5fcdf407570dadaf00f6fed1426d444a60056f Mon Sep 17 00:00:00 2001 +From: "m.olbrich@pengutronix.de" +Date: Sun, 30 Oct 2011 22:29:02 +0100 +Subject: [PATCH 6/9] fix code generation for Gtk::Alignment + +Signed-off-by: Michael Olbrich +--- + src/writers/alignment.cc | 13 ++++--------- + 1 files changed, 4 insertions(+), 9 deletions(-) + +diff --git a/src/writers/alignment.cc b/src/writers/alignment.cc +index 23e68b4..7187767 100644 +--- a/src/writers/alignment.cc ++++ b/src/writers/alignment.cc +@@ -43,15 +43,10 @@ const std::string Gtk_Alignment::IncludeName(const Widget &w) const + + 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() +-- +1.7.7 + diff --git a/patches/glademm-2.6.0/0007-add-gettext-to-enable-gettext-support.patch b/patches/glademm-2.6.0/0007-add-gettext-to-enable-gettext-support.patch new file mode 100644 index 0000000..61f1a5c --- /dev/null +++ b/patches/glademm-2.6.0/0007-add-gettext-to-enable-gettext-support.patch @@ -0,0 +1,43 @@ +From b8bebe8e2ff2e17ef44bf3aee4aa42a7ff055370 Mon Sep 17 00:00:00 2001 +From: "m.olbrich@pengutronix.de" +Date: Sun, 30 Oct 2011 22:29:02 +0100 +Subject: [PATCH 7/9] add --gettext to enable gettext support + +Signed-off-by: Michael Olbrich +--- + src/glade--.cc | 5 ++++- + 1 files changed, 4 insertions(+), 1 deletions(-) + +diff --git a/src/glade--.cc b/src/glade--.cc +index d13238e..70c6608 100644 +--- 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); + } + } +-- +1.7.7 + diff --git a/patches/glademm-2.6.0/0008-Add-support-for-gwt.patch b/patches/glademm-2.6.0/0008-Add-support-for-gwt.patch new file mode 100644 index 0000000..fa8feb2 --- /dev/null +++ b/patches/glademm-2.6.0/0008-Add-support-for-gwt.patch @@ -0,0 +1,163 @@ +From 8e437a16d254386ec29cc2e73800f9c0ad008721 Mon Sep 17 00:00:00 2001 +From: Michael Olbrich Produce code for all gwt widgets + +Date: Sun, 30 Oct 2011 22:29:02 +0100 +Subject: [PATCH 8/9] Add support for gwt + +Signed-off-by: Michael Olbrich +--- + 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(-) + create mode 100644 src/writers/gwt.cc + +diff --git a/src/writers/Makefile.am b/src/writers/Makefile.am +index 94a1b23..9a0bace 100644 +--- a/src/writers/Makefile.am ++++ b/src/writers/Makefile.am +@@ -25,6 +25,7 @@ noinst_HEADERS = WriterBase.hh adjustment.hh bin.hh box.hh button.hh \ + 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 \ +diff --git a/src/writers/WriterBase.cc b/src/writers/WriterBase.cc +index f893d32..a91d4b4 100644 +--- a/src/writers/WriterBase.cc ++++ b/src/writers/WriterBase.cc +@@ -322,15 +322,17 @@ void WriterBase::WriteTranslatableProperty(const Widget &w, CxxFile &f, const st + } + } + +-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(const std::string &s) + std::string res=s; + replace_all(res,"GTK_","Gtk::"); + replace_all(res,"GDK_","Gdk::"); ++ replace_all(res,"GWT_","Gwt::"); + return res; + } + +diff --git a/src/writers/WriterBase.hh b/src/writers/WriterBase.hh +index 8a8c972..5c6f97d 100644 +--- 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/src/writers/gwt.cc b/src/writers/gwt.cc +new file mode 100644 +index 0000000..b622c0c +--- /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"); ++} ++ +-- +1.7.7 + diff --git a/patches/glademm-2.6.0/0009-include-and-namespace-fixes-for-a-stricter-compiler.patch b/patches/glademm-2.6.0/0009-include-and-namespace-fixes-for-a-stricter-compiler.patch new file mode 100644 index 0000000..359f4eb --- /dev/null +++ b/patches/glademm-2.6.0/0009-include-and-namespace-fixes-for-a-stricter-compiler.patch @@ -0,0 +1,83 @@ +From cc0d0fc7de8e70e48709bc08168e28c94fc42bce Mon Sep 17 00:00:00 2001 +From: Michael Olbrich +Date: Sun, 30 Oct 2011 22:29:02 +0100 +Subject: [PATCH 9/9] include and namespace fixes for a stricter compiler + +g++-4.3 is a lot stricter with respect to the C++ standard. +This patch adds various includes that used to be implicit. + +Signed-off-by: Michael Olbrich +--- + src/Tag.hh | 1 + + src/TagStream.cc | 7 ++++--- + src/writers/WriterBase.hh | 1 + + src/writers/xpmname.cc | 1 + + 4 files changed, 7 insertions(+), 3 deletions(-) + +diff --git a/src/Tag.hh b/src/Tag.hh +index 2732a3a..d6fe055 100644 +--- a/src/Tag.hh ++++ b/src/Tag.hh +@@ -23,6 +23,7 @@ + #include + #endif + #include ++#include + #include + #include // for find + #include +diff --git a/src/TagStream.cc b/src/TagStream.cc +index 213ba2d..d220562 100644 +--- a/src/TagStream.cc ++++ b/src/TagStream.cc +@@ -18,9 +18,10 @@ + */ + + #include "TagStream.hh" ++#include + #include ++#include + #include +-#include + + //#define REMEMBER_EMPTY_SPACE + +@@ -73,10 +74,10 @@ std::string TagStream::de_xml(const std::string &cont) + { std::string ret; + std::string::const_iterator i(cont.begin()); + while (i!=cont.end()) +- { std::string::const_iterator verbatim(::find(i,cont.end(),'&')); ++ { std::string::const_iterator verbatim(std::find(i,cont.end(),'&')); + ret+=std::string(i,verbatim); + if (verbatim!=cont.end()) +- { std::string::const_iterator endtag(::find(verbatim,cont.end(),';')); ++ { std::string::const_iterator endtag(std::find(verbatim,cont.end(),';')); + if (endtag!=cont.end()) ++endtag; + std::string tag(verbatim,endtag); + if (tag[1]=='#' && tag[2]=='x') +diff --git a/src/writers/WriterBase.hh b/src/writers/WriterBase.hh +index 5c6f97d..f1d6e7c 100644 +--- a/src/writers/WriterBase.hh ++++ b/src/writers/WriterBase.hh +@@ -22,6 +22,7 @@ + #define WRITER_BASE_HH + #include + #include ++#include + #include "../Enums.hh" + // these are not necessary for all widgets, + // but it's convenient to have them defined +diff --git a/src/writers/xpmname.cc b/src/writers/xpmname.cc +index 626b98e..5c336c2 100644 +--- a/src/writers/xpmname.cc ++++ b/src/writers/xpmname.cc +@@ -1,5 +1,6 @@ + #include + #include ++#include + #include + + // parts taken from +-- +1.7.7 + diff --git a/patches/glademm-2.6.0/box_pack_child_with_responseid.diff b/patches/glademm-2.6.0/box_pack_child_with_responseid.diff deleted file mode 100644 index e937454..0000000 --- a/patches/glademm-2.6.0/box_pack_child_with_responseid.diff +++ /dev/null @@ -1,32 +0,0 @@ -Subject: children of box with response id will also get packed -By: Luotao Fu - 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 ---- - 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/configurable_pkgconfig.diff b/patches/glademm-2.6.0/configurable_pkgconfig.diff deleted file mode 100644 index eeb2d2b..0000000 --- a/patches/glademm-2.6.0/configurable_pkgconfig.diff +++ /dev/null @@ -1,95 +0,0 @@ -Subject: make pkg-config binary configurable -By: Luotao Fu - 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 ---- - 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/fix-alignment-writer.diff b/patches/glademm-2.6.0/fix-alignment-writer.diff deleted file mode 100644 index 0956302..0000000 --- a/patches/glademm-2.6.0/fix-alignment-writer.diff +++ /dev/null @@ -1,34 +0,0 @@ -Subject: fix code generation for Gtk::Alignment -From: Michael Olbrich - Produce correct code even if some properties have the default values and - are not specified in the glade file. - -Signed-off-by: Michael Olbrich ---- - 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/fix-for-new-gcc.diff b/patches/glademm-2.6.0/fix-for-new-gcc.diff deleted file mode 100644 index eca5a37..0000000 --- a/patches/glademm-2.6.0/fix-for-new-gcc.diff +++ /dev/null @@ -1,78 +0,0 @@ -Subject: include and namespace fixes for a stricter compiler -From: Michael Olbrich - -g++-4.3 is a lot stricter with respect to the C++ standard. -This patch adds various includes that used to be implicit. - -Signed-off-by: Michael Olbrich ---- - src/Tag.hh | 1 + - src/TagStream.cc | 7 ++++--- - src/writers/WriterBase.hh | 1 + - src/writers/xpmname.cc | 1 + - 4 files changed, 7 insertions(+), 3 deletions(-) - -Index: b/src/writers/WriterBase.hh -=================================================================== ---- a/src/writers/WriterBase.hh -+++ b/src/writers/WriterBase.hh -@@ -22,6 +22,7 @@ - #define WRITER_BASE_HH - #include - #include -+#include - #include "../Enums.hh" - // these are not necessary for all widgets, - // but it's convenient to have them defined -Index: b/src/Tag.hh -=================================================================== ---- a/src/Tag.hh -+++ b/src/Tag.hh -@@ -23,6 +23,7 @@ - #include - #endif - #include -+#include - #include - #include // for find - #include -Index: b/src/writers/xpmname.cc -=================================================================== ---- a/src/writers/xpmname.cc -+++ b/src/writers/xpmname.cc -@@ -1,5 +1,6 @@ - #include - #include -+#include - #include - - // parts taken from -Index: b/src/TagStream.cc -=================================================================== ---- a/src/TagStream.cc -+++ b/src/TagStream.cc -@@ -18,9 +18,10 @@ - */ - - #include "TagStream.hh" -+#include - #include -+#include - #include --#include - - //#define REMEMBER_EMPTY_SPACE - -@@ -73,10 +74,10 @@ std::string TagStream::de_xml(const std: - { std::string ret; - std::string::const_iterator i(cont.begin()); - while (i!=cont.end()) -- { std::string::const_iterator verbatim(::find(i,cont.end(),'&')); -+ { std::string::const_iterator verbatim(std::find(i,cont.end(),'&')); - ret+=std::string(i,verbatim); - if (verbatim!=cont.end()) -- { std::string::const_iterator endtag(::find(verbatim,cont.end(),';')); -+ { std::string::const_iterator endtag(std::find(verbatim,cont.end(),';')); - if (endtag!=cont.end()) ++endtag; - std::string tag(verbatim,endtag); - if (tag[1]=='#' && tag[2]=='x') diff --git a/patches/glademm-2.6.0/fix-glade-only.diff b/patches/glademm-2.6.0/fix-glade-only.diff deleted file mode 100644 index 6d63a33..0000000 --- a/patches/glademm-2.6.0/fix-glade-only.diff +++ /dev/null @@ -1,104 +0,0 @@ -Subject: fix --gladeonly -From: Michael Olbrich - 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 ---- - 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/fix-table-attach.diff b/patches/glademm-2.6.0/fix-table-attach.diff deleted file mode 100644 index 7564bb3..0000000 --- a/patches/glademm-2.6.0/fix-table-attach.diff +++ /dev/null @@ -1,49 +0,0 @@ -Subject: fix code generation for Gtk::Table -From: Michael Olbrich - Use the correct default values. - Note: this may break old glade files (glade-2 and older). - -Signed-off-by: Michael Olbrich ---- - 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/fix_double_qualification.diff b/patches/glademm-2.6.0/fix_double_qualification.diff deleted file mode 100644 index 3555428..0000000 --- a/patches/glademm-2.6.0/fix_double_qualification.diff +++ /dev/null @@ -1,24 +0,0 @@ -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/gettext-param.diff b/patches/glademm-2.6.0/gettext-param.diff deleted file mode 100644 index 5f76b76..0000000 --- a/patches/glademm-2.6.0/gettext-param.diff +++ /dev/null @@ -1,41 +0,0 @@ -Subject: add --gettext to enable gettext support -From: Michael Olbrich - 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 ---- - 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/gwt-support.diff b/patches/glademm-2.6.0/gwt-support.diff deleted file mode 100644 index 17a4bcf..0000000 --- a/patches/glademm-2.6.0/gwt-support.diff +++ /dev/null @@ -1,156 +0,0 @@ -Subject: Add support for gwt -From: Michael Olbrich - Produce code for all gwt widgets. - -Signed-off-by: Michael Olbrich ---- - 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/series b/patches/glademm-2.6.0/series deleted file mode 100644 index 8334c1b..0000000 --- a/patches/glademm-2.6.0/series +++ /dev/null @@ -1,9 +0,0 @@ -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 -fix-for-new-gcc.diff -- 1.7.7 -- ptxdist mailing list ptxdist@pengutronix.de