feat: update fcitx5 to 5.1.11

Fcitx Input Method Framework v5

Issue: deepin-community/sig-deepin-sysdev-team#552
Log: update repo

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.6.0)
-project(fcitx VERSION 5.1.10)
+project(fcitx VERSION 5.1.11)
 set(FCITX_VERSION ${PROJECT_VERSION})
 
 find_package(ECM REQUIRED 1.0.0)

data/fcitx5-configtool.sh

@@ -7,14 +7,14 @@ export TEXTDOMAIN=fcitx5
 
 if command -v kdialog > /dev/null 2>&1; then
     message() {
-        kdialog --msgbox "$1"
+        kdialog --yesno "$1"
     }
     error() {
         kdialog --error "$1"
     }
 elif command -v zenity > /dev/null 2>&1; then
     message() {
-        zenity --info --text="$1"
+        zenity --question --text="$1"
     }
     error() {
         zenity --error --text="$1"
@@ -131,13 +131,18 @@ run_qt() {
 run_xdg() {
     case "$DE" in
         kde)
-            message "$(_ "You're currently running KDE, but KCModule for fcitx couldn't be found, the package name of this KCModule is usually kcm-fcitx or kde-config-fcitx. Now it will open config directory.")"
+            message "$(_ "You're currently running KDE, but KCModule for fcitx couldn't be found. The package name of this KCModule is usually kcm-fcitx5, kde-config-fcitx5, or fcitx5-configtool. Now it will open the configuration directory.")"
             ;;
         *)
-            message "$(_ "You're currently running Fcitx with GUI, but fcitx5-config-qt couldn't be found. Now it will open config directory.")"
+            message "$(_ "You're currently running Fcitx with GUI, but fcitx5-config-qt couldn't be found. The package name provides this binary is usually fcitx5-configtool. Now it will open the configuration directory.")"
             ;;
     esac
 
+    # user choose no
+    if [ $? -ne 0 ]; then
+        exit
+    fi
+
     if command="$(command -v xdg-open 2>/dev/null)"; then
         exec "$command" "$HOME/.config/fcitx5"
     fi

data/org.fcitx.Fcitx5.metainfo.xml.in

@@ -31,6 +31,7 @@
     <binary>fcitx5</binary>
   </provides>
   <releases>
+    <release version="5.1.11" date="2024-10-08"/>
     <release version="5.1.10" date="2024-05-30"/>
     <release version="5.1.9" date="2024-04-22"/>
     <release version="5.1.8" date="2024-02-28"/>

debian/changelog

@@ -1,27 +1,24 @@
-fcitx5 (5.1.10-1deepin7) unstable; urgency=medium
+fcitx5 (5.1.11-2) unstable; urgency=medium
 
-  * Processing Deepin25 Jump Control Center
+  [ Pino Toscano ]
+  * Make fcitx5 build and hopefully install also on non-Linux architectures:
+    - add the dh-exec build dependency to add architecture filtering in install
+      files
+    - install the Wayland-related files only on Linux
+    - limit the fcitx5-module-wayland provides in fcitx5-modules as linux-any,
+      as Wayland modules are available only on Linux
 
- -- caixiangrong <[email protected]>  Thu, 05 Dec 2024 16:35:43 +0800
-
-fcitx5 (5.1.10-1deepin6) unstable; urgency=medium
-
-  * add enable autostart
-
- -- Chengqi E <[email protected]>  Fri, 22 Nov 2024 16:25:33 +0800
-
-fcitx5 (5.1.10-1deepin5) unstable; urgency=medium
-
-  * remove the restart icon from the right-click menu
+  [ Boyuan Yang ]
+  * debian/control: Bump Standards-Version to 4.7.0.
+  * debian/control: Move main package description to source package section.
 
- -- xionglinlin <[email protected]>  Wed, 16 Oct 2024 16:25:33 +0800
+ -- Boyuan Yang <[email protected]>  Sat, 12 Oct 2024 11:04:06 -0400
 
-fcitx5 (5.1.10-1deepin4) unstable; urgency=medium
+fcitx5 (5.1.11-1) unstable; urgency=medium
 
-  * Use gcc 12.
-  * Set Sogo to the default zh_CN input method list.
+  * New upstream release.
 
- -- xiangzelong <xiangzelong@deepin.org>  Thu, 15 Aug 2024 15:19:29 +0800
+ -- Boyuan Yang <byang@debian.org>  Tue, 08 Oct 2024 18:29:55 -0400
 
 fcitx5 (5.1.10-1) unstable; urgency=medium
 

debian/control

@@ -9,6 +9,7 @@ Build-Depends:
  cmake (>= 3.6.0),
  dbus-daemon <!nocheck>,
  debhelper-compat (= 13),
+ dh-exec,
  extra-cmake-modules,
  gettext,
  iso-codes,
@@ -40,15 +41,26 @@ Build-Depends:
  libxcb1-dev,
  libxkbcommon-x11-dev,
  libxkbfile-dev,
- pkg-config,
+ pkgconf,
  unicode-cldr-core,
  uuid-dev,
  wayland-protocols [linux-any],
-Standards-Version: 4.6.2
+Standards-Version: 4.7.0
 Rules-Requires-Root: no
 Homepage: https://github.com/fcitx/fcitx5
 Vcs-Git: https://salsa.debian.org/input-method-team/fcitx5.git
 Vcs-Browser: https://salsa.debian.org/input-method-team/fcitx5
+Description: Fcitx Input Method Framework v5
+ Fcitx5 is the next generation of fcitx input method framework. It
+ provides pleasant and modern input experience with intuitive graphical
+ configuration tools. The framework is highly extensible with support
+ for GTK+ and Qt toolkits, D-Bus interfaces, a large variety of desktop
+ environments and a developer-friendly API.
+ .
+ Some of its new features include support of both Wayland and Xorg
+ and the ability to mimic IBus Input Method Framework in order to
+ provide better compatibility across different Linux distributions
+ and desktop environments.
 
 Package: fcitx5
 Architecture: any
@@ -71,17 +83,8 @@ Conflicts:
  fcitx (<< 1:5),
  fcitx-bin (<< 1:5),
  fcitx-data (<< 1:5),
-Description: Next generation of Fcitx Input Method Framework
- Fcitx5 is the next generation of fcitx input method framework. It
- provides pleasant and modern input experience with intuitive graphical
- configuration tools. The framework is highly extensible with support
- for GTK+ and Qt toolkits, D-Bus interfaces, a large variety of desktop
- environments and a developer-friendly API.
- .
- Some of its new features include support of both Wayland and Xorg
- and the ability to mimic IBus Input Method Framework in order to
- provide better compatibility across different Linux distributions
- and desktop environments.
+Description: ${source:Synopsis}
+ ${source:Extended-Description}
  .
  This package provides core fcitx5 framework files.
 
@@ -90,17 +93,8 @@ Architecture: all
 Multi-Arch: foreign
 Depends:
  ${misc:Depends},
-Description: Fcitx Input Method Framework v5 (common data files)
- Fcitx5 is the next generation of fcitx input method framework. It
- provides pleasant and modern input experience with intuitive graphical
- configuration tools. The framework is highly extensible with support
- for GTK+ and Qt toolkits, D-Bus interfaces, a large variety of desktop
- environments and a developer-friendly API.
- .
- Some of its new features include support of both Wayland and Xorg
- and the ability to mimic IBus Input Method Framework in order to
- provide better compatibility across different Linux distributions
- and desktop environments.
+Description: ${source:Synopsis} (common data files)
+ ${source:Extended-Description}
  .
  This package provides architecture-independent data files.
 
@@ -118,17 +112,8 @@ Suggests:
  fcitx5-frontend-fbterm,
  fcitx5-frontend-gtk2,
  fcitx5-frontend-tmux,
-Description: Fcitx Input Method Framework v5 (IM Module Metapackage)
- Fcitx5 is the next generation of fcitx input method framework. It
- provides pleasant and modern input experience with intuitive graphical
- configuration tools. The framework is highly extensible with support
- for GTK+ and Qt toolkits, D-Bus interfaces, a large variety of desktop
- environments and a developer-friendly API.
- .
- Some of its new features include support of both Wayland and Xorg
- and the ability to mimic IBus Input Method Framework in order to
- provide better compatibility across different Linux distributions
- and desktop environments.
+Description: ${source:Synopsis} (Frontend IM Module metapackage)
+ ${source:Extended-Description}
  .
  This package depends on Input Method Modules (IM Modules) utilized
  by popular GUI libraries for better GUI input integration, currently
@@ -165,19 +150,10 @@ Provides:
  fcitx5-module-ibus,
  fcitx5-module-kimpanel,
  fcitx5-module-quickphrase,
- fcitx5-module-wayland,
+ fcitx5-module-wayland [linux-any],
  fcitx5-module-xorg,
-Description: Fcitx Input Method Framework v5 (core modules)
- Fcitx5 is the next generation of fcitx input method framework. It
- provides pleasant and modern input experience with intuitive graphical
- configuration tools. The framework is highly extensible with support
- for GTK+ and Qt toolkits, D-Bus interfaces, a large variety of desktop
- environments and a developer-friendly API.
- .
- Some of its new features include support of both Wayland and Xorg
- and the ability to mimic IBus Input Method Framework in order to
- provide better compatibility across different Linux distributions
- and desktop environments.
+Description: ${source:Synopsis} (core modules)
+ ${source:Extended-Description}
  .
  This package provides core modules for fcitx5 and depends on all
  input modules.
@@ -191,17 +167,8 @@ Depends:
  libfcitx5core-dev (= ${binary:Version}),
  libfcitx5utils-dev (= ${binary:Version}),
  ${misc:Depends},
-Description: Fcitx Input Method Framework v5 (input modules dev files)
- Fcitx5 is the next generation of fcitx input method framework. It
- provides pleasant and modern input experience with intuitive graphical
- configuration tools. The framework is highly extensible with support
- for GTK+ and Qt toolkits, D-Bus interfaces, a large variety of desktop
- environments and a developer-friendly API.
- .
- Some of its new features include support of both Wayland and Xorg
- and the ability to mimic IBus Input Method Framework in order to
- provide better compatibility across different Linux distributions
- and desktop environments.
+Description: ${source:Synopsis} (input modules dev files)
+ ${source:Extended-Description}
  .
  This package provides development files for fcitx5 input modules.
 
@@ -212,17 +179,8 @@ Section: libdevel
 Depends:
  libfcitx5config6 (= ${binary:Version}),
  ${misc:Depends},
-Description: Fcitx Input Method Framework v5 (config library dev files)
- Fcitx5 is the next generation of fcitx input method framework. It
- provides pleasant and modern input experience with intuitive graphical
- configuration tools. The framework is highly extensible with support
- for GTK+ and Qt toolkits, D-Bus interfaces, a large variety of desktop
- environments and a developer-friendly API.
- .
- Some of its new features include support of both Wayland and Xorg
- and the ability to mimic IBus Input Method Framework in order to
- provide better compatibility across different Linux distributions
- and desktop environments.
+Description: ${source:Synopsis} (config library dev files)
+ ${source:Extended-Description}
  .
  This package provides development files for fcitx5 config libraries.
 
@@ -233,17 +191,8 @@ Multi-Arch: same
 Depends:
  ${misc:Depends},
  ${shlibs:Depends},
-Description: Fcitx Input Method Framework v5 (config library)
- Fcitx5 is the next generation of fcitx input method framework. It
- provides pleasant and modern input experience with intuitive graphical
- configuration tools. The framework is highly extensible with support
- for GTK+ and Qt toolkits, D-Bus interfaces, a large variety of desktop
- environments and a developer-friendly API.
- .
- Some of its new features include support of both Wayland and Xorg
- and the ability to mimic IBus Input Method Framework in order to
- provide better compatibility across different Linux distributions
- and desktop environments.
+Description: ${source:Synopsis} (config library)
+ ${source:Extended-Description}
  .
  This package provides fcitx5 config libraries.
 
@@ -256,17 +205,8 @@ Depends:
  libfcitx5core7 (= ${binary:Version}),
  libfcitx5utils-dev (= ${binary:Version}),
  ${misc:Depends},
-Description: Fcitx Input Method Framework v5 (core library dev files)
- Fcitx5 is the next generation of fcitx input method framework. It
- provides pleasant and modern input experience with intuitive graphical
- configuration tools. The framework is highly extensible with support
- for GTK+ and Qt toolkits, D-Bus interfaces, a large variety of desktop
- environments and a developer-friendly API.
- .
- Some of its new features include support of both Wayland and Xorg
- and the ability to mimic IBus Input Method Framework in order to
- provide better compatibility across different Linux distributions
- and desktop environments.
+Description: ${source:Synopsis} (core library dev files)
+ ${source:Extended-Description}
  .
  This package provides development files for fcitx5 core libraries.
 
@@ -277,17 +217,8 @@ Multi-Arch: same
 Depends:
  ${misc:Depends},
  ${shlibs:Depends},
-Description: Fcitx Input Method Framework v5 (core library)
- Fcitx5 is the next generation of fcitx input method framework. It
- provides pleasant and modern input experience with intuitive graphical
- configuration tools. The framework is highly extensible with support
- for GTK+ and Qt toolkits, D-Bus interfaces, a large variety of desktop
- environments and a developer-friendly API.
- .
- Some of its new features include support of both Wayland and Xorg
- and the ability to mimic IBus Input Method Framework in order to
- provide better compatibility across different Linux distributions
- and desktop environments.
+Description: ${source:Synopsis} (core library)
+ ${source:Extended-Description}
  .
  This package provides fcitx5 core libraries.
 
@@ -298,17 +229,8 @@ Section: libdevel
 Depends:
  libfcitx5utils2 (= ${binary:Version}),
  ${misc:Depends},
-Description: Fcitx Input Method Framework v5 (utils library dev files)
- Fcitx5 is the next generation of fcitx input method framework. It
- provides pleasant and modern input experience with intuitive graphical
- configuration tools. The framework is highly extensible with support
- for GTK+ and Qt toolkits, D-Bus interfaces, a large variety of desktop
- environments and a developer-friendly API.
- .
- Some of its new features include support of both Wayland and Xorg
- and the ability to mimic IBus Input Method Framework in order to
- provide better compatibility across different Linux distributions
- and desktop environments.
+Description: ${source:Synopsis} (utils library dev files)
+ ${source:Extended-Description}
  .
  This package provides development files for fcitx5 utils libraries.
 
@@ -319,16 +241,7 @@ Multi-Arch: same
 Depends:
  ${misc:Depends},
  ${shlibs:Depends},
-Description: Fcitx Input Method Framework v5 (utils library)
- Fcitx5 is the next generation of fcitx input method framework. It
- provides pleasant and modern input experience with intuitive graphical
- configuration tools. The framework is highly extensible with support
- for GTK+ and Qt toolkits, D-Bus interfaces, a large variety of desktop
- environments and a developer-friendly API.
- .
- Some of its new features include support of both Wayland and Xorg
- and the ability to mimic IBus Input Method Framework in order to
- provide better compatibility across different Linux distributions
- and desktop environments.
+Description: ${source:Synopsis} (utils library)
+ ${source:Extended-Description}
  .
  This package provides fcitx5 utils libraries.

debian/fcitx5-modules.install

@@ -1,3 +1,4 @@
+#! /usr/bin/dh-exec
 usr/lib/*/fcitx5/libclassicui.so
 usr/lib/*/fcitx5/libclipboard.so
 usr/lib/*/fcitx5/libdbus.so
@@ -17,8 +18,8 @@ usr/lib/*/fcitx5/libtestim.so
 usr/lib/*/fcitx5/libtestui.so
 usr/lib/*/fcitx5/libunicode.so
 usr/lib/*/fcitx5/libvirtualkeyboard.so
-usr/lib/*/fcitx5/libwayland.so
-usr/lib/*/fcitx5/libwaylandim.so
+[linux-any] usr/lib/*/fcitx5/libwayland.so
+[linux-any] usr/lib/*/fcitx5/libwaylandim.so
 usr/lib/*/fcitx5/libxcb.so
 usr/lib/*/fcitx5/libxim.so
 usr/share/dbus-1/services/org.fcitx.Fcitx5.service
@@ -38,8 +39,8 @@ usr/share/fcitx5/addon/quickphrase.conf
 usr/share/fcitx5/addon/spell.conf
 usr/share/fcitx5/addon/unicode.conf
 usr/share/fcitx5/addon/virtualkeyboard.conf
-usr/share/fcitx5/addon/wayland.conf
-usr/share/fcitx5/addon/waylandim.conf
+[linux-any] usr/share/fcitx5/addon/wayland.conf
+[linux-any] usr/share/fcitx5/addon/waylandim.conf
 usr/share/fcitx5/addon/xcb.conf
 usr/share/fcitx5/addon/xim.conf
 usr/share/fcitx5/data/quickphrase.d

debian/fcitx5.install

@@ -1,8 +1,8 @@
-etc/xdg/Xwayland-session.d/20-fcitx-x11
+#! /usr/bin/dh-exec
+[linux-any] etc/xdg/Xwayland-session.d/20-fcitx-x11
 usr/bin/
-usr/libexec/
+[linux-any] usr/libexec/
 usr/share/applications/
 usr/share/icons/hicolor/*/apps/fcitx.*
 usr/share/icons/hicolor/*/apps/org.fcitx.Fcitx5.*
 usr/share/metainfo/org.fcitx.Fcitx5.metainfo.xml
-etc/xdg/autostart/