[ffgtk] - Added build dependency on speexdsp-devel as the dsp is now in its own package - patch for switch t

Louis Lagendijk llagendijk at fedoraproject.org
Mon Feb 9 20:34:13 UTC 2015 

commit e93e05c54e84fd5a54318e0699caa58eb2af6c52
Author: Louis Lagendijk <louis.lagendijk at gmail.com>
Date:   Mon Feb 9 21:33:15 2015 +0100

    - Added build dependency on speexdsp-devel as the dsp is now in its own package
    - patch for switch to C11
      Fixes BZ#1187060
    - Removed dependency on evolution. Fixes BZ#1145071

 ffgtk-0.8.6-automake.patch |   13 +++++++++++
 ffgtk-0.8.6-c11.patch      |   48 ++++++++++++++++++++++++++++++++++++++++++++
 ffgtk-0.8.6-no-evo.patch   |   26 +++++++++++++++++++++++
 ffgtk.spec                 |   19 ++++++++++++++--
 4 files changed, 103 insertions(+), 3 deletions(-)
---
diff --git a/ffgtk-0.8.6-automake.patch b/ffgtk-0.8.6-automake.patch
new file mode 100644
index 0000000..ff3c7a8
--- /dev/null
+++ b/ffgtk-0.8.6-automake.patch
@@ -0,0 +1,13 @@
+Index: configure.ac
+===================================================================
+--- configure.ac	(revision 2213)
++++ configure.ac	(working copy)
+@@ -1,7 +1,7 @@
+ dnl Process this file with autoconf to produce configure.
+ AC_INIT(ffgtk, 0.8.6, http://www.tabos.org/ffgtk)
+ AC_PREFIX_DEFAULT(/usr)
+-AM_INIT_AUTOMAKE
++AM_INIT_AUTOMAKE(subdir-objects)
+ AC_CONFIG_HEADER(config.h)
+ AC_CONFIG_MACRO_DIR([m4])
+ 
diff --git a/ffgtk-0.8.6-c11.patch b/ffgtk-0.8.6-c11.patch
new file mode 100644
index 0000000..b7585ad
--- /dev/null
+++ b/ffgtk-0.8.6-c11.patch
@@ -0,0 +1,48 @@
+Index: ffgtk/faxophone/isdn-convert.c
+===================================================================
+--- ffgtk/faxophone/isdn-convert.c	(revision 2213)
++++ ffgtk/faxophone/isdn-convert.c	(working copy)
+@@ -111,6 +111,7 @@
+  * \param nC char value
+  * \return bit-inversed value
+  */
++/* moved to isdn-convert.h
+ inline unsigned char bitinverse( unsigned char nC ) {
+ 	return ( ( nC >> 7 ) & 0x1 ) |
+ 		( ( nC >> 5 ) & 0x2 ) |
+@@ -121,6 +122,7 @@
+ 		( ( nC << 5 ) & 0x40 ) |
+ 		( ( nC << 7 ) & 0x80 );
+ }
++*/
+ 
+ /**
+  * \brief Create lookup table buffer
+Index: ffgtk/faxophone/isdn-convert.h
+===================================================================
+--- ffgtk/faxophone/isdn-convert.h	(revision 2213)
++++ ffgtk/faxophone/isdn-convert.h	(working copy)
+@@ -24,6 +24,22 @@
+ double getLineLevelOut( void );
+ void convertIsdnToAudio( struct sRecorder *psRecorder, unsigned char *pnInBuf, unsigned int nInBufLen, unsigned char *pnOutBuf, unsigned int *pnOutBufLen, short *pnRecBuf );
+ void convertAudioToIsdn( struct sCapiConnection *psConnection, unsigned char *pnInBuf, unsigned int nInBufLen, unsigned char *pnOutBuf, unsigned int *pnOutBufLen, short *pnRecBuf );
+-inline unsigned char bitinverse( unsigned char nChar );
++// inline unsigned char bitinverse( unsigned char nChar );
++/**
++ * \brief Bit-inverse the given value
++ * \param nC char value
++ * \return bit-inversed value
++ */
++inline unsigned char bitinverse( unsigned char nC ) {
++        return ( ( nC >> 7 ) & 0x1 ) |
++                ( ( nC >> 5 ) & 0x2 ) |
++                ( ( nC >> 3 ) & 0x4 ) |
++                ( ( nC >> 1 ) & 0x8 ) |
++                ( ( nC << 1 ) & 0x10 ) |
++                ( ( nC << 3 ) & 0x20 ) |
++                ( ( nC << 5 ) & 0x40 ) |
++                ( ( nC << 7 ) & 0x80 );
++}
+ 
++
+ #endif
diff --git a/ffgtk-0.8.6-no-evo.patch b/ffgtk-0.8.6-no-evo.patch
new file mode 100644
index 0000000..305cadf
--- /dev/null
+++ b/ffgtk-0.8.6-no-evo.patch
@@ -0,0 +1,26 @@
+diff -up ffgtk-0.8.6/configure.ac.no-evo ffgtk-0.8.6/configure.ac
+--- ffgtk-0.8.6/configure.ac.no-evo	2014-09-22 12:13:37.414043889 +0200
++++ ffgtk-0.8.6/configure.ac	2014-09-22 12:13:41.365043732 +0200
+@@ -277,7 +277,7 @@ AS_IF([test "x$with_ebook" != xno],
+ 		pkg-config --atleast-version=3.5.4 libebook-1.2 && with_ebook_registry=yes
+ 		if test "x$with_ebook_registry" = xyes; then
+ 			AC_DEFINE([HAVE_EBOOK_SOURCE_REGISTRY], 1, [Have libebook >= 3.5.4])
+-			PKG_CHECK_MODULES([EVO_SHELL], evolution-shell-3.0 >= 2.5.4,, AC_MSG_ERROR([libebook >= 2.5.4 requires evolution-shell]))
++			PKG_CHECK_MODULES([LIBEDATASERVER], libedataserver-1.2 >= 3.5.4,, AC_MSG_ERROR([libedataserver >= 3.5.4 not found]))
+ 		fi
+ 		FFGTK_FEATURES_YES="\tebook\n$FFGTK_FEATURES_YES"
+ 	else
+diff -up ffgtk-0.8.6/plugins/Makefile.am.no-evo ffgtk-0.8.6/plugins/Makefile.am
+--- ffgtk-0.8.6/plugins/Makefile.am.no-evo	2014-09-22 12:13:57.070043110 +0200
++++ ffgtk-0.8.6/plugins/Makefile.am	2014-09-22 12:14:04.149042830 +0200
+@@ -56,8 +56,8 @@ endif
+ else
+ lib_ab_ebook_la_SOURCES = ab_ebook/ebook-v1.c
+ endif
+-lib_ab_ebook_la_CFLAGS=$(EXTRA_CFLAGS) $(GTK_CFLAGS) $(EBOOK_CFLAGS) $(EVO_SHELL_CFLAGS) -DLIBDIR=\"$(libdir)/ffgtk/\" -Wall -O2  -I$(top_srcdir)/ffgtk
+-lib_ab_ebook_la_LDFLAGS=$(plugin_LDFLAGS) $(EBOOK_LIBS) $(EVO_SHELL_LIBS) $(EXTRA_LIBS) $(GTK_LIBS)
++lib_ab_ebook_la_CFLAGS=$(EXTRA_CFLAGS) $(GTK_CFLAGS) $(EBOOK_CFLAGS) $(LIBEDATASERVER_CFLAGS) -DLIBDIR=\"$(libdir)/ffgtk/\" -Wall -O2  -I$(top_srcdir)/ffgtk
++lib_ab_ebook_la_LDFLAGS=$(plugin_LDFLAGS) $(EBOOK_LIBS) $(LIBEDATASERVER_LIBS) $(EXTRA_LIBS) $(GTK_LIBS)
+ endif
+ 
+ if WITH_GNOME_KEYRING
diff --git a/ffgtk.spec b/ffgtk.spec
index 26f29b2..83a964d 100644
--- a/ffgtk.spec
+++ b/ffgtk.spec
@@ -1,6 +1,6 @@
 Name:           ffgtk
 Version:        0.8.6
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        A solution for controlling Fritz!Box or compatible routers
 Group:          Applications/Communications
 License:        GPLv2
@@ -20,6 +20,9 @@ Patch1:         ffgtk-0.8.3-use-old-spooler.patch
 Patch2:         ffgtk-trayicon.patch
 Patch3:         ffgtk-assistant.patch
 Patch4:		ffgtk-capi.patch
+Patch5:		ffgtk-0.8.6-no-evo.patch
+Patch6:		ffgtk-0.8.6-automake.patch 
+Patch7:		ffgtk-0.8.6-c11.patch 
 
 %global         _hardened_build 1
 
@@ -28,8 +31,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gettext autoconf automake libtool intltool desktop-file-utils
 BuildRequires:  gtk3-devel libcurl-devel dbus-devel dbus-glib-devel 
 Buildrequires:  isdn4k-utils-devel spandsp-devel evolution-data-server-devel
-Buildrequires:  evolution-devel libgnome-keyring-devel
-Buildrequires:  speex-devel speexdsp.devel libnotify-devel libsndfile-devel
+Buildrequires:  libgnome-keyring-devel
+Buildrequires:  speex-devel speexdsp-devel libnotify-devel libsndfile-devel
 Buildrequires:  pulseaudio-libs-devel glib2-devel libgdata-devel
 
 # We no longer use the bundled md5, but use the glib implementation
@@ -71,6 +74,10 @@ This plugin has beta quality
 %patch3 -p0 -b .assistant
 # This path is for now required for Fedora as isdn4k-utils does not yet have capi20 3.6
 %patch4 -p0 -b .capi
+%patch5 -p1 -b .no-evo
+%patch6 -p0 -b .automake
+%patch7 -p0 -b .c11
+
 install -m644 %{SOURCE1} ./README.Fedora
 
 %build
@@ -173,6 +180,12 @@ fi
 %{_libdir}/ffgtk/plugins/lib_ab_google.so
 
 %changelog
+* Mon Feb 09 2015 Louis Lagendijk <louis.lagendijk at gmail.com> 0.8.6-11
+- Added build dependency on speexdsp-devel as the dsp is now in its own package
+- patch for switch to C11
+  Fixes BZ#1187060
+- Removed dependency on evolution. Fixes BZ#1145071
+
 * Wed Sep 24 2014 Milan Crha <mcrha at redhat.com> - 0.8.6-10
 - Rebuild against newer evolution-data-server

More information about the scm-commits mailing list