Re: [blfs-dev] Package updates and some notes

[Armin K.]

On 03/04/2012 10:21 PM, Andrew Benton wrote:
On Sun, 04 Mar 2012 19:45:09 +0100
"Armin K."<kre...@email.com>  wrote:

Actually, I only rediffed nspr patch. nss is the same - it still applies
but I diffed it to apply cleanly. Here are both patches with details. I
always forgot that one.

Sorry to mess you around but I think we should drop the nspr pkgconfig patch 
and create the pc file with a cat. It keeps all the info on the page, it's 
easier to update and the user can see what's happening.

Andy

Agreed. Same thing has been done with libmad, I don't see why it can't 
be with nspr. See attachment.
Index: BOOK/general.ent
===================================================================
--- BOOK/general.ent	(revision 9594)
+++ BOOK/general.ent	(working copy)
@@ -208,7 +208,7 @@
 <!ENTITY libtasn1-version             "2.10">
 <!ENTITY libunique-version            "3.0.2">
 <!ENTITY liboil-version               "0.3.17">
-<!ENTITY nspr-version                 "4.8.9">
+<!ENTITY nspr-version                 "4.9">
 <!ENTITY libffi-version               "3.0.10">
 <!ENTITY gobject-introspection-version "1.30.0">
 <!ENTITY libgee-version               "0.6.0">
Index: BOOK/general/genlib/nspr.xml
===================================================================
--- BOOK/general/genlib/nspr.xml	(revision 9594)
+++ BOOK/general/genlib/nspr.xml	(working copy)
@@ -6,9 +6,9 @@
 
   <!ENTITY nspr-download-http "http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v&nspr-version;/src/nspr-&nspr-version;.tar.gz";>
   <!ENTITY nspr-download-ftp  "ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v&nspr-version;/src/nspr-&nspr-version;.tar.gz";>
-  <!ENTITY nspr-md5sum        "60770d45dc08c0f181b22cdfce5be3e8">
+  <!ENTITY nspr-md5sum        "aa0c960b23a9d66a3c30c3e6ba80a99a">
   <!ENTITY nspr-size          "1.2 MB">
-  <!ENTITY nspr-buildsize     "21 MB">
+  <!ENTITY nspr-buildsize     "15 MB">
   <!ENTITY nspr-time          "less than 0.1 SBU">
 ]>
 
@@ -56,15 +56,6 @@
       </listitem>
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required patch: <ulink
-          url="http://www.linuxfromscratch.org/patches/downloads/nspr/nspr-&nspr-version;-pkgconfig-2.patch"/>
-      </para>
-      </listitem>
-    </itemizedlist>
-
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/nspr"/></para>
 
@@ -76,8 +67,7 @@
     <para>Install <application>NSPR</application> by running the following
     commands:</para>
 
-<screen><userinput>patch -Np1 -i ../nspr-&nspr-version;-pkgconfig-2.patch &amp;&amp;
-cd mozilla/nsprpub &amp;&amp;
+<screen><userinput>cd mozilla/nsprpub &amp;&amp;
 sed -i 's#^\(RELEASE_BINS =\).*#\1#' pr/src/misc/Makefile.in &amp;&amp;
 ./configure --prefix=/usr --with-mozilla --with-pthreads \
   $([ $(arch) = x86_64 ] &amp;&amp; echo --enable-64bit) &amp;&amp;
@@ -90,6 +80,24 @@
 <screen role="root"><userinput>make install &amp;&amp;
 cp -v -LR dist/include/nspr /usr/include</userinput></screen>
 
+    <para>Many packages check for the pkg-config file for nspr, so create it.</para>
+
+    <para>As the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>cat &gt; /usr/lib/pkgconfig/nspr.pc &lt;&lt; "EOF"
+<literal>prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include/nspr
+
+Name: NSPR
+Description: The Netscape Portable Runtime
+Version: &nspr-version;
+Libs: -L${libdir} -lplds4 -lplc4 -lnspr4 -lpthread
+Cflags: -I${includedir}
+</literal>
+EOF</userinput></screen>
+
   </sect2>
 
   <sect2 role="commands">
-- 
http://linuxfromscratch.org/mailman/listinfo/blfs-dev
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page