Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
SUSE:SLE-12-SP5:Update
webkit2gtk3.31974
webkit2gtk3-glib244.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File webkit2gtk3-glib244.patch of Package webkit2gtk3.31974
diff -urpN webkitgtk-2.41.91.glib254/Source/cmake/FindGI.cmake webkitgtk-2.41.91.glib244/Source/cmake/FindGI.cmake --- webkitgtk-2.41.91.glib254/Source/cmake/FindGI.cmake 2023-08-09 03:49:52.616536900 -0500 +++ webkitgtk-2.41.91.glib244/Source/cmake/FindGI.cmake 2023-09-04 12:40:23.107637695 -0500 @@ -334,6 +334,13 @@ function(GI_INTROSPECT namespace nsversi # Generate .gir set(target_def "$<TARGET_PROPERTY:${opt_TARGET},COMPILE_DEFINITIONS>") set(target_inc "$<TARGET_PROPERTY:${opt_TARGET},INTERFACE_INCLUDE_DIRECTORIES>") + set(PREV_LOADER_LIBRARY_PATH "$ENV{LD_LIBRARY_PATH}") + string(COMPARE EQUAL "${PREV_LOADER_LIBRARY_PATH}" "" ld_library_path_does_not_exist) + if (ld_library_path_does_not_exist) + set(INTROSPECTION_ADDITIONAL_LIBRARY_PATH "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}") + else () + set(INTROSPECTION_ADDITIONAL_LIBRARY_PATH "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}:${PREV_LOADER_LIBRARY_PATH}") + endif () add_custom_command( OUTPUT "${gir_path}" COMMENT "Generating ${gir_name}.gir" @@ -342,6 +349,7 @@ function(GI_INTROSPECT namespace nsversi VERBATIM COMMAND_EXPAND_LISTS COMMAND ${CMAKE_COMMAND} -E env "CC=${CMAKE_C_COMPILER}" "CFLAGS=${CMAKE_C_FLAGS}" + "LD_LIBRARY_PATH=${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" "${GI_SCANNER_EXE}" --quiet --warn-all --warn-error --no-libtool "--output=${gir_path}" "--library=$<TARGET_FILE_BASE_NAME:${opt_TARGET}>" diff -urpN webkitgtk-2.41.91.glib254/Source/cmake/OptionsGTK.cmake webkitgtk-2.41.91.glib244/Source/cmake/OptionsGTK.cmake --- webkitgtk-2.41.91.glib254/Source/cmake/OptionsGTK.cmake 2023-09-04 12:40:11.677577034 -0500 +++ webkitgtk-2.41.91.glib244/Source/cmake/OptionsGTK.cmake 2023-09-04 12:40:23.110971047 -0500 @@ -216,7 +216,7 @@ endif () if (ENABLE_2022_GLIB_API) set(GLIB_MINIMUM_VERSION 2.70.0) else () - set(GLIB_MINIMUM_VERSION 2.54.3) + set(GLIB_MINIMUM_VERSION 2.48.2) endif () find_package(GLIB ${GLIB_MINIMUM_VERSION} REQUIRED COMPONENTS gio gio-unix gobject gthread gmodule) diff -urpN webkitgtk-2.41.91.glib254/Source/WebKit/InspectorGResources.cmake webkitgtk-2.41.91.glib244/Source/WebKit/InspectorGResources.cmake --- webkitgtk-2.41.91.glib254/Source/WebKit/InspectorGResources.cmake 2023-08-09 03:49:47.876387800 -0500 +++ webkitgtk-2.41.91.glib244/Source/WebKit/InspectorGResources.cmake 2023-09-04 12:42:25.958289959 -0500 @@ -12,7 +12,7 @@ macro(WEBKIT_BUILD_INSPECTOR_GRESOURCES OUTPUT ${_derived_sources_dir}/InspectorGResourceBundle.c ${_derived_sources_dir}/InspectorGResourceBundle.deps DEPENDS ${_derived_sources_dir}/InspectorGResourceBundle.xml DEPFILE ${_derived_sources_dir}/InspectorGResourceBundle.deps - COMMAND glib-compile-resources --generate --sourcedir=${_derived_sources_dir}/InspectorResources/WebInspectorUI --target=${_derived_sources_dir}/InspectorGResourceBundle.c --dependency-file=${_derived_sources_dir}/InspectorGResourceBundle.deps ${_derived_sources_dir}/InspectorGResourceBundle.xml + COMMAND glib-compile-resources --generate --sourcedir=${_derived_sources_dir}/InspectorResources/WebInspectorUI --target=${_derived_sources_dir}/InspectorGResourceBundle.c ${_derived_sources_dir}/InspectorGResourceBundle.xml VERBATIM ) endmacro() diff -urpN webkitgtk-2.41.91.glib254/Source/WebKit/ModernMediaControlsGResources.cmake webkitgtk-2.41.91.glib244/Source/WebKit/ModernMediaControlsGResources.cmake --- webkitgtk-2.41.91.glib254/Source/WebKit/ModernMediaControlsGResources.cmake 2023-08-09 03:49:47.876387800 -0500 +++ webkitgtk-2.41.91.glib244/Source/WebKit/ModernMediaControlsGResources.cmake 2023-09-04 12:42:54.741776116 -0500 @@ -11,7 +11,7 @@ macro(WEBKIT_BUILD_MODERN_MEDIA_CONTROLS OUTPUT ${_derived_sources_dir}/ModernMediaControlsGResourceBundle.c ${_derived_sources_dir}/ModernMediaControlsGResourceBundle.deps DEPENDS ${_derived_sources_dir}/ModernMediaControlsGResourceBundle.xml DEPFILE ${_derived_sources_dir}/ModernMediaControlsGResourceBundle.deps - COMMAND glib-compile-resources --generate --sourcedir=${WEBCORE_DIR}/Modules/modern-media-controls/images/adwaita --target=${_derived_sources_dir}/ModernMediaControlsGResourceBundle.c --dependency-file=${_derived_sources_dir}/ModernMediaControlsGResourceBundle.deps ${_derived_sources_dir}/ModernMediaControlsGResourceBundle.xml + COMMAND glib-compile-resources --generate --sourcedir=${WEBCORE_DIR}/Modules/modern-media-controls/images/adwaita --target=${_derived_sources_dir}/ModernMediaControlsGResourceBundle.c ${_derived_sources_dir}/ModernMediaControlsGResourceBundle.xml VERBATIM ) endmacro() diff -urpN webkitgtk-2.41.91.glib254/Source/WebKit/PdfJSGResources.cmake webkitgtk-2.41.91.glib244/Source/WebKit/PdfJSGResources.cmake --- webkitgtk-2.41.91.glib254/Source/WebKit/PdfJSGResources.cmake 2023-08-09 03:49:48.084394500 -0500 +++ webkitgtk-2.41.91.glib244/Source/WebKit/PdfJSGResources.cmake 2023-09-05 15:31:03.200653928 -0500 @@ -14,7 +14,7 @@ macro(WEBKIT_BUILD_PDFJS_GRESOURCES _der OUTPUT ${_derived_sources_dir}/PdfJSGResourceBundle.c ${_derived_sources_dir}/PdfJSGResourceBundle.deps DEPENDS ${_derived_sources_dir}/PdfJSGResourceBundle.xml DEPFILE ${_derived_sources_dir}/PdfJSGResourceBundle.deps - COMMAND glib-compile-resources --generate --sourcedir=${THIRDPARTY_DIR}/pdfjs --target=${_derived_sources_dir}/PdfJSGResourceBundle.c --dependency-file=${_derived_sources_dir}/PdfJSGResourceBundle.deps ${_derived_sources_dir}/PdfJSGResourceBundle.xml + COMMAND glib-compile-resources --generate --sourcedir=${THIRDPARTY_DIR}/pdfjs --target=${_derived_sources_dir}/PdfJSGResourceBundle.c ${_derived_sources_dir}/PdfJSGResourceBundle.xml VERBATIM ) @@ -30,7 +30,7 @@ macro(WEBKIT_BUILD_PDFJS_GRESOURCES _der OUTPUT ${_derived_sources_dir}/PdfJSGResourceBundleExtras.c ${_derived_sources_dir}/PdfJSGResourceBundleExtras.deps DEPENDS ${_derived_sources_dir}/PdfJSGResourceBundleExtras.xml DEPFILE ${_derived_sources_dir}/PdfJSGResourceBundleExtras.deps - COMMAND glib-compile-resources --generate --sourcedir=${WEBCORE_DIR}/Modules/pdfjs-extras --target=${_derived_sources_dir}/PdfJSGResourceBundleExtras.c --dependency-file=${_derived_sources_dir}/PdfJSGResourceBundleExtras.deps ${_derived_sources_dir}/PdfJSGResourceBundleExtras.xml + COMMAND glib-compile-resources --generate --sourcedir=${WEBCORE_DIR}/Modules/pdfjs-extras --target=${_derived_sources_dir}/PdfJSGResourceBundleExtras.c ${_derived_sources_dir}/PdfJSGResourceBundleExtras.xml VERBATIM ) endmacro() diff -urpN webkitgtk-2.41.91.glib254/Source/WebKit/PlatformGTK.cmake webkitgtk-2.41.91.glib244/Source/WebKit/PlatformGTK.cmake --- webkitgtk-2.41.91.glib254/Source/WebKit/PlatformGTK.cmake 2023-09-04 12:14:19.396002985 -0500 +++ webkitgtk-2.41.91.glib244/Source/WebKit/PlatformGTK.cmake 2023-09-04 12:40:23.114304398 -0500 @@ -458,7 +458,7 @@ add_custom_command( OUTPUT ${WebKitGTK_DERIVED_SOURCES_DIR}/WebKitResourcesGResourceBundle.c ${WebKitGTK_DERIVED_SOURCES_DIR}/WebKitResourcesGResourceBundle.deps DEPENDS ${WebKitGTK_DERIVED_SOURCES_DIR}/WebKitResourcesGResourceBundle.xml DEPFILE ${WebKitGTK_DERIVED_SOURCES_DIR}/WebKitResourcesGResourceBundle.deps - COMMAND glib-compile-resources --generate --sourcedir=${CMAKE_SOURCE_DIR}/Source/WebCore/Resources --sourcedir=${CMAKE_SOURCE_DIR}/Source/WebCore/platform/audio/resources --sourcedir=${CMAKE_SOURCE_DIR}/Source/WebKit/Resources/gtk --target=${WebKitGTK_DERIVED_SOURCES_DIR}/WebKitResourcesGResourceBundle.c --dependency-file=${WebKitGTK_DERIVED_SOURCES_DIR}/WebKitResourcesGResourceBundle.deps ${WebKitGTK_DERIVED_SOURCES_DIR}/WebKitResourcesGResourceBundle.xml + COMMAND glib-compile-resources --generate --sourcedir=${CMAKE_SOURCE_DIR}/Source/WebCore/Resources --sourcedir=${CMAKE_SOURCE_DIR}/Source/WebCore/platform/audio/resources --sourcedir=${CMAKE_SOURCE_DIR}/Source/WebKit/Resources/gtk --target=${WebKitGTK_DERIVED_SOURCES_DIR}/WebKitResourcesGResourceBundle.c ${WebKitGTK_DERIVED_SOURCES_DIR}/WebKitResourcesGResourceBundle.xml VERBATIM ) diff -urpN webkitgtk-2.41.91.glib254/Tools/glib/generate-modern-media-controls-gresource-manifest.py webkitgtk-2.41.91.glib244/Tools/glib/generate-modern-media-controls-gresource-manifest.py --- webkitgtk-2.41.91.glib254/Tools/glib/generate-modern-media-controls-gresource-manifest.py 2023-08-09 03:49:55.136616200 -0500 +++ webkitgtk-2.41.91.glib244/Tools/glib/generate-modern-media-controls-gresource-manifest.py 2023-09-04 12:40:23.114304398 -0500 @@ -54,7 +54,7 @@ if __name__ == "__main__": extra_attributes = "" if extension == "svg": extra_attributes = 'preprocess="xml-stripblanks"' - args.output.write(f'{indent}<file compressed="true" {extra_attributes} alias="{alias}">{path}</file>\n') + args.output.write(indent + '<file compressed="true" ' + extra_attributes + ' alias="' + alias + '">' + path + '</file>\n') args.output.write(""" </gresource> </gresources>
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
