Re: [blfs-dev] [blfs-book] r15241 - in trunk/BOOK: . general/prog general/sysutils introduction/welcome multimedia/videoutils server/databases xsoft/other

[Armin K.]

On 12/21/2014 07:45 PM, ferna...@higgs.linuxfromscratch.org wrote:
> Author: fernando
> Date: Sun Dec 21 10:45:33 2014
> New Revision: 15241
> 
> Log:
> Fix inkscape-0.48.5 build with poppler-0.29.0. Replace gc patch by sed.
> 
> Modified:
>    trunk/BOOK/xsoft/other/inkscape.xml
> 

> Modified: trunk/BOOK/xsoft/other/inkscape.xml
> ==============================================================================
> --- trunk/BOOK/xsoft/other/inkscape.xml       Sun Dec 21 10:09:06 2014        
> (r15240)
> +++ trunk/BOOK/xsoft/other/inkscape.xml       Sun Dec 21 10:45:33 2014        
> (r15241)
> @@ -135,9 +135,14 @@
>        commands:
>      </para>
>  
> -<screen><userinput>patch -Np1 -i ../inkscape-&inkscape-version;-gc-1.patch 
> &amp;&amp;
> +<screen><userinput>patch -Np1 -i 
> ../inkscape-&inkscape-version;-poppler-1.patch &amp;&amp;

Any *technical* reason why you didn't use the sed I provided?

> +autoreconf -vi &amp;&amp;
>  
> -./configure --prefix=/usr  &amp;&amp;
> +sed -e '/unsigned GC_version/d' \
> +    -e '/int main(void)/ a\\t\t\tunsigned GC_version = GC_get_version();' \
> +    -i configure &amp;&amp;
> +

Try a simpler one:

sed -ri "s:.*(unsigned GC_version).*:\1 = GC_get_version()\;:" configure

> +./configure --prefix=/usr &amp;&amp;
>  make</userinput></screen>
>  
>  <!-- Test suite is broken as of inkscape-0.48.5
>

-- 
Note: My last name is not Krejzi.

signature.asc
Description: OpenPGP digital signature

-- 
http://lists.linuxfromscratch.org/listinfo/blfs-dev
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page