Revert "kde-base: add pkgconfig"

This reverts commit 9383540359.
This commit is contained in:
Andreas Müller
2021-10-18 19:29:45 +02:00
parent 9383540359
commit 5470d18ce1
127 changed files with 162 additions and 131 deletions

View File

@@ -12,4 +12,4 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "b1b431bf14150ddf509c839dd6686df4dd0efa09b3b69b9f059d925ac8de90a9"
SRC_URI[sha256sum] = "b577202eefaad7b95e701c1ce14108fbfe4ae6fd73ce46c369a2a7a329211bef"

View File

@@ -27,7 +27,7 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "912cd9eded892e44c782fb615491f41df886107b7b33583034d75ff997154aa2"
SRC_URI[sha256sum] = "22ab64377d595e0384285d95fe21464ab63a7644d2303cc0002b495f85412a19"
FILES_SOLIBSDEV = ""

View File

@@ -50,7 +50,8 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "49abcb19639a72eb5ffa916d5eca0a925d32a36e4a02658cc73ab479dea39965"
SRC_URI += "file://0001-Fix-typo.patch"
SRC_URI[sha256sum] = "f22e12dea303478d949f69b88fcf30787ef7f5d098be55595ec562aee4b13606"
# REVISIT
FILES:${PN} += " \

View File

@@ -0,0 +1,31 @@
From fb8ad2be861b49ce6c0f22c94617877253899522 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Sat, 12 Jun 2021 01:40:11 +0200
Subject: [PATCH] Fix typo?
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Statue: Pending
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
kcms/lookandfeel/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kcms/lookandfeel/CMakeLists.txt b/kcms/lookandfeel/CMakeLists.txt
index c13747a..9fa9a61 100644
--- a/kcms/lookandfeel/CMakeLists.txt
+++ b/kcms/lookandfeel/CMakeLists.txt
@@ -5,7 +5,7 @@ if(X11_Xcursor_FOUND)
set(HAVE_XCURSOR TRUE)
endif()
-if(${Breeze_FOUND} AND ${BREEZE_WITH_KDECORATION})
+if(${breeze_FOUND} AND ${BREEZE_WITH_KDECORATION})
set(HAVE_BREEZE_DECO TRUE)
endif()
--
2.31.1

View File

@@ -31,7 +31,7 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "c21e0f0df7a3cf07c93489e92832045bc0d1e17a20d14b46685a635c47e50868"
SRC_URI[sha256sum] = "a21094de5445e662786ab7ce7274106f9bd8a25233de363eea73403ce62fcc05"
FILES:${PN} += " \
${datadir}/bluedevilwizard \

View File

@@ -10,7 +10,7 @@ inherit kde-plasma python3native
DEPENDS += "sassc-native cairo breeze python3-pycairo-native"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "92eb49ba2e2144f8dfce970e4766e372d7e3448e46e22e742f3acb663df2a0d5"
SRC_URI[sha256sum] = "c23bd1810cc491264b376f2e0187c48b4d979e2aaded7061792c35c54fd22e52"
FILES:${PN} += " \
${datadir}/kconf_update \

View File

@@ -31,7 +31,7 @@ DEPENDS += "\
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "2003f168b3d60f5897486d9582631f75da7f0dc2625e9c4cddd9aa3d706bfd9e"
SRC_URI[sha256sum] = "e3fc4ca04cc0df694ab90fa4f9e8ca72512adae2c0320ce3f9702dddda029426"
FILES:${PN} += " \
${datadir}/color-schemes \

View File

@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = " \
inherit kde-plasma gtk-icon-cache mime-xdg
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "536a27fd49c8181810582bfec72feeb611e06c2e5a98a863b1af362d5f2e4651"
SRC_URI[sha256sum] = "c9809ec8f3f26909ce9901d6f7cd03cf52d4854431cfdf5340a4daa8404842b0"
DEPENDS += " \
qtdeclarative \

View File

@@ -34,7 +34,7 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "ae72d6e44769c1ac48d1dc3b4f0345c16fdcd053f7a1a4820b08b1d367df8568"
SRC_URI[sha256sum] = "90cb373ea112b844541d9c52000635b02ccdf2fe2da0fc7901b1a5a8b8df45ca"
# do not move so-libs to -dev package
FILES_SOLIBSDEV = ""

View File

@@ -29,7 +29,7 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "4684ea82a3877573811d6761395f8bf3252d8c7118082c96a70c79d9f9ee11b3"
SRC_URI[sha256sum] = "daf8ca2d5e3e3986a478238bcc6d22cc750e20ea37ce198e1f7ef1d88c971e6c"
CFLAGS += "-isystem ${STAGING_INCDIR}/harfbuzz"
CXXFLAGS += "-isystem ${STAGING_INCDIR}/harfbuzz"

View File

