cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- fix build with latest gtk2

Browse Source
This commit is contained in:
jasper 2010-04-27 20:05:05 +00:00
parent 64fed7a073
commit 05aece0a8e
4 changed files with 74 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x11/trayer/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.5 2009/08/11 08:42:09 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.6 2010/04/27 20:05:05 jasper Exp $
COMMENT= lightweight GTK2-based systray
DISTNAME= trayer-1.0
PKGNAME= ${DISTNAME}p2
PKGNAME= ${DISTNAME}p3
CATEGORIES= x11
HOMEPAGE= http://fvwm-crystal.org/

33
x11/trayer/patches/patch-gtkbar_c Normal file
View File

@ -0,0 +1,33 @@
$OpenBSD: patch-gtkbar_c,v 1.1 2010/04/27 20:05:05 jasper Exp $
Fix build with gtk+ 2.20.
--- gtkbar.c.orig Wed Jun 2 04:04:09 2004
+++ gtkbar.c Tue Apr 27 22:02:43 2010
@@ -118,7 +118,7 @@ gtk_bar_size_request (GtkWidget *widget, GtkRequisitio
child = children->data;
children = children->next;
- if (GTK_WIDGET_VISIBLE (child->widget)) {
+ if (gtk_widget_get_visible (child->widget)) {
GtkRequisition child_requisition;
gtk_widget_size_request (child->widget, &child_requisition);
@@ -168,7 +168,7 @@ gtk_bar_size_allocate (GtkWidget *widget,
child = children->data;
children = children->next;
- if (GTK_WIDGET_VISIBLE (child->widget))
+ if (gtk_widget_get_visible (child->widget))
nvis_children += 1;
}
@@ -193,7 +193,7 @@ gtk_bar_size_allocate (GtkWidget *widget,
child = children->data;
children = children->next;
- if (GTK_WIDGET_VISIBLE (child->widget)) {
+ if (gtk_widget_get_visible (child->widget)) {
gtk_widget_size_allocate (child->widget, &child_allocation);
if (bar->orient == GTK_BAR_HORIZ)
child_allocation.x += child_allocation.width + box->spacing;

24
x11/trayer/patches/patch-panel_c Normal file
View File

@ -0,0 +1,24 @@
$OpenBSD: patch-panel_c,v 1.1 2010/04/27 20:05:05 jasper Exp $
Fix build with gtk+ 2.20.
--- panel.c.orig Tue Apr 27 21:57:37 2010
+++ panel.c Tue Apr 27 21:59:39 2010
@@ -73,7 +73,7 @@ panel_set_wm_strut(panel *p)
int i = 4;
ENTER;
- if (!GTK_WIDGET_MAPPED (p->topgwin))
+ if (!gtk_widget_get_mapped (p->topgwin))
return;
switch (p->edge) {
case EDGE_LEFT:
@@ -333,7 +333,7 @@ panel_style_set(GtkWidget *widget, GtkStyle *s, panel
ENTER;
gtk_rc_parse_string(transparent_rc);
- if (GTK_WIDGET_REALIZED(widget))
+ if (gtk_widget_get_realized(widget))
set_bg(widget, p);
RET();
}

15
x11/trayer/patches/patch-systray_eggtraymanager_c Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-systray_eggtraymanager_c,v 1.1 2010/04/27 20:05:05 jasper Exp $
Fix build with gtk+ 2.20.
--- systray/eggtraymanager.c.orig Tue Apr 27 22:02:55 2010
+++ systray/eggtraymanager.c Tue Apr 27 22:03:55 2010
@@ -399,7 +399,7 @@ egg_tray_manager_unmanage (EggTrayManager *manager)
invisible = manager->invisible;
g_assert (GTK_IS_INVISIBLE (invisible));
- g_assert (GTK_WIDGET_REALIZED (invisible));
+ g_assert (gtk_widget_get_realized (invisible));
g_assert (GDK_IS_WINDOW (invisible->window));
display = GDK_WINDOW_XDISPLAY (invisible->window);