From owner-freebsd-gnome Fri Jan 11 10:28:49 2002 Delivered-To: freebsd-gnome@freebsd.org Received: from alcatraz.iptelecom.net.ua (alcatraz.iptelecom.net.ua [212.9.224.15]) by hub.freebsd.org (Postfix) with ESMTP id D404137B43C for ; Fri, 11 Jan 2002 10:28:05 -0800 (PST) Received: from ipcard.iptcom.net (ipcard.iptcom.net [212.9.224.5]) by alcatraz.iptelecom.net.ua (8.9.3/8.9.3) with ESMTP id UAA78559; Fri, 11 Jan 2002 20:27:58 +0200 (EET) (envelope-from max@vega.com) Received: from vega.vega.com (h117.228.dialup.iptcom.net [212.9.228.117]) by ipcard.iptcom.net (8.9.3/8.9.3) with ESMTP id UAA65122; Fri, 11 Jan 2002 20:27:53 +0200 (EET) (envelope-from max@vega.com) Received: (from max@localhost) by vega.vega.com (8.11.6/8.11.3) id g0BIQgl99941; Fri, 11 Jan 2002 20:26:42 +0200 (EET) (envelope-from sobomax@FreeBSD.org) From: Maxim Sobolev Message-Id: <200201111826.g0BIQgl99941@vega.vega.com> Subject: Patch for testing To: gnome@FreeBSD.org Date: Fri, 11 Jan 2002 20:26:42 +0200 (EET) Cc: marcus@marcuscom.com, john_m_cooper@yahoo.com X-Mailer: ELM [version 2.5 PL5] MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="%--multipart-mixed-boundary-1.99901.1010773602--%" Sender: owner-freebsd-gnome@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG --%--multipart-mixed-boundary-1.99901.1010773602--% Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Folks, Could you please test attached patch upgrading ORBit/bonobo to the latest versions? I'm running it here just fine, but want to double check because we are very close to the 4.5-RELEASE, so occasional breakage should be avoided. Thanks! -Maxim --%--multipart-mixed-boundary-1.99901.1010773602--% Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Description: ASCII C program text Content-Disposition: attachment; filename="gnome.diff" ? ports/devel/ORBit/ORBit-0.5.12.tbz2 ? ports/devel/bonobo/bonobo-1.0.17.tbz2 Index: ports/devel/ORBit/Makefile =================================================================== RCS file: /home/ncvs/ports/devel/ORBit/Makefile,v retrieving revision 1.54 diff -d -u -r1.54 Makefile --- ports/devel/ORBit/Makefile 9 Nov 2001 16:28:10 -0000 1.54 +++ ports/devel/ORBit/Makefile 11 Jan 2002 18:22:08 -0000 @@ -6,7 +6,7 @@ # PORTNAME= ORBit -PORTVERSION= 0.5.12 +PORTVERSION= 0.5.13 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/ORBit Index: ports/devel/ORBit/distinfo =================================================================== RCS file: /home/ncvs/ports/devel/ORBit/distinfo,v retrieving revision 1.21 diff -d -u -r1.21 distinfo --- ports/devel/ORBit/distinfo 9 Nov 2001 16:28:10 -0000 1.21 +++ ports/devel/ORBit/distinfo 11 Jan 2002 18:22:08 -0000 @@ -1 +1 @@ -MD5 (ORBit-0.5.12.tar.gz) = ab66859c937a940da6bad2c84161c6aa +MD5 (ORBit-0.5.13.tar.gz) = 89b16a12e565798945b49e9f41d1db5d Index: ports/devel/ORBit/pkg-plist =================================================================== RCS file: /home/ncvs/ports/devel/ORBit/pkg-plist,v retrieving revision 1.13 diff -d -u -r1.13 pkg-plist --- ports/devel/ORBit/pkg-plist 9 Oct 2001 07:30:46 -0000 1.13 +++ ports/devel/ORBit/pkg-plist 11 Jan 2002 18:22:08 -0000 @@ -22,14 +22,8 @@ include/orbit-1.0/IIOP/giop-msg-buffer.h include/orbit-1.0/IIOP/iiop-encoders.h include/orbit-1.0/IIOP/iiop-endian.h -include/orbit-1.0/ORBitservices/CosEventChannel.idl -include/orbit-1.0/ORBitservices/CosEventComm.idl include/orbit-1.0/ORBitservices/CosNaming.h -include/orbit-1.0/ORBitservices/CosNaming.idl include/orbit-1.0/ORBitservices/CosNaming_impl.h -include/orbit-1.0/ORBitservices/CosTypedEventChannel.idl -include/orbit-1.0/ORBitservices/CosTypedEventComm.idl -include/orbit-1.0/ORBitservices/LName.pidl include/orbit-1.0/ORBitutil/basic_types.h include/orbit-1.0/ORBitutil/compat.h include/orbit-1.0/ORBitutil/orbit-os-config.h @@ -103,6 +97,14 @@ libdata/pkgconfig/libIDL.pc share/aclocal/ORBit.m4 share/aclocal/libIDL.m4 +share/idl/orbit-1.0/CosEventChannel.idl +share/idl/orbit-1.0/CosEventComm.idl +share/idl/orbit-1.0/CosNaming.idl +share/idl/orbit-1.0/CosTypedEventChannel.idl +share/idl/orbit-1.0/CosTypedEventComm.idl +share/idl/orbit-1.0/LName.pidl +@dirrm share/idl/orbit-1.0 +@dirrm share/idl @dirrm include/orbit-1.0/orb @dirrm include/orbit-1.0/ORBitutil @dirrm include/orbit-1.0/ORBitservices Index: ports/devel/ORBit/files/patch-ae =================================================================== RCS file: /home/ncvs/ports/devel/ORBit/files/patch-ae,v retrieving revision 1.5 diff -d -u -r1.5 patch-ae --- ports/devel/ORBit/files/patch-ae 29 Oct 2001 17:05:03 -0000 1.5 +++ ports/devel/ORBit/files/patch-ae 11 Jan 2002 18:22:08 -0000 @@ -1,9 +1,9 @@ -$FreeBSD: ports/devel/ORBit/files/patch-ae,v 1.5 2001/10/29 17:05:03 sobomax Exp $ +$FreeBSD$ ---- configure 2001/10/27 12:43:19 1.1 -+++ configure 2001/10/27 12:43:58 -@@ -5747,9 +5747,9 @@ +--- configure.orig Mon Jan 7 11:09:58 2002 ++++ configure Fri Jan 11 11:51:55 2002 +@@ -2151,9 +2151,9 @@ rm -f conf.glibtest @@ -15,12 +15,12 @@ for ac_prog in 'bison -y' byacc -@@ -7273,57 +7273,47 @@ +@@ -3757,37 +3757,30 @@ fi +echo $ac_n "checking how many vectors writev is capable to handle""... $ac_c" 1>&6 -+echo "configure:7278: checking how many vectors writev is capable to handle" >&5 ++echo "configure:3761: checking how many vectors writev is capable to handle" >&5 if test "$cross_compiling" = yes; then - cat >> confdefs.h <<\EOF -#define HAVE_LIMITED_WRITEV 1 @@ -29,18 +29,16 @@ + MAXIOV=16 else cat > conftest.$ac_ext < +#include #include -#define NIOVECS 50 --int main(int argc, char *argv[]) +#include +#include -+int main() + int main(int argc, char *argv[]) { - char dumbuf[20] = "\n"; - struct iovec iovecs[NIOVECS]; @@ -56,25 +54,22 @@ - return(1); - - if(writev(fd, iovecs, NIOVECS) < 0) -- return 1; -- + FILE *f; + int fd, i; + static struct iovec iovecs[4097]; + if ((f = fopen("conftestval", "w")) == NULL || \ + (fd = open("/dev/null", O_WRONLY)) < 0) -+ exit(1); + return 1; +- + for (i = 1; i < 4098 && writev(fd, iovecs, i) >= 0; i++); + fprintf(f, "%d\n", i - 1); + fclose(f); close(fd); -- return 0; -+ exit(0); + return 0; } - +@@ -3795,19 +3788,16 @@ EOF --if { (eval echo configure:7313: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:7306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + if { (eval echo configure:3797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then - : + MAXIOV=`cat conftestval` @@ -95,7 +90,7 @@ ####################### -@@ -8260,7 +8250,7 @@ +@@ -4740,7 +4730,7 @@ s%@LIB_WRAP@%$LIB_WRAP%g s%@HAVE_HOSTS_ACCESS_TRUE@%$HAVE_HOSTS_ACCESS_TRUE%g s%@HAVE_HOSTS_ACCESS_FALSE@%$HAVE_HOSTS_ACCESS_FALSE%g @@ -104,7 +99,7 @@ s%@subdirs@%$subdirs%g s%@pkglibdir@%$pkglibdir%g -@@ -8584,10 +8574,6 @@ +@@ -5064,10 +5054,6 @@ *) # Relative path. ac_sub_cache_file="$ac_dots$cache_file" ;; esac Index: ports/devel/bonobo/Makefile =================================================================== RCS file: /home/ncvs/ports/devel/bonobo/Makefile,v retrieving revision 1.45 diff -d -u -r1.45 Makefile --- ports/devel/bonobo/Makefile 20 Nov 2001 14:18:56 -0000 1.45 +++ ports/devel/bonobo/Makefile 11 Jan 2002 18:22:08 -0000 @@ -6,7 +6,7 @@ # PORTNAME= bonobo -PORTVERSION= 1.0.17 +PORTVERSION= 1.0.18 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/bonobo Index: ports/devel/bonobo/distinfo =================================================================== RCS file: /home/ncvs/ports/devel/bonobo/distinfo,v retrieving revision 1.26 diff -d -u -r1.26 distinfo --- ports/devel/bonobo/distinfo 20 Nov 2001 14:18:56 -0000 1.26 +++ ports/devel/bonobo/distinfo 11 Jan 2002 18:22:08 -0000 @@ -1 +1 @@ -MD5 (bonobo-1.0.17.tar.gz) = 344e97877be5b9d3c6c1e55ad5228688 +MD5 (bonobo-1.0.18.tar.gz) = 40a0328bc525038129b9409861b94c8f Index: ports/devel/bonobo/pkg-plist =================================================================== RCS file: /home/ncvs/ports/devel/bonobo/pkg-plist,v retrieving revision 1.26 diff -d -u -r1.26 pkg-plist --- ports/devel/bonobo/pkg-plist 9 Nov 2001 16:30:34 -0000 1.26 +++ ports/devel/bonobo/pkg-plist 11 Jan 2002 18:22:08 -0000 @@ -157,6 +157,7 @@ share/locale/el/LC_MESSAGES/bonobo.mo share/locale/en_GB/LC_MESSAGES/bonobo.mo share/locale/es/LC_MESSAGES/bonobo.mo +share/locale/eu/LC_MESSAGES/bonobo.mo share/locale/fi/LC_MESSAGES/bonobo.mo share/locale/fr/LC_MESSAGES/bonobo.mo share/locale/ga/LC_MESSAGES/bonobo.mo Index: ports/devel/bonobo/files/patch-ab =================================================================== RCS file: /home/ncvs/ports/devel/bonobo/files/patch-ab,v retrieving revision 1.10 diff -d -u -r1.10 patch-ab --- ports/devel/bonobo/files/patch-ab 3 Jul 2001 17:34:18 -0000 1.10 +++ ports/devel/bonobo/files/patch-ab 11 Jan 2002 18:22:08 -0000 @@ -1,18 +1,18 @@ -$FreeBSD: ports/devel/bonobo/files/patch-ab,v 1.10 2001/07/03 17:34:18 sobomax Exp $ +$FreeBSD$ ---- Makefile.in.orig Tue Jul 3 15:35:08 2001 -+++ Makefile.in Tue Jul 3 15:37:04 2001 -@@ -157,10 +157,10 @@ - - NULL = - --SUBDIRS = macros intl idl libefs bonobo storage-modules monikers components samples gshell tests doc po -+SUBDIRS = macros intl idl libefs bonobo storage-modules monikers components samples gshell doc po +--- Makefile.in.orig Fri Jan 11 11:57:33 2002 ++++ Makefile.in Fri Jan 11 11:58:32 2002 +@@ -165,10 +165,10 @@ + monikers \ + components samples \ + gshell \ +- tests doc po ++ doc po -confexecdir = $(libdir) +confexecdir = $(sysconfdir) confexec_DATA = bonoboConf.sh bonoboxConf.sh bonobox_printConf.sh - include_HEADERS = bonobo.h + bonoboincludedir = $(includedir)/gnome-1.0 --%--multipart-mixed-boundary-1.99901.1010773602--%-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-gnome" in the body of the message