On 2024-04-06 Andreas Metzler <[email protected]> wrote: [...] > I had a look at the bug and it is non-trivial to fix. (I spent some > effort, but gave up.) So I am wondering whether it would not make sense > to stop building the mlterm canna input method plugin: [...]
Hello, trivial patch attached. Looking at debian/rules I wondered wheter dh_autoreconf couldn't be used for mlterm and also came up with a patch. Perhaps yo'll kike it. cu Andreas
>From 41d63723968d031e29499c3f3c9839ea555ea395 Mon Sep 17 00:00:00 2001 From: Andreas Metzler <[email protected]> Date: Sat, 6 Apr 2024 08:39:19 +0200 Subject: [PATCH 1/3] Drop Canna input method plugin Canna has been dead upstream for decades --- debian/control | 14 +------------- debian/mlterm-im-canna.install | 1 - debian/rules | 4 ++-- 3 files changed, 3 insertions(+), 16 deletions(-) delete mode 100644 debian/mlterm-im-canna.install diff --git a/debian/control b/debian/control index 720daeb..09eccac 100644 --- a/debian/control +++ b/debian/control @@ -1,11 +1,11 @@ Source: mlterm Section: x11 Priority: optional Maintainer: أحمد المحمودي (Ahmed El-Mahmoudy) <[email protected]> Uploaders: Hideki Yamane <[email protected]> -Build-Depends: debhelper-compat (= 13), libgtk-4-dev, libtool, libx11-dev, libxext-dev, libxft-dev, x11proto-dev, libfribidi-dev, libxrender-dev, libuim-dev, libm17n-dev, libscim-dev, libgcroots-dev, libxml2-dev, libthai-dev, libibus-1.0-dev, libfcitx5gclient-dev, libfcitx5utils-dev, libssh2-1-dev, libcairo2-dev, libwnn-dev, libcanna1g-dev, libskk-dev +Build-Depends: debhelper-compat (= 13), libgtk-4-dev, libtool, libx11-dev, libxext-dev, libxft-dev, x11proto-dev, libfribidi-dev, libxrender-dev, libuim-dev, libm17n-dev, libscim-dev, libgcroots-dev, libxml2-dev, libthai-dev, libibus-1.0-dev, libfcitx5gclient-dev, libfcitx5utils-dev, libssh2-1-dev, libcairo2-dev, libwnn-dev, libskk-dev Standards-Version: 4.6.2 Rules-Requires-Root: binary-targets Homepage: https://mlterm.sourceforge.net Vcs-Git: https://salsa.debian.org/debian/mlterm.git Vcs-Browser: https://salsa.debian.org/debian/mlterm @@ -162,22 +162,10 @@ Description: MultiLingual TERMinal, FreeWnn input method plugin various encodings, doublewidth characters, BiDi, Arabic shaping, and so on. . This package contains FreeWnn Input Method plugin for mlterm. -Package: mlterm-im-canna -Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends}, mlterm (= ${binary:Version}) | mlterm-tiny (= ${binary:Version}) -Pre-Depends: ${misc:Pre-Depends} -Multi-Arch: same -Description: MultiLingual TERMinal, Canna input method plugin - mlterm is a terminal emulator for X Window System, which supports - various encodings, doublewidth characters, BiDi, Arabic shaping, - and so on. - . - This package contains Canna Input Method plugin for mlterm. - Package: mlterm-im-skk Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, mlterm (= ${binary:Version}) | mlterm-tiny (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} Multi-Arch: same diff --git a/debian/mlterm-im-canna.install b/debian/mlterm-im-canna.install deleted file mode 100644 index c0fe613..0000000 --- a/debian/mlterm-im-canna.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/mlterm/libim-canna.so diff --git a/debian/rules b/debian/rules index 3f09d13..b7618e6 100755 --- a/debian/rules +++ b/debian/rules @@ -25,10 +25,11 @@ MLTERM_IM_FCITX=$(CURDIR)/debian/mlterm-im-fcitx OPTS_COMMON=--x-includes=/usr/X11R6/include \ --x-libraries=/usr/X11R6/lib \ --disable-rpath \ --disable-iiimf \ + --disable-canna \ --enable-vt52 # --enable-utmp \ OPTS_TINY=$(OPTS_COMMON) \ --with-type-engines=xcore \ @@ -38,11 +39,10 @@ OPTS_TINY=$(OPTS_COMMON) \ --disable-m17nlib \ --disable-scim \ --disable-fcitx \ --disable-ibus \ --disable-wnn \ - --disable-canna \ --disable-skk OPTS_MAIN=$(OPTS_COMMON) \ --with-imagelib=gdk-pixbuf --with-type-engines=xcore,xft,cairo \ --enable-optimize-redrawing \ @@ -76,11 +76,11 @@ override_dh_auto_build: # configure again for installation (later) DH_COMPAT=10 dh_auto_configure -- $(OPTS_MAIN) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS) -Wl,--as-needed" override_dh_install: # mlterm-common: - dh_install -pmlterm-common -Xuim -Xm17 -Xscim -Xibus -Xfcitx -Xwnn -Xcanna -Xskk -Xman1 + dh_install -pmlterm-common -Xuim -Xm17 -Xscim -Xibus -Xfcitx -Xwnn -Xskk -Xman1 rm $(MLTERM_COMMON)/usr/lib/*/libpobl.so rm $(MLTERM_COMMON)/usr/lib/*/libmef.so for i in main font aafont key termcap xim color menu ; \ do install -m 644 debian/config-$$i \ $(MLTERM_COMMON)/etc/mlterm/$$i ; done -- 2.43.0
>From 546471fa7b354c474af163b601eeb4306e488f27 Mon Sep 17 00:00:00 2001 From: Andreas Metzler <[email protected]> Date: Sat, 6 Apr 2024 14:12:47 +0200 Subject: [PATCH 3/3] Support dh_autoreconf --- debian/autoreconf | 3 +++ debian/mlterm-tools.install | 6 +++--- debian/rules | 13 ++++++++++--- 3 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 debian/autoreconf diff --git a/debian/autoreconf b/debian/autoreconf new file mode 100644 index 0000000..053676a --- /dev/null +++ b/debian/autoreconf @@ -0,0 +1,3 @@ +./ +baselib +encodefilter diff --git a/debian/mlterm-tools.install b/debian/mlterm-tools.install index ad73181..150d907 100644 --- a/debian/mlterm-tools.install +++ b/debian/mlterm-tools.install @@ -1,6 +1,6 @@ usr/bin/mlcc usr/bin/mlclient usr/share/man/man1/mlclient.1 -usr/lib/*/mlterm/mlterm-zoom -usr/lib/*/mlterm/mlterm-menu -usr/lib/*/mlterm/mlconfig +usr/libexec/mlterm/mlterm-zoom +usr/libexec/mlterm/mlterm-menu +usr/libexec/mlterm/mlconfig diff --git a/debian/rules b/debian/rules index b7618e6..5d9d40a 100755 --- a/debian/rules +++ b/debian/rules @@ -10,10 +10,11 @@ #export DH_VERBOSE=1 # This has to be exported to make some magic below work. export DH_OPTIONS +export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed MLTERM_COMMON=$(CURDIR)/debian/mlterm-common MLTERM=$(CURDIR)/debian/mlterm MLTERM_TINY=$(CURDIR)/debian/mlterm-tiny MLTERM_TOOLS=$(CURDIR)/debian/mlterm-tools @@ -56,27 +57,33 @@ OPTS_MAIN=$(OPTS_COMMON) \ override_dh_auto_clean: dh_auto_clean rm -rf main-tiny override_dh_autoreconf: + # Modern libtool requires "missing" and "compile" scripts. These + # would normally be installed by automake, but automake cannot + # be run without Makefile.am. + env AUTOMAKE=true AUTOHEADER=true \ + autom4te_buildauxdir=/usr/share/libtool/build-aux \ + dh_autoreconf --verbose --as-needed override_dh_auto_configure: # Make mlterm-common, mlterm, mlterm-tools, mlterm-im-* - DH_COMPAT=10 dh_auto_configure -- $(OPTS_MAIN) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS) -Wl,--as-needed" + dh_auto_configure -- $(OPTS_MAIN) override_dh_auto_build: dh_auto_build # Make mlterm-tiny - DH_COMPAT=10 dh_auto_configure -- $(OPTS_TINY) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS) -Wl,--as-needed" + dh_auto_configure -- $(OPTS_TINY) cp -a main main-tiny rm -f uitoolkit/*.o main-tiny/*.o $(MAKE) -C uitoolkit $(MAKE) -C main-tiny VPATH=$(CURDIR)/main-tiny # configure again for installation (later) - DH_COMPAT=10 dh_auto_configure -- $(OPTS_MAIN) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS) -Wl,--as-needed" + dh_auto_configure -- $(OPTS_MAIN) override_dh_install: # mlterm-common: dh_install -pmlterm-common -Xuim -Xm17 -Xscim -Xibus -Xfcitx -Xwnn -Xskk -Xman1 rm $(MLTERM_COMMON)/usr/lib/*/libpobl.so -- 2.43.0
