Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/pacman/PKGBUILD10
-rw-r--r--core/pacman/backport-mime-fix.patch13
-rw-r--r--core/pacman/install-dependencies-simultanously.patch28
3 files changed, 2 insertions, 49 deletions
diff --git a/core/pacman/PKGBUILD b/core/pacman/PKGBUILD
index 468455c2..d2930688 100644
--- a/core/pacman/PKGBUILD
+++ b/core/pacman/PKGBUILD
@@ -23,15 +23,9 @@ if [ ! "${CARCH}" = "i686" ]; then
)"
fi
-source+=('install-dependencies-simultanously.patch'
- 'replace-i686-by-pentium4-when-architecture-is-auto.patch'
- 'backport-mime-fix.patch')
-sha256sums+=('95052e786da0ae8cc2378c0fc6ec38d433680f4d022f7f0f9cb5a5ad283abd83'
- 'e8d5f8979c4dfab49e7ac058846f2454b865c1da451e086c23e61034fd820c19'
- '25d77d5a4e2517e7eeca18e09cbf1c15d6561f243cf1f41d19c8f41d34ac167e')
+source+=('replace-i686-by-pentium4-when-architecture-is-auto.patch')
+sha256sums+=('e8d5f8979c4dfab49e7ac058846f2454b865c1da451e086c23e61034fd820c19')
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
deleted file mode 100644
index 2812757c..00000000
--- a/core/pacman/backport-mime-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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;;
diff --git a/core/pacman/install-dependencies-simultanously.patch b/core/pacman/install-dependencies-simultanously.patch
deleted file mode 100644
index 07e0e404..00000000
--- a/core/pacman/install-dependencies-simultanously.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
-index 4d9948ec..eb2a19ba 100644
---- a/scripts/makepkg.sh.in
-+++ b/scripts/makepkg.sh.in
-@@ -1398,18 +1398,18 @@ else
- fi
- deperr=0
-
-- msg "$(gettext "Checking runtime dependencies...")"
-- resolve_deps ${depends[@]} || deperr=1
--
- if (( RMDEPS && INSTALL )); then
-+ msg "$(gettext "Checking runtime dependencies...")"
-+ resolve_deps ${depends[@]} || deperr=1
-+
- original_pkglist=($(run_pacman -Qq)) # required by remove_dep
- fi
-
- msg "$(gettext "Checking buildtime dependencies...")"
- if (( CHECKFUNC )); then
-- resolve_deps "${makedepends[@]}" "${checkdepends[@]}" || deperr=1
-+ resolve_deps "${depends[@]}" "${makedepends[@]}" "${checkdepends[@]}" || deperr=1
- else
-- resolve_deps "${makedepends[@]}" || deperr=1
-+ resolve_deps "${depends[@]}" "${makedepends[@]}" || deperr=1
- fi
-
- if (( RMDEPS )); then