Date: 26 Apr 2002 01:25:38 -0300 From: Joe Marcus Clarke <marcus@marcuscom.com> To: Franz Klammer <klammer@webonaut.com> Cc: gnome@FreeBSD.ORG Subject: Re: galeon: patch-configure patch-hairy want to do the same changes Message-ID: <1019795138.308.12.camel@gyros.marcuscom.com> In-Reply-To: <1019773444.477.15.camel@ncc-1701.webonaut.com> References: <1019773444.477.15.camel@ncc-1701.webonaut.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Thu, 2002-04-25 at 19:24, Franz Klammer wrote: > patch-configure and patch-hairy seems to try the > same changes in configure: Thanks. I just fixed this. Forgiveness sought from: sobomax I figured this wasn't a big deal to commit, and will cause some gripes the longer it stays in the tree. Joe > > franz > > > configure error-msg: > ===================================================== > > make configure > ===> Patching for galeon-1.2.1 > ===> Applying FreeBSD patches for galeon-1.2.1 > Ignoring previously applied (or reversed) patch. > 1 out of 1 hunks ignored--saving rejects to configure.rej > >> Patch patch-hairy failed to apply cleanly. > >> Patch(es) patch-GNOME_Galeon_NautilusView.oaf > patch-GNOME_Galeon_NautilusView.oaf.in patch-ab patch-configure > patch-galeon-config-tool.in patch-galeon.schemas.in applied cleanly. > *** Error code 1 > > Stop in /usr/ports/www/galeon. > > > > configure.rej: > ===================================================== > *************** > *** 7078,7084 **** > #define ENABLE_NAUTILUS_VIEW 1 > EOF > > - _gnome_modules="$_gnome_modules bonobox nautilus" > fi > echo "$ac_t""$enable_nautilus_view" 1>&6 > > --- 7079,7085 ---- > #define ENABLE_NAUTILUS_VIEW 1 > EOF > > + _gnome_modules="$_gnome_modules bonobox" > fi > echo "$ac_t""$enable_nautilus_view" 1>&6 > > > > > patch-configure: > ===================================================== > --- configure.orig Thu Apr 25 21:02:26 2002 > +++ configure Thu Apr 25 21:03:14 2002 > @@ -5434,6 +5434,7 @@ > > # This can be used to rebuild libtool when needed > LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" > +$ac_aux_dir/ltconfig $LIBTOOL_DEPS > > # Always use our own libtool. > LIBTOOL='$(SHELL) $(top_builddir)/libtool' > @@ -7078,7 +7079,7 @@ > #define ENABLE_NAUTILUS_VIEW 1 > EOF > > - _gnome_modules="$_gnome_modules bonobox nautilus" > + _gnome_modules="$_gnome_modules bonobox" > fi > echo "$ac_t""$enable_nautilus_view" 1>&6 > > > > (double) patch-hairy: > ===================================================== > --- configure.orig Wed Mar 13 19:23:43 2002 > +++ configure Wed Mar 13 19:29:40 2002 > @@ -7078,7 +7079,7 @@ > #define ENABLE_NAUTILUS_VIEW 1 > EOF > > - _gnome_modules="$_gnome_modules bonobox nautilus" > + _gnome_modules="$_gnome_modules bonobox" > fi > echo "$ac_t""$enable_nautilus_view" 1>&6 > > > > -- > WEBONAUT.com > http://webonaut.com > mailto:klammer@webonaut.com > > > To Unsubscribe: send mail to majordomo@FreeBSD.org > with "unsubscribe freebsd-gnome" in the body of the message > -- PGP Key: http://www.marcuscom.com/pgp.asc 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?1019795138.308.12.camel>