diff options
| -rw-r--r-- | office/gbgoffice/06_const-chars.patch | 289 | ||||
| -rw-r--r-- | office/gbgoffice/07_gcc4.3.patch | 14 | ||||
| -rw-r--r-- | office/gbgoffice/08_fix_const_conversion.patch | 17 | ||||
| -rw-r--r-- | office/gbgoffice/09_deprecated_SigC.patch | 41 | ||||
| -rw-r--r-- | office/gbgoffice/10_workhelper-buttonbox.patch | 16 |
5 files changed, 0 insertions, 377 deletions
diff --git a/office/gbgoffice/06_const-chars.patch b/office/gbgoffice/06_const-chars.patch deleted file mode 100644 index 419a9ff4ae..0000000000 --- a/office/gbgoffice/06_const-chars.patch +++ /dev/null @@ -1,289 +0,0 @@ -# Author: Damyan Ivanov <dmn@debian.org> -# Description: declare inline strings as constants -# Modern GCC (rightfully) complain otherwise ---- a/src/language_tools.h -+++ b/src/language_tools.h -@@ -27,19 +27,19 @@ - #define LT_(x) true == lang ? Glib::convert(x[1], "UTF-8", "CP1251"): x[0] - - --static char *HELP_MESSAGE[] = { -+static const char *HELP_MESSAGE[] = { - "Type a word (bulgarian or english) in entry box above", - "Напишете дума (на български или английски) в полето по-горе" - }; - - --static char *WELLCOME_MESSAGE[] = { -+static const char *WELLCOME_MESSAGE[] = { - "Wellcome to GTK BG Office!", - "Добре дошли в GTK БГ Офис. Приятно използване!" - }; - - --static char *ABOUT_MESSAGE[] = { -+static const char *ABOUT_MESSAGE[] = { - "GTK BG Office assistant - version 1.4 \n" - "Official webpage - http://gbgoffice.info\n\n" - "(C) 2004-2006 Miroslav Yordanov <mironcho@linux-bg.org>\n" -@@ -52,7 +52,7 @@ static char *ABOUT_MESSAGE[] = { - }; - - --static char *CONFIG_ERROR[] = { -+static const char *CONFIG_ERROR[] = { - "The configuration could not be initialized\n" - "This is fatal error and gbgoffice now will exit!", - -@@ -61,7 +61,7 @@ static char *CONFIG_ERROR[] = { - }; - - --static char *ERROR_INIT_TRAYICON[] = { -+static const char *ERROR_INIT_TRAYICON[] = { - "Error initializing trayicon module.\n" - "This is fatal error and gbgoffice now will exit!", - -@@ -70,7 +70,7 @@ static char *ERROR_INIT_TRAYICON[] = { - }; - - --static char *DATA_MISSING[] = { -+static const char *DATA_MISSING[] = { - "Dicionary files are missing.\n" - "Please check that you have installed them\n" - "and if they are missing, visit\n" -@@ -86,7 +86,7 @@ static char *DATA_MISSING[] = { - }; - - --static char *DATA_MISSING_FEDORA[] = { -+static const char *DATA_MISSING_FEDORA[] = { - "Dicionary files are missing.\n" - "Please check that you have installed them\n" - "and if they are missing, please use the supplied \n" -@@ -105,190 +105,190 @@ static char *DATA_MISSING_FEDORA[] = { - - - --static char *GUI_CURRENT_DICT[] = { -+static const char *GUI_CURRENT_DICT[] = { - "Current dictionary - ", - "Текущ речник - " - }; - - --static char *GUI_NEXT_WORDS[] = { -+static const char *GUI_NEXT_WORDS[] = { - "next words", - "следващи думи" - }; - - --static char *GUI_MENU_FILE[] = { -+static const char *GUI_MENU_FILE[] = { - "_File", - "_Файл" - }; - - --static char *GUI_MENU_EDIT[] = { -+static const char *GUI_MENU_EDIT[] = { - "_Edit", - "Р_едактиране" - }; - - --static char *GUI_MENU_DICTS[] = { -+static const char *GUI_MENU_DICTS[] = { - "_Dictionaries", - "_Речници" - }; - - --static char *GUI_MENU_SETTINGS[] = { -+static const char *GUI_MENU_SETTINGS[] = { - "_Settings", - "_Настройки" - }; - - --static char *GUI_MENU_HELP[] = { -+static const char *GUI_MENU_HELP[] = { - "_Help", - "_Помощ" - }; - - --static char *GUI_VIEW_HISTORY[] = { -+static const char *GUI_VIEW_HISTORY[] = { - "View history", - "Показва историята" - }; - - --static char *GUI_PREFS_NUM_WORDS[] = { -+static const char *GUI_PREFS_NUM_WORDS[] = { - " Number of words in list", - " Брой думи в списъка" - }; - - --static char *GUI_PREFS_USE_CLIPBOARD[] = { -+static const char *GUI_PREFS_USE_CLIPBOARD[] = { - " Watch clipboard for new words", - " Наблюдавай клипборда за нови думи" - }; - - --static char *GUI_PREFS_TAB_GENERAL[] = { -+static const char *GUI_PREFS_TAB_GENERAL[] = { - "General", - "Основни" - }; - - --static char *GUI_PREFS_TAB_TRAY[] = { -+static const char *GUI_PREFS_TAB_TRAY[] = { - "Trayicon", - "Trayicon" - }; - - --static char *GUI_PREFS_TAB_TRAY_HELP[] = { -+static const char *GUI_PREFS_TAB_TRAY_HELP[] = { - "<b>You must restart gbgoffice \nbefore these settings take effect</b>", - "<b>Трябва да рестартирате gbgoffice \nза да влязат в сила тези настройки</b>" - }; - - --static char *GUI_PREFS_USE_TRAYICON[] = { -+static const char *GUI_PREFS_USE_TRAYICON[] = { - " Use trayicon", - " Използва trayicon" - }; - - --static char *GUI_PREFS_USE_TRAYICON_CLOSE[] = { -+static const char *GUI_PREFS_USE_TRAYICON_CLOSE[] = { - " Closing main window,\n quits application", - " Затварянето на основния прозорец,\n спира програмата" - }; - --static char *GUI_PREFS_TRAYICON_HIDE_ON_START[] = { -+static const char *GUI_PREFS_TRAYICON_HIDE_ON_START[] = { - " Hide main window on startup", - " Скрива основния прозорец при стартиране" - }; - - --static char *GUI_PREFS_USE_WH[] = { -+static const char *GUI_PREFS_USE_WH[] = { - " Use helper", - " Използва помощника" - }; - - --static char *GUI_PREFS_WH_SECONDS[] = { -+static const char *GUI_PREFS_WH_SECONDS[] = { - " time for showing helper\n (in seconds)", - " време за показване на помощника\n (в секунди)" - }; - - --static char *GUI_EXAM_MENU[] = { -+static const char *GUI_EXAM_MENU[] = { - "Make a test", - "Проверка на знанията" - }; - - --static char *GUI_EXAM_CORRECT[] = { -+static const char *GUI_EXAM_CORRECT[] = { - "correct", - "правилно" - }; - --static char *GUI_EXAM_INCORRECT[] = { -+static const char *GUI_EXAM_INCORRECT[] = { - "incorrect", - "грешно" - }; - --static char *GUI_EXAM_NEWTEST[] = { -+static const char *GUI_EXAM_NEWTEST[] = { - "Press button \"New\" for new test.", - "Натиснете бутона \"Нов\" за нов тест." - }; - --static char *GUI_EXAM_NEW_LEVEL1[] = { -+static const char *GUI_EXAM_NEW_LEVEL1[] = { - "Novice", - "Начално" - }; - --static char *GUI_EXAM_NEW_LEVEL2[] = { -+static const char *GUI_EXAM_NEW_LEVEL2[] = { - "Beginner", - "Лесно" - }; - --static char *GUI_EXAM_NEW_LEVEL3[] = { -+static const char *GUI_EXAM_NEW_LEVEL3[] = { - "Intermediate", - "Средно" - }; - --static char *GUI_EXAM_NEW_LEVEL4[] = { -+static const char *GUI_EXAM_NEW_LEVEL4[] = { - "Specialist", - "Трудно" - }; - --static char *GUI_EXAM_NEW_LEVEL5[] = { -+static const char *GUI_EXAM_NEW_LEVEL5[] = { - "Expert", - "Експертно" - }; - --static char *GUI_EXAM_TRANSLATION[] = { -+static const char *GUI_EXAM_TRANSLATION[] = { - "Translation: ", - "Превод: " - }; - --static char *GUI_EXAM_DIFFICULTY[] = { -+static const char *GUI_EXAM_DIFFICULTY[] = { - "Difficulty: ", - "Ниво: " - }; - --static char *GUI_EXAM_NUMTEST[] = { -+static const char *GUI_EXAM_NUMTEST[] = { - "Test (0 = random): ", - "Тест (0 = произволен): " - }; - --static char *GUI_EXAM_NUMQUEST[] = { -+static const char *GUI_EXAM_NUMQUEST[] = { - "Num of questions: ", - "Брой въпроси: " - }; - --static char *GUI_EXAM_ENDOFTEST[] = { -+static const char *GUI_EXAM_ENDOFTEST[] = { - "End of test.", - "Край на теста." - }; - --static char *GUI_EXAM_TESTNOTSTARTED[] = { -+static const char *GUI_EXAM_TESTNOTSTARTED[] = { - "Test not started.", - "Не е започнат тест." - }; - --static char *GUI_EXAM_CORRECT_ANSWERS[] = { -+static const char *GUI_EXAM_CORRECT_ANSWERS[] = { - "correct", - "правилни" - }; diff --git a/office/gbgoffice/07_gcc4.3.patch b/office/gbgoffice/07_gcc4.3.patch deleted file mode 100644 index 8b620cd623..0000000000 --- a/office/gbgoffice/07_gcc4.3.patch +++ /dev/null @@ -1,14 +0,0 @@ -# Author: Damyan Ivanov <dmn@debian.org> -# Description: include the right header file -# GCC 4.3 has stricter rules about inclusion propagation ---- a/src/translator_manager.cpp -+++ b/src/translator_manager.cpp -@@ -22,7 +22,7 @@ - - #include <sys/types.h> - #include <dirent.h> --#include <string> -+#include <cstring> - #include <iostream> - #include <algorithm> - diff --git a/office/gbgoffice/08_fix_const_conversion.patch b/office/gbgoffice/08_fix_const_conversion.patch deleted file mode 100644 index 0aa6c54fcf..0000000000 --- a/office/gbgoffice/08_fix_const_conversion.patch +++ /dev/null @@ -1,17 +0,0 @@ -# Description: Since a constant is passed into strchr(), pu must also be const -# to keep the compiler from generating an error. -# Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gbgoffice/+bug/445624 -# Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=550115 -# ---- a/src/translator.cpp -+++ b/src/translator.cpp -@@ -315,7 +315,8 @@ bool Translator::findWord(const char *wo - - char *Translator::transformResult(const char *result) { - int j, i, m, n, u; -- char *b, *pu; -+ const char *pu; -+ char *b; - char c; - strcpy(dataBuffer2, result); - if ((advancedSearchState) && (advancedSearchHighlight)) { diff --git a/office/gbgoffice/09_deprecated_SigC.patch b/office/gbgoffice/09_deprecated_SigC.patch deleted file mode 100644 index 3b6151c902..0000000000 --- a/office/gbgoffice/09_deprecated_SigC.patch +++ /dev/null @@ -1,41 +0,0 @@ -# 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 <danchev@debian.org> -# 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<Gtk::TextBuffer> tbuf; - -- SigC::Connection con_entry; -- SigC::Connection con_timer; -+ sigc::connection con_entry; -+ sigc::connection con_timer; - - Glib::RefPtr<Gtk::Clipboard> 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; diff --git a/office/gbgoffice/10_workhelper-buttonbox.patch b/office/gbgoffice/10_workhelper-buttonbox.patch deleted file mode 100644 index d8d77a8dee..0000000000 --- a/office/gbgoffice/10_workhelper-buttonbox.patch +++ /dev/null @@ -1,16 +0,0 @@ -# Description: fix hba declaration to match get_action_area return type -# Gtk::Dialog 2.18 now defines this as a generic ButtonBox -# Forwarded: no -# Bug-Debian: 577371 -# Author: Damyan Ivanov <dmn@debian.org> ---- a/src/workhelper.cpp -+++ b/src/workhelper.cpp -@@ -39,7 +39,7 @@ WorkHelper::WorkHelper() - //set_resize_mode(Gtk::RESIZE_PARENT); - set_reallocate_redraws(true); - -- Gtk::HButtonBox *hba = get_action_area(); -+ Gtk::ButtonBox *hba = get_action_area(); - - add_events(Gdk::ENTER_NOTIFY_MASK | Gdk::LEAVE_NOTIFY_MASK); - |