<p></p>
<p dir="auto">I think I resolved most differences. Left is that we don't call <code>gtk-update-icon-cache</code> and Scintilla's Compat.h</p>
<div class="highlight highlight-source-diff"><pre><span class="pl-md">--- 1 2022-02-19 00:09:57.208958194 +0100</span>
<span class="pl-mi1">+++ 2 2022-02-19 00:20:39.484275455 +0100</span>
<span class="pl-mdr">@@ -21,7 +21,6 @@</span>
./include/geany/pluginutils.h
./include/geany/prefs.h
./include/geany/project.h
<span class="pl-md"><span class="pl-md">-</span>./include/geany/scintilla/Compat.h</span>
./include/geany/scintilla/SciLexer.h
./include/geany/scintilla/Scintilla.h
./include/geany/scintilla/Scintilla.iface
<span class="pl-mdr">@@ -41,20 +40,13 @@</span>
./include/geany/toolbar.h
./include/geany/ui_utils.h
./include/geany/utils.h
<span class="pl-md"><span class="pl-md">-</span>./lib/geany/classbuilder.la</span>
./lib/geany/classbuilder.so
<span class="pl-md"><span class="pl-md">-</span>./lib/geany/export.la</span>
./lib/geany/export.so
<span class="pl-md"><span class="pl-md">-</span>./lib/geany/filebrowser.la</span>
./lib/geany/filebrowser.so
<span class="pl-md"><span class="pl-md">-</span>./lib/geany/htmlchars.la</span>
./lib/geany/htmlchars.so
<span class="pl-md"><span class="pl-md">-</span>./lib/geany/saveactions.la</span>
./lib/geany/saveactions.so
<span class="pl-md"><span class="pl-md">-</span>./lib/geany/splitwindow.la</span>
./lib/geany/splitwindow.so
<span class="pl-md"><span class="pl-md">-</span>./lib/libgeany.la</span>
<span class="pl-md"><span class="pl-md">-</span>./lib/libgeany.so.0.0.0</span>
<span class="pl-mi1"><span class="pl-mi1">+</span>./lib/libgeany.so.0</span>
./lib/pkgconfig/geany.pc
./share/applications/geany.desktop
./share/doc/geany/AUTHORS
<span class="pl-mdr">@@ -82,6 +74,7 @@</span>
./share/doc/geany/html/images/pref_dialog_vte.png
./share/doc/geany/html/images/replace_dialog.png
./share/doc/geany/html/index.html
<span class="pl-mi1"><span class="pl-mi1">+</span>./share/doc/geany/LexillaLicense.txt</span>
./share/doc/geany/manual.txt
./share/doc/geany/NEWS
./share/doc/geany/README
<span class="pl-mdr">@@ -214,6 +207,7 @@</span>
./share/icons/hicolor/24x24/actions/geany-build.png
./share/icons/hicolor/24x24/actions/geany-close-all.png
./share/icons/hicolor/24x24/actions/geany-save-all.png
<span class="pl-mi1"><span class="pl-mi1">+</span>./share/icons/hicolor/24x24/apps/geany.png</span>
./share/icons/hicolor/32x32/actions/geany-build.png
./share/icons/hicolor/32x32/actions/geany-close-all.png
./share/icons/hicolor/32x32/actions/geany-save-all.png
<span class="pl-mdr">@@ -222,7 +216,6 @@</span>
./share/icons/hicolor/48x48/actions/geany-close-all.png
./share/icons/hicolor/48x48/actions/geany-save-all.png
./share/icons/hicolor/48x48/apps/geany.png
<span class="pl-md"><span class="pl-md">-</span>./share/icons/hicolor/icon-theme.cache</span>
./share/icons/hicolor/scalable/actions/geany-build.svg
./share/icons/hicolor/scalable/actions/geany-close-all.svg
./share/icons/hicolor/scalable/actions/geany-save-all.svg
<span class="pl-mdr">@@ -231,7 +224,6 @@</span>
./share/icons/Tango/24x24/actions/geany-save-all.png
./share/icons/Tango/32x32/actions/geany-save-all.png
./share/icons/Tango/48x48/actions/geany-save-all.png
<span class="pl-md"><span class="pl-md">-</span>./share/icons/Tango/icon-theme.cache</span>
./share/icons/Tango/scalable/actions/geany-save-all.svg
./share/locale/ar/LC_MESSAGES/geany.mo
./share/locale/ast/LC_MESSAGES/geany.mo</pre></div>
<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br />Reply to this email directly, <a href="https://github.com/geany/geany/pull/2761#issuecomment-1045336098">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AAIOWJ4RQAWNOPTQS3BLQSLU33H7VANCNFSM4ZDZAFLA">unsubscribe</a>.<br />Triage notifications on the go with GitHub Mobile for <a href="https://apps.apple.com/app/apple-store/id1477376905?ct=notification-email&mt=8&pt=524675">iOS</a> or <a href="https://play.google.com/store/apps/details?id=com.github.android&referrer=utm_campaign%3Dnotification-email%26utm_medium%3Demail%26utm_source%3Dgithub">Android</a>.
<br />You are receiving this because you are subscribed to this thread.<img src="https://github.com/notifications/beacon/AAIOWJ7YJKLF75G6CPF5V5LU33H7VA5CNFSM4ZDZAFLKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOHZHJAIQ.gif" height="1" width="1" alt="" /><span style="color: transparent; font-size: 0; display: none; visibility: hidden; overflow: hidden; opacity: 0; width: 0; height: 0; max-width: 0; max-height: 0; mso-hide: all">Message ID: <span><geany/geany/pull/2761/c1045336098</span><span>@</span><span>github</span><span>.</span><span>com></span></span></p>
<script type="application/ld+json">[
{
"@context": "http://schema.org",
"@type": "EmailMessage",
"potentialAction": {
"@type": "ViewAction",
"target": "https://github.com/geany/geany/pull/2761#issuecomment-1045336098",
"url": "https://github.com/geany/geany/pull/2761#issuecomment-1045336098",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>