commit ekiga for openSUSE:Factory

3 May 2019

Hello community,

here is the log from the commit of package ekiga for openSUSE:Factory checked in at 2019-05-03 22:46:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ekiga (Old)
 and      /work/SRC/openSUSE:Factory/.ekiga.new.5148 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "ekiga"

Fri May  3 22:46:06 2019 rev:60 rq:696488 version:4.1.0

Changes:
--------

--- /work/SRC/openSUSE:Factory/ekiga/ekiga.changes	2018-05-11 11:28:23.472126880 +0200
+++ /work/SRC/openSUSE:Factory/.ekiga.new.5148/ekiga.changes	2019-05-03 22:46:08.379729694 +0200
@@ -1,0 +2,17 @@
+Tue Apr  2 16:41:44 CEST 2019 - ro@suse.de
+
+- get rid of boost:signal dependency
+  - rebase to git commit 12641b735a9886a080949465d4da6d4569822ed2
+  - use 4.1.0 as version
+  - add patches to make it compile:
+    - ekiga-po-Makefile.patch (re-add po/Makefile.in.in)
+    - ekiga-signals2-leftover.patch (fix a left over signal1 incl)
+    - ekiga-missing-includes.patch (include iostream where needed)  
+- use -fexceptions for builds older than code15
+
+-------------------------------------------------------------------
+Tue Mar  5 16:10:36 UTC 2019 - Andreas Schwab <schwab@suse.de>
+
+- boost-configure.patch: add riscv64 to the list of lib64 architectures
+
+-------------------------------------------------------------------

Old:
----
  ekiga-4.0.1.tar.xz

New:
----
  ekiga-12641b735a9886a080949465d4da6d4569822ed2.tar.bz2
  ekiga-missing-includes.patch
  ekiga-po-Makefile.patch
  ekiga-signals2-leftover.patch

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

Other differences:
------------------
++++++ ekiga.spec ++++++
--- /var/tmp/diff_new_pack.a4i8ok/_old	2019-05-03 22:46:09.383731999 +0200
+++ /var/tmp/diff_new_pack.a4i8ok/_new	2019-05-03 22:46:09.383731999 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package ekiga
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,20 +12,21 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
 %define with_evolution 1
 %define with_gstreamer_0_10 0
 Name:           ekiga
-Version:        4.0.1
+Version:        4.1.0
 Release:        0
 Summary:        A GNOME based SIP/H323 teleconferencing application
 License:        SUSE-GPL-2.0-with-openssl-exception
 Group:          Productivity/Telephony/SIP/Clients
 Url:            http://www.ekiga.org/
-Source:         http://download.gnome.org/sources/ekiga/4.0/%{name}-%{version}.tar.xz
+#Source:         http://download.gnome.org/sources/ekiga/4.0/%{name}-%{version}.tar.xz
+Source:         ekiga-12641b735a9886a080949465d4da6d4569822ed2.tar.bz2
 # PATCH-FIX-UPSTREAM boost-configure.patch schwab@suse.de -- AX_BOOST_BASE: add aarch64 to the list of lib64 architectures
 Patch0:         boost-configure.patch
 # PATCH-FIX-UPSTREAM ekiga-appdata.patch badshah400@gmail.com -- Add, translate and install appstream metainfo file taken from upstream git
@@ -36,9 +37,12 @@
 Patch3:		ekiga-4.0.1-libresolv.patch
 # PATCH-FIX-UPSTREAM ekiga-dont-require-gnome-icon-theme.patch badshah400@opensuse.org -- Patch configure.ac to not check for gnome-icon-theme; all required icons are already in hicolor-icon-theme.
 Patch4:         ekiga-dont-require-gnome-icon-theme.patch
+Patch5:         ekiga-po-Makefile.patch
+Patch6:         ekiga-signals2-leftover.patch
+Patch7:         ekiga-missing-includes.patch
 
 %if 0%{?suse_version} > 1325
-BuildRequires:  libboost_signals-devel
+BuildRequires:  libboost_headers-devel
 %else
 BuildRequires:  boost-devel
 %endif
@@ -48,7 +52,10 @@
 BuildRequires:  gcc-c++
 BuildRequires:  gconf2-devel
 BuildRequires:  gnome-doc-utils-devel
-BuildRequires:  gtk2-devel
+BuildRequires:  gtk3-devel
+BuildRequires:  clutter-gtk-devel
+BuildRequires:  gstreamer-plugins-base-devel
+BuildRequires:  libgudev-1_0-devel
 BuildRequires:  intltool
 BuildRequires:  libavahi-glib-devel
 BuildRequires:  libnotify-devel
@@ -61,6 +68,7 @@
 BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
 BuildRequires:  pkgconfig(xv)
+BuildRequires:  gettext
 # Required for Patch1
 BuildRequires:  libtool
 Requires:       hicolor-icon-theme
@@ -110,15 +118,22 @@
 %lang_package
 
 %prep
-%setup -q
+%setup -q -n ekiga
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
 translation-update-upstream
+cp -av /usr/share/gnome-doc-utils/gnome-doc-utils.make .
 
 %build
+%if 0%{?suse_version} < 1500
+export CXXFLAGS="%optflags -fexceptions"
+%endif
 autoreconf -fi
 %configure \
     --disable-schemas-install \

++++++ boost-configure.patch ++++++
--- /var/tmp/diff_new_pack.a4i8ok/_old	2019-05-03 22:46:09.399732036 +0200
+++ /var/tmp/diff_new_pack.a4i8ok/_new	2019-05-03 22:46:09.399732036 +0200
@@ -1,26 +1,11 @@
-Index: ekiga-4.0.1/configure
-===================================================================
---- ekiga-4.0.1.orig/configure
-+++ ekiga-4.0.1/configure
-@@ -17800,7 +17800,7 @@ $as_echo_n "checking for boostlib >= $bo
- 
-                         libsubdirs="lib"
-     ax_arch=`uname -m`
--    if test $ax_arch = x86_64 -o $ax_arch = ppc64 -o $ax_arch = s390x -o $ax_arch = sparc64; then
-+    if test $ax_arch = x86_64 -o $ax_arch = ppc64 -o $ax_arch = s390x -o $ax_arch = sparc64 -o $ax_arch = aarch64 -o $ax_arch = ppc64le ; then
-         libsubdirs="lib64 lib lib64"
-     fi
- 
-Index: ekiga-4.0.1/m4/ax_boost_base.m4
-===================================================================
---- ekiga-4.0.1.orig/m4/ax_boost_base.m4
-+++ ekiga-4.0.1/m4/ax_boost_base.m4
-@@ -91,7 +91,7 @@ if test "x$want_boost" = "xyes"; then
-     dnl are found, e.g. when only header-only libraries are installed!
+--- ekiga/m4/ax_boost_base.m4	2019/04/02 13:20:49	1.1
++++ ekiga/m4/ax_boost_base.m4	2019/04/02 13:20:54
+@@ -92,7 +92,7 @@
      libsubdirs="lib"
      ax_arch=`uname -m`
--    if test $ax_arch = x86_64 -o $ax_arch = ppc64 -o $ax_arch = s390x -o $ax_arch = sparc64; then
-+    if test $ax_arch = x86_64 -o $ax_arch = ppc64 -o $ax_arch = s390x -o $ax_arch = sparc64 -o $ax_arch = aarch64 -o $ax_arch = ppc64le ; then
+     case $ax_arch in
+-      x86_64|ppc64|s390x|sparc64|aarch64)
++      x86_64|ppc64|s390x|sparc64|aarch64|ppc64le|riscv64)
          libsubdirs="lib64 lib lib64"
-     fi
- 
+         ;;
+     esac

++++++ ekiga-4.0.1.tar.xz -> ekiga-12641b735a9886a080949465d4da6d4569822ed2.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/ekiga/ekiga-4.0.1.tar.xz /work/SRC/openSUSE:Factory/.ekiga.new.5148/ekiga-12641b735a9886a080949465d4da6d4569822ed2.tar.bz2 differ: char 1, line 1

++++++ ekiga-dont-require-gnome-icon-theme.patch ++++++
--- /var/tmp/diff_new_pack.a4i8ok/_old	2019-05-03 22:46:09.423732090 +0200
+++ /var/tmp/diff_new_pack.a4i8ok/_new	2019-05-03 22:46:09.427732100 +0200
@@ -1,13 +1,11 @@
-Index: ekiga-4.0.1/configure.ac
-===================================================================
---- ekiga-4.0.1.orig/configure.ac
-+++ ekiga-4.0.1/configure.ac
-@@ -155,7 +155,7 @@ dnl ###############################
+--- ekiga/configure.ac	2019/04/02 13:21:51	1.1
++++ ekiga/configure.ac	2019/04/02 13:22:00
+@@ -155,7 +155,7 @@
  if test "x${gm_platform}" = "xmingw" ; then
-    PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.20.0])
+    PKG_CHECK_MODULES([GTK], [gtk+-3.0 >= 3.4.0])
  else
