提交: cfdfcc99067145fcfd4070b45bb8ec335ad28fea - LFScripts (git)

Commit MetaInfo

• 修订版: cfdfcc99067145fcfd4070b45bb8ec335ad28fea (tree)
• 时间: 2021-12-22 15:16:22
• 作者: matsuand <30614168+matsuand@user...>
• Commiter: matsuand

Log Message

[BLFS] Update cups-2.4.0.

更改概述

• modified: BLFS/cups.sh

差异

--- a/BLFS/cups.sh
+++ b/BLFS/cups.sh
@@ -3,17 +3,18 @@
 . ./_blfsset.sh
 
 APPNAME=cups
-VER=2.1.0
+VER=2.4.0
 TARGET=$APPNAME-$VER
-TARGETBALL=$DLD/${TARGET}-source.tar.bz2
+TARGETBALL=$DLD/${TARGET}-source.tar.gz
 TARGETDIR=$TARGET
 
 echo $TARGET
 
-. $WRK/_checkRequired.sh ""
+. $WRK/_checkRequired.sh \
+	gnutls
 . $WRK/_checkOptions.sh  \
 	libjpeg-turbo libpng tiff tcp_wrappers dbus libusb \
-	acl Linux-PAM openldap gnutls openssl heimdal \
+	acl Linux-PAM openldap openssl heimdal \
 	php python jdk xdg-utils openslp libpaper \
 	valgrind
 . $WRK/_checkTarball.sh
@@ -36,22 +37,14 @@ cd $TARGETDIR
 #patch -Np1 -i $DLD/cups-$VER-blfs-1.patch \
 #	1>> $LOG/$TARGET.0_patch.log 2>&1 || exit 1
 
-sed -i 's:555:755:g;s:444:644:g' Makedefs.in
-sed -i '/MAN.*.EXT/s:.gz::g' \
-       configure config-scripts/cups-manpages.m4
-sed -i '/LIBGCRYPTCONFIG/d' config-scripts/cups-ssl.m4
-sed -i 's@else /\* HAVE_AVAHI \*/@elif defined(HAVE_AVAHI)@' test/ippserver.c
+sed -i 's#@CUPS_HTMLVIEW@#firefox#' desktop/cups.desktop.in
 
-echo Autoconfing...
-aclocal -I config-scripts \
-	1> $LOG/$TARGET.1_auto.log 2>&1 || exit 1
-autoconf -I config-scripts \
-	1>> $LOG/$TARGET.1_auto.log 2>&1 || exit 1
+sed -e "s/format-truncation//" \
+    -i configure \
+       config-scripts/cups-compiler.m4
 
 Configuring
 ./configure --libdir=/usr/lib            \
-            --disable-systemd            \
-            --with-rcdir=/tmp/cupsinit   \
             --with-system-groups=lpadmin \
             --with-docdir=/usr/share/cups/doc-$VER \
 	1> $LOG/$TARGET.1_conf.log 2>&1 || exit 1
@@ -64,20 +57,14 @@ Installing
 porg -lp  $TARGET "make install" \
 	1> $LOG/$TARGET.3_install.log 2>&1 || exit 1
 
-rm -rf /tmp/cupsinit
-porg -lp+ $TARGET "\
-ln -sv ../cups/doc-$VER /usr/share/doc/cups-$VER" \
-	1>> $LOG/$TARGET.3_install.log 2>&1 || exit 1
+#porg -lp+ $TARGET "\
+#ln -sv ../cups/doc-$VER /usr/share/doc/cups-$VER" \
+#	1>> $LOG/$TARGET.3_install.log 2>&1 || exit 1
 
 echo "ServerName /var/run/cups/cups.sock" > /etc/cups/client.conf
 porg -lp+ $TARGET "\
 touch /etc/cups/client.conf"
 
-porg -lp+ $TARGET "\
-rm -rf /usr/share/cups/banners"
-porg -lp+ $TARGET "\
-rm -rf /usr/share/cups/data/testprint"
-
 cat > /etc/pam.d/cups << "EOF"
 # Begin /etc/pam.d/cups