Control: tags -1 +patch
Hey,
I now created a first patch to fix the issue. It is just a workaround, as I
hardcoded the arch-independed path ("lib/kauth/libexec") and do not use any
CMAKE_INSTALL_* variable, so it won't be be a patch that works on any other
OSes, so it is not upstreamable at the current state.Can you try out this patch and respond, if we develop into the right direction... sandro -- On Mittwoch, 17. Januar 2018 18:16:42 CET Helmut Grohne wrote: > Package: libkf5auth-bin-dev > Version: 4:4.14.36-1 > User: helm...@debian.org > Usertags: rebootstrap > Control: affects -1 + src:kwalletmanager > > The issue to be found here is very close to #887452. I'm not duplicating > my thoughts here. I'm going to start with the differences and head to > the conclusion. > > kauth-gen-policy appears to be a tool for turning a text file in > qsettings format (similar to .ini) into an xml file. Both are textual, > so it seems like putting kauth-gen-policy into a Multi-Arch: foreign > package (like kconfig_compiler_kf5 in #887452). Thus we can draw the > same conclusion. > > I think making libkf5auth-bin-dev Multi-Arch: foreign is the right > approach. For consistency with other packages, it should be renamed to > libkf5auth-dev-bin (optional). For the marking to be correct, > kauth-gen-policy needs to live on an architecture-independent path > (needs to be moved) and the .cmake files need to be moved to > libkf5auth-dev. The path in KF5AuthToolsTargets-debian.cmake needs to be > updated for the new location of kauth-gen-policy. > > Can someone make that work? Or maybe support me in figuring how to > implement that? > > Helmut
diff -Nru kauth-5.37.0/debian/changelog kauth-5.37.0/debian/changelog --- kauth-5.37.0/debian/changelog 2017-09-03 09:57:36.000000000 +0200 +++ kauth-5.37.0/debian/changelog 2018-01-21 13:19:55.000000000 +0100 @@ -1,3 +1,11 @@ +kauth (5.37.0-3~) UNRELEASED; urgency=medium + + [ Sandro Knauß ] + * Make kauth usefull for cross compilation + * Rename libkf5auth-bin-dev -> libkf5auth-dev-bin. + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Sun, 21 Jan 2018 13:19:55 +0100 + kauth (5.37.0-2) sid; urgency=medium * New revision diff -Nru kauth-5.37.0/debian/control kauth-5.37.0/debian/control --- kauth-5.37.0/debian/control 2017-09-03 09:57:36.000000000 +0200 +++ kauth-5.37.0/debian/control 2018-01-21 13:19:55.000000000 +0100 @@ -21,12 +21,14 @@ Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/frameworks/kauth.git Vcs-Git: https://anonscm.debian.org/git/pkg-kde/frameworks/kauth.git -Package: libkf5auth-bin-dev +Package: libkf5auth-dev-bin Section: libdevel Architecture: any -Multi-Arch: same -Breaks: libkf5auth-dev (<< 5.15.0-2~) -Replaces: libkf5auth-dev (<< 5.15.0-2~) +Multi-Arch: foreign +Breaks: libkf5auth-dev (<< 5.37.0-3~), + libkf5auth-bin-dev (<< 5.37.0-3~) +Replaces: libkf5auth-dev (<< 5.37.0-3~), + libkf5auth-bin-dev (<< 5.37.0-3~) Depends: ${misc:Depends}, ${shlibs:Depends} Description: Abstraction to system policy and authentication features KAuth is a framework to let applications perform actions as a @@ -36,6 +38,13 @@ . This package contains development files for kauth. +Package: libkf5auth-bin-dev +Architecture: any +Depends: libkf5auth-dev-bin (= ${binary:Version}), ${misc:Depends} +Section: oldlibs +Description: transitional package + This is a transitional package. It can safely be removed. + Package: libkf5auth-data Architecture: all Multi-Arch: foreign @@ -52,11 +61,14 @@ Section: libdevel Architecture: any Multi-Arch: same -Depends: libkf5auth-bin-dev ( = ${binary:Version}), +Depends: libkf5auth-dev-bin (= ${binary:Version}), libkf5auth5 (= ${binary:Version}), libkf5coreaddons-dev (>= 5.37.0~), ${misc:Depends}, ${shlibs:Depends}, +Breaks: libkf5auth-bin-dev (<< 5.37.0-3~), + libkf5configwidgets-dev (<< 5.37) +Replaces: libkf5auth-bin-dev (<< 5.37.0-3~) Recommends: libkf5auth-doc (= ${source:Version}) Description: Abstraction to system policy and authentication features KAuth is a framework to let applications perform actions as a @@ -65,7 +77,6 @@ KAuth is part of KDE Frameworks 5. . This package contains development files for kauth. -Breaks: libkf5configwidgets-dev (<< 5.37) Package: libkf5auth-doc Architecture: all diff -Nru kauth-5.37.0/debian/libkf5auth-bin-dev.install kauth-5.37.0/debian/libkf5auth-bin-dev.install --- kauth-5.37.0/debian/libkf5auth-bin-dev.install 2017-09-03 09:57:36.000000000 +0200 +++ kauth-5.37.0/debian/libkf5auth-bin-dev.install 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -usr/lib/*/cmake/KF5Auth/KF5AuthToolsTargets*.cmake -usr/lib/*/libexec/kauth/kauth-policy-gen diff -Nru kauth-5.37.0/debian/libkf5auth-dev-bin.install kauth-5.37.0/debian/libkf5auth-dev-bin.install --- kauth-5.37.0/debian/libkf5auth-dev-bin.install 1970-01-01 01:00:00.000000000 +0100 +++ kauth-5.37.0/debian/libkf5auth-dev-bin.install 2018-01-21 13:19:55.000000000 +0100 @@ -0,0 +1 @@ +usr/lib/kauth/libexec/kauth-policy-gen diff -Nru kauth-5.37.0/debian/libkf5auth-dev.install kauth-5.37.0/debian/libkf5auth-dev.install --- kauth-5.37.0/debian/libkf5auth-dev.install 2017-09-03 09:57:36.000000000 +0200 +++ kauth-5.37.0/debian/libkf5auth-dev.install 2018-01-21 13:19:55.000000000 +0100 @@ -4,5 +4,6 @@ usr/lib/*/cmake/KF5Auth/KF5AuthMacros.cmake usr/lib/*/cmake/KF5Auth/KF5AuthQchTargets.cmake usr/lib/*/cmake/KF5Auth/KF5AuthTargets*.cmake +usr/lib/*/cmake/KF5Auth/KF5AuthToolsTargets*.cmake usr/lib/*/libKF5Auth.so usr/lib/*/qt5/mkspecs/modules/qt_KAuth.pri diff -Nru kauth-5.37.0/debian/patches/make_kauth-gen-policy_usefull_for_crosscompiling.path kauth-5.37.0/debian/patches/make_kauth-gen-policy_usefull_for_crosscompiling.path --- kauth-5.37.0/debian/patches/make_kauth-gen-policy_usefull_for_crosscompiling.path 1970-01-01 01:00:00.000000000 +0100 +++ kauth-5.37.0/debian/patches/make_kauth-gen-policy_usefull_for_crosscompiling.path 2018-01-21 13:19:55.000000000 +0100 @@ -0,0 +1,24 @@ +Description: Make pacakge usefull for cross compilation + kauth-gen-policy appears to be a tool for turning a text file in + qsettings format (similar to .ini) into an xml file. Both are textual, + so it seems like putting kauth-gen-policy into a Multi-Arch: foreign + package (like kconfig_compiler_kf5 in #887452). Thus we can draw the + same conclusion. +Author: Sandro Kanuß <he...@debian.org> +Origin: Debian +Bug-Debian: https://bugs.debian.org/887521 +Last-Update: 2018-01-21 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -37,7 +37,8 @@ ecm_setup_version(PROJECT VARIABLE_PREFI + + find_package(KF5CoreAddons ${KF5_DEP_VERSION} REQUIRED) + +-set(KAUTH_HELPER_INSTALL_DIR "${KDE_INSTALL_LIBEXECDIR}/kauth") ++set(KAUTH_HELPER_INSTALL_DIR "lib/kauth/libexec") ++message("${KAUTH_HELPER_INSTALL_DIR} ${CMAKE_INSTALL_LIBEXECDIR}") + + if(IS_ABSOLUTE ${KAUTH_HELPER_INSTALL_DIR}) + set(KAUTH_HELPER_INSTALL_ABSOLUTE_DIR ${KAUTH_HELPER_INSTALL_DIR}) diff -Nru kauth-5.37.0/debian/patches/series kauth-5.37.0/debian/patches/series --- kauth-5.37.0/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ kauth-5.37.0/debian/patches/series 2018-01-21 13:15:48.000000000 +0100 @@ -0,0 +1 @@ +make_kauth-gen-policy_usefull_for_crosscompiling.path
signature.asc
Description: This is a digitally signed message part.
