diff options
author | 2016-08-22 12:33:54 +0200 | |
---|---|---|
committer | 2016-08-22 12:35:45 +0200 | |
commit | 118429a6c54e30db5a3dcd5279bb402560e6db75 (patch) | |
tree | 16c6781b8e14a30ea58973b74b25e7016cb7a10f /www-client/midori/files | |
parent | sys-kernel/hardened-sources: version bump to 4.7.2, remove 4.7.1 (diff) | |
download | gentoo-118429a6c54e30db5a3dcd5279bb402560e6db75.tar.gz gentoo-118429a6c54e30db5a3dcd5279bb402560e6db75.tar.bz2 gentoo-118429a6c54e30db5a3dcd5279bb402560e6db75.zip |
www-client/midori: Don't require libsoup-gnome (#587448 by whitehawk), don't rely on obsolete and vulnerable webkit-gtk versions (#584188), doesn't need vala-0.30 (#583296 by Oleg)
Package-Manager: portage-2.3.0
Diffstat (limited to 'www-client/midori/files')
-rw-r--r-- | www-client/midori/files/midori-0.5.11-libsoup.patch | 73 |
1 files changed, 73 insertions, 0 deletions
diff --git a/www-client/midori/files/midori-0.5.11-libsoup.patch b/www-client/midori/files/midori-0.5.11-libsoup.patch new file mode 100644 index 000000000000..b560075f8106 --- /dev/null +++ b/www-client/midori/files/midori-0.5.11-libsoup.patch @@ -0,0 +1,73 @@ +diff -ur midori-0.5.11/CMakeLists.txt midori-0.5.11_p/CMakeLists.txt +--- midori-0.5.11/CMakeLists.txt 2015-08-30 13:56:26.000000000 +0200 ++++ midori-0.5.11_p/CMakeLists.txt 2016-08-21 21:10:30.117983251 +0200 +@@ -112,13 +112,13 @@ + sqlite3>=3.6.19 + gmodule-2.0 + gio-2.0>=2.32.3 +- libsoup-gnome-2.4>=2.37.1 ++ libsoup-2.4>=2.37.1 + ) + add_definitions("-DHAVE_LIBXML") + add_definitions("-DGIO_VERSION=\"${DEPS_gio-2.0_VERSION}\"") +-add_definitions("-DLIBSOUP_VERSION=\"${DEPS_libsoup-gnome-2.4_VERSION}\"") ++add_definitions("-DLIBSOUP_VERSION=\"${DEPS_libsoup-2.4_VERSION}\"") + set(PKGS posix linux libxml-2.0 sqlite3 gmodule-2.0 gio-2.0 libsoup-2.4) +-if (${DEPS_libsoup-gnome-2.4_VERSION} VERSION_GREATER "2.40.0") ++if (${DEPS_libsoup-2.4_VERSION} VERSION_GREATER "2.40.0") + # valac 0.16 didn't have the bindings yet + # For consistency we need to ensure C code makes the same assumptions + if (${VALA_VERSION} VERSION_GREATER "0.17.0") +@@ -126,7 +126,7 @@ + set(VALAFLAGS ${VALAFLAGS} -D HAVE_LIBSOUP_2_40_0) + endif () + endif () +-if (${DEPS_libsoup-gnome-2.4_VERSION} VERSION_GREATER "2.48.0") ++if (${DEPS_libsoup-2.4_VERSION} VERSION_GREATER "2.48.0") + add_definitions("-DHAVE_LIBSOUP_2_48_0") + set(VALAFLAGS ${VALAFLAGS} -D HAVE_LIBSOUP_2_48_0) + endif () +diff -ur midori-0.5.11/extensions/cookie-manager/cookie-manager.c midori-0.5.11_p/extensions/cookie-manager/cookie-manager.c +--- midori-0.5.11/extensions/cookie-manager/cookie-manager.c 2015-08-30 13:56:26.000000000 +0200 ++++ midori-0.5.11_p/extensions/cookie-manager/cookie-manager.c 2016-08-19 23:19:20.000000000 +0200 +@@ -12,7 +12,7 @@ + #include "config.h" + #include <midori/midori.h> + #include "katze/katze.h" +-#include <libsoup/soup-cookie-jar-sqlite.h> ++#include <libsoup/soup-cookie-jar-db.h> + + #include "cookie-manager.h" + #include "cookie-manager-page.h" +@@ -282,7 +282,7 @@ + /* setup soup */ + #ifdef HAVE_WEBKIT2 + gchar *filename = midori_paths_get_config_filename_for_writing ("cookies.db"); +- priv->jar = soup_cookie_jar_sqlite_new (filename, FALSE); ++ priv->jar = soup_cookie_jar_db_new (filename, FALSE); + g_free(filename); + #else + SoupSession *session = webkit_get_default_session(); +diff -ur midori-0.5.11/midori/midori-session.c midori-0.5.11_p/midori/midori-session.c +--- midori-0.5.11/midori/midori-session.c 2015-08-30 13:56:26.000000000 +0200 ++++ midori-0.5.11_p/midori/midori-session.c 2016-08-19 23:56:30.000000000 +0200 +@@ -17,8 +17,8 @@ + #include "sokoke.h" + + #include <glib/gi18n-lib.h> +-#include <libsoup/soup-cookie-jar-sqlite.h> +-#include <libsoup/soup-gnome-features.h> ++#include <libsoup/soup-cookie-jar-db.h> ++#include <libsoup/soup-types.h> + + #define LIBSOUP_USE_UNSTABLE_REQUEST_API + #include <libsoup/soup-cache.h> +@@ -297,7 +297,7 @@ + g_object_unref (feature); + + katze_assign (config_file, midori_paths_get_config_filename_for_writing ("cookies.db")); +- jar = soup_cookie_jar_sqlite_new (config_file, FALSE); ++ jar = soup_cookie_jar_db_new (config_file, FALSE); + soup_session_add_feature (session, SOUP_SESSION_FEATURE (jar)); + g_signal_connect (jar, "changed", + G_CALLBACK (midori_session_cookie_jar_changed_cb), settings); |