kio-extras: disable nfs / enable taglib

Something in oe-coe broke nfs detecttion. It seems that some parts of libtirpc
were deprecated in glibc. A patch was applied to add headers but it linking
fails due to missing symbols (first during configure and if we hack away
symbol detection compile fails)

So disable nfs by patch. On the way we made taglib detection work.

[1] https://git.openembedded.org/openembedded-core/commit/?id=674596421320de08142e010fdd65ec6f0a0f34e9

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
2019-11-17 21:24:09 +01:00
parent 386408fc6b
commit 75c7839991
3 changed files with 77 additions and 0 deletions

View File

@@ -16,6 +16,7 @@ DEPENDS += " \
qtwebengine \
\
exiv2 \
taglib \
kactivities \
karchive \
kauth-native \
@@ -51,6 +52,10 @@ DEPENDS += " \
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "3da78e506ba30497ac303f8fe80628f7"
SRC_URI[sha256sum] = "e38e872f78ff24fe512ec7ff9ed4f6b6a8e1fef6111fdb0222c133bed0a8861f"
SRC_URI += " \
file://0001-Do-not-find-use-taglib-config.patch \
file://0002-Disable-nfs-for-now.patch \
"
# gperf creates hard #line links
do_install_prepend() {

View File

@@ -0,0 +1,37 @@
From b857bad2806372c65cd72d4515e1173834475496 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Sun, 17 Nov 2019 19:14:00 +0100
Subject: [PATCH] Do not find/use taglib-config
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
| -- Could NOT find Taglib: Found unsuitable version "ERROR: /usr/bin/taglib-config should not be used, use an alternative such as pkg-config
Upstream-Status: Inappropriate [oe-specific]
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
cmake/FindTaglib.cmake | 6 ------
1 file changed, 6 deletions(-)
diff --git a/cmake/FindTaglib.cmake b/cmake/FindTaglib.cmake
index d09fb6f..25eb8f6 100644
--- a/cmake/FindTaglib.cmake
+++ b/cmake/FindTaglib.cmake
@@ -35,12 +35,6 @@ if(NOT TAGLIB_MIN_VERSION)
set(TAGLIB_MIN_VERSION "1.4")
endif(NOT TAGLIB_MIN_VERSION)
-if(NOT WIN32)
- find_program(TAGLIBCONFIG_EXECUTABLE NAMES taglib-config PATHS
- ${BIN_INSTALL_DIR}
- )
-endif(NOT WIN32)
-
#reset vars
set(TAGLIB_LIBRARIES)
set(TAGLIB_CFLAGS)
--
2.21.0

View File

@@ -0,0 +1,35 @@
From 56be2d68e5a8213c199006bbb8b3461764764e24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Sun, 17 Nov 2019 21:16:59 +0100
Subject: [PATCH] Disable nfs for now
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
It seems there was a change in oe-core's glibc/libtirpc causing missing symbols
for libtirpc.
Upstream-Status: Inappropriate
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
CMakeLists.txt | 3 ---
1 file changed, 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 55236d4..0f31e67 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -177,9 +177,6 @@ if(NOT WIN32)
endif()
check_include_files(rpc/rpc.h HAVE_RPC_RPC_H)
add_feature_info("NFS kioslave" HAVE_RPC_RPC_H "The RPC library is needed to build the NFS kioslave")
- if(HAVE_RPC_RPC_H)
- add_subdirectory( nfs )
- endif()
endif()
# KDNSSD before 5.54 suffers from a race condition in avahi's dbus API and
--
2.21.0