pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

webkit-gtk4: fix .pc file to point to gtk4



Module Name:	pkgsrc-wip
Committed By:	Dan Cîrnaț <dan%alt.md@localhost>
Pushed By:	cirnatdan
Date:		Sat Nov 21 17:35:12 2020 +0100
Changeset:	d833884b9d372f6115c4424e5963c3da996e06d9

Modified Files:
	webkit-gtk4/distinfo
	webkit-gtk4/patches/patch-Source_WebKit_PlatformGTK.cmake

Log Message:
webkit-gtk4: fix .pc file to point to gtk4

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=d833884b9d372f6115c4424e5963c3da996e06d9

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 webkit-gtk4/distinfo                               |  4 +--
 .../patches/patch-Source_WebKit_PlatformGTK.cmake  | 36 ++++++++++++++++++++++
 2 files changed, 38 insertions(+), 2 deletions(-)

diffs:
diff --git a/webkit-gtk4/distinfo b/webkit-gtk4/distinfo
index f668fd814b..34a879f829 100644
--- a/webkit-gtk4/distinfo
+++ b/webkit-gtk4/distinfo
@@ -39,10 +39,10 @@ SHA1 (patch-Source_WebCore_rendering_RenderLayerBacking.h) = ecf722df1d1cca13573
 SHA1 (patch-Source_WebCore_rendering_shapes_RasterShape.cpp) = 551e47698dee50d097b11e3218f13bb3447edfea
 SHA1 (patch-Source_WebKit_CMakeLists.txt) = 228cc4734de3b08a3877ac839b1ffa2fbf2d3aa8
 SHA1 (patch-Source_WebKit_NetworkProcess_cache_NetworkCacheFileSystem.cpp) = 14dfbee895aa7c70bf3b61b4dbb5bccd96d9583a
-SHA1 (patch-Source_WebKit_PlatformGTK.cmake) = c174093c51755e3d4f189e397d3d96e09abf9388
+SHA1 (patch-Source_WebKit_PlatformGTK.cmake) = 43ea4056503707b9945c00f35cd82f9927b62af4
 SHA1 (patch-Source_WebKit_Platform_IPC_ArgumentCoders.h) = d994b7e780b8fce57431d07a0a7f6b8e2d729871
 SHA1 (patch-Source_WebKit_Platform_IPC_unix_ConnectionUnix.cpp) = 35b62538d09af8725202673a2a23d814f624f8bd
-SHA1 (patch-Source_WebKit_Platform_SharedMemory.h) = 6ec52cc7d4842219d88b083b60d00e3d6a44bc91
+SHA1 (patch-Source_WebKit_Platform_SharedMemory.h) = cd63416b36321d1ac977caf7f24171cd93e86fc2
 SHA1 (patch-Source_WebKit_Platform_classifier_ResourceLoadStatisticsClassifier.cpp) = 920376ec8697780637f376b2fff312b7e214a7f6
 SHA1 (patch-Source_WebKit_Scripts_check-xcfilelists.sh) = 22cc5ba1ababc6395aa0ef467db0c27c2fbf6878
 SHA1 (patch-Source_WebKit_Scripts_generate-unified-sources.sh) = def930cf3f706ac657b2f8835c8c0278ade8f663
diff --git a/webkit-gtk4/patches/patch-Source_WebKit_PlatformGTK.cmake b/webkit-gtk4/patches/patch-Source_WebKit_PlatformGTK.cmake
index 01e8b61796..a181dfe945 100644
--- a/webkit-gtk4/patches/patch-Source_WebKit_PlatformGTK.cmake
+++ b/webkit-gtk4/patches/patch-Source_WebKit_PlatformGTK.cmake
@@ -25,3 +25,39 @@ SunOS ld does not support --version-script.
  if (LIBNOTIFY_FOUND)
      list(APPEND WebKit_PRIVATE_LIBRARIES
          ${LIBNOTIFY_LIBRARIES}
+@@ -660,7 +665,7 @@ if (ENABLE_INTROSPECTION)
+             --namespace=WebKit2
+             --nsversion=${WEBKITGTK_API_VERSION}
+             --include=GObject-2.0
+-            --include=Gtk-3.0
++            --include=Gtk-4.0
+             --include=Soup-2.4
+             --include-uninstalled=${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
+             --library=webkit2gtk-${WEBKITGTK_API_VERSION}
+@@ -669,7 +674,7 @@ if (ENABLE_INTROSPECTION)
+             ${INTROSPECTION_ADDITIONAL_LINKER_FLAGS}
+             --no-libtool
+             --pkg=gobject-2.0
+-            --pkg=gtk+-3.0
++            --pkg=gtk4
+             --pkg=libsoup-2.4
+             --pkg-export=webkit2gtk-${WEBKITGTK_API_VERSION}
+             --output=${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
+@@ -706,7 +711,7 @@ if (ENABLE_INTROSPECTION)
+             --namespace=WebKit2WebExtension
+             --nsversion=${WEBKITGTK_API_VERSION}
+             --include=GObject-2.0
+-            --include=Gtk-3.0
++            --include=Gtk-4.0
+             --include=Soup-2.4
+             --include-uninstalled=${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
+             --library=webkit2gtk-${WEBKITGTK_API_VERSION}
+@@ -716,7 +721,7 @@ if (ENABLE_INTROSPECTION)
+             ${INTROSPECTION_ADDITIONAL_LINKER_FLAGS}
+             --no-libtool
+             --pkg=gobject-2.0
+-            --pkg=gtk+-3.0
++            --pkg=gtk4
+             --pkg=libsoup-2.4
+             --pkg-export=webkit2gtk-web-extension-${WEBKITGTK_API_VERSION}
+             --output=${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir


Home | Main Index | Thread Index | Old Index