Changeset 152950 for trunk/dports/www


Ignore:
Timestamp:
Sep 21, 2016, 7:36:24 AM (2 years ago)
Author:
jeremyhu@…
Message:

webkit-gtk-devel: Minor changes to buildfix patches

Location:
trunk/dports/www/webkit2-gtk-devel/files
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/dports/www/webkit2-gtk-devel/files/PR-162261.patch

    r152917 r152950  
    11diff --git a/Source/WebCore/platform/PlatformPasteboard.h b/Source/WebCore/platform/PlatformPasteboard.h
    2 index 695bc0e..529ba13 100644
     2index 695bc0e..1bfdfa4 100644
    33--- Source/WebCore/platform/PlatformPasteboard.h
    44+++ Source/WebCore/platform/PlatformPasteboard.h
    5 @@ -26,6 +26,8 @@
     5@@ -26,6 +26,7 @@
    66 #ifndef PlatformPasteboard_h
    77 #define PlatformPasteboard_h
    88 
    99+#include <functional>
    10 +
    1110 #include <wtf/Forward.h>
    1211 #include <wtf/RefCounted.h>
    1312 #include <wtf/RetainPtr.h>
    1413diff --git a/Source/WebCore/platform/gtk/PasteboardHelper.h b/Source/WebCore/platform/gtk/PasteboardHelper.h
    15 index b15fbef..f98230d 100644
     14index b15fbef..3f3c8da 100644
    1615--- Source/WebCore/platform/gtk/PasteboardHelper.h
    1716+++ Source/WebCore/platform/gtk/PasteboardHelper.h
    18 @@ -25,6 +25,8 @@
    19  #ifndef PasteboardHelper_h
     17@@ -26,6 +26,7 @@
    2018 #define PasteboardHelper_h
    2119 
     20 #include "GRefPtrGtk.h"
    2221+#include <functional>
    23 +
    24  #include "GRefPtrGtk.h"
    2522 #include <wtf/Noncopyable.h>
    2623 #include <wtf/Vector.h>
     24 #include <wtf/glib/GRefPtr.h>

  • trunk/dports/www/webkit2-gtk-devel/files/PR-162302.patch

    r152917 r152950  
    11diff --git a/Source/WebCore/platform/gtk/ScrollbarThemeGtk.cpp b/Source/WebCore/platform/gtk/ScrollbarThemeGtk.cpp
    2 index 4fed6e9..34dfe25 100644
     2index 4fed6e9..c58d835 100644
    33--- Source/WebCore/platform/gtk/ScrollbarThemeGtk.cpp
    44+++ Source/WebCore/platform/gtk/ScrollbarThemeGtk.cpp
    5 @@ -544,12 +544,12 @@ bool ScrollbarThemeGtk::paint(Scrollbar& scrollbar, GraphicsContext& graphicsCon
    6      if (scrollbar.orientation() == VerticalScrollbar) {
    7          if (rect.width() != preferredSize.width()) {
    8              if (!scrollbarOnLeft)
    9 -                contentsRect.move(std::abs(rect.width() - preferredSize.width()), 0);
    10 +                contentsRect.move(std::abs((double)(rect.width() - preferredSize.width())), 0);
    11              contentsRect.setWidth(preferredSize.width());
    12          }
    13      } else {
    14          if (rect.height() != preferredSize.height()) {
    15 -            contentsRect.move(0, std::abs(rect.height() - preferredSize.height()));
    16 +            contentsRect.move(0, std::abs((double)(rect.height() - preferredSize.height())));
    17              contentsRect.setHeight(preferredSize.height());
    18          }
    19      }
     5@@ -33,6 +33,7 @@
     6 #include "RenderThemeGadget.h"
     7 #include "ScrollView.h"
     8 #include "Scrollbar.h"
     9+#include <cstdlib>
     10 #include <gtk/gtk.h>
     11 
     12 namespace WebCore {
Note: See TracChangeset for help on using the changeset viewer.