extra/chromium to 42.0.2311.135-1

extra/chromium/PKGBUILD

@@ -21,8 +21,9 @@
 buildarch=4
 
 pkgname=chromium
-pkgver=42.0.2311.90
+pkgver=42.0.2311.135
 pkgrel=1
+_launcher_ver=2
 pkgdesc="The open-source project behind Google Chrome, an attempt at creating a safer, faster, and more stable browser"
 arch=('armv6h' 'armv7h')
 url="http://www.chromium.org/"
@@ -31,7 +32,7 @@ depends=('gtk2' 'nss' 'alsa-lib' 'xdg-utils' 'bzip2' 'libevent' 'libxss' 'icu'
          'libexif' 'libgcrypt' 'ttf-font' 'systemd' 'dbus' 'flac' 'snappy'
          'speech-dispatcher' 'pciutils' 'libpulse' 'harfbuzz' 'libsecret'
          'perl' 'perl-file-basedir' 'desktop-file-utils' 'hicolor-icon-theme')
-makedepends=('python2' 'gperf' 'yasm' 'mesa' 'ninja' 'git')
+makedepends=('python2' 'gperf' 'yasm' 'mesa' 'ninja')
 optdepends=('kdebase-kdialog: needed for file dialogs in KDE'
             'gnome-keyring: for storing passwords in GNOME keyring'
             'kdeutils-kwalletmanager: for storing passwords in KWallet')
@@ -39,15 +40,15 @@ provides=('chromium-browser')
 conflicts=('chromium-browser')
 install=chromium.install
 source=(https://commondatastorage.googleapis.com/chromium-browser-official/$pkgname-$pkgver.tar.xz
-        git+https://github.com/foutrelis/chromium-launcher.git
+        chromium-launcher-$_launcher_ver.tar.gz::https://github.com/foutrelis/chromium-launcher/archive/v$_launcher_ver.tar.gz
         chromium.desktop
         arm-webrtc-fix.patch
         chromium-arm-r0.patch
         v6-ffmpeg.patch
         chromium-widevine.patch)
-sha256sums=('60b0eb38c1c3d0cc998dae70b7333e53b715cff2847c1652e03d1723300db4c9'
-            'SKIP'
-            '09bfac44104f4ccda4c228053f689c947b3e97da9a4ab6fa34ce061ee83d0322'
+sha256sums=('c269d40e653794c219fd3eca2922d881199af5acff5d0a55b3e79f3b6a5a2aa9'
+            '7f91c81721092d707d7b94e6555a48bc7fd0bc0e1174df4649bdcd745930e52f'
+            '028a748a5c275de9b8f776f97909f999a8583a4b77fd1cd600b4fc5c0c3e91e9'
             '9db0f01517c52e3236ff52e8a664840542a19144a54923ae6aabea3dcfa92c52'
             'df4be49770d508b772f98eda9fc5f37fa71d4c0459437e12f7f3db5892aa1611'
             '3fbabcbd512494b529e0a0e17560735887acf2291a74653750f9b29f5d45774d'
@@ -95,7 +96,7 @@ prepare() {
 }
 
 build() {
-  cd "$srcdir/chromium-launcher"
+  cd "$srcdir/chromium-launcher-$_launcher_ver"
 
   make PREFIX=/usr
 
@@ -189,10 +190,9 @@ fi
 }
 
 package() {
-  cd "$srcdir/chromium-launcher"
+  cd "$srcdir/chromium-launcher-$_launcher_ver"
 
-  make PREFIX=/usr DESTDIR="$pkgdir" install
-  strip $STRIP_BINARIES "$pkgdir/usr/lib/chromium-launcher/launcher-derp"
+  make PREFIX=/usr DESTDIR="$pkgdir" install-strip
   install -Dm644 LICENSE \
     "$pkgdir/usr/share/licenses/chromium/LICENSE.launcher"
 

extra/chromium/chromium.desktop

@@ -1,5 +1,4 @@
 [Desktop Entry]
-Version=1.0
 Name=Chromium
 # Only KDE 4 seems to use GenericName, so we reuse the KDE strings.
 # From Ubuntu's language-pack-kde-XX-base packages, version 9.04-20090413.

extra/chromium/chromium.install

@@ -1,12 +1,27 @@
 post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &>/dev/null
-    update-desktop-database -q
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-desktop-database -q
 }
 
 post_upgrade() {
-    post_install
+  if (($(vercmp $2 42.0.2311.90-1) < 0)); then
+    echo ':: This Chromium package no longer supports custom flags passed via the'
+    echo '   /etc/chromium/default file (or any other files under /etc/chromium/).'
+    echo
+    echo '   The new /usr/bin/chromium launcher script will automatically detect'
+    echo '   Pepper Flash (if installed) and pass the correct flags to Chromium.'
+    echo
+    echo '   If you need to pass extra command-line arguments to Chromium, you'
+    echo '   can put them in a "chromium-flags.conf" file under $HOME/.config/'
+    echo '   (or $XDG_CONFIG_HOME). Arguments are split on whitespace and shell'
+    echo '   quoting rules apply but no further parsing is performed.'
+  fi
+
+  post_install
 }
 
 post_remove() {
-    post_install
+  post_install
 }
+
+# vim:set ts=2 sw=2 et: