new upstream release

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@8556 ec354946-7b23-47d6-9f5a-488ba84defc7

c/chromium/chromium-vl.spec

@@ -25,7 +25,7 @@ Name:           chromium
 Summary:        Google's opens source browser project
 Summary(ja):    Googleのオープンソースウェブブラウザ
 #'
-Version:        33.0.1750.152
+Version:        35.0.1916.153
 Release:        1%{?_dist_release}
 License:        BSD-3-Clause, LGPL-2.1+
 Group:          Applications/Internet
@@ -71,12 +71,12 @@ Patch67:        adjust-ldflags-no-keep-memory.patch
 
 
 # http://code.google.com/p/gperftools/issues/detail?id=444
-Patch90:	chromium-21.0.1180.81-glibc216.patch
+Patch90:		chromium-21.0.1180.81-glibc216.patch
 
 # Vine
 Patch100:		chromium-30.0.1599.84-no-ffmpegsumo.patch
 Patch101:		chromium-disable-GoogleApiKeysInfoBar-vine.patch
-Patch102:		chromium-33.0.1750.152-rungn.patch
+Patch102:		chromium-35.0.1916.114-rungn.patch
 
 
 BuildRequires:  pciutils-devel
@@ -144,6 +144,8 @@ BuildRequires:  python-devel
 BuildRequires:  libudev-devel
 BuildRequires:  libcap-devel
 
+BuildRequires:  ninja
+
 ##Vine Linux
 #BuildRequires:  libpaper-devel
 BuildRequires:  libXScrnSaver-devel
@@ -220,16 +222,21 @@ cat > src/third_party/ffmpeg/libavutil/avconfig.h <<EOF
 EOF
 
 # apply vendor patch after substitution
-%__sed "s:RPM_VERSION:%{version}-%{release}:" %{SOURCE20} | patch -p0 || exit 1
+#%__sed "s:RPM_VERSION:%{version}-%{release}:" %{SOURCE20} | patch -p0 || exit 1
 
 # Make sure that the requires legal files can be found
 %__cp -a src/AUTHORS src/LICENSE . || exit 1
 
+# remove breakpad
+sed -i "s|import breakpad||" src/tools/find_depot_tools.py
+
+
 %build
-export CC="gcc"
+#export GYP_GENERATORS=make
-export CXX="g++"
+#export CC="gcc"
-export AR="ar"
+#export CXX="g++"
-export RANLIB="ranlib"
+#export AR="ar"
+#export RANLIB="ranlib"
 
 ## create make files
 
@@ -245,7 +252,9 @@ done
 
 pushd src
 
-./build/gyp_chromium -f make build/all.gyp --depth . \
+export GYP_GENERATORS='ninja'
+
+./build/gyp_chromium build/all.gyp --depth . \
     -Dwerror= \
 	-Dlinux_dump_symbols=0 \
     -Dlinux_sandbox_path=%{chrome_sandbox} \
@@ -264,6 +273,7 @@ pushd src
     -Duse_system_flac=0 \
     -Duse_system_harfbuzz=0 \
     -Duse_system_icu=0 \
+    -Dicu_use_data_file_flag=0 \
     -Duse_system_libevent=0 \
     -Duse_system_libexif=0 \
     -Duse_system_libjpeg=0 \
@@ -317,16 +327,13 @@ pushd src
 
 #    -Dlibrary=shared_library -Drelease_extra_cflags=-fPIC \
 
-%__make -r %{?_smp_mflags} chrome BUILDTYPE=Release \
+ninja -C out/Release chrome
-    CC.host="gcc" CXX.host="g++" LINK.host="g++" AR.host="ar" V=1
 
 # Build the required SUID_SANDBOX helper
-%__make -r %{?_smp_mflags} chrome_sandbox BUILDTYPE=Release \
+ninja -C out/Release chrome_sandbox
-    CC.host="gcc" CXX.host="g++" LINK.host="g++" AR.host="ar" V=1
 
 # Build the ChromeDriver test suite
-%__make -r %{?_smp_mflags} chromedriver BUILDTYPE=Release \
+ninja -C out/Release chromedriver
-    CC.host="gcc" CXX.host="g++" LINK.host="g++" AR.host="ar" V=1
 popd
 
 %install
