pyrox.dev
lol
Make gdmap compile with newer gtk
svn path=/nixpkgs/branches/x-updates/; revision=25922
+65
-3
+5
-2
pkgs/tools/system/gdmap/default.nix
+5
-2
pkgs/tools/system/gdmap/default.nix
···
1
1
{ stdenv, fetchurl, gtk, pkgconfig, libxml2, intltool, gettext }:
2
2
3
-
stdenv.mkDerivation {
3
+
stdenv.mkDerivation rec {
4
4
name = "gdmap-0.8.1";
5
5
6
6
src = fetchurl {
7
-
url = http://downloads.sourceforge.net/gdmap/gdmap-0.8.1.tar.gz;
7
+
url = "mirror://sourceforge/gdmap/${name}.tar.gz";
8
8
sha256 = "0nr8l88cg19zj585hczj8v73yh21k7j13xivhlzl8jdk0j0cj052";
9
9
};
10
10
11
11
buildInputs = [ gtk pkgconfig libxml2 intltool gettext ];
12
12
13
+
patches = [ ./get_sensitive.patch ./set_flags.patch ];
14
+
13
15
meta = {
16
+
homepage = http://gdmap.sourceforge.net;
14
17
description = "Recursive rectangle map of disk usage";
15
18
};
16
19
}
+34
pkgs/tools/system/gdmap/get_sensitive.patch
+34
pkgs/tools/system/gdmap/get_sensitive.patch
···
1
+
From 166de50914191303b232ec123cfbaadad521560c Mon Sep 17 00:00:00 2001
2
+
From: Alexander Myltsev <avm@altlinux.ru>
3
+
Date: Wed, 21 Apr 2010 22:43:14 +0400
4
+
Subject: [PATCH] GTK_WIDGET_SENSITIVE -> gtk_widget_get_sensitive
5
+
6
+
---
7
+
gdmap/src/gui_support.c | 4 ++--
8
+
1 files changed, 2 insertions(+), 2 deletions(-)
9
+
10
+
diff --git a/src/gui_support.c b/src/gui_support.c
11
+
index 3027e29..45272d3 100644
12
+
--- a/src/gui_support.c
13
+
+++ b/src/gui_support.c
14
+
@@ -85,7 +85,7 @@ on_ebox_enter(GtkWidget* box, GdkEventCrossing* event, GtkLabel* label) {
15
+
const char* text;
16
+
17
+
(void)event;
18
+
- if (GTK_WIDGET_SENSITIVE(label)) {
19
+
+ if (gtk_widget_get_sensitive(GTK_WIDGET(label))) {
20
+
char* temp;
21
+
22
+
text = g_object_get_data(G_OBJECT(label), "label");
23
+
@@ -129,7 +129,7 @@ static void on_clear_label(GtkWidget* widget) {
24
+
void ui_event_label_set_sensitive(GtkWidget* ebox, gboolean set) {
25
+
gpointer callback = g_object_get_data(G_OBJECT(ebox), "callback");
26
+
GtkWidget* child = GTK_BIN(ebox)->child;
27
+
- if (GTK_WIDGET_SENSITIVE(child) == set) return;
28
+
+ if (gtk_widget_get_sensitive(child) == set) return;
29
+
30
+
if (set && !callback) return;
31
+
gtk_widget_set_sensitive(child, set);
32
+
--
33
+
1.7.3.3
34
+
+25
pkgs/tools/system/gdmap/set_flags.patch
+25
pkgs/tools/system/gdmap/set_flags.patch
···
1
+
From 9a5537d2b0aba18438dd77a45354ac2e73eae23d Mon Sep 17 00:00:00 2001
2
+
From: Alexander Myltsev <avm@altlinux.ru>
3
+
Date: Mon, 13 Dec 2010 23:24:30 +0300
4
+
Subject: [PATCH] GTK_WIDGET_SET_FLAGS -> gtk_widget_set_can_focus
5
+
6
+
---
7
+
gdmap/src/gui_support.c | 2 +-
8
+
1 files changed, 1 insertions(+), 1 deletions(-)
9
+
10
+
diff --git a/src/gui_support.c b/src/gui_support.c
11
+
index 45272d3..ca02d72 100644
12
+
--- a/src/gui_support.c
13
+
+++ b/src/gui_support.c
14
+
@@ -164,7 +164,7 @@ GtkWidget* ui_create_event_label(const char* text, GCallback callback,
15
+
// GDK_FOCUS_CHANGE_MASK |
16
+
GDK_ENTER_NOTIFY_MASK |
17
+
GDK_LEAVE_NOTIFY_MASK);
18
+
- GTK_WIDGET_SET_FLAGS(ebox, GTK_CAN_FOCUS);
19
+
+ gtk_widget_set_can_focus(ebox, TRUE);
20
+
21
+
gtk_widget_show(ebox);
22
+
23
+
--
24
+
1.7.3.3
25
+
+1
-1
pkgs/top-level/all-packages.nix
+1
-1
pkgs/top-level/all-packages.nix