From owner-svn-ports-all@freebsd.org Sun Oct 7 11:36:36 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B67F010BF44A; Sun, 7 Oct 2018 11:36:36 +0000 (UTC) (envelope-from tcberner@gmail.com) Received: from mail-qt1-f172.google.com (mail-qt1-f172.google.com [209.85.160.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47AE88151A; Sun, 7 Oct 2018 11:36:36 +0000 (UTC) (envelope-from tcberner@gmail.com) Received: by mail-qt1-f172.google.com with SMTP id d8-v6so18261600qtk.13; Sun, 07 Oct 2018 04:36:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=0zvYBbCdaUUlQbMbLGWkk8XMs6KtVksuTqo9LAVqoEM=; b=neDHNiB9BlRXf463XW1BWM4Eg8GbqRmBT2qvcE9HOqplTzvpKNnHzANiH3rBBiElRG vPyZ5JFoywPIXt4PSMIPIIDN3Ipjzk5jSnpnWBogd8XiVmKJCEVtSeP/t2ACaWzX/e3s zpVANeAWg285BfJEZs4yP+Oj7anYC0GdTDRCU7Jn3hFk0lYsTAuGJeuCD1i4KfGGoCcO nkEpCexn9ZxtC7PXY45kJl//99RnSczJWYrh9+HQ6X/sL2K85IoJ0/GIgJcrT8AuaaNK JwZ7N4Bnx6eDPy4WrQbRDzfBjAzlULQ9EI6IobzMq/aGS1YH52RQmhfyizzgAo1sR4+X pUdg== X-Gm-Message-State: ABuFfoiLt6eitoxTIP13+wo6+hgdxERkesGNbXUjIc5EndBxiWpfrcoC yZazKRTkWZcMmgAJyIvM8g24SNg2ilE= X-Google-Smtp-Source: ACcGV62yt8nenBG07xqTzUXoFs9O5tJCiKdJRUveA1oj/urt5/zbW9X81viFF71rdgc6fvAsoSxFCQ== X-Received: by 2002:a0c:e2c3:: with SMTP id t3-v6mr15625981qvl.109.1538910571090; Sun, 07 Oct 2018 04:09:31 -0700 (PDT) Received: from mail-qt1-f177.google.com (mail-qt1-f177.google.com. [209.85.160.177]) by smtp.gmail.com with ESMTPSA id f184-v6sm6353278qkc.23.2018.10.07.04.09.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 07 Oct 2018 04:09:30 -0700 (PDT) Received: by mail-qt1-f177.google.com with SMTP id d14-v6so9675117qto.4; Sun, 07 Oct 2018 04:09:30 -0700 (PDT) X-Received: by 2002:aed:20f1:: with SMTP id 104-v6mr16067212qtb.81.1538910570660; Sun, 07 Oct 2018 04:09:30 -0700 (PDT) MIME-Version: 1.0 References: <201810070753.w977rakq022587@repo.freebsd.org> In-Reply-To: <201810070753.w977rakq022587@repo.freebsd.org> From: "Tobias C. Berner" Date: Sun, 7 Oct 2018 13:09:18 +0200 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r481434 - in head/www/qt5-webkit: . files To: "Tobias C. Berner" Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.27 X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Oct 2018 11:36:37 -0000 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 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 > +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 > >