And attached is the NMU patch.
-- Lisandro Damián Nicanor Pérez Meyer http://perezmeyer.com.ar/ http://perezmeyer.blogspot.com/
From 90c200f506436898e5d64766c0fb7a031e151cc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lisandro=20Dami=C3=A1n=20Nicanor=20P=C3=A9rez=20Meyer?= <perezme...@gmail.com> Date: Sat, 28 Dec 2019 20:25:16 -0300 Subject: [PATCH] Drop Qt 4 support. --- debian/README.Debian | 58 ++++++++++++--------------------- debian/README.Qt | 26 --------------- debian/changelog | 11 +++++++ debian/control | 34 ++++--------------- debian/im-switch/scim-immodule | 22 ++----------- debian/rules | 2 +- debian/scim-qt-immodule.install | 1 - debian/scim.docs | 1 - 8 files changed, 42 insertions(+), 113 deletions(-) delete mode 100644 debian/README.Qt delete mode 100644 debian/scim-qt-immodule.install diff --git a/debian/README.Debian b/debian/README.Debian index 6f07b80..1e3d7b6 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -4,14 +4,14 @@ SCIM is an older and mature input method platform, and supports many different input methods (IMs) to make input of complicated characters in X environment -possible. +possible. There are SCIM plugin modules for many languages such as Japanese, Chinese, Korean, Arabic, and many Indic languages. Most description for the new IBus at http://www.debian.org/doc/manuals/debian-reference/ch08.en.html#_the_keyboard_input -is applicable to this older SCIM. +is applicable to this older SCIM. (Older documents in Japanese and English are available at: http://wiki.debian.org/JapaneseEnvironmentE (English) @@ -47,15 +47,11 @@ your language or favorite input method is supported. The packages scim-gtk-immodule-orig and scim-gtk-immodule provide GTK IM mode for SCIM. For more details, please read README.GTK. -The package scim-qt-immodule provides Qt IM mode for SCIM. For more details, -please read README.Qt. - In summary, you should install package scim and one of the IM module package to start. You may install scim-gtk-immodule-orig or scim-gtk-immodule if -you use GTK+ applications and want to try the GTK IM mode; and you may -install scim-qt-immodule if you use Qt applications and want to try the -Qt IM mode. You shouldn't need to explicitly install any other package as -they should be installed as necessary due to dependency. +you use GTK+ applications and want to try the GTK IM mode. You shouldn't need +to explicitly install any other package as they should be installed as +necessary due to dependency. ------- Locales @@ -90,12 +86,12 @@ Using SCIM ---------- After setting up locale, you can try using SCIM to input in your language. -SCIM can be used in three modes: XIM mode, GTK IM mode and Qt IM mode. +SCIM can be used in two modes: XIM mode and GTK IM mode. To use XIM (X Input Method) mode, you need to set the environment variable XMODIFIERS and GTK_IM_MODULE before starting your X application (you only need to set GTK_IM_MODULE/QT_IM_MODULE if the X application you want -to run also uses GTK+/Qt). Run the following commands in an X terminal +to run also uses GTK+). Run the following commands in an X terminal (such as xterm, gnome-terminal or konsole): $ XMODIFIERS="@im=SCIM" $ export XMODIFIERS @@ -142,19 +138,6 @@ and automatically stop when you quit the program. This may cause delay for program start/quit though, so it's always a good idea to explicitly start SCIM by "scim -d" command. -Qt also has its own input method framework, so Qt/KDE programs can use SCIM -in an additional mode, GTK IM mode. SCIM's Qt IM mode is provided as a -Qt IM module by the scim-qt-immodule package, and SCIM can automatically -start if you choose this module. So using GTK IM mode is simpler, just -start a Qt/KDE program, right-click and choose "Input Methods -> SCIM -Input Method" in the pop-up menu, and SCIM should automatically start if -it's not started yet. Now pressing Ctrl-space should also activate SCIM -and you can start typing. An alternative way to start Qt applications -using SCIM at the Qt IM module is by using QT_IM_MODULE - $ QT_IM_MODULE="scim" - $ export QT_IM_MODULE - $ qt-program - -------------- Autostart SCIM -------------- @@ -174,9 +157,8 @@ want to start SCIM automatically with GNOME: export GTK_IM_MODULE export QT_IM_MODULE scim -d -Change the en_US.UTF-8 to your preferred locale, and change -GTK_IM_MODULE/QT_IM_MODULE to -"scim" if you want to use GTK/QT IM mode instead of XIM mode. +Change the en_US.UTF-8 to your preferred locale, and change GTK_IM_MODULE to +"scim" if you want to use GTK IM mode instead of XIM mode. The hard part is to figure out which configuration file to put these in. One choice is to put it in ~/.xsession, and add your X session command at the end @@ -185,7 +167,7 @@ you always need to modify this file to change X session, and the feature of choosing session in GDM/KDM will not work anymore. There are other packages to help these configuration easier, see the next -section. +section. --------------- Helper Packages im-config (newer) @@ -209,11 +191,11 @@ If you just want to set one user account to use SCIM, just type: $ im-config (The menu lists only available IMs.) -If you do the same from root use, you set system wide default. - # im-config +If you do the same from root use, you set system wide default. + # im-config (The menu lists only available IMs.) -UTF-8 locales such as ja_JP.UTF-8 enables to edit any text of any +UTF-8 locales such as ja_JP.UTF-8 enables to edit any text of any languages, i.e., multilingualization (m17n) environment. Thus UTF-8 locale are recommended to be used with SCIM. In order to edit files encoded in other locales such as ja_JP.eucJP, pl_PL.ISO-8859-2, ..., @@ -221,13 +203,13 @@ you need to set up editor to handle them too. Please refer to The im-config package does not change ~/.scim/global or /etc/scim/global to enable all available UTF-8 locales for SCIM since you may want to start -some locales without SCIM. You still need to manually enable your locale +some locales without SCIM. You still need to manually enable your locale (see the "Locales" section above). Select UTF-8 locale using GDM/KDM menu. You can also manually edit/create startup script from - /etc/X11/xinit/xinputrc and ~/.xinputrc + /etc/X11/xinit/xinputrc and ~/.xinputrc Good templates for the contents of these files can be found in /usr/share/im-config/data/*.im . @@ -252,13 +234,13 @@ package for IM. To see what is your IM, $ im-switch -l -will list complete situation. If you just want to set one user account +will list complete situation. If you just want to set one user account to use SCIM, just type: $ im-switch -s scim-immodule The same can be done with menu selection as: $ im-switch -c -If you do the same from root use, you set system wide default. +If you do the same from root use, you set system wide default. # im-switch -s scim-immodule # im-switch -c @@ -276,7 +258,7 @@ enable SCIM system wide for all locales, configure SCIM from root as: Then you clear the user specific configurations with $ im-switch -a -UTF-8 locales such as ja_JP.UTF-8 enables to edit any text of any +UTF-8 locales such as ja_JP.UTF-8 enables to edit any text of any languages, i.e., multilingualization (m17n) environment. Thus UTF-8 locale are recommended to be used with SCIM. In order to edit files encoded in other locales such as ja_JP.eucJP, pl_PL.ISO-8859-2, ..., @@ -284,12 +266,12 @@ you need to set up editor to handle them too. Please refer to The im-switch package does not change ~/.scim/global or /etc/scim/global to enable all available UTF-8 locales for SCIM since you may want to start -some locales without SCIM. You still need to manually enable your locale +some locales without SCIM. You still need to manually enable your locale (see the "Locales" section above). Select UTF-8 locale using GDM/KDM menu. -(You can also add customization scripts in /etc/X11/Xsession.d/ directly, +(You can also add customization scripts in /etc/X11/Xsession.d/ directly, of course, but the maintainer would discourage this.) ------------------- diff --git a/debian/README.Qt b/debian/README.Qt deleted file mode 100644 index 0ae44aa..0000000 --- a/debian/README.Qt +++ /dev/null @@ -1,26 +0,0 @@ -SCIM supports two different input modes for Qt -- XIM mode and Qt IM mode. -Qt 4 applications can use either XIM mode or Qt 4 IM mode for SCIM. -These can be easily set and changed with the im-switch package. The XIM -mode support is included in scim package. To use Qt 4 IM mode, you also -need to install scim-qt-immodule package (which depends on scim-im-agent). - -When using XIM mode in Qt, You need to pay extra attention on two things: - -1. Both Qt and SCIM have their own settings for XIM style, so you need to -make sure they match. There are two commonly used XIM styles, usually -called "on the spot" and "over the spot". To change the style in SCIM, -run scim-setup (or choose "SCIM Input Method Setup" from your menu), and go -to the "FrontEnd -> Global Setup" page. The option to change XIM style is -"Embed Preedit String into client window", when it is selected, you are using -"on the spot" style; and when it is not selected, you are using "over the -spot" style. To change the style in Qt, run qtconfig go to "Interface" tab, -and choose the style in the "XIM Input Style" dropdown menu at the bottom. -You usually don't need the "off the spot" or "root" style. - -2. It is reported that some of the KDE applications don't work very well -when using "on the spot" style. So if your application behaves strangely, -you may want to try switching to "over the spot" style first. - -(Last updated by Tz-Huan Huang, on Thur, 28 Jun 2012) - -vim:textwidth=78: diff --git a/debian/changelog b/debian/changelog index f4d1fbb..e15ca6c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +scim (1.4.18-2.2) unstable; urgency=medium + + * Non-maintainer upload. I took just one part of Tz-Hua's merge request + because there was already an NMU in the archive. See #875250 for more + details. + + [ Tz-Huan Huang ] + * Disable qt-immodules build. Closes: #875258, Closes: #875250 + + -- Lisandro Damián Nicanor Pérez Meyer <lisan...@debian.org> Sat, 28 Dec 2019 20:45:08 -0300 + scim (1.4.18-2.1) unstable; urgency=medium * Non-maintainer upload. diff --git a/debian/control b/debian/control index e5b7fda..2af9726 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Standards-Version: 4.1.4 Build-Depends: dpkg-dev (>= 1.14.6), debhelper (>= 9), dh-autoreconf, intltool, autopoint, pkg-config, x11proto-core-dev, libx11-dev, libpango1.0-dev, libglib2.0-dev, libgtk2.0-dev, libgtk-3-dev | libgtk2.0-dev (<< 2.21), - libqt4-dev, libclutter-1.0-dev, libclutter-imcontext-0.1-dev, + libclutter-1.0-dev, libclutter-imcontext-0.1-dev, libltdl-dev, doxygen Homepage: https://github.com/scim-im/scim Vcs-Browser: https://github.com/leggewie-DM/scim @@ -31,7 +31,7 @@ Description: smart common input method platform . SCIM achieves the communication between IM engines and front ends through both shared library linking and server/client mode. It supports XIM - protocol, as well as GTK+ IM module and Qt IM module. + protocol, as well as GTK+ IM module. . This package is the main binary package of SCIM. It includes: the main program scim (GTK+ based) and other support programs; simple configuration @@ -82,10 +82,10 @@ Description: development library for SCIM platform server/client model through socket in a network environment. As a component of the system, SCIM can work with existing IM framework such as XIM or IIIMF (in progress), as well as using client specific IM interface, such as GTK+ - IM module or Qt IM module. SCIM provides an IM application, scim, which use - various IM engines to provide input methods for many languages, either by - native modules (such as scim-pinyin and scim-hangul) or interfaces to other - IM libraries (such as scim-anthy, scim-uim, scim-m17n, and scim-chewing). + IM module. SCIM provides an IM application, scim, which use various IM + engines to provide input methods for many languages, either by native modules + (such as scim-pinyin and scim-hangul) or interfaces to other IM libraries + (such as scim-anthy, scim-uim, scim-m17n, and scim-chewing). . For more information about SCIM, please see the description of scim package. @@ -111,26 +111,6 @@ Description: GTK+ input method module, with SCIM as the input backend . For more information about SCIM, please see the description of scim package. -Package: scim-qt-immodule -Architecture: any -Multi-Arch: same -Depends: scim (= ${binary:Version}), scim-im-agent (= ${binary:Version}), - ${shlibs:Depends}, ${misc:Depends} -Provides: scim-bridge-client-qt4 -Conflicts: scim-bridge-client-qt, scim-bridge-client-qt4 -Enhances: scim -Description: Qt input method module with SCIM as backend - SCIM (Smart Common Input Method) is an input method (IM) platform. - . - This package is the Qt native input method module for SCIM. It provides - a Qt IM module for version 4 of Qt with SCIM as the input backend. - This input method module should work within all Qt platforms. - . - The Qt IM module communicates with SCIM backend through the IM agent - provided by scim-im-agent package. - . - For more information about SCIM, please see the description of scim package. - Package: scim-clutter-immodule Architecture: any Multi-Arch: same @@ -160,7 +140,7 @@ Description: IM agent for SCIM platform SCIM (Smart Common Input Method) is an input method (IM) platform. . This package provides the IM agent for SCIM. SCIM provides various IM modules - for Gtk/Qt/clutter program. The IM modules connumicate with SCIM through the + for Gtk/clutter program. The IM modules communicate with SCIM through the IM agent. . For more information about SCIM, please see the description of scim package. diff --git a/debian/im-switch/scim-immodule b/debian/im-switch/scim-immodule index be91c0e..d8c110c 100644 --- a/debian/im-switch/scim-immodule +++ b/debian/im-switch/scim-immodule @@ -2,12 +2,12 @@ # This configuration file for SCIM is recommended. # # Use "X input method" for standard X applications -# Use "SCIM IM module" for GTK/Qt/clutter applications if available +# Use "SCIM IM module" for GTK/clutter applications if available # -# Using this configuration may improve some usability for GTK/Qt applications +# Using this configuration may improve some usability for GTK applications # such as the location of word selection window. -# You still need these XIM settings for non-GTK and non-Qt programs. +# You still need these XIM settings for non-GTK programs. XIM=SCIM XIM_PROGRAM=/usr/bin/scim XIM_ARGS="-d" @@ -31,22 +31,6 @@ else GTK_IM_MODULE=xim fi -qtimm_exists () { - # check if any immodule installed - for dir in /usr/lib/qt*/plugins/inputmethods /usr/lib/@DEB_HOST_MULTIARCH@/qt*/plugins/inputmethods; do - if [ -r ${dir}/im-$1.so ]; then - return 0 - fi - done - return 1 -} - -if qtimm_exists scim; then - QT_IM_MODULE=scim -else - QT_IM_MODULE=xim -fi - clutterimm_exists () { # check if any immodule installed for dir in /usr/lib/clutter-imcontext/immodules /usr/lib/@DEB_HOST_MULTIARCH@/clutter-imcontext/imcontext; do diff --git a/debian/rules b/debian/rules index e274014..2eb0230 100755 --- a/debian/rules +++ b/debian/rules @@ -11,7 +11,7 @@ override_dh_autoreconf: ./bootstrap override_dh_auto_configure: - dh_auto_configure -- --enable-clutter-immodule + dh_auto_configure -- --enable-clutter-immodule --disable-qt3-immodule --disable-qt4-immodule override_dh_auto_build: $(MAKE) docs diff --git a/debian/scim-qt-immodule.install b/debian/scim-qt-immodule.install deleted file mode 100644 index c7591c8..0000000 --- a/debian/scim-qt-immodule.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/qt4/plugins/inputmethods/im-scim.so diff --git a/debian/scim.docs b/debian/scim.docs index f5e1c40..4e4513f 100644 --- a/debian/scim.docs +++ b/debian/scim.docs @@ -3,4 +3,3 @@ README TODO debian/README.GTK -debian/README.Qt -- 2.20.1
