From 3554894c2e0f3e54da4f74f0a3f9d484ffc5021d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 17 Aug 2023 18:25:47 +0700 Subject: [PATCH 1/8] cmake: update to 3.27.2. --- srcpkgs/cmake-gui | 1 + srcpkgs/cmake-gui/patches | 1 - srcpkgs/cmake-gui/template | 40 ------------- srcpkgs/cmake-gui/update | 1 - .../patches/ignore-crape-compiler-test.patch | 4 +- srcpkgs/cmake/patches/linux-gate.patch | 14 ----- srcpkgs/cmake/patches/musl-test.patch | 16 +++++- srcpkgs/cmake/patches/nlohmann_json.patch | 23 ++++++++ srcpkgs/cmake/patches/no-license.patch | 26 +++++++++ .../patches/no-run-cmake-bootstrap.patch | 8 +-- srcpkgs/cmake/template | 57 +++++++++---------- 11 files changed, 93 insertions(+), 98 deletions(-) create mode 120000 srcpkgs/cmake-gui delete mode 120000 srcpkgs/cmake-gui/patches delete mode 100644 srcpkgs/cmake-gui/template delete mode 120000 srcpkgs/cmake-gui/update delete mode 100644 srcpkgs/cmake/patches/linux-gate.patch create mode 100644 srcpkgs/cmake/patches/nlohmann_json.patch create mode 100644 srcpkgs/cmake/patches/no-license.patch diff --git a/srcpkgs/cmake-gui b/srcpkgs/cmake-gui new file mode 120000 index 0000000000000..b6868d450eb7b --- /dev/null +++ b/srcpkgs/cmake-gui @@ -0,0 +1 @@ +cmake \ No newline at end of file diff --git a/srcpkgs/cmake-gui/patches b/srcpkgs/cmake-gui/patches deleted file mode 120000 index 6f3ac554b3614..0000000000000 --- a/srcpkgs/cmake-gui/patches +++ /dev/null @@ -1 +0,0 @@ -../cmake/patches \ No newline at end of file diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template deleted file mode 100644 index 6aea8d3e7afb9..0000000000000 --- a/srcpkgs/cmake-gui/template +++ /dev/null @@ -1,40 +0,0 @@ -# Template file for 'cmake-gui' -pkgname=cmake-gui -version=3.26.4 -revision=3 -build_style=cmake -configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake - -DSPHINX_MAN=1 -DCMAKE_MAN_DIR=/share/man - -DBUILD_QtDialog=ON -DCMAKE_USE_SYSTEM_LIBRARIES=ON -DKWSYS_LFS_WORKS=1" -hostmakedepends="qt6-base python3-Sphinx qt6-tools" -makedepends="jsoncpp-devel libarchive-devel libcurl-devel libuv-devel - ncurses-devel qt6-base-devel rhash-devel qt6-tools-devel" -depends="desktop-file-utils shared-mime-info cmake>=${version}" -checkdepends="pax pkg-config git" -short_desc="Cross-platform, open-source build system - Qt GUI" -maintainer="Đoàn Trần Công Danh " -license="BSD-3-Clause" -homepage="https://www.cmake.org" -distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz" -checksum=313b6880c291bd4fe31c0aa51d6e62659282a521e695f30d5cc0d25abbd5c208 - -do_check() { - cd build - ./bin/ctest -} - -do_install() { - # We are only interested in cmake-gui. - vbin build/bin/cmake-gui - vman build/Utilities/Sphinx/man/cmake-gui.1 - - for res in 32 64 128 ; do - vinstall Source/QtDialog/CMakeSetup${res}.png 0644 \ - usr/share/icons/hicolor/${res}x${res}/apps/ - done - - vinstall Source/QtDialog/cmakecache.xml 0644 usr/share/mime - vinstall Source/QtDialog/cmake-gui.desktop 0644 usr/share/applications - - vlicense Copyright.txt -} diff --git a/srcpkgs/cmake-gui/update b/srcpkgs/cmake-gui/update deleted file mode 120000 index c7f49c6a2d189..0000000000000 --- a/srcpkgs/cmake-gui/update +++ /dev/null @@ -1 +0,0 @@ -../cmake/update \ No newline at end of file diff --git a/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch b/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch index 7b6ce9c16962b..cf098a8f88748 100644 --- a/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch +++ b/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch @@ -1,8 +1,6 @@ -diff --git a/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake b/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake -index dcdc7f1b96..37e13b6c5c 100644 --- a/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake +++ b/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake -@@ -11,7 +11,7 @@ project(Minimal NONE) +@@ -8,7 +8,7 @@ set(targets aix-C-XL-13.1.3 aix-CXX-XL-13.1.3 aix-C-XLClang-16.1.0.1 aix-CXX-XLClang-16.1.0.1 diff --git a/srcpkgs/cmake/patches/linux-gate.patch b/srcpkgs/cmake/patches/linux-gate.patch deleted file mode 100644 index 2102feee211f2..0000000000000 --- a/srcpkgs/cmake/patches/linux-gate.patch +++ /dev/null @@ -1,14 +0,0 @@ -https://gitlab.kitware.com/cmake/cmake/-/merge_requests/8229 -diff --git a/Modules/GetPrerequisites.cmake b/Modules/GetPrerequisites.cmake -index 0ba35b6b79..0cd49ab4ba 100644 ---- a/Modules/GetPrerequisites.cmake -+++ b/Modules/GetPrerequisites.cmake -@@ -730,7 +730,7 @@ function(get_prerequisites target prerequisites_var exclude_system recurse exepa - - if(gp_tool MATCHES "ldd$") - set(gp_cmd_args "") -- set(gp_regex "^[\t ]*[^\t ]+ =>[\t ]+([^\t\(]+)( \(.+\))?${eol_char}$") -+ set(gp_regex "^[\t ]*[^\t ]+ =>[\t ]+(/[^\t\(]+)( \(.+\))?${eol_char}$") - set(gp_regex_error "not found${eol_char}$") - set(gp_regex_fallback "^[\t ]*([^\t ]+) => ([^\t ]+).*${eol_char}$") - set(gp_regex_cmp_count 1) diff --git a/srcpkgs/cmake/patches/musl-test.patch b/srcpkgs/cmake/patches/musl-test.patch index 0329b5efd2f52..41161fa81e082 100644 --- a/srcpkgs/cmake/patches/musl-test.patch +++ b/srcpkgs/cmake/patches/musl-test.patch @@ -1,6 +1,6 @@ ---- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-all-check.cmake.orig 2020-12-05 13:27:21.098078774 +0700 -+++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-all-check.cmake 2020-12-05 13:29:19.931553018 +0700 -@@ -33,9 +33,9 @@ +--- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-all-check.cmake ++++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-all-check.cmake +@@ -15,9 +15,9 @@ set(_check [[librunpath_parent_unresolved\.so]] [[librunpath_unresolved\.so]] ) @@ -13,3 +13,13 @@ set(_check "^libconflict\\.so:[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-build/root-all/lib/conflict/libconflict\\.so;[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-build/root-all/lib/conflict2/libconflict\\.so\n$" ) +--- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/RunCMakeTest.cmake ++++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/RunCMakeTest.cmake +@@ -65,7 +65,6 @@ elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL " + + if(NOT CMake_COMPILER_FORCES_NEW_DTAGS) + run_install_test(linux) +- run_install_test(linux-parent-rpath-propagation) + run_install_test(file-filter) + endif() + run_install_test(linux-unresolved) diff --git a/srcpkgs/cmake/patches/nlohmann_json.patch b/srcpkgs/cmake/patches/nlohmann_json.patch new file mode 100644 index 0000000000000..005c0c3ca0c9a --- /dev/null +++ b/srcpkgs/cmake/patches/nlohmann_json.patch @@ -0,0 +1,23 @@ +--- a/Tests/CMakeLib/testDebuggerNamedPipe.cxx ++++ b/Tests/CMakeLib/testDebuggerNamedPipe.cxx +@@ -180,13 +180,13 @@ int runTest(int argc, char* argv[]) + auto debuggerResponse = debuggerResponseStream.str(); + + std::vector expectedResponses = { +- R"("event" : "initialized".*"type" : "event")", +- R"("command" : "launch".*"success" : true.*"type" : "response")", +- R"("command" : "configurationDone".*"success" : true.*"type" : "response")", +- R"("reason" : "started".*"threadId" : 1.*"event" : "thread".*"type" : "event")", +- R"("reason" : "exited".*"threadId" : 1.*"event" : "thread".*"type" : "event")", +- R"("exitCode" : 0.*"event" : "exited".*"type" : "event")", +- R"("command" : "disconnect".*"success" : true.*"type" : "response")" ++ R"("event" *: *"initialized".*"type" *: *"event")", ++ R"("command" *: *"launch".*"success" *: *true.*"type" *: *"response")", ++ R"("command" *: *"configurationDone".*"success" *: *true.*"type" *: *"response")", ++ R"("reason" *: *"started".*"threadId" *: *1.*"event" *: *"thread".*"type" *: *"event")", ++ R"("reason" *: *"exited".*"threadId" *: *1.*"event" *: *"thread".*"type" *: *"event")", ++ R"("exitCode" *: *0.*"event" *: *"exited".*"type" *: *"event")", ++ R"("command" *: *"disconnect".*"success" *: *true.*"type" *: *"response")" + }; + + for (auto& regexString : expectedResponses) { diff --git a/srcpkgs/cmake/patches/no-license.patch b/srcpkgs/cmake/patches/no-license.patch new file mode 100644 index 0000000000000..87e31e21aeb96 --- /dev/null +++ b/srcpkgs/cmake/patches/no-license.patch @@ -0,0 +1,26 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -522,9 +522,6 @@ if(BUILD_TESTING) + endif() + + if(NOT CMake_TEST_EXTERNAL_CMAKE) +- # Install license file as it requires. +- install(FILES Copyright.txt DESTINATION ${CMAKE_DOC_DIR}) +- + # Install script directories. + install( + DIRECTORY Help Modules Templates +--- a/Source/kwsys/CMakeLists.txt ++++ b/Source/kwsys/CMakeLists.txt +@@ -615,11 +615,6 @@ if(KWSYS_INSTALL_DOC_DIR) + COMPONENT ${KWSYS_INSTALL_COMPONENT_NAME_RUNTIME} + ) + endif() +- +- # Install the license under the documentation directory. +- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/Copyright.txt +- DESTINATION ${KWSYS_INSTALL_DOC_DIR}/${KWSYS_NAMESPACE} +- ${KWSYS_INSTALL_LICENSE_OPTIONS}) + endif() + + #----------------------------------------------------------------------------- diff --git a/srcpkgs/cmake/patches/no-run-cmake-bootstrap.patch b/srcpkgs/cmake/patches/no-run-cmake-bootstrap.patch index 4b41aea2450b4..0e550bce7b90e 100644 --- a/srcpkgs/cmake/patches/no-run-cmake-bootstrap.patch +++ b/srcpkgs/cmake/patches/no-run-cmake-bootstrap.patch @@ -1,9 +1,7 @@ We will run cmake ourselves with our flags -Index: cmake-3.20.3/bootstrap -=================================================================== ---- cmake-3.20.3.orig/bootstrap -+++ cmake-3.20.3/bootstrap -@@ -1968,6 +1968,7 @@ export CFLAGS +--- a/bootstrap ++++ b/bootstrap +@@ -2076,6 +2076,7 @@ export CFLAGS export CXXFLAGS export LDFLAGS diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template index 20da7a8678ea8..3517bb2cc6787 100644 --- a/srcpkgs/cmake/template +++ b/srcpkgs/cmake/template @@ -1,58 +1,53 @@ # Template file for 'cmake' pkgname=cmake -version=3.26.4 -revision=3 +version=3.27.2 +revision=1 build_style=cmake configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake -DSPHINX_MAN=1 -DCMAKE_MAN_DIR=/share/man + -DBUILD_CursesDialog=ON -DBUILD_QtDialog=ON -DCMAKE_SKIP_BOOTSTRAP_TEST=1 -DCMAKE_SKIP_RPATH=1 -DCMAKE_USE_SYSTEM_LIBRARIES=ON -DKWSYS_LFS_WORKS=1" -hostmakedepends="gcc-fortran python3-Sphinx" -makedepends="expat-devel libarchive-devel libcurl-devel libuv-devel - ncurses-devel rhash-devel jsoncpp-devel" +hostmakedepends="gcc-fortran python3-Sphinx qt6-base qt6-tools" +makedepends="expat-devel libarchive-devel libcurl-devel libuv-devel cppdap-devel + ncurses-devel rhash-devel jsoncpp-devel qt6-base-devel qt6-tools-devel" checkdepends="pax pkg-config git" short_desc="Cross-platform, open-source build system" maintainer="Đoàn Trần Công Danh " license="BSD-3-Clause, ICU" homepage="https://www.cmake.org" distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz" -checksum=313b6880c291bd4fe31c0aa51d6e62659282a521e695f30d5cc0d25abbd5c208 -replaces="cmake-bootstrap>=0" +checksum=798e50085d423816fe96c9ef8bee5e50002c9eca09fed13e300de8a91d35c211 if [ "$XBPS_TARGET_LIBC" = musl ]; then configure_args+=" -DCMake_NO_SELF_BACKTRACE=1" fi -pre_configure() { - local f - mkdir -p build - cd build - CC=$CC_FOR_BUILD CFLAGS="$CFLAGS_FOR_BUILD" \ - CXX=$CXX_FOR_BUILD CXXFLAGS="$CXXFLAGS_FOR_BUILD" \ - LD=$LD_FOR_BUILD LDFLAGS="$LDFLAGS_FOR_BUILD" \ - ../bootstrap --no-system-libs \ - --generator=Ninja \ - ${XBPS_MAKEJOBS:+--parallel=$XBPS_MAKEJOBS} - # Make sure build directory is clean - for f in *; do - if [ "$f" != Bootstrap.cmk ]; then - return 1 - fi - done - cd ${wrksrc} - PATH="${wrksrc}/build/Bootstrap.cmk:$PATH" -} - do_check() { cd build ./bin/ctest } post_install() { - rm -rf ${DESTDIR}/usr/share/doc/cmake + # No license would be installed + # or something were bundled without our knowledge + test ! -d ${DESTDIR}/usr/share/doc sed -n -e '/Copyright/,/authorization[.]/p' \ - Source/CursesDialog/form/fld_arg.c >fld.LICENSE - vlicense fld.LICENSE + Source/CursesDialog/form/fld_arg.c >fld.license + vlicense fld.license + sed -e '/\$FreeBSD\$/q' Utilities/cmelf/elf_common.h >elf.license + vlicense elf.license vlicense Copyright.txt - vlicense Utilities/KWIML/Copyright.txt KWIML-Copyright.txt +} + +cmake-gui_package() { + depends="desktop-file-utils shared-mime-info cmake>=${version}" + pkg_install() { + vmove usr/bin/cmake-gui + vmove usr/share/man/man1/cmake-gui.1 + + vmove usr/share/applications + vmove usr/share/icons + vmove usr/share/mime + } } From 0dab87d4c840dda4310296a4fc17e8757541e278 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 8 Aug 2023 13:44:43 +0700 Subject: [PATCH 2/8] hooks: move prepare-32bit and shlib-provides to post-install In a later change, we will generate shlib-depends cross subpkgs during pre-pkg stage. Thus we need shlib-provides information of all subpkgs ready before pre-pkg is run. Those information can only be read in post-install stage at the eariliest. Let's move the shlib-provides to post-install. This hook requires prepare-32bit, so, let's move that hook, too. --- .../05-prepare-32bit.sh => post-install/80-prepare-32bit.sh} | 0 .../06-shlib-provides.sh => post-install/98-shlib-provides.sh} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename common/hooks/{pre-pkg/05-prepare-32bit.sh => post-install/80-prepare-32bit.sh} (100%) rename common/hooks/{pre-pkg/06-shlib-provides.sh => post-install/98-shlib-provides.sh} (100%) diff --git a/common/hooks/pre-pkg/05-prepare-32bit.sh b/common/hooks/post-install/80-prepare-32bit.sh similarity index 100% rename from common/hooks/pre-pkg/05-prepare-32bit.sh rename to common/hooks/post-install/80-prepare-32bit.sh diff --git a/common/hooks/pre-pkg/06-shlib-provides.sh b/common/hooks/post-install/98-shlib-provides.sh similarity index 100% rename from common/hooks/pre-pkg/06-shlib-provides.sh rename to common/hooks/post-install/98-shlib-provides.sh From 018df5f33427b571cdc5ffafaaf308bc08bb4ffa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 8 Aug 2023 22:08:27 +0700 Subject: [PATCH 3/8] hooks/shlib-provides: record shared libraries without SONAME In a later change, we would like to generate runtime-deps between sub-packages. In order to do that, we can add everything into etc/shlibs or we can look into other subpackages directly. The former is cumbersome if such package has lot of shared-objects. The latter requires traversing and checking a lot of files. Furtunately, we can speed up the latter one by storing all shared-objects' information in a centralised place. --- .../hooks/post-install/98-shlib-provides.sh | 30 +++++++++++++++---- 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/common/hooks/post-install/98-shlib-provides.sh b/common/hooks/post-install/98-shlib-provides.sh index a09eb6f5c3b33..ad1c31c72db05 100644 --- a/common/hooks/post-install/98-shlib-provides.sh +++ b/common/hooks/post-install/98-shlib-provides.sh @@ -6,19 +6,30 @@ collect_sonames() { local _pattern="^[[:alnum:]]+(.*)+\.so(\.[0-9]+)*$" local _versioned_pattern="^[[:alnum:]]+(.*)+\.so(\.[0-9]+)+$" local _tmpfile=$(mktemp) || exit 1 + local _mainpkg="$2" + local _shlib_dir="${XBPS_STATEDIR}/shlib-provides" + local _no_soname=$(mktemp) || exit 1 + mkdir -p "${_shlib_dir}" || exit 1 if [ ! -d ${_destdir} ]; then rm -f ${_tmpfile} + rm -f ${_no_soname} return 0 fi + # real pkg find ${_destdir} -type f -name "*.so*" | while read f; do _fname="${f##*/}" case "$(file -bi "$f")" in application/x-sharedlib*|application/x-pie-executable*) # shared library - _soname=$(${OBJDUMP} -p "$f"|grep SONAME|awk '{print $2}') + _soname=$(${OBJDUMP} -p "$f"|awk '/SONAME/{print $2}') + if [ -n "$noshlibprovides" ]; then + # register all shared lib for rt-deps between sub-pkg + echo "${_fname}" >>${_no_soname} + continue + fi # Register all versioned sonames, and # unversioned sonames only when in libdir. if [[ ${_soname} =~ ${_versioned_pattern} ]] || @@ -27,6 +38,9 @@ collect_sonames() { -e ${_destdir}/usr/lib32/${_fname} ) ]]; then echo "${_soname}" >> ${_tmpfile} echo " SONAME ${_soname} from ${f##${_destdir}}" + else + # register all shared lib for rt-deps between sub-pkg + echo "${_fname}" >>${_no_soname} fi ;; esac @@ -38,6 +52,14 @@ collect_sonames() { if [ -s "${_tmpfile}" ]; then tr '\n' ' ' < "${_tmpfile}" > ${_destdir}/shlib-provides echo >> ${_destdir}/shlib-provides + if [ "$_mainpkg" ]; then + cp "${_tmpfile}" "${_shlib_dir}/${pkgname}.soname" + fi + fi + if [ "$_mainpkg" ] && [ -s "${_no_soname}" ]; then + mv "${_no_soname}" "${_shlib_dir}/${pkgname}.nosoname" + else + rm -f ${_no_soname} fi rm -f ${_tmpfile} } @@ -45,12 +67,8 @@ collect_sonames() { hook() { local _destdir32=${XBPS_DESTDIR}/${pkgname}-32bit-${version} - if [ -n "$noshlibprovides" ]; then - return 0 - fi - # native pkg - collect_sonames ${PKGDESTDIR} + collect_sonames ${PKGDESTDIR} yes # 32bit pkg collect_sonames ${_destdir32} } From d36429610c969d8e5fd9ef0882af5c753fbc378b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 9 Aug 2023 13:19:01 +0700 Subject: [PATCH 4/8] hooks/gen-rt-deps: Look for rt-deps by subpkg first, common/shlibs later --- .../hooks/pre-pkg/04-generate-runtime-deps.sh | 80 +++++++------------ 1 file changed, 29 insertions(+), 51 deletions(-) diff --git a/common/hooks/pre-pkg/04-generate-runtime-deps.sh b/common/hooks/pre-pkg/04-generate-runtime-deps.sh index a291f2ccc8720..e2020ce05f79f 100644 --- a/common/hooks/pre-pkg/04-generate-runtime-deps.sh +++ b/common/hooks/pre-pkg/04-generate-runtime-deps.sh @@ -47,6 +47,7 @@ store_pkgdestdir_rundeps() { hook() { local depsftmp f lf j mapshlibs sorequires _curdep elfmagic broken_shlibs verify_deps + local _shlib_dir="${XBPS_STATEDIR}/shlib-provides" # Disable trap on ERR, xbps-uhelper cmd might return error... but not something # to be worried about because if there are broken shlibs this hook returns @@ -95,65 +96,42 @@ hook() { # above, the mapping is done thru the common/shlibs file. # for f in ${verify_deps}; do - unset _f j rdep _rdep rdepcnt soname _pkgname _rdepver found - _f=$(echo "$f"|sed -E 's|\+|\\+|g') - rdep="$(grep -E "^${_f}[[:blank:]]+.*$" $mapshlibs|cut -d ' ' -f2)" - rdepcnt="$(grep -E "^${_f}[[:blank:]]+.*$" $mapshlibs|cut -d ' ' -f2|wc -l)" - if [ -z "$rdep" ]; then + unset _rdep _pkgname _rdepver + + if [ "$(find ${PKGDESTDIR} -name "$f")" ]; then # Ignore libs by current pkg - soname=$(find ${PKGDESTDIR} -name "$f") - if [ -z "$soname" ]; then + echo " SONAME: $f <-> $pkgname (ignored)" + continue + # If this library is provided by a subpkg of sourcepkg, use that subpkg + elif _pkgname="$(cd "$_shlib_dir" && grep -F -l -x "$f" *.soname 2>/dev/null)"; then + # If that library has SONAME, add it to shlibs-requires, too. + _pkgname=${_pkgname%.soname} + _sdep="${_pkgname}-${version}_${revision}" + sorequires+="${f} " + elif _pkgname="$(cd "$_shlib_dir" && grep -F -l -x "$f" *.nosoname 2>/dev/null)"; then + _pkgname=${_pkgname%.nosoname} + _sdep="${_pkgname}-${version}_${revision}" + else + _rdep="$(awk -v sl="$f" '$1 == sl { print $2; exit; }' "$mapshlibs")" + + if [ -z "$_rdep" ]; then msg_red_nochroot " SONAME: $f <-> UNKNOWN PKG PLEASE FIX!\n" broken_shlibs=1 - else - echo " SONAME: $f <-> $pkgname (ignored)" - fi - continue - elif [ "$rdepcnt" -gt 1 ]; then - unset j found - # Check if shlib is provided by multiple pkgs. - for j in ${rdep}; do - _pkgname=$($XBPS_UHELPER_CMD getpkgname "$j") - # if there's a SONAME matching pkgname, use it. - for x in ${pkgname} ${subpackages}; do - [[ $_pkgname == $x ]] && found=1 && break - done - [[ $found ]] && _rdep=$j && break - done - if [ -z "${_rdep}" ]; then - # otherwise pick up the first one. - for j in ${rdep}; do - [ -z "${_rdep}" ] && _rdep=$j - done + continue fi - else - _rdep=$rdep - fi - _pkgname=$($XBPS_UHELPER_CMD getpkgname "${_rdep}" 2>/dev/null) - _rdepver=$($XBPS_UHELPER_CMD getpkgversion "${_rdep}" 2>/dev/null) - if [ -z "${_pkgname}" -o -z "${_rdepver}" ]; then - msg_red_nochroot " SONAME: $f <-> UNKNOWN PKG PLEASE FIX!\n" - broken_shlibs=1 - continue - fi - # Check if pkg is a subpkg of sourcepkg; if true, ignore version - # in common/shlibs. - _sdep="${_pkgname}>=${_rdepver}" - for _subpkg in ${subpackages}; do - if [ "${_subpkg}" = "${_pkgname}" ]; then - _sdep="${_pkgname}-${version}_${revision}" - break + _pkgname=$($XBPS_UHELPER_CMD getpkgname "${_rdep}" 2>/dev/null) + _rdepver=$($XBPS_UHELPER_CMD getpkgversion "${_rdep}" 2>/dev/null) + if [ -z "${_pkgname}" -o -z "${_rdepver}" ]; then + msg_red_nochroot " SONAME: $f <-> UNKNOWN PKG PLEASE FIX!\n" + broken_shlibs=1 + continue fi - done + _sdep="${_pkgname}>=${_rdepver}" - if [ "${_pkgname}" != "${pkgname}" ]; then - echo " SONAME: $f <-> ${_sdep}" + # By this point, SONAME can't be found in current pkg sorequires+="${f} " - else - # Ignore libs by current pkg - echo " SONAME: $f <-> ${_rdep} (ignored)" - continue fi + echo " SONAME: $f <-> ${_sdep}" add_rundep "${_sdep}" done # From ffe849815d32d14ba862bdad2b09d2d92f74f355 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 9 Aug 2023 19:50:06 +0700 Subject: [PATCH 5/8] libreoffice: verify dependencies --- srcpkgs/libreoffice-epub | 1 - srcpkgs/libreoffice/template | 27 +++------------------------ 2 files changed, 3 insertions(+), 25 deletions(-) delete mode 120000 srcpkgs/libreoffice-epub diff --git a/srcpkgs/libreoffice-epub b/srcpkgs/libreoffice-epub deleted file mode 120000 index d5e3a56f35028..0000000000000 --- a/srcpkgs/libreoffice-epub +++ /dev/null @@ -1 +0,0 @@ -libreoffice \ No newline at end of file diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template index a5ade73cc1969..709ffe8d7161b 100644 --- a/srcpkgs/libreoffice/template +++ b/srcpkgs/libreoffice/template @@ -488,8 +488,9 @@ do_install() { libreoffice-common_package() { short_desc+=" - Common files" - depends="hunspell hyphen mythes openldap libreoffice-i18n-en-US>=${version}_${revision}" + depends="libreoffice-i18n-en-US>=${version}_${revision}" skiprdeps=/usr/lib/libreoffice/program/libofficebean.so + replaces="libreoffice-epub>=0" pkg_install() { _split common } @@ -498,7 +499,6 @@ libreoffice-common_package() { libreoffice-base_package() { short_desc+=" - Database frontend" depends="libreoffice-writer>=${version}_${revision}" - noverifyrdeps=yes pkg_install() { _split base } @@ -507,7 +507,6 @@ libreoffice-base_package() { libreoffice-calc_package() { short_desc+=" - Spreadsheet" depends="libreoffice-writer>=${version}_${revision}" - noverifyrdeps=yes pkg_install() { _split calc } @@ -516,7 +515,6 @@ libreoffice-calc_package() { libreoffice-draw_package() { short_desc+=" - Drawing application" depends="sane libreoffice-writer>=${version}_${revision}" - noverifyrdeps=yes pkg_install() { _split draw } @@ -556,8 +554,6 @@ libreoffice-fonts_package() { libreoffice-gnome_package() { short_desc+=" - GNOME integration" - depends="libreoffice-common>=${version}_${revision}" - noverifyrdeps=yes pkg_install() { _split gnome } @@ -566,7 +562,6 @@ libreoffice-gnome_package() { libreoffice-impress_package() { short_desc+=" - Presentation application" depends="libreoffice-writer>=${version}_${revision}" - noverifyrdeps=yes pkg_install() { _split impress } @@ -574,8 +569,6 @@ libreoffice-impress_package() { libreoffice-kde_package() { short_desc+=" - KDE integration" - depends="libreoffice-common>=${version}_${revision}" - noverifyrdeps=yes pkg_install() { cat > ${wrksrc}/file-lists/kde5_list.txt <<-EOF %dir /usr/lib/libreoffice/program @@ -593,8 +586,6 @@ libreoffice-kde_package() { libreoffice-qt6_package() { short_desc+=" - Qt6 integration" - depends="libreoffice-common>=${version}_${revision}" - noverifyrdeps=yes pkg_install() { cat > ${wrksrc}/file-lists/qt6_list.txt <<-EOF %dir /usr/lib/libreoffice/program @@ -615,7 +606,6 @@ libreoffice-kit_package() { libreoffice-math_package() { short_desc+=" - Equation editor" depends="libreoffice-writer>=${version}_${revision}" - noverifyrdeps=yes pkg_install() { _split math } @@ -623,8 +613,7 @@ libreoffice-math_package() { libreoffice-postgresql_package() { short_desc+=" - Connector for PostgreSQL" - depends="libreoffice-base>=${version}_${revision} libreoffice-common>=${version}_${revision}" - noverifyrdeps=yes + depends="libreoffice-base>=${version}_${revision}" pkg_install() { _split postgresql } @@ -632,25 +621,15 @@ libreoffice-postgresql_package() { libreoffice-writer_package() { short_desc+=" - Word processor" - depends="libreoffice-common>=${version}_${revision}" - noverifyrdeps=yes pkg_install() { _split writer } } -libreoffice-epub_package() { - short_desc+=" - EPUB output" - build_style=meta - depends="libreoffice-common>=${version}_${revision} libepubgen libabw libe-book - libetonyek libwps" -} - # Use a name which makes this catch-all subpackage the last one libreoffice-xtensions_package() { short_desc+=" - Extensions" depends="libreoffice-common>=${version}_${revision}" - noverifyrdeps=yes pkg_install() { # Remove empty files find ${DESTDIR}/all -size 0 -delete From 7910e7b236094c5e636e056af4d4575335ca9897 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 17 Aug 2023 09:35:21 +0700 Subject: [PATCH 6/8] mercury: verify runtime deps --- srcpkgs/mercury/template | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/srcpkgs/mercury/template b/srcpkgs/mercury/template index 078da62c329ee..07ab9363960bc 100644 --- a/srcpkgs/mercury/template +++ b/srcpkgs/mercury/template @@ -1,9 +1,8 @@ # Template file for 'mercury' pkgname=mercury version=22.01.3 -revision=1 +revision=2 hostmakedepends="flex bison gettext texinfo" -depends="mercury-libs>=${version}_${revision}" short_desc="Logic/Functional Programming Language" maintainer="Emily McDonough " license="GPL-2.0-only, custom:LGPL-2.0-only-linking-exception" @@ -11,7 +10,6 @@ homepage="https://mercurylang.org/" distfiles="https://dl.mercurylang.org/release/mercury-srcdist-${version}.tar.xz" checksum=4b0783ee9205021e4193b0404fd654e9c6fd288bc9bb7e144b1c1f6cd45dcd2e nocross="Mercury cannot be cross-compiled to different architectures" -noverifyrdeps=yes CFLAGS="-Wno-array-bounds -fno-tree-slp-vectorize" From 5d5648c2f37ff7b91efbaf7caafeed8f8d30d74b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 17 Aug 2023 07:05:45 +0700 Subject: [PATCH 7/8] (restricted): verify runtime deps --- common/shlibs | 1 + srcpkgs/CLion/template | 4 +--- srcpkgs/PhpStorm/template | 2 -- srcpkgs/intellij-idea-ultimate-edition/INSTALL.msg | 2 -- srcpkgs/intellij-idea-ultimate-edition/template | 9 ++++----- srcpkgs/jetbrains-jdk-bin/template | 4 ---- srcpkgs/protonmail-bridge/template | 13 +++++++++++-- srcpkgs/teamspeak3/template | 7 ++----- srcpkgs/zoom/template | 12 ++++++------ 9 files changed, 25 insertions(+), 29 deletions(-) delete mode 100644 srcpkgs/intellij-idea-ultimate-edition/INSTALL.msg diff --git a/common/shlibs b/common/shlibs index 4477d4c879782..311ced37789f5 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2052,6 +2052,7 @@ libQt6LabsSharedImage.so.6 qt6-declarative-6.1.0_1 libQt6LabsWavefrontMesh.so.6 qt6-declarative-6.1.0_1 libQt6QmlLocalStorage.so.6 qt6-declarative-6.1.0_1 libQt6QmlWorkerScript.so.6 qt6-declarative-6.0.0_1 +libQt6QmlXmlListModel.so.6 qt6-declarative-6.5.0_1 libQt6QuickTest.so.6 qt6-quick-test-6.4.2_1 libQt6QuickShapes.so.6 qt6-declarative-6.0.0_1 libQt6QuickWidgets.so.6 qt6-declarative-6.0.0_1 diff --git a/srcpkgs/CLion/template b/srcpkgs/CLion/template index f302b7d6798e9..cc924d23fe49c 100644 --- a/srcpkgs/CLion/template +++ b/srcpkgs/CLion/template @@ -1,7 +1,7 @@ # Template file for 'CLion' pkgname=CLion version=2021.3.4 -revision=1 +revision=2 archs="x86_64 aarch64" depends="jetbrains-jdk-bin giflib libXtst" short_desc="Smart cross-platform IDE for C and C++" @@ -13,8 +13,6 @@ checksum=f3b0b9e0dd0cd4aebef5d424e7a22868c732daad47d6c94f73630cef449ccf78 repository=nonfree restricted=yes nopie=yes -# JetBrains' tools are self-sufficient and while they include code that appears to be linked to libs from other packages, these libs are either included in the tool package, or the code works by looking for one of several supported libs. -noverifyrdeps=yes python_version=3 build_options="bundled_cmake bundled_gdb bundled_lldb" diff --git a/srcpkgs/PhpStorm/template b/srcpkgs/PhpStorm/template index 306a6c77d0b36..cb84a08e13636 100644 --- a/srcpkgs/PhpStorm/template +++ b/srcpkgs/PhpStorm/template @@ -13,8 +13,6 @@ checksum=a23922f5f93bc8df1f2aabbb0f9969e27d28f706c09d18d66d4cc2d56c52ddc9 repository=nonfree restricted=yes nopie=yes -# JetBrains' tools are self-sufficient and while they include code that appears to be linked to libs from other packages, these libs are either included in the tool package, or the code works by looking for one of several supported libs. -noverifyrdeps=yes python_version=3 post_extract() { diff --git a/srcpkgs/intellij-idea-ultimate-edition/INSTALL.msg b/srcpkgs/intellij-idea-ultimate-edition/INSTALL.msg deleted file mode 100644 index c04f6c9ab2a95..0000000000000 --- a/srcpkgs/intellij-idea-ultimate-edition/INSTALL.msg +++ /dev/null @@ -1,2 +0,0 @@ -IntelliJ Ultimate has the following optional dependencies: - libdbusmenu-glib: For global menu support diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template index 92ad9135f3a97..00c1186b589f7 100644 --- a/srcpkgs/intellij-idea-ultimate-edition/template +++ b/srcpkgs/intellij-idea-ultimate-edition/template @@ -1,10 +1,9 @@ # Template file for 'intellij-idea-ultimate-edition' pkgname=intellij-idea-ultimate-edition version=2021.3.3 -revision=1 +revision=2 archs="i686 x86_64" -create_wrksrc="true" -depends="giflib libXtst jetbrains-jdk-bin" +depends="giflib libXtst jetbrains-jdk-bin lldb-devel" short_desc="Most intelligent Java IDE" maintainer="Anton Afanasyev " license="custom:Commercial" @@ -15,9 +14,9 @@ checksum=2a3295fca08060ad515f6c7198879d09963724cfb36af3ea94f16dcd76636470 repository=nonfree restricted=yes nopie=yes -# JetBrains' tools are self-sufficient and while they include code that appears to be linked to libs from other packages, these libs are either included in the tool package, or the code works by looking for one of several supported libs. -noverifyrdeps=yes python_version=3 +# requires liblldb.so which is unversioned, pulled by lldb-devel +skiprdeps="/usr/lib/intellij-idea-ultimate-edition/plugins/Kotlin/bin/linux/LLDBFrontend" do_extract() { bsdtar xf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_filename} --strip-components=1 -C . diff --git a/srcpkgs/jetbrains-jdk-bin/template b/srcpkgs/jetbrains-jdk-bin/template index c275199504e8c..79534a1383f51 100644 --- a/srcpkgs/jetbrains-jdk-bin/template +++ b/srcpkgs/jetbrains-jdk-bin/template @@ -11,11 +11,7 @@ _jdk_ver=${version%b*} _jdk_build=${version#*b} distfiles="https://cache-redirector.jetbrains.com/intellij-jbr/jbr_jcef-${_jdk_ver//\./_}-linux-x64-b${_jdk_build}.tar.gz" checksum=192bc1c4d877a9035a08db8a4bc9ac98551fa344ec5835f08d455fab66c82fe0 -# This JDK appears to link to libs that do not exist, but functions well even in their absence. -# Best guess is that they are optional. ¯\_(ツ)_/¯ -noverifyrdeps=yes nopie=yes -noshlibprovides=yes do_install() { TARGET_PATH="usr/lib/jvm/jbrsdk" diff --git a/srcpkgs/protonmail-bridge/template b/srcpkgs/protonmail-bridge/template index 5d1315f6063ca..ff08aee8720d7 100644 --- a/srcpkgs/protonmail-bridge/template +++ b/srcpkgs/protonmail-bridge/template @@ -1,7 +1,7 @@ # Template file for 'protonmail-bridge' pkgname=protonmail-bridge version=3.3.0 -revision=1 +revision=2 archs="x86_64" create_wrksrc=yes depends="desktop-file-utils" @@ -13,9 +13,18 @@ distfiles="https://proton.me/download/bridge/protonmail-bridge_${version}-1_amd6 checksum=4541f8aa145097ee171889b0c9d058450d09dc23be10231c83d6659789a27627 restricted=yes -noverifyrdeps=yes nopie=yes do_install() { + rm -f usr/lib/protonmail/bridge/plugins/sqldrivers/libqsqlmysql.so + rm -f usr/lib/protonmail/bridge/plugins/sqldrivers/libqsqlodbc.so + rm -f usr/lib/protonmail/bridge/plugins/sqldrivers/libqsqlpsql.so + rm -rf usr/lib/protonmail/bridge/plugins/designer + rm -rf usr/lib/protonmail/bridge/plugins/qmltooling + rm -rf usr/lib/protonmail/bridge/qml/QtTest + rm -rf usr/lib/protonmail/bridge/qml/Qt/labs + rm -rf usr/lib/protonmail/bridge/lib/cmake + rm -rf usr/lib/protonmail/bridge/lib/pkgconfig + rm -rf usr/lib/protonmail/bridge/lib/*.a vcopy usr / } diff --git a/srcpkgs/teamspeak3/template b/srcpkgs/teamspeak3/template index 23ca26aeb08e9..bf0dcfd75b642 100644 --- a/srcpkgs/teamspeak3/template +++ b/srcpkgs/teamspeak3/template @@ -1,12 +1,10 @@ # Template file for 'teamspeak3' pkgname=teamspeak3 version=3.5.6 -revision=1 +revision=2 archs="i686 x86_64" -create_wrksrc=yes hostmakedepends="tar" -depends="glib bash grep freetype nss libXcomposite fontconfig glibc - libxslt dbus-libs alsa-lib libXi libXcursor libXtst libXScrnSaver pciutils" +depends="bash grep" short_desc="Popular proprietary voice chat for gaming" maintainer="Tai Chi Minh Ralph Eastwood " license="custom:Proprietary" @@ -15,7 +13,6 @@ restricted=yes repository="nonfree" nopie=yes nostrip=yes -noverifyrdeps=yes if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then _pkg="TeamSpeak3-Client-linux_amd64-${version}" diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template index 7b026f182ae7d..db3e3288bc05c 100644 --- a/srcpkgs/zoom/template +++ b/srcpkgs/zoom/template @@ -1,13 +1,10 @@ # Template file for 'zoom' pkgname=zoom version=5.15.3.4839 -revision=1 +revision=2 archs="x86_64" create_wrksrc=yes -depends="$(vopt_if systemqt 'qt5 qt5-graphicaleffects qt5-imageformats qt5-quickcontrols qt5-quickcontrols2 qt5-svg qt5-script qt5-declarative') - xcb-util-image xcb-util-keysyms glib libXfixes libXtst libgbm libglvnd - nss atk at-spi2-atk libXcomposite libXdamage libXrandr libxkbcommon pango - alsa-lib libcups libxshmfence pulseaudio-utils" +depends="libglvnd pulseaudio-utils" short_desc="Video Conferencing and Web Conferencing Service" maintainer="Orphaned " license="custom:Proprietary" @@ -16,13 +13,16 @@ distfiles="https://cdn.zoom.us/prod/${version}/zoom_x86_64.rpm" checksum=3dc36195400744ceacd025009e88549f7a8481a6964ef3276a4f753764e51ac6 repository=nonfree noshlibprovides=yes -noverifyrdeps=yes restricted=yes nopie=yes build_options="systemqt" desc_option_systemqt="Use system QT libraries" pre_install() { + # rm -rf opt/zoom/Qt/qml/QtQml/RemoteObjects + # rm -rf opt/zoom/Qt/qml/Qt/labs + # rm -rf opt/zoom/Qt/qml/QtQuick/Scene2D + # rm -rf opt/zoom/Qt/qml/QtQuick/Scene3D if [ "${build_option_systemqt}" ]; then rm -f opt/zoom/libQt5*.so{,.*} rm -f opt/zoom/libicu*.so{,.*} From 8d40f5ae6b015e7ef36e596fdab2cd0a98ec758c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 17 Aug 2023 11:04:58 +0700 Subject: [PATCH 8/8] common/shlibs: clean up --- common/shlibs | 49 ------------------------------------------------- 1 file changed, 49 deletions(-) diff --git a/common/shlibs b/common/shlibs index 311ced37789f5..f6a8230e3fc4b 100644 --- a/common/shlibs +++ b/common/shlibs @@ -131,13 +131,6 @@ libGL.so.1 libGL-7.11_1 libEGL.so.1 libEGL-7.11_1 libGLESv1_CM.so.1 libGLES-1.0_1 libGLESv2.so.2 libGLES-1.0_1 -libEGL.so rpi-userland-0.0.0.0.20150907_1 -libGLESv2.so rpi-userland-0.0.0.0.20150907_1 -libGLESv2.so opera-55.0.2994.37_2 -libGLESv2.so discord-0.0.7_1 -libGLESv2.so keybase-desktop-3.1.2_1 -libGLESv2.so Signal-Desktop-1.23.2_1 -libGLESv2.so slack-desktop-3.4.2_1 libbrcmEGL.so rpi-userland-20180103_2 libbrcmGLESv2.so rpi-userland-20180103_2 libbrcmOpenVG.so rpi-userland-20180103_2 @@ -1141,7 +1134,6 @@ libgstpbutils-1.0.so.0 gst-plugins-base1-1.0.0_1 libgstriff-1.0.so.0 gst-plugins-base1-1.0.0_1 libgstapp-1.0.so.0 gst-plugins-base1-1.0.0_1 libgstallocators-1.0.so.0 gst-plugins-base1-1.1.1_1 -libgsttranscoder-1.0.so.0 gst-plugins-bad1-1.22.1_1 libgstphotography-1.0.so.0 gst-plugins-bad1-1.18.3_2 libgstsignalprocessor-1.0.so.0 gst-plugins-bad1-1.18.3_2 libgstbasevideo-1.0.so.0 gst-plugins-bad1-1.18.3_2 @@ -1844,30 +1836,6 @@ libawt_xawt.so openjdk11-jre-11.0.5+10_1 libjava.so openjdk11-jre-11.0.5+10_1 libjli.so openjdk11-jre-11.0.5+10_1 libjvm.so openjdk11-jre-11.0.5+10_1 -libjawt.so openjdk7-bootstrap-7u221b02_1 -libawt.so openjdk7-bootstrap-7u221b02_1 -libawt_xawt.so openjdk7-bootstrap-7u221b02_1 -libjava.so openjdk7-bootstrap-7u221b02_1 -libjli.so openjdk7-bootstrap-7u221b02_1 -libjvm.so openjdk7-bootstrap-7u221b02_1 -libjawt.so openjdk9-bootstrap-9.0.4p12_1 -libawt.so openjdk9-bootstrap-9.0.4p12_1 -libawt_xawt.so openjdk9-bootstrap-9.0.4p12_1 -libjava.so openjdk9-bootstrap-9.0.4p12_1 -libjli.so openjdk9-bootstrap-9.0.4p12_1 -libjvm.so openjdk9-bootstrap-9.0.4p12_1 -libjawt.so openjdk10-bootstrap-10.0.2p13_1 -libawt.so openjdk10-bootstrap-10.0.2p13_1 -libawt_xawt.so openjdk10-bootstrap-10.0.2p13_1 -libjava.so openjdk10-bootstrap-10.0.2p13_1 -libjli.so openjdk10-bootstrap-10.0.2p13_1 -libjvm.so openjdk10-bootstrap-10.0.2p13_1 -libjawt.so mandrel-21.1.0.0_1 -libawt.so mandrel-21.1.0.0_1 -libawt_xawt.so mandrel-21.1.0.0_1 -libjava.so mandrel-21.1.0.0_1 -libjli.so mandrel-21.1.0.0_1 -libjvm.so mandrel-21.1.0.0_1 libucl.so.5 libucl-0.8.1_6 libhandle.so.1 xfsprogs-3.2.1_1 libnfnetlink.so.0 libnfnetlink-1.0.1_1 @@ -2642,16 +2610,10 @@ libglyphy.so.0 glyphy-0.0.20160104_1 libSwiften.so.0 swiften-4.0.3_2 libfreehand-0.1.so.1 libfreehand-0.1.1_1 libe-book-0.1.so.1 libe-book-0.1.2_1 -libOsi.so.1 CoinMP-1.8.3_1 -libClp.so.1 CoinMP-1.8.3_1 libCoinMP.so.1 CoinMP-1.8.3_1 libOsiCbc.so.3 CoinMP-1.8.3_1 -libCoinUtils.so.3 CoinMP-1.8.3_1 -libClpSolver.so.1 CoinMP-1.8.3_1 libCgl.so.1 CoinMP-1.8.3_1 -libOsiClp.so.1 CoinMP-1.8.3_1 libCbc.so.3 CoinMP-1.8.3_1 -libOsiCommonTests.so.1 CoinMP-1.8.3_1 libCbcSolver.so.3 CoinMP-1.8.3_1 libmwaw-0.3.so.3 libmwaw-0.3.7_1 libixion-0.17.so.0 libixion-0.17.0_1 @@ -2675,10 +2637,6 @@ leatherman_curl.so.1.12.4 leatherman-1.12.4_1 leatherman_dynamic_library.so.1.12.4 leatherman-1.12.4_1 leatherman_execution.so.1.12.4 leatherman-1.12.4_1 leatherman_ruby.so.1.12.4 leatherman-1.12.4_1 -libUTF.so opencollada-0.0.20160223_1 -libbuffer.so opencollada-0.0.20160223_1 -libftoa.so opencollada-0.0.20160223_1 -libzlib.so opencollada-1.6.51_1 libfbclient.so.2 libfbclient3-3.0.4.33054_1 libipmiutil.so.1 ipmiutil-3.1.3_4 libqxmpp.so.3 qxmpp-1.2.0_1 @@ -3646,12 +3604,6 @@ libTECkit.so.0 libteckit-2.5.8_1 libTECkit_Compiler.so.0 libteckit-2.5.8_1 libwf-config.so.1 wf-config-0.5.0_1 libQt5Pas.so.1 qt5pas-2.6~beta_1 -libClp.so.1 libClp-1.16.11_1 -libCoinUtils.so.3 libClp-1.16.11_1 -libOsiClp.so.1 libClp-1.16.11_1 -libClpSolver.so.1 libClp-1.16.11_1 -libOsiCommonTests.so.1 libClp-1.16.11_1 -libOsi.so.1 libClp-1.16.11_1 libOGDF.so libogdf-2018.03_1 libCOIN.so libogdf-2018.03_1 librocksdb.so.7 rocksdb-7.4.5_1 @@ -4189,7 +4141,6 @@ libThread.so root-6.24.06_1 libTMVA.so root-6.24.06_1 libMathCore.so root-6.24.06_1 libCore.so root-6.24.06_1 -libCore.so qtcreator-7.0.2_1 liblowdown.so.3 lowdown-1.0.2_1 libjaylink.so.0 libjaylink-0.2.0_1 libnvidia-container.so.1 libnvidia-container-1.10.0_1