diff options
| author | khorben <khorben@pkgsrc.org> | 2014-10-25 10:36:24 +0000 |
|---|---|---|
| committer | khorben <khorben@pkgsrc.org> | 2014-10-25 10:36:24 +0000 |
| commit | 35dc1bec1c96556ee27dcf0225e701177cd6ebb1 (patch) | |
| tree | b60b6cbd594efed37946df936ce28670edd86783 /x11 | |
| parent | ccbe144376c91384d685e799e1d41e31e6c5558b (diff) | |
| download | pkgsrc-35dc1bec1c96556ee27dcf0225e701177cd6ebb1.tar.gz | |
Consistency fix with Gtk+ 2.24; bumped PKGREVISION
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/deforaos-panel/Makefile | 3 | ||||
| -rw-r--r-- | x11/deforaos-panel/distinfo | 3 | ||||
| -rw-r--r-- | x11/deforaos-panel/patches/patch-src_panel.c | 43 |
3 files changed, 47 insertions, 2 deletions
diff --git a/x11/deforaos-panel/Makefile b/x11/deforaos-panel/Makefile index 873c6f7841a..52a7c46c9a1 100644 --- a/x11/deforaos-panel/Makefile +++ b/x11/deforaos-panel/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.12 2014/10/25 10:33:35 khorben Exp $ +# $NetBSD: Makefile,v 1.13 2014/10/25 10:36:24 khorben Exp $ # DISTNAME= Panel-0.3.1 PKGNAME= deforaos-panel-0.3.1 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= http://www.defora.org/os/download/download/4338/ diff --git a/x11/deforaos-panel/distinfo b/x11/deforaos-panel/distinfo index 38485ec7887..657349584c1 100644 --- a/x11/deforaos-panel/distinfo +++ b/x11/deforaos-panel/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2014/10/24 23:43:17 khorben Exp $ +$NetBSD: distinfo,v 1.7 2014/10/25 10:36:24 khorben Exp $ SHA1 (Panel-0.3.1.tar.gz) = 0a2d9d424b8b316d8a6db087c8cb2dddaaa47347 RMD160 (Panel-0.3.1.tar.gz) = 3e2fe1e8f1cf2a4c27cdf355bf5c00685d5ada9a @@ -8,4 +8,5 @@ SHA1 (patch-src_applets_main.c) = 2dcc2b6394116406a1c2a23b22ba0feb56c85ecd SHA1 (patch-src_applets_memory.c) = 858dc9f03fa32e01d3d02d49d13742cda7b0193e SHA1 (patch-src_applets_swap.c) = 75599dd9b7aed08895c542376d2a6b7883a91f7f SHA1 (patch-src_applets_volume.c) = 10a4dfe01b6576a7f39a344ddd669725666d72a7 +SHA1 (patch-src_panel.c) = 9423e1a6c3535be8d90a40c9b2f70a5cbff2ac78 SHA1 (patch-tools_Makefile) = 642887110b585cd6b78d0cf43acc4f826b1abcae diff --git a/x11/deforaos-panel/patches/patch-src_panel.c b/x11/deforaos-panel/patches/patch-src_panel.c new file mode 100644 index 00000000000..ae18cd8d955 --- /dev/null +++ b/x11/deforaos-panel/patches/patch-src_panel.c @@ -0,0 +1,43 @@ +$NetBSD: patch-src_panel.c,v 1.1 2014/10/25 10:36:24 khorben Exp $ + +Fix for Gtk+ 2.24 + +--- src/panel.c.orig 2014-10-23 09:38:39.000000000 +0000 ++++ src/panel.c +@@ -768,7 +768,7 @@ static GtkWidget * _preferences_window_p + for(i = 0; i < sizeof(titles) / sizeof(*titles); i++) + { + #if GTK_CHECK_VERSION(2, 24, 0) +- gtk_combo_box_append_text(GTK_COMBO_BOX(widget), _(titles[i])); ++ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(widget), _(titles[i])); + #else + gtk_combo_box_append_text(GTK_COMBO_BOX(widget), _(titles[i])); + #endif +@@ -782,11 +782,11 @@ static GtkWidget * _preferences_window_p + FALSE, TRUE, 0); + gtk_widget_set_no_show_all(panel->pr_panels[i].enabled, TRUE); + /* size */ +-#if GTK_CHECK_VERSION(3, 0, 0) ++#if GTK_CHECK_VERSION(2, 24, 0) + panel->pr_panels[i].size = gtk_combo_box_text_new(); +- gtk_combo_box_text_append( ++ gtk_combo_box_text_append_text( + GTK_COMBO_BOX_TEXT(panel->pr_panels[i].size), +- NULL, _("Default")); ++ _("Default")); + #else + panel->pr_panels[i].size = gtk_combo_box_new_text(); + gtk_combo_box_append_text( +@@ -796,9 +796,9 @@ static GtkWidget * _preferences_window_p + for(j = 0; j < sizeof(_panel_sizes) / sizeof(*_panel_sizes); + j++) + { +-#if GTK_CHECK_VERSION(3, 0, 0) +- gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT( +- panel->pr_panels[i].size), NULL, ++#if GTK_CHECK_VERSION(2, 24, 0) ++ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT( ++ panel->pr_panels[i].size), + _(_panel_sizes[j].alias)); + #else + gtk_combo_box_append_text( |