Hi,
iaxcomm won't build with the update to wxWidgets 3 I'm cooking. I tried
a few tweaks which didn't help. See the logs below.
Given that iaxclient isn't maintained upstream any more, I'd prefer to
spend time on other wxWidgets consumers. A possible solution would be
to mark it broken until a fix is found, but my first thought was to
kill the offending subpackage. After all, this is beta software from
2008. ;)
Thoughts? ok? (devel/quirks diff not included)
PS: make port-lib-depend-check complains fribidi not being registered,
I'm not sure what to do about it.
Index: Makefile
===================================================================
RCS file: /cvs/ports/telephony/iaxclient/Makefile,v
retrieving revision 1.39
diff -u -p -r1.39 Makefile
--- Makefile 24 Oct 2018 14:28:11 -0000 1.39
+++ Makefile 10 Dec 2018 16:12:40 -0000
@@ -2,12 +2,10 @@
COMMENT-main= IAX client library
COMMENT-tcl= IAX client library, tcl bindings
-COMMENT-iaxcomm=IAX softphone
DISTNAME= iaxclient-2.1beta3
PKGNAME-main= ${DISTNAME}
PKGNAME-tcl= ${DISTNAME:S/iaxclient/iaxclient-tcl/}
-PKGNAME-iaxcomm= iaxcomm-1.1.0
REVISION= 22
CATEGORIES= telephony
@@ -21,7 +19,7 @@ MAINTAINER= Sebastian Reitenbach <sebast
# LGPLv2.1
PERMIT_PACKAGE_CDROM= Yes
-MULTI_PACKAGES= -main -tcl -iaxcomm
+MULTI_PACKAGES= -main -tcl
MODULES= x11/tk
COMPILER = base-clang ports-gcc base-gcc
@@ -41,17 +39,6 @@ WANTLIB-tcl += pangoft2-1.0 pcre pixman-
WANTLIB-tcl += graphite2 harfbuzz vorbis
WANTLIB-tcl += xcb-shm ffi ${cWANTLIB}
-WANTLIB-iaxcomm += ICE SDL SM X11 Xcomposite Xcursor Xdamage
-WANTLIB-iaxcomm += Xext Xfixes Xi Xinerama Xrandr Xrender Xxf86vm
atk-1.0
-WANTLIB-iaxcomm += c cairo expat fontconfig freetype gdk-x11-2.0
gdk_pixbuf-2.0
-WANTLIB-iaxcomm += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
-WANTLIB-iaxcomm += gtk-x11-2.0 iaxclient iconv intl iodbc jpeg mspack
-WANTLIB-iaxcomm += pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
-WANTLIB-iaxcomm += png ${COMPILER_LIBCXX} tiff usbhid wx_base
wx_base_net
-WANTLIB-iaxcomm += wx_base_odbc wx_base_xml wx_gtk2_adv wx_gtk2_aui
wx_gtk2_core
-WANTLIB-iaxcomm += wx_gtk2_dbgrid wx_gtk2_html wx_gtk2_qa
wx_gtk2_richtext
-WANTLIB-iaxcomm += graphite2 harfbuzz vorbis
-WANTLIB-iaxcomm += wx_gtk2_xrc xcb xcb-render xcb-shm ffi ${cWANTLIB}
BUILD_DEPENDS= ${MODTK_BUILD_DEPENDS}
@@ -68,14 +55,10 @@ LIB_DEPENDS-tcl=${LIB_DEPENDS} \
RUN_DEPENDS-tcl=${MODTCL_RUN_DEPENDS}
-RUN_DEPENDS-iaxcomm=
-LIB_DEPENDS-iaxcomm=${BASE_PKGPATH} \
- x11/wxWidgets
-
CONFIGURE_STYLE=gnu
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -L/usr/lib -lossaudio" \
WISH=${MODTK_BIN}
-CONFIGURE_ARGS=--enable-clients="testcall tkphone iaxcomm"
+CONFIGURE_ARGS=--enable-clients="testcall tkphone"
# iaxphone needs an ANSI (not unicode) build of wxWidgets
# vtestcall pulls in SDL dependency, not doing this for now
Index: patches/patch-simpleclient_iaxcomm_calls_cc
===================================================================
RCS file: patches/patch-simpleclient_iaxcomm_calls_cc
diff -N patches/patch-simpleclient_iaxcomm_calls_cc
--- patches/patch-simpleclient_iaxcomm_calls_cc 18 Jun 2010 17:32:21 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-simpleclient_iaxcomm_calls_cc,v 1.1 2010/06/18 17:32:21
sebastia Exp $
---- simpleclient/iaxcomm/calls.cc.orig Sun Jun 6 13:46:43 2010
-+++ simpleclient/iaxcomm/calls.cc Sun Jun 6 13:46:55 2010
-@@ -85,7 +85,7 @@ CallList::CallList(wxWindow *parent, int nCalls, wxWin
-
- Hide();
-
--#if !defined(__UNICODE__)
-+#if !defined(wxUSE_UNICODE)
- wxFont font = GetFont();
- font.SetPointSize(11);
- font.SetFamily(wxSWISS);
Index: patches/patch-simpleclient_iaxcomm_frame_cc
===================================================================
RCS file: patches/patch-simpleclient_iaxcomm_frame_cc
diff -N patches/patch-simpleclient_iaxcomm_frame_cc
--- patches/patch-simpleclient_iaxcomm_frame_cc 18 Jun 2010 17:32:21 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-simpleclient_iaxcomm_frame_cc,v 1.1 2010/06/18 17:32:21
sebastia Exp $
---- simpleclient/iaxcomm/frame.cc.orig Sun Jun 6 13:46:27 2010
-+++ simpleclient/iaxcomm/frame.cc Sun Jun 6 13:46:41 2010
-@@ -425,7 +425,7 @@ void MyFrame::ShowDirectoryControls()
- config->SetPath(_T("/OT"));
- bCont = config->GetFirstGroup(OTName, dummy);
- while ( bCont ) {
--#if defined(__UNICODE__)
-+#if defined(wxUSE_UNICODE)
- ot = ((wxButton
*)((*aPanel).FindWindow(wxXmlResource::GetXRCID(OTName))));
- #else
- ot = XRCCTRL(*aPanel, OTName, wxButton);
Index: patches/patch-simpleclient_iaxcomm_ringer_cc
===================================================================
RCS file: patches/patch-simpleclient_iaxcomm_ringer_cc
diff -N patches/patch-simpleclient_iaxcomm_ringer_cc
--- patches/patch-simpleclient_iaxcomm_ringer_cc 18 Jun 2010 17:32:21
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,23 +0,0 @@
-$OpenBSD: patch-simpleclient_iaxcomm_ringer_cc,v 1.1 2010/06/18 17:32:21
sebastia Exp $
---- simpleclient/iaxcomm/ringer.cc.orig Sun Jun 6 14:01:31 2010
-+++ simpleclient/iaxcomm/ringer.cc Sun Jun 6 14:03:06 2010
-@@ -58,14 +58,18 @@
- #ifdef __WXGTK__
- #include <sys/ioctl.h>
- #include <sys/fcntl.h>
-+ #ifdef __OpenBSD__
-+ #include <dev/wscons/wsdisplay_usl_io.h>
-+ #else
- #include <linux/kd.h>
-+ #endif
-
- static void Beep(int freq, int dur)
- {
- int fd;
- int arg;
-
-- fd = open("/dev/tty0", O_RDONLY);
-+ fd = open("/dev/tty", O_RDONLY);
- arg = (dur<<16)+(1193180/freq);
- ioctl(fd,KDMKTONE,arg);
- }
Index: pkg/DESCR-iaxcomm
===================================================================
RCS file: pkg/DESCR-iaxcomm
diff -N pkg/DESCR-iaxcomm
--- pkg/DESCR-iaxcomm 18 Jun 2010 17:32:21 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1 +0,0 @@
-iaxComm is an Open Source softphone for the Asterisk PBX.
Index: pkg/PLIST-iaxcomm
===================================================================
RCS file: pkg/PLIST-iaxcomm
diff -N pkg/PLIST-iaxcomm
--- pkg/PLIST-iaxcomm 18 Jun 2010 17:32:21 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,27 +0,0 @@
-@comment $OpenBSD: PLIST-iaxcomm,v 1.1 2010/06/18 17:32:21 sebastia Exp $
-@bin bin/iaxcomm
-share/iaxcomm/
-share/iaxcomm/iaxcomm.htb
-share/iaxcomm/rc/
-share/iaxcomm/rc/accounts.xrc
-share/iaxcomm/rc/application.ico
-share/iaxcomm/rc/bitmaps/
-share/iaxcomm/rc/bitmaps/KP0.bmp
-share/iaxcomm/rc/bitmaps/KP1.bmp
-share/iaxcomm/rc/bitmaps/KP2.bmp
-share/iaxcomm/rc/bitmaps/KP3.bmp
-share/iaxcomm/rc/bitmaps/KP4.bmp
-share/iaxcomm/rc/bitmaps/KP5.bmp
-share/iaxcomm/rc/bitmaps/KP6.bmp
-share/iaxcomm/rc/bitmaps/KP7.bmp
-share/iaxcomm/rc/bitmaps/KP8.bmp
-share/iaxcomm/rc/bitmaps/KP9.bmp
-share/iaxcomm/rc/bitmaps/KPPOUND.bmp
-share/iaxcomm/rc/bitmaps/KPSTAR.bmp
-share/iaxcomm/rc/devices.xrc
-share/iaxcomm/rc/directory.xrc
-share/iaxcomm/rc/frame.xrc
-share/iaxcomm/rc/logo.xpm
-share/iaxcomm/rc/menubar.xrc
-share/iaxcomm/rc/panel.xrc
-share/iaxcomm/rc/prefs.xrc
--8<--
Making all in iaxcomm
c++ -DHAVE_CONFIG_H -I. -I../.. -I../../lib
-I/usr/local/lib/wx/include/gtk3-unicode-3.0 -I/usr/local/include/wx-3.0
-I/usr/X11R6/include -D_FILE_OFFSET_BITS=64 -DWXUSINGDLL -D__WXGTK__
-DIAXCOMM_VERSION=\"1.1.0final\" -DXR
CDIRECTORY=\"/usr/local/share/iaxcomm/rc\"
-DDATADIR=\"/usr/local/share/iaxcomm\" -I/usr/local/include/gtk-2.0
-I/usr/local/lib/gtk-2.0/include -I/usr/local/include/pango-1.0
-I/usr/local/include/gio-unix-2.0/ -I/usr/X11R6/
include -I/usr/local/include/cairo -I/usr/local/include/atk-1.0
-I/usr/X11R6/include/pixman-1 -I/usr/local/include/libpng16
-I/usr/local/include/gdk-pixbuf-2.0 -pthread -I/usr/local/include/harfbuzz
-I/usr/local/include -I/usr/
local/include/fribidi -I/usr/local/include/glib-2.0
-I/usr/local/lib/glib-2.0/include -I/usr/X11R6/include/freetype2 -O2 -pipe
-MT main.o -MD -MP -MF .deps/main.Tpo -c -o main.o main.cc
c++ -DHAVE_CONFIG_H -I. -I../.. -I../../lib
-I/usr/local/lib/wx/include/gtk3-unicode-3.0 -I/usr/local/include/wx-3.0
-I/usr/X11R6/include -D_FILE_OFFSET_BITS=64 -DWXUSINGDLL -D__WXGTK__
-DIAXCOMM_VERSION=\"1.1.0final\" -DXR
CDIRECTORY=\"/usr/local/share/iaxcomm/rc\"
-DDATADIR=\"/usr/local/share/iaxcomm\" -I/usr/local/include/gtk-2.0
-I/usr/local/lib/gtk-2.0/include -I/usr/local/include/pango-1.0
-I/usr/local/include/gio-unix-2.0/ -I/usr/X11R6/
include -I/usr/local/include/cairo -I/usr/local/include/atk-1.0
-I/usr/X11R6/include/pixman-1 -I/usr/local/include/libpng16
-I/usr/local/include/gdk-pixbuf-2.0 -pthread -I/usr/local/include/harfbuzz
-I/usr/local/include -I/usr/
local/include/fribidi -I/usr/local/include/glib-2.0
-I/usr/local/lib/glib-2.0/include -I/usr/X11R6/include/freetype2 -O2 -pipe
-MT prefs.o -MD -MP -MF .deps/prefs.Tpo -c -o prefs.o prefs.cc
In file included from main.cc:40:
In file included from ./main.h:29:
In file included from ./app.h:50:
In file included from /usr/local/include/gtk-2.0/gdk/gdk.h:32:
In file included from /usr/local/include/gtk-2.0/gdk/gdkapplaunchcontext.h:31:
In file included from /usr/local/include/gtk-2.0/gdk/gdkscreen.h:32:
/usr/local/include/gtk-2.0/gdk/gdktypes.h:114:39: error: typedef redefinition
with different types ('struct _GdkDrawable' vs 'struct _GdkWindow')
typedef struct _GdkDrawable GdkWindow;
^
/usr/local/include/wx-3.0/wx/defs.h:3464:31: note: previous definition is here
typedef struct _GdkWindow GdkWindow;
^
In file included from prefs.cc:39:
In file included from ./prefs.h:30:
In file included from ./app.h:50:
In file included from /usr/local/include/gtk-2.0/gdk/gdk.h:32:
In file included from /usr/local/include/gtk-2.0/gdk/gdkapplaunchcontext.h:31:
In file included from /usr/local/include/gtk-2.0/gdk/gdkscreen.h:32:
/usr/local/include/gtk-2.0/gdk/gdktypes.h:114:39: error: typedef redefinition
with different types ('struct _GdkDrawable' vs 'struct _GdkWindow')
typedef struct _GdkDrawable GdkWindow;
^
/usr/local/include/wx-3.0/wx/defs.h:3464:31: note: previous definition is here
typedef struct _GdkWindow GdkWindow;
^
prefs.cc:321:79: error: use of undeclared identifier 'wxOPEN'
wxFileDialog where(NULL, _("Raw sound file"), dirHome, _T(""), _T("*.*"),
wxOPEN );
^
1 error generated.
2 errors generated.
*** Error 1 in target 'main.o'
*** Error 1 in simpleclient/iaxcomm (Makefile:399 'prefs.o')
*** Error 1 (Makefile:399 'main.o')
*** Error 1 in simpleclient (Makefile:307 'all-recursive')
*** Error 1 in . (Makefile:374 'all-recursive')
*** Error 2 in /usr/ports/pobj/iaxclient-2.1beta3/iaxclient-2.1beta3
(Makefile:263 'all')
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2797
'/usr/ports/pobj/iaxclient-2.1beta3/.build_done')
*** Error 1 in /usr/ports/telephony/iaxclient
(/usr/ports/infrastructure/mk/bsd.port.mk:2465 'all')
-->8--
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
