From 88275f98d5fac50c978e4fbdc9f7d418aee638ce Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Tue, 12 Jul 2011 00:09:57 -0500 Subject: pacman: Bumped to latest --- abs/core/pacman/PKGBUILD | 39 +++++++++++++++++++------------------- abs/core/pacman/makepkg.conf | 9 ++++----- abs/core/pacman/pacman.conf | 4 ++-- abs/core/pacman/pacman.conf.x86_64 | 9 +++++++-- abs/core/pacman/pacman.install | 29 ++++++++++++++++++---------- 5 files changed, 51 insertions(+), 39 deletions(-) diff --git a/abs/core/pacman/PKGBUILD b/abs/core/pacman/PKGBUILD index 2d4f776..59ff582 100644 --- a/abs/core/pacman/PKGBUILD +++ b/abs/core/pacman/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 89780 2010-09-04 01:05:26Z dan $ +# $Id$ # Maintainer: Dan McGee pkgname=pacman -pkgver=3.4.1 -pkgrel=3 +pkgver=3.5.3 +pkgrel=1 pkgdesc="A library-based package manager with dependency support" arch=('i686' 'x86_64') url="http://www.archlinux.org/pacman/" license=('GPL') groups=('base') -depends=('bash' 'libarchive>=2.7.1' 'libfetch>=2.25' 'pacman-mirrorlist') +depends=('bash' 'libarchive>=2.8.4' 'libfetch>=2.28' 'pacman-mirrorlist') optdepends=('fakeroot: for makepkg usage as normal user' 'curl: for rankmirrors usage') backup=(etc/pacman.conf etc/makepkg.conf) @@ -19,44 +19,43 @@ source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz pacman.conf pacman.conf.x86_64 makepkg.conf) +md5sums=('b4f1fdbc17100923071ebe8fe9377be5' + 'e99eb721b6b704f68c5f47468507c102' + 'f8b939d9b2beb79a0436961a2d707d7c' + 'a8684989d3dfad5a6e1bcf95af3e571b') # keep an upgrade path for older installations PKGEXT='.pkg.tar.gz' build() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --enable-doc - make || return 1 + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --enable-doc + make } package() { cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install || return 1 + make DESTDIR=$pkgdir install # install Arch specific stuff mkdir -p $pkgdir/etc case "$CARCH" in i686) install -m644 $srcdir/pacman.conf $pkgdir/etc/pacman.conf - ;; - x86_64) - install -m644 $srcdir/pacman.conf.x86_64 $pkgdir/etc/pacman.conf - ;; - esac - install -m644 $srcdir/makepkg.conf $pkgdir/etc/ - # set things correctly in the default conf file - case "$CARCH" in - i686) mycarch="i686" mychost="i686-pc-linux-gnu" myflags="-march=i686 " ;; x86_64) + install -m644 $srcdir/pacman.conf.x86_64 $pkgdir/etc/pacman.conf mycarch="x86_64" mychost="x86_64-unknown-linux-gnu" myflags="-march=x86-64 " ;; esac + install -m644 $srcdir/makepkg.conf $pkgdir/etc/ + # set things correctly in the default conf file sed -i $pkgdir/etc/makepkg.conf \ -e "s|@CARCH[@]|$mycarch|g" \ -e "s|@CHOST[@]|$mychost|g" \ @@ -70,7 +69,7 @@ package() { } # vim: set ts=2 sw=2 et: -md5sums=('4e4e8e4f636d9878fbed9cf840f162cf' - '4792e61cd1b902d20046e19f97ae758d' - '9ba146b4fa7bcb3cc18204b06d1f6157' - 'aef317285c7d16ac495b0e53deeb948d') +md5sums=('c36c18ed4d8ec69c0ecb4f9684266901' + '8f7e5462469cfc7520b3aade58ff28de' + 'f8b939d9b2beb79a0436961a2d707d7c' + 'a8684989d3dfad5a6e1bcf95af3e571b') diff --git a/abs/core/pacman/makepkg.conf b/abs/core/pacman/makepkg.conf index ff08a0f..a655e93 100644 --- a/abs/core/pacman/makepkg.conf +++ b/abs/core/pacman/makepkg.conf @@ -39,15 +39,16 @@ LDFLAGS="-Wl,--hash-style=gnu -Wl,--as-needed" # BUILD ENVIRONMENT ######################################################################### # -# Defaults: BUILDENV=(fakeroot !distcc color !ccache) +# Defaults: BUILDENV=(fakeroot !distcc color !ccache check) # A negated environment option will do the opposite of the comments below. # #-- fakeroot: Allow building packages as a non-root user #-- distcc: Use the Distributed C/C++/ObjC compiler #-- color: Colorize output messages #-- ccache: Use ccache to cache compilation +#-- check: Run the check() function if present in the PKGBUILD # -BUILDENV=(fakeroot !distcc color !ccache) +BUILDENV=(fakeroot !distcc color !ccache check) # #-- If using DistCC, your MAKEFLAGS will also need modification. In addition, #-- specify a space-delimited list of hosts running in the DistCC cluster. @@ -61,7 +62,7 @@ BUILDENV=(fakeroot !distcc color !ccache) # Default: OPTIONS=(strip docs libtool emptydirs zipman purge) # A negated option will do the opposite of the comments below. # -#-- strip: Strip symbols from binaries/libraries in STRIP_DIRS +#-- strip: Strip symbols from binaries/libraries #-- docs: Save doc directories specified by DOC_DIRS #-- libtool: Leave libtool (.la) files in packages #-- emptydirs: Leave empty directories in packages @@ -82,8 +83,6 @@ STRIP_STATIC="--strip-debug" MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info}) #-- Doc directories to remove (if !docs is specified) DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc}) -#-- Directories to be searched for the strip option (if strip is specified) -STRIP_DIRS=(bin lib sbin usr/{bin,lib,sbin,local/{bin,lib,sbin}} opt/*/{bin,lib,sbin}) #-- Files to be removed from all packages (if purge is specified) PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod) diff --git a/abs/core/pacman/pacman.conf b/abs/core/pacman/pacman.conf index c44d2e6..ae584e2 100644 --- a/abs/core/pacman/pacman.conf +++ b/abs/core/pacman/pacman.conf @@ -17,7 +17,7 @@ HoldPkg = pacman glibc # If upgrades are available for these packages they will be asked for first SyncFirst = pacman #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u -#XferCommand = /usr/bin/curl -C - %u > %o +#XferCommand = /usr/bin/curl -C - -f %u > %o #CleanMethod = KeepInstalled Architecture = auto @@ -33,6 +33,7 @@ Architecture = auto #ShowSize #UseDelta #TotalDownload +#CheckSpace # # REPOSITORIES @@ -76,4 +77,3 @@ Include = /etc/pacman.d/mirrorlist # tips on creating your own repositories. #[custom] #Server = file:///home/custompkgs - diff --git a/abs/core/pacman/pacman.conf.x86_64 b/abs/core/pacman/pacman.conf.x86_64 index e825b4b..6f04236 100644 --- a/abs/core/pacman/pacman.conf.x86_64 +++ b/abs/core/pacman/pacman.conf.x86_64 @@ -17,7 +17,7 @@ HoldPkg = pacman glibc # If upgrades are available for these packages they will be asked for first SyncFirst = pacman #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u -#XferCommand = /usr/bin/curl -C - %u > %o +#XferCommand = /usr/bin/curl -C - -f %u > %o #CleanMethod = KeepInstalled Architecture = auto @@ -33,6 +33,7 @@ Architecture = auto #ShowSize #UseDelta #TotalDownload +#CheckSpace # # REPOSITORIES @@ -73,7 +74,11 @@ Include = /etc/pacman.d/mirrorlist Include = /etc/pacman.d/mirrorlist # If you want to run 32 bit applications on your x86_64 system, -# enable the multilib repository here. +# enable the multilib repositories as required here. + +#[multilib-testing] +#Include = /etc/pacman.d/mirrorlist + #[multilib] #Include = /etc/pacman.d/mirrorlist diff --git a/abs/core/pacman/pacman.install b/abs/core/pacman/pacman.install index 294222e..b735399 100644 --- a/abs/core/pacman/pacman.install +++ b/abs/core/pacman/pacman.install @@ -2,19 +2,28 @@ # arg 1: the new package version # arg 2: the old package version post_upgrade() { - # one time stuff for md5sum issue with older pacman versions - if [ "$(vercmp $2 3.0.2)" -lt 0 ]; then - _resetbackups - fi + # one time stuff for md5sum issue with older pacman versions + if [ "$(vercmp $2 3.0.2)" -lt 0 ]; then + _resetbackups + fi + if [ "$(vercmp $2 3.5.0)" -lt 0 ]; then + _warnupgrade + fi +} + +_warnupgrade() { + echo ">>> The pacman database format has changed as of pacman 3.5.0." + echo ">>> You will need to run \`pacman-db-upgrade\` as root." + echo ">>>" } _resetbackups() { - echo ">>> Performing one-time reset of NoUpgrade md5sums. After this reset" - echo ">>> you are able to remove all NoUpgrade lines of already protected" - echo ">>> files from pacman.conf." - echo ">>>" + echo ">>> Performing one-time reset of NoUpgrade md5sums. After this reset" + echo ">>> you are able to remove all NoUpgrade lines of already protected" + echo ">>> files from pacman.conf." + echo ">>>" - # path variables + # path variables pacconf="/etc/pacman.conf" dbpath="/var/lib/pacman/local" @@ -50,4 +59,4 @@ _resetbackups() { echo ">>> -> $file is unowned." fi done -} +} -- cgit v0.12 From 02256098c3e55b15d1a85359f93bf8cffe962ffd Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Tue, 12 Jul 2011 19:07:12 -0500 Subject: chromium:Bumped to latest --- abs/extra/community/chromium/PKGBUILD | 121 +++++++++++--------- abs/extra/community/chromium/chromium.desktop | 2 +- abs/extra/community/chromium/chromium.install | 7 +- abs/extra/community/chromium/gcc-4.6.patch | 159 ++++++++++++++++++++++++++ abs/extra/community/chromium/glibc-2.14.patch | 51 +++++++++ 5 files changed, 284 insertions(+), 56 deletions(-) create mode 100644 abs/extra/community/chromium/gcc-4.6.patch create mode 100644 abs/extra/community/chromium/glibc-2.14.patch diff --git a/abs/extra/community/chromium/PKGBUILD b/abs/extra/community/chromium/PKGBUILD index eba588c..013f1cc 100644 --- a/abs/extra/community/chromium/PKGBUILD +++ b/abs/extra/community/chromium/PKGBUILD @@ -1,42 +1,62 @@ -# $Id: PKGBUILD 109507 2011-02-10 15:37:06Z ibiru $ +# $Id$ +# Maintainer: Evangelos Foutras # Contributor: Pierre Schmitz # Contributor: Jan "heftig" Steffens -# Maintainer: Daniel J Griffiths +# Contributor: Daniel J Griffiths pkgname=chromium -pkgver=9.0.597.94 -pkgrel=3 -pkgdesc='The open-source project behind Google Chrome, an attempt at creating a safer, faster, and more stable browser.' +pkgver=12.0.742.112 +pkgrel=1 +pkgdesc="The open-source project behind Google Chrome, an attempt at creating a safer, faster, and more stable browser" arch=('i686' 'x86_64') -url='http://www.chromium.org/' +url="http://www.chromium.org/" license=('BSD') -depends=('nss' 'gconf' 'alsa-lib' 'xdg-utils' 'hicolor-icon-theme' 'bzip2' 'libevent' 'libxss' 'libxtst' 'ttf-dejavu' 'libcups') -makedepends=('python2' 'perl' 'gperf' 'yasm' 'mesa' 'libgnome-keyring' 'libcups') +depends=('gtk2' 'dbus-glib' 'nss' 'alsa-lib' 'xdg-utils' 'bzip2' 'libevent' + 'libxss' 'libxtst' 'ttf-dejavu' 'desktop-file-utils' + 'hicolor-icon-theme') +makedepends=('python2' 'perl' 'gperf' 'yasm' 'mesa' 'libgnome-keyring') provides=('chromium-browser') conflicts=('chromium-browser') install=chromium.install -source=("http://build.chromium.org/buildbot/official/chromium-${pkgver}.tar.bz2" - 'chromium.desktop' 'chromium.sh') -md5sums=('41386b3df743575f2325c4c64d6d7bc7' - 'c5e849fcb1101149977355c99d8ff78f' - '096a46ef386817988250d2d7bddd1b34') +source=(http://build.chromium.org/official/chromium-$pkgver.tar.bz2 + chromium.desktop + chromium.sh + gcc-4.6.patch + glibc-2.14.patch) +md5sums=('8a5b7b4b30f5fe8de10fcf7d984321b8' + '075c3c2fa5902e16b8547dd31d437191' + '096a46ef386817988250d2d7bddd1b34' + '0ea28c80c49a0a4440786e05b5251678' + '543a32b09f138fd47858b9a4a7c82dfb') build() { - cd ${srcdir}/chromium-${pkgver} + cd "$srcdir/chromium-$pkgver" + + # Patches to fix gcc 4.6 compilation from + # http://code.google.com/p/chromium/issues/detail?id=80071 + # http://code.google.com/p/chromium/issues/detail?id=70746 + # http://code.google.com/p/chromium/issues/detail?id=46411 + patch -Np0 -i "$srcdir/gcc-4.6.patch" + + # Fix build with glibc 2.14 + # http://code.google.com/p/chromium/issues/detail?id=86646 + patch -Np2 -i "$srcdir/glibc-2.14.patch" ### Configure - echo 'Use python2 instead of python...' - find . -type f -exec \ - sed -E 's#(/usr/bin/python)$#\12#g;s#(/usr/bin/python2)\.4$#\1#g' -i {} \; + # Use Python 2 + find . -type f -exec sed -i -r \ + -e 's|/usr/bin/python$|\02|g' \ + -e 's|(/usr/bin/python2)\.4$|\1|g' \ + {} + # There are still a lot of relative calls which need a workaround - mkdir ${srcdir}/python2-path - ln -s /usr/bin/python2 ${srcdir}/python2-path/python - export PATH="${srcdir}/python2-path/:${PATH}" + mkdir "$srcdir/python2-path" + ln -s /usr/bin/python2 "$srcdir/python2-path/python" + export PATH="$srcdir/python2-path:$PATH" - # we need to disable system_ssl until "next protocol negotiation" support - # is available in our nss package - # see https://bugzilla.mozilla.org/show_bug.cgi?id=547312 + # We need to disable system_ssl until "next protocol negotiation" support is + # available in our nss package. + # (See https://bugzilla.mozilla.org/show_bug.cgi?id=547312) build/gyp_chromium -f make build/all.gyp --depth=. \ -Dgcc_version=45 \ @@ -44,7 +64,7 @@ build() { -Dwerror= \ -Dlinux_sandbox_path=/usr/lib/chromium/chromium-sandbox \ -Dlinux_strip_binary=1 \ - -Drelease_extra_cflags="${CFLAGS}" \ + -Drelease_extra_cflags="$CFLAGS" \ -Dffmpeg_branding=Chrome \ -Dproprietary_codecs=1 \ -Duse_system_libjpeg=1 \ @@ -57,7 +77,8 @@ build() { -Duse_system_yasm=1 \ -Duse_system_libevent=1 \ -Duse_system_ssl=0 \ - $([ "${CARCH}" == 'i686' ] && echo '-Ddisable_sse2=1') + -Duse_gconf=0 \ + $([[ $CARCH == i686 ]] && echo '-Ddisable_sse2=1') ### Build @@ -65,47 +86,43 @@ build() { } package() { - cd ${srcdir}/chromium-${pkgver} + cd "$srcdir/chromium-$pkgver" - install -m 0755 -D out/Release/chrome ${pkgdir}/usr/lib/chromium/chromium + install -D out/Release/chrome ${pkgdir}/usr/lib/chromium/chromium - install -m 4555 -o root -g root -D out/Release/chrome_sandbox \ - ${pkgdir}/usr/lib/chromium/chromium-sandbox + install -Dm4755 -o root -g root out/Release/chrome_sandbox \ + "$pkgdir/usr/lib/chromium/chromium-sandbox" - install -m 0644 -D out/Release/chrome.pak \ - ${pkgdir}/usr/lib/chromium/chrome.pak + install -Dm644 out/Release/chrome.pak "$pkgdir/usr/lib/chromium/chrome.pak" - install -m 0644 -D out/Release/resources.pak \ - ${pkgdir}/usr/lib/chromium/resources.pak + install -Dm644 out/Release/resources.pak \ + "$pkgdir/usr/lib/chromium/resources.pak" - install -m 0755 -D out/Release/libffmpegsumo.so \ - ${pkgdir}/usr/lib/chromium/libffmpegsumo.so + install -D out/Release/libffmpegsumo.so \ + "$pkgdir/usr/lib/chromium/libffmpegsumo.so" -# these links are only needed when building with system ffmpeg -# ln -s /usr/lib/libavcodec.so.52 ${pkgdir}/usr/lib/chromium/ -# ln -s /usr/lib/libavformat.so.52 ${pkgdir}/usr/lib/chromium/ -# ln -s /usr/lib/libavutil.so.50 ${pkgdir}/usr/lib/chromium/ + # These links are only needed when building with system ffmpeg + #ln -s /usr/lib/libavcodec.so.52 ${pkgdir}/usr/lib/chromium/ + #ln -s /usr/lib/libavformat.so.52 ${pkgdir}/usr/lib/chromium/ + #ln -s /usr/lib/libavutil.so.50 ${pkgdir}/usr/lib/chromium/ - cp -a out/Release/locales out/Release/resources \ - ${pkgdir}/usr/lib/chromium/ + cp -a out/Release/locales out/Release/resources "$pkgdir/usr/lib/chromium/" - find ${pkgdir}/usr/lib/chromium/ -name '*.d' -type f -delete + find "$pkgdir/usr/lib/chromium/" -name '*.d' -type f -delete - install -m 0644 -D out/Release/chrome.1 \ - ${pkgdir}/usr/share/man/man1/chromium.1 + install -Dm644 out/Release/chrome.1 "$pkgdir/usr/share/man/man1/chromium.1" - install -m 0644 -D ${srcdir}/chromium.desktop \ - ${pkgdir}/usr/share/applications/chromium.desktop + install -Dm644 "$srcdir/chromium.desktop" \ + "$pkgdir/usr/share/applications/chromium.desktop" for size in 16 22 24 32 48 64 128 256; do - install -m 0644 -D \ - chrome/app/theme/chromium/product_logo_${size}.png \ - ${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png + install -Dm644 "chrome/app/theme/chromium/product_logo_$size.png" \ + "$pkgdir/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png" done - install -m 0755 -D ${srcdir}/chromium.sh ${pkgdir}/usr/bin/chromium + install -D "$srcdir/chromium.sh" "$pkgdir/usr/bin/chromium" - install -m 0644 -D LICENSE ${pkgdir}/usr/share/licenses/chromium/LICENSE + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/chromium/LICENSE" } -# vim:set sw=2 sts=2 et: +# vim:set ts=2 sw=2 et: diff --git a/abs/extra/community/chromium/chromium.desktop b/abs/extra/community/chromium/chromium.desktop index 4bb6981..18446d4 100644 --- a/abs/extra/community/chromium/chromium.desktop +++ b/abs/extra/community/chromium/chromium.desktop @@ -110,4 +110,4 @@ Terminal=false Icon=chromium Type=Application Categories=GTK;Network;WebBrowser; -MimeType=text/html;text/xml;application/xhtml_xml; +MimeType=text/html;text/xml;application/xhtml+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https; diff --git a/abs/extra/community/chromium/chromium.install b/abs/extra/community/chromium/chromium.install index e70c054..d43ea7c 100644 --- a/abs/extra/community/chromium/chromium.install +++ b/abs/extra/community/chromium/chromium.install @@ -1,11 +1,12 @@ post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null + xdg-icon-resource forceupdate --theme hicolor &>/dev/null + update-desktop-database -q } post_upgrade() { - post_install + post_install } post_remove() { - post_install + post_install } diff --git a/abs/extra/community/chromium/gcc-4.6.patch b/abs/extra/community/chromium/gcc-4.6.patch new file mode 100644 index 0000000..931cd64 --- /dev/null +++ b/abs/extra/community/chromium/gcc-4.6.patch @@ -0,0 +1,159 @@ +diff -u -r chrome/browser/search_engines/template_url_prepopulate_data.h chrome/browser/search_engines/template_url_prepopulate_data.h +--- chrome/browser/search_engines/template_url_prepopulate_data.h 2011-04-13 13:23:41.000000000 +0400 ++++ chrome/browser/search_engines/template_url_prepopulate_data.h 2011-04-20 19:32:58.000000000 +0400 +@@ -7,6 +7,7 @@ + #pragma once + + #include ++#include + + class GURL; + class PrefService; +diff -u -r gpu/command_buffer/common/types.h gpu/command_buffer/common/types.h +--- gpu/command_buffer/common/types.h 2011-04-13 13:22:57.000000000 +0400 ++++ gpu/command_buffer/common/types.h 2011-04-20 19:32:58.000000000 +0400 +@@ -11,6 +11,7 @@ + #include + #endif + #include ++#include + + typedef signed char schar; + typedef signed char int8; +diff -u -r ppapi/cpp/paint_aggregator.h ppapi/cpp/paint_aggregator.h +--- ppapi/cpp/paint_aggregator.h 2011-04-13 13:22:58.000000000 +0400 ++++ ppapi/cpp/paint_aggregator.h 2011-04-20 20:11:44.000000000 +0400 +@@ -9,6 +9,7 @@ + + #include "ppapi/cpp/point.h" + #include "ppapi/cpp/rect.h" ++#include + + namespace pp { + +diff -u -r third_party/libjingle/source/talk/base/sigslot.h third_party/libjingle/source/talk/base/sigslot.h +--- third_party/libjingle/source/talk/base/sigslot.h 2011-04-13 13:25:41.000000000 +0400 ++++ third_party/libjingle/source/talk/base/sigslot.h 2011-04-20 20:00:43.000000000 +0400 +@@ -80,6 +80,7 @@ + + #include + #include ++#include + + // On our copy of sigslot.h, we force single threading + #define SIGSLOT_PURE_ISO +diff -u -r third_party/ots/src/os2.cc third_party/ots/src/os2.cc +--- third_party/ots/src/os2.cc 2011-04-13 13:24:06.000000000 +0400 ++++ third_party/ots/src/os2.cc 2011-04-20 19:45:44.000000000 +0400 +@@ -5,6 +5,7 @@ + #include "os2.h" + + #include "head.h" ++#include + + // OS/2 - OS/2 and Windows Metrics + // http://www.microsoft.com/opentype/otspec/os2.htm +diff -u -r third_party/tcmalloc/chromium/src/base/stl_allocator.h third_party/tcmalloc/chromium/src/base/stl_allocator.h +--- third_party/tcmalloc/chromium/src/base/stl_allocator.h 2011-04-13 13:23:04.000000000 +0400 ++++ third_party/tcmalloc/chromium/src/base/stl_allocator.h 2011-04-20 19:32:58.000000000 +0400 +@@ -38,6 +38,7 @@ + #include + + #include ++#include + + #include "base/basictypes.h" + #include "base/logging.h" +diff -u -r third_party/tcmalloc/chromium/src/base/vdso_support.h third_party/tcmalloc/chromium/src/base/vdso_support.h +--- third_party/tcmalloc/chromium/src/base/vdso_support.h 2011-04-13 13:23:04.000000000 +0400 ++++ third_party/tcmalloc/chromium/src/base/vdso_support.h 2011-04-20 19:32:58.000000000 +0400 +@@ -37,6 +37,7 @@ + + #define HAVE_VDSO_SUPPORT 1 + ++#include + #include // for NULL + #include // for ElfW + #include "base/basictypes.h" +diff -u -r third_party/tcmalloc/chromium/src/common.cc third_party/tcmalloc/chromium/src/common.cc +--- third_party/tcmalloc/chromium/src/common.cc 2011-04-13 13:23:04.000000000 +0400 ++++ third_party/tcmalloc/chromium/src/common.cc 2011-04-20 19:32:58.000000000 +0400 +@@ -34,6 +34,7 @@ + #include "system-alloc.h" + #include "config.h" + #include "common.h" ++#include + + namespace tcmalloc { + +diff -u -r third_party/tcmalloc/chromium/src/symbolize.h third_party/tcmalloc/chromium/src/symbolize.h +--- third_party/tcmalloc/chromium/src/symbolize.h 2011-04-13 13:23:04.000000000 +0400 ++++ third_party/tcmalloc/chromium/src/symbolize.h 2011-04-20 19:32:58.000000000 +0400 +@@ -38,6 +38,7 @@ + #include // for uintptr_t + #endif + #include ++#include + + using std::map; + +diff -u -r third_party/tcmalloc/chromium/src/system-alloc.h third_party/tcmalloc/chromium/src/system-alloc.h +--- third_party/tcmalloc/chromium/src/system-alloc.h 2011-04-13 13:23:04.000000000 +0400 ++++ third_party/tcmalloc/chromium/src/system-alloc.h 2011-04-20 19:32:58.000000000 +0400 +@@ -37,6 +37,7 @@ + #define TCMALLOC_SYSTEM_ALLOC_H_ + + #include ++#include + #include "internal_logging.h" + + // REQUIRES: "alignment" is a power of two or "0" to indicate default alignment +diff -u -r ui/gfx/codec/jpeg_codec.h ui/gfx/codec/jpeg_codec.h +--- ui/gfx/codec/jpeg_codec.h 2011-04-13 13:23:45.000000000 +0400 ++++ ui/gfx/codec/jpeg_codec.h 2011-04-20 19:32:58.000000000 +0400 +@@ -7,6 +7,7 @@ + #pragma once + + #include ++#include + + class SkBitmap; + +--- ppapi/cpp/paint_aggregator.h 2010-12-23 18:10:27.000000000 -0600 ++++ ppapi/cpp/paint_aggregator.h~ 2011-04-19 05:34:56.085582885 -0500 +@@ -5,6 +5,7 @@ + #ifndef PPAPI_CPP_PAINT_AGGREGATOR_H_ + #define PPAPI_CPP_PAINT_AGGREGATOR_H_ + ++#include + #include + + #include "ppapi/cpp/point.h" +Index: Source/WebCore/ChangeLog +=================================================================== +--- third_party/WebKit/Source/WebCore/ChangeLog (revision 84120) ++++ third_party/WebKit/Source/WebCore/ChangeLog (revision 84123) +@@ -1,2 +1,24 @@ ++2011-04-17 Thierry Reding ++ ++ Reviewed by Adam Barth. ++ ++ Fix build with GCC 4.6. ++ ++ * dom/make_names.pl: Execute preprocessor without the -P option. The ++ preprocessor in GCC 4.6 eats empty lines, effectively breaking the ++ parsing performed by this script. Dropping the -P option when invoking ++ the preprocessor keeps the empty lines but as a side-effect also adds ++ additional linemarkers. ++ ++ From the cpp manpage: ++ ++ -P Inhibit generation of linemarkers in the output from the ++ preprocessor. This might be useful when running the preprocessor ++ on something that is not C code, and will be sent to a program ++ which might be confused by the linemarkers. ++ ++ The linemarkers are not problematic, however, because the script ++ properly handles them by ignoring all lines starting with a #. ++ + 2011-04-17 David Kilzer diff --git a/abs/extra/community/chromium/glibc-2.14.patch b/abs/extra/community/chromium/glibc-2.14.patch new file mode 100644 index 0000000..1bfbbee --- /dev/null +++ b/abs/extra/community/chromium/glibc-2.14.patch @@ -0,0 +1,51 @@ +--- trunk/src/third_party/tcmalloc/chromium/src/tcmalloc.cc 2011/06/21 07:36:46 89799 ++++ trunk/src/third_party/tcmalloc/chromium/src/tcmalloc.cc 2011/06/21 07:37:01 89800 +@@ -150,6 +150,13 @@ + # define WIN32_DO_PATCHING 1 + #endif + ++// GLibc 2.14+ requires the hook functions be declared volatile, based on the ++// value of the define __MALLOC_HOOK_VOLATILE. For compatibility with ++// older/non-GLibc implementations, provide an empty definition. ++#if !defined(__MALLOC_HOOK_VOLATILE) ++#define __MALLOC_HOOK_VOLATILE ++#endif ++ + using std::max; + using tcmalloc::PageHeap; + using tcmalloc::SizeMap; +@@ -403,7 +410,7 @@ + return tc_malloc(size); + } + +-void* (*__malloc_hook)( ++void* (*__MALLOC_HOOK_VOLATILE __malloc_hook)( + size_t size, const void* caller) = tc_ptmalloc_malloc_hook; + + static void* tc_ptmalloc_realloc_hook( +@@ -411,14 +418,14 @@ + return tc_realloc(ptr, size); + } + +-void* (*__realloc_hook)( ++void* (*__MALLOC_HOOK_VOLATILE __realloc_hook)( + void* ptr, size_t size, const void* caller) = tc_ptmalloc_realloc_hook; + + static void tc_ptmalloc_free_hook(void* ptr, const void* caller) { + tc_free(ptr); + } + +-void (*__free_hook)(void* ptr, const void* caller) = tc_ptmalloc_free_hook; ++void (*__MALLOC_HOOK_VOLATILE __free_hook)(void* ptr, const void* caller) = tc_ptmalloc_free_hook; + + #endif + +@@ -1757,7 +1764,7 @@ + MallocHook::InvokeNewHook(result, size); + return result; + } +-void *(*__memalign_hook)(size_t, size_t, const void *) = MemalignOverride; ++void *(*__MALLOC_HOOK_VOLATILE __memalign_hook)(size_t, size_t, const void *) = MemalignOverride; + #endif // #ifndef TCMALLOC_FOR_DEBUGALLOCATION + + // ---Double free() debugging implementation ----------------------------------- -- cgit v0.12 From 2a8a9c6309a64223d7ee9d6394caaa52efbcfff0 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 14 Jul 2011 12:44:27 -0500 Subject: libdrm: Bumped to latest. refs #772 --- abs/core/libdrm/PKGBUILD | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/abs/core/libdrm/PKGBUILD b/abs/core/libdrm/PKGBUILD index c3b2c6d..b93c2dd 100644 --- a/abs/core/libdrm/PKGBUILD +++ b/abs/core/libdrm/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 86650 2010-08-02 19:36:00Z jgc $ +# $Id$ # Maintainer: Jan de Groot pkgname=libdrm -pkgver=2.4.23 +pkgver=2.4.25 pkgrel=1 pkgdesc="Userspace interface to kernel DRM services" -arch=('i686' 'x86_64') +arch=(i686 x86_64) license=('custom') depends=('glibc') options=('!libtool') @@ -13,26 +13,28 @@ url="http://dri.freedesktop.org/" source=(http://dri.freedesktop.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2 no-pthread-stubs.patch COPYING) - +sha1sums=('b950f29cd1c4bb9f1c98a926486a47256b0a4194' + 'af2d9871565ea4cf524873f897691a18b2bba944' + 'ba3dcd636997ee0d30df14b03dae05c24ae5d094') + build() { cd "${srcdir}/${pkgname}-${pkgver}" patch -Np1 -i "${srcdir}/no-pthread-stubs.patch" - libtoolize --force - aclocal - autoconf - automake + +# libtoolize --force + autoreconf --force --install ./configure --prefix=/usr \ - --enable-intel --enable-radeon \ - --enable-vmwgfx-experimental-api --enable-nouveau-experimental-api \ - --enable-udev + --enable-udev \ + --enable-intel \ + --enable-radeon \ + --enable-vmwgfx-experimental-api \ + --enable-nouveau-experimental-api make } + package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 "${srcdir}/COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/" } -md5sums=('7577ff36ec364d88fae466d4f7fc5fc6' - '9b5ec3bbebe86921e2057694c42f65b8' - 'ba65e71c481b94ef0fb6c23c7f21ffa1') -- cgit v0.12 From 8b9f0fb4833fd985084cb855f19dca46fa3a8ebd Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 14 Jul 2011 12:48:32 -0500 Subject: libxxf86vm: Bumped to latest. refs #772 --- abs/core/libxxf86vm/PKGBUILD | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/abs/core/libxxf86vm/PKGBUILD b/abs/core/libxxf86vm/PKGBUILD index 7d0f7d7..d652897 100644 --- a/abs/core/libxxf86vm/PKGBUILD +++ b/abs/core/libxxf86vm/PKGBUILD @@ -1,24 +1,25 @@ -# $Id: PKGBUILD 54608 2009-10-11 11:43:26Z andyrtr $ +# $Id$ #Maintainer: Jan de Groot pkgname=libxxf86vm -pkgver=1.1.0 +pkgver=1.1.1 pkgrel=1 pkgdesc="X11 XFree86 video mode extension library" arch=('x86_64' 'i686') license=('custom') url="http://xorg.freedesktop.org/" -depends=('libxext>=1.1' 'xf86vidmodeproto>=2.3') -makedepends=('pkgconfig') +depends=('libxext' 'xf86vidmodeproto') +makedepends=('xorg-util-macros') options=('!libtool') source=(${url}/releases/individual/lib/libXxf86vm-${pkgver}.tar.bz2) -md5sums=('b431ad7084e1055fef99a9115237edd8') +sha1sums=('2ff2d2b3c60a5c5c0cc4e0a18492d3b7168a03af') build() { cd "${srcdir}/libXxf86vm-${pkgver}" - ./configure --prefix=/usr --disable-static || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + ./configure --prefix=/usr --disable-static + make + make DESTDIR="${pkgdir}" install + install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1 + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } -- cgit v0.12 From 138cbe14b0dcaf5f664ea6d3133e6a16b5364709 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 14 Jul 2011 14:02:48 -0500 Subject: libx11: Bumped to latest. Refs #772 --- abs/core/libx11/PKGBUILD | 33 +++++++++++++++++---------------- abs/core/libx11/xorg.csh | 15 +++++++++++++++ abs/core/libx11/xorg.sh | 4 ++-- 3 files changed, 34 insertions(+), 18 deletions(-) create mode 100644 abs/core/libx11/xorg.csh diff --git a/abs/core/libx11/PKGBUILD b/abs/core/libx11/PKGBUILD index 8d1c59d..af9afab 100644 --- a/abs/core/libx11/PKGBUILD +++ b/abs/core/libx11/PKGBUILD @@ -1,36 +1,37 @@ -# $Id: PKGBUILD 88397 2010-08-23 08:25:08Z jgc $ +# $Id$ # Maintainer: Jan de Groot pkgname=libx11 -pkgver=1.3.99.903 -pkgrel=1 +pkgver=1.4.3 +pkgrel=2 pkgdesc="X11 client-side library" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" -depends=('libxcb>=1.7' 'kbproto>=1.0.5') -makedepends=('xproto>=7.0.18' 'xextproto>=7.1.2' 'xf86bigfontproto>=1.2.0' 'xtrans>=1.2.5' 'inputproto>=2.0' 'xorg-util-macros>=1.10.0') +depends=('libxcb' 'xproto' 'kbproto') +makedepends=('xorg-util-macros' 'xextproto' 'xtrans' 'inputproto') options=('!libtool') -license=('custom:XFREE86') +license=('custom') source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.bz2 - xorg.sh) + xorg.sh + xorg.csh) +sha1sums=('174270a0e51614b5077026fc6c20701d4e09aef8' + '4b756387426afb2a5bb7a155631ec42348abf5c1' + '45b0b310776cf5d9a94b4a18a5c63ddad9de6ba8') build() { cd "${srcdir}/libX11-${pkgver}" - ./configure --prefix=/usr \ - --with-xcb --disable-static - make || return 1 - make check || return 1 + ./configure --prefix=/usr --disable-static --disable-xf86bigfont + make + make check } + package() { cd "${srcdir}/libX11-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 + make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/etc/profile.d" - install -m755 "${srcdir}/xorg.sh" "${pkgdir}/etc/profile.d/" + install -m755 "${srcdir}/"xorg.{sh,csh} "${pkgdir}/etc/profile.d/" install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } - -md5sums=('3e8ed7a91f70bb819b5dab9c124a7062' - '942ff006e69e041f0307c1316e0dec5d') diff --git a/abs/core/libx11/xorg.csh b/abs/core/libx11/xorg.csh new file mode 100644 index 0000000..26c49a2 --- /dev/null +++ b/abs/core/libx11/xorg.csh @@ -0,0 +1,15 @@ +setenv XDG_DATA_HOME ${HOME}/.local/share +setenv XDG_CONFIG_HOME ${HOME}/.config +setenv XDG_CACHE_HOME ${HOME}/.cache + +if (! ($?XDG_DATA_DIRS) ) then + setenv XDG_DATA_DIRS /usr/share/:/usr/local/share/ +else + setenv XDG_DATA_DIRS /usr/share/:/usr/local/share/:${XDG_DATA_DIRS} +endif + +if (! ($?XDG_CONFIG_DIRS) ) then + setenv XDG_CONFIG_DIRS /etc/xdg +else + setenv XDG_CONFIG_DIRS /etc/xdg:${XDG_CONFIG_DIRS} +endif diff --git a/abs/core/libx11/xorg.sh b/abs/core/libx11/xorg.sh index 9b37312..e1de686 100644 --- a/abs/core/libx11/xorg.sh +++ b/abs/core/libx11/xorg.sh @@ -3,9 +3,9 @@ export XDG_CONFIG_HOME=$HOME/.config export XDG_CACHE_HOME=$HOME/.cache if [ -z $XDG_DATA_DIRS ]; then - export XDG_DATA_DIRS=/usr/share:/usr/local/share + export XDG_DATA_DIRS=/usr/share/:/usr/local/share/ else - export XDG_DATA_DIRS=/usr/share:/usr/local/share:$XDG_DATA_DIRS + export XDG_DATA_DIRS=/usr/share/:/usr/local/share/:$XDG_DATA_DIRS fi if [ -z $XDG_CONFIG_DIRS ]; then -- cgit v0.12 From f1e8cbd3510cef06cad3ea55eaedf40aca12f1ae Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 14 Jul 2011 14:06:30 -0500 Subject: libxt: Bumped to latest. Refs #772 --- abs/core/libxt/PKGBUILD | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/abs/core/libxt/PKGBUILD b/abs/core/libxt/PKGBUILD index 97c945f..a8126f0 100644 --- a/abs/core/libxt/PKGBUILD +++ b/abs/core/libxt/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 97817 2010-11-01 22:29:44Z jgc $ +# $Id$ #Maintainer: Jan de Groot pkgname=libxt -pkgver=1.0.9 +pkgver=1.1.1 pkgrel=1 pkgdesc="X11 toolkit intrinsics library" arch=(i686 x86_64) @@ -12,18 +12,14 @@ depends=('libsm' 'libx11') makedepends=('xorg-util-macros') options=('!libtool') source=(${url}/releases/individual/lib/libXt-${pkgver}.tar.bz2) -sha1sums=('3222c028b37e70a1d0d88feba5e52c2408e6bd5c') +sha1sums=('a29a97f8521bdc7a95364e163f0ce474de572ae5') build() { cd "${srcdir}/libXt-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc --disable-static - make || return 1 -} -package() { - cd "${srcdir}/libXt-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 + make + make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } - -- cgit v0.12