Changeset d7513fd for x

Timestamp:

07/14/2013 03:44:55 PM (11 years ago)

Author:

Krejzi <krejzi@…>

Branches:

systemd-11177

Children:

591858f

Parents:

71f73d39

Message:

Merge trunk and systemd branch, part 2.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@11406 af4574ff-66df-0310-9fd7-8a98e5e911e0

Location:

x

Files:

• installing/libxcb.xml (modified) (3 diffs)
• installing/xterm.xml (modified) (1 diff)
• lib/gtk+2.xml (modified) (1 diff)
• lib/xulrunner.xml (modified) (4 diffs)

x/installing/libxcb.xml

@@ -59 +59 @@
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para>Required patch: <ulink
+        url="&patch-root;/libxcb-&libxcb-version;-automake_bug-1.patch"/></para>
+      </listitem>
+    </itemizedlist>
+
     <bridgehead renderas="sect3">libxcb Dependencies</bridgehead>
 
@@ -86 +94 @@
     commands:</para>
 
-<screen><userinput>sed -e "s/pthread-stubs//" -i configure.ac &amp;&amp;
+<screen><userinput>patch -Np1 -i ../libxcb-&libxcb-version;-automake_bug-1.patch &amp;&amp;
+sed -e "s/pthread-stubs//" -i configure.ac &amp;&amp;
 autoreconf -fi &amp;&amp;
-./configure $XORG_CONFIG --enable-xinput --docdir='${datadir}'/doc/libxcb-&libxcb-version; &amp;&amp;
+./configure $XORG_CONFIG --docdir='${datadir}'/doc/libxcb-&libxcb-version; \
+            --enable-xinput --enable-xkb &amp;&amp;
 make</userinput></screen>
 
@@ -107 +117 @@
 
     <para><option>--enable-xinput</option>: This switch enables XCB Xinput
+    extension.</para>
+
+    <para><option>--enable-xkb</option>: This switch enables XCB XKB
     extension.</para>
 

x/installing/xterm.xml

@@ -7 +7 @@
   <!ENTITY xterm-download-http " ">
   <!ENTITY xterm-download-ftp  "ftp://invisible-island.net/xterm/xterm-&xterm-version;.tgz">
-  <!ENTITY xterm-md5sum        "f9dc37486d5f1e550b6dc2e26a8a0439">
+  <!ENTITY xterm-md5sum        "5a11e78d3504c859e8b16f7bbe03b0d1">
   <!ENTITY xterm-size          "1.1 MB">
   <!ENTITY xterm-buildsize     "13 MB">

x/lib/gtk+2.xml

@@ -7 +7 @@
   <!ENTITY gtk2-download-http "&gnome-download-http;/gtk+/2.24/gtk+-&gtk2-version;.tar.xz">
   <!ENTITY gtk2-download-ftp  "&gnome-download-ftp;/gtk+/2.24/gtk+-&gtk2-version;.tar.xz">
-  <!ENTITY gtk2-md5sum        "490236abeb0d9351b2a34e9aca70e1de">
-  <!ENTITY gtk2-size          "12.8 MB">
-  <!ENTITY gtk2-buildsize     "381 MB">
-  <!ENTITY gtk2-time          "3.0 SBU">
+  <!ENTITY gtk2-md5sum        "9d7833331d7accd80668e29d7f567ce5">
+  <!ENTITY gtk2-size          "13 MB">
+  <!ENTITY gtk2-buildsize     "354 MB">
+  <!ENTITY gtk2-time          "3.1 SBU">
 ]>
 

x/lib/xulrunner.xml

@@ -9 +9 @@
   <!ENTITY xulrunner-download-ftp
            "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/&firefox-version;/source/firefox-&firefox-version;.source.tar.bz2">
-  <!ENTITY xulrunner-md5sum        "6e2510e9466b280c367de0e4c05a8840">
-  <!ENTITY xulrunner-size          "101 MB">
-  <!ENTITY xulrunner-buildsize     "4.1 GB (125 MB installed)">
-  <!ENTITY xulrunner-time          "35 SBU">
+  <!ENTITY xulrunner-md5sum        "4ffb6d1c1a04ca8e3dbca23df09626dd">
+  <!ENTITY xulrunner-size          "107 MB">
+  <!ENTITY xulrunner-buildsize     "4.4 GB (87 MB installed)">
+  <!ENTITY xulrunner-time          "32 SBU">
 ]>
 
@@ -139 +139 @@
 
 <screen><userinput>cat &gt; mozconfig &lt;&lt; "EOF"
-# If you have a multicore machine you can speed up the build by running
-# several jobs at once by uncommenting the following line and setting the
-# value to number of CPU cores:
-#mk_add_options MOZ_MAKE_FLAGS="-j4"
+# If you have a multicore machine, firefox will now use all the cores by
+# default. Exceptionally, you can reduce the number of cores, e.g. to 1,
+# by uncommenting the next line and setting a valid number of CPU cores.
+#mk_add_options MOZ_MAKE_FLAGS="-j1"
 
 # If you have installed DBus-Glib comment out this line:
@@ -218 +218 @@
 ln -sv ../mozilla/plugins /usr/lib/xulrunner-&xulrunner-version; &amp;&amp;
 
-chmod -v 755 /usr/lib/xulrunner-&xulrunner-version;/libxpcom.so \
-             /usr/lib/xulrunner-devel-&xulrunner-version;/sdk/bin/xpcshell &amp;&amp;
-
-for library in libmozalloc.so libmozjs.so libxpcom.so libxul.so; do
+chmod -v 755 /usr/lib/xulrunner-devel-&xulrunner-version;/sdk/bin/xpcshell &amp;&amp;
+
+for library in libmozalloc.so libmozjs.so libxul.so; do
     ln -sfv ../../../xulrunner-&xulrunner-version;/$library \
             /usr/lib/xulrunner-devel-&xulrunner-version;/sdk/lib/$library
@@ -254 +253 @@
 
     <para>
-      <command>for library in libmozalloc.so libmozjs.so libxpcom.so libxul.so ...
+      <command>for library in libmozalloc.so libmozjs.so libxul.so ...
       </command>: The libraries shipped with this package are installed into
       <filename class="directory">/usr/lib/xulrunner-&xulrunner-version;</filename>