From df5b7aedb981bee9a7a87ea2ac775a53caa4a444 Mon Sep 17 00:00:00 2001 From: Petar Petrov Date: Tue, 11 Sep 2012 23:42:31 -0500 Subject: office/gbgoffice: Build fixes and miscellaneous cleanups Signed-off-by: Robby Workman --- office/gbgoffice/patches/09_deprecated_SigC.patch | 41 +++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 office/gbgoffice/patches/09_deprecated_SigC.patch (limited to 'office/gbgoffice/patches/09_deprecated_SigC.patch') diff --git a/office/gbgoffice/patches/09_deprecated_SigC.patch b/office/gbgoffice/patches/09_deprecated_SigC.patch new file mode 100644 index 0000000000..3b6151c902 --- /dev/null +++ b/office/gbgoffice/patches/09_deprecated_SigC.patch @@ -0,0 +1,41 @@ +# Description: fix compilation with gcc-4.5 (and corresponding libstdc++) +# Some deprecated typedefs are finaly removed +# Constructors need not be explicitly named +# Author: George Danchev +# Forwarded: no +# Debian-Bug: #564991 +--- a/src/dictgui.cpp ++++ b/src/dictgui.cpp +@@ -63,7 +63,7 @@ DictGui::DictGui(int argc, char **argv, + splash->show_now(); // show splash window NOW + splash->flush_queue(); // needed only once + +- history = new History::History(CONF_WORDS_IN_HISTORY, CONF_MAX_WORD_LEN); ++ history = new History(CONF_WORDS_IN_HISTORY, CONF_MAX_WORD_LEN); + + splash->set_step(0.2); + #endif +--- a/src/dictgui.h ++++ b/src/dictgui.h +@@ -147,8 +147,8 @@ protected: + + Glib::RefPtr tbuf; + +- SigC::Connection con_entry; +- SigC::Connection con_timer; ++ sigc::connection con_entry; ++ sigc::connection con_timer; + + Glib::RefPtr clp; + +--- a/src/workhelper.h ++++ b/src/workhelper.h +@@ -59,7 +59,7 @@ private: + Gtk::TextView textarea; + Gtk::ScrolledWindow scwin; + Gtk::VScrollbar *vs; +- SigC::Connection con_wait; ++ sigc::connection con_wait; + + unsigned int hide_timeout; + unsigned int sizex, sizey; -- cgit v1.2.3