diff options
Diffstat (limited to 'deskutils/gnote/files')
-rw-r--r-- | deskutils/gnote/files/patch-configure | 11 | ||||
-rw-r--r-- | deskutils/gnote/files/patch-libtomboy_tomboyutil.c | 14 | ||||
-rw-r--r-- | deskutils/gnote/files/patch-src_debug.cpp | 11 | ||||
-rw-r--r-- | deskutils/gnote/files/patch-src_noterenamedialog.cpp | 20 | ||||
-rw-r--r-- | deskutils/gnote/files/patch-src_sharp_datetime.cpp | 52 |
5 files changed, 0 insertions, 108 deletions
diff --git a/deskutils/gnote/files/patch-configure b/deskutils/gnote/files/patch-configure deleted file mode 100644 index 5587ef539..000000000 --- a/deskutils/gnote/files/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig 2009-12-07 19:13:21.000000000 -0500 -+++ configure 2009-12-07 19:14:18.000000000 -0500 -@@ -17128,7 +17128,7 @@ fi - if test "x$prefix" = "x$ac_default_prefix"; then - PANELAPPLET_LIBDIR=`$PKG_CONFIG --variable=libdir libpanelapplet-2.0` - fi -- if test "x$PANELAPPLET_LIBDIR" != "x"; then -+ if test "x$PANELAPPLET_LIBDIR" != "x" -a "x$PANELAPPLET_SERVER_DIR" = "x" ; then - PANELAPPLET_SERVER_DIR="$PANELAPPLET_LIBDIR/bonobo/servers" - fi - # Set PANELAPPLET_SERVER_DIR default if it's not already set diff --git a/deskutils/gnote/files/patch-libtomboy_tomboyutil.c b/deskutils/gnote/files/patch-libtomboy_tomboyutil.c deleted file mode 100644 index 2252cd007..000000000 --- a/deskutils/gnote/files/patch-libtomboy_tomboyutil.c +++ /dev/null @@ -1,14 +0,0 @@ ---- libtomboy/tomboyutil.c.orig 2010-03-14 00:35:24.000000000 -0500 -+++ libtomboy/tomboyutil.c 2010-03-14 00:36:19.000000000 -0500 -@@ -153,9 +153,9 @@ tomboy_window_override_user_time (GtkWin - void - tomboy_window_present_hardcore (GtkWindow *window) - { -- if (!GTK_WIDGET_REALIZED (window)) -+ if (!gtk_widget_get_realized (window)) - gtk_widget_realize (GTK_WIDGET (window)); -- else if (GTK_WIDGET_VISIBLE (window)) -+ else if (gtk_widget_get_visible (window)) - tomboy_window_move_to_current_workspace (window); - - tomboy_window_override_user_time (window); diff --git a/deskutils/gnote/files/patch-src_debug.cpp b/deskutils/gnote/files/patch-src_debug.cpp deleted file mode 100644 index 69c81272c..000000000 --- a/deskutils/gnote/files/patch-src_debug.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/debug.cpp.orig 2009-11-25 14:12:33.000000000 +0100 -+++ src/debug.cpp 2009-12-03 17:28:54.000000000 +0100 -@@ -126,7 +126,7 @@ - // static boost::recursive_mutex mutex; - // boost::recursive_mutex::scoped_lock lock(mutex); - char buf[128]; -- snprintf(buf, 128, "(%d) ", (int)pthread_self()); -+ snprintf(buf, 128, "(%ld) ", (pthread_t)pthread_self()); - fwrite(buf, 1, strlen(buf), stderr); - fwrite(prefix, 1, strlen(prefix), stderr); - diff --git a/deskutils/gnote/files/patch-src_noterenamedialog.cpp b/deskutils/gnote/files/patch-src_noterenamedialog.cpp deleted file mode 100644 index 0e7002990..000000000 --- a/deskutils/gnote/files/patch-src_noterenamedialog.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- src/noterenamedialog.cpp.orig 2010-03-14 00:32:43.000000000 -0500 -+++ src/noterenamedialog.cpp 2010-03-14 00:33:46.000000000 -0500 -@@ -63,6 +63,8 @@ private: - Gtk::TreeModelColumn<Note::Ptr> m_column_note; - }; - -+ModelColumnRecord model_column_record; -+ - ModelColumnRecord::ModelColumnRecord() - : Gtk::TreeModelColumnRecord() - , m_column_selected() -@@ -152,7 +154,7 @@ NoteRenameDialog::NoteRenameDialog(const - *renamed_note->get_window(), - false, - false) -- , m_notes_model(Gtk::ListStore::create(ModelColumnRecord())) -+ , m_notes_model(Gtk::ListStore::create(model_column_record)) - , m_dont_rename_button(_("_Don't Rename Links"), true) - , m_rename_button(_("_Rename Links"), true) - , m_select_all_button(_("Select All")) diff --git a/deskutils/gnote/files/patch-src_sharp_datetime.cpp b/deskutils/gnote/files/patch-src_sharp_datetime.cpp deleted file mode 100644 index d2a7601b8..000000000 --- a/deskutils/gnote/files/patch-src_sharp_datetime.cpp +++ /dev/null @@ -1,52 +0,0 @@ ---- src/sharp/datetime.cpp.orig 2009-12-28 12:46:01.000000000 +0100 -+++ src/sharp/datetime.cpp 2010-02-14 15:47:21.000000000 +0100 -@@ -69,28 +69,28 @@ namespace sharp { - int DateTime::day() const - { - struct tm result; -- localtime_r(&m_date.tv_sec, &result); -+ localtime_r((const time_t *)&m_date.tv_sec, &result); - return result.tm_mday; - } - - int DateTime::month() const - { - struct tm result; -- localtime_r(&m_date.tv_sec, &result); -+ localtime_r((const time_t *)&m_date.tv_sec, &result); - return result.tm_mon + 1; - } - - int DateTime::year() const - { - struct tm result; -- localtime_r(&m_date.tv_sec, &result); -+ localtime_r((const time_t *)&m_date.tv_sec, &result); - return result.tm_year + 1900; - } - - int DateTime::day_of_year() const - { - struct tm result; -- localtime_r(&m_date.tv_sec, &result); -+ localtime_r((const time_t *)&m_date.tv_sec, &result); - return result.tm_yday; - } - -@@ -109,14 +109,14 @@ namespace sharp { - std::string DateTime::to_string(const char * format) const - { - struct tm result; -- return _to_string(format, localtime_r(&m_date.tv_sec, &result)); -+ return _to_string(format, localtime_r((const time_t *)&m_date.tv_sec, &result)); - } - - - std::string DateTime::to_short_time_string() const - { - struct tm result; -- return _to_string("%R", localtime_r(&m_date.tv_sec, &result)); -+ return _to_string("%R", localtime_r((const time_t *)&m_date.tv_sec, &result)); - } - - std::string DateTime::to_iso8601() const |