From: sgn <sgn@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] apparmor: merge apparmor-vim
Date: Wed, 23 Jun 2021 18:38:46 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-31630@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1587 bytes --]
There is a new pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages no-vim-split
https://github.com/void-linux/void-packages/pull/31630
apparmor: merge apparmor-vim
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/31630.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-no-vim-split-31630.patch --]
[-- Type: text/x-diff, Size: 1503 bytes --]
From 112dee65294c4ed2f6cc7824e8ef9f21779ef900 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 23 Jun 2021 23:37:47 +0700
Subject: [PATCH] apparmor: merge apparmor-vim
---
srcpkgs/apparmor/template | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/apparmor/template b/srcpkgs/apparmor/template
index 2431832981c7..ea2611c2443d 100644
--- a/srcpkgs/apparmor/template
+++ b/srcpkgs/apparmor/template
@@ -1,7 +1,7 @@
# Template file for 'apparmor'
pkgname=apparmor
version=3.0.1
-revision=4
+revision=5
wrksrc="${pkgname}-v${version}"
build_wrksrc=libraries/libapparmor
build_style=gnu-configure
@@ -18,6 +18,7 @@ homepage="https://gitlab.com/apparmor/apparmor"
changelog="https://gitlab.com/apparmor/apparmor/-/wikis/Release_Notes_${version}"
distfiles="https://gitlab.com/apparmor/apparmor/-/archive/v${version}/apparmor-v${version}.tar.gz"
checksum=5f9afc157c5e2610737186a31fc9bd6a1d339a2ee85ac4f2667dce59cf60f1c7
+replaces="apparmor-vim>=0"
if [ -z "$CROSS_BUILD" ]; then
configure_args="--with-perl --with-python"
@@ -64,15 +65,6 @@ post_install() {
rm ${DESTDIR}/etc/apparmor.d/{,local/}php-fpm
}
-apparmor-vim_package() {
- short_desc+=" - Vim syntax"
- depends="vim"
- pkg_install() {
- vmove usr/share/vim/vimfiles/syntax/apparmor.vim
- vmove usr/share/man/man5/apparmor.vim.5
- }
-}
-
libapparmor_package() {
short_desc+=" - Library"
pkg_install() {
next reply other threads:[~2021-06-23 16:38 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-23 16:38 sgn [this message]
2021-06-23 16:48 ` ericonr
2021-06-23 17:33 ` Piraty
2021-06-24 0:04 ` [PR PATCH] [Updated] " sgn
2021-06-26 21:44 ` [PR PATCH] [Merged]: " ericonr
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-31630@inbox.vuxu.org \
--to=sgn@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).