From dcb822f9bfb2d2c23c5ecfe8d6649a58c2d852cb Mon Sep 17 00:00:00 2001 From: Samuel Verstraete Date: Thu, 19 Jul 2012 10:58:06 +0200 Subject: [PATCH 1/5] Chromium: version bump + sanitizing BUILD --- web/chromium/BUILD | 86 +++++++++++++++++--------------------------- web/chromium/DEPENDS | 1 - web/chromium/DETAILS | 4 +-- 3 files changed, 34 insertions(+), 57 deletions(-) diff --git a/web/chromium/BUILD b/web/chromium/BUILD index a2922b8b529..45078f4ff61 100644 --- a/web/chromium/BUILD +++ b/web/chromium/BUILD @@ -1,11 +1,10 @@ ( - sedit "s/'-Werror'/''/" build/common.gypi && cp -f $SCRIPT_DIRECTORY/nacl.gypi chrome/ && echo Fixing dumb CPU optimizations please wait in patience... - find . -type f -exec sed -i \ + find . -type f -print0 | xargs -0 sed -i \ -e 's/-mcpu=/-march=/g' \ -e 's/-mtune=/-march=/g' \ -e 's/=pentium4/=native/g' \ @@ -14,9 +13,9 @@ -e 's/=core2/=native/g' \ -e 's/=pentiumpro/=native/g' \ -e 's/=pentium/=native/g' \ - -e 's/=k6/=native/g' {} \; && + -e 's/=k6/=native/g' && - export CHROMIUM_HOME=/usr/lib/$MODULE + export CHROMIUM_HOME=/usr/lib/$MODULE && mkdir -p "${SOURCE_DIRECTORY}"/.gyp && cat << EOF > "${SOURCE_DIRECTORY}"/.gyp/include.gypi @@ -25,29 +24,17 @@ 'cflags': [ '${CFLAGS// /','}' ], 'ldflags': [ '${LDFLAGS// /','}' ], }, + 'variables': { + q 'remove_webcore_debug_symbols' : 1, + }, } EOF if module_installed libjpeg-turbo; then - OPTS+=" -Duse_libjpeg_turbo=1" + OPTS+=" -Duse_libjpeg_turbo=1" fi && -# if module_installed libvpx; then -# patch_it $SOURCE2 0 -# sedit 's@third_party/libvpx/source/libvpx/@@' remoting/base/*coder_vp8.cc -# sedit 's@third_party/libvpx/include/@@' third_party/ffmpeg/ffmpeg_stub_headers.fragment -# fi && - -# if module_installed speex; then -# sedit 's@third_party/speex/include/@@' chrome/browser/speech/speech_recognizer.cc -# cp $SOURCE_CACHE/$SOURCE3 third_party/speex -# fi && - - OPTS+=" -Duse_system_bzip2=1 -Duse_system_libevent=1 -Duse_system_libjpeg=1 -Duse_system_libpng=1 \ - -Duse_system_libxml=1 -Duse_system_libxslt=1 -Duse_system_zlib=1 -Dproprietary_codecs=1 -Dwerror= -Ddisable_sse2=1 \ - -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome -Duse_system_zlib=1 \ - -Dfastbuild=1 -Dlinux_strip_binary=1 -Dlinux_use_seccomp_sandbox=1 \ - -Dlinux_use_gold_binary=0 -Dlinux_use_gold_flags=0" + OPTS+=" -Duse_system_bzip2=1 -Duse_system_libevent=1 -Duse_system_libjpeg=1 -Duse_system_libpng=1 -Duse_system_libxml=1 -Duse_system_libxslt=1 -Duse_system_zlib=1 -Duse_system_zlib=1 -Duse_system_ffmpeg=0 -Dproprietary_codecs=1 -Dwerror= -Ddisable_sse2=1 -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome -Dfastbuild=1 -Dlinux_strip_binary=1 -Dlinux_use_seccomp_sandbox=1 -Dlinux_use_gold_binary=0 -Dlinux_use_gold_flags=0 -Drelease_extra_cflags=$CFLAGS -Dffmpeg_branding=Chrome" # set the target arch here if [ "`arch`" == "x86_64" ]; then @@ -67,54 +54,45 @@ EOF # This is the make step make V=1 chrome chrome_sandbox BUILDTYPE=Release && - # Make missing libffmpegsumo.so make -C third_party/ffmpeg -f ffmpeg.Makefile && prepare_install && - mkdir -p ${CHROMIUM_HOME} && - cp -a out/Release/chrome ${CHROMIUM_HOME} && - cp -a out/Release/chrome_sandbox ${CHROMIUM_HOME} && - chmod 4755 ${CHROMIUM_HOME}/chrome_sandbox && - cp -a out/Release/xdg-settings ${CHROMIUM_HOME} && - install -m 755 $SCRIPT_DIRECTORY/chromium-launcher.sh ${CHROMIUM_HOME} && - cp -a out/Release/chrome.pak ${CHROMIUM_HOME} && - cp -a out/Release/resources.pak ${CHROMIUM_HOME} && - cp -a out/Release/locales ${CHROMIUM_HOME} && - cp -a out/Release/resources ${CHROMIUM_HOME} && - install -m 644 out/Release/chrome.1 /usr/share/man/man1/ && - install -m 644 out/Release/chrome.1 /usr/share/man/man1/chromium.1 && - install -m 644 third_party/ffmpeg/out/Debug/libffmpegsumo.so ${CHROMIUM_HOME} && - if module_installed ffmpeg; then - ln -sf /usr/lib/libavcodec.so.52 ${CHROMIUM_HOME}/libavcodec.so.52 - ln -sf /usr/lib/libavformat.so.52 ${CHROMIUM_HOME}/libavformat.so.52 - ln -sf /usr/lib/libavutil.so.50 ${CHROMIUM_HOME}/libavutil.so.50 - fi && + # installing + install -D out/Release/chrome ${CHROMIUM_HOME}/chrome && + install -Dm4755 -o root -g root out/Release/chrome_sandbox ${CHROMIUM_HOME}/chrome_sandbox && - # symlink to lunar location for browser plugins, should be /usr/lib/lunar/plugins - ln -sf /usr/lib/lunar/plugins ${CHROMIUM_HOME}/plugins && + cp out/Release/{*.pak,libffmpegsumo.so} ${CHROMIUM_HOME} && - # icon installation - mkdir -p /usr/share/pixmaps && - install -m644 out/Release/product_logo_48.png /usr/share/pixmaps/chromium-browser.png && + cp -a out/Release/locales out/Release/resources ${CHROMIUM_HOME}/ && - # theme installation - mkdir -p /usr/share/themes/Chromium && - cp -a $SOURCE_DIRECTORY/chrome/app/theme /usr/share/themes/Chromium/ && + find ${CHROMIUM_HOME}/ -name '*.d' -type f -delete && - ln -sf ${CHROMIUM_HOME}/chromium-launcher.sh /usr/bin/chromium && + install -Dm644 out/Release/chrome.1 /usr/share/man/man1/chromium.1 && install -m 0644 -D $SCRIPT_DIRECTORY/chromium.desktop /usr/share/applications/chromium.desktop && if [ -d /usr/share/icons/hicolor/ ] ; then for size in 16 22 24 32 48 64 128 256; do install -m 0644 -D \ - chrome/app/theme/chromium/product_logo_${size}.png \ - /usr/share/icons/hicolor/${size}x${size}/apps/chromium.png + chrome/app/theme/chromium/product_logo_${size}.png /usr/share/icons/hicolor/${size}x${size}/apps/chromium.png done - fi && + fi && + + install -m 755 $SCRIPT_DIRECTORY/chromium-launcher.sh ${CHROMIUM_HOME} && + ln -sf ${CHROMIUM_HOME}/chromium-launcher.sh /usr/bin/chromium && + + install -Dm644 LICENSE /usr/share/licenses/chromium/LICENSE && + + install -m 755 out/Release/xdg-settings ${CHROMIUM_HOME} && + + # symlink to lunar location for browser plugins, should be /usr/lib/lunar/plugins + ln -sf /usr/lib/lunar/plugins ${CHROMIUM_HOME}/plugins && + + # theme installation + mkdir -p /usr/share/themes/Chromium && + cp -a $SOURCE_DIRECTORY/chrome/app/theme /usr/share/themes/Chromium/ && - # write permissions for /dev/shm are needed - chmod 777 /dev/shm + ln -sf ${CHROMIUM_HOME}/chromium-launcher.sh /usr/bin/chromium ) > $C_FIFO 2>&1 diff --git a/web/chromium/DEPENDS b/web/chromium/DEPENDS index 49892f03765..7973ab88b2f 100644 --- a/web/chromium/DEPENDS +++ b/web/chromium/DEPENDS @@ -16,7 +16,6 @@ depends Switch optional_depends "yasm" "-Duse_system_yasm=1" "-Duse_system_yasm=0" "To use system yasm to compile assembler parts" optional_depends "cups" "-Duse_cups=1" "-Duse_cups=0" "To use cups printing" -optional_depends "ffmpeg" "-Duse_system_ffmpeg=1" "-Duse_system_ffmpeg=0" "To enable system ffmpeg" optional_depends "GConf" "-Duse_gconf=1" "-Duse_gconf=0" "To use cups printing" optional_depends "speex" "" "" "To use system speex" diff --git a/web/chromium/DETAILS b/web/chromium/DETAILS index fe1dc08b579..1aec86fbfd1 100644 --- a/web/chromium/DETAILS +++ b/web/chromium/DETAILS @@ -1,10 +1,10 @@ MODULE=chromium - VERSION=19.0.1084.52 + VERSION=20.0.1132.57 SOURCE=$MODULE-$VERSION.tar.bz2 SOURCE2=$MODULE-fixes-1.patch.bz2 SOURCE_URL=http://commondatastorage.googleapis.com/chromium-browser-official SOURCE2_URL=$PATCH_URL - SOURCE_VFY=sha1:e27acc2cdef9f47b0d8a136b3c5867d86e9317b6 + SOURCE_VFY=sha1:3209d2ba19b4112fbae66580c319039199261e9d SOURCE2_VFY=sha1:99a61908c84fca43766c64835f345eff05fee5b1 WEB_SITE=http://www.chromium.org/Home ENTERED=20100104 From ed95d5246c5fe0e2ca4b1a3a5c2b97c7c9c55467 Mon Sep 17 00:00:00 2001 From: Terry Chan Date: Thu, 19 Jul 2012 08:59:37 -0500 Subject: [PATCH 2/5] sash: Returning this module to moonbase-other --- shells/sash/BUILD | 7 +++++++ shells/sash/DEPENDS | 3 +++ shells/sash/DETAILS | 27 +++++++++++++++++++++++++++ 3 files changed, 37 insertions(+) create mode 100644 shells/sash/BUILD create mode 100644 shells/sash/DEPENDS create mode 100644 shells/sash/DETAILS diff --git a/shells/sash/BUILD b/shells/sash/BUILD new file mode 100644 index 00000000000..8bf71358375 --- /dev/null +++ b/shells/sash/BUILD @@ -0,0 +1,7 @@ +( + + patch_it $SOURCE_CACHE/$SOURCE2 0 && + make && + prepare_install && + make install +) > $C_FIFO 2>&1 diff --git a/shells/sash/DEPENDS b/shells/sash/DEPENDS new file mode 100644 index 00000000000..e0c3ac50c54 --- /dev/null +++ b/shells/sash/DEPENDS @@ -0,0 +1,3 @@ +depends readline +depends ncurses +depends zlib diff --git a/shells/sash/DETAILS b/shells/sash/DETAILS new file mode 100644 index 00000000000..4b20f947123 --- /dev/null +++ b/shells/sash/DETAILS @@ -0,0 +1,27 @@ + MODULE=sash + VERSION=3.7 + #VERSION=3.6 + SOURCE=$MODULE-$VERSION.tar.gz + SOURCE2=$MODULE-$VERSION-readline-plus-2.patch.bz2 + SOURCE_URL=http://www.pcug.org.au/~dbell/programs/ + SOURCE_VFY=sha1:3dd22cb5387966184dbd5404319a9cac1d39192e + SOURCE2_URL=$PATCH_URL + SOURCE2_VFY=sha1:296c74cbf65dabf5660f543b8bbf30e3c87a5027 + WEB_SITE=http://www.pcug.org.au/~dbell + ENTERED=20020526 + UPDATED=20110123 + MAINTAINER=tchan@lunar-linux.org + SHORT="stand-alone shell with many built-in commands" + PSAFE=no +cat << EOF +sash - Stand Alone SHell +The purpose of this program is to make system recovery possible in +many cases where there are missing shared libraries or executables. +It does this by firstly being linked statically, and secondly by +including versions of many of the standard utilities within itself. +Patched to include some GNU Readline features: +1. The TAB key for command and filename completion. +2. The keys Ctrl-N and Ctrl-P for a command history. +Further patched to include the chroot, pivot_root, and losetup functions. +Simple shell variable expansion support has also been added. +EOF From 6f0a0ad5a0e2789c52119b2e225b55e768fee5cc Mon Sep 17 00:00:00 2001 From: Terry Chan Date: Thu, 19 Jul 2012 09:01:47 -0500 Subject: [PATCH 3/5] sash: removed a comment from the DETAILS file --- shells/sash/DETAILS | 1 - 1 file changed, 1 deletion(-) diff --git a/shells/sash/DETAILS b/shells/sash/DETAILS index 4b20f947123..b6914d7c538 100644 --- a/shells/sash/DETAILS +++ b/shells/sash/DETAILS @@ -1,6 +1,5 @@ MODULE=sash VERSION=3.7 - #VERSION=3.6 SOURCE=$MODULE-$VERSION.tar.gz SOURCE2=$MODULE-$VERSION-readline-plus-2.patch.bz2 SOURCE_URL=http://www.pcug.org.au/~dbell/programs/ From 783ce25e6c278fb778b29eddfa67a9bac95c0ff8 Mon Sep 17 00:00:00 2001 From: Terry Chan Date: Thu, 19 Jul 2012 09:06:08 -0500 Subject: [PATCH 4/5] rfkill: Added this module back to moonbase-other --- net/rfkill/DETAILS | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 net/rfkill/DETAILS diff --git a/net/rfkill/DETAILS b/net/rfkill/DETAILS new file mode 100644 index 00000000000..3472f9eae3d --- /dev/null +++ b/net/rfkill/DETAILS @@ -0,0 +1,20 @@ + MODULE=rfkill + VERSION=0.4 + SOURCE=$MODULE-$VERSION.tar.bz2 + SOURCE_URL=http://wireless.kernel.org/download/$MODULE + SOURCE_VFY=sha1:fccabf5a272ac2891f24dc35449dc6f4c45ff44b + WEB_SITE=http://linuxwireless.org/en/users/Documentation/rfkill + ENTERED=20101006 + UPDATED=20101020 + SHORT="A tool for enabling and disabling wireless devices" + +cat < Date: Thu, 19 Jul 2012 19:25:55 +0200 Subject: [PATCH 5/5] chromium: Fix configure failure if $CFLAGS contains more than one option --- web/chromium/BUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/chromium/BUILD b/web/chromium/BUILD index 45078f4ff61..4fda3918c51 100644 --- a/web/chromium/BUILD +++ b/web/chromium/BUILD @@ -34,7 +34,7 @@ EOF OPTS+=" -Duse_libjpeg_turbo=1" fi && - OPTS+=" -Duse_system_bzip2=1 -Duse_system_libevent=1 -Duse_system_libjpeg=1 -Duse_system_libpng=1 -Duse_system_libxml=1 -Duse_system_libxslt=1 -Duse_system_zlib=1 -Duse_system_zlib=1 -Duse_system_ffmpeg=0 -Dproprietary_codecs=1 -Dwerror= -Ddisable_sse2=1 -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome -Dfastbuild=1 -Dlinux_strip_binary=1 -Dlinux_use_seccomp_sandbox=1 -Dlinux_use_gold_binary=0 -Dlinux_use_gold_flags=0 -Drelease_extra_cflags=$CFLAGS -Dffmpeg_branding=Chrome" + OPTS+=" -Duse_system_bzip2=1 -Duse_system_libevent=1 -Duse_system_libjpeg=1 -Duse_system_libpng=1 -Duse_system_libxml=1 -Duse_system_libxslt=1 -Duse_system_zlib=1 -Duse_system_zlib=1 -Duse_system_ffmpeg=0 -Dproprietary_codecs=1 -Dwerror= -Ddisable_sse2=1 -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome -Dfastbuild=1 -Dlinux_strip_binary=1 -Dlinux_use_seccomp_sandbox=1 -Dlinux_use_gold_binary=0 -Dlinux_use_gold_flags=0 -Dffmpeg_branding=Chrome" # set the target arch here if [ "`arch`" == "x86_64" ]; then @@ -49,7 +49,7 @@ EOF fi # This is the configure step - build/gyp_chromium -f make build/all.gyp $OPTS --depth=. && + build/gyp_chromium -f make build/all.gyp $OPTS -Drelease_extra_cflags="$CFLAGS" --depth=. && # This is the make step make V=1 chrome chrome_sandbox BUILDTYPE=Release &&