[Commits] [SCM] claws-win32-installer branch, gtk3, updated. 4.0.0-1-8-g82329d5
jonathan at claws-mail.org
jonathan at claws-mail.org
Tue Aug 17 12:12:17 UTC 2021
The branch, gtk3 has been updated
via 82329d51de5e3a10cc8bfbdbd017525fcab00e35 (commit)
via 8bf6554539b1a500f106038b15007fb89b8fc289 (commit)
via 3ed4174faaafe2fb0712d56542a16dacf2bf1723 (commit)
via 2d3c63714327c2ba13d3c0fe7281db08c69ce35d (commit)
via 05ead8e23338cc390bd6ba3011a910b5d3b8a4a7 (commit)
via b20eeff2e6db0149d155bb92ce8278b7786293b6 (commit)
via 409cb0d2ee03fcbffb9c007528133aa40c20fe91 (commit)
via 4b0fdfecbf80fef35227157a31940c61bb9a515d (commit)
from a3121a653dda42dc8759028909b2a3e2d8a79f77 (commit)
Summary of changes:
configure.ac | 2 +-
packages/packages.current | 2 +-
patches/claws_mail/09-widget-names.patch | 174 +++++++++++++++++++++
patches/enchant/02-free-library-name.patch | 23 +++
patches/glib/01-memcpy-length.patch | 11 ++
.../gtk/60-win32-theme-claws-consolidated.patch | 41 +++--
patches/pango/01-rounding.patch | 41 +++++
src/sections-installer.nsi | 11 ++
src/sections-uninstaller.nsi | 13 ++
9 files changed, 305 insertions(+), 13 deletions(-)
create mode 100644 patches/claws_mail/09-widget-names.patch
create mode 100644 patches/enchant/02-free-library-name.patch
create mode 100644 patches/glib/01-memcpy-length.patch
create mode 100644 patches/pango/01-rounding.patch
- Log -----------------------------------------------------------------
commit 82329d51de5e3a10cc8bfbdbd017525fcab00e35
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Mon Aug 16 23:14:14 2021 -0700
fix messageview attachment icon position
diff --git a/patches/gtk/60-win32-theme-claws-consolidated.patch b/patches/gtk/60-win32-theme-claws-consolidated.patch
index 0c7d278..695f308 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,104 @@
+@@ -272,3 +277,109 @@
.maximized .titlebar button.maximize:disabled {
background-image: -gtk-win32-theme-part(window, 21, 4);
}
@@ -126,3 +126,8 @@ diff -aur a/gtk/theme/win32/gtk.css b/gtk/theme/win32/gtk.css
+ margin-top: -3px;
+ margin-left: -13px;
+}
++
++/* Fix messageview attachment icon offset */
++#textview_icon {
++ margin-left: -13px;
++}
commit 8bf6554539b1a500f106038b15007fb89b8fc289
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Mon Aug 16 22:15:07 2021 -0700
add more adwaita icons
diff --git a/src/sections-installer.nsi b/src/sections-installer.nsi
index aae063c..fe712d8 100644
--- a/src/sections-installer.nsi
+++ b/src/sections-installer.nsi
@@ -301,7 +301,11 @@ SetOutPath "$INSTDIR\share\icons\Adwaita\16x16\devices"
File ${prefix}/share/icons/Adwaita/16x16/devices/drive-harddisk-symbolic.symbolic.png
SetOutPath "$INSTDIR\share\icons\Adwaita\16x16\legacy"
+File ${prefix}/share/icons/Adwaita/16x16/legacy/dialog-error.png
File ${prefix}/share/icons/Adwaita/16x16/legacy/dialog-information.png
+File ${prefix}/share/icons/Adwaita/16x16/legacy/dialog-password.png
+File ${prefix}/share/icons/Adwaita/16x16/legacy/dialog-question.png
+File ${prefix}/share/icons/Adwaita/16x16/legacy/dialog-warning.png
File ${prefix}/share/icons/Adwaita/16x16/legacy/document-properties.png
File ${prefix}/share/icons/Adwaita/16x16/legacy/edit-clear.png
File ${prefix}/share/icons/Adwaita/16x16/legacy/edit-copy.png
@@ -359,6 +363,13 @@ File ${prefix}/share/icons/Adwaita/16x16/ui/window-restore-symbolic.symbolic.png
SetOutPath "$INSTDIR\share\icons\Adwaita\32x32\mimetypes"
File ${prefix}/share/icons/Adwaita/32x32/mimetypes/text-x-generic.png
+SetOutPath "$INSTDIR\share\icons\Adwaita\48x48\legacy"
+File ${prefix}/share/icons/Adwaita/48x48/legacy/dialog-error.png
+File ${prefix}/share/icons/Adwaita/48x48/legacy/dialog-information.png
+File ${prefix}/share/icons/Adwaita/48x48/legacy/dialog-password.png
+File ${prefix}/share/icons/Adwaita/48x48/legacy/dialog-question.png
+File ${prefix}/share/icons/Adwaita/48x48/legacy/dialog-warning.png
+
SetOutPath "$INSTDIR\share\icons\Adwaita\256x256\legacy"
File ${prefix}/share/icons/Adwaita/256x256/legacy/dialog-error.png
File ${prefix}/share/icons/Adwaita/256x256/legacy/dialog-information.png
diff --git a/src/sections-uninstaller.nsi b/src/sections-uninstaller.nsi
index 010df0e..cf7d0d6 100644
--- a/src/sections-uninstaller.nsi
+++ b/src/sections-uninstaller.nsi
@@ -158,7 +158,11 @@ RMDir "$INSTDIR\share\icons\Adwaita\16x16\categories"
Delete "$INSTDIR\share\icons\Adwaita\16x16\devices\drive-harddisk-symbolic.symbolic.png"
RMDir "$INSTDIR\share\icons\Adwaita\16x16\devices"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\dialog-error.png"
Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\dialog-information.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\dialog-password.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\dialog-question.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\dialog-warning.png"
Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\document-properties.png"
Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\edit-clear.png"
Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\edit-copy.png"
@@ -221,6 +225,15 @@ RMDir "$INSTDIR\share\icons\Adwaita\32x32\mimetypes"
RMDir "$INSTDIR\share\icons\Adwaita\32x32"
+Delete "$INSTDIR\share\icons\Adwaita\48x48\legacy\dialog-error.png"
+Delete "$INSTDIR\share\icons\Adwaita\48x48\legacy\dialog-information.png"
+Delete "$INSTDIR\share\icons\Adwaita\48x48\legacy\dialog-password.png"
+Delete "$INSTDIR\share\icons\Adwaita\48x48\legacy\dialog-question.png"
+Delete "$INSTDIR\share\icons\Adwaita\48x48\legacy\dialog-warning.png"
+RMDir "$INSTDIR\share\icons\Adwaita\48x48\legacy"
+
+RMDir "$INSTDIR\share\icons\Adwaita\48x48"
+
Delete "$INSTDIR\share\icons\Adwaita\256x256\legacy\dialog-error.png"
Delete "$INSTDIR\share\icons\Adwaita\256x256\legacy\dialog-information.png"
Delete "$INSTDIR\share\icons\Adwaita\256x256\legacy\dialog-password.png"
commit 3ed4174faaafe2fb0712d56542a16dacf2bf1723
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sun Aug 15 03:31:05 2021 -0700
fix messageview avatar position
diff --git a/patches/gtk/60-win32-theme-claws-consolidated.patch b/patches/gtk/60-win32-theme-claws-consolidated.patch
index 86d31ed..0c7d278 100644
--- a/patches/gtk/60-win32-theme-claws-consolidated.patch
+++ b/patches/gtk/60-win32-theme-claws-consolidated.patch
@@ -1,5 +1,6 @@
+diff -aur a/gtk/theme/win32/gtk.css b/gtk/theme/win32/gtk.css
--- a/gtk/theme/win32/gtk.css 2021-08-03 16:41:08.501811024 -0700
-+++ b/gtk/theme/win32/gtk.css 2021-08-03 16:50:12.553362104 -0700
++++ b/gtk/theme/win32/gtk.css 2021-08-15 03:25:38.858490703 -0700
@@ -1,3 +1,9 @@
+/* win71 theme
+ * Based on (internal) win32 theme from gtk+
@@ -20,7 +21,7 @@
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,97 @@
+@@ -272,3 +277,104 @@
.maximized .titlebar button.maximize:disabled {
background-image: -gtk-win32-theme-part(window, 21, 4);
}
@@ -118,3 +119,10 @@
+#hbox_stat > progressbar.horizontal > trough > progress {
+ min-height: 9px;
+}
++
++/* Fix messageview avatar offset */
++#textview_avatar,
++#textview_contact_pic {
++ margin-top: -3px;
++ margin-left: -13px;
++}
commit 2d3c63714327c2ba13d3c0fe7281db08c69ce35d
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sun Aug 15 00:30:26 2021 -0700
use widget names in gtk theme
diff --git a/patches/claws_mail/09-widget-names.patch b/patches/claws_mail/09-widget-names.patch
new file mode 100644
index 0000000..22f8608
--- /dev/null
+++ b/patches/claws_mail/09-widget-names.patch
@@ -0,0 +1,174 @@
+diff --git a/src/folderview.c b/src/folderview.c
+index 9b2e364e9..a3f549236 100644
+--- a/src/folderview.c
++++ b/src/folderview.c
+@@ -455,6 +455,8 @@ static GtkWidget *folderview_ctree_create(FolderView *folderview)
+ ctree = gtk_sctree_new_with_titles(N_FOLDER_COLS, col_pos[F_COL_FOLDER],
+ titles);
+
++ gtk_widget_set_name(GTK_WIDGET(ctree), "folderview_sctree");
++
+ if (prefs_common.show_col_headers == FALSE)
+ gtk_cmclist_column_titles_hide(GTK_CMCLIST(ctree));
+
+@@ -608,6 +610,7 @@ FolderView *folderview_create(MainWindow *mainwin)
+ folderview = g_new0(FolderView, 1);
+
+ scrolledwin = gtk_scrolled_window_new(NULL, NULL);
++ gtk_widget_set_name(GTK_WIDGET(scrolledwin), "folderview");
+ gtk_scrolled_window_set_policy
+ (GTK_SCROLLED_WINDOW(scrolledwin),
+ GTK_POLICY_AUTOMATIC,
+diff --git a/src/gtk/gtkutils.c b/src/gtk/gtkutils.c
+index 3512e97cd..da8325717 100644
+--- a/src/gtk/gtkutils.c
++++ b/src/gtk/gtkutils.c
+@@ -1524,6 +1524,7 @@ GtkWidget *gtkut_window_new (GtkWindowType type,
+ {
+ GtkWidget *window = gtk_window_new(type);
+ gtk_window_set_role(GTK_WINDOW(window), class);
++ gtk_widget_set_name(GTK_WIDGET(window), class);
+ return window;
+ }
+
+diff --git a/src/headerview.c b/src/headerview.c
+index 69d0d407c..433c26386 100644
+--- a/src/headerview.c
++++ b/src/headerview.c
+@@ -72,6 +72,7 @@ HeaderView *headerview_create(void)
+ headerview = g_new0(HeaderView, 1);
+
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
++ gtk_widget_set_name(GTK_WIDGET(hbox), "headerview");
+ gtk_container_set_border_width(GTK_CONTAINER(hbox), 2);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 2);
+ gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 0);
+diff --git a/src/mainwindow.c b/src/mainwindow.c
+index d8d0388de..440bc28b9 100644
+--- a/src/mainwindow.c
++++ b/src/mainwindow.c
+@@ -1916,6 +1916,7 @@ MainWindow *main_window_create()
+
+ #ifndef GENERIC_UMPC
+ hbox_stat = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 2);
++ gtk_widget_set_name(GTK_WIDGET(hbox_stat), "hbox_stat");
+ gtk_box_pack_end(GTK_BOX(vbox_body), hbox_stat, FALSE, FALSE, 0);
+
+ warning_icon = gtkut_stock_button("dialog-warning", NULL);
+diff --git a/src/messageview.c b/src/messageview.c
+index 36dad2799..6b187d619 100644
+--- a/src/messageview.c
++++ b/src/messageview.c
+@@ -416,6 +416,7 @@ MessageView *messageview_create(MainWindow *mainwin)
+ mimeview->messageview = messageview;
+
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
++ gtk_widget_set_name(GTK_WIDGET(vbox), "messageview");
+ gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET_PTR(headerview),
+ FALSE, FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET_PTR(noticeview),
+diff --git a/src/mimeview.c b/src/mimeview.c
+index 83b103a5f..9b2fa0ec1 100644
+--- a/src/mimeview.c
++++ b/src/mimeview.c
+@@ -362,6 +362,7 @@ MimeView *mimeview_create(MainWindow *mainwin)
+ G_CALLBACK(mimeview_drag_data_get), mimeview);
+
+ mime_notebook = gtk_notebook_new();
++ gtk_widget_set_name(GTK_WIDGET(mime_notebook), "mime_notebook");
+ gtk_widget_show(mime_notebook);
+ gtk_widget_set_can_focus(mime_notebook, FALSE);
+ gtk_notebook_set_show_tabs(GTK_NOTEBOOK(mime_notebook), FALSE);
+@@ -401,6 +402,7 @@ MimeView *mimeview_create(MainWindow *mainwin)
+ G_CALLBACK(mime_toggle_button_cb), mimeview);
+
+ icon_mainbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
++ gtk_widget_set_name(GTK_WIDGET(icon_mainbox), "mimeview_icon_mainbox");
+ gtk_widget_show(icon_mainbox);
+ gtk_widget_set_size_request(icon_mainbox, 32, -1);
+ gtk_box_pack_start(GTK_BOX(icon_mainbox), mime_toggle, FALSE, FALSE, 0);
+@@ -410,6 +412,7 @@ MimeView *mimeview_create(MainWindow *mainwin)
+ G_CALLBACK(icon_scroll_size_allocate_cb), mimeview);
+
+ ctree_mainbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
++ gtk_widget_set_name(GTK_WIDGET(ctree_mainbox), "mimeview_ctree_mainbox");
+ gtk_box_pack_start(GTK_BOX(ctree_mainbox), scrolledwin, TRUE, TRUE, 0);
+ g_signal_connect(G_OBJECT(ctree_mainbox), "size_allocate",
+ G_CALLBACK(ctree_size_allocate_cb), mimeview);
+@@ -459,6 +462,7 @@ MimeView *mimeview_create(MainWindow *mainwin)
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
+ gtk_widget_show(vbox);
+ siginfoview = noticeview_create(mainwin);
++ gtk_widget_set_name(GTK_WIDGET(siginfoview->vgrid), "siginfoview");
+ noticeview_hide(siginfoview);
+ noticeview_set_icon_clickable(siginfoview, TRUE);
+ gtk_box_pack_start(GTK_BOX(vbox), mime_notebook, TRUE, TRUE, 0);
+@@ -470,6 +474,7 @@ MimeView *mimeview_create(MainWindow *mainwin)
+ gtk_paned_pack2(GTK_PANED(paned), vbox, TRUE, TRUE);
+
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
++ gtk_widget_set_name(GTK_WIDGET(hbox), "mimeview");
+ gtk_box_pack_start(GTK_BOX(hbox), paned, TRUE, TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(hbox), icon_mainbox, FALSE, FALSE, 0);
+
+diff --git a/src/noticeview.c b/src/noticeview.c
+index 60c51b037..1b7e925be 100644
+--- a/src/noticeview.c
++++ b/src/noticeview.c
+@@ -86,6 +86,7 @@ NoticeView *noticeview_create(MainWindow *mainwin)
+ noticeview->window = mainwin->window;
+
+ vgrid = gtk_grid_new();
++ gtk_widget_set_name(GTK_WIDGET(vgrid), "noticeview");
+ gtk_orientable_set_orientation(GTK_ORIENTABLE(vgrid),
+ GTK_ORIENTATION_VERTICAL);
+ gtk_grid_set_row_spacing(GTK_GRID(vgrid), 4);
+diff --git a/src/summaryview.c b/src/summaryview.c
+index 9d0b9a433..ada78d7e3 100644
+--- a/src/summaryview.c
++++ b/src/summaryview.c
+@@ -570,6 +570,7 @@ SummaryView *summary_create(MainWindow *mainwin)
+
+ #define SUMMARY_VBOX_SPACING 3
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, SUMMARY_VBOX_SPACING);
++ gtk_widget_set_name(GTK_WIDGET(vbox), "summaryview");
+
+ /* create status label */
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
+@@ -6692,6 +6693,8 @@ static GtkWidget *summary_ctree_create(SummaryView *summaryview)
+ ctree = gtk_sctree_new_with_titles
+ (N_SUMMARY_COLS, col_pos[S_COL_SUBJECT], titles);
+
++ gtk_widget_set_name(GTK_WIDGET(ctree), "summaryview_sctree");
++
+ if (prefs_common.show_col_headers == FALSE)
+ gtk_cmclist_column_titles_hide(GTK_CMCLIST(ctree));
+
+diff --git a/src/textview.c b/src/textview.c
+index 74ba34dfa..9bd0c9a78 100644
+--- a/src/textview.c
++++ b/src/textview.c
+@@ -1959,6 +1959,7 @@ static void textview_show_avatar(TextView *textview)
+ avatarr->image = NULL; /* avoid destroying */
+ avatars_avatarrender_free(avatarr);
+
++ gtk_widget_set_name(GTK_WIDGET(textview->image), "textview_avatar");
+ gtk_widget_show(textview->image);
+
+ gtk_widget_get_allocation(textview->text, &allocation);
+@@ -1989,6 +1990,7 @@ void textview_show_icon(TextView *textview, const gchar *stock_id)
+ textview->image = gtk_image_new_from_icon_name(stock_id, GTK_ICON_SIZE_DIALOG);
+ cm_return_if_fail(textview->image != NULL);
+
++ gtk_widget_set_name(GTK_WIDGET(textview->image), "textview_icon");
+ gtk_widget_show(textview->image);
+
+ gtk_widget_get_allocation(textview->text, &allocation);
+@@ -2090,6 +2092,7 @@ static void textview_show_contact_pic(TextView *textview)
+ }
+ cm_return_if_fail(textview->image != NULL);
+
++ gtk_widget_set_name(GTK_WIDGET(textview->image), "textview_contact_pic");
+ gtk_widget_show(textview->image);
+
+ gtk_widget_get_allocation(textview->text, &allocation);
diff --git a/patches/gtk/60-win32-theme-claws-consolidated.patch b/patches/gtk/60-win32-theme-claws-consolidated.patch
index d231b77..86d31ed 100644
--- a/patches/gtk/60-win32-theme-claws-consolidated.patch
+++ b/patches/gtk/60-win32-theme-claws-consolidated.patch
@@ -94,27 +94,27 @@
+}
+
+/* Make folderview and summaryview background white */
-+box > box > paned > scrolledwindow,
-+paned > box > notebook > stack > scrolledwindow {
++#folderview,
++#summaryview > notebook > stack > scrolledwindow {
+ background-color: white;
+}
+
+/* Shift folderview and summaryview vertical scrollbars up to
+ * fill the corner between the scrollbar and column headers */
-+box > box > paned > scrolledwindow > scrollbar,
-+paned > box > notebook > stack > scrolledwindow > scrollbar {
-+ margin-top: -24px;
++#folderview > scrollbar.vertical,
++#summaryview > notebook > stack > scrolledwindow > scrollbar.vertical {
++ margin-top: -24px;
+}
+
-+/* Make folderview and summaryview buttons closer together */
-+box > box > paned > scrolledwindow button,
-+paned > box > notebook > stack > scrolledwindow > widget > button {
++/* Make folderview and summaryview column headers closer together */
++#folderview_sctree > button,
++#summaryview_sctree > button {
+ margin-left: 0px;
+ margin-right: -1px;
+}
+
+/* Fix status bar height bouncing when progress bar toggles visibility */
-+box > box > box > progressbar.horizontal > trough,
-+box > box > box > progressbar.horizontal > trough > progress {
++#hbox_stat > progressbar.horizontal > trough,
++#hbox_stat > progressbar.horizontal > trough > progress {
+ min-height: 9px;
+}
commit 05ead8e23338cc390bd6ba3011a910b5d3b8a4a7
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sun Aug 15 01:05:58 2021 -0700
update to pango-1.48.8
also add a patch to fix font spacing issues introduced in 1.48.6
diff --git a/packages/packages.current b/packages/packages.current
index 754ac1c..146314b 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -44,7 +44,7 @@ libxml2,2.9.12,file,ftp://xmlsoft.org/libxml2/libxml2-2.9.12.tar.gz,c8d6681e38c5
libxslt,1.1.34,file,ftp://xmlsoft.org/libxml2/libxslt-1.1.34.tar.gz,98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f,,
nettle,3.7.3,file,https://ftp.gnu.org/pub/gnu/nettle/nettle-3.7.3.tar.gz,661f5eb03f048a3b924c3a8ad2515d4068e40f67e774e8a26827658007e3bcf0,,
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.7,file,https://download.gnome.org/sources/pango/1.48/pango-1.48.7.tar.xz,28a82f6a6cab60aa3b75a90f04197ead2d311fa8fe8b7bfdf8666e2781d506dc,,
+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,,
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,,
diff --git a/patches/pango/01-rounding.patch b/patches/pango/01-rounding.patch
new file mode 100644
index 0000000..bb721eb
--- /dev/null
+++ b/patches/pango/01-rounding.patch
@@ -0,0 +1,41 @@
+From df0217a3f46c77b743fa1ae1ddfc2bb321ba91e8 Mon Sep 17 00:00:00 2001
+From: Chun-wei Fan <fanchunwei at src.gnome.org>
+Date: Mon, 9 Aug 2021 16:22:22 +0800
+Subject: [PATCH] pango/shape.c: Use the former rounding code as needed
+
+The careful rounding code that was brought back as a result of commit
+d4356779 only had effect if we are using a backend that supported font
+hinting, so on other backends, use the former rounding code that was
+dropped in favor of the careful rounding code that unfortunately did not
+apply for all backends.
+
+Should fix #578.
+---
+ pango/shape.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/pango/shape.c b/pango/shape.c
+index f8ac3691..aed028b7 100644
+--- a/pango/shape.c
++++ b/pango/shape.c
+@@ -341,5 +341,17 @@ pango_shape_with_flags (const gchar *item_text,
+ #undef HINT
+ }
+ }
++ else
++ {
++ for (i = 0; i < glyphs->num_glyphs; i++)
++ {
++ glyphs->glyphs[i].geometry.width =
++ PANGO_UNITS_ROUND (glyphs->glyphs[i].geometry.width);
++ glyphs->glyphs[i].geometry.x_offset =
++ PANGO_UNITS_ROUND (glyphs->glyphs[i].geometry.x_offset);
++ glyphs->glyphs[i].geometry.y_offset =
++ PANGO_UNITS_ROUND (glyphs->glyphs[i].geometry.y_offset);
++ }
++ }
+ }
+ }
+--
+GitLab
+
commit b20eeff2e6db0149d155bb92ce8278b7786293b6
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Mon Aug 2 23:11:08 2021 -0700
add patches for glib and enchant
fix issues found by app verifier:
glib reads past the end of a buffer
enchant leaks memory from DllMain
diff --git a/patches/enchant/02-free-library-name.patch b/patches/enchant/02-free-library-name.patch
new file mode 100644
index 0000000..b55efee
--- /dev/null
+++ b/patches/enchant/02-free-library-name.patch
@@ -0,0 +1,23 @@
+--- a/lib/relocatable.c 2021-08-02 22:03:28.502997457 -0700
++++ b/lib/relocatable.c 2021-08-02 22:09:43.269387994 -0700
+@@ -314,7 +314,7 @@
+ #if defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE
+
+ /* Full pathname of shared library, or NULL. */
+-static char *shared_library_fullname;
++static char *shared_library_fullname = NULL;
+
+ #if defined _WIN32 && !defined __CYGWIN__
+ /* Native Windows only.
+@@ -345,6 +345,11 @@
+
+ shared_library_fullname = strdup (location);
+ }
++ else if (event == DLL_PROCESS_DETACH)
++ {
++ if (shared_library_fullname != NULL)
++ free(shared_library_fullname);
++ }
+
+ return TRUE;
+ }
diff --git a/patches/glib/01-memcpy-length.patch b/patches/glib/01-memcpy-length.patch
new file mode 100644
index 0000000..8fb0255
--- /dev/null
+++ b/patches/glib/01-memcpy-length.patch
@@ -0,0 +1,11 @@
+--- a/gio/gwin32packageparser.c 2021-08-02 21:23:30.898523365 -0700
++++ b/gio/gwin32packageparser.c 2021-08-02 21:30:48.908511480 -0700
+@@ -390,7 +390,7 @@
+ wcs_path = LoadedWindowsGetStringRawBuffer (path, NULL);
+ manifest_filename_size = wcslen (wcs_path) + wcslen (bslash_appmanifest);
+ manifest_filename = g_new (wchar_t, manifest_filename_size + 1);
+- memcpy (manifest_filename, wcs_path, manifest_filename_size * sizeof (wchar_t));
++ memcpy (manifest_filename, wcs_path, wcslen (wcs_path) * sizeof (wchar_t));
+ memcpy (&manifest_filename[wcslen (wcs_path)], bslash_appmanifest, (wcslen (bslash_appmanifest) + 1) * sizeof (wchar_t));
+
+ memset (sax, 0, sizeof (*sax));
commit 409cb0d2ee03fcbffb9c007528133aa40c20fe91
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Mon Aug 2 17:29:59 2021 -0700
add missing dependency on cairo for pixman
diff --git a/configure.ac b/configure.ac
index db0ad87..92729ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -235,7 +235,7 @@ CM_SPKG([libffi])
CM_SPKG([glib], [libiconv gettext libffi zlib])
CM_SPKG([expat])
CM_SPKG([pixman], [libpng])
-CM_SPKG([cairo], [zlib libpng glib freetype fontconfig])
+CM_SPKG([cairo], [zlib libpng glib freetype fontconfig pixman])
CM_SPKG([atk], [glib])
CM_SPKG([libxml2], [zlib])
CM_SPKG([fontconfig], [zlib expat freetype libiconv libxml2])
commit 4b0fdfecbf80fef35227157a31940c61bb9a515d
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Tue Aug 3 16:56:56 2021 -0700
theme fix for progress bar
Fix the status bar height bouncing when the progress bar toggles
visibility
diff --git a/patches/gtk/60-win32-theme-claws-consolidated.patch b/patches/gtk/60-win32-theme-claws-consolidated.patch
index 9b8a947..d231b77 100644
--- a/patches/gtk/60-win32-theme-claws-consolidated.patch
+++ b/patches/gtk/60-win32-theme-claws-consolidated.patch
@@ -1,5 +1,5 @@
---- a/gtk/theme/win32/gtk.css 2021-07-29 19:54:57.943852906 -0700
-+++ b/gtk/theme/win32/gtk.css 2021-07-29 23:42:22.453515376 -0700
+--- a/gtk/theme/win32/gtk.css 2021-08-03 16:41:08.501811024 -0700
++++ b/gtk/theme/win32/gtk.css 2021-08-03 16:50:12.553362104 -0700
@@ -1,3 +1,9 @@
+/* win71 theme
+ * Based on (internal) win32 theme from gtk+
@@ -20,7 +20,7 @@
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,91 @@
+@@ -272,3 +277,97 @@
.maximized .titlebar button.maximize:disabled {
background-image: -gtk-win32-theme-part(window, 21, 4);
}
@@ -112,3 +112,9 @@
+ margin-left: 0px;
+ margin-right: -1px;
+}
++
++/* Fix status bar height bouncing when progress bar toggles visibility */
++box > box > box > progressbar.horizontal > trough,
++box > box > box > progressbar.horizontal > trough > progress {
++ min-height: 9px;
++}
-----------------------------------------------------------------------
hooks/post-receive
--
Installer sources for Claws Mail Windows port
More information about the Commits
mailing list