summaryrefslogtreecommitdiff
path: root/chromium
diff options
context:
space:
mode:
authorMatt Housh <jaeger@crux.ninja>2018-01-07 15:00:40 -0600
committerMatt Housh <jaeger@crux.ninja>2018-01-07 15:04:03 -0600
commitbb59db6f379f42bd1699de1c4bcd645c1740febb (patch)
tree1f8751ce39bb1129d9fc938532366d2f698dab22 /chromium
parent4acd6397eb07bd59acbd4cf44f785685541a1033 (diff)
downloadopt-bb59db6f379f42bd1699de1c4bcd645c1740febb.tar.gz
opt-bb59db6f379f42bd1699de1c4bcd645c1740febb.tar.xz
chromium: fixed a missing $PKG destination, retabbed
If chromium was previously installed the update will need to be forced as the following files were installed but not tracked by the package database: /usr/share/icons/hicolor/16x16/apps/chromium.png /usr/share/icons/hicolor/32x32/apps/chromium.png
Diffstat (limited to 'chromium')
-rw-r--r--chromium/.footprint6
-rw-r--r--chromium/.signature6
-rw-r--r--chromium/Pkgfile182
3 files changed, 100 insertions, 94 deletions
diff --git a/chromium/.footprint b/chromium/.footprint
index e1e4da0b5..46709aa55 100644
--- a/chromium/.footprint
+++ b/chromium/.footprint
@@ -272,6 +272,9 @@ drwxr-xr-x root/root usr/share/icons/hicolor/
drwxr-xr-x root/root usr/share/icons/hicolor/128x128/
drwxr-xr-x root/root usr/share/icons/hicolor/128x128/apps/
-rw-r--r-- root/root usr/share/icons/hicolor/128x128/apps/chromium.png
+drwxr-xr-x root/root usr/share/icons/hicolor/16x16/
+drwxr-xr-x root/root usr/share/icons/hicolor/16x16/apps/
+-rw-r--r-- root/root usr/share/icons/hicolor/16x16/apps/chromium.png
drwxr-xr-x root/root usr/share/icons/hicolor/22x22/
drwxr-xr-x root/root usr/share/icons/hicolor/22x22/apps/
-rw-r--r-- root/root usr/share/icons/hicolor/22x22/apps/chromium.png
@@ -281,6 +284,9 @@ drwxr-xr-x root/root usr/share/icons/hicolor/24x24/apps/
drwxr-xr-x root/root usr/share/icons/hicolor/256x256/
drwxr-xr-x root/root usr/share/icons/hicolor/256x256/apps/
-rw-r--r-- root/root usr/share/icons/hicolor/256x256/apps/chromium.png
+drwxr-xr-x root/root usr/share/icons/hicolor/32x32/
+drwxr-xr-x root/root usr/share/icons/hicolor/32x32/apps/
+-rw-r--r-- root/root usr/share/icons/hicolor/32x32/apps/chromium.png
drwxr-xr-x root/root usr/share/icons/hicolor/48x48/
drwxr-xr-x root/root usr/share/icons/hicolor/48x48/apps/
-rw-r--r-- root/root usr/share/icons/hicolor/48x48/apps/chromium.png
diff --git a/chromium/.signature b/chromium/.signature
index 03e042969..d5d09d5ff 100644
--- a/chromium/.signature
+++ b/chromium/.signature
@@ -1,7 +1,7 @@
untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/ZHjbkSlwkkc8jW6yRFPUENs6WOqBsSAUUebNDS9wngNajv6SV3vJcD1gehMpL2AHQrkU+fEmxImG/SXd0W2XQo=
-SHA256 (Pkgfile) = 7f780d9b5c1cf0d02fb6447c18e39e46c02619bbd8e46635850ad0de145a7636
-SHA256 (.footprint) = 2b57eade7d1a318c8a6993c87aa7f9359fdc36fbf74906498b712e73c5bf1ce2
+RWSE3ohX2g5d/WrHyDzQa9T2MiA/XxUCvWyReknChqOVcJlyJA7SVWBHpNx+9WXhFRaHEvO9/QTY80/BZk6b0lpTL5lmIeJzOgc=
+SHA256 (Pkgfile) = 35e12c8bce397c625881d2623ba1fa882b131be773cb67094e52e7f21b69498a
+SHA256 (.footprint) = 7886836592cc13787d9f1ea173d9e22c7e0e12e1ebe65632311279c86ced91b0
SHA256 (chromium-63.0.3239.108.tar.xz) = 47d80798194da78bdd519b7ce012425b13cf89d6eb287e22a34342a245c31a2b
SHA256 (last-commit-position.patch) = d3dc397956a26ec045e76c25c57a1fac5fc0acff94306b2a670daee7ba15709e
SHA256 (chromium.sh) = 7b182d0ae1e9ef841f8cd0b403a304babd548bf60b5e3808b2144bebdbb7c154
diff --git a/chromium/Pkgfile b/chromium/Pkgfile
index 0ead8cae2..95bdd7a15 100644
--- a/chromium/Pkgfile
+++ b/chromium/Pkgfile
@@ -13,108 +13,108 @@ source=(https://commondatastorage.googleapis.com/$name-browser-official/$name-$v
chromium-webrtc-r0.patch)
build() {
- cd $name-$version
+ cd $name-$version
- if [ -n "$(pkginfo -i | grep '^ccache ')" ]; then
- # Avoid falling back to preprocessor mode when sources contain time macros
- export CCACHE_SLOPPINESS=time_macros
- fi
+ if [ -n "$(pkginfo -i | grep '^ccache ')" ]; then
+ # Avoid falling back to preprocessor mode when sources contain time macros
+ export CCACHE_SLOPPINESS=time_macros
+ fi
- export CFLAGS="$CFLAGS $(pkg-config --cflags nspr)"
- export LDFLAGS="$LDFLAGS $(pkg-config --libs nspr)"
+ export CFLAGS="$CFLAGS $(pkg-config --cflags nspr)"
+ export LDFLAGS="$LDFLAGS $(pkg-config --libs nspr)"
- # we don't use git sources
- patch -p1 -i $SRC/last-commit-position.patch
+ # we don't use git sources
+ patch -p1 -i $SRC/last-commit-position.patch
- # https://chromium-review.googlesource.com/c/chromium/src/+/71257
- patch -p1 -i $SRC/chromium-exclude_unwind_tables.patch
+ # https://chromium-review.googlesource.com/c/chromium/src/+/71257
+ patch -p1 -i $SRC/chromium-exclude_unwind_tables.patch
- # Fixes from Gentoo
- patch -p1 -i $SRC/chromium-clang-r1.patch
- patch -p1 -i $SRC/chromium-webrtc-r0.patch
+ # Fixes from Gentoo
+ patch -p1 -i $SRC/chromium-clang-r1.patch
+ patch -p1 -i $SRC/chromium-webrtc-r0.patch
- mkdir -p third_party/node/linux/node-linux-x64/bin
- ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/
+ mkdir -p third_party/node/linux/node-linux-x64/bin
+ ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/
# for LIB in ffmpeg flac harfbuzz-ng libjpeg \
-# libjpeg_turbo libpng libwebp libxslt yasm; do
-# find -type f -path "*third_party/$LIB/*" \
-# \! -path "*third_party/$LIB/chromium/*" \
-# \! -path "*third_party/$LIB/google/*" \
-# \! -path "*base/third_party/icu/*" \
-# \! -regex '.*\.\(gn\|gni\|isolate\|py\)' \
-# -delete
+# libjpeg_turbo libpng libwebp libxslt yasm; do
+# find -type f -path "*third_party/$LIB/*" \
+# \! -path "*third_party/$LIB/chromium/*" \
+# \! -path "*third_party/$LIB/google/*" \
+# \! -path "*base/third_party/icu/*" \
+# \! -regex '.*\.\(gn\|gni\|isolate\|py\)' \
+# -delete
# done
# /usr/bin/python2 build/linux/unbundle/replace_gn_files.py \
-# --system-libraries ffmpeg flac harfbuzz-ng libjpeg libxml libevent \
-# libpng libwebp libxslt opus yasm freetype
+# --system-libraries ffmpeg flac harfbuzz-ng libjpeg libxml libevent \
+# libpng libwebp libxslt opus yasm freetype
# /usr/bin/python2 third_party/libaddressinput/chromium/tools/update-strings.py
- _gn_args=(
- 'blink_gc_plugin=false'
- 'clang_use_chrome_plugins=false'
- 'enable_hangout_services_extension=true'
- 'enable_nacl=false'
- 'enable_swiftshader=false'
- 'fatal_linker_warnings=false'
- 'ffmpeg_branding="Chrome"'
- 'is_clang=false'
- 'is_debug=false'
- 'linux_use_bundled_binutils=false'
- 'use_custom_libcxx=false'
- 'proprietary_codecs=true'
- 'remove_webcore_debug_symbols=true'
- 'symbol_level=0'
- 'treat_warnings_as_errors=false'
- 'use_allocator="none"'
- 'use_cups=false'
- 'use_gconf=false'
- 'use_gnome_keyring=false'
- 'use_gold=false'
- 'use_gtk3=true'
- 'use_kerberos=false'
- 'use_pulseaudio=false'
- 'use_sysroot=false'
- )
-
- /usr/bin/python2 tools/gn/bootstrap/bootstrap.py --gn-gen-args="${_gn_args[*]}"
- out/Release/gn gen out/Release --args="${_gn_args[*]}" --script-executable=/usr/bin/python2
-
- ninja -j ${JOBS-1} -C out/Release chrome chrome_sandbox
-
- install -m 0755 -D out/Release/chrome $PKG/usr/lib/$name/$name
- install -m 4755 -o root -g root -D out/Release/chrome_sandbox $PKG/usr/lib/$name/chrome-sandbox
- install -m 0644 -D out/Release/*.pak $PKG/usr/lib/$name
- install -d $PKG/usr/lib/$name/locales
- install -m 0644 out/Release/locales/en-US.pak $PKG/usr/lib/$name/locales
- cp -a out/Release/resources $PKG/usr/lib/$name
-
- install -m 0644 -D chrome/installer/linux/common/desktop.template $PKG/usr/share/applications/$name.desktop
- install -m 0644 -D chrome/app/resources/manpage.1.in $PKG/usr/share/man/man1/$name.1
-
- sed -i \
- -e "s/@@MENUNAME@@/Chromium/g" \
- -e "s/@@PACKAGE@@/chromium/g" \
- -e "s/@@USR_BIN_SYMLINK_NAME@@/chromium/g" \
- $PKG/usr/share/applications/$name.desktop \
- $PKG/usr/share/man/man1/$name.1
-
- # fix v8 natives
- cp -a out/Release/{natives,snapshot}_blob.bin $PKG/usr/lib/$name
-
- for size in 16 32; do
- install -m 0644 -D chrome/app/theme/default_100_percent/$name/product_logo_${size}.png \
- /usr/share/icons/hicolor/${size}x${size}/apps/$name.png
- done
-
- for size in 22 24 48 64 128 256; do
- install -m 0644 -D chrome/app/theme/$name/product_logo_${size}.png \
- $PKG/usr/share/icons/hicolor/${size}x${size}/apps/$name.png
- done
-
- # fix icu installation
- install -m 0644 -D out/Release/icudtl.dat $PKG/usr/lib/$name/icudtl.dat
-
- install -m 0755 -D $SRC/$name.sh $PKG/usr/bin/$name
+ _gn_args=(
+ 'blink_gc_plugin=false'
+ 'clang_use_chrome_plugins=false'
+ 'enable_hangout_services_extension=true'
+ 'enable_nacl=false'
+ 'enable_swiftshader=false'
+ 'fatal_linker_warnings=false'
+ 'ffmpeg_branding="Chrome"'
+ 'is_clang=false'
+ 'is_debug=false'
+ 'linux_use_bundled_binutils=false'
+ 'use_custom_libcxx=false'
+ 'proprietary_codecs=true'
+ 'remove_webcore_debug_symbols=true'
+ 'symbol_level=0'
+ 'treat_warnings_as_errors=false'
+ 'use_allocator="none"'
+ 'use_cups=false'
+ 'use_gconf=false'
+ 'use_gnome_keyring=false'
+ 'use_gold=false'
+ 'use_gtk3=true'
+ 'use_kerberos=false'
+ 'use_pulseaudio=false'
+ 'use_sysroot=false'
+ )
+
+ /usr/bin/python2 tools/gn/bootstrap/bootstrap.py --gn-gen-args="${_gn_args[*]}"
+ out/Release/gn gen out/Release --args="${_gn_args[*]}" --script-executable=/usr/bin/python2
+
+ ninja -j ${JOBS-1} -C out/Release chrome chrome_sandbox
+
+ install -m 0755 -D out/Release/chrome $PKG/usr/lib/$name/$name
+ install -m 4755 -o root -g root -D out/Release/chrome_sandbox $PKG/usr/lib/$name/chrome-sandbox
+ install -m 0644 -D out/Release/*.pak $PKG/usr/lib/$name
+ install -d $PKG/usr/lib/$name/locales
+ install -m 0644 out/Release/locales/en-US.pak $PKG/usr/lib/$name/locales
+ cp -a out/Release/resources $PKG/usr/lib/$name
+
+ install -m 0644 -D chrome/installer/linux/common/desktop.template $PKG/usr/share/applications/$name.desktop
+ install -m 0644 -D chrome/app/resources/manpage.1.in $PKG/usr/share/man/man1/$name.1
+
+ sed -i \
+ -e "s/@@MENUNAME@@/Chromium/g" \
+ -e "s/@@PACKAGE@@/chromium/g" \
+ -e "s/@@USR_BIN_SYMLINK_NAME@@/chromium/g" \
+ $PKG/usr/share/applications/$name.desktop \
+ $PKG/usr/share/man/man1/$name.1
+
+ # fix v8 natives
+ cp -a out/Release/{natives,snapshot}_blob.bin $PKG/usr/lib/$name
+
+ for size in 16 32; do
+ install -m 0644 -D chrome/app/theme/default_100_percent/$name/product_logo_${size}.png \
+ $PKG/usr/share/icons/hicolor/${size}x${size}/apps/$name.png
+ done
+
+ for size in 22 24 48 64 128 256; do
+ install -m 0644 -D chrome/app/theme/$name/product_logo_${size}.png \
+ $PKG/usr/share/icons/hicolor/${size}x${size}/apps/$name.png
+ done
+
+ # fix icu installation
+ install -m 0644 -D out/Release/icudtl.dat $PKG/usr/lib/$name/icudtl.dat
+
+ install -m 0755 -D $SRC/$name.sh $PKG/usr/bin/$name
}

Generated by cgit