diff options
| author | Rahul Gopinath <rahul@gopinath.org> | 2017-02-07 19:35:52 -0800 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2017-02-09 11:20:46 +0100 |
| commit | a4d952178cd1c22c8165f91fd998055dda41df8b (patch) | |
| tree | ab6e07c4c5c4b4fb7dd2fe606e70919240526eb8 /pkgs/applications/misc/mlterm | |
| parent | 055ab6ba743d043553dd2779b9d0543377d61567 (diff) | |
| download | nixlib-a4d952178cd1c22c8165f91fd998055dda41df8b.tar nixlib-a4d952178cd1c22c8165f91fd998055dda41df8b.tar.gz nixlib-a4d952178cd1c22c8165f91fd998055dda41df8b.tar.bz2 nixlib-a4d952178cd1c22c8165f91fd998055dda41df8b.tar.lz nixlib-a4d952178cd1c22c8165f91fd998055dda41df8b.tar.xz nixlib-a4d952178cd1c22c8165f91fd998055dda41df8b.tar.zst nixlib-a4d952178cd1c22c8165f91fd998055dda41df8b.zip | |
mlterm: 3.7.2 -> 3.8.0
Diffstat (limited to 'pkgs/applications/misc/mlterm')
| -rw-r--r-- | pkgs/applications/misc/mlterm/default.nix | 21 | ||||
| -rw-r--r-- | pkgs/applications/misc/mlterm/x_shortcut.c.patch | 26 |
2 files changed, 7 insertions, 40 deletions
diff --git a/pkgs/applications/misc/mlterm/default.nix b/pkgs/applications/misc/mlterm/default.nix index 9da087d49692..1317c0357923 100644 --- a/pkgs/applications/misc/mlterm/default.nix +++ b/pkgs/applications/misc/mlterm/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "mlterm-${version}"; - version = "3.7.2"; + version = "3.8.0"; src = fetchurl { url = "mirror://sourceforge/project/mlterm/01release/${name}/${name}.tar.gz"; - sha256 = "1b24w8hfck1ylfkdz9z55vlmsb36q9iyfr0i9q9y98dfk0f0rrw8"; + sha256 = "00dzx5rqsp73shgvn2jvgk85v3lirby06wxkqjcm1i1xwigidq3b"; }; nativeBuildInputs = [ pkgconfig autoconf ]; @@ -20,17 +20,15 @@ stdenv.mkDerivation rec { 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 preConfigure = '' sed -ie 's;-L/usr/local/lib -R/usr/local/lib;;g' \ - xwindow/libtype/Makefile.in \ main/Makefile.in \ tool/mlfc/Makefile.in \ tool/mlimgloader/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' \ tool/mlconfig/po/Makefile.in.in #utmp and mlterm-fb @@ -68,14 +66,9 @@ stdenv.mkDerivation rec { ]; postInstall = '' - mkdir -p "$out/share/icons/hicolor/scalable/apps" - cp contrib/icon/mlterm-icon.svg "$out/share/icons/hicolor/scalable/apps/mlterm.svg" - - 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 + install -D 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/* ''; desktopItem = makeDesktopItem rec { diff --git a/pkgs/applications/misc/mlterm/x_shortcut.c.patch b/pkgs/applications/misc/mlterm/x_shortcut.c.patch deleted file mode 100644 index f0f929b79650..000000000000 --- a/pkgs/applications/misc/mlterm/x_shortcut.c.patch +++ /dev/null @@ -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 && |