diff options
20 files changed, 166 insertions, 188 deletions
diff --git a/abs/core/linhes-scripts/PKGBUILD b/abs/core/linhes-scripts/PKGBUILD index eda3653..a50faf8 100644 --- a/abs/core/linhes-scripts/PKGBUILD +++ b/abs/core/linhes-scripts/PKGBUILD @@ -3,7 +3,7 @@ pkgname=linhes-scripts pkgver=7 -pkgrel=25 +pkgrel=27 pkgdesc="Various scripts that help to make LinHES, LinHES." arch=('i686' 'x86_64') license=('GPL2') @@ -84,8 +84,8 @@ md5sums=('f56985b2d602e11dc1e10d3e7848b2a5' '25dd5b8ec0482d561b481bfce051d648' 'b2c3dd48a4abb976eda2d5fbf22a173a' 'b527b01d119d3bc33b8fa69bdf1082bb' - 'f691c2bdf5da5455c9a5c2ab0ee1f820' - 'a2786dd6fb70332c9f2f6d1737e7ac44' + '9d077c24d102fa02e4f417d639d8b00a' + '98979920c30bb48c02d00f6943e9e50e' '460861e6d0cf999629b734912eea0acf' 'ccca6bdbbd86b203a3eecdbbe363e701' '65629302a4d2c3adf88cdf0ebc10d493' diff --git a/abs/core/linhes-scripts/linhes_update.sh b/abs/core/linhes-scripts/linhes_update.sh index a307146..e5dd2ad 100644 --- a/abs/core/linhes-scripts/linhes_update.sh +++ b/abs/core/linhes-scripts/linhes_update.sh @@ -47,7 +47,7 @@ chck () { mv /tmp/linhes.xml.tmp /usr/share/mythtv/themes/defaultmenu/linhes.xml echo "<mythmenu name=\"LinHES\">" > /tmp/update3.xml.tmp - if grep kernel26 /tmp/to_be_upgraded + if grep kernel26 /tmp/to_be_upgraded || grep nvidia /tmp/to_be_upgraded then echo "" >> /tmp/update3.xml.tmp echo " <button>" >> /tmp/update3.xml.tmp diff --git a/abs/core/linhes-scripts/linhes_update2.sh b/abs/core/linhes-scripts/linhes_update2.sh index a48a996..d6984ed 100644 --- a/abs/core/linhes-scripts/linhes_update2.sh +++ b/abs/core/linhes-scripts/linhes_update2.sh @@ -20,6 +20,11 @@ then killall -9 osd_cat echo -e "\nUpdates complete." | osd_cat --pos=middle --align=center --delay=3 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font & echo -e "\nUpdates complete." | osd_cat --pos=middle --align=center --delay=3 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font & + if grep kernel26 /tmp/to_be_upgraded || grep nvidia /tmp/to_be_upgraded + then + echo -e "\n\nUpdates require a reboot." | osd_cat --pos=middle --align=center --delay=3 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font & + echo -e "\n\nUpdates require a reboot." | osd_cat --pos=middle --align=center --delay=3 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font & + fi else killall -9 osd_cat echo -e "\nUpdates canceled." | osd_cat --pos=middle --align=center --delay=3 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font & diff --git a/abs/core/mythtv/stable-0.24/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.24/mythplugins/PKGBUILD index e1e23a2..760948f 100644 --- a/abs/core/mythtv/stable-0.24/mythplugins/PKGBUILD +++ b/abs/core/mythtv/stable-0.24/mythplugins/PKGBUILD @@ -13,7 +13,7 @@ pkgname=('mytharchive' 'mythweather' 'mythzoneminder') pkgver=0.24 -pkgrel=19 +pkgrel=20 arch=('i686' 'x86_64') url="http://www.mythtv.org" license=('GPL') diff --git a/abs/core/mythtv/stable-0.24/mythsmolt/PKGBUILD b/abs/core/mythtv/stable-0.24/mythsmolt/PKGBUILD index 6563bf9..c145741 100644 --- a/abs/core/mythtv/stable-0.24/mythsmolt/PKGBUILD +++ b/abs/core/mythtv/stable-0.24/mythsmolt/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythsmolt pkgver=0.24 -pkgrel=8 +pkgrel=9 pkgdesc="mythsmolt, a hardware profileing tool" arch=('i686' 'x86_64') url="http://www.mythvantage.com" diff --git a/abs/core/mythtv/stable-0.24/myththemes/PKGBUILD b/abs/core/mythtv/stable-0.24/myththemes/PKGBUILD index 002d867..96fa147 100644 --- a/abs/core/mythtv/stable-0.24/myththemes/PKGBUILD +++ b/abs/core/mythtv/stable-0.24/myththemes/PKGBUILD @@ -5,7 +5,7 @@ pkgname=myththemes pkgver=0.24 -pkgrel=8 +pkgrel=9 pkgdesc="Themes for MythTV" arch=('any') url="http://www.mythtv.org/" diff --git a/abs/core/mythtv/stable-0.24/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.24/mythtv/PKGBUILD index 933936c..e9d9a12 100755 --- a/abs/core/mythtv/stable-0.24/mythtv/PKGBUILD +++ b/abs/core/mythtv/stable-0.24/mythtv/PKGBUILD @@ -6,7 +6,7 @@ pkgname=mythtv pkgver=0.24 -pkgrel=28 +pkgrel=30 pkgdesc="A Homebrew PVR project" arch=('i686' 'x86_64') url="http://www.mythtv.org/" diff --git a/abs/core/mythtv/stable-0.24/mythtv/mythtv.install b/abs/core/mythtv/stable-0.24/mythtv/mythtv.install index 0524f86..3f2e304 100755 --- a/abs/core/mythtv/stable-0.24/mythtv/mythtv.install +++ b/abs/core/mythtv/stable-0.24/mythtv/mythtv.install @@ -33,6 +33,22 @@ post_upgrade() { else mv /usr/share/mythtv/themes/defaultmenu/is.xml.pre /usr/share/mythtv/themes/defaultmenu/is.xml fi + pacxmbc=`pacman -Q xbmc` + if [ -z "$pacxbmc" ] + then + mv /usr/share/mythtv/themes/defaultmenu/library.xml /tmp + grep -v -e /mythmenu /tmp/library.xml > /tmp/library.xml.tmp + echo "<!--#XBMC-->" >> /tmp/library.xml.tmp + echo " <button>" >> /tmp/library.xml.tmp + echo " <type>MENU_XBMC</type>" >> /tmp/library.xml.tmp + echo " <text>Launch XBMC</text>" >> /tmp/library.xml.tmp + echo " <action>EXEC /usr/bin/xbmc</action>" >> /tmp/library.xml.tmp + echo " </button>" >> /tmp/library.xml.tmp + echo "<!--#XBMC-->" >> /tmp/library.xml.tmp + echo "" >> /tmp/library.xml.tmp + echo "</mythmenu>" >> /tmp/library.xml.tmp + mv /tmp/library.xml.tmp /usr/share/mythtv/themes/defaultmenu/library.xml + fi } diff --git a/abs/core/mythtv/stable-0.24/mythweb/PKGBUILD b/abs/core/mythtv/stable-0.24/mythweb/PKGBUILD index f0fb2f8..cab8fbd 100644 --- a/abs/core/mythtv/stable-0.24/mythweb/PKGBUILD +++ b/abs/core/mythtv/stable-0.24/mythweb/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythweb pkgver=0.24 -pkgrel=15 +pkgrel=16 pkgdesc="Web interface for MythTV's backend" url="http://www.mythtv.org" license="GPL" diff --git a/abs/core/nvidia-utils/PKGBUILD b/abs/core/nvidia-utils/PKGBUILD index edbc47c..dbd6c6b 100644 --- a/abs/core/nvidia-utils/PKGBUILD +++ b/abs/core/nvidia-utils/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 143066 2011-11-22 10:02:44Z ibiru $ +# $Id$ # Maintainer: Thomas Baechler <thomas@archlinux.org> # Contributor: James Rayner <iphitus@gmail.com> pkgbase=nvidia-utils pkgname=('nvidia-utils' 'opencl-nvidia') -pkgver=280.13 +pkgver=295.20 pkgrel=1 arch=('i686' 'x86_64') url="http://www.nvidia.com/" @@ -14,12 +14,12 @@ if [ "$CARCH" = "i686" ]; then _arch='x86' _pkg="NVIDIA-Linux-${_arch}-${pkgver}" source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") -# md5sums=('50319a4b3818c12c9c7243525e0e6316') + md5sums=('a6f702271da49930a17e28b5928fe75a') elif [ "$CARCH" = "x86_64" ]; then _arch='x86_64' _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32" source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") - md5sums=('cebfba9a7e91716a06c66bb5b38d9661') + md5sums=('79b05cffa482234833ae1c4bb40664c3') fi create_links() { @@ -104,4 +104,4 @@ package_nvidia-utils() { create_links } -md5sums=('c3992c8cef02b7773a398640d8830e77') +md5sums=('a6f702271da49930a17e28b5928fe75a') diff --git a/abs/core/nvidia/PKGBUILD b/abs/core/nvidia/PKGBUILD index 42573aa..108f5c2 100644 --- a/abs/core/nvidia/PKGBUILD +++ b/abs/core/nvidia/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143065 2011-11-22 10:00:31Z ibiru $ +# $Id$ # Maintainer : Thomas Baechler <thomas@archlinux.org> pkgname=nvidia -pkgver=280.13 +pkgver=295.20 #_extramodules=extramodules-2.6.39-LinHES _kernver='2.6.39-LinHES' pkgrel=1 @@ -20,12 +20,12 @@ if [ "$CARCH" = "i686" ]; then _arch='x86' _pkg="NVIDIA-Linux-${_arch}-${pkgver}" source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") - md5sums=('50319a4b3818c12c9c7243525e0e6316') + md5sums=('a6f702271da49930a17e28b5928fe75a') elif [ "$CARCH" = "x86_64" ]; then _arch='x86_64' _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32" source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") - md5sums=('cebfba9a7e91716a06c66bb5b38d9661') + md5sums=('79b05cffa482234833ae1c4bb40664c3') fi build() { @@ -39,9 +39,10 @@ package() { install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \ "${pkgdir}/lib/modules/${_kernver}/kernel/drivers/video/nvidia.ko" install -d -m755 "${pkgdir}/etc/modprobe.d" - echo "blacklist nouveau" >> "${pkgdir}/etc/modprobe.d/nouveau_blacklist.conf" + echo "blacklist nouveau" >> "${pkgdir}/etc/modprobe.d/nvidia.conf" + echo "blacklist nvidiafb" >> "${pkgdir}/etc/modprobe.d/nvidia.conf" sed -i -e "s/EXTRAMODULES='.*'/KERNEL_VERSION='${_kernver}'/" "${startdir}/nvidia.install" gzip "${pkgdir}/lib/modules/${_kernver}/kernel/drivers/video/nvidia.ko" } -md5sums=('c3992c8cef02b7773a398640d8830e77') +md5sums=('a6f702271da49930a17e28b5928fe75a') diff --git a/abs/extra/community/chromium/PKGBUILD b/abs/extra/community/chromium/PKGBUILD index e5518e9..df239af 100644 --- a/abs/extra/community/chromium/PKGBUILD +++ b/abs/extra/community/chromium/PKGBUILD @@ -1,54 +1,66 @@ -# $Id$ -# Maintainer: Evangelos Foutras <foutrelis@gmail.com> +# $Id: PKGBUILD 150259 2012-02-16 02:37:46Z foutrelis $ +# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> +# Building for x86_64 requires lib32-glibc & lib32-zlib from [multilib]. These +# libraries are linked from the NaCl toolchain, and are only needed during +# build time. + pkgname=chromium -pkgver=13.0.782.112 -pkgrel=1 +pkgver=17.0.963.56 +pkgrel=2 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/" license=('BSD') depends=('gtk2' 'dbus-glib' 'nss' 'alsa-lib' 'xdg-utils' 'bzip2' 'libevent' - 'libxss' 'libxtst' 'ttf-dejavu' 'desktop-file-utils' + 'libxss' 'libgcrypt' 'ttf-dejavu' 'desktop-file-utils' 'hicolor-icon-theme') -makedepends=('python2' 'perl' 'gperf' 'yasm' 'mesa' 'libgnome-keyring') -optdepends=('mozplugger-chromium: A Mozilla multimedia plugin for Chromium') +makedepends=('python2' 'perl' 'gperf' 'yasm' 'mesa' 'libgnome-keyring' + 'elfutils') +optdepends=('kdebase-kdialog: needed for file dialogs in KDE' + 'mozplugger-chromium: A Mozilla multimedia plugin for Chromium') +# Needed for the NaCl toolchain +[[ $CARCH == x86_64 ]] && makedepends+=('lib32-zlib') provides=('chromium-browser') conflicts=('chromium-browser') replaces=('firefox' 'firefox-i18n' 'mozplugger') install=chromium.install -source=(http://build.chromium.org/official/chromium-$pkgver.tar.bz2 +source=(http://commondatastorage.googleapis.com/chromium-browser-official/$pkgname-$pkgver.tar.bz2 + http://commondatastorage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/nacl_sdk.zip chromium.desktop chromium.sh gcc-4.6.patch - glibc-2.14.patch - make-hash-tools-use-if-instead-of-switch.patch) + nacl-cflags-remove-fstack-protector.patch + chromium-media-no-sse-r0.patch) +sha256sums=('270be138d499c6c2092644af69acab8310cb05c3d06c3afe7891e488c29b020f' + '964fe3a5ec56f2505649aba00f900abe4205674b7fdaa16772647d347173bb01' + '09bfac44104f4ccda4c228053f689c947b3e97da9a4ab6fa34ce061ee83d0322' + 'c53bfc4db9dde684fbaed6a4bbecb207e3e7a0a2703233426fe076a6d3c557f3' + '9c5e0803904d1a0e71ab7444c92a7046a34a9518eeba7a70f2eec7abecb8bf4e' + '59e732880314333d6e9acf6ac99de467c98e8a92aa5c5292ae808a805e0f8d76' + '71751bf5913da1eec3c88c433044224c869b0abd5a29172cf239bddbb4eff761') build() { cd "$srcdir/chromium-$pkgver" - # Patches to fix gcc 4.6 compilation from + # Fix build with gcc 4.6 # 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" -# Fix build with Perl 5.14 - patch -d third_party/WebKit -Np2 -i \ - "$srcdir/make-hash-tools-use-if-instead-of-switch.patch" + # Filter -fstack-protector out of cflags for nacl_helper_bootstrap + # http://code.google.com/p/chromium/issues/detail?id=104569 + patch -d native_client -Np1 -i \ + "$srcdir/nacl-cflags-remove-fstack-protector.patch" -### Configure + # Remove unconditional use of SSE3 (patch from Gentoo) + patch -Np0 -i "$srcdir/chromium-media-no-sse-r0.patch" # Use Python 2 find . -type f -exec sed -i -r \ - -e 's|/usr/bin/python$|\02|g' \ + -e 's|/usr/bin/python$|&2|g' \ -e 's|(/usr/bin/python2)\.4$|\1|g' \ {} + # There are still a lot of relative calls which need a workaround @@ -56,12 +68,21 @@ build() { ln -s /usr/bin/python2 "$srcdir/python2-path/python" export PATH="$srcdir/python2-path:$PATH" + pushd "$srcdir/nacl_sdk" + ./naclsdk update pepper_16 + popd + + ln -s "$srcdir/nacl_sdk/pepper_16/toolchain/linux_x86_newlib" \ + native_client/toolchain/linux_x86_newlib + # 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) + # CFLAGS are passed through release_extra_cflags below + export -n CFLAGS CXXFLAGS + build/gyp_chromium -f make build/all.gyp --depth=. \ - -Dgcc_version=45 \ -Dno_strict_aliasing=1 \ -Dwerror= \ -Dlinux_sandbox_path=/usr/lib/chromium/chromium-sandbox \ @@ -69,21 +90,18 @@ build() { -Drelease_extra_cflags="$CFLAGS" \ -Dffmpeg_branding=Chrome \ -Dproprietary_codecs=1 \ - -Duse_system_libjpeg=1 \ - -Duse_system_libxslt=0 \ - -Duse_system_libxml=0 \ -Duse_system_bzip2=1 \ - -Duse_system_zlib=1 \ - -Duse_system_libpng=1 \ -Duse_system_ffmpeg=0 \ - -Duse_system_yasm=1 \ -Duse_system_libevent=1 \ + -Duse_system_libjpeg=0 \ + -Duse_system_libpng=1 \ + -Duse_system_libxml=0 \ -Duse_system_ssl=0 \ + -Duse_system_yasm=1 \ + -Duse_system_zlib=1 \ -Duse_gconf=0 \ $([[ $CARCH == i686 ]] && echo '-Ddisable_sse2=1') -### Build - make chrome chrome_sandbox BUILDTYPE=Release } @@ -95,13 +113,10 @@ package() { install -Dm4755 -o root -g root out/Release/chrome_sandbox \ "$pkgdir/usr/lib/chromium/chromium-sandbox" - install -Dm644 out/Release/chrome.pak "$pkgdir/usr/lib/chromium/chrome.pak" - - install -Dm644 out/Release/resources.pak \ - "$pkgdir/usr/lib/chromium/resources.pak" - - install -D out/Release/libffmpegsumo.so \ - "$pkgdir/usr/lib/chromium/libffmpegsumo.so" + cp out/Release/{{chrome,resources}.pak,libffmpegsumo.so} \ + out/Release/nacl_helper{,_bootstrap} \ + out/Release/{libppGoogleNaClPluginChrome.so,nacl_irt_x86_*.nexe} \ + "$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/ @@ -128,9 +143,3 @@ package() { } # vim:set ts=2 sw=2 et: -md5sums=('a0ddccb65b0075419d089087a9de785c' - '075c3c2fa5902e16b8547dd31d437191' - '096a46ef386817988250d2d7bddd1b34' - '690f2be42bf2a31755753a466653eb33' - '543a32b09f138fd47858b9a4a7c82dfb' - '9d9e66c8365d7333e55305796b49fd77') diff --git a/abs/extra/community/chromium/chromium-media-no-sse-r0.patch b/abs/extra/community/chromium/chromium-media-no-sse-r0.patch new file mode 100644 index 0000000..07cda2d --- /dev/null +++ b/abs/extra/community/chromium/chromium-media-no-sse-r0.patch @@ -0,0 +1,17 @@ +--- media/media.gyp.orig 2012-02-02 10:03:41.000000000 +0100 ++++ media/media.gyp 2012-02-02 10:04:09.000000000 +0100 +@@ -467,14 +467,6 @@ + [ 'os_posix == 1 and OS != "mac" and OS != "android"', { + 'cflags': [ + '-msse2', +- '-msse3', +- '-mssse3', +- ], +- }], +- [ 'OS == "openbsd"', { +- # OpenBSD's gcc (4.2.1) does not support -mssse3 +- 'cflags!': [ +- '-mssse3', + ], + }], + [ 'OS == "mac"', { diff --git a/abs/extra/community/chromium/chromium.sh b/abs/extra/community/chromium/chromium.sh index e1c3388..e1c3388 100644..100755 --- a/abs/extra/community/chromium/chromium.sh +++ b/abs/extra/community/chromium/chromium.sh diff --git a/abs/extra/community/chromium/gcc-4.6.patch b/abs/extra/community/chromium/gcc-4.6.patch index 220fe7a..b5e61dc 100644 --- a/abs/extra/community/chromium/gcc-4.6.patch +++ b/abs/extra/community/chromium/gcc-4.6.patch @@ -68,9 +68,9 @@ diff -u -r third_party/tcmalloc/chromium/src/common.cc third_party/tcmalloc/chro --- 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 "system-alloc.h" +#include <cstddef> namespace tcmalloc { @@ -86,17 +86,6 @@ diff -u -r third_party/tcmalloc/chromium/src/symbolize.h third_party/tcmalloc/ch 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 <config.h> -+#include <cstddef> - #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 diff --git a/abs/extra/community/chromium/glibc-2.14.patch b/abs/extra/community/chromium/glibc-2.14.patch deleted file mode 100644 index 1bfbbee..0000000 --- a/abs/extra/community/chromium/glibc-2.14.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- 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 ----------------------------------- diff --git a/abs/extra/community/chromium/make-hash-tools-use-if-instead-of-switch.patch b/abs/extra/community/chromium/make-hash-tools-use-if-instead-of-switch.patch deleted file mode 100644 index 1b917ba..0000000 --- a/abs/extra/community/chromium/make-hash-tools-use-if-instead-of-switch.patch +++ /dev/null @@ -1,37 +0,0 @@ -Index: /trunk/Source/WebCore/make-hash-tools.pl -=================================================================== ---- /trunk/Source/WebCore/make-hash-tools.pl (revision 72664) -+++ /trunk/Source/WebCore/make-hash-tools.pl (revision 89265) -@@ -21,5 +21,4 @@ - - use strict; --use Switch; - use File::Basename; - -@@ -29,7 +28,5 @@ - - --switch ($option) { -- --case "DocTypeStrings" { -+if ($option eq "DocTypeStrings") { - - my $docTypeStringsGenerated = "$outdir/DocTypeStrings.cpp"; -@@ -39,7 +36,5 @@ - system("gperf --key-positions=\"*\" -s 2 $docTypeStringsGperf > $docTypeStringsGenerated") == 0 || die "calling gperf failed: $?"; - --} # case "DocTypeStrings" -- --case "ColorData" { -+} elsif ($option eq "ColorData") { - - my $colorDataGenerated = "$outdir/ColorData.cpp"; -@@ -49,5 +44,5 @@ - system("gperf --key-positions=\"*\" -D -s 2 $colorDataGperf > $colorDataGenerated") == 0 || die "calling gperf failed: $?"; - --} # case "ColorData" -- --} # switch ($option) -+} else { -+ die "Unknown option."; -+} diff --git a/abs/extra/community/chromium/nacl-cflags-remove-fstack-protector.patch b/abs/extra/community/chromium/nacl-cflags-remove-fstack-protector.patch new file mode 100644 index 0000000..0e4f7cf --- /dev/null +++ b/abs/extra/community/chromium/nacl-cflags-remove-fstack-protector.patch @@ -0,0 +1,17 @@ +Index: src/trusted/service_runtime/linux/nacl_bootstrap.gyp +diff --git a/src/trusted/service_runtime/linux/nacl_bootstrap.gyp b/src/trusted/service_runtime/linux/nacl_bootstrap.gyp +index 66d95ca4dc98653219c965b899dbd5ad35d2960c..083e3fdd24ff4562d2037f8d17a06540e05357b8 100644 +--- a/src/trusted/service_runtime/linux/nacl_bootstrap.gyp ++++ b/src/trusted/service_runtime/linux/nacl_bootstrap.gyp +@@ -84,6 +84,11 @@ + '-fasan', + '-faddress-sanitizer', + '-w', ++ # We filter these out because release_extra_cflags or another ++ # such thing might be adding them in, and those options wind up ++ # coming after the -fno-stack-protector we added above. ++ '-fstack-protector', ++ '-fstack-protector-all', + ], + 'conditions': [ + ['clang==1', { diff --git a/abs/extra/community/flashplugin/PKGBUILD b/abs/extra/community/flashplugin/PKGBUILD index 274c5e0..53ded26 100644 --- a/abs/extra/community/flashplugin/PKGBUILD +++ b/abs/extra/community/flashplugin/PKGBUILD @@ -1,9 +1,10 @@ -# $Id$ +# $Id: PKGBUILD 150281 2012-02-16 09:18:00Z ibiru $ +# Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> pkgname=flashplugin _licensefile='PlatformClients_PC_WWEULA_Combined_20100108_1657.pdf' -pkgver=11.0.1.152 +pkgver=11.1.102.62 pkgrel=1 pkgdesc='Adobe Flash Player' url='http://get.adobe.com/flashplayer' @@ -17,35 +18,39 @@ install=flashplugin.install backup=(etc/adobe/mms.cfg) if [ "$CARCH" = "i686" ]; then - source=('http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_11_linux.i386.tar.gz' + source=("http://fpdownload.macromedia.com/get/flashplayer/pdc/$pkgver/install_flash_player_11_linux.i386.tar.gz" "http://www.adobe.com/products/eulas/pdfs/${_licensefile}" mms.cfg) - md5sums=('34051edfcb78e6db14567a6c5f53e161' + md5sums=('c73d490e552e92016d53247a869ce64b' '94ca2aecb409abfe36494d1a7ec7591d' 'f34aae6279b40e0bd2abfb0d9963d7b8') elif [ "$CARCH" = "x86_64" ]; then - source=('http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_11_linux.x86_64.tar.gz' + source=("http://fpdownload.macromedia.com/get/flashplayer/pdc/$pkgver/install_flash_player_11_linux.x86_64.tar.gz" "http://www.adobe.com/products/eulas/pdfs/${_licensefile}" mms.cfg) - md5sums=('782952c5730caa4e4cbe7e1d9dfa6214' + md5sums=('76be6fe21f68684c19ccee138a42fff9' '94ca2aecb409abfe36494d1a7ec7591d' 'f34aae6279b40e0bd2abfb0d9963d7b8') fi package () { - cd ${srcdir} - install -Dm755 libflashplayer.so "${pkgdir}/usr/lib/mozilla/plugins/libflashplayer.so" - install -Dm755 usr/lib/kde4/kcm_adobe_flash_player.so "${pkgdir}/usr/lib/kde4/kcm_adobe_flash_player.so" - install -Dm755 usr/bin/flash-player-properties "${pkgdir}/usr/bin/flash-player-properties" + cd "$srcdir" + install -Dm755 libflashplayer.so "$pkgdir/usr/lib/mozilla/plugins/libflashplayer.so" + if [ "$CARCH" = x86_64 ]; then + install -Dm755 usr/lib64/kde4/kcm_adobe_flash_player.so "$pkgdir/usr/lib/kde4/kcm_adobe_flash_player.so" + else + install -Dm755 usr/lib/kde4/kcm_adobe_flash_player.so "$pkgdir/usr/lib/kde4/kcm_adobe_flash_player.so" + fi + install -Dm755 usr/bin/flash-player-properties "$pkgdir/usr/bin/flash-player-properties" for i in 16x16 22x22 24x24 32x32 48x48; do - install -Dm644 usr/share/icons/hicolor/${i}/apps/flash-player-properties.png \ - "${pkgdir}/usr/share/icons/hicolor/${i}/apps/flash-player-properties.png" + install -Dm644 usr/share/icons/hicolor/$i/apps/flash-player-properties.png \ + "$pkgdir/usr/share/icons/hicolor/$i/apps/flash-player-properties.png" done - install -Dm644 usr/share/applications/flash-player-properties.desktop "${pkgdir}/usr/share/applications/flash-player-properties.desktop" - install -Dm644 usr/share/kde4/services/kcm_adobe_flash_player.desktop "${pkgdir}/usr/share/kde4/services/kcm_adobe_flash_player.desktop" - install -Dm644 "${_licensefile}" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.pdf" - install -Dm644 ${srcdir}/mms.cfg "${pkgdir}/etc/adobe/mms.cfg" + install -Dm644 usr/share/applications/flash-player-properties.desktop "$pkgdir/usr/share/applications/flash-player-properties.desktop" + install -Dm644 usr/share/kde4/services/kcm_adobe_flash_player.desktop "$pkgdir/usr/share/kde4/services/kcm_adobe_flash_player.desktop" + install -Dm644 "${_licensefile}" "$pkgdir/usr/share/licenses/$pkgname/LICENSE.pdf" + install -Dm644 "$srcdir/mms.cfg" "$pkgdir/etc/adobe/mms.cfg" } -md5sums=('34051edfcb78e6db14567a6c5f53e161' +md5sums=('c73d490e552e92016d53247a869ce64b' '94ca2aecb409abfe36494d1a7ec7591d' 'f34aae6279b40e0bd2abfb0d9963d7b8') diff --git a/abs/extra/community/mozplugger-chromium/PKGBUILD b/abs/extra/community/mozplugger-chromium/PKGBUILD index e058615..360fcad 100644 --- a/abs/extra/community/mozplugger-chromium/PKGBUILD +++ b/abs/extra/community/mozplugger-chromium/PKGBUILD @@ -1,30 +1,36 @@ # Maintainer: Alexander Rødseth <rodseth@gmail.com> -# Thanks to: Giuseppe Borzi <gborzi@ieee.org> +# Contributor: Giuseppe Borzi <gborzi@ieee.org> # Contributor: fs4000 <matthias_dienstbier[at]yahoo[dot]de> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Todd Musall <tmusall@comcast.net> pkgname=mozplugger-chromium -pkgver=1.14.3 -pkgrel=3 -pkgdesc="A Mozilla multimedia plugin for Chromium" +pkgver=1.14.4 +pkgrel=1 +pkgdesc="Mozilla multimedia plugin for Chromium" arch=('x86_64' 'i686') -url="http://mozplugger.mozdev.org" +url="http://mozplugger.mozdev.org/" license=('GPL') depends=('libx11') backup=('etc/mozpluggerrc') conflicts=('mozplugger') source=("http://mozplugger.mozdev.org/files/mozplugger-$pkgver.tar.gz") -md5sums=('ac2f916ac93c3b59dec2ebfc511d00a0') +sha256sums=('8343c4b107a18b05ef0bb789ab72e0276c979395fb56148fb531fa5c2319745a') build() { cd "mozplugger-$pkgver" + msg2 "Configuring..." ./configure --prefix="$pkgdir/usr" --exec-prefix="$pkgdir/usr/bin" \ --enable-always-xembed --sysconfdir="/etc" msg2 "Building..." make - msg2 "Packaging..." gzip mozplugger.7 +} + +package() { + cd "mozplugger-$pkgver" + + msg2 "Packaging..." install -Dm644 mozplugger.7.gz "$pkgdir/usr/share/man/man7/mozplugger.7.gz" install -Dm644 mozpluggerrc "$pkgdir/etc/mozpluggerrc" install -Dm644 mozplugger.so "$pkgdir/usr/lib/mozilla/plugins/mozplugger.so" @@ -32,4 +38,5 @@ build() { install -Dm755 mozplugger-helper "$pkgdir/usr/bin/mozplugger-helper" install -Dm755 mozplugger-linker "$pkgdir/usr/bin/mozplugger-linker" } + # vim:set ts=2 sw=2 et: |