Attachment 79287 Details for Bug 113916 – fbpanel-4.9.patch

[patch] fbpanel-4.9.patch

fbpanel-4.9.patch (text/plain), 5.07 KB, created by Tobias Roth on 2007-06-21 18:00:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tobias Roth

Created: 2007-06-21 18:00:08 UTC

Size: 5.07 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/ports/x11/fbpanel/Makefile,v
>retrieving revision 1.11
>diff -u -u -r1.11 Makefile
>--- Makefile	19 May 2007 20:26:17 -0000	1.11
>+++ Makefile	21 Jun 2007 16:07:40 -0000
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	fbpanel
>-PORTVERSION=	4.3
>-PORTREVISION=	4
>+PORTVERSION=	4.9
> CATEGORIES=	x11
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR=	${PORTNAME}
>Index: distinfo
>===================================================================
>RCS file: /home/ncvs/ports/x11/fbpanel/distinfo,v
>retrieving revision 1.6
>diff -u -u -r1.6 distinfo
>--- distinfo	24 Jan 2006 03:15:56 -0000	1.6
>+++ distinfo	21 Jun 2007 16:07:40 -0000
>@@ -1,3 +1,3 @@
>-MD5 (fbpanel-4.3.tgz) = 2d2f3713cf3c17b71997064f39d4c888
>-SHA256 (fbpanel-4.3.tgz) = e4db7a6305ffe2333fae08c940ded8f7e5b02999e0917b0ea4ef3764c80f58c8
>-SIZE (fbpanel-4.3.tgz) = 95702
>+MD5 (fbpanel-4.9.tgz) = 67a2a442a038ba80094c8cc06784dd08
>+SHA256 (fbpanel-4.9.tgz) = 6d7f445885644988820119f51fb0728fbd2b8df0c26ca8d010c267b535d129de
>+SIZE (fbpanel-4.9.tgz) = 169637
>Index: pkg-plist
>===================================================================
>RCS file: /home/ncvs/ports/x11/fbpanel/pkg-plist,v
>retrieving revision 1.4
>diff -u -u -r1.4 pkg-plist
>--- pkg-plist	11 Apr 2006 11:11:53 -0000	1.4
>+++ pkg-plist	21 Jun 2007 16:07:40 -0000
>@@ -1,15 +1,23 @@
> bin/fbpanel
> %%DATADIR%%/default
>-%%DATADIR%%/images/Desktop2.png
>-%%DATADIR%%/images/Editor.png
>-%%DATADIR%%/images/Emacs.png
>-%%DATADIR%%/images/GNOME-Terminal.png
>-%%DATADIR%%/images/Menu.png
>-%%DATADIR%%/images/Networking.png
> %%DATADIR%%/images/bottom-left.xpm
> %%DATADIR%%/images/bottom-right.xpm
> %%DATADIR%%/images/default.xpm
>-%%DATADIR%%/images/settings.png
>+%%DATADIR%%/images/gnome-applications.png
>+%%DATADIR%%/images/gnome-devel.svg
>+%%DATADIR%%/images/gnome-emacs.svg
>+%%DATADIR%%/images/gnome-fs-desktop.svg
>+%%DATADIR%%/images/gnome-fs-home.svg
>+%%DATADIR%%/images/gnome-globe.svg
>+%%DATADIR%%/images/gnome-graphics.png
>+%%DATADIR%%/images/gnome-joystick.svg
>+%%DATADIR%%/images/gnome-multimedia.svg
>+%%DATADIR%%/images/gnome-settings.svg
>+%%DATADIR%%/images/gnome-system.png
>+%%DATADIR%%/images/gnome-util.svg
>+%%DATADIR%%/images/gnome_terminal.svg
>+%%DATADIR%%/images/mozilla-firefox.svg
>+%%DATADIR%%/images/star.png
> %%DATADIR%%/images/top-left.xpm
> %%DATADIR%%/images/top-right.xpm
> %%DATADIR%%/pager
>Index: files/patch-Makefile.common
>===================================================================
>RCS file: /home/ncvs/ports/x11/fbpanel/files/patch-Makefile.common,v
>retrieving revision 1.5
>diff -u -u -r1.5 patch-Makefile.common
>--- files/patch-Makefile.common	11 Apr 2006 11:11:54 -0000	1.5
>+++ files/patch-Makefile.common	21 Jun 2007 16:07:40 -0000
>@@ -1,27 +1,32 @@
>---- Makefile.common.orig	Tue May 31 17:39:18 2005
>-+++ Makefile.common	Sun Apr  2 16:30:37 2006
>+--- Makefile.common.orig	Tue Apr 24 15:45:43 2007
>++++ Makefile.common	Thu Jun 21 06:58:50 2007
> @@ -53,7 +53,7 @@
>  
>- DEVEL  ?= 0
>- CHATTY ?= $(DEVEL)
>--STATIC_PLUGINS ?= 0
>-+STATIC_PLUGINS ?= 1
>+ DEVEL  = 0
>+ CHATTY = $(DEVEL)
>+-STATIC_PLUGINS = 0
>++STATIC_PLUGINS = 1
>  #$(warning CHATTY=$(CHATTY) DEVEL=$(DEVEL))
>  ifeq (1,$(CHATTY))
>  Q :=
>-@@ -83,13 +83,11 @@
>- # compile flags
>- 
>- RM      = rm -f
>--CC      = gcc
>-+CC      ?= gcc
>+@@ -89,10 +89,8 @@
>+ CC      ?= gcc
>  AR      = ar
>- 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)
>+ LIBS    = $(shell pkg-config --libs glib-2.0 gmodule-2.0 gthread-2.0 gtk+-2.0 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0) -L/usr/X11R6/lib  -lXmu
>+-INCS2   = $(shell pkg-config --cflags glib-2.0 gmodule-2.0 gthread-2.0 gtk+-2.0 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0)
> -INCS   := $(INCS2:-I%=-isystem %)
> +INCS = $(shell pkg-config --cflags gtk+-2.0 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0)
>  
>--CFLAGS = -O2
>+-CFLAGS ?= -O2 -Wall
>  ifeq (1,$(DEVEL))
>  override CFLAGS += -g
>  endif
>+@@ -113,7 +111,7 @@
>+ 
>+ %.dep : %.c
>+ 	$(call summary,DEP ,$@)
>+-	$(Q)$(CC) $(CPPFLAGS) $(INCS) -MM $< | sed 's/$$*$.o[ :]*/\1.o $@ :/' > $@
>++	$(Q)$(CC) $(CPPFLAGS) $(INCS) -MM $< | sed 's/$$*$\.o[ :]*/\1.o $@ :/' > $@
>+ 
>+ 
>+ #########################################
>Index: files/patch-bg.c
>===================================================================
>RCS file: /home/ncvs/ports/x11/fbpanel/files/patch-bg.c,v
>retrieving revision 1.1
>diff -u -u -r1.1 patch-bg.c
>--- files/patch-bg.c	18 Dec 2004 09:58:29 -0000	1.1
>+++ files/patch-bg.c	21 Jun 2007 16:07:40 -0000
>@@ -1,9 +1,9 @@
>---- bg.c~	Sat Dec 18 17:41:41 2004
>-+++ bg.c	Sat Dec 18 17:43:04 2004
>-@@ -196,7 +196,7 @@
>-     ENTER;
>+--- bg.c.orig	Tue Apr 24 15:45:43 2007
>++++ bg.c	Wed Jun 20 17:02:10 2007
>+@@ -237,7 +237,7 @@
>      win =  GDK_WINDOW_XWINDOW(widget->window); 
>-     if (!XGetGeometry(bg->dpy, win, &dummy, &x, &y, &width, &height, &border, &depth)) {
>+     if (!XGetGeometry(bg->dpy, win, &dummy, &x, &y, &width, &height, &border,
>+               &depth)) {
> -        DBG2("XGetGeometry failed\n");
> +        DBG("XGetGeometry failed\n");
>          RET(NULL);

Actions: View | Diff

Attachments on bug 113916: 79287