Attachment 75882 Details for Bug 50675 – patch to bump versions and remove now-unnecessary conditionals

[patch] patch to bump versions and remove now-unnecessary conditionals

webkit-bump-versions.patch (text/plain), 17.54 KB, created by Dan Winship on 2010-12-08 03:11:10 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Dan Winship

Created: 2010-12-08 03:11:10 PST

Size: 17.54 KB

patch

obsolete

>diff --git a/ChangeLog b/ChangeLog
>index 3276c03..cd5ad6c 100644
>--- a/ChangeLog
>+++ b/ChangeLog
>@@ -1,3 +1,15 @@
>+2010-12-08  Dan Winship  <danw@gnome.org>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        [GTK] Require the latest glib and libsoup, and remove conditional
>+        support for older versions
>+        https://bugs.webkit.org/show_bug.cgi?id=50675
>+
>+        * autotools/webkit.m4: use AM_PATH_GLIB_2_0 rather than doing
>+        basically the same work by hand
>+        * configure.ac:
>+
> 2010-12-07  Patrick Gansterer  <paroga@webkit.org>
> 
>         Reviewed by Andreas Kling.
>diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
>index f9dd043..08e848e 100644
>--- a/WebCore/ChangeLog
>+++ b/WebCore/ChangeLog
>@@ -1,3 +1,23 @@
>+2010-12-08  Dan Winship  <danw@gnome.org>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        [GTK] Remove HAVE_LIBSOUP_2_29_90 conditionals; we depend on
>+        libsoup 2.33.0 now.
>+        https://bugs.webkit.org/show_bug.cgi?id=50675
>+
>+        * platform/network/soup/CookieJarSoup.cpp:
>+        (WebCore::defaultCookieJar):
>+        (WebCore::setCookies):
>+        * platform/network/soup/ResourceHandleSoup.cpp:
>+        (WebCore::ResourceHandle::prepareForURL):
>+        (WebCore::restartedCallback):
>+        (WebCore::startHttp):
>+        * platform/network/soup/ResourceRequestSoup.cpp:
>+        (WebCore::ResourceRequest::updateSoupMessage):
>+        (WebCore::ResourceRequest::toSoupMessage):
>+        (WebCore::ResourceRequest::updateFromSoupMessage):
>+
> 2010-12-08  Dai Mikurube  <dmikurube@google.com>
> 
>         Reviewed by Kent Tamura.
>diff --git a/WebCore/platform/network/soup/CookieJarSoup.cpp b/WebCore/platform/network/soup/CookieJarSoup.cpp
>index ba29622..e2c2f05 100644
>--- a/WebCore/platform/network/soup/CookieJarSoup.cpp
>+++ b/WebCore/platform/network/soup/CookieJarSoup.cpp
>@@ -38,9 +38,7 @@ SoupCookieJar* defaultCookieJar()
>         cookiesInitialized = true;
> 
>         cookieJar = soup_cookie_jar_new();
>-#ifdef HAVE_LIBSOUP_2_29_90
>         soup_cookie_jar_set_accept_policy(cookieJar, SOUP_COOKIE_JAR_ACCEPT_NO_THIRD_PARTY);
>-#endif
>     }
> 
>     return cookieJar;
>@@ -67,18 +65,12 @@ void setCookies(Document* document, const KURL& url, const String& value)
> 
>     GOwnPtr<SoupURI> origin(soup_uri_new(url.string().utf8().data()));
> 
>-#ifdef HAVE_LIBSOUP_2_29_90
>     GOwnPtr<SoupURI> firstParty(soup_uri_new(document->firstPartyForCookies().string().utf8().data()));
> 
>     soup_cookie_jar_set_cookie_with_first_party(jar,
>                                                 origin.get(),
>                                                 firstParty.get(),
>                                                 value.utf8().data());
>-#else
>-    soup_cookie_jar_set_cookie(jar,
>-                               origin.get(),
>-                               value.utf8().data());
>-#endif
> }
> 
> String cookies(const Document* /*document*/, const KURL& url)
>diff --git a/WebCore/platform/network/soup/ResourceHandleSoup.cpp b/WebCore/platform/network/soup/ResourceHandleSoup.cpp
>index 09e1ebe..b587fde 100644
>--- a/WebCore/platform/network/soup/ResourceHandleSoup.cpp
>+++ b/WebCore/platform/network/soup/ResourceHandleSoup.cpp
>@@ -146,12 +146,10 @@ ResourceHandle::~ResourceHandle()
> 
> void ResourceHandle::prepareForURL(const KURL &url)
> {
>-#ifdef HAVE_LIBSOUP_2_29_90
>     GOwnPtr<SoupURI> soupURI(soup_uri_new(url.prettyURL().utf8().data()));
>     if (!soupURI)
>         return;
>     soup_session_prepare_for_uri(ResourceHandle::defaultSession(), soupURI.get());
>-#endif
> }
> 
> // All other kinds of redirections, except for the *304* status code
>@@ -205,14 +203,12 @@ static void restartedCallback(SoupMessage* msg, gpointer data)
>     if (d->m_cancelled)
>         return;
> 
>-#ifdef HAVE_LIBSOUP_2_29_90
>     // Update the first party in case the base URL changed with the redirect
>     String firstPartyString = request.firstPartyForCookies().string();
>     if (!firstPartyString.isEmpty()) {
>         GOwnPtr<SoupURI> firstParty(soup_uri_new(firstPartyString.utf8().data()));
>         soup_message_set_first_party(d->m_soupMessage.get(), firstParty.get());
>     }
>-#endif
> }
> 
> static void gotHeadersCallback(SoupMessage* msg, gpointer data)
>@@ -596,13 +592,11 @@ static bool startHttp(ResourceHandle* handle)
>     g_signal_connect(soupMessage, "got-headers", G_CALLBACK(gotHeadersCallback), handle);
>     d->m_gotChunkHandler = g_signal_connect(soupMessage, "got-chunk", G_CALLBACK(gotChunkCallback), handle);
> 
>-#ifdef HAVE_LIBSOUP_2_29_90
>     String firstPartyString = request.firstPartyForCookies().string();
>     if (!firstPartyString.isEmpty()) {
>         GOwnPtr<SoupURI> firstParty(soup_uri_new(firstPartyString.utf8().data()));
>         soup_message_set_first_party(soupMessage, firstParty.get());
>     }
>-#endif
> 
>     FormData* httpBody = d->m_firstRequest.httpBody();
>     if (httpBody && !httpBody->isEmpty()) {
>diff --git a/WebCore/platform/network/soup/ResourceRequestSoup.cpp b/WebCore/platform/network/soup/ResourceRequestSoup.cpp
>index d46e47b..5016bf1 100644
>--- a/WebCore/platform/network/soup/ResourceRequestSoup.cpp
>+++ b/WebCore/platform/network/soup/ResourceRequestSoup.cpp
>@@ -46,13 +46,11 @@ void ResourceRequest::updateSoupMessage(SoupMessage* soupMessage) const
>             soup_message_headers_append(soupHeaders, it->first.string().utf8().data(), it->second.utf8().data());
>     }
> 
>-#ifdef HAVE_LIBSOUP_2_29_90
>     String firstPartyString = firstPartyForCookies().string();
>     if (!firstPartyString.isEmpty()) {
>         GOwnPtr<SoupURI> firstParty(soup_uri_new(firstPartyString.utf8().data()));
>         soup_message_set_first_party(soupMessage, firstParty.get());
>     }
>-#endif
> 
>     soup_message_set_flags(soupMessage, m_soupFlags);
> }
>@@ -71,13 +69,11 @@ SoupMessage* ResourceRequest::toSoupMessage() const
>             soup_message_headers_append(soupHeaders, it->first.string().utf8().data(), it->second.utf8().data());
>     }
> 
>-#ifdef HAVE_LIBSOUP_2_29_90
>     String firstPartyString = firstPartyForCookies().string();
>     if (!firstPartyString.isEmpty()) {
>         GOwnPtr<SoupURI> firstParty(soup_uri_new(firstPartyString.utf8().data()));
>         soup_message_set_first_party(soupMessage, firstParty.get());
>     }
>-#endif
> 
>     soup_message_set_flags(soupMessage, m_soupFlags);
> 
>@@ -104,11 +100,9 @@ void ResourceRequest::updateFromSoupMessage(SoupMessage* soupMessage)
>     if (soupMessage->request_body->data)
>         m_httpBody = FormData::create(soupMessage->request_body->data, soupMessage->request_body->length);
> 
>-#ifdef HAVE_LIBSOUP_2_29_90
>     SoupURI* firstParty = soup_message_get_first_party(soupMessage);
>     if (firstParty)
>         m_firstPartyForCookies = soupURIToKURL(firstParty);
>-#endif
> 
>     m_soupFlags = soup_message_get_flags(soupMessage);
> 
>diff --git a/WebKit/efl/ChangeLog b/WebKit/efl/ChangeLog
>index cfb2f11..ebd54d6 100644
>--- a/WebKit/efl/ChangeLog
>+++ b/WebKit/efl/ChangeLog
>@@ -1,3 +1,16 @@
>+2010-12-08  Dan Winship  <danw@gnome.org>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        [GTK] Remove HAVE_LIBSOUP_2_29_90 conditionals; we depend on
>+        libsoup 2.33.0 now.
>+        https://bugs.webkit.org/show_bug.cgi?id=50675
>+
>+        * ewk/ewk_cookies.cpp:
>+        (ewk_cookies_file_set):
>+        (ewk_cookies_policy_set):
>+        (ewk_cookies_policy_get):
>+
> 2010-12-03  Alex Bredariol Grilo  <abgrilo@profusion.mobi>
> 
>         Reviewed by Andreas Kling.
>diff --git a/WebKit/efl/ewk/ewk_cookies.cpp b/WebKit/efl/ewk/ewk_cookies.cpp
>index 421f8dc..2564fc7 100644
>--- a/WebKit/efl/ewk/ewk_cookies.cpp
>+++ b/WebKit/efl/ewk/ewk_cookies.cpp
>@@ -57,9 +57,7 @@ EAPI Eina_Bool ewk_cookies_file_set(const char *filename)
>     if (!cookieJar)
>         return EINA_FALSE;
> 
>-#ifdef HAVE_LIBSOUP_2_29_90
>     soup_cookie_jar_set_accept_policy(cookieJar, SOUP_COOKIE_JAR_ACCEPT_NO_THIRD_PARTY);
>-#endif
> 
>     SoupSession* session = WebCore::ResourceHandle::defaultSession();
>     SoupSessionFeature* oldjar = soup_session_get_feature(session, SOUP_TYPE_COOKIE_JAR);
>@@ -187,7 +185,6 @@ EAPI void ewk_cookies_cookie_free(Ewk_Cookie *cookie)
> EAPI void ewk_cookies_policy_set(Ewk_Cookie_Policy p)
> {
> #ifdef WTF_USE_SOUP
>-#ifdef HAVE_LIBSOUP_2_29_90
>     SoupCookieJar* cookieJar = WebCore::defaultCookieJar();
>     SoupCookieJarAcceptPolicy policy;
> 
>@@ -206,7 +203,6 @@ EAPI void ewk_cookies_policy_set(Ewk_Cookie_Policy p)
> 
>     soup_cookie_jar_set_accept_policy(cookieJar, policy);
> #endif
>-#endif
> }
> 
> /*
>@@ -218,7 +214,6 @@ EAPI Ewk_Cookie_Policy ewk_cookies_policy_get()
> {
>     Ewk_Cookie_Policy ewk_policy = EWK_COOKIE_JAR_ACCEPT_ALWAYS;
> #ifdef WTF_USE_SOUP
>-#ifdef HAVE_LIBSOUP_2_29_90
>     SoupCookieJar* cookieJar = WebCore::defaultCookieJar();
>     SoupCookieJarAcceptPolicy policy;
> 
>@@ -235,7 +230,6 @@ EAPI Ewk_Cookie_Policy ewk_cookies_policy_get()
>         break;
>     }
> #endif
>-#endif
> 
>     return ewk_policy;
> }
>diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
>index 9e8acb5..25403c8 100644
>--- a/WebKit/gtk/ChangeLog
>+++ b/WebKit/gtk/ChangeLog
>@@ -1,3 +1,18 @@
>+2010-12-08  Dan Winship  <danw@gnome.org>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        [GTK] Remove HAVE_LIBSOUP_2_29_90 and HAVE_GSETTINGS conditionals;
>+        we depend on glib 2.27.4 and libsoup 2.33.0 now.
>+        https://bugs.webkit.org/show_bug.cgi?id=50675
>+
>+        * GNUmakefile.am:
>+        * WebCoreSupport/InspectorClientGtk.cpp:
>+        (WebKit::InspectorClient::storeSetting):
>+        * webkit/webkitprivate.cpp:
>+        (inspectorGSettings):
>+        * webkit/webkitprivate.h:
>+
> 2010-12-07  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
> 
>         Reviewed by Martin Robinson.
>diff --git a/WebKit/gtk/GNUmakefile.am b/WebKit/gtk/GNUmakefile.am
>index a846f7f..be65841 100644
>--- a/WebKit/gtk/GNUmakefile.am
>+++ b/WebKit/gtk/GNUmakefile.am
>@@ -315,10 +315,8 @@ $(GENSOURCES_WEBKIT)/webkitenumtypes.cpp: $(webkitgtk_h_api) $(WebKit)/GNUmakefi
> 	&& rm -f xgen-gtc
> 
> # GSettings
>-if USE_GSETTINGS
> gsettings_SCHEMAS = $(top_builddir)/WebKit/gtk/org.webkitgtk-@WEBKITGTK_API_VERSION@.gschema.xml
> @GSETTINGS_RULES@
>-endif
> 
> EXTRA_DIST += \
> 	$(WebKit)/ChangeLog \
>diff --git a/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp b/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp
>index 312b8c8..a0e1b94 100644
>--- a/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp
>+++ b/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp
>@@ -112,7 +112,6 @@ void InspectorClient::hideHighlight()
>     gtk_widget_queue_draw(GTK_WIDGET(m_inspectedWebView));
> }
> 
>-#ifdef HAVE_GSETTINGS
> static String toGSettingName(String inspectorSettingName)
> {
>     if (inspectorSettingName == "resourceTrackingEnabled")
>@@ -211,17 +210,6 @@ void InspectorClient::storeSetting(const String& key, const String& value)
> 
>     g_settings_set_value(settings, toGSettingName(key).utf8().data(), variant.get());
> }
>-#else
>-void InspectorClient::populateSetting(const String&, String*)
>-{
>-    notImplemented();
>-}
>-
>-void InspectorClient::storeSetting(const String&, const String&)
>-{
>-    notImplemented();
>-}
>-#endif // HAVE_GSETTINGS
> 
> bool InspectorClient::sendMessageToFrontend(const String& message)
> {
>diff --git a/WebKit/gtk/webkit/webkitprivate.cpp b/WebKit/gtk/webkit/webkitprivate.cpp
>index 52ce896..5064d34 100644
>--- a/WebKit/gtk/webkit/webkitprivate.cpp
>+++ b/WebKit/gtk/webkit/webkitprivate.cpp
>@@ -225,7 +225,6 @@ static void closeIconDatabaseOnExit()
>     iconDatabase()->close();
> }
> 
>-#ifdef HAVE_GSETTINGS
> static bool isSchemaAvailable(const char* schemaID)
> {
>     const char* const* availableSchemas = g_settings_list_schemas();
>@@ -262,7 +261,6 @@ GSettings* inspectorGSettings()
> 
>     return settings;
> }
>-#endif
> 
> void webkit_init()
> {
>diff --git a/WebKit/gtk/webkit/webkitprivate.h b/WebKit/gtk/webkit/webkitprivate.h
>index 0f8d700..0b8de5c 100644
>--- a/WebKit/gtk/webkit/webkitprivate.h
>+++ b/WebKit/gtk/webkit/webkitprivate.h
>@@ -124,9 +124,7 @@ namespace WebKit {
> extern "C" {
>     void webkit_init();
> 
>-#ifdef HAVE_GSETTINGS
>     GSettings* inspectorGSettings();
>-#endif
> 
> #define WEBKIT_PARAM_READABLE ((GParamFlags)(G_PARAM_READABLE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB))
> #define WEBKIT_PARAM_READWRITE ((GParamFlags)(G_PARAM_READWRITE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB))
>diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
>index 9cabc08..a77106e 100644
>--- a/WebKitTools/ChangeLog
>+++ b/WebKitTools/ChangeLog
>@@ -1,3 +1,16 @@
>+2010-12-08  Dan Winship  <danw@gnome.org>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        [GTK] Remove HAVE_LIBSOUP_2_29_90 conditional; we depend on
>+        libsoup 2.33.0 now.
>+        https://bugs.webkit.org/show_bug.cgi?id=50675
>+
>+        * DumpRenderTree/gtk/DumpRenderTree.cpp:
>+        (resetDefaultsToConsistentValues):
>+        * DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
>+        (LayoutTestController::setAlwaysAcceptCookies):
>+
> 2010-12-07  Tony Chang  <tony@chromium.org>
> 
>         Reviewed by Ojan Vafai.
>diff --git a/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
>index 8dfbecd..780877b 100644
>--- a/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
>+++ b/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
>@@ -425,7 +425,6 @@ static void resetDefaultsToConsistentValues()
>     WebKitWebBackForwardList* list = webkit_web_view_get_back_forward_list(webView);
>     webkit_web_back_forward_list_clear(list);
> 
>-#ifdef HAVE_LIBSOUP_2_29_90
>     SoupSession* session = webkit_get_default_session();
>     SoupCookieJar* jar = reinterpret_cast<SoupCookieJar*>(soup_session_get_feature(session, SOUP_TYPE_COOKIE_JAR));
> 
>@@ -433,7 +432,6 @@ static void resetDefaultsToConsistentValues()
>     // HTTP. Should we initialize it earlier, perhaps?
>     if (jar)
>         g_object_set(G_OBJECT(jar), SOUP_COOKIE_JAR_ACCEPT_POLICY, SOUP_COOKIE_JAR_ACCEPT_NO_THIRD_PARTY, NULL);
>-#endif
> 
>     setlocale(LC_ALL, "");
> 
>diff --git a/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp b/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
>index 83874f4..a542589 100644
>--- a/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
>+++ b/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
>@@ -231,7 +231,6 @@ void LayoutTestController::setAcceptsEditing(bool acceptsEditing)
> 
> void LayoutTestController::setAlwaysAcceptCookies(bool alwaysAcceptCookies)
> {
>-#ifdef HAVE_LIBSOUP_2_29_90
>     SoupSession* session = webkit_get_default_session();
>     SoupCookieJar* jar = reinterpret_cast<SoupCookieJar*>(soup_session_get_feature(session, SOUP_TYPE_COOKIE_JAR));
> 
>@@ -252,7 +251,6 @@ void LayoutTestController::setAlwaysAcceptCookies(bool alwaysAcceptCookies)
>         policy = SOUP_COOKIE_JAR_ACCEPT_NO_THIRD_PARTY;
> 
>     g_object_set(G_OBJECT(jar), SOUP_COOKIE_JAR_ACCEPT_POLICY, policy, NULL);
>-#endif
> }
> 
> void LayoutTestController::setCustomPolicyDelegate(bool setDelegate, bool permissive)
>diff --git a/autotools/webkit.m4 b/autotools/webkit.m4
>index 6b44f30..5c8d795 100644
>--- a/autotools/webkit.m4
>+++ b/autotools/webkit.m4
>@@ -108,24 +108,14 @@ AC_DEFUN_ONCE([_WEBKIT_CHECK_GLIB],
> [dnl
> dnl check for glib
> # Version requirements
>-GLIB_REQUIRED_VERSION=2.24
>-GOBJECT_REQUIRED_VERSION=2.0
>-GTHREAD_REQUIRED_VERSION=2.0
>-
>-PKG_CHECK_MODULES([GLIB],
>-                  [glib-2.0 >= $GLIB_REQUIRED_VERSION
>-                  gobject-2.0 >= $GOBJECT_REQUIRED_VERSION
>-                  gthread-2.0 >= $GTHREAD_REQUIRED_VERSION])
>-AC_SUBST([GLIB_CFLAGS])
>-AC_SUBST([GLIB_LIBS])
>-
>-# GTK+ port only
>-# Check for glib-genmarshal and glib-mkenums
>-AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal])
>-AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums])
>+GLIB_REQUIRED_VERSION=2.27.4
>+
>+AM_PATH_GLIB_2_0($GLIB_REQUIRED_VERSION)
> if test -z "$GLIB_GENMARSHAL" || test -z "$GLIB_MKENUMS"; then
>    AC_MSG_ERROR([You need the GLib dev tools in your path])
> fi
>+
>+GLIB_GSETTINGS
> ])
> 
> AC_DEFUN_ONCE([_WEBKIT_CHECK_UNICODE],
>diff --git a/configure.ac b/configure.ac
>index 9e2df40..bdf9281 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -247,7 +247,7 @@ if test "$with_hildon" = "yes"; then
> fi
> 
> # minimum base dependencies
>-LIBSOUP_REQUIRED_VERSION=2.28.2
>+LIBSOUP_REQUIRED_VERSION=2.33.0
> CAIRO_REQUIRED_VERSION=1.6
> FONTCONFIG_REQUIRED_VERSION=2.4
> FREETYPE2_REQUIRED_VERSION=9.0
>@@ -271,16 +271,6 @@ ENCHANT_REQUIRED_VERSION=0.22
> # todo: webcore gtk
> WEBKIT_CHECK_DEPENDENCIES([glib unicode])
> 
>-# Check if we can use GSettings
>-PKG_CHECK_MODULES([GSETTINGS],
>-                  [gio-2.0 >= 2.25.0],
>-                  [have_gsettings=yes],
>-                  [have_gsettings=no])
>-if test "$have_gsettings" = "yes"; then
>-   AC_DEFINE([HAVE_GSETTINGS], 1, [Whether we can use GSettings])
>-   GLIB_GSETTINGS
>-fi
>-
> GETTEXT_PACKAGE=$PACKAGE-$GTK_API_VERSION
> AC_SUBST(GETTEXT_PACKAGE)
> AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",
>@@ -808,15 +798,6 @@ PKG_CHECK_MODULES([LIBSOUP],
> AC_SUBST([LIBSOUP_CFLAGS])
> AC_SUBST([LIBSOUP_LIBS])
> 
>-# check if we can use libSoup 2.29.90 features
>-PKG_CHECK_MODULES([LIBSOUP_2_29_90],
>-                  [libsoup-2.4 >= 2.29.90],
>-                  [have_libsoup_2_29_90=yes],
>-                  [have_libsoup_2_29_90=no])
>-if test "$have_libsoup_2_29_90" = "yes"; then
>-   AC_DEFINE([HAVE_LIBSOUP_2_29_90], 1, [Whether libSoup 2.29.90 features are available])
>-fi
>-
> # check if FreeType/FontConfig are available
> if test "$with_font_backend" = "freetype"; then
>    if test "$with_target" = "directfb"; then
>@@ -918,9 +899,6 @@ AM_CONDITIONAL([USE_GLIB_UNICODE], [test "$with_unicode_backend" = "glib"])
> AM_CONDITIONAL([USE_FREETYPE], [test "$with_font_backend" = "freetype"])
> AM_CONDITIONAL([USE_PANGO], [test "$with_font_backend" = "pango"])
> 
>-# GLib/GIO feature conditionals
>-AM_CONDITIONAL([USE_GSETTINGS], [test "$have_gsettings" = "yes"])
>-
> # GStreamer feature conditional
> AM_CONDITIONAL([USE_GSTREAMER], [test "$have_gstreamer" = "yes"])
>

Actions: View | Formatted Diff | Diff

Attachments on bug 50675: 75882 | 76039 | 80479 | 80497