aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Frankenberger <simon@fraho.eu>2020-05-31 10:31:18 +0200
committerKevin Daudt <kdaudt@alpinelinux.org>2020-06-02 20:22:16 +0000
commit6aa80f810a27bc8dac056243bb1a8e3f1eb4dec7 (patch)
tree8af1234a5d3b07898619133fd347a7a5efad59a0
parente0f097ac3a467617734f1a8c9b08f19947b5cce9 (diff)
downloadaports-6aa80f810a27bc8dac056243bb1a8e3f1eb4dec7.tar.gz
aports-6aa80f810a27bc8dac056243bb1a8e3f1eb4dec7.tar.bz2
aports-6aa80f810a27bc8dac056243bb1a8e3f1eb4dec7.tar.xz
community/git-flow: move from testing
-rw-r--r--community/git-flow/APKBUILD (renamed from testing/git-flow/APKBUILD)4
-rw-r--r--community/git-flow/add-destdir-support.patch (renamed from testing/git-flow/add-destdir-support.patch)2
-rw-r--r--community/git-flow/fix-busybox-readlink.patch (renamed from testing/git-flow/fix-busybox-readlink.patch)2
3 files changed, 6 insertions, 2 deletions
diff --git a/testing/git-flow/APKBUILD b/community/git-flow/APKBUILD
index 547870f348..abbf36f834 100644
--- a/testing/git-flow/APKBUILD
+++ b/community/git-flow/APKBUILD
@@ -20,5 +20,5 @@ package() {
}
sha512sums="807cd36de7f5c9b4a7b28101de5ea8cfcbf528ff76578e4914c788b8098c7d3d91f8c19a3274e124ee7f7b4bdb6efdc5de2b74e09f374b71ae685beaa86e3e5a git-flow-1.12.3.tar.gz
-8206b38f5ed843519b33ebcdcc125c6dc6d6e9b6726919a1ec7becb52f22db125a3e58e3724ea95a4cf926cad8bb8cda5c163498d2de7ebb489d5b6985dc3cec add-destdir-support.patch
-c82b619470f3ecf14809e8ae742607b426de044e4a454f423563faba995b07f36bcf99ce8081dbc2a4f9342f23922b4df5d04993b93e10671e33af1d92b01076 fix-busybox-readlink.patch"
+a8e7ebf54280cbc8cda7a43bfecf12a27122a99d214d9b8f59c68a1b2e78efeca7050631ff8c904c4dd9cde057598c299a1c69e4d210eb00be9b6aceaaca6246 add-destdir-support.patch
+313f8b79903c96a0caf83239b0c3aea1f7eaa223e14019ed1df2179a581847d8a7c044a1dbb0947f69757f8865d3a12f11b982503570ea829a06d56a5e865b62 fix-busybox-readlink.patch"
diff --git a/testing/git-flow/add-destdir-support.patch b/community/git-flow/add-destdir-support.patch
index b55776f83e..aea98123c4 100644
--- a/testing/git-flow/add-destdir-support.patch
+++ b/community/git-flow/add-destdir-support.patch
@@ -1,3 +1,5 @@
+The Makefile doesn't provide a way to install into a custom directory
+
--- old/Makefile
+++ new/Makefile
@@ -26,7 +26,7 @@
diff --git a/testing/git-flow/fix-busybox-readlink.patch b/community/git-flow/fix-busybox-readlink.patch
index 48647529dd..f3bc9b20ff 100644
--- a/testing/git-flow/fix-busybox-readlink.patch
+++ b/community/git-flow/fix-busybox-readlink.patch
@@ -1,3 +1,5 @@
+Patch the readlink command to work with busybox
+
--- old/git-flow
+++ new/git-flow
@@ -46,7 +46,7 @@