diff --git a/README.md b/README.md index d205af52..65b2a78b 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ My efforts here will focus on creating a **64-bit version** of the GTK+-2 runtim The installers can be found in the [releases section](https://github.com/tschoonj/GTK-for-Windows-Runtime-Environment-Installer/releases). -The current releases ([gtk2-runtime-2.24.32-2018-02-20-ts-win64.exe](https://github.com/tschoonj/GTK-for-Windows-Runtime-Environment-Installer/releases/download/2018-02-20/gtk2-runtime-2.24.32-2018-02-20-ts-win64.exe) and [gtk3-runtime-3.22.28-2018-02-20-ts-win64.exe](https://github.com/tschoonj/GTK-for-Windows-Runtime-Environment-Installer/releases/download/2018-02-20/gtk3-runtime-3.22.28-2018-02-20-ts-win64.exe)) were obtained entirely from the excellent [MSYS2 project](www.msys2.org), and were **not** compiled by myself, as was the case for releases made before 2017. Users who want to compile against this runtime are strongly encouraged to set up a MSYS2 installation themselves, and install the required packages (compiled with the mingw-w64-x86\_64 toolchain!!!). +The current releases ([gtk2-runtime-2.24.32-2018-03-12-ts-win64.exe](https://github.com/tschoonj/GTK-for-Windows-Runtime-Environment-Installer/releases/download/2018-03-12/gtk2-runtime-2.24.32-2018-03-12-ts-win64.exe) and [gtk3-runtime-3.22.28-2018-03-12-ts-win64.exe](https://github.com/tschoonj/GTK-for-Windows-Runtime-Environment-Installer/releases/download/2018-03-12/gtk3-runtime-3.22.28-2018-03-12-ts-win64.exe)) were obtained entirely from the excellent [MSYS2 project](www.msys2.org), and were **not** compiled by myself, as was the case for releases made before 2017. Users who want to compile against this runtime are strongly encouraged to set up a MSYS2 installation themselves, and install the required packages (compiled with the mingw-w64-x86\_64 toolchain!!!). The following packages are included in the current GTK+-2/3 installers @@ -36,7 +36,7 @@ The following packages are included in the current GTK+-2/3 installers * [harfbuzz](http://www.freedesktop.org/software/harfbuzz/release/) (1.7.5) * [hicolor-icon-theme](http://icon-theme.freedesktop.org/releases/) (0.15) * [json-glib](http://ftp.gnome.org/pub/gnome/sources/json-glib/) (1.4.2) -* [libepoxy](https://github.com/anholt/libepoxy) (1.4.3) +* [libepoxy](https://github.com/anholt/libepoxy) (1.5.0) * [libffi](http://sourceware.org/libffi/) (3.2.1) * [libiconv](https://ftp.gnu.org/pub/gnu/libiconv/) (1.15) * [libpng](http://sourceforge.net/project/showfiles.php?group_id=5624) (1.6.34) diff --git a/gtk-nsis-pack/bin/libepoxy-0.dll b/gtk-nsis-pack/bin/libepoxy-0.dll index 44c1e76b..9f986a8f 100644 Binary files a/gtk-nsis-pack/bin/libepoxy-0.dll and b/gtk-nsis-pack/bin/libepoxy-0.dll differ diff --git a/gtk-nsis-pack/bin/libjasper-4.dll b/gtk-nsis-pack/bin/libjasper-4.dll new file mode 100644 index 00000000..5f1d370d Binary files /dev/null and b/gtk-nsis-pack/bin/libjasper-4.dll differ diff --git a/gtk-nsis-pack/bin/libjpeg-8.dll b/gtk-nsis-pack/bin/libjpeg-8.dll new file mode 100644 index 00000000..5e938ed4 Binary files /dev/null and b/gtk-nsis-pack/bin/libjpeg-8.dll differ diff --git a/gtk-nsis-pack/copy-msys2-files.sh b/gtk-nsis-pack/copy-msys2-files.sh index 27e0b0ec..0a2d4b23 100644 --- a/gtk-nsis-pack/copy-msys2-files.sh +++ b/gtk-nsis-pack/copy-msys2-files.sh @@ -102,6 +102,8 @@ cp $INSTALL_SRC_MSYS2_BIN/libbz2-1.dll $INSTALL_SRC_BIN cp $INSTALL_SRC_MSYS2_BIN/libgraphite2.dll $INSTALL_SRC_BIN cp $INSTALL_SRC_MSYS2_BIN/librsvg-2-2.dll $INSTALL_SRC_BIN cp $INSTALL_SRC_MSYS2_BIN/libtiff-5.dll $INSTALL_SRC_BIN +cp $INSTALL_SRC_MSYS2_BIN/libjasper-4.dll $INSTALL_SRC_BIN +cp $INSTALL_SRC_MSYS2_BIN/libjpeg-8.dll $INSTALL_SRC_BIN # libsoup and its dependencies cp $INSTALL_SRC_MSYS2_BIN/libsoup-2.4-1.dll $INSTALL_SRC_BIN diff --git a/gtk-nsis-pack/gtk2-runtime.ts.nsi b/gtk-nsis-pack/gtk2-runtime.ts.nsi index 08480799..378ef9f8 100644 --- a/gtk-nsis-pack/gtk2-runtime.ts.nsi +++ b/gtk-nsis-pack/gtk2-runtime.ts.nsi @@ -14,7 +14,7 @@ !define GTK_VERSION "2.24.32" !define GTK_BIN_VERSION "2.10.0" -!define PRODUCT_VERSION "${GTK_VERSION}-2018-02-20-ts-win64" +!define PRODUCT_VERSION "${GTK_VERSION}-2018-03-12-ts-win64" !define PRODUCT_NAME "GTK2-Runtime Win64" !define PRODUCT_PUBLISHER "Tom Schoonjans" !define PRODUCT_WEB_SITE "https://github.com/tschoonj/GTK-for-Windows-Runtime-Environment-Installer" @@ -270,6 +270,9 @@ SectionIn 1 2 RO File bin\libpangomm-1.4-1.dll File bin\libpixman-1-0.dll ; libpixman, needed by cairo File bin\libpng16-16.dll ; for gdk_pixbuf loader. + File bin\libjasper-4.dll ; for gdk_pixbuf loader. + File bin\libjpeg-8.dll ; for gdk_pixbuf loader. + File bin\libtiff-5.dll ; for gdk_pixbuf loader. File bin\libxml++-2.6-2.dll ; fontconfig needs this File bin\libxml++-3.0-1.dll File bin\libpcre-1.dll @@ -280,7 +283,8 @@ SectionIn 1 2 RO File bin\libbz2-1.dll ; required by fontconfig File bin\libgraphite2.dll ; required by harfbuzz File bin\librsvg-2-2.dll ; required by adwaita-icon-theme - File bin\libtiff-5.dll ; required by gdk-pixbuf2 + File bin\libcroco-0.6-3.dll ; required by adwaita-icon-theme + File bin\liblzma-5.dll ; required by adwaita-icon-theme File bin\libstdc++-6.dll File bin\libgcc_s_seh-1.dll File bin\libwinpthread-1.dll @@ -626,6 +630,9 @@ Function un.DeleteDlls Delete $LIB_INSTDIR\libpangomm-1.4-1.dll Delete $LIB_INSTDIR\libpixman-1-0.dll ; libpixman, needed by cairo Delete $LIB_INSTDIR\libpng16-16.dll ; for gdk_pixbuf loader. + Delete $LIB_INSTDIR\libjasper-4.dll ; for gdk_pixbuf loader. + Delete $LIB_INSTDIR\libjpeg-8.dll ; for gdk_pixbuf loader. + Delete $LIB_INSTDIR\libtiff-5.dll ; for gdk_pixbuf loader. Delete $LIB_INSTDIR\libxml2-2.dll ; fontconfig needs this Delete $LIB_INSTDIR\libxslt-1.dll ; fontconfig needs this Delete $LIB_INSTDIR\libxml++-2.6-2.dll ; fontconfig needs this @@ -636,7 +643,8 @@ Function un.DeleteDlls Delete $LIB_INSTDIR\libbz2-1.dll Delete $LIB_INSTDIR\libgraphite2.dll Delete $LIB_INSTDIR\librsvg-2-2.dll - Delete $LIB_INSTDIR\libtiff-5.dll + Delete $LIB_INSTDIR\libcroco-0.6-3.dll + Delete $LIB_INSTDIR\liblzma-5.dll Delete $LIB_INSTDIR\libstdc++-6.dll Delete $LIB_INSTDIR\libgcc_s_seh-1.dll Delete $LIB_INSTDIR\libwinpthread-1.dll diff --git a/gtk-nsis-pack/gtk3-runtime.ts.nsi b/gtk-nsis-pack/gtk3-runtime.ts.nsi index 385c9107..771fc4d7 100644 --- a/gtk-nsis-pack/gtk3-runtime.ts.nsi +++ b/gtk-nsis-pack/gtk3-runtime.ts.nsi @@ -13,7 +13,7 @@ !define GTK_VERSION "3.22.28" !define GTK_BIN_VERSION "3.0.0" -!define PRODUCT_VERSION "${GTK_VERSION}-2018-02-20-ts-win64" +!define PRODUCT_VERSION "${GTK_VERSION}-2018-03-12-ts-win64" !define PRODUCT_NAME "GTK3-Runtime Win64" !define PRODUCT_PUBLISHER "Tom Schoonjans" !define PRODUCT_WEB_SITE "https://github.com/tschoonj/GTK-for-Windows-Runtime-Environment-Installer" @@ -272,6 +272,8 @@ SectionIn 1 2 RO File bin\libpangomm-1.4-1.dll File bin\libpixman-1-0.dll ; libpixman, needed by cairo File bin\libpng16-16.dll ; required by gdk-pixbuf2 + File bin\libjpeg-8.dll ; required by gdk-pixbuf2 + File bin\libjasper-4.dll ; required by gdk-pixbuf2 File bin\libxml++-2.6-2.dll ; fontconfig needs this File bin\libxml++-3.0-1.dll File bin\libxml2-2.dll ; fontconfig needs this @@ -650,6 +652,8 @@ Function un.DeleteDlls Delete $LIB_INSTDIR\libpangomm-1.4-1.dll Delete $LIB_INSTDIR\libpixman-1-0.dll ; libpixman, needed by cairo Delete $LIB_INSTDIR\libpng16-16.dll ; for gdk_pixbuf loader. + Delete $LIB_INSTDIR\libjasper-4.dll ; for gdk_pixbuf loader. + Delete $LIB_INSTDIR\libjpeg-8.dll ; for gdk_pixbuf loader. Delete $LIB_INSTDIR\libxslt-1.dll ; fontconfig needs this Delete $LIB_INSTDIR\libpcre-1.dll ; fontconfig needs this Delete $LIB_INSTDIR\libxml2-2.dll ; fontconfig needs this