@@ -41,7 +41,7 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "2f15f9e2c90f88f87377c0e7aff0b8645b02afcfb5518ef279865d60810f91b8"
SRC_URI[sha256sum] = "6240bb29e3e23374e193659b50b21ddf1448b3f5f88fb15094d029d6b1643103"
FILES:${PN} += " \
${datadir}/icons \

View File

@@ -19,7 +19,7 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "a31ff237c00814f46de7d6791a0b496f971a6f9b2467fb3534d643dc0e6190f4"
SRC_URI[sha256sum] = "0210777ada99795086d7ec348143e4f0e48089dd15fd30f09eb68d3739275054"
FILES:${PN} += " \
${datadir}/kgamma \

View File

@@ -33,7 +33,7 @@ DEPENDS += "\
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "0f13f6842976853db42a7912da55ce25f6ad7e116740109f6255522662cb0f76"
SRC_URI[sha256sum] = "64e1c561ca124209a6be7647aa400f2b8ce67dd6fa578442d551d2ba0e4e17d0"
FILES:${PN} += " \
${datadir}/kservices5 \

View File

@@ -39,7 +39,7 @@ DEPENDS += " \
DEPENDS += "${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/libx11", "", d)}"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "4baf7e6e9a1d305c7c1b4c0c0d0ef4146fbc4008203d490ad6f4f6b4e578e07d"
SRC_URI[sha256sum] = "951e42305ce4aaf709fca5e211e9fc4f2ddbbdba2417192f755a190fe325b9df"
SRC_URI += "file://0001-fix-build-in-x11-less-environments.patch"
FILES:${PN} += " \

View File

@@ -31,7 +31,7 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "b25053d24eb9e8a9f79dcc65bab742de6c027ee28f1b9344ddf94ffcfb370e6e"
SRC_URI[sha256sum] = "1ad7f0e64b5088e16f61150d5936ece570410b17fb32d02bb7ec71d420c0c8c6"
# do not move so-libs to -dev package
FILES_SOLIBSDEV = ""

View File

@@ -29,7 +29,7 @@ DEPENDS += "\
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "25ca9a2db37d7838462beb0b0bf3d21b89dea01a56e9b8b6df020ffcfe0cf83b"
SRC_URI[sha256sum] = "6bfab1f10532599e16d1112e794626b105b4c80c41659665ffdf710bc29d1e60"
FILES:${PN} += " \
${datadir}/k*_kscreen \

View File

@@ -30,7 +30,7 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "832fd3c89e916c454edace46f1fba72c3bd211e98806e4ae2c2acc4df201324c"
SRC_URI[sha256sum] = "28edcf841db79554ac113c8619d20f978b2ab81bfd5d5be25f973506f262f180"
SRC_URI += "file://kde.pam"
do_install:append() {

View File

@@ -21,4 +21,4 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "a86c20079b62c55da26171eb9aec05e38f6c33f712455558d027a5cace08c163"
SRC_URI[sha256sum] = "f7dd2fa8d28ac4a673a9af0694f73c96caea63ae96ad836b9aa7a8055067e245"

View File

@@ -15,7 +15,7 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "d7ee58f3878c07286f1c7185d6365f4b2275e6db30490bf0d773b3c37d417173"
SRC_URI[sha256sum] = "d8a2a7408e8eefa2b3cc1aa22d130f90ae4bd67c716f290f295a05d5de14320f"
SRC_URI += "file://0001-use-pkgconfig-to-find-libgcrypt.patch"
EXTRA_OECMAKE += "-DCMAKE_INSTALL_LIBDIR=${base_libdir}"

View File

@@ -16,7 +16,7 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "07e68dafbc92f2906fb6df051d715bc34df369bcf5a476af282c1e3d9a5e4acd"
SRC_URI[sha256sum] = "4cbc301227a507fb2ac42e08130c79ff58a9905ebd444ddd64c78bb1e834fb4d"
FILES:${PN} += " \
${OE_QMAKE_PATH_PLUGINS} \

View File

@@ -27,7 +27,7 @@ SRC_URI:append:class-native = " \
file://0001-Build-qtwaylandscanner_kde-only-for-native-build.patch \
file://0002-Avoid-traces-to-sysroot-to-avoid-false-fails-by-cmak.patch \
"
SRC_URI[sha256sum] = "3009d7249af74582afa89978d478eece3424e5ef225bdb6f40032e2a6471d671"
SRC_URI[sha256sum] = "dd64bdd629b239621d687d8deceff6e0da88542c6b67140c5ff8b654155bf39d"
do_configure:append() {
# adjust path to protocol sources in sysroot

View File

@@ -15,10 +15,10 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 31c5a91..ad6a0f0 100644
index 47ecfd4..7690823 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,7 +45,8 @@ ecm_setup_version(PROJECT VARIABLE_PREFIX KWAYLANDSERVER
@@ -39,7 +39,8 @@ ecm_setup_version(PROJECT VARIABLE_PREFIX KWAYLANDSERVER
SOVERSION 5)
# Dependencies
@@ -28,7 +28,7 @@ index 31c5a91..ad6a0f0 100644
find_package(KF5Wayland ${KF5_MIN_VERSION} CONFIG REQUIRED)
find_package(PlasmaWaylandProtocols CONFIG REQUIRED)
@@ -77,9 +78,11 @@ add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00)
@@ -71,9 +72,11 @@ add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00)
if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
ecm_install_po_files_as_qm(po)
endif()
@@ -40,14 +40,13 @@ index 31c5a91..ad6a0f0 100644
if (BUILD_TESTING)
add_subdirectory(autotests)
add_subdirectory(tests)
@@ -113,6 +116,7 @@ install(EXPORT KWaylandServerTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FI
@@ -107,5 +110,6 @@ install(EXPORT KWaylandServerTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FI
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kwaylandserver_version.h
DESTINATION ${KDE_INSTALL_INCLUDEDIR} COMPONENT Devel )
+endif()
# add clang-format target for all our real source files
file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES *.cpp *.h)
feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 93c174e..8d75147 100644
--- a/src/CMakeLists.txt

View File

@@ -61,7 +61,7 @@ DEPENDS += " \
DEPENDS += "${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/libx11 qtx11extras libepoxy xcb-util-cursor", "",d)}"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "ba74f70648faa3c92c88e1b77916c6abd7fcad1af9e717a39dc9df278f1a551f"
SRC_URI[sha256sum] = "128daed41c1b9e65ddad3fe2ce3aea821ef54af520d3d39cde059b2c2bfcf5a3"
# kwin check libepoxy only -> egl pkgconfig is skipped
CXXFLAGS:append_mx6 += " -DLINUX=1"

View File

@@ -16,7 +16,7 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "65a74b5d6fb75f4129b528a8cec6e3aadcbccdee6f7e0bf2d994fb1854999ffb"
SRC_URI[sha256sum] = "63bd95099452951dba9e10a5ba15c4b6693cc44fb3ce99b7cb45638890748e09"
FILES:${PN} += " \
${datadir}/knotifications5 \

View File

@@ -14,7 +14,7 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "f71377ad9e44e12005233b2309e37f00f8a469d4628647c5c4c80f026ce96b5e"
SRC_URI[sha256sum] = "ffcc705ae4fadabc3422b8331a8d6334e2ce197ca6fadd7343c0a48927d32f45"
FILES:${PN} += " \
${OE_QMAKE_PATH_PLUGINS} \

View File

@@ -12,7 +12,7 @@ inherit kde-plasma
DEPENDS += "${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/libx11 qtx11extras", "", d)}"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "c64b87b80683acccc5a3beb8fe22bd80a6e8b224b8a55714d5160174ad4ef1e5"
SRC_URI[sha256sum] = "5b4fcaebacc3a4cb62e599a796dca89a30c5ac10937ba3ef9a28998c84ca16e3"
FILES:${PN} += " \
${datadir}/dbus-1 \

View File

@@ -37,7 +37,7 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "c379dc3e806085ec058e7633153d697ab8868aa6eac1f483931f75f2fcdd61eb"
SRC_URI[sha256sum] = "a522ab976baafa8c1b80cbfe6a4d7718aa8c8623f84294d25c5d43429dd472c2"
FILES:${PN} += " \
${datadir}/dbus-1 \

View File

@@ -26,7 +26,7 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "115f03b3b9c47206fc09543b7646e93862a6b6bb1c20ff650961f6c16bbe9eb9"
SRC_URI[sha256sum] = "f7c22b46d9a5081206f78e9964f515055876b7b4e9e6075d5fcc50b85c783fb4"
FILES:${PN} += " \
${datadir}/k*5 \

View File

@@ -25,7 +25,7 @@ DEPENDS += " \
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "6c04ed2e5eca4d0dd82034875cd159dfd149ca412032258055f6a848ecbfe09e"
SRC_URI[sha256sum] = "0c3bb29ce140b00e1c95a0a1cb39c662d935f7216e61810837097a39516ec43b"
PACKAGECONFIG ??= ""
PACKAGECONFIG[settings] = "-DBUILD_OXYGEN_SETTINGS=ON,-DBUILD_OXYGEN_SETTINGS=OFF,kcmutils"

View File

@@ -50,7 +50,7 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "346a806c839f3b26fca2db943bf58561dc3fd7ac08e7e73e9a157b532cae9c77"
SRC_URI[sha256sum] = "b4532accca913cb2551fdbdb865fd0c50cff76f690c9cfa8fa2ad627ddadacce"
SRC_URI += "file://0001-Ensure-xkb_base-is-not-empty-instead-of-checking-if-.patch"
FILES_SOLIBSDEV = "${libdir}/libkfont*${SOLIBSDEV}"

View File

@@ -26,7 +26,7 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "0930859552d8772f6a86ed723448d74609cfd559c55f7746ac33802cd33a7965"
SRC_URI[sha256sum] = "28c743f1a911042dac1dd86ae615748b7b5422e8d4b47bff34d31cf4bdb6f270"
FILES:${PN} += " \
${datadir}/kconf_update \

View File

@@ -14,7 +14,7 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "fcda0e8492c66b07e9ff4b2f30ec7f963a50c53e9d9fa3e7acd8b5c2e135ca94"
SRC_URI[sha256sum] = "50ba3ec6f8619936fdac8bf2eff03e595828e8b7c2f7e5adcb8001e07a451945"
FILES:${PN} += " \
${datadir}/plasma \

View File

@@ -45,7 +45,7 @@ DEPENDS += " \
# MobileBroadbandProviderInfo
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "ab3fdcf10d6d1db431c64101d3eee7481d213cd98f048a1e9445f2aec083ee38"
SRC_URI[sha256sum] = "7fab9fa175a7b0caf21ff19dddda9d1ea4d05cd3962fe1a2c726404203b9fc49"
# do not move so-libs to -dev package
FILES_SOLIBSDEV = ""

View File

@@ -29,7 +29,7 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "0044353d5ee41d948ec19263fb359660e1525b08ed279bc642b9659597331cb4"
SRC_URI[sha256sum] = "40ade6a4f7b19ae378d0db621f238f5c197d7a1a78379b5c92e9a1a88929b5ab"
FILES_SOLIBSDEV = ""

View File

@@ -26,7 +26,7 @@ DEPENDS += " \
inherit kde-plasma gettext
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "9a8b818f4c23491defd43e32881607a810c2c74891ad05853b3db51daf3444f0"
SRC_URI[sha256sum] = "40669f5218ac04d7e1aa71ffecf2376a6de5e747da1d24adee37cbe6e7e35ad4"
FILES:${PN} += " \
${datadir}/k*5 \

View File

@@ -31,7 +31,7 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "5c4c5f200ee75544db076be2da27a422387faf6c6e5163b63966626970a090d2"
SRC_URI[sha256sum] = "dd9eaaeba11da2d9640873882ed4aa573c2b3fc2f5640783965992ceda1647a3"
FILES:${PN} += " \
${datadir}/config.kcfg \

View File

@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = " \
inherit kde-plasma gtk-icon-cache
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "21be4da381d9453f908dd495c00f4bddd4c276e336ce9029341161096287df6f"
SRC_URI[sha256sum] = "4091679106a73c2d1ea4c76048258ce9bbbba326a1cdff359514dba7d29de9aa"
DEPENDS += " \
kauth-native \

View File

@@ -7,6 +7,6 @@ LIC_FILES_CHKSUM = " \
inherit kde-plasma
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "424993551ed03c409c08e5067505a7df5f5adb81f6febf303fd763e6226a7394"
SRC_URI[sha256sum] = "be214397f580adff039f28b37758b5a19da01f35ef5ee9ddb3fe93c0f116a8c0"
FILES:${PN} += "${datadir}/wallpapers"

View File

@@ -23,7 +23,7 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "22d08e3989acf9ff92312b754c897d5323c6cf638e2fc12c22439924bce19cae"
SRC_URI[sha256sum] = "60e3ea544b2b609351961fe7f299b79c9f8ff89b911b63490fa0d3afd5222ba8"
FILES:${PN} += " \
${datadir}/knotifications5 \

View File

@@ -30,7 +30,7 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "06bb0a69faeb9991dec4a752b1f3b1798ff9bb0aa6a201d0c6615e176153504b"
SRC_URI[sha256sum] = "597301e6520c17131c98a98960a1e3b7827e63ab9efed0fea5340203133f1c9f"
FILES:${PN} += " \
${datadir}/k*5 \

View File

@@ -24,7 +24,7 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "c0c09f4a67bce82ceb65587c95a075218f430fb6c2db01205e95c6891ef3198c"
SRC_URI[sha256sum] = "4669a40fe4380f65dfff509b00fe1dfd026507ae50fc5fa8daeea7b68c207798"
RDEPENDS:${PN} = "sddm"

View File

@@ -35,7 +35,7 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "0b925472ec68a6e184ec4e044d1df7f406713847c0fd7b28e94ba88adadf388d"
SRC_URI[sha256sum] = "cc7978faa1c3fcf75584a09459e69e665c17514dcf59e07287e1d80aadb975bb"
FILES:${PN} += " \
${datadir}/k*5 \