Date: Fri, 22 Nov 2013 20:04:57 +0200 From: Pavlo Greenberg <dog@virtual.org.ua> To: Eitan Adler <lists@eitanadler.com> Cc: FreeBSD Ports <ports@freebsd.org>, Wolfgang Zenker <wolfgang@lyxys.ka.sub.org> Subject: Re: CFT: icewm update Message-ID: <CAPGd3h3OcQi-JZvBBaQ440og4bPRR5iu5AJmg0i-4pT7q66zDQ@mail.gmail.com> In-Reply-To: <CAF6rxgk7XRDpKTDhgzEtiy9irbK6bPV%2BrzchBY%2BbmJgk1OaK6w@mail.gmail.com> References: <CAF6rxgk7XRDpKTDhgzEtiy9irbK6bPV%2BrzchBY%2BbmJgk1OaK6w@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
Hello. dog@dog:~> uname -a FreeBSD dog 10.0-BETA3 FreeBSD 10.0-BETA3 #0 r258354: Tue Nov 19 22:18:10 EET 2013 root@dog:/usr/obj/usr/src/sys/DOG amd64 Fails with thw following error: dog@dog:~> cd /usr/ports/x11-wm/icewm/ dog@dog:/usr/ports/x11-wm/icewm> sudo make clean =3D=3D=3D> Cleaning for icewm-1.3.7_3 dog@dog:/usr/ports/x11-wm/icewm> sudo wget http://people.freebsd.org/~eadler/files/icewm-update.diff --2013-11-22 19:53:30-- http://people.freebsd.org/~eadler/files/icewm-update.diff =F7=C9=DA=CE=C1=DE=C5=CE=CE=D1 =A6=CD=C5=CE=A6 people.freebsd.org (people.f= reebsd.org)... 8.8.178.141 Connecting to people.freebsd.org (people.freebsd.org)|8.8.178.141|:80... =D0=A6=C4'=A4=C4=CE=C1=CE=CF. HTTP-=DA=C1=D0=C9=D4 =CE=C1=C4=A6=D3=CC=C1=CE=CF, =CF=DE=A6=CB=D5=A4=CD =D7= =A6=C4=D0=CF=D7=A6=C4=A6... 200 OK =E4=CF=D7=D6=C9=CE=C1: 6734 (6,6K) [text/plain] Saving to: 'icewm-update.diff' 100%[=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D>] 6 734 --.-K/s in 0,001s 2013-11-22 19:53:30 (9,00 MB/s) - 'icewm-update.diff' saved [6734/6734] dog@dog:/usr/ports/x11-wm/icewm> sudo sh -c "patch < icewm-update.diff" Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: Makefile |=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D |--- Makefile (revision 333538) |+++ Makefile (working copy) -------------------------- Patching file Makefile using Plan A... Hunk #1 succeeded at 2 with fuzz 1. Hunk #2 succeeded at 27. Hunk #3 succeeded at 87. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: distinfo |=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D |--- distinfo (revision 333538) |+++ distinfo (working copy) -------------------------- Patching file distinfo using Plan A... Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: files/patch-Makefile.in |=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D |--- files/patch-Makefile.in (revision 0) |+++ files/patch-Makefile.in (working copy) -------------------------- (Creating file files/patch-Makefile.in...) Patching file files/patch-Makefile.in using Plan A... Empty context always matches. Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- | |Property changes on: files/patch-Makefile.in |___________________________________________________________________ |Added: svn:mime-type |## -0,0 +1 ## |+text/plain |\ No newline at end of property |Added: svn:keywords |## -0,0 +1 ## |+FreeBSD=3D%H |\ No newline at end of property |Added: fbsd:nokeywords |## -0,0 +1 ## |+yes |\ No newline at end of property |Added: svn:eol-style |## -0,0 +1 ## |+native |\ No newline at end of property |Index: files/patch-src__Makefile.in |=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D |--- files/patch-src__Makefile.in (revision 333538) |+++ files/patch-src__Makefile.in (working copy) -------------------------- Patching file files/patch-src__Makefile.in using Plan A... Hunk #1 succeeded at 0. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: files/patch-src__aapm.cc |=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D |--- files/patch-src__aapm.cc (revision 333538) |+++ files/patch-src__aapm.cc (working copy) -------------------------- Patching file files/patch-src__aapm.cc using Plan A... Hunk #1 succeeded at 0. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: files/patch-src__apppstatus.cc |=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D |--- files/patch-src__apppstatus.cc (revision 333538) |+++ files/patch-src__apppstatus.cc (working copy) -------------------------- Patching file files/patch-src__apppstatus.cc using Plan A... Hunk #1 succeeded at 0. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: files/patch-src__wmapp.h |=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D |--- files/patch-src__wmapp.h (revision 0) |+++ files/patch-src__wmapp.h (working copy) -------------------------- (Creating file files/patch-src__wmapp.h...) Patching file files/patch-src__wmapp.h using Plan A... Empty context always matches. Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- | |Property changes on: files/patch-src__wmapp.h |___________________________________________________________________ |Added: fbsd:nokeywords |## -0,0 +1 ## |+yes |\ No newline at end of property |Added: svn:eol-style |## -0,0 +1 ## |+native |\ No newline at end of property |Added: svn:mime-type |## -0,0 +1 ## |+text/plain |\ No newline at end of property |Added: svn:keywords |## -0,0 +1 ## |+FreeBSD=3D%H |\ No newline at end of property |Index: files/patch-src__yarray.h |=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D |--- files/patch-src__yarray.h (revision 333538) |+++ files/patch-src__yarray.h (working copy) -------------------------- Patching file files/patch-src__yarray.h using Plan A... Hunk #1 succeeded at 0. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: files/patch-src_base.h |=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D |--- files/patch-src_base.h (revision 333538) |+++ files/patch-src_base.h (working copy) -------------------------- Patching file files/patch-src_base.h using Plan A... Hunk #1 succeeded at 0. done dog@dog:/usr/ports/x11-wm/icewm> sudo rm icewm-update.diff dog@dog:/usr/ports/x11-wm/icewm> sudo portupgrade -v icewm-1.3.7_3 ---> Session started at: Fri, 22 Nov 2013 19:59:55 +0200 [Reading data from pkg(8) ... - 1163 packages found - done] ** Port marked as IGNORE: x11-wm/icewm: patch does not apply ---> Listing the results (+:done / -:ignored / *:skipped / !:failed) - x11-wm/icewm (marked as IGNORE) ---> Packages processed: 0 done, 1 ignored, 0 skipped and 0 failed ---> Session ended at: Fri, 22 Nov 2013 19:59:59 +0200 (consumed 00:00:03) 2013/11/21 Eitan Adler <lists@eitanadler.com> > If you use icewm can you please test the following patch and let me > know if it runs as expected. > > > [ patch here: http://people.freebsd.org/~eadler/files/icewm-update.diff ] > Index: Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > --- Makefile (revision 333538) > +++ Makefile (working copy) > @@ -2,8 +2,7 @@ > # $FreeBSD$ > > PORTNAME=3D icewm > -PORTVERSION=3D 1.3.7 > -PORTREVISION=3D 3 > +PORTVERSION=3D 1.3.8 > CATEGORIES=3D x11-wm > MASTER_SITES=3D SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}/${PORTVERSIO= N}/ > > @@ -28,10 +27,12 @@ CONFIGURE_ARGS=3D --enable-shaped-decorations \ > --with-mkfontdir=3D${NONEXISTENT} > > OPTIONS_DEFINE=3D GNOME ESOUND XFT XINERAMA ASM BEASTIE NLS LITE MENUFIX > -OPTIONS_DEFAULT=3D XFT XINERAMA ASM BEASTIE NLS MENUFIX > +OPTIONS_DEFAULT=3D XFT XINERAMA ASM BEASTIE NLS > BEASTIE_DESC=3D Use Beastie'fied startup button > MENUFIX_DESC=3D MenuIconSize fix > > +MAKE_JOBS_UNSAFE=3D yes > + > .include <bsd.port.pre.mk> > > .if ${PORT_OPTIONS:MGNOME} > @@ -86,6 +87,7 @@ MAKE_ENV+=3D LITE=3D1 > .endif > > .if ${PORT_OPTIONS:MMENUFIX} > +IGNORE=3Dpatch does not apply > EXTRA_PATCHES+=3D ${FILESDIR}/extra-menu-icon-fix.patch > .endif > > Index: distinfo > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > --- distinfo (revision 333538) > +++ distinfo (working copy) > @@ -1,2 +1,2 @@ > -SHA256 (icewm-1.3.7.tar.gz) =3D > ca1a78046ae340c324c441ce24a9675c24a8bafd3eb6ed8205345785da08887b > -SIZE (icewm-1.3.7.tar.gz) =3D 898197 > +SHA256 (icewm-1.3.8.tar.gz) =3D > 17588d9e0bbbb23587bc04c83da9dd94fd4da6894ecfee6d7f3ed50d780dcd18 > +SIZE (icewm-1.3.8.tar.gz) =3D 905680 > Index: files/patch-Makefile.in > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > --- files/patch-Makefile.in (revision 0) > +++ files/patch-Makefile.in (working copy) > @@ -0,0 +1,11 @@ > +--- ./Makefile.in.orig 2013-11-17 11:54:39.000000000 -0500 > ++++ ./Makefile.in 2013-11-20 20:55:13.828716619 -0500 > +@@ -4,8 +4,6 @@ > + # Please run 'configure' first (generate it with autogen.sh) > + > #########################################################################= ####### > + > +-SHELL=3D/bin/bash > +- > + srcdir =3D @srcdir@ > + top_srcdir =3D @top_srcdir@ > + > > Property changes on: files/patch-Makefile.in > ___________________________________________________________________ > Added: svn:keywords > ## -0,0 +1 ## > +FreeBSD=3D%H > \ No newline at end of property > Added: fbsd:nokeywords > ## -0,0 +1 ## > +yes > \ No newline at end of property > Added: svn:eol-style > ## -0,0 +1 ## > +native > \ No newline at end of property > Added: svn:mime-type > ## -0,0 +1 ## > +text/plain > \ No newline at end of property > Index: files/patch-src__Makefile.in > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > --- files/patch-src__Makefile.in (revision 333538) > +++ files/patch-src__Makefile.in (working copy) > @@ -1,11 +0,0 @@ > ---- ./src/Makefile.in.orig 2011-04-22 23:41:38.690448253 +0200 > -+++ ./src/Makefile.in 2011-04-22 23:41:53.522445343 +0200 > -@@ -32,7 +32,7 @@ > - -DICEWMBGEXE=3D'"icewmbg$(EXEEXT)"' \ > - -DICESMEXE=3D'"icewm-session$(EXEEXT)"' \ > - -DICEHELPEXE=3D'"icehelp$(EXEEXT)"' \ > -- -DICEHELPIDX=3D'"$(DOCDIR)/icewm-$(VERSION)/icewm.html"= ' > -+ -DICEHELPIDX=3D'"$(DOCDIR)/icewm/icewm.html"' > - > - CXXFLAGS =3D @CXXFLAGS@ $(DEBUG) $(DEFS) `pkg-config > gdk-pixbuf-xlib-2.0 --cflags` \ > - @CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ # `fc-config > --cflags` > Index: files/patch-src__aapm.cc > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > --- files/patch-src__aapm.cc (revision 333538) > +++ files/patch-src__aapm.cc (working copy) > @@ -1,10 +0,0 @@ > ---- ./src/aapm.cc.orig 2010-10-31 10:09:36.000000000 -0400 > -+++ ./src/aapm.cc 2010-11-02 19:56:53.000000000 -0400 > -@@ -243,6 +243,7 @@ > - } > - > - void YApm::AcpiStr(char *s, bool Tool) { > -+ size_t len; > - char buf[80], buf2[80], bat_info[250]; > - FILE *fd; > - //name of the battery > Index: files/patch-src__apppstatus.cc > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > --- files/patch-src__apppstatus.cc (revision 333538) > +++ files/patch-src__apppstatus.cc (working copy) > @@ -1,17 +0,0 @@ > -Fix clang build errors > - > - > http://icewm.cvs.sourceforge.net/viewvc/icewm/icewm-1.2/src/apppstatus.cc= ?r1=3D1.24.2.1.2.4&r2=3D1.24.2.1.2.5&pathrev=3Dicewm-1-3-BRANCH > - > ---- src/apppstatus.cc 2009/11/08 19:24:08 1.24.2.1.2.4 > -+++ src/apppstatus.cc 2010/12/25 15:29:53 1.24.2.1.2.5 > -@@ -82,7 +82,9 @@ > - } > - > - NetStatus::~NetStatus() { > -- delete[] color; > -+ delete color[0]; > -+ delete color[1]; > -+ delete color[2]; > - delete[] ppp_in; > - delete[] ppp_out; > - delete fUpdateTimer; > Index: files/patch-src__wmapp.h > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > --- files/patch-src__wmapp.h (revision 0) > +++ files/patch-src__wmapp.h (working copy) > @@ -0,0 +1,12 @@ > +--- ./src/wmapp.h.orig 2013-11-20 21:01:23.373692186 -0500 > ++++ ./src/wmapp.h 2013-11-20 21:01:25.890691688 -0500 > +@@ -78,9 +78,7 @@ > + Window managerWindow; > + }; > + > +-#if 0 > + extern YWMApp * wmapp; > +-#endif > + > + extern YMenu *windowMenu; > + extern YMenu *occupyMenu; > > Property changes on: files/patch-src__wmapp.h > ___________________________________________________________________ > Added: svn:mime-type > ## -0,0 +1 ## > +text/plain > \ No newline at end of property > Added: svn:keywords > ## -0,0 +1 ## > +FreeBSD=3D%H > \ No newline at end of property > Added: fbsd:nokeywords > ## -0,0 +1 ## > +yes > \ No newline at end of property > Added: svn:eol-style > ## -0,0 +1 ## > +native > \ No newline at end of property > Index: files/patch-src__yarray.h > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > --- files/patch-src__yarray.h (revision 333538) > +++ files/patch-src__yarray.h (working copy) > @@ -1,16 +0,0 @@ > -Fix build with clang > - > - > http://icewm.cvs.sourceforge.net/viewvc/icewm/icewm-1.2/src/yarray.h?r1= =3D1.5.4.3&r2=3D1.5.4.4&pathrev=3Dicewm-1-3-BRANCH > - > ---- src/yarray.h 2009/06/01 17:10:07 1.5.4.3 > -+++ src/yarray.h 2010/12/25 15:29:53 1.5.4.4 > -@@ -152,7 +152,8 @@ > - } > - > - virtual void remove(const typename YArray<DataType *>::SizeType > index) { > -- if (index < YArray<DataType *>::getCount()) delete > getItem(index); > -+ if (index < YArray<DataType *>::getCount()) > -+ delete YArray<DataType *>::getItem(index); > - YArray<DataType *>::remove(index); > - } > - > Index: files/patch-src_base.h > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > --- files/patch-src_base.h (revision 333538) > +++ files/patch-src_base.h (working copy) > @@ -1,15 +0,0 @@ > ---- src/base.h.orig 2010-10-31 15:09:36.000000000 +0100 > -+++ src/base.h 2013-05-25 12:39:49.498390711 +0200 > -@@ -1,12 +1,6 @@ > - #ifndef __BASE_H > - #define __BASE_H > - > --#if ( __GNUC__ =3D=3D 3 && __GNUC_MINOR__ > 0 ) || __GNUC__ > 3 > --#define deprecated __attribute__((deprecated)) > --#else > --#define deprecated > --#endif > -- > - /*** Atomar Data Types > ********************************************************/ > - > - #ifdef NEED_BOOL > > > -- > Eitan Adler >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAPGd3h3OcQi-JZvBBaQ440og4bPRR5iu5AJmg0i-4pT7q66zDQ>