From 010f690b3b073043c95da1409629ebea23532800 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hermann=20H=C3=B6hne?= Date: Sat, 4 Mar 2023 01:11:18 +0100 Subject: [PATCH] Consolidate versions involving win32 build. Updated Pidgin. gtk+ was not aligned with the version used by Pidgin. MinGW now ships with newer gcc. --- README.md | 8 ++++---- dependencies/win32/CMakeLists.txt | 7 ++++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 16f2092..ed7d6ff 100644 --- a/README.md +++ b/README.md @@ -86,10 +86,10 @@ Dependencies: * pidgin (libpurple glib gtk) * pkg-config -* cmake (3.8 or later) +* cmake (3.8 or newer) * make -* go (1.18 or later) -* gcc (6.3.0 or later) +* go (1.18 or newer) +* gcc (9.2.0 or newer) * libgdk-pixbuf-2.0 (optional) * liboggfile (optional) @@ -108,7 +108,7 @@ CMake will try to set-up a development environment automatically. Additional dependencies: * [go 1.18 or newer (32 bit)](https://go.dev/dl/go1.18.9.windows-386.msi) -* [gcc (32 bit)](https://osdn.net/projects/mingw/) +* [gcc 9.2.0 or newer (32 bit)](https://osdn.net/projects/mingw/) go and gcc must be in `%PATH%`. diff --git a/dependencies/win32/CMakeLists.txt b/dependencies/win32/CMakeLists.txt index ac5d7ff..5a91fd1 100644 --- a/dependencies/win32/CMakeLists.txt +++ b/dependencies/win32/CMakeLists.txt @@ -1,9 +1,10 @@ cmake_minimum_required(VERSION 3.18) # for file(ARCHIVE_EXTRACT ...) -set(GTK_BUNDLE_ZIP gtk+-bundle_2.24.10-20120208_win32.zip) # TODO: find correct version. 2.14.7 is too old, see https://developer.pidgin.im/ticket/15526 +# Pidgin 2.14.12 is shipped with gtk+ 2.16.6 and glib 2.28.8 +set(GTK_BUNDLE_ZIP gtk+-bundle_2.16.6-20100912_win32.zip) # NOTE: This contains glib 2.24.2 IF(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/${GTK_BUNDLE_ZIP}) message(STATUS "Fetching ${GTK_BUNDLE_ZIP}...") - file(DOWNLOAD http://ftp.gnome.org/pub/gnome/binaries/win32/gtk+/2.24/${GTK_BUNDLE_ZIP} ${CMAKE_CURRENT_BINARY_DIR}/${GTK_BUNDLE_ZIP} SHOW_PROGRESS) + file(DOWNLOAD http://ftp.gnome.org/pub/gnome/binaries/win32/gtk+/2.16/${GTK_BUNDLE_ZIP} ${CMAKE_CURRENT_BINARY_DIR}/${GTK_BUNDLE_ZIP} SHOW_PROGRESS) ENDIF() IF(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/gtk/include/gtk-2.0/gtk/gtk.h) file(ARCHIVE_EXTRACT INPUT ${CMAKE_CURRENT_BINARY_DIR}/${GTK_BUNDLE_ZIP} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/gtk) @@ -20,7 +21,7 @@ set(GTK_LIBRARY_DIRS find_file(GLIB_LIB "glib-2.0.lib" PATHS ${GTK_LIBRARY_DIRS}) find_file(PIXBUF_LIB "gdk_pixbuf-2.0.lib" PATHS ${GTK_LIBRARY_DIRS}) -set(PIDGIN_VERSION 2.14.8) +set(PIDGIN_VERSION 2.14.12) set(PIDGIN_DIRNAME pidgin-${PIDGIN_VERSION}) set(PIDGIN_SOURCE_ZIP ${PIDGIN_DIRNAME}.tar.bz2) IF(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/${PIDGIN_SOURCE_ZIP})