Merged r243060 - [WPE] Bump dependencies to wpe-1.0 and wpebackend-fd…

…o-1.0 https://bugs.webkit.org/show_bug.cgi?id=195786 Reviewed by Philippe Normand. .: * Source/cmake/FindWPE.cmake: Check for the wpe-1.0 pkg-config package. Source/WebKit: * wpe/wpe-web-extension.pc.in: Change dependency to wpe-1.0 * wpe/wpe-webkit.pc.in: Ditto. Tools: * flatpak/org.webkit.WPEModules.yaml: Use libwpe 1.1.90 and wpebackend-fdo 1.1.91. * wpe/jhbuild.modules: Ditto.
WebKit · Mar 18, 2019 · bc2d28a · bc2d28a
1 parent a3e70f8
commit bc2d28a
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 12 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,12 @@
+2019-03-18  Adrian Perez de Castro  <aperez@igalia.com>
+
+        [WPE] Bump dependencies to wpe-1.0 and wpebackend-fdo-1.0
+        https://bugs.webkit.org/show_bug.cgi?id=195786
+
+        Reviewed by Philippe Normand.
+
+        * Source/cmake/FindWPE.cmake: Check for the wpe-1.0 pkg-config package.
+
 2019-03-13  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         Unreviewed. Update OptionsGTK.cmake and NEWS for 2.24.0 release

diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2019-03-18  Adrian Perez de Castro  <aperez@igalia.com>
+
+        [WPE] Bump dependencies to wpe-1.0 and wpebackend-fdo-1.0
+        https://bugs.webkit.org/show_bug.cgi?id=195786
+
+        Reviewed by Philippe Normand.
+
+        * wpe/wpe-web-extension.pc.in: Change dependency to wpe-1.0
+        * wpe/wpe-webkit.pc.in: Ditto.
+
 2019-03-13  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         Unreviewed. Update OptionsGTK.cmake and NEWS for 2.24.0 release

diff --git a/Source/WebKit/wpe/wpe-web-extension.pc.in b/Source/WebKit/wpe/wpe-web-extension.pc.in
@@ -7,6 +7,6 @@ Name: WPE WebKit Web process extensions
 Description: Embeddable Web content engine - Web process extensions
 URL: https://wpewebkit.org
 Version: @PROJECT_VERSION@
-Requires: glib-2.0 libsoup-2.4 wpe-0.2
+Requires: glib-2.0 libsoup-2.4 wpe-1.0
 Libs: -L${libdir} -lWPEWebKit-@WPE_API_VERSION@
 Cflags: -I${includedir}/wpe-webkit-@WPE_API_VERSION@
diff --git a/Source/WebKit/wpe/wpe-webkit.pc.in b/Source/WebKit/wpe/wpe-webkit.pc.in
@@ -7,6 +7,6 @@ Name: WPE WebKit
 Description: Embeddable Web content engine
 URL: https://wpewebkit.org
 Version: @PROJECT_VERSION@
-Requires: glib-2.0 libsoup-2.4 wpe-0.2
+Requires: glib-2.0 libsoup-2.4 wpe-1.0
 Libs: -L${libdir} -lWPEWebKit-@WPE_API_VERSION@
 Cflags: -I${includedir}/wpe-webkit-@WPE_API_VERSION@
diff --git a/Source/cmake/FindWPE.cmake b/Source/cmake/FindWPE.cmake
@@ -29,15 +29,15 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 find_package(PkgConfig)
-pkg_check_modules(PC_WPE QUIET wpe-0.2)
+pkg_check_modules(PC_WPE QUIET wpe-1.0)
 
 find_path(WPE_INCLUDE_DIRS
     NAMES wpe/wpe.h
     HINTS ${PC_WPE_INCLUDEDIR} ${PC_WPE_INCLUDE_DIRS}
 )
 
 find_library(WPE_LIBRARIES
-    NAMES wpe-0.2 wpe
+    NAMES wpe-1.0
     HINTS ${PC_WPE_LIBDIR} ${PC_WPE_LIBRARY_DIRS}
 )
 

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
@@ -1,3 +1,13 @@
+2019-03-18  Adrian Perez de Castro  <aperez@igalia.com>
+
+        [WPE] Bump dependencies to wpe-1.0 and wpebackend-fdo-1.0
+        https://bugs.webkit.org/show_bug.cgi?id=195786
+
+        Reviewed by Philippe Normand.
+
+        * flatpak/org.webkit.WPEModules.yaml: Use libwpe 1.1.90 and wpebackend-fdo 1.1.91.
+        * wpe/jhbuild.modules: Ditto.
+
 2019-03-07  Tomas Popela  <tpopela@redhat.com>
 
         [GTK] Make Tools/gtkdoc python3 compatible

diff --git a/Tools/flatpak/org.webkit.WPEModules.yaml b/Tools/flatpak/org.webkit.WPEModules.yaml
@@ -2,11 +2,11 @@
   buildsystem: cmake-ninja
   sources:
     - type: archive
-      url: https://wpewebkit.org/releases/libwpe-1.1.0.tar.xz
-      sha256: 72e34ad754be11abd1a438cfe195d8d644c52105ab2b1c3b39dec6228bc776ce
+      url: https://wpewebkit.org/releases/libwpe-1.1.90.tar.xz
+      sha256: d21dcf83f7e7405e8296c1732d240637d2facdb40e1c9879a1c0f9f222517592
 - name: wpebackend-fdo
   buildsystem: cmake-ninja
   sources:
     - type: archive
-      url: https://wpewebkit.org/releases/wpebackend-fdo-1.1.0.tar.xz
-      sha256: f6c72130d16e50860cb83eb0f6e109c76f1826d2c6bee39025fb3651941761e7
+      url: https://wpewebkit.org/releases/wpebackend-fdo-1.1.91.tar.xz
+      sha256: d20e5688e3e6d9fdf1c3ee083ea14720bf59354aa17f275a003b030e8131315d
diff --git a/Tools/wpe/jhbuild.modules b/Tools/wpe/jhbuild.modules
@@ -192,17 +192,17 @@
   </autotools>
 
   <cmake id="libwpe">
-      <branch repo="wpewebkit" module="libwpe-1.1.0.tar.xz" version="1.1.0"
-              hash="sha256:72e34ad754be11abd1a438cfe195d8d644c52105ab2b1c3b39dec6228bc776ce"/>
+      <branch repo="wpewebkit" module="libwpe-1.1.90.tar.xz" version="1.1.90"
+              hash="sha256:d21dcf83f7e7405e8296c1732d240637d2facdb40e1c9879a1c0f9f222517592"/>
   </cmake>
 
   <cmake id="wpebackend-fdo">
     <dependencies>
       <dep package="libwpe"/>
       <dep package="glib"/>
     </dependencies>
-    <branch repo="wpewebkit" module="wpebackend-fdo-1.1.90.tar.xz" version="1.1.90"
-            hash="sha256:31d9f1ae06968fe752055dde9d5cd7d5fd044c1aec92798bc0491d9a9cef84da"/>
+    <branch repo="wpewebkit" module="wpebackend-fdo-1.1.91.tar.xz" version="1.1.91"
+            hash="sha256:d20e5688e3e6d9fdf1c3ee083ea14720bf59354aa17f275a003b030e8131315d"/>
   </cmake>
 
   <autotools id="libgpg-error" autogen-sh="configure">