[easytag] Update Windows installer for latest Fedora MinGW



commit effffadf1472a55ef6470f2b1763eefeef7c3b71
Author: David King <amigadave amigadave com>
Date:   Mon Dec 5 19:21:36 2016 +0000

    Update Windows installer for latest Fedora MinGW
    
    Drop Pango modules, add additional libraries.

 SOURCES                        |    7 ++++++-
 easytag-win32-installer.nsi.in |   16 ++++++++++------
 2 files changed, 16 insertions(+), 7 deletions(-)
---
diff --git a/SOURCES b/SOURCES
index d0bca73..efd58c3 100644
--- a/SOURCES
+++ b/SOURCES
@@ -1,12 +1,16 @@
 Source: https://git.gnome.org/browse/easytag/tag/?id=easytag-2.4.2
 
-This binary was generated with GCC/MinGW on Fedora 22.
+This binary was generated with GCC/MinGW on Fedora 25.
 
 DLLs and binaries from the following Fedora binary packages are included:
 
 * mingw32-atk
+* mingw32-bzip2
 * mingw32-cairo
+* mingw32-expat
 * mingw32-flac
+* mingw32-fontconfig
+* mingw32-freetype
 * mingw32-gcc
 * mingw32-gcc-c++
 * mingw32-gdk-pixbuf
@@ -23,6 +27,7 @@ DLLs and binaries from the following Fedora binary packages are included:
 * mingw32-opus
 * mingw32-opusfile
 * mingw32-pango
+* mingw32-pcre
 * mingw32-pixman
 * mingw32-speex
 * mingw32-taglib
diff --git a/easytag-win32-installer.nsi.in b/easytag-win32-installer.nsi.in
index 12eab72..d782bf5 100644
--- a/easytag-win32-installer.nsi.in
+++ b/easytag-win32-installer.nsi.in
@@ -168,11 +168,15 @@ Section "Core ${PRODUCT_NAME} Files" SecProgram
   SetOutPath "$INSTDIR\bin"
   File "${PREFIX}/bin/iconv.dll"
   File "${PREFIX}/bin/libatk-1.0-0.dll"
+  File "${PREFIX}/bin/libbz2-1.dll"
   File "${PREFIX}/bin/libcairo-2.dll"
   File "${PREFIX}/bin/libcairo-gobject-2.dll"
   File "${PREFIX}/bin/libepoxy-0.dll"
+  File "${PREFIX}/bin/libexpat-1.dll"
   File "${PREFIX}/bin/libFLAC-8.dll"
   File "${PREFIX}/bin/libffi-6.dll"
+  File "${PREFIX}/bin/libfontconfig-1.dll"
+  File "${PREFIX}/bin/libfreetype-6.dll"
   File "${PREFIX}/bin/libgcc_s_sjlj-1.dll"
   File "${PREFIX}/bin/libgdk-3-0.dll"
   File "${PREFIX}/bin/libgdk_pixbuf-2.0-0.dll"
@@ -190,6 +194,7 @@ Section "Core ${PRODUCT_NAME} Files" SecProgram
   File "${PREFIX}/bin/libpango-1.0-0.dll"
   File "${PREFIX}/bin/libpangocairo-1.0-0.dll"
   File "${PREFIX}/bin/libpangowin32-1.0-0.dll"
+  File "${PREFIX}/bin/libpcre-1.dll"
   File "${PREFIX}/bin/libpixman-1-0.dll"
   File "${PREFIX}/bin/libpng16-16.dll"
   File "${PREFIX}/bin/libstdc++-6.dll"
@@ -202,18 +207,15 @@ Section "Core ${PRODUCT_NAME} Files" SecProgram
   File "${PREFIX}/bin/glib-compile-schemas.exe"
   File "${PREFIX}/bin/gspawn-win32-helper.exe"
   File "${PREFIX}/bin/gtk-update-icon-cache.exe"
-  File "${PREFIX}/bin/pango-querymodules.exe"
   File "${PREFIX}/bin/zlib1.dll"
 
   SetOutPath "$INSTDIR\etc"
   File /r "${PREFIX}/etc/fonts"
   File /r "${PREFIX}/etc/gtk-3.0"
