commit 66c246569ff258c12aea2dcd417d17207ed648f5
Author: Jan Rękorajski <[email protected]>
Date: Tue Jul 6 00:19:29 2021 +0200
- rediff patches
- disable format security, warnings do not make sense
build.patch | 7 +--
linphone-cxx-autotools.patch | 104 +++++++++++++++++++++++--------------------
linphone-no-rebuild.patch | 7 +--
linphone-sh.patch | 11 ++---
linphone.spec | 3 +-
5 files changed, 71 insertions(+), 61 deletions(-)
---
diff --git a/linphone.spec b/linphone.spec
index f3952ab..a90752a 100644
--- a/linphone.spec
+++ b/linphone.spec
@@ -45,7 +45,6 @@ BuildRequires: intltool >= 0.40
BuildRequires: libnotify-devel >= 0.7.0
BuildRequires: libstdc++-devel
BuildRequires: libtool >= 2:2
-BuildRequires: libupnp-devel < 1.7
BuildRequires: libupnp-devel >= 1.6
BuildRequires: libxml2-devel >= 2.0
%{?with_system_mediastreamer:BuildRequires: mediastreamer-devel >= 2.12.1}
@@ -84,6 +83,8 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _noautoreq %{?_noautoreq_1} %{?_noautoreq_2}
%define _noautoprov %{?_noautoreq}
+%define filterout -Werror=format-security
+
%description
Linphone is a web phone: it let you phone to your friends anywhere in
the whole world, freely, simply by using the internet. The cost of the
diff --git a/build.patch b/build.patch
index 77c9d51..32b1e60 100644
--- a/build.patch
+++ b/build.patch
@@ -1,6 +1,7 @@
---- linphone-3.12.0/configure.ac~ 2018-09-29 12:18:42.000000000 +0200
-+++ linphone-3.12.0/configure.ac 2018-09-29 12:19:42.148451748 +0200
-@@ -1069,7 +1069,6 @@ AC_CONFIG_FILES([ po/Makefile.in
+diff -urNp -x '*.orig' linphone-3.12.0.org/configure.ac
linphone-3.12.0/configure.ac
+--- linphone-3.12.0.org/configure.ac 2021-07-06 00:14:06.029407541 +0200
++++ linphone-3.12.0/configure.ac 2021-07-06 00:14:06.246077365 +0200
+@@ -1069,7 +1069,6 @@ AC_CONFIG_FILES([
build/macos/Info-linphone.plist
build/macos/pkg-distribution.xml
m4/Makefile
diff --git a/linphone-cxx-autotools.patch b/linphone-cxx-autotools.patch
index 718d852..b1c8f24 100644
--- a/linphone-cxx-autotools.patch
+++ b/linphone-cxx-autotools.patch
@@ -1,42 +1,6 @@
---- linphone-3.12.0/wrappers/cpp/Makefile.am.orig 1970-01-01
01:00:00.000000000 +0100
-+++ linphone-3.12.0/wrappers/cpp/Makefile.am 2019-06-09 20:54:05.193613161
+0200
-@@ -0,0 +1,20 @@
-+lib_LTLIBRARIES = liblinphone++.la
-+liblinphone___la_CPPFLAGS = -DLINPHONECXX_EXPORTS
-+liblinphone___la_CXXFLAGS = -I$(builddir)/include -I$(top_builddir)/include
-I$(top_srcdir)/include $(BCTOOLBOX_CFLAGS) $(BELLESIP_CFLAGS)
-+liblinphone___la_SOURCES = object.cc tools.cc
-+nodist_liblinphone___la_SOURCES = src/linphone++.cc
-+liblinphone___la_LDFLAGS= -version-info $(LIBLINPHONE_SO_VERSION)
-no-undefined
-+liblinphone___la_LIBADD = $(top_builddir)/coreapi/liblinphone.la
$(BCTOOLBOX_LIBS) $(BELLESIP_LIBS)
-+
-+linphonexxincludedir = $(includedir)/linphone++
-+linphonexxinclude_HEADERS = object.hh
-+
-+pkgconfigdir = $(libdir)/pkgconfig
-+nodist_pkgconfig_DATA = linphone++.pc
-+
-+src/linphone++.cc include/linphone++/linphone.hh:
$(top_srcdir)/tools/genapixml.py $(top_srcdir)/tools/metadoc.py
$(top_srcdir)/tools/abstractapi.py genwrapper.py class_header.mustache
class_impl.mustache enums_header.mustache main_header.mustache
$(top_builddir)/coreapi/help/doc/doxygen/xml/index.xml
-+ $(PYTHON) $(srcdir)/genwrapper.py
$(top_builddir)/coreapi/help/doc/doxygen/xml
-+
-+install-data-hook:
-+ install -d $(DESTDIR)$(linphonexxincludedir)
-+ cp -p $(builddir)/include/linphone++/*.hh
$(DESTDIR)$(linphonexxincludedir)
---- linphone-3.12.0/wrappers/cpp/linphone++.pc.in.orig 1970-01-01
01:00:00.000000000 +0100
-+++ linphone-3.12.0/wrappers/cpp/linphone++.pc.in 2019-06-17
17:53:28.781100707 +0200
-@@ -0,0 +1,11 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Requires.private: linphone bctoolbox belle-sip
-+Name: liblinphone++
-+Description: C++ wrapper for linphone libraries.
-+Version: @VERSION@
-+Libs: -llinphone++
-+Cflags: -I$(includedir)
---- linphone-3.12.0/Makefile.am.orig 2017-04-06 11:25:59.000000000 +0200
-+++ linphone-3.12.0/Makefile.am 2019-06-09 20:54:34.416788179 +0200
+diff -urNp -x '*.orig' linphone-3.12.0.org/Makefile.am
linphone-3.12.0/Makefile.am
+--- linphone-3.12.0.org/Makefile.am 2017-04-06 11:25:59.000000000 +0200
++++ linphone-3.12.0/Makefile.am 2021-07-06 00:14:06.742751269 +0200
@@ -4,7 +4,7 @@
ACLOCAL_AMFLAGS = -I m4 $(ACLOCAL_MACOS_FLAGS)
@@ -46,9 +10,10 @@
GITVERSION=`cd $(top_srcdir) && git describe --always || echo $(VERSION)`
---- linphone-3.12.0/configure.ac.orig 2019-06-09 20:37:36.645635251 +0200
-+++ linphone-3.12.0/configure.ac 2019-06-09 20:54:59.119987683 +0200
-@@ -1073,6 +1073,12 @@
+diff -urNp -x '*.orig' linphone-3.12.0.org/configure.ac
linphone-3.12.0/configure.ac
+--- linphone-3.12.0.org/configure.ac 2021-07-06 00:14:06.539414973 +0200
++++ linphone-3.12.0/configure.ac 2021-07-06 00:14:06.742751269 +0200
+@@ -1073,6 +1073,12 @@ AC_CONFIG_FILES([
include/Makefile
include/linphone/Makefile
coreapi/Makefile
@@ -61,7 +26,7 @@
tester/Makefile
gtk/Makefile
console/Makefile
-@@ -1089,6 +1089,8 @@
+@@ -1089,6 +1095,8 @@ AC_CONFIG_FILES([
share/audio-assistant.desktop
scripts/Makefile
tools/Makefile
@@ -70,9 +35,10 @@
linphone.spec
linphone.iss
])
---- linphone-3.12.0/coreapi/Makefile.am.orig 2017-06-20 12:03:59.000000000
+0200
-+++ linphone-3.12.0/coreapi/Makefile.am 2019-06-09 21:50:46.738518743
+0200
-@@ -13,7 +13,7 @@
+diff -urNp -x '*.orig' linphone-3.12.0.org/coreapi/Makefile.am
linphone-3.12.0/coreapi/Makefile.am
+--- linphone-3.12.0.org/coreapi/Makefile.am 2017-06-20 12:03:59.000000000
+0200
++++ linphone-3.12.0/coreapi/Makefile.am 2021-07-06 00:14:06.742751269
+0200
+@@ -13,7 +13,7 @@ GITLOG=`cd $(top_srcdir) && git log -1 -
ECHO=/bin/echo
@@ -81,8 +47,9 @@
EXTRA_DIST=linphonecore_jni.cc $(GITVERSION_FILE)
---- linphone-3.12.0/coreapi/help/doc/doxygen/Makefile.am.orig 2017-06-20
12:03:59.000000000 +0200
-+++ linphone-3.12.0/coreapi/help/doc/doxygen/Makefile.am 2019-06-10
19:34:47.457985724 +0200
+diff -urNp -x '*.orig'
linphone-3.12.0.org/coreapi/help/doc/doxygen/Makefile.am
linphone-3.12.0/coreapi/help/doc/doxygen/Makefile.am
+--- linphone-3.12.0.org/coreapi/help/doc/doxygen/Makefile.am 2017-06-20
12:03:59.000000000 +0200
++++ linphone-3.12.0/coreapi/help/doc/doxygen/Makefile.am 2021-07-06
00:14:06.742751269 +0200
@@ -1,6 +1,6 @@
EXTRA_DIST=Doxyfile.in doxygen.dox
@@ -91,7 +58,7 @@
if HAVE_DOXYGEN
-@@ -9,21 +9,21 @@
+@@ -9,21 +9,21 @@ pkgdocdir=$(docdir)/$(PACKAGE)-$(VERSION
doc_htmldir=$(pkgdocdir)/html
doc_xmldir=$(pkgdocdir)/xml
@@ -121,3 +88,42 @@
install-data-hook:
+diff -urNp -x '*.orig' linphone-3.12.0.org/wrappers/cpp/Makefile.am
linphone-3.12.0/wrappers/cpp/Makefile.am
+--- linphone-3.12.0.org/wrappers/cpp/Makefile.am 1970-01-01
01:00:00.000000000 +0100
++++ linphone-3.12.0/wrappers/cpp/Makefile.am 2021-07-06 00:14:06.742751269
+0200
+@@ -0,0 +1,20 @@
++lib_LTLIBRARIES = liblinphone++.la
++liblinphone___la_CPPFLAGS = -DLINPHONECXX_EXPORTS
++liblinphone___la_CXXFLAGS = -I$(builddir)/include -I$(top_builddir)/include
-I$(top_srcdir)/include $(BCTOOLBOX_CFLAGS) $(BELLESIP_CFLAGS)
++liblinphone___la_SOURCES = object.cc tools.cc
++nodist_liblinphone___la_SOURCES = src/linphone++.cc
++liblinphone___la_LDFLAGS= -version-info $(LIBLINPHONE_SO_VERSION)
-no-undefined
++liblinphone___la_LIBADD = $(top_builddir)/coreapi/liblinphone.la
$(BCTOOLBOX_LIBS) $(BELLESIP_LIBS)
++
++linphonexxincludedir = $(includedir)/linphone++
++linphonexxinclude_HEADERS = object.hh
++
++pkgconfigdir = $(libdir)/pkgconfig
++nodist_pkgconfig_DATA = linphone++.pc
++
++src/linphone++.cc include/linphone++/linphone.hh:
$(top_srcdir)/tools/genapixml.py $(top_srcdir)/tools/metadoc.py
$(top_srcdir)/tools/abstractapi.py genwrapper.py class_header.mustache
class_impl.mustache enums_header.mustache main_header.mustache
$(top_builddir)/coreapi/help/doc/doxygen/xml/index.xml
++ $(PYTHON) $(srcdir)/genwrapper.py
$(top_builddir)/coreapi/help/doc/doxygen/xml
++
++install-data-hook:
++ install -d $(DESTDIR)$(linphonexxincludedir)
++ cp -p $(builddir)/include/linphone++/*.hh
$(DESTDIR)$(linphonexxincludedir)
+diff -urNp -x '*.orig' linphone-3.12.0.org/wrappers/cpp/linphone++.pc.in
linphone-3.12.0/wrappers/cpp/linphone++.pc.in
+--- linphone-3.12.0.org/wrappers/cpp/linphone++.pc.in 1970-01-01
01:00:00.000000000 +0100
++++ linphone-3.12.0/wrappers/cpp/linphone++.pc.in 2021-07-06
00:14:06.742751269 +0200
+@@ -0,0 +1,11 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Requires.private: linphone bctoolbox belle-sip
++Name: liblinphone++
++Description: C++ wrapper for linphone libraries.
++Version: @VERSION@
++Libs: -llinphone++
++Cflags: -I$(includedir)
diff --git a/linphone-no-rebuild.patch b/linphone-no-rebuild.patch
index e5ea8f7..111aa09 100644
--- a/linphone-no-rebuild.patch
+++ b/linphone-no-rebuild.patch
@@ -1,6 +1,7 @@
---- linphone-3.12.0/coreapi/Makefile.am.orig 2019-06-17 18:45:57.727374734
+0200
-+++ linphone-3.12.0/coreapi/Makefile.am 2019-06-17 19:13:50.548312285
+0200
-@@ -205,7 +205,7 @@
+diff -urNp -x '*.orig' linphone-3.12.0.org/coreapi/Makefile.am
linphone-3.12.0/coreapi/Makefile.am
+--- linphone-3.12.0.org/coreapi/Makefile.am 2021-07-06 00:14:07.039422258
+0200
++++ linphone-3.12.0/coreapi/Makefile.am 2021-07-06 00:14:07.249425317
+0200
+@@ -205,7 +205,7 @@ make_gitversion_h:
cp -f $(builddir)/$(GITVERSION_FILE_TMP)
$(builddir)/$(GITVERSION_FILE) ; \
fi ; \
rm -f $(builddir)/$(GITVERSION_FILE_TMP) ; \
diff --git a/linphone-sh.patch b/linphone-sh.patch
index e747175..571001f 100644
--- a/linphone-sh.patch
+++ b/linphone-sh.patch
@@ -1,6 +1,7 @@
---- linphone-3.10.2/configure.ac~ 2016-08-30 16:20:09.000000000 +0200
-+++ linphone-3.10.2/configure.ac 2018-09-26 15:05:58.553546486 +0200
-@@ -898,11 +898,11 @@ if test x$enable_vcard != xfalse; then
+diff -urNp -x '*.orig' linphone-3.12.0.org/configure.ac
linphone-3.12.0/configure.ac
+--- linphone-3.12.0.org/configure.ac 2017-06-29 11:20:47.000000000 +0200
++++ linphone-3.12.0/configure.ac 2021-07-06 00:14:05.732736552 +0200
+@@ -922,11 +922,11 @@ if test x$enable_vcard != xfalse; then
if test "$found_vcard" = "no"; then
dnl Check the lib presence in case the PKG-CONFIG version is
not found
AC_LANG_CPLUSPLUS
@@ -14,7 +15,7 @@
enable_vcard=true
else
if test x$enable_vcard = xtrue; then
-@@ -931,12 +931,12 @@ if test x$enable_sqlite_storage != xfals
+@@ -955,12 +955,12 @@ if test x$enable_sqlite_storage != xfals
PKG_CHECK_MODULES(SQLITE3,[sqlite3 >=
3.6.0],[found_sqlite=yes],[found_sqlite=no])
if test "$found_sqlite" = "no"; then
dnl Check the lib presence in case the PKG-CONFIG version is
not found
@@ -28,5 +29,5 @@
- SQLITE3_LIBS+=" -liconv"
+ SQLITE3_LIBS="$SQLITE3_LIBS -liconv"
fi
- enable_msg_storage=true
+ enable_sqlite_storage=true
else
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/linphone.git/commitdiff/66c246569ff258c12aea2dcd417d17207ed648f5
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
