public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mlterm: 3.7.2 -> 3.8.0

Browse Source
This commit is contained in:
Rahul Gopinath 2017-02-07 19:35:52 -08:00 committed by Franz Pletz
parent 055ab6ba74
commit a4d952178c
2 changed files with 7 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/applications/misc/mlterm/default.nix
View File

@ -7,11 +7,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mlterm-${version}"; name = "mlterm-${version}";
version = "3.7.2"; version = "3.8.0";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/project/mlterm/01release/${name}/${name}.tar.gz"; url = "mirror://sourceforge/project/mlterm/01release/${name}/${name}.tar.gz";
sha256 = "1b24w8hfck1ylfkdz9z55vlmsb36q9iyfr0i9q9y98dfk0f0rrw8"; sha256 = "00dzx5rqsp73shgvn2jvgk85v3lirby06wxkqjcm1i1xwigidq3b";
}; };
nativeBuildInputs = [ pkgconfig autoconf ]; nativeBuildInputs = [ pkgconfig autoconf ];
@ -20,17 +20,15 @@ stdenv.mkDerivation rec {
harfbuzz fribidi m17n_lib openssl libssh2 harfbuzz fribidi m17n_lib openssl libssh2
]; ];
patches = [ ./x_shortcut.c.patch ]; #fixes numlock in 3.7.2. should be safe to remove by 3.7.3 since it's already in the trunk: https://bitbucket.org/arakiken/mlterm/commits/4820d42c7abfe1760a5ea35492c83be469c642b3
#bad configure.ac and Makefile.in everywhere #bad configure.ac and Makefile.in everywhere
preConfigure = '' preConfigure = ''
sed -ie 's;-L/usr/local/lib -R/usr/local/lib;;g' \ sed -ie 's;-L/usr/local/lib -R/usr/local/lib;;g' \
xwindow/libtype/Makefile.in \
main/Makefile.in \ main/Makefile.in \
tool/mlfc/Makefile.in \ tool/mlfc/Makefile.in \
tool/mlimgloader/Makefile.in \ tool/mlimgloader/Makefile.in \
tool/mlconfig/Makefile.in \ tool/mlconfig/Makefile.in \
xwindow/libotl/Makefile.in uitoolkit/libtype/Makefile.in \
uitoolkit/libotl/Makefile.in
sed -ie 's;cd ..srcdir. && rm -f ...lang..gmo.*;;g' \ sed -ie 's;cd ..srcdir. && rm -f ...lang..gmo.*;;g' \
tool/mlconfig/po/Makefile.in.in tool/mlconfig/po/Makefile.in.in
#utmp and mlterm-fb #utmp and mlterm-fb
@ -68,14 +66,9 @@ stdenv.mkDerivation rec {
]; ];
postInstall = '' postInstall = ''
mkdir -p "$out/share/icons/hicolor/scalable/apps" install -D contrib/icon/mlterm-icon.svg "$out/share/icons/hicolor/scalable/apps/mlterm.svg"
cp contrib/icon/mlterm-icon.svg "$out/share/icons/hicolor/scalable/apps/mlterm.svg" install -D contrib/icon/mlterm-icon-gnome2.png "$out/share/icons/hicolor/48x48/apps/mlterm.png"
install -D -t $out/share/applications $desktopItem/share/applications/*
mkdir -p "$out/share/icons/hicolor/48x48/apps"
cp contrib/icon/mlterm-icon-gnome2.png "$out/share/icons/hicolor/48x48/apps/mlterm.png"
mkdir -p "$out/share/applications"
cp $desktopItem/share/applications/* $out/share/applications
''; '';
desktopItem = makeDesktopItem rec { desktopItem = makeDesktopItem rec {

26
pkgs/applications/misc/mlterm/x_shortcut.c.patch
View File

@ -1,26 +0,0 @@
--- mlterm-3.7.2/xwindow/x_shortcut.c
+++ mlterm-3.7.2/xwindow/x_shortcut.c
@@ -292,6 +292,11 @@
/* ingoring except these masks */
state &= (ModMask|ControlMask|ShiftMask|CommandMask|button_mask) ;
+ if( state & button_mask)
+ {
+ state &= ~Mod2Mask ; /* XXX NumLock */
+ }
+
if( shortcut->map[func].ksym == ksym &&
shortcut->map[func].state ==
( state |
@@ -318,6 +323,11 @@
/* ingoring except these masks */
state &= (ModMask|ControlMask|ShiftMask|CommandMask|button_mask) ;
+ if( state & button_mask)
+ {
+ state &= ~Mod2Mask ; /* XXX NumLock */
+ }
+
for( count = 0 ; count < shortcut->str_map_size ; count ++)
{
if( shortcut->str_map[count].ksym == ksym &&