Attachment #79287 for bug #113916

View | Details | Raw Unified | Return to bug 113916
Collapse All | Expand All

Lines 6-13 Link Here

(-)Makefile (-2 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= fbpanel	8	PORTNAME= fbpanel
9	PORTVERSION= 4.3	9	PORTVERSION= 4.9
10	PORTREVISION= 4
11	CATEGORIES= x11	10	CATEGORIES= x11
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	MASTER_SITE_SUBDIR= ${PORTNAME}	12	MASTER_SITE_SUBDIR= ${PORTNAME}

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	MD5 (fbpanel-4.3.tgz) = 2d2f3713cf3c17b71997064f39d4c888	1	MD5 (fbpanel-4.9.tgz) = 67a2a442a038ba80094c8cc06784dd08
2	SHA256 (fbpanel-4.3.tgz) = e4db7a6305ffe2333fae08c940ded8f7e5b02999e0917b0ea4ef3764c80f58c8	2	SHA256 (fbpanel-4.9.tgz) = 6d7f445885644988820119f51fb0728fbd2b8df0c26ca8d010c267b535d129de
3	SIZE (fbpanel-4.3.tgz) = 95702	3	SIZE (fbpanel-4.9.tgz) = 169637




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/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




--- 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
 #$(warning CHATTY=$(CHATTY) DEVEL=$(DEVEL))
 ifeq (1,$(CHATTY))
 Q :=
@@ -89,10 +89,8 @@
 CC      ?= gcc
 
 RM      = rm -f
-CC      = gcc
+CC      ?= gcc
 AR      = ar
 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 -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 $@ :/' > $@
 
 
 #########################################

Lines 1-9 Link Here

(-)files/patch-bg.c (-5 / +5 lines)
1	--- bg.c~ Sat Dec 18 17:41:41 2004	1	--- bg.c.orig Tue Apr 24 15:45:43 2007
2	+++ bg.c Sat Dec 18 17:43:04 2004	2	+++ bg.c Wed Jun 20 17:02:10 2007
3	@@ -196,7 +196,7 @@	3	@@ -237,7 +237,7 @@
4	ENTER;
5	win = GDK_WINDOW_XWINDOW(widget->window);	4	win = GDK_WINDOW_XWINDOW(widget->window);
6	if (!XGetGeometry(bg->dpy, win, &dummy, &x, &y, &width, &height, &border, &depth)) {	5	if (!XGetGeometry(bg->dpy, win, &dummy, &x, &y, &width, &height, &border,
		6	&depth)) {
7	- DBG2("XGetGeometry failed\n");	7	- DBG2("XGetGeometry failed\n");
8	+ DBG("XGetGeometry failed\n");	8	+ DBG("XGetGeometry failed\n");
9	RET(NULL);	9	RET(NULL);

Return to bug 113916

Lines 1-15 Link Here

(-)pkg-plist (-7 / +15 lines)
1	bin/fbpanel	1	bin/fbpanel
2	%%DATADIR%%/default	2	%%DATADIR%%/default
3	%%DATADIR%%/images/Desktop2.png
4	%%DATADIR%%/images/Editor.png
5	%%DATADIR%%/images/Emacs.png
6	%%DATADIR%%/images/GNOME-Terminal.png
7	%%DATADIR%%/images/Menu.png
8	%%DATADIR%%/images/Networking.png
9	%%DATADIR%%/images/bottom-left.xpm	3	%%DATADIR%%/images/bottom-left.xpm
10	%%DATADIR%%/images/bottom-right.xpm	4	%%DATADIR%%/images/bottom-right.xpm
11	%%DATADIR%%/images/default.xpm	5	%%DATADIR%%/images/default.xpm
12	%%DATADIR%%/images/settings.png	6	%%DATADIR%%/images/gnome-applications.png
		7	%%DATADIR%%/images/gnome-devel.svg
		8	%%DATADIR%%/images/gnome-emacs.svg
		9	%%DATADIR%%/images/gnome-fs-desktop.svg
		10	%%DATADIR%%/images/gnome-fs-home.svg
		11	%%DATADIR%%/images/gnome-globe.svg
		12	%%DATADIR%%/images/gnome-graphics.png
		13	%%DATADIR%%/images/gnome-joystick.svg
		14	%%DATADIR%%/images/gnome-multimedia.svg
		15	%%DATADIR%%/images/gnome-settings.svg
		16	%%DATADIR%%/images/gnome-system.png
		17	%%DATADIR%%/images/gnome-util.svg
		18	%%DATADIR%%/images/gnome_terminal.svg
		19	%%DATADIR%%/images/mozilla-firefox.svg
		20	%%DATADIR%%/images/star.png
13	%%DATADIR%%/images/top-left.xpm	21	%%DATADIR%%/images/top-left.xpm
14	%%DATADIR%%/images/top-right.xpm	22	%%DATADIR%%/images/top-right.xpm
15	%%DATADIR%%/pager	23	%%DATADIR%%/pager

Lines 1-27 Link Here

(-)files/patch-Makefile.common (-15 / +20 lines)
1	--- Makefile.common.orig Tue May 31 17:39:18 2005	1	--- Makefile.common.orig Tue Apr 24 15:45:43 2007
2	+++ Makefile.common Sun Apr 2 16:30:37 2006	2	+++ Makefile.common Thu Jun 21 06:58:50 2007
3	@@ -53,7 +53,7 @@	3	@@ -53,7 +53,7 @@
4		4
5	DEVEL ?= 0	5	DEVEL = 0
6	CHATTY ?= $(DEVEL)	6	CHATTY = $(DEVEL)
7	-STATIC_PLUGINS ?= 0	7	-STATIC_PLUGINS = 0
8	+STATIC_PLUGINS ?= 1	8	+STATIC_PLUGINS = 1
9	#$(warning CHATTY=$(CHATTY) DEVEL=$(DEVEL))	9	#$(warning CHATTY=$(CHATTY) DEVEL=$(DEVEL))
10	ifeq (1,$(CHATTY))	10	ifeq (1,$(CHATTY))
11	Q :=	11	Q :=
12	@@ -83,13 +83,11 @@	12	@@ -89,10 +89,8 @@
13	# compile flags	13	CC ?= gcc
14
15	RM = rm -f
16	-CC = gcc
17	+CC ?= gcc
18	AR = ar	14	AR = ar
19	LIBS = $(shell pkg-config --libs gtk+-2.0 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0) -L/usr/X11R6/lib -lXmu	15	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
20	-INCS2 = $(shell pkg-config --cflags gtk+-2.0 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0)	16	-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)
21	-INCS := $(INCS2:-I%=-isystem %)	17	-INCS := $(INCS2:-I%=-isystem %)
22	+INCS = $(shell pkg-config --cflags gtk+-2.0 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0)	18	+INCS = $(shell pkg-config --cflags gtk+-2.0 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0)
23		19
24	-CFLAGS = -O2	20	-CFLAGS ?= -O2 -Wall
25	ifeq (1,$(DEVEL))	21	ifeq (1,$(DEVEL))
26	override CFLAGS += -g	22	override CFLAGS += -g
27	endif	23	endif
		24	@@ -113,7 +111,7 @@
		25
		26	%.dep : %.c
		27	$(call summary,DEP ,$@)
		28	- $(Q)$(CC) $(CPPFLAGS) $(INCS) -MM $< \| sed 's/\($\).o[ :]/\1.o $@ :/' > $@
		29	+ $(Q)$(CC) $(CPPFLAGS) $(INCS) -MM $< \| sed 's/\($\)\.o[ :]/\1.o $@ :/' > $@
		30
		31
		32	#########################################