Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8bc623323d764cd5a442f468b7319faf00739132
commit 8bc623323d764cd5a442f468b7319faf00739132 Author: DeX77 <[email protected]> Date: Mon Dec 12 13:58:21 2016 +0100 cups-2.2.1-2-x86_64 + add lib32 subpackage diff --git a/source/xapps/cups/FrugalBuild b/source/xapps/cups/FrugalBuild index 3a60150..4ee0a7f 100644 --- a/source/xapps/cups/FrugalBuild +++ b/source/xapps/cups/FrugalBuild @@ -4,11 +4,11 @@ pkgname=cups pkgver=2.2.1 -pkgrel=1 +pkgrel=2 pkgdesc="The CUPS Printing System" depends=('avahi>=0.6.31-9' 'libusb1>=1.0.20-5') rodepends=('libcups') -makedepends=('xdg-utils' 'hicolor-icon-theme' 'clang>=3.8.1-4') +makedepends=('xdg-utils' 'hicolor-icon-theme' 'clang>=3.8.1-4' 'lib32-libusb1') groups=('xapps') archs=("x86_64") backup=(etc/cups/{printers.conf,classes.conf,client.conf,cupsd.conf,mime.types,mime.convs}) @@ -28,33 +28,54 @@ subdescs=('Main library of the CUPS printing system.') subgroups=('lib') subdepends=('gnutls>=3.4.15-2 avahi>=0.6.31-9') subarchs=("x86_64") +suboptions=('') + +subpkgs+=("lib32-libcups") +subdescs+=("Main library of the CUPS printing system. ( 32bit )") +subdepends+=("lib32-gnutls lib32-avahi") +subgroups+=('lib32-extra') +subarchs+=('x86_64') +suboptions+=('force') options+=('force' 'noccache') -# Do NOT remove --libdir option, needed for x86_64 to put libs into /usr/lib Fconfopts+=" --with-cups-user=lp \ --with-cups-group=lp \ --with-logdir=/var/log/cups \ --with-docdir=/usr/share/cups/doc \ --disable-pam \ --enable-ssl \ - --enable-threads \ - --libdir=/usr/lib" - -_F_make_opts="${_F_make_opts} " + --enable-threads" +Finclude cross32 build() { + Fcross32_prepare + Fcross32_copy_source Fcd - Fsed "Icon=cups" "Icon=/usr/share/pixmaps/cups-128.png" desktop/cups.desktop.in Fpatchall - Fmake + Fmake --libdir=/usr/lib32 make BUILDROOT=$Fdestdir install || Fdie - Ficonrel desktop/cups-128.png - # samba support - ( if [ ! -r $Fdestdir/usr/lib/cups/backend/smb ]; then - Fln /usr/bin/smbspool /usr/lib/cups/backend/smb + ( if [ ! -r $Fdestdir/usr/lib32/cups/backend/smb ]; then + Fln /usr/bin/smbspool /usr/lib32/cups/backend/smb + fi ) + + Fcross32_copy_back_source + Fcross32_reset_and_fix + Fsplit "lib32-libcups" /usr/lib32 + + Fcd + Fsed "Icon=cups" "Icon=/usr/share/pixmaps/cups-128.png" desktop/cups.desktop.in + Fpatchall + Fmake --libdir=/usr/lib + make BUILDROOT=$Fdestdir install || Fdie + + Ficonrel desktop/cups-128.png + + # samba support + ( if [ ! -r $Fdestdir/usr/lib/cups/backend/smb ]; then + Fln /usr/bin/smbspool /usr/lib/cups/backend/smb fi ) # fix perms on /var/spool @@ -75,6 +96,7 @@ EOF if [ -e $Fdestdir/usr/share/applications/cups.desktop ]; then Fsed "Exec=htmlview http://localhost:631/"; "Exec=xdg-open http://localhost:631/"; $Fdestdir/usr/share/applications/cups.desktop fi + } # optimization OK _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
