diff --git a/kde/frameworks/extra-cmake-modules/extra-cmake-modules.py b/kde/frameworks/extra-cmake-modules/extra-cmake-modules.py index 44410757..0f5d5b8f 100644 --- a/kde/frameworks/extra-cmake-modules/extra-cmake-modules.py +++ b/kde/frameworks/extra-cmake-modules/extra-cmake-modules.py @@ -1,57 +1,58 @@ # -*- coding: utf-8 -*- # Copyright Hannah von Reth # # 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 above copyright # notice, this list of conditions and the following disclaimer. # 2. Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. # # THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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 REGENTS OR CONTRIBUTORS 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. import info class subinfo(info.infoclass): def setTargets(self): self.versionInfo.setDefaultValues() for ver in self.versionInfo.tarballs() + self.versionInfo.branches() + self.versionInfo.tags(): ecmVer = CraftVersion(ver) if ecmVer <= CraftVersion("5.48.0"): self.patchLevel[ver] = 3 self.patchToApply[ver] = ('icotool.diff', 1) self.patchToApply["5.54.0"] = [("extra-cmake-modules-5.54.0-20190126.diff", 1)] - self.patchToApply["5.55.0"] = [("extra-cmake-modules-5.54.0-20190126.diff", 1)] + self.patchToApply["5.55.0"] = [("extra-cmake-modules-5.54.0-20190126.diff", 1), + ("pkgconfig-fix.diff", 1)] self.patchLevel["5.54.0"] = 1 self.tags = "ECM" def setDependencies(self): self.runtimeDependencies["virtual/base"] = None self.buildDependencies["dev-utils/icoutils"] = None # needed for many kf5's self.buildDependencies["dev-utils/flexbison"] = None if CraftCore.settings.getboolean("CMake", "KDE_L10N_AUTO_TRANSLATIONS", False): self.buildDependencies["dev-utils/ruby"] = None from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__(self): CMakePackageBase.__init__(self) diff --git a/kde/frameworks/extra-cmake-modules/pkgconfig-fix.diff b/kde/frameworks/extra-cmake-modules/pkgconfig-fix.diff new file mode 100644 index 00000000..2b835b57 --- /dev/null +++ b/kde/frameworks/extra-cmake-modules/pkgconfig-fix.diff @@ -0,0 +1,34 @@ +diff --git i/modules/ECMGeneratePkgConfigFile.cmake w/modules/ECMGeneratePkgConfigFile.cmake +index 7657216..51c2119 100644 +--- i/modules/ECMGeneratePkgConfigFile.cmake ++++ w/modules/ECMGeneratePkgConfigFile.cmake +@@ -156,9 +156,9 @@ function(ECM_GENERATE_PKGCONFIG_FILE) + string(REPLACE ";" " " PKGCONFIG_TARGET_DEPS "${EGPF_DEPS}") + endif () + if(IS_ABSOLUTE "${EGPF_INCLUDE_INSTALL_DIR}") +- set(PKGCONFIG_TARGET_INCLUDES "-I${EGPF_INCLUDE_INSTALL_DIR}") ++ set(PKGCONFIG_TARGET_INCLUDES "${EGPF_INCLUDE_INSTALL_DIR}") + else() +- set(PKGCONFIG_TARGET_INCLUDES "-I${CMAKE_INSTALL_PREFIX}/${EGPF_INCLUDE_INSTALL_DIR}") ++ set(PKGCONFIG_TARGET_INCLUDES "${CMAKE_INSTALL_PREFIX}/${EGPF_INCLUDE_INSTALL_DIR}") + endif() + if(IS_ABSOLUTE "${EGPF_LIB_INSTALL_DIR}") + set(PKGCONFIG_TARGET_LIBS "${EGPF_LIB_INSTALL_DIR}") +@@ -178,11 +178,16 @@ function(ECM_GENERATE_PKGCONFIG_FILE) + + file(WRITE ${PKGCONFIG_FILENAME} + " ++prefix=${CMAKE_INSTALL_PREFIX} ++exec_prefix=${CMAKE_INSTALL_PREFIX} ++libdir=${CMAKE_INSTALL_PREFIX}/${EGPF_LIB_INSTALL_DIR} ++includedir=${PKGCONFIG_TARGET_INCLUDES} ++ + 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} ++Cflags: -I${PKGCONFIG_TARGET_INCLUDES} ${PKGCONFIG_TARGET_DEFINES} + Requires: ${PKGCONFIG_TARGET_DEPS} + " + )