diff options
| author | Robby Workman <rw@rlworkman.net> | 2010-05-13 00:38:52 +0200 |
|---|---|---|
| committer | Michiel van Wessem <michiel@slackbuilds.org> | 2010-05-13 00:38:52 +0200 |
| commit | 3320e21a95b586a02c484a3545cd28132e7d1199 (patch) | |
| tree | 7851d0eea1b471d7400f0a27a7f0173fefbc6415 /office/abiword/patches | |
| parent | 4f9f68bc7df2a473fc694ab3e36618f53be78770 (diff) | |
| download | slackbuilds-3320e21a95b586a02c484a3545cd28132e7d1199.tar.gz | |
office/abiword: Updated for version 2.8.2
Diffstat (limited to 'office/abiword/patches')
| -rw-r--r-- | office/abiword/patches/boost_asio.patch | 42 | ||||
| -rw-r--r-- | office/abiword/patches/url_show.patch | 50 |
2 files changed, 92 insertions, 0 deletions
diff --git a/office/abiword/patches/boost_asio.patch b/office/abiword/patches/boost_asio.patch new file mode 100644 index 0000000000..0632f8ff79 --- /dev/null +++ b/office/abiword/patches/boost_asio.patch @@ -0,0 +1,42 @@ +--- abiword-2.8.1/asio.hpp 1969-12-31 16:00:00.000000000 -0800 ++++ abiword-2.8.1/asio.hpp 2009-10-31 19:01:58.977141321 -0700 +@@ -0,0 +1,10 @@ ++#include <boost/asio.hpp> ++#include <boost/thread.hpp> ++ ++namespace asio ++{ ++ using namespace boost::asio; ++ using boost::system::error_code; ++ using boost::system::system_error; ++ using boost::thread; ++} +--- abiword-2.8.1/configure 2009-10-30 23:30:30.761312681 -0700 ++++ abiword-2.8.1/configure 2009-10-31 19:18:16.581095503 -0700 +@@ -22662,7 +22662,7 @@ + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + +-for ac_header in asio.hpp ++for ac_header in boost/asio.hpp + do + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +@@ -22834,7 +22834,7 @@ + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + +-for ac_header in asio.hpp ++for ac_header in boost/asio.hpp + do + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +@@ -23838,7 +23838,7 @@ + + if test "$enable_collab_backend_tcp" == "yes" || \ + test "$enable_collab_backend_service" == "yes"; then +- COLLAB_LIBS="$COLLAB_LIBS -lgcrypt -lpthread" ++ COLLAB_LIBS="$COLLAB_LIBS -lgcrypt -lpthread -lboost_system-mt -lboost_thread-mt" + fi + + test "$enable_collab" == "auto" && PLUGINS="$PLUGINS collab" diff --git a/office/abiword/patches/url_show.patch b/office/abiword/patches/url_show.patch new file mode 100644 index 0000000000..78e4b17ce9 --- /dev/null +++ b/office/abiword/patches/url_show.patch @@ -0,0 +1,50 @@ +--- abiword-2.8.1/src/af/util/xp/ut_go_file.cpp 2009-10-30 23:30:24.005096842 -0700 ++++ abiword-2.8.1/src/af/util/xp/ut_go_file.cpp 2009-10-31 09:32:24.028095222 -0700 +@@ -1665,12 +1665,17 @@ + #else + GError *err = NULL; + #ifdef HAVE_GTK214 +- gtk_show_uri (NULL, url, GDK_CURRENT_TIME, &err); +- return err; +-#elif defined(WITH_GNOMEVFS) +- gnome_vfs_url_show (url); +- return err; +-#else ++ if(gtk_show_uri (NULL, url, GDK_CURRENT_TIME, &err)) ++ { ++ return err; ++ } ++#endif ++#if defined(WITH_GNOMEVFS) ++ if(gnome_vfs_url_show (url)) ++ { ++ return err; ++ } ++#endif + gchar *browser = NULL; + gchar *clean_url = NULL; + +@@ -1679,6 +1684,7 @@ + + if (browser == NULL) { + static char const * const browsers[] = { ++ "xdg-open", /* freedesktop.org */ + "sensible-browser", /* debian */ + "epiphany", /* primary gnome */ + "galeon", /* secondary gnome */ +@@ -1688,6 +1694,7 @@ + "mozilla", + "netscape", + "konqueror", ++ "dillo", + "xterm -e w3m", + "xterm -e lynx", + "xterm -e links" +@@ -1735,7 +1742,6 @@ + g_free (clean_url); + return err; + #endif +-#endif + } + + /** |