pyrox.dev
mlterm: 3.7.2 -> 3.8.0
authored by Rahul Gopinath and committed by Franz Pletz a4d95217 055ab6ba
+7
-14
pkgs/applications/misc/mlterm/default.nix
+7
-14
pkgs/applications/misc/mlterm/default.nix
···
7
8
stdenv.mkDerivation rec {
9
name = "mlterm-${version}";
10
-
version = "3.7.2";
11
12
src = fetchurl {
13
url = "mirror://sourceforge/project/mlterm/01release/${name}/${name}.tar.gz";
14
-
sha256 = "1b24w8hfck1ylfkdz9z55vlmsb36q9iyfr0i9q9y98dfk0f0rrw8";
15
};
16
17
nativeBuildInputs = [ pkgconfig autoconf ];
···
20
harfbuzz fribidi m17n_lib openssl libssh2
21
];
22
23
-
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
24
-
25
#bad configure.ac and Makefile.in everywhere
26
preConfigure = ''
27
sed -ie 's;-L/usr/local/lib -R/usr/local/lib;;g' \
28
-
xwindow/libtype/Makefile.in \
29
main/Makefile.in \
30
tool/mlfc/Makefile.in \
31
tool/mlimgloader/Makefile.in \
32
tool/mlconfig/Makefile.in \
33
-
xwindow/libotl/Makefile.in
34
sed -ie 's;cd ..srcdir. && rm -f ...lang..gmo.*;;g' \
35
tool/mlconfig/po/Makefile.in.in
36
#utmp and mlterm-fb
···
68
];
69
70
postInstall = ''
71
-
mkdir -p "$out/share/icons/hicolor/scalable/apps"
72
-
cp contrib/icon/mlterm-icon.svg "$out/share/icons/hicolor/scalable/apps/mlterm.svg"
73
-
74
-
mkdir -p "$out/share/icons/hicolor/48x48/apps"
75
-
cp contrib/icon/mlterm-icon-gnome2.png "$out/share/icons/hicolor/48x48/apps/mlterm.png"
76
-
77
-
mkdir -p "$out/share/applications"
78
-
cp $desktopItem/share/applications/* $out/share/applications
79
'';
80
81
desktopItem = makeDesktopItem rec {
···
7
8
stdenv.mkDerivation rec {
9
name = "mlterm-${version}";
10
+
version = "3.8.0";
11
12
src = fetchurl {
13
url = "mirror://sourceforge/project/mlterm/01release/${name}/${name}.tar.gz";
14
+
sha256 = "00dzx5rqsp73shgvn2jvgk85v3lirby06wxkqjcm1i1xwigidq3b";
15
};
16
17
nativeBuildInputs = [ pkgconfig autoconf ];
···
20
harfbuzz fribidi m17n_lib openssl libssh2
21
];
22
23
#bad configure.ac and Makefile.in everywhere
24
preConfigure = ''
25
sed -ie 's;-L/usr/local/lib -R/usr/local/lib;;g' \
26
main/Makefile.in \
27
tool/mlfc/Makefile.in \
28
tool/mlimgloader/Makefile.in \
29
tool/mlconfig/Makefile.in \
30
+
uitoolkit/libtype/Makefile.in \
31
+
uitoolkit/libotl/Makefile.in
32
sed -ie 's;cd ..srcdir. && rm -f ...lang..gmo.*;;g' \
33
tool/mlconfig/po/Makefile.in.in
34
#utmp and mlterm-fb
···
66
];
67
68
postInstall = ''
69
+
install -D contrib/icon/mlterm-icon.svg "$out/share/icons/hicolor/scalable/apps/mlterm.svg"
70
+
install -D contrib/icon/mlterm-icon-gnome2.png "$out/share/icons/hicolor/48x48/apps/mlterm.png"
71
+
install -D -t $out/share/applications $desktopItem/share/applications/*
72
'';
73
74
desktopItem = makeDesktopItem rec {
-26
pkgs/applications/misc/mlterm/x_shortcut.c.patch
-26
pkgs/applications/misc/mlterm/x_shortcut.c.patch
···
1
-
--- mlterm-3.7.2/xwindow/x_shortcut.c
2
-
+++ mlterm-3.7.2/xwindow/x_shortcut.c
3
-
@@ -292,6 +292,11 @@
4
-
/* ingoring except these masks */
5
-
state &= (ModMask|ControlMask|ShiftMask|CommandMask|button_mask) ;
6
-
7
-
+ if( state & button_mask)
8
-
+ {
9
-
+ state &= ~Mod2Mask ; /* XXX NumLock */
10
-
+ }
11
-
+
12
-
if( shortcut->map[func].ksym == ksym &&
13
-
shortcut->map[func].state ==
14
-
( state |
15
-
@@ -318,6 +323,11 @@
16
-
/* ingoring except these masks */
17
-
state &= (ModMask|ControlMask|ShiftMask|CommandMask|button_mask) ;
18
-
19
-
+ if( state & button_mask)
20
-
+ {
21
-
+ state &= ~Mod2Mask ; /* XXX NumLock */
22
-
+ }
23
-
+
24
-
for( count = 0 ; count < shortcut->str_map_size ; count ++)
25
-
{
26
-
if( shortcut->str_map[count].ksym == ksym &&
···