@@ -460,6 +467,14 @@ fi || :
 
 
 %changelog
+* Sun Jun 15 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 35.0.1916.153-1
+- update to 35.0.1916.153
+- update Patch102 (chromium-35.0.1916.114-rungn.patch)
+- update Source3 (pack_chromium_source-vine.sh)
+- update Source30 (master_preferences.vine)
+- update Source100 (chromium-browser-vine.sh)
+- add BuildRequires: ninja
+
 * Sat Mar 15 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 33.0.1750.152-1
 - update to 33.0.1750.152
 - update Patch13,101

c/chromium/pack_chromium_source-vine.sh

@@ -0,0 +1,136 @@
+#!/bin/bash
+#
+# forgive me for the state of this script
+
+set -e
+
+tmp=$(mktemp -d)
+pwd=$(pwd)
+
+trap cleanup EXIT
+cleanup() {
+    set +e
+    [ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp"
+}
+
+chromium_svn_dir=$1
+chromium_tgt_dir=${tmp}/${chromium_svn_dir}
+
+[ ! -d $chromium_svn_dir ] && \
+    echo "No such directories: $chromium_svn_dir" && \
+    [ -f ${chromium_svn_dir}.tar.xz ] && \
+    echo "Found $chromium_svn_dir.tar.xz" && \
+    echo "Decompressing $chromium_svn_dir.tar.xz" && \
+    tar -xf ${chromium_svn_dir}.tar.xz
+
+mkdir -p ${chromium_tgt_dir}
+
+name=chromium
+#version="`cat $chromium_svn_dir/chrome/VERSION | cut -f2 -d= |while read i; do echo -n $i\. ; done`"
+version="`cat $chromium_svn_dir/chrome/VERSION | cut -f2 -d= |while read i; do echo -n $i\. ; done`" && version=$(echo $version | sed s/\.$//)
+#revision="svn`cat $chromium_svn_dir/src/.svn/entries | grep -m1 -A1 'dir' | tr '\n\r' '-' | cut -f2 -d-`"
+
+echo "Version: $version"
+#echo "Revision: $revision"
+
+xz="`which xz 2>/dev/null`"
+#xz="`which pxz 2>/dev/null`"
+#lzma="`which lzma 2>/dev/null`"
+
+
+if [ -z $chromium_svn_dir ]
+then
+	echo "Usage:  `basename $0` [SVN_SOURCE_DIR]"
+	exit 1
+fi
+
+if [ -f $xz ]
+then
+	compress=$xz
+	#compress_opts='-9 -F lzma' #xz compresses MUCH faster, so why not make it compress more?  We have the RAM...
+	compress_opts='-9'
+	echo "using xz"
+else
+    exit 1
+	compress=$lzma
+	compress_opts="-7"
+	echo "using lzma"
+fi
+
+echo
+echo "Moving source in staging area"
+cp -ra $chromium_svn_dir ${chromium_tgt_dir}/src
+
+# remove big bad ffmpeg binaries.
+echo "Removing ffmpeg binaries/sources"
+cd $chromium_tgt_dir/src/third_party/ffmpeg/
+rm -rf binaries/ chromium/binaries/
+rm -rf doc ffpresets mt-work tools tests
+find -type f -name "*.c" | grep -v xcode_hack.c | xargs rm -f 
+echo "Removing courgette sources"
+cd $chromium_tgt_dir/src/
+rm -rf courgette/
+echo "Removing o3d plugin sources (Not yet buildable)"
+cd $chromium_tgt_dir/src/
+rm -rf o3d/
+echo "Removing unnecessary sources"
+rm -rf third_party/WebKit/WebKitTools/Scripts/webkitpy/layout_tests/
+rm -rf webkit/data/layout_tests/
+#rm -rf third_party/hunspell/dictionaries/
+rm -rf src/third_party/WebKit/LayoutTests/
+rm -rf chrome/test/data/
+rm -rf third_party/icu/icudt42.dll  
+#rm -rf third_party/icu/linux/  
+rm -rf third_party/icu/mac/  
+#rm -rf third_party/icu/source/
+rm -rf native_client/tests/
+#rm -rf third_party/libvpx/ 
+#rm -rf third_party/speex/
+# Remove other directories (untested)
+cd $chromium_tgt_dir/src/third_party
+# First, just take out the sources for the items which have already been conditionalized so we're sure we're not using them.
+# We need to leave the .gyp files since this is how it finds the system libs.
+# bzip2
+#rm -rf bzip2/*.c bzip2/*.h bzip2/LICENSE
+
+# libjpeg
+#rm -rf libjpeg/*.c libjpeg/README*
+
+# libpng
+#rm -rf libpng/*.c libpng/*.h libpng/README* libpng/LICENSE
+
+# libevent 
+#rm -rf libevent/*.c libevent/*.h libevent/*sh libevent/config* libevent/*.3 libevent/README libevent/compat libevent/linux libevent/mac libevent/sample libevent/test libevent/ChangeLog libevent/Makefile.* libevent/aclocal.m4 libevent/*.py libevent/mising libevent/mkinstalldirs
+
+# libxml
+#rm -rf libxml/*c libxml/*.h libxml/*.in libxml/*sh libxml/*.m4 libxml/*.py libxml/*.xml libxml/missing libxml/mkinstalldirs libxml/*.1 libxml/build libxml/include libxml/linux libxml/mac libxml/win32 libxml/AUTHORS libxml/COPYING libxml/ChangeLog libxml/Copyright libxml/INSTALL libxml/NEWS libxml/README libxml/README.tests libxml/TODO* libxml/config* libxml/*.pl
+
+# libxslt
+#rm -rf libxslt/build libxslt/libexslt libxslt/libxslt libxslt/linux libxslt/mac libxslt/win32 libxslt/AUTHORS libxslt/COPYING libxslt/ChangeLog libxslt/FEATURES libxslt/INSTALL libxslt/NEWS libxslt/README libxslt/TODO libxslt/*.h libxslt/*.m4 libxslt/compile libxslt/config* libxslt/depcomp libxslt/*sh libxslt/*.in libxslt/*.spec libxslt/missing
+
+# Next, nuke the whole directories for things not yet conditionalized:
+#rm -rf nss/ nspr/ 
+
+# expat is only built on windows
+#rm -rf expat/files
+
+# Another copy of zlib? Unpossible!
+#rm -rf src/third_party/WebKit/WebCore/platform/image-decoders/zlib/
+
+# #Remove v8 as that we build against the system one
+# rm -rf src/v8/include src/v8/src/
+
+
+echo 
+echo "Recompressing and excluding svn data"
+echo "  this takes a while, sorry"
+echo "  Compressing with $compress"
+
+cd $chromium_tgt_dir/
+cd ..
+
+tar --exclude=\.svn -cf - ${name}-${version} | $compress ${compress_opts} > ${pwd}/${name}-${version}-vine.tar.xz
+
+#rm -rf $chromium_tgt_dir
+
+exit

nonfree/self-build-mikutter/mikutter-vl.spec

@@ -1,7 +1,7 @@
 Summary:	Simple, powerful and moeful twitter client
 Summary(ja):	至高の Twitter Client
 Name:		mikutter
-Version:	0.2.2.1537
+Version:	3.0.0
 Release:	1%{?_dist_release}
 License:	GPLv3
 Group:		System Environment/Libraries
@@ -83,6 +83,9 @@ update-desktop-database -q &> /dev/null || :
 
 
 %changelog
+* Sun Jun 15 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.0.0-1
+- new upstream release
+
 * Sun Apr 20 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.2.2.1537-1
 - new upstream release
 

nonfree/self-build-mikutter/self-build-mikutter-vl.spec

@@ -5,7 +5,7 @@
 Summary:	Package to automatically build %{pkgname} rpm package
 Summary(ja): 	%{pkgname} の rpm パッケージを自動作成するパッケージ
 Name:		self-build-%{pkgname}
-Version:	0.2.2.1537
+Version:	3.0.0
 Release: 	1%{?_dist_release}
 Source0:	%{pkgname}-vl.spec
 License:	GPLv3
@@ -101,12 +101,15 @@ Client を目指す Twitter Client。
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
 %posttrans
-/usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec %{sourceurl} 3000
+/usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec %{sourceurl} 5000
 
 %files
 %{_datadir}/%{name}
 
 %changelog
+* Sun Jun 15 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.0.0-1
+- new upstream release
+
 * Sun Apr 20 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.2.2.1537-1
 - new upstream release