# HG changeset patch # User Aleksej Bobylev # Date 1497087399 -10800 # Node ID 107066b600c7cc41428a93b54e6b47ab91f691e7 # Parent b147959187956e9ff066427235b541f230ab6160 Fix glib installing and packaging, up aspell-* receipts. diff -r b14795918795 -r 107066b600c7 alsaplayer/receipt --- a/alsaplayer/receipt Sat Jun 10 09:48:47 2017 +0300 +++ b/alsaplayer/receipt Sat Jun 10 12:36:39 2017 +0300 @@ -48,7 +48,7 @@ SUGGESTED="alsaplayer-scopes libid3tag flac" ;; alsaplayer-scopes) - copy scopes2/ + copy scopes2/*.so CAT="multimedia|visualisations" DEPENDS="alsaplayer" ;; diff -r b14795918795 -r 107066b600c7 apr-util/receipt --- a/apr-util/receipt Sat Jun 10 09:48:47 2017 +0300 +++ b/apr-util/receipt Sat Jun 10 12:36:39 2017 +0300 @@ -37,7 +37,7 @@ { case $PACKAGE in apr-util) - DEPENDS="apr expat ncurses readline zlib" + DEPENDS="apr expat util-linux-uuid" copy libaprutil-1.so* aprutil.exp ;; apr-dbd-mysql) @@ -70,6 +70,11 @@ CAT="libdevel|GDBM plugin" copy *dbm*.so ;; - *-dev) copy @dev;; + *-dev) + copy @dev + DEPENDS="apr-dev expat-dev gdbm-dev libcrypto-dev mysql-dev \ + openldap-dev openssl-dev postgresql-dev sqlite-dev unixODBC-dev \ + util-linux-uuid-dev zlib-dev" + ;; esac } diff -r b14795918795 -r 107066b600c7 aspell-cs/receipt --- a/aspell-cs/receipt Sat Jun 10 09:48:47 2017 +0300 +++ b/aspell-cs/receipt Sat Jun 10 12:36:39 2017 +0300 @@ -1,9 +1,9 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="aspell-cs" VERSION="20040614-1" CATEGORY="text" -SHORT_DESC="Czech aspell dictionary." +SHORT_DESC="Czech aspell dictionary" MAINTAINER="erjo@slitaz.org" LICENSE="GPL2" WEB_SITE="https://ftp.gnu.org/gnu/aspell/dict/0index.html" @@ -11,7 +11,6 @@ TARBALL="aspell6-cs-$VERSION.tar.bz2" WGET_URL="$GNU_MIRROR/aspell/dict/cs/$TARBALL" -DEPENDS="aspell" BUILD_DEPENDS="aspell-dev" # Rules to configure and make the package. @@ -23,5 +22,6 @@ # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - cook_copy_folders lib + copy @std + DEPENDS="aspell" } diff -r b14795918795 -r 107066b600c7 aspell-da/receipt --- a/aspell-da/receipt Sat Jun 10 09:48:47 2017 +0300 +++ b/aspell-da/receipt Sat Jun 10 12:36:39 2017 +0300 @@ -1,9 +1,9 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="aspell-da" VERSION="1.4.42-1" CATEGORY="text" -SHORT_DESC="Danish aspell dictionary." +SHORT_DESC="Danish aspell dictionary" MAINTAINER="paul@slitaz.org" LICENSE="GPL2" WEB_SITE="https://ftp.gnu.org/gnu/aspell/dict/0index.html" @@ -11,7 +11,6 @@ TARBALL="aspell5-da-$VERSION.tar.bz2" WGET_URL="$GNU_MIRROR/aspell/dict/da/$TARBALL" -DEPENDS="aspell" BUILD_DEPENDS="aspell-dev" # Rules to configure and make the package. @@ -23,5 +22,6 @@ # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - cook_copy_folders lib + copy @std + DEPENDS="aspell" } diff -r b14795918795 -r 107066b600c7 aspell-de/receipt --- a/aspell-de/receipt Sat Jun 10 09:48:47 2017 +0300 +++ b/aspell-de/receipt Sat Jun 10 12:36:39 2017 +0300 @@ -1,9 +1,9 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="aspell-de" VERSION="20030222-1" CATEGORY="text" -SHORT_DESC="German aspell dictionary." +SHORT_DESC="German aspell dictionary" MAINTAINER="paul@slitaz.org" LICENSE="GPL2" WEB_SITE="https://ftp.gnu.org/gnu/aspell/dict/0index.html" @@ -11,7 +11,6 @@ TARBALL="aspell6-de-$VERSION.tar.bz2" WGET_URL="$GNU_MIRROR/aspell/dict/de/$TARBALL" -DEPENDS="aspell" BUILD_DEPENDS="aspell-dev" # Rules to configure and make the package. @@ -23,5 +22,6 @@ # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - cook_copy_folders lib + copy @std + DEPENDS="aspell" } diff -r b14795918795 -r 107066b600c7 aspell-en/receipt --- a/aspell-en/receipt Sat Jun 10 09:48:47 2017 +0300 +++ b/aspell-en/receipt Sat Jun 10 12:36:39 2017 +0300 @@ -1,9 +1,9 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="aspell-en" VERSION="2017.01.22-0" CATEGORY="text" -SHORT_DESC="English aspell dictionary." +SHORT_DESC="English aspell dictionary" MAINTAINER="paul@slitaz.org" LICENSE="PublicDomain" WEB_SITE="https://ftp.gnu.org/gnu/aspell/dict/0index.html" @@ -12,7 +12,6 @@ TARBALL="aspell6-en-$VERSION.tar.bz2" WGET_URL="$GNU_MIRROR/aspell/dict/en/$TARBALL" -DEPENDS="aspell" BUILD_DEPENDS="aspell-dev" # Rules to configure and make the package. @@ -24,5 +23,6 @@ # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - cook_copy_folders lib + copy @std + DEPENDS="aspell" } diff -r b14795918795 -r 107066b600c7 aspell-es/receipt --- a/aspell-es/receipt Sat Jun 10 09:48:47 2017 +0300 +++ b/aspell-es/receipt Sat Jun 10 12:36:39 2017 +0300 @@ -1,9 +1,9 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="aspell-es" VERSION="1.11-2" CATEGORY="text" -SHORT_DESC="Spanish aspell dictionary." +SHORT_DESC="Spanish aspell dictionary" MAINTAINER="paul@slitaz.org" LICENSE="GPL2" WEB_SITE="https://ftp.gnu.org/gnu/aspell/dict/0index.html" @@ -12,7 +12,6 @@ TARBALL="aspell6-es-$VERSION.tar.bz2" WGET_URL="$GNU_MIRROR/aspell/dict/es/$TARBALL" -DEPENDS="aspell" BUILD_DEPENDS="aspell-dev" # Rules to configure and make the package. @@ -24,5 +23,6 @@ # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - cook_copy_folders lib + copy @std + DEPENDS="aspell" } diff -r b14795918795 -r 107066b600c7 aspell-fr/receipt --- a/aspell-fr/receipt Sat Jun 10 09:48:47 2017 +0300 +++ b/aspell-fr/receipt Sat Jun 10 12:36:39 2017 +0300 @@ -1,9 +1,9 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="aspell-fr" VERSION="0.50-3" CATEGORY="text" -SHORT_DESC="French aspell dictionary." +SHORT_DESC="French aspell dictionary" MAINTAINER="paul@slitaz.org" LICENSE="GPL2" WEB_SITE="https://ftp.gnu.org/gnu/aspell/dict/0index.html" @@ -12,7 +12,6 @@ TARBALL="$PACKAGE-$VERSION.tar.bz2" WGET_URL="$GNU_MIRROR/aspell/dict/fr/$TARBALL" -DEPENDS="aspell" BUILD_DEPENDS="aspell-dev" # Rules to configure and make the package. @@ -24,5 +23,6 @@ # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - cook_copy_folders lib + copy @std + DEPENDS="aspell" } diff -r b14795918795 -r 107066b600c7 aspell-hu/receipt --- a/aspell-hu/receipt Sat Jun 10 09:48:47 2017 +0300 +++ b/aspell-hu/receipt Sat Jun 10 12:36:39 2017 +0300 @@ -1,9 +1,9 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="aspell-hu" VERSION="0.99.4.2-0" CATEGORY="text" -SHORT_DESC="Hungarian aspell dictionary." +SHORT_DESC="Hungarian aspell dictionary" MAINTAINER="erjo@slitaz.org" LICENSE="GPL2" WEB_SITE="https://ftp.gnu.org/gnu/aspell/dict/0index.html" @@ -11,7 +11,6 @@ TARBALL="aspell6-hu-$VERSION.tar.bz2" WGET_URL="$GNU_MIRROR/aspell/dict/hu/$TARBALL" -DEPENDS="aspell" BUILD_DEPENDS="aspell-dev" # Rules to configure and make the package. @@ -23,5 +22,6 @@ # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - cook_copy_folders lib + copy @std + DEPENDS="aspell" } diff -r b14795918795 -r 107066b600c7 aspell-id/receipt --- a/aspell-id/receipt Sat Jun 10 09:48:47 2017 +0300 +++ b/aspell-id/receipt Sat Jun 10 12:36:39 2017 +0300 @@ -1,9 +1,9 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="aspell-id" VERSION="1.2-0" CATEGORY="text" -SHORT_DESC="Indonesian aspell dictionary." +SHORT_DESC="Indonesian aspell dictionary" MAINTAINER="erjo@slitaz.org" LICENSE="GPL2" WEB_SITE="https://ftp.gnu.org/gnu/aspell/dict/0index.html" @@ -11,7 +11,6 @@ TARBALL="aspell5-id-$VERSION.tar.bz2" WGET_URL="$GNU_MIRROR/aspell/dict/id/$TARBALL" -DEPENDS="aspell" BUILD_DEPENDS="aspell-dev" # Rules to configure and make the package. @@ -23,5 +22,6 @@ # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - cook_copy_folders lib + copy @std + DEPENDS="aspell" } diff -r b14795918795 -r 107066b600c7 aspell-it/receipt --- a/aspell-it/receipt Sat Jun 10 09:48:47 2017 +0300 +++ b/aspell-it/receipt Sat Jun 10 12:36:39 2017 +0300 @@ -1,9 +1,9 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="aspell-it" VERSION="2.2_20050523-0" CATEGORY="text" -SHORT_DESC="Italian aspell dictionary." +SHORT_DESC="Italian aspell dictionary" MAINTAINER="erjo@slitaz.org" LICENSE="GPL2" WEB_SITE="https://ftp.gnu.org/gnu/aspell/dict/0index.html" @@ -11,7 +11,6 @@ TARBALL="aspell6-it-$VERSION.tar.bz2" WGET_URL="$GNU_MIRROR/aspell/dict/it/$TARBALL" -DEPENDS="aspell" BUILD_DEPENDS="aspell-dev" # Rules to configure and make the package. @@ -23,5 +22,6 @@ # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - cook_copy_folders lib + copy @std + DEPENDS="aspell" } diff -r b14795918795 -r 107066b600c7 aspell-nl/receipt --- a/aspell-nl/receipt Sat Jun 10 09:48:47 2017 +0300 +++ b/aspell-nl/receipt Sat Jun 10 12:36:39 2017 +0300 @@ -1,9 +1,9 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="aspell-nl" VERSION="0.50-2" CATEGORY="text" -SHORT_DESC="Dutch aspell dictionary." +SHORT_DESC="Dutch aspell dictionary" MAINTAINER="paul@slitaz.org" LICENSE="GPL" WEB_SITE="https://ftp.gnu.org/gnu/aspell/dict/0index.html" @@ -11,7 +11,6 @@ TARBALL="$PACKAGE-$VERSION.tar.bz2" WGET_URL="$GNU_MIRROR/aspell/dict/nl/$TARBALL" -DEPENDS="aspell" BUILD_DEPENDS="aspell-dev" # Rules to configure and make the package. @@ -23,5 +22,6 @@ # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - cook_copy_folders lib + copy @std + DEPENDS="aspell" } diff -r b14795918795 -r 107066b600c7 aspell-pl/receipt --- a/aspell-pl/receipt Sat Jun 10 09:48:47 2017 +0300 +++ b/aspell-pl/receipt Sat Jun 10 12:36:39 2017 +0300 @@ -1,9 +1,9 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="aspell-pl" VERSION="6.0_20061121-0" CATEGORY="system-tools" -SHORT_DESC="Polish aspell dictionary." +SHORT_DESC="Polish aspell dictionary" MAINTAINER="paul@slitaz.org" LICENSE="GPL LGPL CC-SA" WEB_SITE="https://ftp.gnu.org/gnu/aspell/dict/0index.html" @@ -11,7 +11,6 @@ TARBALL="aspell6-pl-$VERSION.tar.bz2" WGET_URL="$GNU_MIRROR/aspell/dict/pl/$TARBALL" -DEPENDS="aspell" BUILD_DEPENDS="aspell-dev" # Rules to configure and make the package. @@ -23,5 +22,6 @@ # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - cook_copy_folders lib + copy @std + DEPENDS="aspell" } diff -r b14795918795 -r 107066b600c7 aspell-pt_BR/receipt --- a/aspell-pt_BR/receipt Sat Jun 10 09:48:47 2017 +0300 +++ b/aspell-pt_BR/receipt Sat Jun 10 12:36:39 2017 +0300 @@ -1,9 +1,9 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="aspell-pt_BR" VERSION="20090702-0" CATEGORY="system-tools" -SHORT_DESC="Brazilian aspell dictionary." +SHORT_DESC="Brazilian aspell dictionary" MAINTAINER="paul@slitaz.org" LICENSE="LGPL2.1" WEB_SITE="https://ftp.gnu.org/gnu/aspell/dict/0index.html" @@ -12,7 +12,6 @@ TARBALL="aspell6-pt_BR-$VERSION.tar.bz2" WGET_URL="$GNU_MIRROR/aspell/dict/pt_BR/$TARBALL" -DEPENDS="aspell" BUILD_DEPENDS="aspell-dev" # Rules to configure and make the package. @@ -24,5 +23,6 @@ # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - cook_copy_folders lib + copy @std + DEPENDS="aspell" } diff -r b14795918795 -r 107066b600c7 aspell-pt_PT/receipt --- a/aspell-pt_PT/receipt Sat Jun 10 09:48:47 2017 +0300 +++ b/aspell-pt_PT/receipt Sat Jun 10 12:36:39 2017 +0300 @@ -1,9 +1,9 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="aspell-pt_PT" VERSION="20070510-0" CATEGORY="text" -SHORT_DESC="Portuguese aspell dictionary." +SHORT_DESC="Portuguese aspell dictionary" MAINTAINER="paul@slitaz.org" LICENSE="GPL2" WEB_SITE="https://ftp.gnu.org/gnu/aspell/dict/0index.html" @@ -11,7 +11,6 @@ TARBALL="aspell6-pt_PT-$VERSION.tar.bz2" WGET_URL="$GNU_MIRROR/aspell/dict/pt_PT/$TARBALL" -DEPENDS="aspell" BUILD_DEPENDS="aspell-dev" # Rules to configure and make the package. @@ -23,5 +22,6 @@ # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - cook_copy_folders lib + copy @std + DEPENDS="aspell" } diff -r b14795918795 -r 107066b600c7 aspell-ru/receipt --- a/aspell-ru/receipt Sat Jun 10 09:48:47 2017 +0300 +++ b/aspell-ru/receipt Sat Jun 10 12:36:39 2017 +0300 @@ -1,9 +1,9 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="aspell-ru" VERSION="0.99f7-1" CATEGORY="text" -SHORT_DESC="Russian aspell dictionary." +SHORT_DESC="Russian aspell dictionary" MAINTAINER="erjo@slitaz.org" LICENSE="other" WEB_SITE="https://ftp.gnu.org/gnu/aspell/dict/0index.html" @@ -11,7 +11,6 @@ TARBALL="aspell6-ru-$VERSION.tar.bz2" WGET_URL="$GNU_MIRROR/aspell/dict/ru/$TARBALL" -DEPENDS="aspell" BUILD_DEPENDS="aspell-dev" # Rules to configure and make the package. @@ -23,5 +22,6 @@ # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - cook_copy_folders lib + copy @std + DEPENDS="aspell" } diff -r b14795918795 -r 107066b600c7 aspell-sl/receipt --- a/aspell-sl/receipt Sat Jun 10 09:48:47 2017 +0300 +++ b/aspell-sl/receipt Sat Jun 10 12:36:39 2017 +0300 @@ -1,9 +1,9 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="aspell-sl" VERSION="0.50-0" CATEGORY="text" -SHORT_DESC="Slovenian aspell dictionary." +SHORT_DESC="Slovenian aspell dictionary" MAINTAINER="erjo@slitaz.org" LICENSE="GPL2" WEB_SITE="https://ftp.gnu.org/gnu/aspell/dict/0index.html" @@ -11,7 +11,6 @@ TARBALL="$PACKAGE-$VERSION.tar.bz2" WGET_URL="$GNU_MIRROR/aspell/dict/sl/$TARBALL" -DEPENDS="aspell" BUILD_DEPENDS="aspell-dev" # Rules to configure and make the package. @@ -23,5 +22,6 @@ # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - cook_copy_folders lib + copy @std + DEPENDS="aspell" } diff -r b14795918795 -r 107066b600c7 glib/receipt --- a/glib/receipt Sat Jun 10 09:48:47 2017 +0300 +++ b/glib/receipt Sat Jun 10 12:36:39 2017 +0300 @@ -15,7 +15,7 @@ BUILD_DEPENDS="perl indent python zlib-dev libffi-dev gettext-tools elfutils-dev \ pcre-dev gtk-doc libxslt libxml2-tools dbus-dev util-linux-mount-dev" BUILD_DEPENDS_arm="pcre-dev libffi-dev zlib-dev elfutils-dev libxml2-dev" -SPLIT="libgio libgio-dev glib-dev" +SPLIT="libgio glib libgio-dev glib-dev" # Rules to configure and make the package. compile_rules() @@ -23,15 +23,15 @@ case "$ARCH" in i?86) ./configure \ - --sysconfdir=/etc \ - --with-pcre=system \ - $CONFIGURE_ARGS ;; + --sysconfdir=/etc \ + --with-pcre=system \ + $CONFIGURE_ARGS ;; arm*) # Native ARM build --> if ARCH != SLITAZ_ARCH ? export LD_LIBRARY_PATH=/cross/$ARCH/sysroot/usr/lib:/usr/lib:/lib export PKG_CONFIG_PATH=/cross/$ARCH/sysroot/usr/lib/pkgconfig export LDFLAGS="$LDFLAGS -L/cross/$ARCH/sysroot/usr/lib -Wl,-rpath=/cross/$ARCH/sysroot/usr/lib" - + # Glib export glib_cv_stack_grows=${glib_cv_stack_grows=no} export glib_cv_uscore=${glib_cv_uscore=no} @@ -50,38 +50,38 @@ --disable-rpath ;; esac && make && - make install + make DESTDIR=/ install && + make DESTDIR=$DESTDIR install + + # we need `make DESTDIR=/ install` first because at the some stage (usual) + # `make install` need file glib-2.0.pc installed in the FS. + # `cook` is sure than this error is fatal. + # Installing into / is safe since we working in the Aufs layer... } # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { case $PACKAGE in + libgio) + copy libgio*.so* + CAT="libs|libgio shared library" + ;; glib) copy bin/ *.so* - # Split gio --> libgio - rm $fs/usr/lib/libgio* + remove_already_packed # Python codegen, tester, Perl mkenums --> glib-dev cd $fs/usr/bin; rm gdbus-codegen gtester* glib-mkenums DEPENDS="pcre libffi libxml2 elfutils" ;; - libgio) - copy libgio*.so* - CAT="libs|libgio shared library" - ;; libgio-dev) - copy gio/ libgio*.*a gio*.pc - rm -rf $fs/usr/share + copy *-2.0/gio/ libgio*.*a gio*.pc CAT="development|libgio development files" DEPENDS="libgio" ;; glib-dev) - # Python codegen, tester, compile, Perl mkenums - copy @dev gdbus-codegen gtester* glib-mkenums - # Remove libgio-dev - rm -rf $fs/usr/lib/libgio*.*a - rm -rf $fs/usr/include/gio-unix-2.0 - rm $fs/usr/lib/pkgconfig/gio*.pc + copy @std @dev + remove_already_packed DEPENDS="glib perl python libffi-dev libgio libgio-dev pcre-dev \ pkg-config" ;;