[SCM] qt5webkit packaging branch, master, updated. debian/5.212.0_alpha2-5-8-g0e009e0
Dmitry Shachnev
mitya57 at moszumanska.debian.org
Tue Jan 9 15:33:21 UTC 2018
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt5webkit.git;a=commitdiff;h=ea51ea6
The following commit has been merged in the master branch:
commit ea51ea63891f4f19c888b9be3d947caa22f97224
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date: Tue Jan 9 18:26:59 2018 +0300
Backport upstream changes to add descriptions to pkg-config files.
Closes: #884035.
---
debian/changelog | 2 +
debian/patches/pkgconfig_description.diff | 141 ++++++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 144 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index b0c46b5..4544755 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ qtwebkit-opensource-src (5.212.0~alpha2-6) UNRELEASED; urgency=medium
- Backport upstream patch to use JSVALUE32_64 on x32.
- Use gold linker on x32, to avoid undefined reference error.
* Backport upstream changes to fix build on Alpha (closes: #880640).
+ * Backport upstream changes to add descriptions to pkg-config files
+ (closes: #884035).
[ Pino Toscano ]
* Fix build on hurd-i386:
diff --git a/debian/patches/pkgconfig_description.diff b/debian/patches/pkgconfig_description.diff
new file mode 100644
index 0000000..c715ac8
--- /dev/null
+++ b/debian/patches/pkgconfig_description.diff
@@ -0,0 +1,141 @@
+Description: update ECMGeneratePkgConfigFile to latest version, fill in DESCRIPTION
+Origin: upstream, https://github.com/annulen/webkit/commit/0325d51c4a2a05fb
+Last-Update: 2018-01-09
+
+--- a/Source/WebKit/PlatformQt.cmake
++++ b/Source/WebKit/PlatformQt.cmake
+@@ -479,6 +479,7 @@
+ if (NOT MACOS_BUILD_FRAMEWORKS)
+ ecm_generate_pkgconfig_file(
+ BASE_NAME Qt5WebKit
++ DESCRIPTION "Qt WebKit module"
+ DEPS "${WEBKIT_PKGCONGIG_DEPS}"
+ FILENAME_VAR WebKit_PKGCONFIG_FILENAME
+ )
+@@ -669,6 +670,7 @@
+ if (NOT MACOS_BUILD_FRAMEWORKS)
+ ecm_generate_pkgconfig_file(
+ BASE_NAME Qt5WebKitWidgets
++ DESCRIPTION "Qt WebKitWidgets module"
+ DEPS "${WEBKITWIDGETS_PKGCONFIG_DEPS}"
+ FILENAME_VAR WebKitWidgets_PKGCONFIG_FILENAME
+ )
+--- a/Source/cmake/ECMGeneratePkgConfigFile.cmake
++++ b/Source/cmake/ECMGeneratePkgConfigFile.cmake
+@@ -16,6 +16,7 @@
+ # [INCLUDE_INSTALL_DIR <dir>]
+ # [LIB_INSTALL_DIR <dir>]
+ # [DEFINES -D<variable=value>...]
++# [DESCRIPTION <library description>]
+ # [INSTALL])
+ #
+ # ``BASE_NAME`` is the name of the module. It's the name projects will use to
+@@ -42,6 +43,10 @@
+ # ``DEFINES`` is a list of preprocessor defines that it is recommended users of
+ # the library pass to the compiler when using it.
+ #
++# ``DESCRIPTION`` describes what this library is. If it's not specified, CMake
++# will first try to get the description from the metainfo.yaml file or will
++# create one based on ``LIB_NAME``.
++#
+ # ``INSTALL`` will cause the module to be installed to the ``pkgconfig``
+ # subdirectory of ``LIB_INSTALL_DIR``, unless the ``ECM_PKGCONFIG_INSTALL_DIR``
+ # cache variable is set to something different. Note that the first call to
+@@ -66,24 +71,39 @@
+ # )
+ #
+ # Since 1.3.0.
++# ``DESCRIPTION`` available since 5.1.41
++#
+
+ #=============================================================================
+ # Copyright 2014 Aleix Pol Gonzalez <aleixpol at kde.org>
+ # Copyright 2014 David Faure <faure at kde.org>
+ #
+-# Distributed under the OSI-approved BSD License (the "License");
+-# see accompanying file COPYING-CMAKE-SCRIPTS for details.
+-#
+-# This software is distributed WITHOUT ANY WARRANTY; without even the
+-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+-# See the License for more information.
+-#=============================================================================
+-# (To distribute this file outside of extra-cmake-modules, substitute the full
+-# License text for the above reference.)
++# Redistribution and use in source and binary forms, with or without
++# modification, are permitted provided that the following conditions
++# are met:
++#
++# 1. Redistributions of source code must retain the copyright
++# notice, this list of conditions and the following disclaimer.
++# 2. Redistributions in binary form must reproduce the copyright
++# notice, this list of conditions and the following disclaimer in the
++# documentation and/or other materials provided with the distribution.
++# 3. The name of the author may not be used to endorse or promote products
++# derived from this software without specific prior written permission.
++#
++# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
++# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
++# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
++# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
++# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
++# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
++# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
++# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
++# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
++# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ function(ECM_GENERATE_PKGCONFIG_FILE)
+ set(options INSTALL)
+- set(oneValueArgs BASE_NAME LIB_NAME FILENAME_VAR INCLUDE_INSTALL_DIR LIB_INSTALL_DIR)
++ set(oneValueArgs BASE_NAME LIB_NAME FILENAME_VAR INCLUDE_INSTALL_DIR LIB_INSTALL_DIR DESCRIPTION)
+ set(multiValueArgs DEPS DEFINES)
+
+ cmake_parse_arguments(EGPF "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+@@ -119,6 +139,17 @@
+ set(EGPF_LIB_INSTALL_DIR "lib")
+ endif()
+ endif()
++ if(NOT EGPF_DESCRIPTION)
++ if(EXISTS ${CMAKE_SOURCE_DIR}/metainfo.yaml)
++ file(STRINGS "${CMAKE_SOURCE_DIR}/metainfo.yaml" _EGPF_METAINFO_DESCRIPTION_STRING REGEX "^description:.*$")
++ if(_EGPF_METAINFO_DESCRIPTION_STRING)
++ string(REGEX REPLACE "^description:[ ]*(.*)" "\1" EGPF_DESCRIPTION ${_EGPF_METAINFO_DESCRIPTION_STRING})
++ endif()
++ endif()
++ if("${EGPF_DESCRIPTION}" STREQUAL "")
++ set(EGPF_DESCRIPTION "${EGPF_LIB_NAME} library.")
++ endif()
++ endif()
+
+ set(PKGCONFIG_TARGET_BASENAME ${EGPF_BASE_NAME})
+ set(PKGCONFIG_TARGET_LIBNAME ${EGPF_LIB_NAME})
+@@ -135,6 +166,7 @@
+ else()
+ set(PKGCONFIG_TARGET_LIBS "${CMAKE_INSTALL_PREFIX}/${EGPF_LIB_INSTALL_DIR}")
+ endif()
++ set(PKGCONFIG_TARGET_DESCRIPTION "${EGPF_DESCRIPTION}")
+ set(PKGCONFIG_TARGET_DEFINES "")
+ if(EGPF_DEFINES)
+ set(PKGCONFIG_TARGET_DEFINES "${EGPF_DEFINE}")
+@@ -148,6 +180,7 @@
+ file(WRITE ${PKGCONFIG_FILENAME}
+ "
+ Name: ${PKGCONFIG_TARGET_LIBNAME}
++Description: ${PKGCONFIG_TARGET_DESCRIPTION}
+ Version: ${PROJECT_VERSION}
+ Libs: -L${CMAKE_INSTALL_PREFIX}/${EGPF_LIB_INSTALL_DIR} -l${PKGCONFIG_TARGET_LIBNAME}
+ Cflags: ${PKGCONFIG_TARGET_INCLUDES} ${PKGCONFIG_TARGET_DEFINES}
+@@ -156,8 +189,11 @@
+ )
+
+ if(EGPF_INSTALL)
+- set(ECM_PKGCONFIG_INSTALL_DIR "${EGPF_LIB_INSTALL_DIR}/pkgconfig" CACHE PATH "The directory where pkgconfig will be installed to.")
++ if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
++ set(ECM_PKGCONFIG_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig" CACHE PATH "The directory where pkgconfig will be installed to.")
++ else()
++ set(ECM_PKGCONFIG_INSTALL_DIR "${EGPF_LIB_INSTALL_DIR}/pkgconfig" CACHE PATH "The directory where pkgconfig will be installed to.")
++ endif()
+ install(FILES ${PKGCONFIG_FILENAME} DESTINATION ${ECM_PKGCONFIG_INSTALL_DIR})
+ endif()
+ endfunction()
+-
diff --git a/debian/patches/series b/debian/patches/series
index 8ce2fe8..a5c41f9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ fix_selectedHtml_segfault.diff
fix_ftbfs_x32.diff
path_max.diff
fix_ftbfs_alpha.diff
+pkgconfig_description.diff
--
qt5webkit packaging
More information about the pkg-kde-commits
mailing list