Update to 20171125

3 files changed, 8 insertions, 46 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1d422680a55b..40dfafe5cfca 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Wed Oct 25 15:52:22 UTC 2017
+# Sun Nov 26 00:01:22 UTC 2017
 pkgbase = vlc-nightly
 	pkgdesc = A multi-platform MPEG, VCD/DVD, and DivX player - nightly snapshot
-	pkgver = 3.0.0v20171023
+	pkgver = 3.0.0v20171125
 	pkgrel = 1
 	url = http://www.videolan.org/vlc/
 	arch = i686
@@ -101,15 +101,13 @@ pkgbase = vlc-nightly
 	conflicts = vlc
 	replaces = vlc-plugin
 	options = !emptydirs
-	source = http://nightlies.videolan.org/build/source/vlc-3.0.0-20171023-0237-git.tar.xz
+	source = http://nightlies.videolan.org/build/source/vlc-3.0.0-20171125-0230-git.tar.xz
 	source = update-vlc-plugin-cache.hook
 	source = https://git.archlinux.org/svntogit/packages.git/plain/trunk/lua53_compat.patch?h=packages/vlc
-	source = 0001-Prevent-including-missing-SVGs.patch
 	source = find-deps.py
-	sha256sums = 4599182701872f8799102d57ebbd8463897103be8d0b27b30a750ca60c668b71
+	sha256sums = 597c007c11234e615c290c407222eaca24bfaa96f2a42f42b4346ba19d01be9e
 	sha256sums = c6f60c50375ae688755557dbfc5bd4a90a8998f8cf4d356c10d872a1a0b44f3a
 	sha256sums = d1cb88a1037120ea83ef75b2a13039a16825516b776d71597d0e2eae5df2d8fa
-	sha256sums = 599ce4bf0db5fc74f54bc03136b662606c22b8435b81440b02fc73f52d09bd7f
 	sha256sums = 90b0e34d5772d2307ba07a1c2aa715db7488389003cfe6d3570b2a9c63061db7
 
 pkgname = vlc-nightly
diff --git a/0001-Prevent-including-missing-SVGs.patch b/0001-Prevent-including-missing-SVGs.patch
deleted file mode 100644
index dd5a46260828..000000000000
--- a/0001-Prevent-including-missing-SVGs.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/modules/gui/qt/vlc.qrc	2017-10-18 21:40:51.489682799 +0200
-+++ b/modules/gui/qt/vlc.qrc	2017-10-18 21:39:05.602097150 +0200
-@@ -106,19 +106,19 @@
-         <file alias="sample_skins.png">pixmaps/sample_skins.png</file>
-     </qresource>
-     <qresource prefix="/prefsmenu/advanced">
--        <file alias="audio.svg">pixmaps/prefs/advprefs_audio.svg</file>
--        <file alias="codec.svg">pixmaps/prefs/advprefs_codec.svg</file>
--        <file alias="extended.svg">pixmaps/prefs/advprefs_extended.svg</file>
--        <file alias="intf.svg">pixmaps/prefs/advprefs_intf.svg</file>
--        <file alias="playlist.svg">pixmaps/prefs/advprefs_playlist.svg</file>
--        <file alias="sout.svg">pixmaps/prefs/advprefs_sout.svg</file>
--        <file alias="video.svg">pixmaps/prefs/advprefs_video.svg</file>
-+        <file alias="audio.svg">pixmaps/prefs/advprefs_audio.png</file>
-+        <file alias="codec.svg">pixmaps/prefs/advprefs_codec.png</file>
-+        <file alias="extended.svg">pixmaps/prefs/advprefs_extended.png</file>
-+        <file alias="intf.svg">pixmaps/prefs/advprefs_intf.png</file>
-+        <file alias="playlist.svg">pixmaps/prefs/advprefs_playlist.png</file>
-+        <file alias="sout.svg">pixmaps/prefs/advprefs_sout.png</file>
-+        <file alias="video.svg">pixmaps/prefs/advprefs_video.png</file>
-     </qresource>
-     <qresource prefix="/win7">
--        <file alias="pause.svg">pixmaps/win7/win7thumbnail_pause.svg</file>
--        <file alias="prev.svg">pixmaps/win7/win7thumbnail_prev.svg</file>
--        <file alias="play.svg">pixmaps/win7/win7thumbnail_play.svg</file>
--        <file alias="next.svg">pixmaps/win7/win7thumbnail_next.svg</file>
-+        <file alias="pause.svg">pixmaps/win7/win7thumbnail_pause.png</file>
-+        <file alias="prev.svg">pixmaps/win7/win7thumbnail_prev.png</file>
-+        <file alias="play.svg">pixmaps/win7/win7thumbnail_play.png</file>
-+        <file alias="next.svg">pixmaps/win7/win7thumbnail_next.png</file>
-     </qresource>
-     <qresource prefix="/sidebar">
-         <file alias="disc.svg">pixmaps/playlist/sidebar-icons/disc.svg</file>
diff --git a/PKGBUILD b/PKGBUILD
index 6c12f11be0fd..a107a4043ec7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,10 +5,10 @@
 
 _appname_=vlc
 pkgname=${_appname_}-nightly
-pkgver=3.0.0v20171023
+pkgver=3.0.0v20171125
 _pkgver=3.0.0
-_snapshot_=20171023
-_snapver_=0237
+_snapshot_=20171125
+_snapver_=0230
 _nightly_=${_snapshot_}-${_snapver_}
 pkgrel=1
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player - nightly snapshot"
@@ -63,7 +63,6 @@ options=("!emptydirs")
 source=("http://nightlies.videolan.org/build/source/vlc-${_pkgver}-${_nightly_}-git.tar.xz" 
         'update-vlc-plugin-cache.hook'
         'https://git.archlinux.org/svntogit/packages.git/plain/trunk/lua53_compat.patch?h=packages/vlc'
-        '0001-Prevent-including-missing-SVGs.patch'
         'find-deps.py')
 
 pkgver() {
@@ -78,7 +77,6 @@ prepare() {
   patch -Np1 -i "${srcdir}/vlc"
   sed -i -e 's:truetype/ttf-dejavu:TTF:g' modules/visualization/projectm.cpp
   sed -i -e 's:truetype/freefont:TTF:g' modules/text_renderer/freetype/freetype.c
-  patch -p1 -i "$srcdir/0001-Prevent-including-missing-SVGs.patch"
 }
 
 build() {
@@ -132,8 +130,7 @@ package() {
   #  depends=("${_detected_depends[@]}" "${_undetected_depends[@]}")
 }
 
-sha256sums=('4599182701872f8799102d57ebbd8463897103be8d0b27b30a750ca60c668b71'
+sha256sums=('597c007c11234e615c290c407222eaca24bfaa96f2a42f42b4346ba19d01be9e'
             'c6f60c50375ae688755557dbfc5bd4a90a8998f8cf4d356c10d872a1a0b44f3a'
             'd1cb88a1037120ea83ef75b2a13039a16825516b776d71597d0e2eae5df2d8fa'
-            '599ce4bf0db5fc74f54bc03136b662606c22b8435b81440b02fc73f52d09bd7f'
             '90b0e34d5772d2307ba07a1c2aa715db7488389003cfe6d3570b2a9c63061db7')