Skip to content

Commit de8599e

Browse files
tschoonjtschoonj
committed
New installers: 2018-03-12
* Closes #13 -> add missing libjasper and libjpeg dlls
1 parent 0f30a32 commit de8599e

7 files changed

Lines changed: 20 additions & 6 deletions

File tree

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ My efforts here will focus on creating a **64-bit version** of the GTK+-2 runtim
99

1010
The installers can be found in the [releases section](https://github.com/tschoonj/GTK-for-Windows-Runtime-Environment-Installer/releases).
1111

12-
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!!!).
12+
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!!!).
1313

1414
The following packages are included in the current GTK+-2/3 installers
1515

@@ -36,7 +36,7 @@ The following packages are included in the current GTK+-2/3 installers
3636
* [harfbuzz](http://www.freedesktop.org/software/harfbuzz/release/) (1.7.5)
3737
* [hicolor-icon-theme](http://icon-theme.freedesktop.org/releases/) (0.15)
3838
* [json-glib](http://ftp.gnome.org/pub/gnome/sources/json-glib/) (1.4.2)
39-
* [libepoxy](https://github.com/anholt/libepoxy) (1.4.3)
39+
* [libepoxy](https://github.com/anholt/libepoxy) (1.5.0)
4040
* [libffi](http://sourceware.org/libffi/) (3.2.1)
4141
* [libiconv](https://ftp.gnu.org/pub/gnu/libiconv/) (1.15)
4242
* [libpng](http://sourceforge.net/project/showfiles.php?group_id=5624) (1.6.34)

‎gtk-nsis-pack/bin/libepoxy-0.dll‎

36.9 KB
Binary file not shown.

‎gtk-nsis-pack/bin/libjasper-4.dll‎

446 KB
Binary file not shown.

‎gtk-nsis-pack/bin/libjpeg-8.dll‎

456 KB
Binary file not shown.

‎gtk-nsis-pack/copy-msys2-files.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,8 @@ cp $INSTALL_SRC_MSYS2_BIN/libbz2-1.dll $INSTALL_SRC_BIN
102102
cp $INSTALL_SRC_MSYS2_BIN/libgraphite2.dll $INSTALL_SRC_BIN
103103
cp $INSTALL_SRC_MSYS2_BIN/librsvg-2-2.dll $INSTALL_SRC_BIN
104104
cp $INSTALL_SRC_MSYS2_BIN/libtiff-5.dll $INSTALL_SRC_BIN
105+
cp $INSTALL_SRC_MSYS2_BIN/libjasper-4.dll $INSTALL_SRC_BIN
106+
cp $INSTALL_SRC_MSYS2_BIN/libjpeg-8.dll $INSTALL_SRC_BIN
105107

106108
# libsoup and its dependencies
107109
cp $INSTALL_SRC_MSYS2_BIN/libsoup-2.4-1.dll $INSTALL_SRC_BIN

‎gtk-nsis-pack/gtk2-runtime.ts.nsi‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
!define GTK_VERSION "2.24.32"
1616
!define GTK_BIN_VERSION "2.10.0"
17-
!define PRODUCT_VERSION "${GTK_VERSION}-2018-02-20-ts-win64"
17+
!define PRODUCT_VERSION "${GTK_VERSION}-2018-03-12-ts-win64"
1818
!define PRODUCT_NAME "GTK2-Runtime Win64"
1919
!define PRODUCT_PUBLISHER "Tom Schoonjans"
2020
!define PRODUCT_WEB_SITE "https://github.com/tschoonj/GTK-for-Windows-Runtime-Environment-Installer"
@@ -270,6 +270,9 @@ SectionIn 1 2 RO
270270
File bin\libpangomm-1.4-1.dll
271271
File bin\libpixman-1-0.dll ; libpixman, needed by cairo
272272
File bin\libpng16-16.dll ; for gdk_pixbuf loader.
273+
File bin\libjasper-4.dll ; for gdk_pixbuf loader.
274+
File bin\libjpeg-8.dll ; for gdk_pixbuf loader.
275+
File bin\libtiff-5.dll ; for gdk_pixbuf loader.
273276
File bin\libxml++-2.6-2.dll ; fontconfig needs this
274277
File bin\libxml++-3.0-1.dll
275278
File bin\libpcre-1.dll
@@ -280,7 +283,8 @@ SectionIn 1 2 RO
280283
File bin\libbz2-1.dll ; required by fontconfig
281284
File bin\libgraphite2.dll ; required by harfbuzz
282285
File bin\librsvg-2-2.dll ; required by adwaita-icon-theme
283-
File bin\libtiff-5.dll ; required by gdk-pixbuf2
286+
File bin\libcroco-0.6-3.dll ; required by adwaita-icon-theme
287+
File bin\liblzma-5.dll ; required by adwaita-icon-theme
284288
File bin\libstdc++-6.dll
285289
File bin\libgcc_s_seh-1.dll
286290
File bin\libwinpthread-1.dll
@@ -626,6 +630,9 @@ Function un.DeleteDlls
626630
Delete $LIB_INSTDIR\libpangomm-1.4-1.dll
627631
Delete $LIB_INSTDIR\libpixman-1-0.dll ; libpixman, needed by cairo
628632
Delete $LIB_INSTDIR\libpng16-16.dll ; for gdk_pixbuf loader.
633+
Delete $LIB_INSTDIR\libjasper-4.dll ; for gdk_pixbuf loader.
634+
Delete $LIB_INSTDIR\libjpeg-8.dll ; for gdk_pixbuf loader.
635+
Delete $LIB_INSTDIR\libtiff-5.dll ; for gdk_pixbuf loader.
629636
Delete $LIB_INSTDIR\libxml2-2.dll ; fontconfig needs this
630637
Delete $LIB_INSTDIR\libxslt-1.dll ; fontconfig needs this
631638
Delete $LIB_INSTDIR\libxml++-2.6-2.dll ; fontconfig needs this
@@ -636,7 +643,8 @@ Function un.DeleteDlls
636643
Delete $LIB_INSTDIR\libbz2-1.dll
637644
Delete $LIB_INSTDIR\libgraphite2.dll
638645
Delete $LIB_INSTDIR\librsvg-2-2.dll
639-
Delete $LIB_INSTDIR\libtiff-5.dll
646+
Delete $LIB_INSTDIR\libcroco-0.6-3.dll
647+
Delete $LIB_INSTDIR\liblzma-5.dll
640648
Delete $LIB_INSTDIR\libstdc++-6.dll
641649
Delete $LIB_INSTDIR\libgcc_s_seh-1.dll
642650
Delete $LIB_INSTDIR\libwinpthread-1.dll

‎gtk-nsis-pack/gtk3-runtime.ts.nsi‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
!define GTK_VERSION "3.22.28"
1515
!define GTK_BIN_VERSION "3.0.0"
16-
!define PRODUCT_VERSION "${GTK_VERSION}-2018-02-20-ts-win64"
16+
!define PRODUCT_VERSION "${GTK_VERSION}-2018-03-12-ts-win64"
1717
!define PRODUCT_NAME "GTK3-Runtime Win64"
1818
!define PRODUCT_PUBLISHER "Tom Schoonjans"
1919
!define PRODUCT_WEB_SITE "https://github.com/tschoonj/GTK-for-Windows-Runtime-Environment-Installer"
@@ -272,6 +272,8 @@ SectionIn 1 2 RO
272272
File bin\libpangomm-1.4-1.dll
273273
File bin\libpixman-1-0.dll ; libpixman, needed by cairo
274274
File bin\libpng16-16.dll ; required by gdk-pixbuf2
275+
File bin\libjpeg-8.dll ; required by gdk-pixbuf2
276+
File bin\libjasper-4.dll ; required by gdk-pixbuf2
275277
File bin\libxml++-2.6-2.dll ; fontconfig needs this
276278
File bin\libxml++-3.0-1.dll
277279
File bin\libxml2-2.dll ; fontconfig needs this
@@ -650,6 +652,8 @@ Function un.DeleteDlls
650652
Delete $LIB_INSTDIR\libpangomm-1.4-1.dll
651653
Delete $LIB_INSTDIR\libpixman-1-0.dll ; libpixman, needed by cairo
652654
Delete $LIB_INSTDIR\libpng16-16.dll ; for gdk_pixbuf loader.
655+
Delete $LIB_INSTDIR\libjasper-4.dll ; for gdk_pixbuf loader.
656+
Delete $LIB_INSTDIR\libjpeg-8.dll ; for gdk_pixbuf loader.
653657
Delete $LIB_INSTDIR\libxslt-1.dll ; fontconfig needs this
654658
Delete $LIB_INSTDIR\libpcre-1.dll ; fontconfig needs this
655659
Delete $LIB_INSTDIR\libxml2-2.dll ; fontconfig needs this

0 commit comments

Comments
 (0)