Changeset ac38e9dc for pst/scanning


Ignore:
Timestamp:
08/01/2015 04:26:22 AM (9 years ago)
Author:
Douglas R. Reno <renodr@…>
Branches:
systemd-13485
Children:
ad6910d
Parents:
4a83293
Message:

Import back into SVN from Github

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

Location:
pst/scanning
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • pst/scanning/sane.xml

    r4a83293 rac38e9dc  
    1313  <!ENTITY sane-be-size          "5.6 MB">
    1414  <!ENTITY sane-be-buildsize     "97 MB">
    15   <!ENTITY sane-be-time          "1 SBU">
     15  <!ENTITY sane-be-time          "1.0 SBU">
    1616
    1717  <!ENTITY sane-fe-download-http "http://alioth.debian.org/frs/download.php/file/1140/sane-frontends-&sane-fe-version;.tar.gz">
    … …  
    5151    front ends are user interfaces to access the backends.</para>
    5252
    53     &lfs76_checked;
     53    &lfs77_checked;
    5454
    5555    <!-- The upstream web site has the md5sums for the tarballs:
    … …  
    137137      <xref linkend="libtiff"/>,
    138138      <xref linkend="libusb"/>,
     139      <xref linkend="v4l-utils"/>,
    139140      <ulink url="http://www.net-snmp.org/">Net-SNMP</ulink>,
    140141      <ulink url="http://cyberelk.net/tim/libieee1284/">libieee1284</ulink>,
    141       <ulink url="http://www.gphoto.org/">libgphoto2</ulink>,
    142       <ulink url="http://linuxtv.org/downloads/v4l-utils/">Video4Linux</ulink>, and
    143       <xref linkend="texlive"/>
     142      <ulink url="http://www.gphoto.org/">libgphoto2</ulink>, and
     143      <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>)
    144144    </para>
    145145
    … …  
    213213      </note>
    214214
     215      <para>
     216        Fix linking with the systemd library when using <application>systemd</application>
     217        210 and later:
     218      </para>
     219
     220<screen><userinput>sed -i "s:systemd-daemon:systemd:g" configure configure.in</userinput></screen>
     221
    215222      <para>For a USB scanner, if you are linking to <xref linkend="libusb"/>,
    216223      include the configure switch --enable-libusb_1_0. Install
    … …  
    245252      <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
    246253
    247 <screen role="root"><userinput>make install                                         &amp;&amp;
    248 install -m 644 -v tools/udev/libsane.rules           \
    249                   /etc/udev/rules.d/65-scanner.rules &amp;&amp;
    250 chgrp -v scanner  /var/lock/sane</userinput></screen>
     254<screen role="root"><userinput>make install                                        &amp;&amp;
     255install -v -m644 tools/udev/libsane.rules           \
     256                 /etc/udev/rules.d/65-scanner.rules &amp;&amp;
     257chgrp -v scanner /var/lock/sane</userinput></screen>
    251258
    252259      <para>With the scanner on, run <command>scanimage -L</command> and the
    253       name and location of the device should appear. Of course, you need the
    254       device drivers configured, in order to run this test.</para>
     260      name and location of the device should appear. You need to configure
     261      the device drivers in order to run this test.</para>
    255262
    256263    </sect3>
    … …  
    271278
    272279<screen><userinput>sed -i -e "/SANE_CAP_ALWAYS_SETTABLE/d" src/gtkglue.c &amp;&amp;
    273 ./configure --prefix=/usr &amp;&amp;
     280./configure --prefix=/usr --mandir=/usr/share/man &amp;&amp;
    274281make</userinput></screen>
    275282
    … …  
    287294      command as the <systemitem class="username">root</systemitem> user:</para>
    288295
    289 <screen role="root"><userinput>ln -v -s ../../../../bin/xscanimage /usr/lib/gimp/2.0/plug-ins</userinput></screen>
     296<screen role="root"><userinput>ln -sfv ../../../../bin/xscanimage /usr/lib/gimp/2.0/plug-ins</userinput></screen>
    290297
    291298      <note>
    … …  
    388395EOF
    389396
    390 ln -svf ../sane/xscanimage-icon-48x48-2.png /usr/share/pixmaps/xscanimage.png</userinput></screen>
     397ln -sfv ../sane/xscanimage-icon-48x48-2.png /usr/share/pixmaps/xscanimage.png</userinput></screen>
    391398
    392399      </sect4>

  • pst/scanning/xsane.xml

    r4a83293 rac38e9dc  
    3535    quality and ease of use compared to <command>xscanimage</command>.</para>
    3636
    37     &lfs76_checked;
     37    &lfs77_checked;
    3838
    3939    <bridgehead renderas="sect3">Package Information</bridgehead>
    … …  
    9090
    9191<!--sed -i -e 's/netscape/xdg-open/'                   src/xsane.h      &amp;&amp;-->
    92 <screen><userinput>sed -i -e 's/png_ptr->jmpbuf/png_jmpbuf(png_ptr)/' src/xsane-save.c &amp;&amp;
    93 ./configure --prefix=/usr                                           &amp;&amp;
     92<screen><userinput>sed -e 's/png_ptr->jmpbuf/png_jmpbuf(png_ptr)/' \
     93    -i src/xsane-save.c                         &amp;&amp;
     94./configure --prefix=/usr                       &amp;&amp;
    9495make</userinput></screen>
    9596
    … …  
    99100
    100101<screen role="root"><userinput>make xsanedocdir=/usr/share/doc/xsane-&xsane-version; install &amp;&amp;
    101 ln -v -s ../../doc/xsane-&xsane-version; /usr/share/sane/xsane/doc</userinput></screen>
     102ln -sfv ../../doc/xsane-&xsane-version; /usr/share/sane/xsane/doc</userinput></screen>
    102103<!--
    103104    <para>If you have not installed <xref linkend="xdg-utils"/> and have not
    … …  
    107108    user:</para>
    108109
    109 <screen role="root"><userinput>ln -v -s &lt;browser&gt; /usr/bin/netscape</userinput></screen>
     110<screen role="root"><userinput>ln -sfv &lt;browser&gt; /usr/bin/netscape</userinput></screen>
    110111
    111112    <note><para>Be sure to replace &lt;browser&gt; with the browser of your
    … …  
    113114
    114115    <para>Alternatively, if the environment variable BROWSER is set to the
    115     browser you want to use, eg, BROWSER="/usr/bin/firefox", the first time you
    116     run <command>xsane</command>, it will be recorded in ~/.sane/xsane/xsane.rc.
    117     If you wish to change it, edit this file, or remove it, and use the
    118     instructions above, so that a new one is created.</para>
     116    browser you want to use, eg, BROWSER="/usr/bin/firefox", it will be
     117    saved in ~/.sane/xsane/xsane.rc the first time you run
     118    <command>xsane</command>. If you wish to change it, edit or remove the
     119    mentioned file and use the instructions above to create a new one.</para>
    119120
    120121    <para>If <application>GIMP</application> is installed, issue the following
    121122    command as the <systemitem class="username">root</systemitem> user:</para>
    122123
    123 <screen role="root"><userinput>ln -v -s /usr/bin/xsane /usr/lib/gimp/2.0/plug-ins/</userinput></screen>
     124<screen role="root"><userinput>ln -sfv /usr/bin/xsane /usr/lib/gimp/2.0/plug-ins/</userinput></screen>
    124125
    125126  </sect2>
    … …  
    132133    instead of the hardcoded browser.</para>-->
    133134
    134     <para><command>ln -v -s ../../doc/xsane-&xsane-version;
     135    <para><command>ln -sfv ../../doc/xsane-&xsane-version;
    135136    /usr/share/sane/xsane/doc</command>: This symlink is created to ensure that
    136137    any program that looks for the <application>XSane</application>
    … …  
    139140    <command>make install</command> command.</para>
    140141
    141     <para><command>ln -v -s /usr/bin/xsane /usr/lib/gimp/2.0/plug-ins/</command>:
     142    <para><command>ln -sfv /usr/bin/xsane /usr/lib/gimp/2.0/plug-ins/</command>:
    142143    This creates a link in the system-wide <application>GIMP</application>
    143144    <filename class='directory'>plug-ins</filename> directory so that users can
Note: See TracChangeset for help on using the changeset viewer.