diff --git a/.travis.yml b/.travis.yml index 10ec40cb2..c1d40d8db 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ before_install: git pull; brew update; brew unlink python; - brew install glib pkgconfig libffi protobuf protobuf-c qt gettext; + brew install glib pkgconfig libffi protobuf protobuf-c qt gettext gnutls; brew install sqlite --with-fts; brew install gstreamer gst-plugins-base; brew install gst-plugins-good --with-flac; diff --git a/dist/windows/strawberry-debug-x64.nsi.in b/dist/windows/strawberry-debug-x64.nsi.in index 864342fe7..e90b50dfb 100644 --- a/dist/windows/strawberry-debug-x64.nsi.in +++ b/dist/windows/strawberry-debug-x64.nsi.in @@ -162,6 +162,7 @@ Section "Strawberry" Strawberry File "libxml2-2.dll" File "libsoup-2.4-1.dll" File "liblzma-5.dll" + File "libgnutls-30.dll" ; Register Strawberry with Default Programs Var /GLOBAL AppIcon @@ -406,6 +407,7 @@ Section "Uninstall" Delete "$INSTDIR\libxml2-2.dll" Delete "$INSTDIR\libsoup-2.4-1.dll" Delete "$INSTDIR\liblzma-5.dll" + Delete "$INSTDIR\libgnutls-30.dll" Delete "$INSTDIR\platforms\qwindows.dll" Delete "$INSTDIR\sqldrivers\qsqlite.dll" diff --git a/dist/windows/strawberry-debug-x86.nsi.in b/dist/windows/strawberry-debug-x86.nsi.in index 0f0e1afc3..e392af0cd 100644 --- a/dist/windows/strawberry-debug-x86.nsi.in +++ b/dist/windows/strawberry-debug-x86.nsi.in @@ -162,6 +162,7 @@ Section "Strawberry" Strawberry File "libxml2-2.dll" File "libsoup-2.4-1.dll" File "liblzma-5.dll" + File "libgnutls-30.dll" ; Register Strawberry with Default Programs Var /GLOBAL AppIcon @@ -406,6 +407,7 @@ Section "Uninstall" Delete "$INSTDIR\libxml2-2.dll" Delete "$INSTDIR\libsoup-2.4-1.dll" Delete "$INSTDIR\liblzma-5.dll" + Delete "$INSTDIR\libgnutls-30.dll" Delete "$INSTDIR\platforms\qwindows.dll" Delete "$INSTDIR\sqldrivers\qsqlite.dll" diff --git a/dist/windows/strawberry-x64.nsi.in b/dist/windows/strawberry-x64.nsi.in index 56652a58d..17eac9469 100644 --- a/dist/windows/strawberry-x64.nsi.in +++ b/dist/windows/strawberry-x64.nsi.in @@ -155,12 +155,11 @@ Section "Strawberry" Strawberry File "Qt5Widgets.dll" File "Qt5WinExtras.dll" File "zlib1.dll" - ;File "libmpcdec-5.dll" - ;File "libtheora-0.dll" File "libfftw3-3.dll" File "libxml2-2.dll" File "libsoup-2.4-1.dll" File "liblzma-5.dll" + File "libgnutls-30.dll" ; Register Strawberry with Default Programs Var /GLOBAL AppIcon @@ -367,12 +366,11 @@ Section "Uninstall" Delete "$INSTDIR\Qt5Widgets.dll" Delete "$INSTDIR\Qt5WinExtras.dll" Delete "$INSTDIR\zlib1.dll" - ;Delete "$INSTDIR\libmpcdec-5.dll" - ;Delete "$INSTDIR\libtheora-0.dll" Delete "$INSTDIR\libfftw3-3.dll" Delete "$INSTDIR\libxml2-2.dll" Delete "$INSTDIR\libsoup-2.4-1.dll" Delete "$INSTDIR\liblzma-5.dll" + Delete "$INSTDIR\libgnutls-30.dll" Delete "$INSTDIR\platforms\qwindows.dll" Delete "$INSTDIR\sqldrivers\qsqlite.dll" diff --git a/dist/windows/strawberry-x86.nsi.in b/dist/windows/strawberry-x86.nsi.in index 1863f4e70..8c53da301 100644 --- a/dist/windows/strawberry-x86.nsi.in +++ b/dist/windows/strawberry-x86.nsi.in @@ -155,12 +155,11 @@ Section "Strawberry" Strawberry File "Qt5Widgets.dll" File "Qt5WinExtras.dll" File "zlib1.dll" - ;File "libmpcdec-5.dll" - ;File "libtheora-0.dll" File "libfftw3-3.dll" File "libxml2-2.dll" File "libsoup-2.4-1.dll" File "liblzma-5.dll" + File "libgnutls-30.dll" ; Register Strawberry with Default Programs Var /GLOBAL AppIcon @@ -367,12 +366,11 @@ Section "Uninstall" Delete "$INSTDIR\Qt5Widgets.dll" Delete "$INSTDIR\Qt5WinExtras.dll" Delete "$INSTDIR\zlib1.dll" - ;Delete "$INSTDIR\libmpcdec-5.dll" - ;Delete "$INSTDIR\libtheora-0.dll" Delete "$INSTDIR\libfftw3-3.dll" Delete "$INSTDIR\libxml2-2.dll" Delete "$INSTDIR\libsoup-2.4-1.dll" Delete "$INSTDIR\liblzma-5.dll" + Delete "$INSTDIR\libgnutls-30.dll" Delete "$INSTDIR\platforms\qwindows.dll" Delete "$INSTDIR\sqldrivers\qsqlite.dll"