Merge branch '3.1' into 3.2

This commit is contained in:
Fredrik Rinnestam 2015-10-17 17:00:32 +02:00
commit 88f83b09fe
8 changed files with 79 additions and 65 deletions

View File

@ -72,10 +72,10 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/Images/
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/responsiveDesign_2x.png
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/searchNext.png
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/searchPrev.png
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/securityStateHttp.png
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/securityStateHttp_2x.png
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/securityStateInsecure.png
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/securityStateInsecure_2x.png
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/securityStateNeutral.png
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/securityStateNeutral_2x.png
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/securityStateSecure.png
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/securityStateSecure_2x.png
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/securityStateWarning.png
@ -85,7 +85,6 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/Images/
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/settingsListRemove.png
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/settingsListRemove_2x.png
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/speech.png
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/spinner.svg
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/thumbActiveHoriz.png
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/thumbActiveVert.png
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/thumbHoriz.png
@ -111,6 +110,19 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/Images/
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/devtools.js
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/devtools_extension_api.js
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/elements_module.js
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/emulated_devices/
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/emulated_devices/google-nexus-5-horizontal-default-1x.png
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/emulated_devices/google-nexus-5-horizontal-default-2x.png
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/emulated_devices/google-nexus-5-horizontal-keyboard-1x.png
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/emulated_devices/google-nexus-5-horizontal-keyboard-2x.png
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/emulated_devices/google-nexus-5-horizontal-navigation-1x.png
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/emulated_devices/google-nexus-5-horizontal-navigation-2x.png
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/emulated_devices/google-nexus-5-vertical-default-1x.png
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/emulated_devices/google-nexus-5-vertical-default-2x.png
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/emulated_devices/google-nexus-5-vertical-keyboard-1x.png
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/emulated_devices/google-nexus-5-vertical-keyboard-2x.png
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/emulated_devices/google-nexus-5-vertical-navigation-1x.png
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/emulated_devices/google-nexus-5-vertical-navigation-2x.png
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/emulated_devices_module.js (EMPTY)
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/heap_snapshot_worker_module.js
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/inspector.css

View File

@ -1,3 +1,3 @@
f1b9c46940cefada831d642ec98f95c4 chromium-45.0.2454.99.tar.xz
0011d66f7ec8221fc021da3f5f66d929 chromium-46.0.2490.71.tar.xz
b527005e021b14869a669e42c46b661d chromium.desktop
64968626706b07721983ac59fb3babbf chromium.sh

View File

