Hello community,

here is the log from the commit of package linphone for openSUSE:Factory 
checked in at 2018-02-23 15:29:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/linphone (Old)
 and      /work/SRC/openSUSE:Factory/.linphone.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "linphone"

Fri Feb 23 15:29:23 2018 rev:59 rq:578782 version:3.12.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/linphone/linphone.changes        2018-02-21 
14:11:59.253074353 +0100
+++ /work/SRC/openSUSE:Factory/.linphone.new/linphone.changes   2018-02-23 
15:29:24.435369772 +0100
@@ -1,0 +2,7 @@
+Wed Feb 21 13:09:12 UTC 2018 - sor.ale...@meowr.ru
+
+- Add linphone-build-readline.patch: Add the ability to compile
+  with readline to the build system.
+- Build with the readline support.
+
+-------------------------------------------------------------------

New:
----
  linphone-build-readline.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ linphone.spec ++++++
--- /var/tmp/diff_new_pack.iakt8X/_old  2018-02-23 15:29:26.127308644 +0100
+++ /var/tmp/diff_new_pack.iakt8X/_new  2018-02-23 15:29:26.131308500 +0100
@@ -33,6 +33,8 @@
 Patch0:         linphone-fix-pkgconfig.patch
 # PATCH-FIX-OPENSUSE linphone-fix-gtkui-build.patch -- Fix building of GtkUI.
 Patch1:         linphone-fix-gtkui-build.patch
+# PATCH-FEATURE-OPENSUSE linphone-build-readline.patch sor.ale...@meowr.ru -- 
Add the ability to compile with readline to the build system.
+Patch2:         linphone-build-readline.patch
 BuildRequires:  cmake
 BuildRequires:  doxygen
 BuildRequires:  fdupes
@@ -193,6 +195,7 @@
 %setup -q -D -T -a 1
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %cmake \

