[Commits] [SCM] claws-win32-installer branch, gtk3, updated. 4.0.0-1-14-g27966d0
jonathan at claws-mail.org
jonathan at claws-mail.org
Mon Aug 23 16:34:53 UTC 2021
The branch, gtk3 has been updated
via 27966d0244ab89e4e2a4551c7f7e3fe6de18857c (commit)
via 59d9897b9496cf07a578a89801746dfc736264da (commit)
via 4dbfd63dd6041b0f28fb92f805804d1db6acfe96 (commit)
via 82fe9762b72568ff6523fe78862306a364d0b0de (commit)
via 5730081f3592ffb7537a301f7b175572aa2eb7eb (commit)
via 4119579f31661fd1f44108370c3c0efb9b7dd2d2 (commit)
from 82329d51de5e3a10cc8bfbdbd017525fcab00e35 (commit)
Summary of changes:
README | 12 ++--
configure.ac | 28 ++++++--
packages/packages.current | 2 +
.../gtk/60-win32-theme-claws-consolidated.patch | 36 +++++++++-
patches/gtk/69-win71-theme-finalize.sh | 6 +-
patches/poppler/01-mingw-std-threads.patch | 84 ++++++++++++++++++++++
src/Makefile.am | 41 ++++++++++-
src/config.nsi.in | 1 +
src/sections-installer.nsi | 9 ++-
src/sections-uninstaller.nsi | 6 ++
10 files changed, 207 insertions(+), 18 deletions(-)
create mode 100755 patches/poppler/01-mingw-std-threads.patch
- Log -----------------------------------------------------------------
commit 27966d0244ab89e4e2a4551c7f7e3fe6de18857c
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Mon Aug 23 06:29:23 2021 -0700
pdf viewer theme fixes
diff --git a/patches/gtk/60-win32-theme-claws-consolidated.patch b/patches/gtk/60-win32-theme-claws-consolidated.patch
index f3f7326..bb3b62b 100644
--- a/patches/gtk/60-win32-theme-claws-consolidated.patch
+++ b/patches/gtk/60-win32-theme-claws-consolidated.patch
@@ -21,7 +21,7 @@ diff -aur a/gtk/theme/win32/gtk.css b/gtk/theme/win32/gtk.css
padding-bottom: 0px;
background: -gtk-win32-theme-part(window, 1, 1);
min-height: calc(-gtk-win32-size(window, cycaption) - -gtk-win32-size(window, cyframe) - -gtk-win32-size(window, cxpaddedborder));
-@@ -272,3 +277,114 @@
+@@ -272,3 +277,143 @@
.maximized .titlebar button.maximize:disabled {
background-image: -gtk-win32-theme-part(window, 21, 4);
}
@@ -136,3 +136,32 @@ diff -aur a/gtk/theme/win32/gtk.css b/gtk/theme/win32/gtk.css
+#textview_icon {
+ margin-left: -13px;
+}
++
++/* Remove extra border around pdf viewer buttons */
++#mime_notebook > stack {
++ background-image: none;
++}
++
++/* Fix pdf viewer button size */
++#pdf_viewer > #buttons button {
++ min-height: 24px;
++ min-width: 26px;
++}
++
++/* Fix pdf viewer spin button size */
++#pdf_viewer > #buttons spinbutton.horizontal button {
++ min-width: 0px;
++
++ background-size: 15px 15px;
++ background-repeat: no-repeat;
++}
++
++#pdf_viewer > #buttons spinbutton.horizontal button.down {
++ margin-top: 14px;
++ margin-bottom: -14px;
++}
++
++#pdf_viewer > #buttons spinbutton.horizontal button.up {
++ margin-top: -14px;
++ margin-bottom: 14px;
++}
commit 59d9897b9496cf07a578a89801746dfc736264da
Author: Jonathan Boeing <jonathan.n.boeing at gmail.com>
Date: Sat Jul 17 17:36:15 2021 -0700
add pdf_viewer plugin and dependencies
diff --git a/configure.ac b/configure.ac
index cb6804d..93b8d30 100644
--- a/configure.ac
+++ b/configure.ac
@@ -235,12 +235,16 @@ CM_BPKG([bsfilter])
CM_MPKG([bzip2])
CM_MPKG([zlib])
+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])
CM_SPKG([hunspell], [libiconv gettext])
+CM_SPKG([jpeg])
CM_SPKG([libiconv])
CM_SPKG([gettext], [libiconv])
@@ -280,7 +284,6 @@ CM_SPKG([ytnef])
CM_SPKG([gumbo_parser])
if test "$build_fancy" = yes; then
- CM_SPKG([jpeg])
CM_SPKG([sqlite], [zlib])
CM_SPKG([libwebp], [zlib libpng jpeg])
CM_SPKG([libxslt], [libxml2])
@@ -293,7 +296,7 @@ else
AC_SUBST(NSIS_DISABLE_FANCY, [-DDISABLE_FANCY_PLUGIN])
fi
-claws_mail_deps="libiconv gettext zlib gtk libpng enchant glib"
+claws_mail_deps="libiconv gettext zlib gtk libpng enchant glib poppler"
claws_mail_deps="$claws_mail_deps gpgme regex libetpan gnutls ytnef gumbo_parser"
claws_mail_deps="$claws_mail_deps libxml2 expat $cm_dep_webkitgtk curl libical nettle"
CM_SPKG([claws_mail], [$claws_mail_deps])
diff --git a/packages/packages.current b/packages/packages.current
index 146314b..c648e1a 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -46,6 +46,8 @@ nettle,3.7.3,file,https://ftp.gnu.org/pub/gnu/nettle/nettle-3.7.3.tar.gz,661f5eb
p11_kit,0.24.0,file,https://github.com/p11-glue/p11-kit/releases/download/0.24.0/p11-kit-0.24.0.tar.xz,81e6140584f635e4e956a1b93a32239acf3811ff5b2d3a5c6094e94e99d2c685,,
pango,1.48.8,file,https://download.gnome.org/sources/pango/1.48/pango-1.48.8.tar.xz,009d9d830ecbe11911d6637e48eec1c51390d3d12eb286035ef7c641f3c87410,,
pixman,0.40.0,file,https://cairographics.org/releases/pixman-0.40.0.tar.gz,6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc,,
+poppler,21.08.0,file,https://poppler.freedesktop.org/poppler-21.08.0.tar.xz,e9cf5dc5964bce4bb0264d1c4f8122706c910588b421cfc30abc97d6b23e602d,,
+poppler_data,0.4.10,file,https://poppler.freedesktop.org/poppler-data-0.4.10.tar.gz,6e2fcef66ec8c44625f94292ccf8af9f1d918b410d5aa69c274ce67387967b30,,
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,,
diff --git a/patches/poppler/01-mingw-std-threads.patch b/patches/poppler/01-mingw-std-threads.patch
new file mode 100755
index 0000000..c06e824
--- /dev/null
+++ b/patches/poppler/01-mingw-std-threads.patch
@@ -0,0 +1,84 @@
+diff -aur apoppler-21.08.0/poppler/Annot.h poppler-21.08.0/poppler/Annot.h
+--- apoppler-21.08.0/poppler/Annot.h 2021-08-01 08:19:17.000000000 -0700
++++ poppler-21.08.0/poppler/Annot.h 2021-08-22 17:26:09.443799196 -0700
+@@ -50,7 +50,7 @@
+
+ #include <memory>
+ #include <atomic>
+-#include <mutex>
++#include "mingw.mutex.h"
+ #include <vector>
+
+ #include "Object.h"
+diff -aur apoppler-21.08.0/poppler/Array.h poppler-21.08.0/poppler/Array.h
+--- apoppler-21.08.0/poppler/Array.h 2021-08-01 08:19:17.000000000 -0700
++++ poppler-21.08.0/poppler/Array.h 2021-08-22 17:26:00.011882041 -0700
+@@ -29,7 +29,7 @@
+ #define ARRAY_H
+
+ #include <atomic>
+-#include <mutex>
++#include "mingw.mutex.h"
+ #include <vector>
+
+ #include "poppler-config.h"
+diff -aur apoppler-21.08.0/poppler/CairoFontEngine.h poppler-21.08.0/poppler/CairoFontEngine.h
+--- apoppler-21.08.0/poppler/CairoFontEngine.h 2021-08-01 08:19:17.000000000 -0700
++++ poppler-21.08.0/poppler/CairoFontEngine.h 2021-08-22 17:26:19.525249517 -0700
+@@ -30,7 +30,7 @@
+ #ifndef CAIROFONTENGINE_H
+ #define CAIROFONTENGINE_H
+
+-#include <mutex>
++#include "mingw.mutex.h"
+
+ #include "poppler-config.h"
+ #include <cairo-ft.h>
+diff -aur apoppler-21.08.0/poppler/Dict.h poppler-21.08.0/poppler/Dict.h
+--- apoppler-21.08.0/poppler/Dict.h 2021-08-01 08:19:17.000000000 -0700
++++ poppler-21.08.0/poppler/Dict.h 2021-08-22 17:26:32.638869326 -0700
+@@ -31,7 +31,7 @@
+ #define DICT_H
+
+ #include <atomic>
+-#include <mutex>
++#include "mingw.mutex.h"
+ #include <string>
+ #include <vector>
+ #include <utility>
+diff -aur apoppler-21.08.0/poppler/GlobalParams.h poppler-21.08.0/poppler/GlobalParams.h
+--- apoppler-21.08.0/poppler/GlobalParams.h 2021-08-01 08:19:17.000000000 -0700
++++ poppler-21.08.0/poppler/GlobalParams.h 2021-08-22 17:25:33.690499390 -0700
+@@ -47,7 +47,7 @@
+ #include <unordered_map>
+ #include <string>
+ #include <memory>
+-#include <mutex>
++#include "mingw.mutex.h"
+ #include <vector>
+
+ class GooString;
+diff -aur apoppler-21.08.0/poppler/Page.h poppler-21.08.0/poppler/Page.h
+--- apoppler-21.08.0/poppler/Page.h 2021-08-01 08:19:17.000000000 -0700
++++ poppler-21.08.0/poppler/Page.h 2021-08-22 17:26:41.951851455 -0700
+@@ -36,7 +36,7 @@
+ #define PAGE_H
+
+ #include <memory>
+-#include <mutex>
++#include "mingw.mutex.h"
+
+ #include "poppler-config.h"
+ #include "Object.h"
+diff -aur apoppler-21.08.0/poppler/PDFDoc.h poppler-21.08.0/poppler/PDFDoc.h
+--- apoppler-21.08.0/poppler/PDFDoc.h 2021-08-01 08:19:17.000000000 -0700
++++ poppler-21.08.0/poppler/PDFDoc.h 2021-08-22 17:25:50.992805747 -0700
+@@ -46,7 +46,7 @@
+
+ #include <algorithm>
+ #include <cstdio>
+-#include <mutex>
++#include "mingw.mutex.h"
+
+ #include "poppler-config.h"
+
diff --git a/src/Makefile.am b/src/Makefile.am
index fe7c023..faa7eed 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -38,6 +38,7 @@ EXTRA_DIST = config.nsi.in claws-mail.nsi \
# We can use $(idir) here for the installation prefix.
cm_pkg_libical_cmake = yes
+cm_pkg_poppler_cmake = yes
cm_pkg_gtk_meson = yes
cm_pkg_libepoxy_meson = yes
@@ -386,6 +387,24 @@ cm_pkg_libical_configure = \
-DICAL_GLIB=OFF \
-DLIBICAL_BUILD_TESTING=OFF
+cm_pkg_poppler_configure = \
+ -DBUILD_GTK_TESTS=OFF \
+ -DBUILD_QT5_TESTS=OFF \
+ -DBUILD_QT6_TESTS=OFF \
+ -DBUILD_CPP_TESTS=OFF \
+ -DBUILD_MANUAL_TESTS=OFF \
+ -DENABLE_BOOST=OFF \
+ -DENABLE_CPP=OFF \
+ -DENABLE_UTILS=OFF \
+ -DENABLE_GOBJECT_INTROSPECTION=OFF \
+ -DENABLE_GTK_DOC=OFF \
+ -DENABLE_QT5=OFF \
+ -DENABLE_QT6=OFF \
+ -DENABLE_LIBCURL=OFF \
+ -DENABLE_LIBOPENJPEG=none \
+ -DCMAKE_C_FLAGS="$(CM_CFLAGS)" \
+ -DCMAKE_CXX_FLAGS="$(CM_CXXFLAGS) -fexceptions"
+
cm_pkg_gumbo_parser_configure = \
LDFLAGS=-L$(idir)/lib \
CPPFLAGS=-I$(idir)/include
@@ -418,6 +437,12 @@ cm_pkg_zlib_make_args_inst = \
LIBRARY_PATH=$(pkg_idir)/lib \
SHARED_MODE=1
+cm_pkg_poppler_data_make_args = \
+ prefix=$(pkg_idir)
+
+cm_pkg_poppler_data_make_args_inst = \
+ prefix=$(pkg_idir)
+
# Now do the bunch of the work. This is a bunch of dirty magic to
# integrate our special makefile into automake, while not actually
# including it (make should include it). This is in turn necessary
diff --git a/src/config.nsi.in b/src/config.nsi.in
index e59e589..0671c1d 100644
--- a/src/config.nsi.in
+++ b/src/config.nsi.in
@@ -91,3 +91,4 @@
!define cm_pkg_libical_version @cm_pkg_libical_version@
!define cm_pkg_ytnef_version @cm_pkg_ytnef_version@
!define cm_pkg_gumbo_parser_version @cm_pkg_gumbo_parser_version@
+!define cm_pkg_poppler_version @cm_pkg_poppler_version@
diff --git a/src/sections-installer.nsi b/src/sections-installer.nsi
index fe712d8..890c547 100644
--- a/src/sections-installer.nsi
+++ b/src/sections-installer.nsi
@@ -469,10 +469,8 @@ File ${prefix}/bin/libjavascriptcoregtk-1.0-0.dll
#######################################
### jpeg
-!ifndef DISABLE_FANCY_PLUGIN
!insertmacro SetPrefix jpeg
File ${prefix}/bin/libjpeg-9.dll
-!endif
#######################################
### glib-networking
@@ -523,6 +521,12 @@ File ${prefix}/bin/libytnef-0.dll
!insertmacro SetPrefix gumbo_parser
File ${prefix}/bin/libgumbo-1.dll
+#######################################
+### poppler
+!insertmacro SetPrefix poppler
+File ${prefix}/bin/libpoppler-glib-8.dll
+File ${prefix}/bin/libpoppler-112.dll
+
#######################################
### claws-mail
!insertmacro SetPrefix claws_mail
@@ -545,6 +549,7 @@ File ${prefix}/lib/claws-mail/plugins/libravatar.dll
File ${prefix}/lib/claws-mail/plugins/litehtml_viewer.dll
File ${prefix}/lib/claws-mail/plugins/managesieve.dll
File ${prefix}/lib/claws-mail/plugins/notification.dll
+File ${prefix}/lib/claws-mail/plugins/pdf_viewer.dll
File ${prefix}/lib/claws-mail/plugins/pgpcore.dll
File ${prefix}/lib/claws-mail/plugins/pgpinline.dll
File ${prefix}/lib/claws-mail/plugins/pgpinline.deps
diff --git a/src/sections-uninstaller.nsi b/src/sections-uninstaller.nsi
index cf7d0d6..2cac667 100644
--- a/src/sections-uninstaller.nsi
+++ b/src/sections-uninstaller.nsi
@@ -18,6 +18,7 @@ Delete "$INSTDIR\lib\claws-mail\plugins\libravatar.dll"
Delete "$INSTDIR\lib\claws-mail\plugins\litehtml_viewer.dll"
Delete "$INSTDIR\lib\claws-mail\plugins\managesieve.dll"
Delete "$INSTDIR\lib\claws-mail\plugins\notification.dll"
+Delete "$INSTDIR\lib\claws-mail\plugins\pdf_viewer.dll"
Delete "$INSTDIR\lib\claws-mail\plugins\pgpcore.dll"
Delete "$INSTDIR\lib\claws-mail\plugins\pgpinline.dll"
Delete "$INSTDIR\lib\claws-mail\plugins\pgpinline.deps"
@@ -32,6 +33,11 @@ Delete "$INSTDIR\lib\claws-mail\plugins\vcalendar.dll"
RMDir "$INSTDIR\lib\claws-mail\plugins"
RMDir "$INSTDIR\lib\claws-mail"
+#######################################
+### poppler
+Delete "$INSTDIR\libpoppler-glib-8.dll"
+Delete "$INSTDIR\libpoppler-112.dll"
+
#######################################
### gumbo-parser
Delete "$INSTDIR\libgumbo-1.dll"
commit 4dbfd63dd6041b0f28fb92f805804d1db6acfe96
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Fri Aug 20 03:03:46 2021 -0700
update readme
diff --git a/README b/README
index a8d9df6..7f3aed2 100644
--- a/README
+++ b/README
@@ -51,7 +51,7 @@ If any parameters are passed to autogen.sh, the first must be either
configure script.
-The configure script has three parameters for developers:
+The configure script has four parameters for developers:
--disable-fancy-plugin will skip building the fancy plugin and its dependencies
@@ -61,6 +61,8 @@ into separate .debug files
--enable-bzip2 will use faster bzip2 compression in the nsis installer instead
of smaller lzma
+--enable-debug will build packages with debug CFLAGS and configure options
+
The configure script looks for four environment variables:
@@ -84,7 +86,7 @@ Build examples
# Build an unstripped, 64-bit debug build suitable for use with cv2pdb
# cv2pdb will generate PDB symbols for use with native Microsoft tools
- $ ./autogen.sh --build-w64 --disable-strip CFLAGS="-Og -ggdb -pipe -mms-bitfields"
+ $ ./autogen.sh --build-w64 --disable-strip --enable-debug
Basic requirements
@@ -179,8 +181,10 @@ This requires editing a couple of files.
cm_pkg_<pkg>_make_args if the package needs special arguments to make
cm_pkg_<pkg>_make_args_inst if the package needs special arguments to make install
-4. Specify what files from the built package should be included in
- the installation (and uninstallation) in src/sections-(un)installer.nsi.
+4. Add a cm_pkg_<pkg>_version entry to src/config.nsi.in
+
+5. Specify what files from the built package should be included in
+the installation (and uninstallation) in src/sections-(un)installer.nsi.
Then follow the standard build instructions listed above.
commit 82fe9762b72568ff6523fe78862306a364d0b0de
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Thu Aug 19 10:05:05 2021 -0700
add configure option to enable package debug flags
diff --git a/configure.ac b/configure.ac
index 92729ea..cb6804d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -95,14 +95,28 @@ AC_SUBST(STRIP_BINARIES)
AC_ARG_ENABLE([bzip2],
AS_HELP_STRING([--enable-bzip2],[Use faster bzip2 compression for installer (default=no)]),
[nsis_bzip2=$enableval],
- [nsis_bzip2=$no])
+ [nsis_bzip2=no])
AS_IF([test "$nsis_bzip2" = yes],
[NSIS_COMPRESSOR=bzip2],
[NSIS_COMPRESSOR=lzma])
AC_SUBST(NSIS_COMPRESSOR)
-AS_IF([test -z "$CFLAGS"],
- [CM_CFLAGS="-O2 -pipe -ggdb -mms-bitfields"],
+AC_ARG_ENABLE([debug],
+ AS_HELP_STRING([--enable-debug],[Build packages with debug flags and options (default=no)]),
+ [build_debug=$enableval],
+ [build_debug=no])
+AS_IF([test "$build_debug" = yes],
+ [ENABLE_DEBUG_OPTS=yes],
+ [ENABLE_DEBUG_OPTS=no])
+AM_CONDITIONAL([ENABLE_DEBUG_OPTS], [test x$build_debug = xyes])
+
+rel_cflags="-O2 -pipe -ggdb -mms-bitfields"
+deb_cflags="-Og -pipe -ggdb -mms-bitfields"
+AS_IF([test "$ENABLE_DEBUG_OPTS" = yes],
+ [CM_CFLAGS=$deb_cflags],
+ [CM_CFLAGS=$rel_cflags])
+
+AS_IF([test -n "$CFLAGS"],
[CM_CFLAGS=$CFLAGS])
AS_IF([test -z "$CXXFLAGS"],
[CM_CXXFLAGS=$CM_CFLAGS],
@@ -309,6 +323,7 @@ echo "
Fancy plugin: $ENABLE_FANCY_PLUGIN
Strip binaries: $STRIP_BINARIES
NSIS compression: $NSIS_COMPRESSOR
+ Enable debug options: $ENABLE_DEBUG_OPTS
Default package CFLAGS: $CM_CFLAGS
Default package CXXFLAGS: $CM_CXXFLAGS
Default make jobs: $CM_MAKE_JOBS
diff --git a/src/Makefile.am b/src/Makefile.am
index 1ec3f32..fe7c023 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -73,7 +73,11 @@ cm_pkg_regex_configure = \
cm_pkg_glib_configure = \
-Dinternal_pcre=true
+if ENABLE_DEBUG_OPTS
+cm_pkg_glib_meson_cppflags = -I$(idir)/include -DG_ENABLE_DEBUG
+else
cm_pkg_glib_meson_cppflags = -I$(idir)/include
+endif
cm_pkg_glib_meson_ldflags = -L$(idir)/lib
cm_pkg_gdk_pixbuf_configure = \
@@ -93,7 +97,11 @@ cm_pkg_gtk_configure = \
-Dexamples=false \
-Dtests=false \
-Dintrospection=false
+if ENABLE_DEBUG_OPTS
+cm_pkg_gtk_meson_cppflags = -I$(idir)/include -DG_ENABLE_DEBUG
+else
cm_pkg_gtk_meson_cppflags = -I$(idir)/include
+endif
cm_pkg_gtk_meson_ldflags = -L$(idir)/lib
cm_pkg_libepoxy_configure = \
@@ -327,14 +335,16 @@ cm_pkg_libwebp_configure = \
CPPFLAGS=-I$(idir)/include
# --enable-debug-symbols=yes|full sets -ggdb which causes the ICE below
+if ENABLE_DEBUG_OPTS
webkitgtk_debug = \
--enable-debug \
--enable-debug-symbols=min \
--enable-developer-mode=no \
--enable-optimizations=no
-
-webkitgtk_release = \
+else
+webkitgtk_debug = \
--disable-debug
+endif
cm_pkg_webkitgtk_configure = \
--disable-webkit2 \
@@ -359,7 +369,7 @@ cm_pkg_webkitgtk_configure = \
--disable-gamepad \
--disable-webgl \
--disable-glibtest \
- $(webkitgtk_release) \
+ $(webkitgtk_debug) \
--disable-accelerated-compositing \
--enable-silent-rules \
CPPFLAGS="-I$(idir)/include -Wno-expansion-to-defined -Wno-class-memaccess" \
commit 5730081f3592ffb7537a301f7b175572aa2eb7eb
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Tue Aug 17 13:55:50 2021 -0700
fix gtk warning message
diff --git a/patches/gtk/69-win71-theme-finalize.sh b/patches/gtk/69-win71-theme-finalize.sh
index ba21182..da6829b 100755
--- a/patches/gtk/69-win71-theme-finalize.sh
+++ b/patches/gtk/69-win71-theme-finalize.sh
@@ -14,9 +14,9 @@ cat << GTK_INI_EOF > claws/settings.ini
gtk-theme-name=win71
gtk-auto-mnemonics=true
gtk-button-images=true
-;gtk-application-prefer-dark-theme=1
+#gtk-application-prefer-dark-theme=1
[Doc]
-;= To enable CSD, set following environment variable
-;= GTK_CSD=1
+#= To enable CSD, set following environment variable
+#= GTK_CSD=1
GTK_INI_EOF
commit 4119579f31661fd1f44108370c3c0efb9b7dd2d2
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Tue Aug 17 13:22:26 2021 -0700
silence gtk warning for_size smaller than min-size
diff --git a/patches/gtk/60-win32-theme-claws-consolidated.patch b/patches/gtk/60-win32-theme-claws-consolidated.patch
index 695f308..f3f7326 100644
--- a/patches/gtk/60-win32-theme-claws-consolidated.patch
+++ b/patches/gtk/60-win32-theme-claws-consolidated.patch
@@ -21,7 +21,7 @@ diff -aur a/gtk/theme/win32/gtk.css b/gtk/theme/win32/gtk.css
padding-bottom: 0px;
background: -gtk-win32-theme-part(window, 1, 1);
min-height: calc(-gtk-win32-size(window, cycaption) - -gtk-win32-size(window, cyframe) - -gtk-win32-size(window, cxpaddedborder));
-@@ -272,3 +277,109 @@
+@@ -272,3 +277,114 @@
.maximized .titlebar button.maximize:disabled {
background-image: -gtk-win32-theme-part(window, 21, 4);
}
@@ -94,6 +94,11 @@ diff -aur a/gtk/theme/win32/gtk.css b/gtk/theme/win32/gtk.css
+ margin-top: -3px;
+}
+
++/* Silence Gtk-WARNING message: for_size smaller than min-size */
++spinbutton.horizontal button {
++ min-width: 0px;
++}
++
+/* Make folderview and summaryview background white */
+#folderview,
+#summaryview > notebook > stack > scrolledwindow {
-----------------------------------------------------------------------
hooks/post-receive
--
Installer sources for Claws Mail Windows port
More information about the Commits
mailing list