@ -5,7 +5,7 @@
# Depends on: ninja dbus-glib gtk libevent nss xorg-libxscrnsaver xorg-libxtst libgcrypt xorg-libxdamage yasm xorg-libxt gperf speech-dispatcher libdrm libexif pciutils
name=chromium
version=45.0.2454.99
version=46.0.2490.71
release=1
source=(http://commondatastorage.googleapis.com/$name-browser-official/$name-$version.tar.xz \
$name.sh $name.desktop)
@ -13,6 +13,8 @@ source=(http://commondatastorage.googleapis.com/$name-browser-official/$name-$ve
build() {
cd $name-$version
touch chrome/test/data/webui/i18n_process_css_test.html
export CFLAGS="$CFLAGS $(pkg-config --cflags nspr)"
export LDFLAGS="$LDFLAGS $(pkg-config --libs nspr)"

View File

@ -1 +1 @@
9673f1230d4bf8e1a779900f62edd96d flash-plugin-11.2.202.535-release.x86_64.rpm
110b35abebf8ebc1331a78976897dfed flash-plugin-11.2.202.540-release.x86_64.rpm

View File

@ -5,7 +5,7 @@
# Depends on:
name=flash-player-plugin
version=11.2.202.535
version=11.2.202.540
release=1
source=(http://fpdownload.macromedia.com/get/flashplayer/pdc/$version/flash-plugin-$version-release.x86_64.rpm)

View File

@ -3,64 +3,65 @@ drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/freetype-config
drwxr-xr-x root/root usr/include/
drwxr-xr-x root/root usr/include/freetype2/
drwxr-xr-x root/root usr/include/freetype2/config/
-rw-r--r-- root/root usr/include/freetype2/config/ftconfig.h
-rw-r--r-- root/root usr/include/freetype2/config/ftheader.h
-rw-r--r-- root/root usr/include/freetype2/config/ftmodule.h
-rw-r--r-- root/root usr/include/freetype2/config/ftoption.h
-rw-r--r-- root/root usr/include/freetype2/config/ftstdlib.h
-rw-r--r-- root/root usr/include/freetype2/freetype.h
drwxr-xr-x root/root usr/include/freetype2/freetype/
drwxr-xr-x root/root usr/include/freetype2/freetype/config/
-rw-r--r-- root/root usr/include/freetype2/freetype/config/ftconfig.h
-rw-r--r-- root/root usr/include/freetype2/freetype/config/ftheader.h
-rw-r--r-- root/root usr/include/freetype2/freetype/config/ftmodule.h
-rw-r--r-- root/root usr/include/freetype2/freetype/config/ftoption.h
-rw-r--r-- root/root usr/include/freetype2/freetype/config/ftstdlib.h
-rw-r--r-- root/root usr/include/freetype2/freetype/freetype.h
-rw-r--r-- root/root usr/include/freetype2/freetype/ftadvanc.h
-rw-r--r-- root/root usr/include/freetype2/freetype/ftautoh.h
-rw-r--r-- root/root usr/include/freetype2/freetype/ftbbox.h
-rw-r--r-- root/root usr/include/freetype2/freetype/ftbdf.h
-rw-r--r-- root/root usr/include/freetype2/freetype/ftbitmap.h
-rw-r--r-- root/root usr/include/freetype2/freetype/ftbzip2.h
-rw-r--r-- root/root usr/include/freetype2/freetype/ftcache.h
-rw-r--r-- root/root usr/include/freetype2/freetype/ftcffdrv.h
-rw-r--r-- root/root usr/include/freetype2/freetype/ftchapters.h
-rw-r--r-- root/root usr/include/freetype2/freetype/ftcid.h
-rw-r--r-- root/root usr/include/freetype2/freetype/fterrdef.h
-rw-r--r-- root/root usr/include/freetype2/freetype/fterrors.h
-rw-r--r-- root/root usr/include/freetype2/freetype/ftfntfmt.h
-rw-r--r-- root/root usr/include/freetype2/freetype/ftgasp.h
-rw-r--r-- root/root usr/include/freetype2/freetype/ftglyph.h
-rw-r--r-- root/root usr/include/freetype2/freetype/ftgxval.h
-rw-r--r-- root/root usr/include/freetype2/freetype/ftgzip.h
-rw-r--r-- root/root usr/include/freetype2/freetype/ftimage.h
-rw-r--r-- root/root usr/include/freetype2/freetype/ftincrem.h
-rw-r--r-- root/root usr/include/freetype2/freetype/ftlcdfil.h
-rw-r--r-- root/root usr/include/freetype2/freetype/ftlist.h
-rw-r--r-- root/root usr/include/freetype2/freetype/ftlzw.h
-rw-r--r-- root/root usr/include/freetype2/freetype/ftmac.h
-rw-r--r-- root/root usr/include/freetype2/freetype/ftmm.h
-rw-r--r-- root/root usr/include/freetype2/freetype/ftmodapi.h
-rw-r--r-- root/root usr/include/freetype2/freetype/ftmoderr.h
-rw-r--r-- root/root usr/include/freetype2/freetype/ftotval.h
-rw-r--r-- root/root usr/include/freetype2/freetype/ftoutln.h
-rw-r--r-- root/root usr/include/freetype2/freetype/ftpfr.h
-rw-r--r-- root/root usr/include/freetype2/freetype/ftrender.h
-rw-r--r-- root/root usr/include/freetype2/freetype/ftsizes.h
-rw-r--r-- root/root usr/include/freetype2/freetype/ftsnames.h
-rw-r--r-- root/root usr/include/freetype2/freetype/ftstroke.h
-rw-r--r-- root/root usr/include/freetype2/freetype/ftsynth.h
-rw-r--r-- root/root usr/include/freetype2/freetype/ftsystem.h
-rw-r--r-- root/root usr/include/freetype2/freetype/fttrigon.h
-rw-r--r-- root/root usr/include/freetype2/freetype/ftttdrv.h
-rw-r--r-- root/root usr/include/freetype2/freetype/fttypes.h
-rw-r--r-- root/root usr/include/freetype2/freetype/ftwinfnt.h
-rw-r--r-- root/root usr/include/freetype2/freetype/t1tables.h
-rw-r--r-- root/root usr/include/freetype2/freetype/ttnameid.h
-rw-r--r-- root/root usr/include/freetype2/freetype/tttables.h
-rw-r--r-- root/root usr/include/freetype2/freetype/tttags.h
-rw-r--r-- root/root usr/include/freetype2/freetype/ttunpat.h
-rw-r--r-- root/root usr/include/freetype2/ft2build.h
-rw-r--r-- root/root usr/include/freetype2/ftadvanc.h
-rw-r--r-- root/root usr/include/freetype2/ftautoh.h
-rw-r--r-- root/root usr/include/freetype2/ftbbox.h
-rw-r--r-- root/root usr/include/freetype2/ftbdf.h
-rw-r--r-- root/root usr/include/freetype2/ftbitmap.h
-rw-r--r-- root/root usr/include/freetype2/ftbzip2.h
-rw-r--r-- root/root usr/include/freetype2/ftcache.h
-rw-r--r-- root/root usr/include/freetype2/ftcffdrv.h
-rw-r--r-- root/root usr/include/freetype2/ftchapters.h
-rw-r--r-- root/root usr/include/freetype2/ftcid.h
-rw-r--r-- root/root usr/include/freetype2/fterrdef.h
-rw-r--r-- root/root usr/include/freetype2/fterrors.h
-rw-r--r-- root/root usr/include/freetype2/ftfntfmt.h
-rw-r--r-- root/root usr/include/freetype2/ftgasp.h
-rw-r--r-- root/root usr/include/freetype2/ftglyph.h
-rw-r--r-- root/root usr/include/freetype2/ftgxval.h
-rw-r--r-- root/root usr/include/freetype2/ftgzip.h
-rw-r--r-- root/root usr/include/freetype2/ftimage.h
-rw-r--r-- root/root usr/include/freetype2/ftincrem.h
-rw-r--r-- root/root usr/include/freetype2/ftlcdfil.h
-rw-r--r-- root/root usr/include/freetype2/ftlist.h
-rw-r--r-- root/root usr/include/freetype2/ftlzw.h
-rw-r--r-- root/root usr/include/freetype2/ftmac.h
-rw-r--r-- root/root usr/include/freetype2/ftmm.h
-rw-r--r-- root/root usr/include/freetype2/ftmodapi.h
-rw-r--r-- root/root usr/include/freetype2/ftmoderr.h
-rw-r--r-- root/root usr/include/freetype2/ftotval.h
-rw-r--r-- root/root usr/include/freetype2/ftoutln.h
-rw-r--r-- root/root usr/include/freetype2/ftpfr.h
-rw-r--r-- root/root usr/include/freetype2/ftrender.h
-rw-r--r-- root/root usr/include/freetype2/ftsizes.h
-rw-r--r-- root/root usr/include/freetype2/ftsnames.h
-rw-r--r-- root/root usr/include/freetype2/ftstroke.h
-rw-r--r-- root/root usr/include/freetype2/ftsynth.h
-rw-r--r-- root/root usr/include/freetype2/ftsystem.h
-rw-r--r-- root/root usr/include/freetype2/fttrigon.h
-rw-r--r-- root/root usr/include/freetype2/ftttdrv.h
-rw-r--r-- root/root usr/include/freetype2/fttypes.h
-rw-r--r-- root/root usr/include/freetype2/ftwinfnt.h
-rw-r--r-- root/root usr/include/freetype2/t1tables.h
-rw-r--r-- root/root usr/include/freetype2/ttnameid.h
-rw-r--r-- root/root usr/include/freetype2/tttables.h
-rw-r--r-- root/root usr/include/freetype2/tttags.h
-rw-r--r-- root/root usr/include/freetype2/ttunpat.h
drwxr-xr-x root/root usr/lib/
-rw-r--r-- root/root usr/lib/libfreetype.a
-rwxr-xr-x root/root usr/lib/libfreetype.la
lrwxrwxrwx root/root usr/lib/libfreetype.so -> libfreetype.so.6.12.0
lrwxrwxrwx root/root usr/lib/libfreetype.so.6 -> libfreetype.so.6.12.0
-rwxr-xr-x root/root usr/lib/libfreetype.so.6.12.0
lrwxrwxrwx root/root usr/lib/libfreetype.so -> libfreetype.so.6.12.1
lrwxrwxrwx root/root usr/lib/libfreetype.so.6 -> libfreetype.so.6.12.1
-rwxr-xr-x root/root usr/lib/libfreetype.so.6.12.1
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/freetype2.pc
drwxr-xr-x root/root usr/man/

View File

@ -1 +1 @@
5682890cb0267f6671dd3de6eabd3e69 freetype-2.6.tar.bz2
35cb8f4d9e5906847901bb39324c2f80 freetype-2.6.1.tar.bz2

View File

@ -5,7 +5,7 @@
# Depends on: zlib libpng
name=freetype
version=2.6
version=2.6.1
release=1
source=(http://download.savannah.gnu.org/releases/$name/$name-$version.tar.bz2)
@ -14,8 +14,7 @@ build() {
./configure --prefix=/usr \
--mandir=/usr/man \
--with-zlib \
--disable-nls
--with-zlib
make
make DESTDIR=$PKG install