Hello community, here is the log from the commit of package linphone for openSUSE:Factory checked in at 2020-10-07 14:18:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/linphone (Old) and /work/SRC/openSUSE:Factory/.linphone.new.4249 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "linphone" Wed Oct 7 14:18:31 2020 rev:63 rq:839903 version:4.4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/linphone/linphone.changes 2020-08-03 14:16:09.324545380 +0200 +++ /work/SRC/openSUSE:Factory/.linphone.new.4249/linphone.changes 2020-10-07 14:18:38.713493262 +0200 @@ -1,0 +2,7 @@ +Tue Oct 6 22:09:27 UTC 2020 - Benjamin Greiner <[email protected]> + +- Force linking to libsoci_sqlite3 + * boo#1140595 (comment 15) + * linphone-link-soci-sqlite3.patch + +------------------------------------------------------------------- New: ---- linphone-link-soci-sqlite3.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linphone.spec ++++++ --- /var/tmp/diff_new_pack.d6WO4S/_old 2020-10-07 14:18:40.081494350 +0200 +++ /var/tmp/diff_new_pack.d6WO4S/_new 2020-10-07 14:18:40.085494353 +0200 @@ -32,6 +32,8 @@ Patch1: linphone-build-readline.patch # PATCH-FIX-UPSTREAM Patch2: reproducible.patch +# PATCH-FIX-OPENSUSE linphone-link-soci-sqlite3.patch -- force linking to libsoci_sqlite3 so that RPM finds the requirement boo#1140595 -- [email protected] +Patch3: linphone-link-soci-sqlite3.patch BuildRequires: cmake BuildRequires: doxygen BuildRequires: fdupes @@ -177,7 +179,8 @@ -DENABLE_LDAP=ON \ -DENABLE_TOOLS=OFF \ -DENABLE_STRICT=OFF \ - -DENABLE_STATIC=OFF + -DENABLE_STATIC=OFF \ + -DCMAKE_LINK_WHAT_YOU_USE=ON %cmake_build %install ++++++ linphone-link-soci-sqlite3.patch ++++++ Index: liblinphone-4.4.0/CMakeLists.txt =================================================================== --- liblinphone-4.4.0.orig/CMakeLists.txt +++ liblinphone-4.4.0/CMakeLists.txt @@ -138,12 +138,7 @@ find_package(Sqlite3 REQUIRED) find_package(XML2 REQUIRED) if (ENABLE_DB_STORAGE) - #APPLE platform does not use dlopen for soci backend - if (APPLE OR ANDROID) - find_package(Soci REQUIRED COMPONENTS sqlite3) - else() - find_package(Soci REQUIRED) - endif() + find_package(Soci REQUIRED COMPONENTS sqlite3) set(HAVE_DB_STORAGE 1) endif() Index: liblinphone-4.4.0/src/CMakeLists.txt =================================================================== --- liblinphone-4.4.0.orig/src/CMakeLists.txt +++ liblinphone-4.4.0/src/CMakeLists.txt @@ -60,11 +60,8 @@ if(ZLIB_FOUND) endif() if (ENABLE_DB_STORAGE) if (SOCI_FOUND) - #take care of the order for static link - if(APPLE OR ANDROID) - list(APPEND INTERFACE_LIBS ${SOCI_sqlite3_PLUGIN}) - list(APPEND LINK_LIBS ${SOCI_sqlite3_PLUGIN}) - endif() + list(APPEND INTERFACE_LIBS ${SOCI_sqlite3_PLUGIN}) + list(APPEND LINK_LIBS ${SOCI_sqlite3_PLUGIN}) list(APPEND INTERFACE_LIBS soci) list(APPEND LINK_LIBS ${SOCI_LIBRARIES}) endif()
