Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=fbe51d11237883f0920221ef5c85a49924d66762
commit fbe51d11237883f0920221ef5c85a49924d66762
Author: Miklos Vajna <vmik...@frugalware.org>
Date: Sat Oct 2 14:29:26 2010 +0200
pacman-g2-3.7.8-5-i686
- bin unused patches
diff --git a/source/base/pacman-g2/0001-fix-percent-calculation.patch
b/source/base/pacman-g2/0001-fix-percent-calculation.patch
deleted file mode 100644
index 33b161a..0000000
--- a/source/base/pacman-g2/0001-fix-percent-calculation.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 15239ddaabded16686facc39dd57e675e1da1888 Mon Sep 17 00:00:00 2001
-From: crazy <cr...@frugalware.org>
-Date: Sat, 26 Jun 2010 00:08:40 +0200
-Subject: [PATCH] fix percent calculation , should close #4252
-
----
- lib/libpacman/add.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/lib/libpacman/add.c b/lib/libpacman/add.c
-index 34186f2..29167c1 100644
---- a/lib/libpacman/add.c
-+++ b/lib/libpacman/add.c
-@@ -444,7 +444,7 @@ int _pacman_add_commit(pmtrans_t *trans, pmdb_t *db)
- STRNCPY(pathname, archive_entry_pathname
(entry), PATH_MAX);
-
- if (info->size != 0)
-- percent =
archive_position_uncompressed(archive) / info->size;
-+ percent =
(double)archive_position_uncompressed(archive) / info->size;
- if (needdisp == 0) {
- PROGRESS(trans, cb_state, what,
(int)(percent * 100), howmany, (howmany - remain +1));
- }
---
-1.7.1
-
diff --git a/source/base/pacman-g2/0002-fix-ccache.patch
b/source/base/pacman-g2/0002-fix-ccache.patch
deleted file mode 100644
index dcc9074..0000000
--- a/source/base/pacman-g2/0002-fix-ccache.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-commit 5a27136c9df7bb9e920c9f0bd91ed2af7b54c778
-Author: Michel Hermier <herm...@frugalware.org>
-Date: Mon Jul 5 13:50:37 2010 +0200
-
- scripts/makepkg: Disable ccache when /var/cache/ccache is not writable.
-
- * With the recent cache update, it now don't die silently when the cache
- is writable. Don't export ccache environment in this case (so that
- ccache is disabled).
-
-diff --git a/scripts/makepkg b/scripts/makepkg
-index 5988ccf..c177dd4 100755
---- a/scripts/makepkg
-+++ b/scripts/makepkg
-@@ -1537,13 +1537,14 @@ fi
-
- # use ccache if it's available
- if [ "$NOCCACHE" = "0" -a -d /usr/lib/ccache/bin ]; then
-- export PATH=/usr/lib/ccache/bin:$PATH
-- FCC="ccache $FCC"
-- install -d -m 2775 /var/cache/ccache/$pkgname
-- export CCACHE_DIR=/var/cache/ccache/$pkgname
-- export CCACHE_NOLINK=1
-- export CCACHE_UMASK=002
-- if [ ! -w /var/cache/ccache/ ]; then
-+ if [ -w /var/cache/ccache/ ]; then
-+ export PATH=/usr/lib/ccache/bin:$PATH
-+ FCC="ccache $FCC"
-+ install -d -m 2775 /var/cache/ccache/$pkgname
-+ export CCACHE_DIR=/var/cache/ccache/$pkgname
-+ export CCACHE_NOLINK=1
-+ export CCACHE_UMASK=002
-+ else
- if [ "$INCHROOT" != "1" ]; then
- error "You installed ccache but you are not in the
ccache group."
- plain "Either add yourserlf to the ccache group or"
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
