diff options
| author | Erich Eckner <git@eckner.net> | 2019-05-28 06:07:03 +0200 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2019-05-28 06:07:03 +0200 |
| commit | 79cb4205dc78a8390f1d8175014e59dc7b4aab49 (patch) | |
| tree | 7b33e2fcfb0b820c11319fa73a5eec3c6f88e51e | |
| parent | c961a1c92a58de074525f3e6750fb77960e23d2c (diff) | |
| download | packages-79cb4205dc78a8390f1d8175014e59dc7b4aab49.tar.xz | |
core/pacman: backport the mime fix
| -rw-r--r-- | core/pacman/PKGBUILD | 7 | ||||
| -rw-r--r-- | core/pacman/backport-mime-fix.patch | 13 |
2 files changed, 18 insertions, 2 deletions
diff --git a/core/pacman/PKGBUILD b/core/pacman/PKGBUILD index b99fa6d3..6c656486 100644 --- a/core/pacman/PKGBUILD +++ b/core/pacman/PKGBUILD @@ -24,11 +24,14 @@ if [ ! "${CARCH}" = "i686" ]; then fi source+=('install-dependencies-simultanously.patch' - 'replace-i686-by-pentium4-when-architecture-is-auto.patch') + 'replace-i686-by-pentium4-when-architecture-is-auto.patch' + 'backport-mime-fix.patch') sha256sums+=('95052e786da0ae8cc2378c0fc6ec38d433680f4d022f7f0f9cb5a5ad283abd83' - 'e8d5f8979c4dfab49e7ac058846f2454b865c1da451e086c23e61034fd820c19') + 'e8d5f8979c4dfab49e7ac058846f2454b865c1da451e086c23e61034fd820c19' + '25d77d5a4e2517e7eeca18e09cbf1c15d6561f243cf1f41d19c8f41d34ac167e') prepare() { cd "$pkgname-$pkgver" patch -p1 -i ../install-dependencies-simultanously.patch patch -p1 -i ../replace-i686-by-pentium4-when-architecture-is-auto.patch + patch -p1 -i ../backport-mime-fix.patch } diff --git a/core/pacman/backport-mime-fix.patch b/core/pacman/backport-mime-fix.patch new file mode 100644 index 00000000..2812757c --- /dev/null +++ b/core/pacman/backport-mime-fix.patch @@ -0,0 +1,13 @@ +diff --git a/scripts/libmakepkg/source/file.sh.in b/scripts/libmakepkg/source/file.sh.in +index 08b8bef8..8492ba11 100644 +--- a/scripts/libmakepkg/source/file.sh.in ++++ b/scripts/libmakepkg/source/file.sh.in +@@ -102,7 +102,7 @@ extract_file() { + case "$file_type" in + *application/x-tar*|*application/zip*|*application/x-zip*|*application/x-cpio*) + cmd="bsdtar" ;; +- *application/x-gzip*) ++ *application/x-gzip*|*application/gzip*) + case "$ext" in + gz|z|Z) cmd="gzip" ;; + *) return;; |