Merge branch 'master' into 570-introduce-css-make-iptux-easier-to-cus…

…tomize

.github/workflows/ci.yml

@@ -72,12 +72,16 @@ jobs:
           xvfb-run -a meson test -C build --verbose --no-stdsplit
 
   codecov:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
+    permissions:
+      checks: write
+      pull-requests: write
     steps:
       - uses: actions/checkout@v2
       - name: apt install
         run: >-
           sudo apt update &&
+          sudo apt install libunwind-dev &&
           sudo apt install -y lcov ${{ env.DEB_PKGS }} ${{ env.DEB_TEST_PKGS }}
       - name: meson
         run: meson setup -D b_coverage=true build
@@ -97,12 +101,17 @@ jobs:
           lcov --list coverage.info; #debug info
       # https://docs.codecov.com/docs/quick-start
       - name: "Upload coverage reports to Codecov"
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
         with:
           fail_ci_if_error: true # optional (default = false)
           verbose: false # optional (default = false)
+      - name: "Publish Test Results"
+        uses: EnricoMi/publish-unit-test-result-action@v2
+        if: always()
+        with:
+          files: build/meson-logs/testlog.junit.xml
 
   build_job:
     # The host should always be linux

NEWS

@@ -1,3 +1,15 @@
+Version 0.9.3
+~~~~~~~~~~~~~
+Released: 2024-06-22
+
+Features:
+  * [#593, #595, #601, #604] support paste image into chatbox, support copy/save
+    image in chat history.
+  * [#586] add keywords to metainfo and desktop file.
+
+Bugfixes:
+ * [#584] fix compile failed under armhf.
+
 Version 0.9.1
 ~~~~~~~~~~~~~
 Released: 2024-05-12

meson.build

@@ -1,6 +1,7 @@
 project('iptux', 'cpp',
     license: 'GPL2+',
-    version: '0.9.1',
+    version: '0.9.3',
+    meson_version: '>=0.53',
     default_options: ['warning_level=3', 'cpp_std=c++14'])
 add_global_arguments('-Werror=format', language : 'cpp')
 add_project_arguments(
@@ -11,9 +12,50 @@ if get_option('sanitize-address')
   add_project_link_arguments('-fsanitize=address', language: 'cpp')
 endif
 
-so_version = '0.9.1'
+so_version = '0.9.3'
 subdir('src')
 subdir('share')
 subdir('po')
 subdir('examples')
 subdir('scripts')
+
+if meson.version().version_compare('>=0.57')
+  summary({
+    'prefix': get_option('prefix'),
+    'bindir': get_option('bindir'),
+    'libdir': get_option('libdir'),
+    'data': get_option('datadir'),
+    }, section: 'Directories:')
+
+  summary_deps = {
+    'meson': meson.version(),
+    'glib-2.0': glib_dep,
+    'gtk+-3.0': gtk_dep,
+    'jsoncpp': jsoncpp_dep,
+    'libglog': glog_dep,
+    'gflags': gflags_dep,
+    'sigc++-2.0': sigc_dep,
+    }
+
+  if host_machine.system() == 'darwin'
+    summary_deps += {'gtk-mac-integration-gtk3': gtk_mac_integration_dep}
+  endif
+
+  if host_machine.system() == 'linux'
+    summary_deps += {'ayatana-appindicator3-0.1': appindicator_dep}
+  endif
+
+  summary_deps += {
+    'glib-compile-resources': glib_compile_resources,
+    'appstreamcli': ascli_exe,
+  }
+
+  summary(summary_deps, section: 'Dependencies:')
+
+  summary({
+    'dev': get_option('dev'),
+    'static-link': get_option('static-link'),
+    'appindicator': appindicator_dep.found(),
+    'sanitize-address': get_option('sanitize-address'),
+    }, section: 'Options:')
+endif

meson_options.txt

@@ -22,6 +22,6 @@ option(
 option(
   'sanitize-address',
   type: 'boolean',
-  value: 'false',
+  value: false,
   description: 'enable -fsanitize=address compile/link flag',
 )

po/POTFILES

@@ -32,7 +32,6 @@ src/iptux/DetectPal.cpp
 src/iptux/DialogBase.cpp
 src/iptux/DialogGroup.cpp
 src/iptux/DialogPeer.cpp
-src/iptux/EventAdaptor.cpp
 src/iptux/GioNotificationService.cpp
 src/iptux/LogSystem.cpp
 src/iptux/MainWindow.cpp