Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ed341756d536fdddd86374e2c1a1c2c18ddd6461
commit ed341756d536fdddd86374e2c1a1c2c18ddd6461 Author: James Buren <r...@frugalware.org> Date: Mon Feb 18 13:46:56 2013 -0600 pacman-g2-3.9.0-1-x86_64 * version bump * drop old patch diff --git a/source/base/pacman-g2/0001-makepkg.conf.in-march-is-x86-64-not-x86_64.patch b/source/base/pacman-g2/0001-makepkg.conf.in-march-is-x86-64-not-x86_64.patch deleted file mode 100644 index e1c6fa0..0000000 --- a/source/base/pacman-g2/0001-makepkg.conf.in-march-is-x86-64-not-x86_64.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 719695510d2174e69815c0a586a83b55b81da9aa Mon Sep 17 00:00:00 2001 -From: James Buren <r...@frugalware.org> -Date: Fri, 22 Jun 2012 05:14:50 -0500 -Subject: [PATCH] makepkg.conf.in: march is x86-64 not x86_64 - ---- - etc/makepkg.conf.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in -index 109ede7..4ea8e79 100644 ---- a/etc/makepkg.conf.in -+++ b/etc/makepkg.conf.in -@@ -20,8 +20,8 @@ case $(uname -m) in - x86_64) - CARCH="x86_64" - CHOST="x86_64-frugalware-linux" -- CFLAGS="-march=x86_64 -mtune=generic -O2 -pipe" -- CXXFLAGS="-march=x86_64 -mtune=generic -O2 -pipe" -+ CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe" -+ CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe" - ;; - arm*) - CARCH="arm" --- -1.7.11 - diff --git a/source/base/pacman-g2/FrugalBuild b/source/base/pacman-g2/FrugalBuild index 0141ca0..6ffb0e4 100644 --- a/source/base/pacman-g2/FrugalBuild +++ b/source/base/pacman-g2/FrugalBuild @@ -8,9 +8,9 @@ USE_MINIMAL=${USE_MINIMAL:-"n"} USE_STABLE=${USE_STABLE:-"n"} pkgname=pacman-g2 -pkgver=3.8.9 +pkgver=3.9.0 Fuse $USE_DEVEL && pkgver=3.8.1.18.gc254053 -pkgrel=2 +pkgrel=1 pkgdesc="A .tar.xz based package manager library (libpacman) and client (pacman-g2) with dependency support." url="http://ftp.frugalware.org/pub/other/pacman-g2/" backup=(etc/{makepkg,pacman-g2}.conf etc/pacman-g2/repos/{frugalware,frugalware-current}) @@ -36,8 +36,8 @@ archs=('i686' 'x86_64' 'arm') _F_archive_nosort=y up2date="Flasttar $url/releases/" if ! Fuse $USE_DEVEL; then - source=($url/releases/$pkgname-$pkgver.tar.gz 0001-Revert-libftp-set-SO_-TIMEO-on-sockets-to-avoid-bloc.patch 0001-makepkg.conf.in-march-is-x86-64-not-x86_64.patch) - signatures=("$source.asc" '' '') + source=($url/releases/$pkgname-$pkgver.tar.gz 0001-Revert-libftp-set-SO_-TIMEO-on-sockets-to-avoid-bloc.patch) + signatures=("$source.asc" '') if Fuse $USE_STABLE; then source=("${source[@]}" stable.patch) signatures=("${signatures[@]}" '') _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git