diff options
| author | clive <clive@FreeBSD.org> | 2004-12-18 17:58:29 +0800 |
|---|---|---|
| committer | clive <clive@FreeBSD.org> | 2004-12-18 17:58:29 +0800 |
| commit | 6bb81117410eef7be68befccfa7a58fa1618b2d0 (patch) | |
| tree | 20c2a172f81f46d3cb15dabe68f68ddeeece3c3e /x11/fbpanel | |
| parent | e597e803899775212eeea2de7d118056d8e45854 (diff) | |
| download | freebsd-ports-gnome-6bb81117410eef7be68befccfa7a58fa1618b2d0.tar.gz freebsd-ports-gnome-6bb81117410eef7be68befccfa7a58fa1618b2d0.tar.zst freebsd-ports-gnome-6bb81117410eef7be68befccfa7a58fa1618b2d0.zip | |
Fix build on 4.x.
Diffstat (limited to 'x11/fbpanel')
| -rw-r--r-- | x11/fbpanel/files/patch-Makefile.common | 11 | ||||
| -rw-r--r-- | x11/fbpanel/files/patch-bg.c | 11 | ||||
| -rw-r--r-- | x11/fbpanel/files/patch-gtkbgbox.c | 14 | ||||
| -rw-r--r-- | x11/fbpanel/files/patch-plugins-deskno.c | 14 |
4 files changed, 45 insertions, 5 deletions
diff --git a/x11/fbpanel/files/patch-Makefile.common b/x11/fbpanel/files/patch-Makefile.common index 3625cbc91377..2c332a3f8530 100644 --- a/x11/fbpanel/files/patch-Makefile.common +++ b/x11/fbpanel/files/patch-Makefile.common @@ -1,16 +1,17 @@ ---- Makefile.common.orig Tue Dec 14 18:52:32 2004 -+++ Makefile.common Tue Dec 14 18:53:15 2004 -@@ -15,12 +15,10 @@ +--- Makefile.common.orig Sat Nov 6 07:36:35 2004 ++++ Makefile.common Sat Dec 18 17:35:28 2004 +@@ -15,12 +15,9 @@ endif endif -CC = gcc +CC ?= gcc LIBS = $(shell pkg-config --libs gtk+-2.0 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0) -L/usr/X11R6/lib -lXmu - INCS2 = $(shell pkg-config --cflags gtk+-2.0 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0) - INCS := $(INCS2:-I%=-isystem%) +-INCS2 = $(shell pkg-config --cflags gtk+-2.0 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0) +-INCS := $(INCS2:-I%=-isystem%) -# first = may be overwriten by command line or env. variable -CFLAGS = -O2 ++INCS = $(shell pkg-config --cflags gtk+-2.0 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0) # this one always applays CFLAGS += -Wall ifneq (,$(DEVEL)) diff --git a/x11/fbpanel/files/patch-bg.c b/x11/fbpanel/files/patch-bg.c new file mode 100644 index 000000000000..4ee24b855786 --- /dev/null +++ b/x11/fbpanel/files/patch-bg.c @@ -0,0 +1,11 @@ +--- bg.c~ Sat Dec 18 17:41:41 2004 ++++ bg.c Sat Dec 18 17:43:04 2004 +@@ -196,7 +196,7 @@ + ENTER; + win = GDK_WINDOW_XWINDOW(widget->window); + if (!XGetGeometry(bg->dpy, win, &dummy, &x, &y, &width, &height, &border, &depth)) { +- DBG2("XGetGeometry failed\n"); ++ DBG("XGetGeometry failed\n"); + RET(NULL); + } + XTranslateCoordinates(bg->dpy, win, bg->xroot, 0, 0, &x, &y, &dummy); diff --git a/x11/fbpanel/files/patch-gtkbgbox.c b/x11/fbpanel/files/patch-gtkbgbox.c new file mode 100644 index 000000000000..4f27e7f6fec4 --- /dev/null +++ b/x11/fbpanel/files/patch-gtkbgbox.c @@ -0,0 +1,14 @@ +--- gtkbgbox.c~ Sat Dec 18 17:46:25 2004 ++++ gtkbgbox.c Sat Dec 18 17:46:40 2004 +@@ -310,10 +310,9 @@ + static void + gtk_bgbox_set_bg_root(GtkWidget *widget, GtkBgboxPrivate *priv) + { +- priv = GTK_BGBOX_GET_PRIVATE (widget); + GdkRectangle rect; ++ priv = GTK_BGBOX_GET_PRIVATE (widget); + +- ENTER; + priv->pixmap = fb_bg_get_xroot_pix_for_win(priv->bg, widget); + if (!priv->pixmap || priv->pixmap == GDK_NO_BG) { + priv->bg_type = BG_NONE; diff --git a/x11/fbpanel/files/patch-plugins-deskno.c b/x11/fbpanel/files/patch-plugins-deskno.c new file mode 100644 index 000000000000..330c01c67f74 --- /dev/null +++ b/x11/fbpanel/files/patch-plugins-deskno.c @@ -0,0 +1,14 @@ +--- plugins/deskno.c~ Sat Dec 18 17:37:12 2004 ++++ plugins/deskno.c Sat Dec 18 17:37:30 2004 +@@ -25,10 +25,10 @@ + static void + clicked( GtkWidget *widget, gpointer data) + { +- ENTER; + int desknum = get_net_current_desktop(); + int desks = get_net_number_of_desktops(); + int newdesk; ++ ENTER; + if(desknum == (desks - 1)) + newdesk = 0; + else |