Date: Tue, 3 Sep 2002 15:28:17 +0300 From: Maxim Sobolev <sobomax@FreeBSD.org> To: roger@FreeBSD.org Cc: gnome@FreeBSD.org Subject: Gnomemeeting and OpenH323 fixes [patch] Message-ID: <20020903122817.GA8010@vega.vega.com>
next in thread | raw e-mail | index | archive | help
--jRHKVT23PllUwdXP Content-Type: text/plain; charset=koi8-r Content-Disposition: inline Hi there, Attached please find a patch, which fixes multiple problems with Gnomemeeting and OpenH323 ports, namely: 1. Incorrect layout of GNOME and locale files; 2. Problems building on 5-CURRENT; 3. Hardcoded /usr/local in gnomemeeting/Makefile and usage of PREFIX instead of LOCALBASE; 4. Semaphores are not enabled in pwlib, though FreeBSD actually supports them. 5. In openh323 bogus -O3 is added into CFLAGS, which could screew up generated code. In addition, the new patch converts gnomemeeting to GNOMENG framework, which substantially reduces number of dependencies (try `make package-depends' with and without the patch) and allows to use gnomemeeting along with GNOME2 desktop. Thank you in advance! -Maxim --jRHKVT23PllUwdXP Content-Type: text/plain; charset=koi8-r Content-Disposition: attachment; filename="gnomemeeting_and_openh323.diff" ? net/gnomemeeting/pkg-plist,v Index: net/openh323/Makefile =================================================================== RCS file: /home/ncvs/ports/net/openh323/Makefile,v retrieving revision 1.33 diff -d -u -r1.33 Makefile --- net/openh323/Makefile 22 May 2002 00:44:56 -0000 1.33 +++ net/openh323/Makefile 3 Sep 2002 12:26:07 -0000 @@ -36,6 +36,7 @@ OPENH323DIR=${WRKDIR}/openh323 THE_MACHTYPE= ${ARCH:S/i386/x86/} MAKE_ARGS= OSTYPE=${OPSYS} MACHTYPE=${THE_MACHTYPE} OSRELEASE=${OSVERSION} CPLUS=${CXX} +CFLAGS+= -fpermissive -w post-patch: .if !exists(/usr/include/sys/telephony.h) Index: net/openh323/files/patch-aa =================================================================== RCS file: /home/ncvs/ports/net/openh323/files/patch-aa,v retrieving revision 1.6 diff -d -u -r1.6 patch-aa --- net/openh323/files/patch-aa 22 May 2002 00:44:57 -0000 1.6 +++ net/openh323/files/patch-aa 3 Sep 2002 12:26:07 -0000 @@ -1,45 +1,37 @@ -*** ../pwlib/make/unix.mak.orig Tue May 7 02:57:51 2002 ---- ../pwlib/make/unix.mak Wed May 22 00:53:00 2002 -*************** ifeq ($(OSTYPE),FreeBSD) -*** 644,654 **** - - P_PTHREADS := 1 - -! ifeq ($(MACHTYPE),x86) -! ifdef CPUTYPE -! STDCCFLAGS += -mcpu=$(CPUTYPE) -! endif -! endif - - ifndef OSRELEASE - OSRELEASE := $(shell sysctl -n kern.osreldate) ---- 644,654 ---- - - P_PTHREADS := 1 - -! #ifeq ($(MACHTYPE),x86) -! #ifdef CPUTYPE -! #STDCCFLAGS += -mcpu=$(CPUTYPE) -! #endif -! #endif - - ifndef OSRELEASE - OSRELEASE := $(shell sysctl -n kern.osreldate) -*************** LDFLAGS += $(DEBLDFLAGS) -*** 1136,1142 **** - - else - -! OPTCCFLAGS += -O3 -DNDEBUG - #OPTCCFLAGS += -DP_USE_INLINES=1 - #OPTCCFLAGS += -fconserve-space - ifneq ($(OSTYPE),Carbon) ---- 1136,1143 ---- - - else - -! #OPTCCFLAGS += -O3 -DNDEBUG -! OPTCCFLAGS += -DNDEBUG - #OPTCCFLAGS += -DP_USE_INLINES=1 - #OPTCCFLAGS += -fconserve-space - ifneq ($(OSTYPE),Carbon) +--- ../pwlib/make/unix.mak.orig Tue May 7 04:57:51 2002 ++++ ../pwlib/make/unix.mak Sat Aug 31 00:16:19 2002 +@@ -644,11 +647,11 @@ + + P_PTHREADS := 1 + +-ifeq ($(MACHTYPE),x86) +-ifdef CPUTYPE +-STDCCFLAGS += -mcpu=$(CPUTYPE) +-endif +-endif ++#ifeq ($(MACHTYPE),x86) ++#ifdef CPUTYPE ++#STDCCFLAGS += -mcpu=$(CPUTYPE) ++#endif ++#endif + + ifndef OSRELEASE + OSRELEASE := $(shell sysctl -n kern.osreldate) +@@ -657,6 +660,7 @@ + STDCCFLAGS += -DP_FREEBSD=$(OSRELEASE) + + ifdef P_PTHREADS ++STDCCFLAGS += -DP_HAS_SEMAPHORES + CFLAGS += -pthread + endif + +@@ -1136,7 +1140,8 @@ + + else + +-OPTCCFLAGS += -O3 -DNDEBUG ++#OPTCCFLAGS += -O3 -DNDEBUG ++OPTCCFLAGS += -DNDEBUG + #OPTCCFLAGS += -DP_USE_INLINES=1 + #OPTCCFLAGS += -fconserve-space + ifneq ($(OSTYPE),Carbon) Index: net/openh323/files/patch-ad =================================================================== RCS file: net/openh323/files/patch-ad diff -N net/openh323/files/patch-ad --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ net/openh323/files/patch-ad 3 Sep 2002 12:26:07 -0000 @@ -0,0 +1,15 @@ +--- ../pwlib/src/ptlib/common/osutils.cxx 2002/09/03 08:27:56 1.1 ++++ ../pwlib/src/ptlib/common/osutils.cxx 2002/09/03 08:29:01 +@@ -867,8 +867,11 @@ + entries from appearing under some patholgical conditions. Unfortunately if + stderr is used the unitbuf flag causes the out_waiting() not to work so we + must suffer with blank lines in that case. ++ ++ XXX: there is no out_waiting() in gcc-3.2.1, so suffer with blank lines ++ in any case. + */ +- if ((s.flags()&ios::unitbuf) != 0 || s.rdbuf()->out_waiting() > 0) { ++ if ((s.flags()&ios::unitbuf) != 0) { + if ((PTraceOptions&SystemLogStream) != 0) + s.flush(); + else Index: net/openh323/files/patch-ae =================================================================== RCS file: net/openh323/files/patch-ae diff -N net/openh323/files/patch-ae --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ net/openh323/files/patch-ae 3 Sep 2002 12:26:07 -0000 @@ -0,0 +1,17 @@ +--- ../pwlib/src/ptlib/common/object.cxx 2002/09/03 08:36:39 1.1 ++++ ../pwlib/src/ptlib/common/object.cxx 2002/09/03 08:37:47 +@@ -743,12 +743,12 @@ + + #else // PMEMORY_CHECK + +-void * operator new[](size_t nSize) ++void * operator new[](size_t nSize) throw (std::bad_alloc) + { + return malloc(nSize); + } + +-void operator delete[](void * ptr) ++void operator delete[](void * ptr) throw () + { + free(ptr); + } Index: net/openh323/files/patch-af =================================================================== RCS file: net/openh323/files/patch-af diff -N net/openh323/files/patch-af --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ net/openh323/files/patch-af 3 Sep 2002 12:26:07 -0000 @@ -0,0 +1,11 @@ +--- ../pwlib/src/ptlib/unix/oss.cxx 2002/08/30 21:44:57 1.1 ++++ ../pwlib/src/ptlib/unix/oss.cxx 2002/08/30 21:45:18 +@@ -174,7 +174,7 @@ + #endif + + #ifdef P_FREEBSD +-#include <machine/soundcard.h> ++#include <sys/soundcard.h> + #endif + + #if defined(P_OPENBSD) || defined(P_NETBSD) Index: net/gnomemeeting/Makefile =================================================================== RCS file: /home/ncvs/ports/net/gnomemeeting/Makefile,v retrieving revision 1.9 diff -d -u -r1.9 Makefile --- net/gnomemeeting/Makefile 24 May 2002 11:28:11 -0000 1.9 +++ net/gnomemeeting/Makefile 3 Sep 2002 12:26:07 -0000 @@ -14,29 +14,28 @@ MAINTAINER= roger@FreeBSD.org -LIB_DEPENDS= ldap.1:${PORTSDIR}/net/openldap \ - gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf/ - +LIB_DEPENDS= ldap.1:${PORTSDIR}/net/openldap BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/net/openh323:build # note, we do not want to clean openh323, otherwise it has to build # it all over again which can take several hours. NOCLEANDEPENDS= yes - +USE_X_PREFIX= yes USE_NEWGCC= yes USE_BISON= yes -USE_GNOME= yes -USE_AUTOCONF= yes -USE_GTK= yes USE_GMAKE= yes -CONFIGURE_ARGS= --with-ptlib-includes=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/pwlib/include/ptlib \ - --with-ptlib-libs=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/pwlib/lib \ - --with-openh323-includes=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/openh323/include \ - --with-openh323-libs=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/openh323/lib \ - --with-ldap=/usr/local +USE_GNOMENG= yes +USE_GNOME= gnomehack gnomeprefix gdkpixbuf gnomelibs +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --with-ptlib-includes=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/pwlib/include/ptlib \ + --with-ptlib-libs=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/pwlib/lib \ + --with-openh323-includes=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/openh323/include \ + --with-openh323-libs=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/openh323/lib \ + --with-ldap=${LOCALBASE} CONFIGURE_ENV= OSTYPE=${OPSYS} \ - LIBS=-L${PREFIX}/lib \ + LIBS=-L${X11BASE}/lib \ PTLIBDIR=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/pwlib \ - OPENH323DIR=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/openh323 \ + OPENH323DIR=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/openh323 +CFLAGS+= -fpermissive -w -DP_HAS_SEMAPHORES .include <bsd.port.mk> Index: net/gnomemeeting/pkg-plist =================================================================== RCS file: /home/ncvs/ports/net/gnomemeeting/pkg-plist,v retrieving revision 1.5 diff -d -u -r1.5 pkg-plist --- net/gnomemeeting/pkg-plist 24 May 2002 11:28:11 -0000 1.5 +++ net/gnomemeeting/pkg-plist 3 Sep 2002 12:26:07 -0000 @@ -1,26 +1,71 @@ -share/gnome/locale/cs.mo/LC_MESSAGES/GnomeMeeting.mo -share/gnome/locale/de.mo/LC_MESSAGES/GnomeMeeting.mo -share/gnome/locale/el.mo/LC_MESSAGES/GnomeMeeting.mo -share/gnome/locale/es.mo/LC_MESSAGES/GnomeMeeting.mo -share/gnome/locale/fr.mo/LC_MESSAGES/GnomeMeeting.mo -share/gnome/locale/gl.mo/LC_MESSAGES/GnomeMeeting.mo -share/gnome/locale/it.mo/LC_MESSAGES/GnomeMeeting.mo -share/gnome/locale/ja.mo/LC_MESSAGES/GnomeMeeting.mo -share/gnome/locale/nl.mo/LC_MESSAGES/GnomeMeeting.mo -share/gnome/locale/no.mo/LC_MESSAGES/GnomeMeeting.mo -share/gnome/locale/pt_BR.mo/LC_MESSAGES/GnomeMeeting.mo -share/gnome/locale/ru.mo/LC_MESSAGES/GnomeMeeting.mo -share/gnome/locale/sk.mo/LC_MESSAGES/GnomeMeeting.mo -share/gnome/locale/sv.mo/LC_MESSAGES/GnomeMeeting.mo -share/gnome/locale/tr.mo/LC_MESSAGES/GnomeMeeting.mo -share/gnome/locale/wa.mo/LC_MESSAGES/GnomeMeeting.mo -share/gnome/locale/zh_CN.mo/LC_MESSAGES/GnomeMeeting.mo -share/gnome/locale/zh_TW.mo/LC_MESSAGES/GnomeMeeting.mo bin/gnomemeeting +etc/gconf/gconf.xml.defaults/apps/gnomemeeting/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gnomemeeting/audio_codecs/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gnomemeeting/audio_settings/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gnomemeeting/devices/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gnomemeeting/gatekeeper/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gnomemeeting/general/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gnomemeeting/history/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gnomemeeting/ldap/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gnomemeeting/personal_data/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gnomemeeting/video_settings/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gnomemeeting/view/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/audio_codecs/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/audio_settings/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/devices/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/gatekeeper/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/general/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/history/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/ldap/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/personal_data/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/video_settings/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/view/%gconf.xml +etc/gconf/schemas/gnomemeeting.schema +etc/sound/events/GnomeMeeting.soundlist +share/gnome/apps/Internet/gnomemeeting.desktop share/gnome/pixmaps/gnomemeeting-logo-icon.png share/gnome/pixmaps/gnomemeeting-logo.png share/gnome/pixmaps/gnomemeeting-splash.png share/gnome/sounds/gnomemeeting/gnomemeeting.wav -etc/sound/events/GnomeMeeting.soundlist -share/gnome/gnome/apps/Internet/gnomemeeting.desktop -etc/gconf/schemas/gnomemeeting.schema +share/locale/cs/LC_MESSAGES/GnomeMeeting.mo +share/locale/de/LC_MESSAGES/GnomeMeeting.mo +share/locale/el/LC_MESSAGES/GnomeMeeting.mo +share/locale/es/LC_MESSAGES/GnomeMeeting.mo +share/locale/fr/LC_MESSAGES/GnomeMeeting.mo +share/locale/gl/LC_MESSAGES/GnomeMeeting.mo +share/locale/it/LC_MESSAGES/GnomeMeeting.mo +share/locale/ja/LC_MESSAGES/GnomeMeeting.mo +share/locale/nl/LC_MESSAGES/GnomeMeeting.mo +share/locale/no/LC_MESSAGES/GnomeMeeting.mo +share/locale/pt_BR/LC_MESSAGES/GnomeMeeting.mo +share/locale/ru/LC_MESSAGES/GnomeMeeting.mo +share/locale/sk/LC_MESSAGES/GnomeMeeting.mo +share/locale/sv/LC_MESSAGES/GnomeMeeting.mo +share/locale/tr/LC_MESSAGES/GnomeMeeting.mo +share/locale/wa/LC_MESSAGES/GnomeMeeting.mo +share/locale/zh_CN/LC_MESSAGES/GnomeMeeting.mo +share/locale/zh_TW/LC_MESSAGES/GnomeMeeting.mo +@dirrm share/gnome/sounds/gnomemeeting +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/view +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/video_settings +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/personal_data +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/ldap +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/history +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/general +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/gatekeeper +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/devices +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/audio_settings +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/audio_codecs +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting +@dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/view +@dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/video_settings +@dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/personal_data +@dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/ldap +@dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/history +@dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/general +@dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/gatekeeper +@dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/devices +@dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/audio_settings +@dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/audio_codecs +@dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting Index: net/gnomemeeting/files/patch-ab =================================================================== RCS file: /home/ncvs/ports/net/gnomemeeting/files/patch-ab,v retrieving revision 1.5 diff -d -u -r1.5 patch-ab --- net/gnomemeeting/files/patch-ab 20 Apr 2002 20:05:03 -0000 1.5 +++ net/gnomemeeting/files/patch-ab 3 Sep 2002 12:26:07 -0000 @@ -1,19 +1,22 @@ -*** configure.in.orig Sat Apr 20 20:51:18 2002 ---- configure.in Sat Apr 20 20:51:39 2002 -*************** dnl * -D_DEBUG -DPMEMORY_CHECK=1 -DPTRAC -*** 50,56 **** - - FreeBSD) - H323_CFLAGS="-DP_FREEBSD=400001 -DP_SSL -DP_PTHREADS -DPBYTE_ORDER=PLITTLE_ENDIAN -O2 -Wall" -! H323_LIBS="-lh323_FreeBSD_x86_r -lpt_FreeBSD_x86_r -pthread -lssl -lcrypto" - LIBPT_FILE="libpt_FreeBSD_x86_r_s.a" - LIBOPENH323_FILE="libh323_FreeBSD_x86_r_s.a" - ;; ---- 50,56 ---- - - FreeBSD) - H323_CFLAGS="-DP_FREEBSD=400001 -DP_SSL -DP_PTHREADS -DPBYTE_ORDER=PLITTLE_ENDIAN -O2 -Wall" -! H323_LIBS="-lh323_FreeBSD_x86_r_s -lpt_FreeBSD_x86_r_s -pthread -lssl -lcrypto" - LIBPT_FILE="libpt_FreeBSD_x86_r_s.a" - LIBOPENH323_FILE="libh323_FreeBSD_x86_r_s.a" - ;; +--- configure.orig Fri Mar 8 17:07:36 2002 ++++ configure Sat Aug 31 14:47:13 2002 +@@ -1917,8 +1917,8 @@ + ;; + + FreeBSD) +- H323_CFLAGS="-DP_FREEBSD=400001 -DP_SSL -DP_PTHREADS -DPBYTE_ORDER=PLITTLE_ENDIAN -O2 -Wall" +- H323_LIBS="-lh323_FreeBSD_x86_r -lpt_FreeBSD_x86_r -pthread -lssl -lcrypto" ++ H323_CFLAGS="-DP_FREEBSD=400001 -DP_SSL -DP_PTHREADS -DPBYTE_ORDER=PLITTLE_ENDIAN -Wall" ++ H323_LIBS="-lh323_FreeBSD_x86_r_s -lpt_FreeBSD_x86_r_s -pthread -lssl -lcrypto" + LIBPT_FILE="libpt_FreeBSD_x86_r_s.a" + LIBOPENH323_FILE="libh323_FreeBSD_x86_r_s.a" + ;; +@@ -3471,7 +3471,7 @@ + + + +-CXXFLAGS="-O3 $ORBIT_CFLAGS" ++CXXFLAGS="$CXXFLAGS $ORBIT_CFLAGS" + + + # Check whether --enable-install_schemas or --disable-install_schemas was given. Index: net/gnomemeeting/files/patch-aj =================================================================== RCS file: net/gnomemeeting/files/patch-aj diff -N net/gnomemeeting/files/patch-aj --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ net/gnomemeeting/files/patch-aj 3 Sep 2002 12:26:07 -0000 @@ -0,0 +1,11 @@ +--- src/audio.h 2002/08/31 12:01:07 1.1 ++++ src/audio.h 2002/08/31 12:01:18 +@@ -35,7 +35,7 @@ + #include <linux/soundcard.h> + #endif + #ifdef __FreeBSD__ +-#include <machine/soundcard.h> ++#include <sys/soundcard.h> + #endif + + #include <sys/ioctl.h> Index: net/gnomemeeting/files/patch-ak =================================================================== RCS file: net/gnomemeeting/files/patch-ak diff -N net/gnomemeeting/files/patch-ak --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ net/gnomemeeting/files/patch-ak 3 Sep 2002 12:26:07 -0000 @@ -0,0 +1,11 @@ +--- po/Makefile.in.in 2002/08/31 12:24:32 1.1 ++++ po/Makefile.in.in 2002/08/31 12:24:53 +@@ -106,7 +106,7 @@ + @catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ +- lang=`echo $$cat | sed 's/\.gmo$$//'`; \ ++ lang=`echo $$cat | sed 's/\.mo$$//'`; \ + dir=$(localedir)/$$lang/LC_MESSAGES; \ + $(mkinstalldirs) $(DESTDIR)$$dir; \ + if test -r $$cat; then \ --jRHKVT23PllUwdXP-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-gnome" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020903122817.GA8010>