On 21-12-2014 16:11, Armin K. wrote:
> On 12/21/2014 07:45 PM, [email protected] 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?

Yes: I didn't see it. Actually, after you reported, I decided to search
for the problem and after finding, I forgot to got to that github
address, thinking it was the same thing.

Then, when deciding if making one patch from the two problems, noticed
that your gc patch could be replaced by an sed.

> 
>> +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

No problem, will replace it tomorrow. I planned to download libreoffice
to run overnight, but even this is delayed.


Thanks, again.


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

Reply via email to