summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorYen Chi Hsuan2016-02-01 05:21:16 +0800
committerYen Chi Hsuan2016-02-01 05:21:16 +0800
commit962463d827fe2ee350e76a31832a7ff7df64c3ae (patch)
treeed1677be0f4286971900783d186bec82de807d8f
parent8761965df19d5d148fa9005a7d662af53beba836 (diff)
downloadaur-962463d827fe2ee350e76a31832a7ff7df64c3ae.tar.gz
Pacman 5 patch landed
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
-rw-r--r--pacorig-removed-in-pacman5.patch22
3 files changed, 1 insertions, 29 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4947c5521db..1d3ef371cb3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Sun Jan 31 13:29:33 UTC 2016
+# Sun Jan 31 21:21:05 UTC 2016
pkgbase = pyalpm-git
pkgdesc = Libalpm bindings for Python 3 (Git version)
pkgver = 0.6.2.r3.g3c4692b
@@ -15,10 +15,8 @@ pkgbase = pyalpm-git
conflicts = pyalpm
source = git+https://projects.archlinux.org/git/users/remy/pyalpm.git
source = 0001-Fix-build-for-Python-3.5.patch
- source = pacorig-removed-in-pacman5.patch
md5sums = SKIP
md5sums = d5481d4f9920860518277a78857c25e8
- md5sums = 0bc081273ff6817080cd7c3226413f54
pkgname = pyalpm-git
diff --git a/PKGBUILD b/PKGBUILD
index 567bf75899f..ebb33aec580 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,13 +16,10 @@ makedepends=('git')
source=(
'git+https://projects.archlinux.org/git/users/remy/pyalpm.git'
'0001-Fix-build-for-Python-3.5.patch'
- # https://lists.archlinux.org/pipermail/arch-projects/2016-January/004320.html
- 'pacorig-removed-in-pacman5.patch'
)
md5sums=(
'SKIP'
'd5481d4f9920860518277a78857c25e8'
- '0bc081273ff6817080cd7c3226413f54'
)
pkgver() {
@@ -37,7 +34,6 @@ prepare() {
cd "$srcdir/$_pkgname"
patch -Np1 -i ../0001-Fix-build-for-Python-3.5.patch
- patch -Np1 -i ../pacorig-removed-in-pacman5.patch
}
package() {
diff --git a/pacorig-removed-in-pacman5.patch b/pacorig-removed-in-pacman5.patch
deleted file mode 100644
index 98ad561d8c6..00000000000
--- a/pacorig-removed-in-pacman5.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Support for .pacorig files has been removed in
-libalpm, so remove the relevant event case.
-
-Signed-off-by: Jelle van der Waa <jelle at vdwaa.nl>
----
- src/transaction.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/transaction.c b/src/transaction.c
-index 9c28c50..4e681f8 100644
---- a/src/transaction.c
-+++ b/src/transaction.c
-@@ -141,7 +141,6 @@ void pyalpm_eventcb(alpm_event_t *event) {
- case ALPM_EVENT_KEY_DOWNLOAD_DONE:
- case ALPM_EVENT_PACNEW_CREATED:
- case ALPM_EVENT_PACSAVE_CREATED:
-- case ALPM_EVENT_PACORIG_CREATED:
- default:
- eventstr = "unknown event";
- }
---
-2.7.0