Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=66cf0246a2386ca6eb6e2fdf1bddf90b58a22cdc
commit 66cf0246a2386ca6eb6e2fdf1bddf90b58a22cdc Author: DeX77 <[email protected]> Date: Mon Dec 31 14:04:30 2012 +0100 chromium-browser-23.0.1271.110-1-x86_64 * version bump * finally found the culprit: chromium version >=23 has a silent dep on * libpng>=15. Fixed by using provided version diff --git a/source/xapps-extra/chromium-browser/FrugalBuild b/source/xapps-extra/chromium-browser/FrugalBuild index 2dcf8d9..8d0f6e0 100644 --- a/source/xapps-extra/chromium-browser/FrugalBuild +++ b/source/xapps-extra/chromium-browser/FrugalBuild @@ -2,12 +2,12 @@ # Maintainer: DeX77 <[email protected]> pkgname=chromium-browser -pkgver=22.0.1229.94 -pkgrel=3 +pkgver=23.0.1271.110 +pkgrel=1 pkgdesc='An open-source browser project that aims to build a safer, faster, and more stable way for all users to experience the web' url='http://www.chromium.org/' depends=('nss' 'alsa-lib' 'hicolor-icon-theme' 'libxslt' 'ffmpeg>=1.0' \ - 'libevent>=2.0.10' 'libxscrnsaver' 'libpng>=1.4.1' 'gtk+2-libs' 'libxtst' \ + 'libevent>=2.0.10' 'libxscrnsaver' 'libpng=1.4.8-1' 'gtk+2-libs' 'libxtst' \ 'libgcrypt' 'dejavu-ttf' 'gnutls>=2.12.12' 'libtasn1' 'gdk-pixbuf2' \ 'systemd>=188' 'libcups' 'openssl' 'libxml2') makedepends=('python' 'perl' 'gperf' 'yasm' 'libgl' 'libgnome-keyring' 'cups' 'krb5' \ @@ -23,9 +23,11 @@ up2date="lynx -dump 'http://googlechromereleases.blogspot.de/search/label/Stable egrep -o -m 1 'Stable channel has been updated to ([0123456789.]*)' | \ egrep -o '([0123456789.]*)'" source=(http://commondatastorage.googleapis.com/chromium-browser-official/$_F_archive_name-$pkgver.tar.bz2 \ + chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch \ $pkgname.desktop \ $pkgname.sh) -sha1sums=('a61699735ea05eaf2ba6cddda85c30b7d15eeb73' \ +sha1sums=('b69c7349c9d3c9bcbe7b02cda3fa125749cbcf37' \ + '770065c9e6c68ee7da2a4205cca23b252102cfea' \ '78ed8913b8a598de6a9e45d206973a846dbe8a51' \ 'e06de4aee77b3deb77e3b08ebb175ec02da42ced') CXXFLAGS="$CXXFLAGS -fpermissive" @@ -40,8 +42,10 @@ build() { Fpatchall if [ $CARCH = i686 ]; then - build/gyp_chromium -f make build/all.gyp --depth=. \ - -Dno_strict_aliasing=1 \ + build/gyp_chromium --depth=. \ + -Dlinux_use_gold_binary=0 \ + -Dlinux_use_gold_flags=0 \ + -Ddisable_glibc=1 \ -Dwerror= \ -Dlinux_sandbox_path=/usr/lib/chromium/chromium-sandbox \ -Dlinux_strip_binary=1 \ @@ -52,16 +56,21 @@ build() { -Duse_system_ffmpeg=0 \ -Duse_system_libevent=1 \ -Duse_system_libjpeg=1 \ - -Duse_system_libpng=1 \ - -Duse_system_libxml=1 \ + -Duse_system_libpng=0 \ + -Duse_system_libxml=0 \ + -Ddisable_pnacl=1 \ -Duse_system_ssl=0 \ -Duse_system_yasm=1 \ - -Duse_system_zlib=1 \ + -Duse_system_zlib=0 \ -Ddisable_nacl=1 \ - -Duse_gconf=0 + -Duse_gconf=0 \ + -Dlinux_use_tcmalloc=0 \ + -Duse_pulseaudio=1 elif [ $CARCH = x86_64 ]; then - build/gyp_chromium -f make build/all.gyp --depth=. \ - -Dno_strict_aliasing=1 \ + build/gyp_chromium --depth=. \ + -Dlinux_use_gold_binary=0 \ + -Dlinux_use_gold_flags=0 \ + -Ddisable_glibc=1 \ -Dwerror= \ -Dlinux_sandbox_path=/usr/lib/chromium/chromium-sandbox \ -Dlinux_strip_binary=1 \ @@ -72,13 +81,16 @@ build() { -Duse_system_ffmpeg=0 \ -Duse_system_libevent=1 \ -Duse_system_libjpeg=1 \ - -Duse_system_libpng=1 \ + -Duse_system_libpng=0 \ -Duse_system_libxml=0 \ + -Ddisable_pnacl=1 \ -Duse_system_ssl=0 \ -Duse_system_yasm=1 \ - -Duse_system_zlib=1 \ + -Duse_system_zlib=0 \ -Ddisable_nacl=1 \ -Duse_gconf=0 \ + -Dlinux_use_tcmalloc=0 \ + -Duse_pulseaudio=1 \ -Ddisable_sse2=1 fi @@ -93,10 +105,6 @@ build() { cp out/Release/*.pak "$Fdestdir/usr/lib/chromium/" || Fdie cp out/Release/libffmpegsumo.so "$Fdestdir/usr/lib/chromium/" || Fdie - Fln /usr/lib/libavcodec.so.54 /usr/lib/chromium/libavcodec.so.53 - Fln /usr/lib/libavformat.so.54 /usr/lib/chromium/libavformat.so.53 - Fln /usr/lib/libavutil.so.51 /usr/lib/chromium/libavutil.so.51 - cp -a out/Release/locales out/Release/resources \ $Fdestdir/usr/lib/chromium/ || Fdie find $Fdestdir/usr/lib/chromium/ -name '*.d' -type f -delete @@ -112,7 +120,9 @@ build() { Fdirschmod usr/lib/chromium/locales 755 Fexe $pkgname.sh usr/bin/$pkgname + + Frm usr/lib/chromium/ressources Fdocrel LICENSE - Fbuild_gnome_scriptlet + Fbuild_gnome_scriptlet } diff --git a/source/xapps-extra/chromium-browser/chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch b/source/xapps-extra/chromium-browser/chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch new file mode 100644 index 0000000..f4ee9fb --- /dev/null +++ b/source/xapps-extra/chromium-browser/chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch @@ -0,0 +1,35 @@ +diff -upr chromium-20.0.1132.57.orig/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h chromium-20.0.1132.57/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h +--- chromium-20.0.1132.57.orig/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h 2012-07-10 10:48:31.000000000 +0300 ++++ chromium-20.0.1132.57/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h 2012-07-11 23:44:11.000000000 +0300 +@@ -243,14 +243,13 @@ struct kernel_rusage { + long ru_nivcsw; + }; + +-struct siginfo; + #if defined(__i386__) || defined(__arm__) || defined(__PPC__) + + /* include/asm-{arm,i386,mips,ppc}/signal.h */ + struct kernel_old_sigaction { + union { + void (*sa_handler_)(int); +- void (*sa_sigaction_)(int, struct siginfo *, void *); ++ void (*sa_sigaction_)(int, siginfo_t *, void *); + }; + unsigned long sa_mask; + unsigned long sa_flags; +@@ -287,13 +286,13 @@ struct kernel_sigaction { + unsigned long sa_flags; + union { + void (*sa_handler_)(int); +- void (*sa_sigaction_)(int, struct siginfo *, void *); ++ void (*sa_sigaction_)(int, siginfo_t *, void *); + }; + struct kernel_sigset_t sa_mask; + #else + union { + void (*sa_handler_)(int); +- void (*sa_sigaction_)(int, struct siginfo *, void *); ++ void (*sa_sigaction_)(int, siginfo_t *, void *); + }; + unsigned long sa_flags; + void (*sa_restorer)(void); _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
