Changeset 9ea9aa7 for x

Timestamp:

04/06/2016 11:23:04 PM (8 years ago)

Author:

DJ Lucas <dj@…>

Branches:

systemd-13485

Children:

c7facee

Parents:

02d46cb

Message:

Merges from trunk to r17100.

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

Location:

x

Files:

• icons/oxygen-icons.xml (modified) (1 diff)
• installing/x7proto.xml (modified) (1 diff)
• installing/xorg-server.xml (modified) (5 diffs)
• installing/xterm.xml (modified) (1 diff)
• lib/qt5.xml (modified) (2 diffs)

x/icons/oxygen-icons.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY oxygen-icons-download-http "&kde-download-http;applications/&oxygen-icons-version;/src/oxygen-icons-&oxygen-icons-version;.tar.xz">
+  <!ENTITY oxygen-icons-download-http "&kde-download-attic;/&oxygen-icons-version;/src/oxygen-icons-&oxygen-icons-version;.tar.xz">
   <!ENTITY oxygen-icons-download-ftp  " ">
   <!ENTITY oxygen-icons-md5sum        "4f24f975fb90d8daab833fc719ce39a3">

x/installing/x7proto.xml

@@ -62 +62 @@
   <!ENTITY scrnsaverproto-md5sum           "edd8a73775e8ece1d69515dd17767bfb">
 
-  <!ENTITY videoproto-version              "2.3.2">
-  <!ENTITY videoproto-md5sum               "e658641595327d3990eab70fdb55ca8b">
+  <!ENTITY videoproto-version              "2.3.3">
+  <!ENTITY videoproto-md5sum               "fe86de8ea3eb53b5a8f52956c5cd3174">
 
   <!ENTITY xcmiscproto-version             "1.2.2">

x/installing/xorg-server.xml

@@ -7 +7 @@
   <!ENTITY xorg-server-download-http "&xorg-download-http;/xserver/xorg-server-&xorg-server-version;.tar.bz2">
   <!ENTITY xorg-server-download-ftp  "&xorg-download-ftp;/xserver/xorg-server-&xorg-server-version;.tar.bz2">
-  <!ENTITY xorg-server-md5sum        "1b9e85420c3790dd487addd50313f4da">
+  <!ENTITY xorg-server-md5sum        "052fc1b4b12a5df0a3e35a1b46a52db3">
   <!ENTITY xorg-server-size          "5.6 MB">
   <!ENTITY xorg-server-buildsize     "544 MB (with tests)">
@@ -79 +79 @@
         </para>
       </listitem>
+<!--  Seems to have been included in version 1.18.2
       <listitem>
         <para>
@@ -84 +85 @@
           <ulink url="&patch-root;/xorg-server-&xorg-server-version;-wayland_190-1.patch"/>
         </para>
-      </listitem>
+      </listitem>-->
     </itemizedlist>
 
@@ -130 +131 @@
     <title>Installation of Xorg Server</title>
 
-    <para>
+<!--    <para>
       If you have downloaded the optional patch, apply it by running the
       following command:
@@ -136 +137 @@
 
 <screen><userinput>patch -Np1 -i ../xorg-server-&xorg-server-version;-add_prime_support-1.patch</userinput></screen>
-
+-->
     <para>
       If you have downloaded the recommended patch, apply it by running the

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        "9ea4c83ac7275fdecf39fde9db781fac">
+  <!ENTITY xterm-md5sum        "7c325c29d67637cf7ff8e904a23c222e">
   <!ENTITY xterm-size          "1.2 MB">
-  <!ENTITY xterm-buildsize     "15 MB">
-  <!ENTITY xterm-time          "0.1 SBU">
+  <!ENTITY xterm-buildsize     "11.8 MB">
+  <!ENTITY xterm-time          "0.2 SBU">
 ]>
 

x/lib/qt5.xml

@@ -101 +101 @@
       <xref linkend="libtiff"/>,
       <xref linkend="libwebp"/>,
+      <xref linkend="libxkbcommon"/>,
       <xref linkend="mesa"/>,
       <xref linkend="mtdev"/>,
@@ -125 +126 @@
       <xref linkend="postgresql"/>,
       <xref linkend="pulseaudio"/>,
-      <xref linkend="unixodbc"/>,
-      <ulink url="https://code.google.com/p/ibus/">IBus</ulink>, and 
-      <ulink url="http://xkbcommon.org/">libxkbcommon</ulink>
+      <xref linkend="unixodbc"/>, and
+      <ulink url="https://code.google.com/p/ibus/">IBus</ulink>.
     </para>