-  CreateDirectory "$INSTDIR\etc\pango"
 
   SetOutPath "$INSTDIR\lib"
   File /r "${PREFIX}/lib/gdk-pixbuf-2.0"
   File /r "${PREFIX}/lib/gtk-3.0"
-  File /r "${PREFIX}/lib/pango"
 
   SetOutPath "$INSTDIR\etc\gtk-3.0"
   FileOpen $0 settings.ini w
@@ -242,7 +244,6 @@ Section "Core ${PRODUCT_NAME} Files" SecProgram
 
   ReadEnvStr $0 COMSPEC
   SetOutPath "$INSTDIR"
-  nsExec::ExecToLog '"$0" /C bin\pango-querymodules.exe > etc\pango\pango.modules'
   nsExec::ExecToLog '"$0" /C bin\glib-compile-schemas.exe share\glib-2.0\schemas'
   nsExec::ExecToLog '"$0" /C bin\gtk-update-icon-cache.exe share\icons\Adwaita'
   nsExec::ExecToLog '"$0" /C bin\gtk-update-icon-cache.exe share\icons\hicolor'
@@ -394,12 +395,10 @@ Section Uninstall
   RMDir /r "$INSTDIR\lib\pango"
   RMDir /r "$INSTDIR\lib\gtk-3.0"
   RMDir /r "$INSTDIR\lib\gdk-pixbuf-2.0"
-  RMDir /r "$INSTDIR\etc\pango"
   RMDir /r "$INSTDIR\etc\gtk-3.0"
   RMDir /r "$INSTDIR\etc\fonts"
 
   Delete /rebootok "$INSTDIR\bin\zlib1.dll"
-  Delete /rebootok "$INSTDIR\bin\pango-querymodules.exe"
   Delete /rebootok "$INSTDIR\bin\gtk-update-icon-cache.exe"
   Delete /rebootok "$INSTDIR\bin\gspawn-win32-helper.exe"
   Delete /rebootok "$INSTDIR\bin\glib-compile-schemas.exe"
@@ -412,6 +411,7 @@ Section Uninstall
   Delete /rebootok "$INSTDIR\bin\libspeex-1.dll"
   Delete /rebootok "$INSTDIR\bin\libpng16-16.dll"
   Delete /rebootok "$INSTDIR\bin\libpixman-1-0.dll"
+  Delete /rebootok "$INSTDIR\bin\libpcre-1.dll"
   Delete /rebootok "$INSTDIR\bin\libpangowin32-1.0-0.dll"
   Delete /rebootok "$INSTDIR\bin\libpangocairo-1.0-0.dll"
   Delete /rebootok "$INSTDIR\bin\libpango-1.0-0.dll"
@@ -429,11 +429,15 @@ Section Uninstall
   Delete /rebootok "$INSTDIR\bin\libgdk_pixbuf-2.0-0.dll"
   Delete /rebootok "$INSTDIR\bin\libgdk-3-0.dll"
   Delete /rebootok "$INSTDIR\bin\libgcc_s_sjlj-1.dll"
+  Delete /rebootok "$INSTDIR\bin\libfreetype-6.dll"
+  Delete /rebootok "$INSTDIR\bin\libfontconfig-1.dll"
   Delete /rebootok "$INSTDIR\bin\libffi-6.dll"
   Delete /rebootok "$INSTDIR\bin\libFLAC-8.dll"
+  Delete /rebootok "$INSTDIR\bin\libexpat-1.dll"
   Delete /rebootok "$INSTDIR\bin\libepoxy-0.dll"
   Delete /rebootok "$INSTDIR\bin\libcairo-gobject-2.dll"
   Delete /rebootok "$INSTDIR\bin\libcairo-2.dll"
+  Delete /rebootok "$INSTDIR\bin\libbz2-1.dll"
   Delete /rebootok "$INSTDIR\bin\libatk-1.0-0.dll"
   Delete /rebootok "$INSTDIR\bin\iconv.dll"
   RMDir /r "$INSTDIR\usr"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]