svn commit: r481434 - in head/www/qt5-webkit: . files
Tobias C. Berner
tcberner at freebsd.org
Sun Oct 7 11:36:37 UTC 2018
Sorry, this was based on a conflicting ports tree. I'll commit a fix
shortly.
mfg Tobias
On Sun, 7 Oct 2018 at 09:53, Tobias C. Berner <tcberner at freebsd.org> wrote:
> Author: tcberner
> Date: Sun Oct 7 07:53:36 2018
> New Revision: 481434
> URL: https://svnweb.freebsd.org/changeset/ports/481434
>
> Log:
> www/qt5-webkit: fix installed pkg config files
>
> PR: 231108
> Obtained from:
> https://src.mouf.net/area51/view/branches/plasma5/PORTS/www/qt5-webkit-annulen-wk2/files/patch-Source_WebKit_PlatformQt.cmake?rev=13782
>
> Modified:
> head/www/qt5-webkit/Makefile
> head/www/qt5-webkit/files/patch-Source_WebKit_PlatformQt.cmake
>
> Modified: head/www/qt5-webkit/Makefile
>
> ==============================================================================
> --- head/www/qt5-webkit/Makefile Sun Oct 7 07:24:52 2018
> (r481433)
> +++ head/www/qt5-webkit/Makefile Sun Oct 7 07:53:36 2018
> (r481434)
> @@ -2,7 +2,7 @@
>
> PORTNAME= webkit
> DISTVERSION= 5.212.0-alpha2
> -PORTREVISION= 12
> +PORTREVISION= 13
> CATEGORIES= www
> MASTER_SITES=
> https://github.com/annulen/${PORTNAME}/releases/download/${DISTNAME}/
> PKGNAMEPREFIX= qt5-
>
> Modified: head/www/qt5-webkit/files/patch-Source_WebKit_PlatformQt.cmake
>
> ==============================================================================
> --- head/www/qt5-webkit/files/patch-Source_WebKit_PlatformQt.cmake
> Sun Oct 7 07:24:52 2018 (r481433)
> +++ head/www/qt5-webkit/files/patch-Source_WebKit_PlatformQt.cmake
> Sun Oct 7 07:53:36 2018 (r481434)
> @@ -1,18 +1,42 @@
> ---- Source/WebKit/PlatformQt.cmake.orig 2017-06-15 23:36:48 UTC
> +commit 14947c04b3c19b5eb04a683081742b14c1d32786
> +Author: Konstantin Tokarev <annulen at yandex.ru>
> +Date: Sat Oct 7 17:38:32 2017 +0300
> +
> + [cmake] Fix build with CMake 3.10: -frtti was enabled for wrong file
> path
> +
> + Change-Id: I65d4f491f21c17f6d99a14259988d2ddb0d67105
> +
> +--- Source/WebKit/PlatformQt.cmake.orig 2018-10-07 07:18:38 UTC
> +++ Source/WebKit/PlatformQt.cmake
> @@ -481,6 +481,7 @@ if (NOT MACOS_BUILD_FRAMEWORKS)
> BASE_NAME Qt5WebKit
> DEPS "${WEBKIT_PKGCONGIG_DEPS}"
> FILENAME_VAR WebKit_PKGCONFIG_FILENAME
> -+ DESCRIPTION "Qt WebKit module"
> ++ INCLUDE_INSTALL_DIR "${KDE_INSTALL_INCLUDEDIR}/QtWebKit"
> + DESCRIPTION "Qt WebKit module"
> )
> - set(ECM_PKGCONFIG_INSTALL_DIR "${LIB_INSTALL_DIR}/pkgconfig" CACHE
> PATH "The directory where pkgconfig will be installed to.")
> - install(FILES ${WebKit_PKGCONFIG_FILENAME} DESTINATION
> ${ECM_PKGCONFIG_INSTALL_DIR} COMPONENT Data)
> -@@ -671,6 +672,7 @@ if (NOT MACOS_BUILD_FRAMEWORKS)
> + set(ECM_PKGCONFIG_INSTALL_DIR
> "${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig" CACHE PATH "The directory where
> pkgconfig will be installed to.")
> +@@ -672,6 +673,7 @@ if (NOT MACOS_BUILD_FRAMEWORKS)
> BASE_NAME Qt5WebKitWidgets
> DEPS "${WEBKITWIDGETS_PKGCONFIG_DEPS}"
> FILENAME_VAR WebKitWidgets_PKGCONFIG_FILENAME
> -+ DESCRIPTION "Qt WebKitWidgets module"
> ++ INCLUDE_INSTALL_DIR "${KDE_INSTALL_INCLUDEDIR}/QtWebKitWidgets"
> + DESCRIPTION "Qt WebKitWidgets module"
> )
> install(FILES ${WebKitWidgets_PKGCONFIG_FILENAME} DESTINATION
> ${ECM_PKGCONFIG_INSTALL_DIR} COMPONENT Data)
> - endif ()
> +@@ -788,6 +790,7 @@ if (COMPILER_IS_GCC_OR_CLANG)
> + set_source_files_properties(
> + qt/Api/qwebdatabase.cpp
> + qt/Api/qwebelement.cpp
> ++ qt/Api/qwebfullscreenrequest.cpp
> + qt/Api/qwebhistory.cpp
> + qt/Api/qwebhistoryinterface.cpp
> + qt/Api/qwebpluginfactory.cpp
> +@@ -797,7 +800,6 @@ if (COMPILER_IS_GCC_OR_CLANG)
> +
> + qt/WidgetApi/qgraphicswebview.cpp
> + qt/WidgetApi/qwebframe.cpp
> +- qt/WidgetApi/qwebfullscreenrequest.cpp
> + qt/WidgetApi/qwebinspector.cpp
> + qt/WidgetApi/qwebpage.cpp
> + qt/WidgetApi/qwebview.cpp
>
>
More information about the svn-ports-all
mailing list