X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/de8d91bff3528f03e8b468d2703ef2e3b06b37fd..7db94a94b2896f6f582db2ce1b98c2c0ecf24630:/packages/apt/build.sh

diff --git a/packages/apt/build.sh b/packages/apt/build.sh
index 68ad3a82..6a399084 100644
--- a/packages/apt/build.sh
+++ b/packages/apt/build.sh
@@ -1,47 +1,40 @@
 TERMUX_PKG_HOMEPAGE=https://packages.debian.org/apt
 TERMUX_PKG_DESCRIPTION="Front-end for the dpkg package manager"
-TERMUX_PKG_DEPENDS="libbz2, liblzma, libgnustl, dpkg, gnupg"
-TERMUX_PKG_VERSION=1.0.10.2
+TERMUX_PKG_DEPENDS="libutil, libcurl, liblzma, dpkg, gpgv, libc++"
+TERMUX_PKG_VERSION=1.4.8
+TERMUX_PKG_SHA256=767ad7d6efb64cde52faececb7d3c0bf49800b9fe06f3a5b0132ab4c01a5b8f8
 TERMUX_PKG_SRCURL=http://ftp.debian.org/debian/pool/main/a/apt/apt_${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--host=${TERMUX_ARCH}-linux --disable-rpath acl_cv_rpath=$TERMUX_PREFIX/lib gt_cv_func_CFPreferencesCopyAppValue=no gt_cv_func_CFLocaleCopyCurrent=no ac_cv_c_bigendian=no --no-create"
-TERMUX_PKG_FOLDERNAME=apt-${TERMUX_PKG_VERSION}
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
+-DPERL_EXECUTABLE=`which perl`
+-DCMAKE_INSTALL_FULL_LOCALSTATEDIR=$TERMUX_PREFIX
+-DCOMMON_ARCH=$TERMUX_ARCH
+-DDPKG_DATADIR=$TERMUX_PREFIX/share/dpkg
+-DUSE_NLS=OFF
+-DWITH_DOC=OFF
+"
 TERMUX_PKG_ESSENTIAL=yes
+TERMUX_PKG_CONFFILES="etc/apt/sources.list"
+TERMUX_PKG_CONFLICTS=apt-transport-https
+TERMUX_PKG_REPLACES=apt-transport-https
+TERMUX_PKG_RM_AFTER_INSTALL="
+bin/apt-cdrom
+bin/apt-extracttemplates
+bin/apt-mark
+bin/apt-sortpkgs
+etc/apt/apt.conf.d
+lib/apt/apt-helper
+lib/apt/methods/bzip2
+lib/apt/methods/cdrom
+lib/apt/methods/mirror
+lib/apt/methods/rred
+lib/apt/planners/
+lib/apt/solvers/
+lib/dpkg/
+lib/libapt-inst.so
+"
 
-# $NDK/docs/STANDALONE-TOOLCHAIN.html: "If you use the GNU libstdc++, you will need to explicitly link with libsupc++ if you use these features"
-export LDFLAGS="$LDFLAGS -lgnustl_shared" # -lsupc++"
-
-termux_step_pre_configure () {
-	cp $TERMUX_COMMON_CACHEDIR/config.{guess,sub} $TERMUX_PKG_SRCDIR/buildlib
-        perl -p -i -e "s/TERMUX_ARCH/$TERMUX_ARCH/" $TERMUX_PKG_SRCDIR/configure
-}
-
-termux_step_post_configure () {
-        # This is needed to generate makefile, but does not work due to configure arguments not being remembered
-        ./config.status
-}
-
-termux_step_make () {
-        unset CC
-        unset CFLAGS
-        unset LDFLAGS
-        unset CXX
-        unset CXXFLAGS
-        make
-}
-
-termux_step_make_install () {
-        cp $TERMUX_PKG_BUILDDIR/bin/apt{,-get,-cache,-config,-key} $TERMUX_PREFIX/bin/
-        cp $TERMUX_PKG_BUILDDIR/bin/libapt-{pkg.so.4.16,private.so.0.0} $TERMUX_PREFIX/lib/
-        (cd $TERMUX_PREFIX/lib; rm -f libapt-pkg.so; ln -s libapt-pkg.so.4.16 libapt-pkg.so) # used by python-apt
-        mkdir -p $TERMUX_PREFIX/lib/apt/methods $TERMUX_PREFIX/share/man/man{5,8}
-        cp $TERMUX_PKG_BUILDDIR/docs/apt{,-cache,-get}.8 $TERMUX_PREFIX/share/man/man8/
-        cp $TERMUX_PKG_BUILDDIR/docs/{apt.conf,sources.list}.5 $TERMUX_PREFIX/share/man/man5/
-        cp $TERMUX_PKG_BUILDDIR/bin/methods/{copy,file,gpgv,gzip,http,https} $TERMUX_PREFIX/lib/apt/methods
-        (cd $TERMUX_PREFIX/lib/apt/methods; ln -f -s gzip bzip2)
-
-        mkdir -p $TERMUX_PREFIX/etc/apt
-        printf "# The main termux repository:\ndeb [arch=all,${TERMUX_ARCH}] http://apt.termux.com stable main\n" > $TERMUX_PREFIX/etc/apt/sources.list
-
-        # The trusted.gpg was created with "apt-key add public-key.key":
+termux_step_post_make_install() {
+	printf "# The main termux repository:\ndeb [arch=all,${TERMUX_ARCH}] https://termux.net stable main\n" > $TERMUX_PREFIX/etc/apt/sources.list
         cp $TERMUX_PKG_BUILDER_DIR/trusted.gpg $TERMUX_PREFIX/etc/apt/
+	rm /data/data/com.termux/files/usr/include/apt-pkg -r
 }