diff options
author | Mike Crute <mike@crute.us> | 2020-06-01 06:05:13 +0000 |
---|---|---|
committer | Kevin Daudt <kdaudt@alpinelinux.org> | 2020-06-05 04:51:39 +0000 |
commit | d66e262c893419ecaa1304abe3f4a0586956932c (patch) | |
tree | e8080f71f3141991abaa184382b4c78455837dd6 | |
parent | 320b07ddac10523c307511cea8219e5152b30940 (diff) | |
download | alpine_aports-d66e262c893419ecaa1304abe3f4a0586956932c.tar.bz2 alpine_aports-d66e262c893419ecaa1304abe3f4a0586956932c.tar.xz alpine_aports-d66e262c893419ecaa1304abe3f4a0586956932c.zip |
community/gerbera: fix lint and build warnings
-rw-r--r-- | community/gerbera/APKBUILD | 6 | ||||
-rw-r--r-- | community/gerbera/disable-git-test.patch | 10 | ||||
-rw-r--r-- | community/gerbera/upnp-updates.patch | 11 |
3 files changed, 24 insertions, 3 deletions
diff --git a/community/gerbera/APKBUILD b/community/gerbera/APKBUILD index 4a6ac19cf8..f6187c0240 100644 --- a/community/gerbera/APKBUILD +++ b/community/gerbera/APKBUILD | |||
@@ -33,7 +33,7 @@ checkdepends=" | |||
33 | gmock | 33 | gmock |
34 | " | 34 | " |
35 | install="$pkgname.pre-install $pkgname.post-deinstall" | 35 | install="$pkgname.pre-install $pkgname.post-deinstall" |
36 | subpackages="$pkgname-doc" | 36 | subpackages="$pkgname-doc $pkgname-openrc" |
37 | pkgusers="$pkgname" | 37 | pkgusers="$pkgname" |
38 | pkggroups="$pkgname" | 38 | pkggroups="$pkgname" |
39 | # | 39 | # |
@@ -106,8 +106,8 @@ package() { | |||
106 | } | 106 | } |
107 | 107 | ||
108 | sha512sums="989716bc60bc7e171448e18aff58d8f17dbbed28ca31cfeaa7dc0e6f1cb646da88041deff6481e15ba398090a01f07e00f74b12e84c423b7ca5b82eb97b918cd gerbera-1.4.0.tar.gz | 108 | sha512sums="989716bc60bc7e171448e18aff58d8f17dbbed28ca31cfeaa7dc0e6f1cb646da88041deff6481e15ba398090a01f07e00f74b12e84c423b7ca5b82eb97b918cd gerbera-1.4.0.tar.gz |
109 | 9037fbdc18b7af1492352abccaacca39193b16332040b02b72513ce31e47fbd56220b6c0c62a207e04fd56c4d15d5bd92910506968a4d70a66e133ba49eaeeaa disable-git-test.patch | 109 | f4cd58f52e4ab932d282ad8166c4c9c445140cbed6740ba292317aab28ddb2814803fa8c862846aa8f6f2c02f957176b99fc61437ada51b6219486270cb43cb5 disable-git-test.patch |
110 | 47e1953c49ceae3eeaea50b4ecd2bf44d4da2286c315a3bdbfcbe7e7fc8500e2f27438acebe16f6a72a0c97efd7b8a1b185282d73b12e730e1a8fbec19c18046 0001-Remove-IN-and-OUT-dropped-upstream.patch | 110 | 47e1953c49ceae3eeaea50b4ecd2bf44d4da2286c315a3bdbfcbe7e7fc8500e2f27438acebe16f6a72a0c97efd7b8a1b185282d73b12e730e1a8fbec19c18046 0001-Remove-IN-and-OUT-dropped-upstream.patch |
111 | e134dee2080c21a39120999d215b0ec36890bed9283a1460d9750e2b21908b3283db09d33c5ff445ae779559b5486f8c81c590c1dbde77ae3d5bb900d694d17f upnp-updates.patch | 111 | 965b356fafff92548b7189edf3763a638cd3dc42e173c5f656612a9cb22c34bde719b86cac3152a166f726c786d2001c42ad772fcac9b90c33b2b12c803cb67d upnp-updates.patch |
112 | 8ae265dd283705802d138dc014d592362b0b95030eee0999bfcf6058fa656f215a5dc11e2b548459300750be0f9e6c3d0f5047714a6fc16eeb430c40aff8d35b gerbera.initd | 112 | 8ae265dd283705802d138dc014d592362b0b95030eee0999bfcf6058fa656f215a5dc11e2b548459300750be0f9e6c3d0f5047714a6fc16eeb430c40aff8d35b gerbera.initd |
113 | 392d7e964b0328778847f871e88ffd475ddac99b6cf8c8ded4825eb2f970e084db692552790a1b30ff96f59eabcd9fff50164d9dedf328badab95a1cec833c02 gerbera.confd" | 113 | 392d7e964b0328778847f871e88ffd475ddac99b6cf8c8ded4825eb2f970e084db692552790a1b30ff96f59eabcd9fff50164d9dedf328badab95a1cec833c02 gerbera.confd" |
diff --git a/community/gerbera/disable-git-test.patch b/community/gerbera/disable-git-test.patch index 3a2bc2f424..2eb64acb2f 100644 --- a/community/gerbera/disable-git-test.patch +++ b/community/gerbera/disable-git-test.patch | |||
@@ -1,3 +1,13 @@ | |||
1 | From: Mike Crute <mike@crute.us> | ||
2 | Date: Tue, 24 Dec 2019 16:18:32 +0000 | ||
3 | Subject: Disable broken tests | ||
4 | |||
5 | Patch removes check for git info in server version output. This assumes | ||
6 | that the binary was built within a git repo which is not the case for | ||
7 | releases. This test will never work for us. | ||
8 | |||
9 | --- | ||
10 | |||
1 | --- a/test/test_server/test_main.cc.orig | 11 | --- a/test/test_server/test_main.cc.orig |
2 | +++ b/test/test_server/test_main.cc | 12 | +++ b/test/test_server/test_main.cc |
3 | @@ -48,7 +48,7 @@ | 13 | @@ -48,7 +48,7 @@ |
diff --git a/community/gerbera/upnp-updates.patch b/community/gerbera/upnp-updates.patch index 4cc06cfead..7d173398f8 100644 --- a/community/gerbera/upnp-updates.patch +++ b/community/gerbera/upnp-updates.patch | |||
@@ -1,3 +1,14 @@ | |||
1 | From: Mike Crute <mike@crute.us> | ||
2 | Date: Tue, 24 Dec 2019 16:18:32 +0000 | ||
3 | Subject: Disable broken tests | ||
4 | |||
5 | Disables some tests that don't work with the latest version of libupnp. | ||
6 | Upstream has very seriously overhauled these tests and there's noting | ||
7 | feasible to pull forward. We can drop this patch after the next upstream | ||
8 | gerbera release. | ||
9 | |||
10 | --- | ||
11 | |||
1 | --- a/src/util/headers.cc | 12 | --- a/src/util/headers.cc |
2 | +++ b/src/util/headers.cc | 13 | +++ b/src/util/headers.cc |
3 | @@ -81,7 +81,7 @@ | 14 | @@ -81,7 +81,7 @@ |