[Commits] [SCM] claws-win32-installer branch, gtk3, updated. 4.0.0-1-29-g9d13eb6
jonathan at claws-mail.org
jonathan at claws-mail.org
Tue Sep 21 11:23:56 CEST 2021
The branch, gtk3 has been updated
via 9d13eb6a798a9345d8edfbe14ccf171118832850 (commit)
via 92d61a00a94143996bda448dc96452830ab1ddf1 (commit)
from 55b49b6957d800c656f4a89c6321c58ecb93ef3b (commit)
Summary of changes:
configure.ac | 3 +--
packages/packages.current | 1 -
patches/w32pth-2.0.5/01-def-fix.patch | 11 -----------
patches/w32pth-2.0.5/99-autogen.sh | 7 -------
src/config.nsi.in | 1 -
src/sections-installer.nsi | 7 +------
src/sections-uninstaller.nsi | 4 ----
7 files changed, 2 insertions(+), 32 deletions(-)
delete mode 100644 patches/w32pth-2.0.5/01-def-fix.patch
delete mode 100755 patches/w32pth-2.0.5/99-autogen.sh
- Log -----------------------------------------------------------------
commit 9d13eb6a798a9345d8edfbe14ccf171118832850
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Tue Sep 14 22:13:18 2021 -0700
update gtk2 reference
diff --git a/src/sections-installer.nsi b/src/sections-installer.nsi
index 86951fa..6b325af 100644
--- a/src/sections-installer.nsi
+++ b/src/sections-installer.nsi
@@ -592,7 +592,7 @@ skip_default_client:
WriteRegStr HKLM "SOFTWARE\Clients\Mail\Claws Mail" "" "Claws Mail"
WriteRegStr HKLM "SOFTWARE\Clients\Mail\Claws Mail" "DLLPath" ""
-WriteRegStr HKLM "SOFTWARE\Clients\Mail\Claws Mail\Capabilities" "ApplicationDescription" "Fast, lightweight and user-friendly GTK+2 based email client"
+WriteRegStr HKLM "SOFTWARE\Clients\Mail\Claws Mail\Capabilities" "ApplicationDescription" "Fast, lightweight and user-friendly GTK+3 based email client"
WriteRegStr HKLM "SOFTWARE\Clients\Mail\Claws Mail\Capabilities" "ApplicationIcon" "$INSTDIR\claws-mail.exe,0"
WriteRegStr HKLM "SOFTWARE\Clients\Mail\Claws Mail\Capabilities" "ApplicationName" "Claws Mail"
commit 92d61a00a94143996bda448dc96452830ab1ddf1
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Mon Sep 20 02:42:28 2021 -0700
Remove unused w32pth package
diff --git a/configure.ac b/configure.ac
index 092bf65..5095dfe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -239,7 +239,6 @@ CM_MPKG([poppler_data])
CM_SPKG([poppler], [poppler_data cairo freetype gdk_pixbuf glib gtk icu4c jpeg libiconv libpng zlib])
-CM_SPKG([w32pth])
CM_SPKG([gmp])
CM_SPKG([regex], [gettext])
CM_SPKG([fribidi])
@@ -263,7 +262,7 @@ CM_SPKG([libpng], [zlib])
CM_SPKG([enchant], [glib hunspell])
CM_SPKG([libgpg_error], [libiconv gettext])
-CM_SPKG([libassuan], [libgpg_error w32pth])
+CM_SPKG([libassuan], [libgpg_error])
CM_SPKG([gpgme], [libgpg_error libassuan glib])
CM_SPKG([libtasn1])
CM_SPKG([nettle], [gmp])
diff --git a/packages/packages.current b/packages/packages.current
index 01ec873..0d028cc 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -50,7 +50,6 @@ poppler,21.09.0,file,https://poppler.freedesktop.org/poppler-21.09.0.tar.xz,5a47
poppler_data,0.4.11,file,https://poppler.freedesktop.org/poppler-data-0.4.11.tar.gz,2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c,,
regex,20210702,git,git://git.savannah.gnu.org/gnulib.git,7769c80aaa6b75c4fc4f2cfe62f6bf46291dabfef9e11dd42bd9656dbbd7a9af,master,901694b904cd861adc2529b2e05a3fb33f9b534f
sqlite,3.36.0,file,https://sqlite.org/2021/sqlite-autoconf-3360000.tar.gz,bd90c3eb96bee996206b83be7065c9ce19aef38c3f4fb53073ada0d0b69bbce3,,
-w32pth,2.0.5,file,ftp://ftp.g10code.com/g10code/w32pth/w32pth-2.0.5.tar.bz2,5e462d06ed50e9e961546ab5264258e606b101860a74c1e410d086432ec27a06,,
webkitgtk,2.4.11,file,https://webkitgtk.org/releases/webkitgtk-2.4.11.tar.xz,588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7,,
ytnef,1.9.3,file,https://www.claws-mail.org/win32/ytnef-1.9.3.tar.gz,41a0033bde33c86a7e4aa4e14bb822dd03084098638e7d6557263e47e80b4f4f,,
zlib,1.2.11,file,https://zlib.net/zlib-1.2.11.tar.gz,c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1,,
diff --git a/patches/w32pth-2.0.5/01-def-fix.patch b/patches/w32pth-2.0.5/01-def-fix.patch
deleted file mode 100644
index 8f1443a..0000000
--- a/patches/w32pth-2.0.5/01-def-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur w32pth-2.0.5.orig/libw32pth.def w32pth-2.0.5/libw32pth.def
---- w32pth-2.0.5.orig/libw32pth.def 2015-05-25 18:30:22.734187106 +0200
-+++ w32pth-2.0.5/libw32pth.def 2015-05-25 18:30:32.838459236 +0200
-@@ -18,7 +18,6 @@
- ;; 02110-1301, USA.
-
-
--EXPORTS
- pth_init @1
- pth_kill @2
- pth_ctrl @3
diff --git a/patches/w32pth-2.0.5/99-autogen.sh b/patches/w32pth-2.0.5/99-autogen.sh
deleted file mode 100755
index f97c38b..0000000
--- a/patches/w32pth-2.0.5/99-autogen.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-# We run this primarily for the libtoolize step, so that libtool
-# gets updated to a newer version. The version enchant ships is older
-# and buggy when it comes to generating a DLL for x86_64.
-libtoolize
-./autogen.sh
diff --git a/src/config.nsi.in b/src/config.nsi.in
index 0671c1d..5766e74 100644
--- a/src/config.nsi.in
+++ b/src/config.nsi.in
@@ -42,7 +42,6 @@
# The version of each package.
!define cm_pkg_libgpg_error_version @cm_pkg_libgpg_error_version@
-!define cm_pkg_w32pth_version @cm_pkg_w32pth_version@
!define cm_pkg_libassuan_version @cm_pkg_libassuan_version@
!define cm_pkg_gpgme_version @cm_pkg_gpgme_version@
!define cm_pkg_libtasn1_version @cm_pkg_libtasn1_version@
diff --git a/src/sections-installer.nsi b/src/sections-installer.nsi
index 9793d6d..86951fa 100644
--- a/src/sections-installer.nsi
+++ b/src/sections-installer.nsi
@@ -55,11 +55,6 @@ File ${prefix}/bin/libtasn1-6.dll
!insertmacro SetPrefix regex
File ${prefix}/bin/libregex-1.dll
-#######################################
-### w32pth
-!insertmacro SetPrefix w32pth
-File ${prefix}/bin/libw32pth-0.dll
-
#######################################
### zlib
!insertmacro SetPrefix zlib
diff --git a/src/sections-uninstaller.nsi b/src/sections-uninstaller.nsi
index 37bcf97..1476be6 100644
--- a/src/sections-uninstaller.nsi
+++ b/src/sections-uninstaller.nsi
@@ -437,10 +437,6 @@ Delete /REBOOTOK "$INSTDIR\iconv.dll"
### zlib
Delete /REBOOTOK "$INSTDIR\zlib1.dll"
-#######################################
-### w32pth
-Delete "$INSTDIR\libw32pth-0.dll"
-
#######################################
### regex
Delete "$INSTDIR\libregex-1.dll"
-----------------------------------------------------------------------
hooks/post-receive
--
Installer sources for Claws Mail Windows port
More information about the Commits
mailing list