···

       
1
       
1
       
 
       
{

     

       
2
       
2
       
 
       
  lib,

     

       
3
       
3
       
 
       
  stdenv,

     

       
4
       
4
       
-
       
  fetchurl,

     

       
5
       
5
       
-
       
  xorg,

     

       
4
       
4
       
+
       
  fetchgit,

     

       
5
       
5
       
+
       
  autoreconfHook,

     

       
6
       
6
       
 
       
  pixman,

     

       
7
       
7
       
 
       
  pkg-config,

     

       
8
       
8
       
+
       
  util-macros,

     

       
9
       
9
       
+
       
  libXinerama,

     

       
10
       
10
       
+
       
  libAppleWM,

     

       
11
       
11
       
+
       
  xorgproto,

     

       
12
       
12
       
+
       
  libXrandr,

     

       
13
       
13
       
+
       
  libXext,

     

       
8
       
14
       
 
       
}:

     

       
9
       
15
       
 
       


     

       
10
       
10
       
-
       
let

     

       
11
       
11
       
-
       
  version = "1.3.1";

     

       
12
       
12
       
-
       
in

     

       
13
       
13
       
-
       
stdenv.mkDerivation {

     

       
16
       
16
       
+
       
stdenv.mkDerivation (finalAttrs: {

     

       
14
       
17
       
 
       
  pname = "quartz-wm";

     

       
15
       
15
       
-
       
  inherit version;

     

       
16
       
16
       
-
       
  src = fetchurl {

     

       
17
       
17
       
-
       
    url = "http://xquartz-dl.macosforge.org/src/quartz-wm-${version}.tar.xz";

     

       
18
       
18
       
-
       
    sha256 = "1j8zd3p7rhay1s3sxq6anw78k5s59mx44xpqla2ianl62346a5g9";

     

       
18
       
18
       
+
       
  version = "1.3.2";

     

       
19
       
19
       
+
       


     

       
20
       
20
       
+
       
  src = fetchgit {

     

       
21
       
21
       
+
       
    url = "https://gitlab.freedesktop.org/xorg/app/quartz-wm.git";

     

       
22
       
22
       
+
       
    tag = "quartz-wm-${finalAttrs.version}";

     

       
23
       
23
       
+
       
    hash = "sha256-1+KZNeR4Gq2uWBHTN53PTITHuly1Z4buR+grzdVNwhs=";

     

       
19
       
24
       
 
       
  };

     

       
20
       
20
       
-
       
  patches = [

     

       
21
       
21
       
-
       
    ./no_title_crash.patch

     

       
22
       
22
       
-
       
    ./extern-patch.patch

     

       
23
       
23
       
-
       
  ];

     

       
25
       
25
       
+
       


     

       
24
       
26
       
 
       
  configureFlags = [ "--enable-xplugin-dock-support" ];

     

       
25
       
25
       
-
       
  nativeBuildInputs = [ pkg-config ];

     

       
27
       
27
       
+
       
  nativeBuildInputs = [

     

       
28
       
28
       
+
       
    autoreconfHook

     

       
29
       
29
       
+
       
    pkg-config

     

       
30
       
30
       
+
       
    util-macros

     

       
31
       
31
       
+
       
  ];

     

       
26
       
32
       
 
       
  buildInputs = [

     

       
27
       
27
       
-
       
    xorg.libXinerama

     

       
28
       
28
       
-
       
    xorg.libAppleWM

     

       
29
       
29
       
-
       
    xorg.xorgproto

     

       
30
       
30
       
-
       
    xorg.libXrandr

     

       
31
       
31
       
-
       
    xorg.libXext

     

       
33
       
33
       
+
       
    libXinerama

     

       
34
       
34
       
+
       
    libAppleWM

     

       
35
       
35
       
+
       
    xorgproto

     

       
36
       
36
       
+
       
    libXrandr

     

       
37
       
37
       
+
       
    libXext

     

       
32
       
38
       
 
       
    pixman

     

       
33
       
39
       
 
       
  ];

     

       
34
       
34
       
-
       
  meta = with lib; {

     

       
35
       
35
       
-
       
    license = licenses.apple-psl20;

     

       
36
       
36
       
-
       
    platforms = platforms.darwin;

     

       
37
       
37
       
-
       
    maintainers = with maintainers; [ matthewbauer ];

     

       
40
       
40
       
+
       


     

       
41
       
41
       
+
       
  meta = {

     

       
42
       
42
       
+
       
    license = lib.licenses.apple-psl20;

     

       
43
       
43
       
+
       
    platforms = lib.platforms.darwin;

     

       
44
       
44
       
+
       
    maintainers = with lib.maintainers; [ matthewbauer ];

     

       
45
       
45
       
+
       
    mainProgram = "quartz-wm";

     

       
38
       
46
       
 
       
  };

     

       
39
       
39
       
-
       
}

     

       
47
       
47
       
+
       
})

     

···

       
1
       
1
       
-
       
diff --git a/src/x-list.h b/src/x-list.h

     

       
2
       
2
       
-
       
index bb85c02..059c88b 100644

     

       
3
       
3
       
-
       
--- a/src/x-list.h

     

       
4
       
4
       
-
       
+++ b/src/x-list.h

     

       
5
       
5
       
-
       
@@ -39,7 +39,7 @@

     

       
6
       
6
       
-
       
 #endif

     

       
7
       
7
       
-
       
 

     

       
8
       
8
       
-
       
 #ifndef X_EXTERN

     

       
9
       
9
       
-
       
-# define X_EXTERN __private_extern__

     

       
10
       
10
       
-
       
+# define X_EXTERN extern

     

       
11
       
11
       
-
       
 #endif

     

       
12
       
12
       
-
       
 

     

       
13
       
13
       
-
       
 X_EXTERN void X_PFX (list_free_1) (x_list *node);

     

···

       
1
       
1
       
-
       
commit c28527b1340c51f2b492a31e49127106cebbfc5d

     

       
2
       
2
       
-
       
Author: Jeremy Huddleston <jeremyhu@apple.com>

     

       
3
       
3
       
-
       
Date:   Fri Jun 1 10:38:37 2012 -0700

     

       
4
       
4
       
-
       


     

       
5
       
5
       
-
       
    Fix a crash when minimizing windows without titles

     

       
6
       
6
       
-
       
    

     

       
7
       
7
       
-
       
    <rdar://problem/11575791>

     

       
8
       
8
       
-
       
    

     

       
9
       
9
       
-
       
    Regression-from: 21f210c923aa5d79400ce46275084f2636c92bd9

     

       
10
       
10
       
-
       
    

     

       
11
       
11
       
-
       
    Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>

     

       
12
       
12
       
-
       


     

       
13
       
13
       
-
       
diff --git a/src/x-window.m b/src/x-window.m

     

       
14
       
14
       
-
       
index a210c6a..e3b9066 100644

     

       
15
       
15
       
-
       
--- a/src/x-window.m

     

       
16
       
16
       
-
       
+++ b/src/x-window.m

     

       
17
       
17
       
-
       
@@ -2139,7 +2139,7 @@ - (void) do_collapse

     

       
18
       
18
       
-
       
     if (wid == XP_NULL_NATIVE_WINDOW_ID)

     

       
19
       
19
       
-
       
         return;

     

       
20
       
20
       
-
       
 

     

       
21
       
21
       
-
       
-    title_c = strdup([_title UTF8String]);

     

       
22
       
22
       
-
       
+    title_c = strdup([[self title] UTF8String]);

     

       
23
       
23
       
-
       
     assert(title_c);

     

       
24
       
24
       
-
       
 

     

       
25
       
25
       
-
       
     err = qwm_dock_minimize_item_with_title_async (wid, title_c);