--   PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.20.0 gnome-icon-theme >= 3.0.0])
-+   PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.20.0])
+-   PKG_CHECK_MODULES([GTK], [gtk+-3.0 >= 3.4.0 gnome-icon-theme >= 3.0.0])
++   PKG_CHECK_MODULES([GTK], [gtk+-3.0 >= 3.4.0])
  fi
  PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.24.0 gmodule-2.0 gobject-2.0 gthread-2.0])
  AC_ARG_ENABLE([gtk-debug],

++++++ ekiga-missing-includes.patch ++++++
--- ekiga/plugins/avahi/avahi-heap.cpp	2019/04/02 14:08:47	1.1
+++ ekiga/plugins/avahi/avahi-heap.cpp	2019/04/02 14:09:00
@@ -36,6 +36,7 @@
  */
 
 #include <cstdlib>
+#include <iostream>
 #include <glib/gi18n.h>
 
 #include "avahi-heap.h"
--- ekiga/plugins/resource-list/rl-presentity.cpp	2019/04/02 14:23:25	1.1
+++ ekiga/plugins/resource-list/rl-presentity.cpp	2019/04/02 14:23:38
@@ -34,6 +34,7 @@
  */
 
 #include <algorithm>
+#include <iostream>
 #include <set>
 
 #include <glib/gi18n.h>
--- ekiga/plugins/resource-list/rl-entry-ref.cpp	2019/04/02 14:24:07	1.1
+++ ekiga/plugins/resource-list/rl-entry-ref.cpp	2019/04/02 14:24:20
@@ -35,6 +35,8 @@
  *
  */
 
+#include <iostream>
+
 #include "config.h"
 
 #include <glib/gi18n-lib.h>
--- ekiga/plugins/resource-list/rl-heap.cpp	2019/04/02 14:30:57	1.1
+++ ekiga/plugins/resource-list/rl-heap.cpp	2019/04/02 14:31:09
@@ -35,6 +35,8 @@
  *
  */
 
+#include <iostream>
+
 #include <glib/gi18n.h>
 
 #include "robust-xml.h"
++++++ ekiga-po-Makefile.patch ++++++
--- ekiga/po/Makefile.in.in	2019/04/02 13:54:11	1.1
+++ ekiga/po/Makefile.in.in	2019/04/02 13:54:17
@@ -0,0 +1,222 @@
+# Makefile for program source directory in GNU NLS utilities package.
+# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
+# Copyright (C) 2004-2008 Rodney Dawes <dobey.pwns@gmail.com>
+#
+# This file may be copied and used freely without restrictions.  It may
+# be used in projects which are not available under a GNU Public License,
+# but which still want to provide support for the GNU gettext functionality.
+#
+# - Modified by Owen Taylor <otaylor@redhat.com> to use GETTEXT_PACKAGE
+#   instead of PACKAGE and to look for po2tbl in ./ not in intl/
+#
+# - Modified by jacob berkman <jacob@ximian.com> to install
+#   Makefile.in.in and po2tbl.sed.in for use with glib-gettextize
+#
+# - Modified by Rodney Dawes <dobey.pwns@gmail.com> for use with intltool
+#
+# We have the following line for use by intltoolize:
+# INTLTOOL_MAKEFILE
+
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+
+SHELL = @SHELL@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+top_builddir = @top_builddir@
+VPATH = @srcdir@
+
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+datadir = @datadir@
+datarootdir = @datarootdir@
+libdir = @libdir@
+DATADIRNAME = @DATADIRNAME@
+itlocaledir = $(prefix)/$(DATADIRNAME)/locale
+subdir = po
+install_sh = @install_sh@
+# Automake >= 1.8 provides @mkdir_p@.
+# Until it can be supposed, use the safe fallback:
+mkdir_p = $(install_sh) -d
+
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+
+GMSGFMT = @GMSGFMT@
+MSGFMT = @MSGFMT@
+XGETTEXT = @XGETTEXT@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+MSGMERGE = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
+GENPOT   = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
+
+ALL_LINGUAS = @ALL_LINGUAS@
+
+PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi)
+
+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep \^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep \^$$lang$$`"; then printf "$$lang "; fi; done; fi)
+
+USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
+
+POFILES=$(shell LINGUAS="$(PO_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
+
+DISTFILES = Makefile.in.in POTFILES.in $(POFILES)
+EXTRA_DISTFILES = ChangeLog POTFILES.skip Makevars LINGUAS
+
+POTFILES = \
+# This comment gets stripped out
+
+CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
+
+.SUFFIXES:
+.SUFFIXES: .po .pox .gmo .mo .msg .cat
+
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+INTLTOOL_V_MSGFMT = $(INTLTOOL__v_MSGFMT_$(V))
+INTLTOOL__v_MSGFMT_= $(INTLTOOL__v_MSGFMT_$(AM_DEFAULT_VERBOSITY))
+INTLTOOL__v_MSGFMT_0 = @echo "  MSGFMT" $@;
+
+.po.pox:
+	$(MAKE) $(GETTEXT_PACKAGE).pot
+	$(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox
+
+.po.mo:
+	$(INTLTOOL_V_MSGFMT)$(MSGFMT) -o $@ $<
+
+.po.gmo:
+	$(INTLTOOL_V_MSGFMT)file=`echo $* | sed 's,.*/,,'`.gmo \
+	  && rm -f $$file && $(GMSGFMT) -o $$file $<
+
+.po.cat:
+	sed -f ../intl/po2msg.sed < $< > $*.msg \
+	  && rm -f $@ && gencat $@ $*.msg
+
+
+all: all-@USE_NLS@
+
+all-yes: $(CATALOGS)
+all-no:
+
+$(GETTEXT_PACKAGE).pot: $(POTFILES)
+	$(GENPOT)
+
+install: install-data
+install-data: install-data-@USE_NLS@
+install-data-no: all
+install-data-yes: all
+	linguas="$(USE_LINGUAS)"; \
+	for lang in $$linguas; do \
+	  dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
+	  $(mkdir_p) $$dir; \
+	  if test -r $$lang.gmo; then \
+	    $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
+	    echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \
+	  else \
+	    $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
+	    echo "installing $(srcdir)/$$lang.gmo as" \
+		 "$$dir/$(GETTEXT_PACKAGE).mo"; \
+	  fi; \
+	  if test -r $$lang.gmo.m; then \
+	    $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \
+	    echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \
+	  else \
+	    if test -r $(srcdir)/$$lang.gmo.m ; then \
+	      $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \
+		$$dir/$(GETTEXT_PACKAGE).mo.m; \
+	      echo "installing $(srcdir)/$$lang.gmo.m as" \
+		   "$$dir/$(GETTEXT_PACKAGE).mo.m"; \
+	    else \
+	      true; \
+	    fi; \
+	  fi; \
+	done
+
+# Empty stubs to satisfy archaic automake needs
+dvi info ctags tags CTAGS TAGS ID:
+
+# Define this as empty until I found a useful application.
+install-exec installcheck:
+
+uninstall:
+	linguas="$(USE_LINGUAS)"; \
+	for lang in $$linguas; do \
+	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
+	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
+	done
+
+check: all $(GETTEXT_PACKAGE).pot
+	rm -f missing notexist
+	srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m
+	if [ -r missing -o -r notexist ]; then \
+	  exit 1; \
+	fi
+
+mostlyclean:
+	rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
+	rm -f .intltool-merge-cache
+
+clean: mostlyclean
+
+distclean: clean
+	rm -f Makefile Makefile.in POTFILES stamp-it
+	rm -f *.mo *.msg *.cat *.cat.m *.gmo
+
+maintainer-clean: distclean
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
+	rm -f Makefile.in.in
+
+distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
+dist distdir: $(DISTFILES)
+	dists="$(DISTFILES)"; \
+	extra_dists="$(EXTRA_DISTFILES)"; \
+	for file in $$extra_dists; do \
+	  test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \
+	done; \
+	for file in $$dists; do \
+	  test -f $$file || file="$(srcdir)/$$file"; \
+	  ln $$file $(distdir) 2> /dev/null \
+	    || cp -p $$file $(distdir); \
+	done
+
+update-po: Makefile
+	$(MAKE) $(GETTEXT_PACKAGE).pot
+	tmpdir=`pwd`; \
+	linguas="$(USE_LINGUAS)"; \
+	for lang in $$linguas; do \
+	  echo "$$lang:"; \
+	  result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \
+	  if $$result; then \
+	    if cmp $(srcdir)/$$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
+	      rm -f $$tmpdir/$$lang.new.po; \
+            else \
+	      if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
+	        :; \
+	      else \
+	        echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
+	        rm -f $$tmpdir/$$lang.new.po; \
+	        exit 1; \
+	      fi; \
+	    fi; \
+	  else \
+	    echo "msgmerge for $$lang.gmo failed!"; \
+	    rm -f $$tmpdir/$$lang.new.po; \
+	  fi; \
+	done
+
+Makefile POTFILES: stamp-it
+	@if test ! -f $@; then \
+	  rm -f stamp-it; \
+	  $(MAKE) stamp-it; \
+	fi
+
+stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in
+	cd $(top_builddir) \
+	  && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \
+	       $(SHELL) ./config.status
+
+# Tell versions [3.59,3.63) of GNU make not to export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
++++++ ekiga-signals2-leftover.patch ++++++
--- ekiga/lib/engine/framework/scoped-connections.h	2019/04/02 13:58:29	1.1
+++ ekiga/lib/engine/framework/scoped-connections.h	2019/04/02 13:58:38
@@ -38,7 +38,7 @@
 #define __SCOPED_CONNECTIONS_H__
 
 #include <list>
-#include <boost/signal.hpp>
+#include <boost/signals2.hpp>
 
 /* The boost signals library has several tricks to disconnect connections on signals
  * automatically, namely :

    

root

tags

participants (1)