From 7355c69487f68716a775071ce8dab9f83c56629b Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Tue, 11 Jul 2017 14:53:04 +0200 Subject: main/lua-aports: backport support for checkdepends --- ...0001-pkg-db-support-checkdepends-variable.patch | 64 ++++++++++++++++++++++ main/lua-aports/APKBUILD | 14 ++--- 2 files changed, 68 insertions(+), 10 deletions(-) create mode 100644 main/lua-aports/0001-pkg-db-support-checkdepends-variable.patch diff --git a/main/lua-aports/0001-pkg-db-support-checkdepends-variable.patch b/main/lua-aports/0001-pkg-db-support-checkdepends-variable.patch new file mode 100644 index 0000000000..2a95bffad4 --- /dev/null +++ b/main/lua-aports/0001-pkg-db-support-checkdepends-variable.patch @@ -0,0 +1,64 @@ +From dbf4268f130ca7cc4b68b4b8c986ee19f94007e3 Mon Sep 17 00:00:00 2001 +From: William Pitcock +Date: Sun, 29 Jan 2017 09:59:40 +0000 +Subject: [PATCH] pkg, db: support $checkdepends variable + +--- + aports/db.lua | 6 ++++-- + aports/pkg.lua | 3 +++ + 2 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/aports/db.lua b/aports/db.lua +index 09afaeb..407a3d9 100644 +--- a/aports/db.lua ++++ b/aports/db.lua +@@ -55,13 +55,14 @@ local function split_apkbuild(line) + return nil + end + local r = {} +- local dir,pkgname, pkgver, pkgrel, arch, options, depends, makedepends, subpackages, linguas, source, url = string.match(line, "([^|]*)|([^|]*)|([^|]*)|([^|]*)|([^|]*)|([^|]*)|([^|]*)|([^|]*)|([^|]*)|([^|]*)|([^|]*)|([^|]*)") ++ local dir,pkgname, pkgver, pkgrel, arch, options, depends, makedepends, checkdepends, subpackages, linguas, source, url = string.match(line, "([^|]*)|([^|]*)|([^|]*)|([^|]*)|([^|]*)|([^|]*)|([^|]*)|([^|]*)|([^|]*)|([^|]*)|([^|]*)|([^|]*)|([^|]*)") + r.dir = dir + r.pkgname = pkgname + r.pkgver = pkgver + r.pkgrel = pkgrel + r.depends = split_deps(depends) + r.makedepends = split_deps(makedepends) ++ r.checkdepends = split_deps(checkdepends) + r.linguas = split(linguas) + r.subpackages = split_subpkgs(subpackages, r.linguas, pkgname) + r.source = split(source) +@@ -93,6 +94,7 @@ local function apkbuilds_open(aportsdir, repos) + options= + depends= + makedepends= ++ checkdepends= + subpackages= + linguas= + source= +@@ -101,7 +103,7 @@ local function apkbuilds_open(aportsdir, repos) + [ -n "$dir" ] || exit 1; + cd "$dir"; + . ./APKBUILD; +- echo $dir\|$pkgname\|$pkgver\|$pkgrel\|$arch\|$options\|$depends\|$makedepends\|$subpackages\|$linguas\|$source\|$url ; ++ echo $dir\|$pkgname\|$pkgver\|$pkgrel\|$arch\|$options\|$depends\|$makedepends\|$checkdepends\|$subpackages\|$linguas\|$source\|$url ; + done; + ]]) + obj.read = function(self) +diff --git a/aports/pkg.lua b/aports/pkg.lua +index f21f352..5d40db5 100644 +--- a/aports/pkg.lua ++++ b/aports/pkg.lua +@@ -110,6 +110,9 @@ function M.each_dependency(pkg) + for _,dep in pairs(pkg.makedepends or {}) do + coroutine.yield(dep) + end ++ for _,dep in pairs(pkg.checkdepends or {}) do ++ coroutine.yield(dep) ++ end + end) + end + +-- +2.13.2 + diff --git a/main/lua-aports/APKBUILD b/main/lua-aports/APKBUILD index aa0cde344d..e870c99907 100644 --- a/main/lua-aports/APKBUILD +++ b/main/lua-aports/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa pkgname=lua-aports pkgver=0.5 -pkgrel=4 +pkgrel=5 pkgdesc="Lua modules for parsing aports tree" url="http://dev.alpinelinux.org/archive/lua-aports/" arch="noarch" @@ -16,6 +16,7 @@ source="http://dev.alpinelinux.org/archive/lua-aports/lua-aports-$pkgver.tar.xz 0001-buildrepo-fix-bug-when-repodest-is-set-with-buildrep.patch 0001-pkg-support-arch-arch-syntax.patch 0001-buildrepo-regenerate-index-if-packages-been-deleted.patch + 0001-pkg-db-support-checkdepends-variable.patch " _builddir="$srcdir"/lua-aports-$pkgver @@ -38,15 +39,8 @@ package() { make DESTDIR="$pkgdir" install || return 1 } -md5sums="068ddedda0968d3e000637d2db8da4cd lua-aports-0.5.tar.xz -d66bc2a08712170da458b46466499c7a 0001-buildrepo-fix-bug-when-repodest-is-set-with-buildrep.patch -5f5ab124bb210fcaac3f5127fdbad4d6 0001-pkg-support-arch-arch-syntax.patch -09fe5b8ccf59aa2c68e00abb4604763b 0001-buildrepo-regenerate-index-if-packages-been-deleted.patch" -sha256sums="fb7ff16a884ed17f6856dc241ec17f0d1586f6d07b83dc5aebc1b320b772d4a9 lua-aports-0.5.tar.xz -738e8967dc247b555299c1f43aab379d27afa9c2d9ccf47d061d6883b5c1babb 0001-buildrepo-fix-bug-when-repodest-is-set-with-buildrep.patch -b4bf7873836d587071accf1dd4452383f373f2c76933c31395f9cd93c793543d 0001-pkg-support-arch-arch-syntax.patch -38c251efed9d9039aa7397c6f1e7a0a70f4b5d7597d1be28d3edfd3199943f18 0001-buildrepo-regenerate-index-if-packages-been-deleted.patch" sha512sums="7047f0c902c8f65e8a45ed221e793dd0a0c8abf77f85b21b2d23c4f3c19ab12d9862565615718223ff2633465b85026f260bba4d5851a898475974c93f40797d lua-aports-0.5.tar.xz 74d282482c54671cdac7bb0b484818aa67a875719bd615d24fa69b8ebd9905b5cc685d029e478d7f7c4f351e86b94b6fd4ad207240e82071bcff3b23ff764caf 0001-buildrepo-fix-bug-when-repodest-is-set-with-buildrep.patch 442f4701ea8020dce801bd5ddc08cac2bccff5a70cf12cc3d1602d091ae3dffe3e6905037d04e78da87eb3734401718b3340721d25dac0be5dbb59dbec9dac5a 0001-pkg-support-arch-arch-syntax.patch -165418eea5bfa8ef0c9782b29f43a27e5fd922ce0f54db0d12c7fe92ab174bc134e31a87d835a3fef6935f81a204573246a33a63adaf77580e21cf9d924bffe1 0001-buildrepo-regenerate-index-if-packages-been-deleted.patch" +165418eea5bfa8ef0c9782b29f43a27e5fd922ce0f54db0d12c7fe92ab174bc134e31a87d835a3fef6935f81a204573246a33a63adaf77580e21cf9d924bffe1 0001-buildrepo-regenerate-index-if-packages-been-deleted.patch +1a9399f5488256edd17e51ab25d35e4b1b80fe4b7b2d701f5a008b0ef9af7f3b69925056bb9aafed362c2143b203bc6430dc938d92d76a5cde9b5728fb84300e 0001-pkg-db-support-checkdepends-variable.patch" -- cgit v1.2.3