Attachment #41833 for bug #65342

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




#

PORTNAME=	gcursor
PORTVERSION=	0.05
PORTREVISION=	2
CATEGORIES=	x11 gnome
MASTER_SITES=	http://download.qballcow.nl/programs/gcursor/



USE_GMAKE=	yes
USE_X_PREFIX=	yes
USE_GNOME=	gnomehack gnomeprefix gnometarget intlhack libgnomeui
GNU_CONFIGURE=	yes
CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
		LDFLAGS="-L${LOCALBASE}/lib"

post-patch:
	@${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' \
			${WRKSRC}/src/gcursor.c
	@${REINPLACE_CMD} -e 's|share/applications|share/gnome/capplets|g' \
			${WRKSRC}/data/Makefile.in

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)gcursor/distinfo (-2 / +2 lines)
1	MD5 (gcursor-0.04.tar.gz) = b0e92fb0f1f910d0a130ed9d02be0d12	1	MD5 (gcursor-0.05.tar.gz) = 945fb7548eb412a1bcb5dd83a7287fb4
2	SIZE (gcursor-0.04.tar.gz) = 78100	2	SIZE (gcursor-0.05.tar.gz) = 97544




--- src/gcursor.c.orig	Thu Apr  8 10:25:03 2004
+++ src/gcursor.c	Thu Apr  8 18:00:14 2004
@@ -32,10 +32,7 @@
 GConfClient *client;
 XcursorImage * cursor = NULL;
 char*current_theme = NULL;
-int path_index = 4;
+int path_index = 2;
 
 #warning move this into gconf
 char *paths[] = {
@@ -26,9 +26,7 @@
 animation_struct animations[4];
 
 char *paths[4] = {
-	"/usr/share/cursors/xfree/",
-	"/usr/X11R6/lib/X11/icons/",
-	"/usr/local/share/icons/",
-	"/usr/share/icons/",
+	"%%X11BASE%%/lib/X11/icons/",
 	"%s/.icons/",
 	NULL
 };	
 
@@ -348,7 +346,7 @@
 				GTK_STOCK_DIALOG_QUESTION, GTK_ICON_SIZE_LARGE_TOOLBAR);
 	}
 
-	if(animations[1].image->images != NULL && animations[1].image->nimage != 0)
+	if(animations[1].image != NULL && animations[1].image->nimage != 0)
 	{
 		pixbuf = get_pixbuf_from_cursor_image(animations[1].image->images[animations[1].pos]);
 		gtk_image_set_from_pixbuf(GTK_IMAGE(glade_xml_get_widget(main_window, "example_2")),

Lines 1-3 Link Here

(-)gcursor/pkg-plist (+2 lines)
1	bin/gcursor	1	bin/gcursor
		2	share/gnome/capplets/gcursor.desktop
2	share/gnome/gcursor/gcursor.glade	3	share/gnome/gcursor/gcursor.glade
		4	share/locale/de/LC_MESSAGES/gcursor.mo
3	@dirrm share/gnome/gcursor	5	@dirrm share/gnome/gcursor

Return to bug 65342

Lines 6-13 Link Here

(-)gcursor/Makefile (-3 / +4 lines)
6	#	6	#
7		7
8	PORTNAME= gcursor	8	PORTNAME= gcursor
9	PORTVERSION= 0.04	9	PORTVERSION= 0.05
10	PORTREVISION= 2
11	CATEGORIES= x11 gnome	10	CATEGORIES= x11 gnome
12	MASTER_SITES= http://download.qballcow.nl/programs/gcursor/	11	MASTER_SITES= http://download.qballcow.nl/programs/gcursor/
13		12
Lines 19-25 Link Here
19		18
20	USE_GMAKE= yes	19	USE_GMAKE= yes
21	USE_X_PREFIX= yes	20	USE_X_PREFIX= yes
22	USE_GNOME= gnomehack gnomeprefix gnometarget libgnomeui	21	USE_GNOME= gnomehack gnomeprefix gnometarget intlhack libgnomeui
23	GNU_CONFIGURE= yes	22	GNU_CONFIGURE= yes
24	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \	23	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
25	LDFLAGS="-L${LOCALBASE}/lib"	24	LDFLAGS="-L${LOCALBASE}/lib"
Lines 27-31 Link Here
27	post-patch:	26	post-patch:
28	@${REINPLACE_CMD} -e 's\|%%X11BASE%%\|${X11BASE}\|g' \	27	@${REINPLACE_CMD} -e 's\|%%X11BASE%%\|${X11BASE}\|g' \
29	${WRKSRC}/src/gcursor.c	28	${WRKSRC}/src/gcursor.c
		29	@${REINPLACE_CMD} -e 's\|share/applications\|share/gnome/capplets\|g' \
		30	${WRKSRC}/data/Makefile.in
30		31
31	.include <bsd.port.mk>	32	.include <bsd.port.mk>

Lines 1-31 Link Here

(-)gcursor/files/patch-src::gcursor.c (-25 / +8 lines)
1	--- src/gcursor.c.orig Fri Mar 26 12:54:55 2004	1	--- src/gcursor.c.orig Thu Apr 8 10:25:03 2004
2	+++ src/gcursor.c Mon Apr 5 13:21:52 2004	2	+++ src/gcursor.c Thu Apr 8 18:00:14 2004
3	@@ -16,7 +16,7 @@	3	@@ -32,10 +32,7 @@
4	GConfClient *client;
5	XcursorImage * cursor = NULL;
6	char*current_theme = NULL;
7	-int path_index = 4;
8	+int path_index = 2;
9		4
10	typedef struct {	5	#warning move this into gconf
11	XcursorImages *image;	6	char *paths[] = {
12	@@ -26,9 +26,7 @@
13	animation_struct animations[4];
14
15	char *paths[4] = {
16	- "/usr/share/cursors/xfree/",	7	- "/usr/share/cursors/xfree/",
		8	- "/usr/X11R6/lib/X11/icons/",
17	- "/usr/local/share/icons/",	9	- "/usr/local/share/icons/",
18	- "/usr/share/icons/",	10	- "/usr/share/icons/",
19	+ "%%X11BASE%%/lib/X11/icons/",	11	+ "%%X11BASE%%/lib/X11/icons/",
20	"%s/.icons/"	12	"%s/.icons/",
		13	NULL
21	};	14	};
22
23	@@ -348,7 +346,7 @@
24	GTK_STOCK_DIALOG_QUESTION, GTK_ICON_SIZE_LARGE_TOOLBAR);
25	}
26
27	- if(animations[1].image->images != NULL && animations[1].image->nimage != 0)
28	+ if(animations[1].image != NULL && animations[1].image->nimage != 0)
29	{
30	pixbuf = get_pixbuf_from_cursor_image(animations[1].image->images[animations[1].pos]);
31	gtk_image_set_from_pixbuf(GTK_IMAGE(glade_xml_get_widget(main_window, "example_2")),