Author Login
Post Reply
Quoting Anssi Hannula <anssi@(protected)>:
>> Source0: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/%{name}-%{version}.tar.bz2
>> # (fc) 1.0.20-4mdk don't add -L/usr/lib to ldflags
>> Patch0: bonobo-1.0.20-libdir.patch.bz2
>> -# (gb) 1.0.22-8mdk stick to built-in libtool 1.4 with fixes
>> -Patch1: bonobo-1.0.22-libtool.patch.bz2
>> # (neoclust) 1.0.22-8mdk Patch to make it build with gcc4
>> Patch2: bonobo-1.0.22-gcc4.patch.bz2
>> # (Anssi 05/2008) Fix underlinking
>> @@(protected) @@
>> %if %{build_xvfb}
>> BuildRequires: XFree86-Xvfb
>> %endif
>> +BuildRequires: libtool
>>
>> %description
>> Bonobo is a library that provides the necessary framework for GNOME
>> @@(protected) @@
>> %prep
>> %setup -q
>> %patch0 -p1 -b .libdir
>> -%patch1 -p1 -b .libtool
>> %patch2 -p1 -b .gcc4
>> %patch3 -p1
>> %patch4 -p1
>>
>> -# needed by patch0,3 and regenerate_configure
>> -# (Anssi 05/2008) does not work with new autoconf
>> -autoconf-2.13
>> -automake-1.4
>
> So, here you basically disable my Patch3 (and possibly Frederic's
> Patch0), even though the patches are still applied. Why?
I will try to review it because patches are still being applied.
IIRC it was not compiling cleanly after the other dependencies were
rebuilt. All I wanted was to recompile with the missing symbol
so that gtkhtml doesn't have missing symbols.
>> -# ... but libefs does not work with old autotools:
>> autoreconf -if libefs
>>
>> %build
>> %configure2_5x
>>
>> -# use only one (correct) implementation of libtool
>> -rm -f libefs/libtool
>> -ln -s ../libtool libefs/libtool
>> +# Use system libtool and
>> +# don't expliclity include or link to files under /usr/X11R6
>> +perl -pi -e '\
>> +s@/X11R6/@/@(protected);\
>> +s@(protected)@'\
>> + `find . -name Makefile`
>>
>> -# Don't expliclity include or link to files under /usr/X11R6
>> -perl -pi -e 's@/X11R6/@/@(protected)`
>
> Interesting, wouldn't the usual 'libtoolize --copy --force' (possibly
> with aclocal) have worked? IMO it would've been nicer than this hack.
I think it gets back to the problem of order packages are rebuilt,
at least one build should not add /X11R6/ to pathnames, so it doesn't
propagate to the others.
>> +# Fix underlinked libraries
>> +perl -pi -e '\
>> +s@(protected)
>> -lglib -lgtk -loaf -lgmodule -lgnome -ldl -lX11@;\
>> +s@(protected)
>> libbonobo.la -lxml -lart_lgpl -lgnomeprint@'\
>> + bonobo/Makefile
>
> So here you basically re-do my patch3 (that you effectively disabled)
> with a perl hack?!
I will try again building without these changes, but again, IIRC
there were still missing symbols.
>> # parallel build is broken, don't use macro
>> make
If you feel like it, you can also rework this package. These packages
that were not rebuilt since 2007.0 or earlier are a pain...
> --
> Anssi Hannula
Paulo