diff options
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | 003-logfile-parser-downgrades-fix.patch | 42 | ||||
| -rw-r--r-- | PKGBUILD | 12 |
3 files changed, 54 insertions, 6 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Fri Jan 6 21:39:28 UTC 2017 +# Fri Jan 6 22:11:19 UTC 2017 pkgbase = pkgbrowser-qt4 pkgdesc = A utility for browsing pacman databases and the AUR (Qt4 version) pkgver = 0.18.1 - pkgrel = 4 + pkgrel = 5 url = https://bitbucket.org/kachelaqa/pkgbrowser arch = i686 arch = x86_64 @@ -17,9 +17,11 @@ pkgbase = pkgbrowser-qt4 source = https://bitbucket.org/kachelaqa/pkgbrowser/downloads/pkgbrowser-0.18.1.tar.gz source = 001-pkgbrowser-qt4-build-fixes.patch source = 002-pkgbrowser-qt4-aur4-fixes.patch + source = 003-logfile-parser-downgrades-fix.patch sha256sums = 5edcb712ac97b0a616a2bfbee07a4549b4cc8f5e2d777b2e0d12015554e2189b sha256sums = dbf6b6883759a5a05cfe88f2dab510cf8d1ce1a258bb1f9087eb351fffe0b9b1 sha256sums = dc5bb5cbe809183648f44861f779fc1fa1d88217f357c423198acff0c10d3911 + sha256sums = e7454a05b267524e95ebb832b184dcc192b192d7ac442b96279588fc7ac125da pkgname = pkgbrowser-qt4 diff --git a/003-logfile-parser-downgrades-fix.patch b/003-logfile-parser-downgrades-fix.patch new file mode 100644 index 000000000000..6ed231bed76a --- /dev/null +++ b/003-logfile-parser-downgrades-fix.patch @@ -0,0 +1,42 @@ +diff '--color=auto' -aur a/pkgbrowser/conf.py b/pkgbrowser/conf.py +--- a/pkgbrowser/conf.py 2015-03-29 10:41:40.000000000 -0700 ++++ b/pkgbrowser/conf.py 2017-01-06 15:03:28.080141854 -0700 +@@ -1,4 +1,4 @@ +-# Copyright (C) 2010-2015, kachelaqa <kachelaqa@gmail.com> ++# Copyright (C) 2010-2017, kachelaqa <kachelaqa@gmail.com> + + import os, re, glob, time, signal + import urllib.request, tempfile, shutil +@@ -19,6 +19,11 @@ + PM_LOG_FILE = '/var/log/pacman.log' + PM_CACHE_DIRS = ('/var/cache/pacman/pkg',) + ++match_pkgfile = re.compile(r""" ++ ^(.+)-([^-\s]+-[^-\s]+)-(i686|x86_64|any) ++ \.pkg\.tar(?:\.(?:gz|bz2|xz|Z))?$ ++ """, re.X).match ++ + + def read_config(path=PM_CONF_FILE, section=None, config=None): + if config is None: +@@ -84,7 +89,7 @@ + log = defaultdict(list) + pattern = re.compile(r""" + ^(\[[^]]+\])\ +(?:\[[^]]+\]\ +)? +- (installed|upgraded|removed)\ +(\S+)\ +(\(.+) ++ (installed|upgraded|downgraded|removed)\ +(\S+)\ +(\(.+) + """, re.X | re.S) + with open(path, 'r') as stream: + for line in stream: +@@ -97,11 +102,6 @@ + zip.writestr(name, ''.join(lines).encode('utf-8')) + return ZipFile(temp) + +-match_pkgfile = re.compile(r""" +- ^(.+)-([^-\s]+-[^-\s]+)-(i686|x86_64|any) +- \.pkg\.tar(?:\.(?:gz|bz2|xz|Z))?$ +- """, re.X).match +- + def load_pkgcache(caches=PM_CACHE_DIRS): + packages = defaultdict(list) + for cache in sorted(caches): @@ -6,7 +6,7 @@ pkgname=pkgbrowser-qt4 _pkgname=pkgbrowser pkgver=0.18.1 -pkgrel=4 +pkgrel=5 pkgdesc="A utility for browsing pacman databases and the AUR (Qt4 version)" arch=('i686' 'x86_64') url="https://bitbucket.org/kachelaqa/pkgbrowser" @@ -17,17 +17,21 @@ conflicts=('pkgbrowser') replaces=('pkgbrowser') source=("$url/downloads/${_pkgname}-${pkgver}.tar.gz" '001-pkgbrowser-qt4-build-fixes.patch' - '002-pkgbrowser-qt4-aur4-fixes.patch') + '002-pkgbrowser-qt4-aur4-fixes.patch' + '003-logfile-parser-downgrades-fix.patch') sha256sums=('5edcb712ac97b0a616a2bfbee07a4549b4cc8f5e2d777b2e0d12015554e2189b' 'dbf6b6883759a5a05cfe88f2dab510cf8d1ce1a258bb1f9087eb351fffe0b9b1' - 'dc5bb5cbe809183648f44861f779fc1fa1d88217f357c423198acff0c10d3911') + 'dc5bb5cbe809183648f44861f779fc1fa1d88217f357c423198acff0c10d3911' + 'e7454a05b267524e95ebb832b184dcc192b192d7ac442b96279588fc7ac125da') prepare() { cd "${srcdir}/${_pkgname}-${pkgver}" # fixes to enable building Qt4 version - see https://bbs.archlinux.org/viewtopic.php?pid=1578506#p1578506 patch -Np1 -i ../001-pkgbrowser-qt4-build-fixes.patch - # fixes for AUR4 and Arch Linux Archive + # version 0.20 fixes for AUR4 and Arch Linux Archive patch -Np1 -i ../002-pkgbrowser-qt4-aur4-fixes.patch + # version 0.20.1 fixes for logfile parser so that downgrades are included + patch -Np1 -i ../003-logfile-parser-downgrades-fix.patch } build() { |