++++++ linphone-build-readline.patch ++++++
--- a/cmake/FindReadline.cmake
+++ b/cmake/FindReadline.cmake
@@ -0,0 +1,58 @@
+############################################################################
+# FindReadline.cmake
+# Copyright (C) 2014  Belledonne Communications, Grenoble France
+#
+############################################################################
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, 
USA.
+#
+############################################################################
+#
+# - Find the readline include file and library
+#
+#  READLINE_FOUND - system has readline
+#  READLINE_INCLUDE_DIRS - the readline include directory
+#  READLINE_LIBRARIES - The libraries needed to use readline
+
+if(APPLE AND NOT IOS)
+       set(READLINE_HINTS "/usr")
+endif()
+if(READLINE_HINTS)
+       set(READLINE_LIBRARIES_HINTS "${READLINE_HINTS}/lib")
+endif()
+
+find_path(READLINE_INCLUDE_DIRS
+       NAMES readline.h
+       HINTS "${READLINE_HINTS}"
+       PATH_SUFFIXES include/readline
+)
+
+if(READLINE_INCLUDE_DIRS)
+       set(HAVE_READLINE_H 1)
+       set(HAVE_HISTORY_H 1)
+endif()
+
+find_library(READLINE_LIBRARIES
+       NAMES readline
+       HINTS "${READLINE_LIBRARIES_HINTS}"
+)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Readline
+       DEFAULT_MSG
+       READLINE_INCLUDE_DIRS READLINE_LIBRARIES HAVE_READLINE_H HAVE_HISTORY_H
+)
+
+mark_as_advanced(READLINE_INCLUDE_DIRS READLINE_LIBRARIES HAVE_READLINE_H 
HAVE_HISTORY_H)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,6 +56,7 @@ option(ENABLE_TUTORIALS "Enable compilat
 option(ENABLE_UNIT_TESTS "Enable compilation of unit tests." YES)
 option(ENABLE_UPDATE_CHECK "Enable update check." NO)
 option(ENABLE_VIDEO "Build with video support." YES)
+cmake_dependent_option(ENABLE_READLINE "Enable readline support." YES 
"ENABLE_CONSOLE_UI" NO)
 cmake_dependent_option(ENABLE_ASSISTANT "Turn on assistant compiling." YES 
"ENABLE_GTK_UI" NO)
 option(ENABLE_DEBUG_LOGS "Turn on or off debug level logs." NO)
 option(ENABLE_NLS "Build with internationalisation support" YES)
@@ -137,6 +138,15 @@ endif()
 if(ENABLE_SQLITE_STORAGE)
        find_package(Sqlite3 REQUIRED)
 endif()
+if(ENABLE_READLINE)
+       find_package(Readline)
+       if(READLINE_FOUND)
+               set(HAVE_READLINE 1)
+       else()
+               message(WARNING "Could not find the readline library!")
+               set(ENABLE_READLINE OFF CACHE BOOL "Enable readline support." 
FORCE)
+       endif()
+endif()
 if(ENABLE_NOTIFY)
        find_package(Notify)
        if(NOTIFY_FOUND)
@@ -267,7 +277,7 @@ if(MSVC)
        endif()
 else()
        list(APPEND STRICT_OPTIONS_CPP "-Wall" "-Wuninitialized" 
"-Wno-error=deprecated-declarations")
-       list(APPEND STRICT_OPTIONS_C "-Wstrict-prototypes" 
"-Werror=strict-prototypes")
+       list(APPEND STRICT_OPTIONS_C "-Wstrict-prototypes")
        if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
                list(APPEND STRICT_OPTIONS_C "-fno-inline-small-functions")
        endif()
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -42,6 +42,9 @@
 #cmakedefine HAVE_GTK_OSX 1
 #cmakedefine HAVE_NOTIFY4
 #cmakedefine HAVE_ZLIB 1
+#cmakedefine HAVE_READLINE
+#cmakedefine HAVE_READLINE_H
+#cmakedefine HAVE_HISTORY_H
 #cmakedefine HAVE_CU_GET_SUITE 1
 #cmakedefine HAVE_CU_CURSES 1
 #cmakedefine HAVE_LIBUDEV_H 0
--- a/console/CMakeLists.txt
+++ b/console/CMakeLists.txt
@@ -40,6 +40,10 @@ add_executable(linphonec ${LINPHONEC_SOU
 target_link_libraries(linphonec ${LINPHONE_LIBS_FOR_TOOLS} 
${BCTOOLBOX_CORE_LIBRARIES} ${ORTP_LIBRARIES} ${MEDIASTREAMER2_LIBRARIES})
 set_target_properties(linphonec PROPERTIES LINK_FLAGS "${LINPHONE_LDFLAGS}")
 
+if(READLINE_FOUND)
+       target_include_directories(linphonec PUBLIC ${READLINE_INCLUDE_DIRS})
+       target_link_libraries(linphonec ${READLINE_LIBRARIES})
+endif()
 if(INTL_FOUND)
        target_link_libraries(linphonec ${INTL_LIBRARIES})
 endif()
@@ -47,6 +51,10 @@ endif()
 if(WIN32)
        add_executable(linphoned WIN32 ${LINPHONEC_SOURCE_FILES})
        target_link_libraries(linphoned ${LINPHONE_LIBS_FOR_TOOLS} 
${BCTOOLBOX_CORE_LIBRARIES} ${ORTP_LIBRARIES} ${MEDIASTREAMER2_LIBRARIES})
+       if(READLINE_FOUND)
+               target_include_directories(linphoned PUBLIC 
${READLINE_INCLUDE_DIRS})
+               target_link_libraries(linphoned ${READLINE_LIBRARIES})
+       endif()
        if(INTL_FOUND)
                target_link_libraries(linphoned ${INTL_LIBRARIES})
        endif()
@@ -56,6 +64,11 @@ add_executable(linphonecsh ${LINPHONECSH
 target_link_libraries(linphonecsh ${LINPHONE_LIBS_FOR_TOOLS} ${ORTP_LIBRARIES})
 set_target_properties(linphonecsh PROPERTIES LINK_FLAGS "${LINPHONE_LDFLAGS}")
 
+if(READLINE_FOUND)
+       target_include_directories(linphonecsh PUBLIC ${READLINE_INCLUDE_DIRS})
+       target_link_libraries(linphonecsh ${READLINE_LIBRARIES})
+endif()
+
 set(INSTALL_TARGETS linphonec linphonecsh)
 if(WIN32)
        list(APPEND INSTALL_TARGETS linphoned)
--- a/daemon/CMakeLists.txt
+++ b/daemon/CMakeLists.txt
@@ -118,6 +118,11 @@ target_include_directories(linphone-daem
 target_link_libraries(linphone-daemon ${LINPHONE_LIBS_FOR_TOOLS} 
${MEDIASTREAMER2_LIBRARIES} ${ORTP_LIBRARIES} ${BCTOOLBOX_CORE_LIBRARIES})
 set_target_properties(linphone-daemon PROPERTIES LINK_FLAGS 
"${LINPHONE_LDFLAGS}")
 
+if(READLINE_FOUND)
+       target_include_directories(linphone-daemon PUBLIC 
${READLINE_INCLUDE_DIRS})
+       target_link_libraries(linphone-daemon ${READLINE_LIBRARIES})
+endif()
+
 add_executable(linphone-daemon-pipetest ${DAEMON_PIPETEST_SOURCE_FILES})
 target_link_libraries(linphone-daemon-pipetest ${LINPHONE_LIBS_FOR_TOOLS} 
${ORTP_LIBRARIES})
 set_target_properties(linphone-daemon-pipetest PROPERTIES LINK_FLAGS 
"${LINPHONE_LDFLAGS}")
--- a/daemon/daemon.cc
+++ b/daemon/daemon.cc
@@ -28,11 +28,6 @@ Inc., 51 Franklin Street, Fifth Floor, B
 #include <functional>
 #include <limits>
 
-#ifdef HAVE_READLINE
-#include <readline/readline.h>
-#include <readline/history.h>
-#endif
-
 #ifndef _WIN32
 #include <poll.h>
 #endif
--- a/Makefile.am
+++ b/Makefile.am
@@ -67,6 +67,7 @@ EXTRA_DIST = \
        cmake/FindIconv.cmake \
        cmake/FindIntl.cmake \
        cmake/FindNotify.cmake \
+       cmake/FindReadline.cmake \
        cmake/FindSqlite3.cmake \
        cmake/FindXML2.cmake \
        cmake/FindZlib.cmake \

Reply via email to