pidgin/pidgin

A few cleanups for the windows build
release-2.x.y
2 months ago, Gary Kramlich
8851e3dc8613
Parents 61c0f0d9b632
Children 1392ea316bd0
A few cleanups for the windows build

* Since we're no longer building with a newer gcc under msys2 we no longer
need to copy those specific files into our tree.
* Update the dictionaries to a new build.

Testing Done:
Built on windows and installed the online and offline installers without issue including downloading the en_US dictionary.

Also verified that the crash on exit was no more.

Reviewed at https://reviews.imfreedom.org/r/2976/
2 files changed, 1 insertions(+), 11 deletions(-)
  • +1 -1
    Makefile.mingw
  • +0 -10
    libpurple/Makefile.mingw
    • --- a/Makefile.mingw Fri Feb 23 03:41:23 2024 -0600
    +++ b/Makefile.mingw Fri Feb 23 04:48:07 2024 -0600
    @@ -8,7 +8,7 @@
    PIDGIN_TREE_TOP := .
    include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
    -DICTIONARY_TIMESTAMP := 20220215-003057
    +DICTIONARY_TIMESTAMP := 20240223-040846
    # Generate a X.X.X.X version for the installer file versioning header
    # The last digit will be 99 for a final release, 0 for dev or unknown, or the beta number
    --- a/libpurple/Makefile.mingw Fri Feb 23 03:41:23 2024 -0600
    +++ b/libpurple/Makefile.mingw Fri Feb 23 04:48:07 2024 -0600
    @@ -10,16 +10,6 @@
    TARGET = libpurple
    NEEDED_DLLS = $(LIBXML2_TOP)/bin/libxml2-2.dll
    -# gcc 4.8 on windows moved to dynamically linking libgcc. So if we're building
    -# under msys2 we assume we're using gcc >= 4.8 and need to copy libgcc and
    -# libwinpthread from the system into our install bundle.
    -#
    -# See https://gcc.gnu.org/gcc-4.8/changes.html#windows for more info.
    -ifeq ($(MSYSTEM),MINGW32)
    -NEEDED_DLLS += $(MSYSTEM_PREFIX)/bin/libgcc_s_dw2-1.dll \
    - $(MSYSTEM_PREFIX)/bin/libwinpthread-1.dll
    -endif
    -
    ifeq ($(CYRUS_SASL), 1)
    NEEDED_DLLS += $(CYRUS_SASL_TOP)/bin/libsasl2-3.dll