summaryrefslogtreecommitdiffstats
path: root/sysutils
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2007-09-21 03:28:24 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2007-09-21 03:28:24 +0800
commit792fe1fbeb8665d99cb5a2f001cecae43e304e1a (patch)
treef3885fb4b69a50a484ff202dc106023b4d473791 /sysutils
parent67cb3e38b34242a572f27941bebfba84f3aff16b (diff)
downloadmarcuscom-ports-792fe1fbeb8665d99cb5a2f001cecae43e304e1a.tar
marcuscom-ports-792fe1fbeb8665d99cb5a2f001cecae43e304e1a.tar.gz
marcuscom-ports-792fe1fbeb8665d99cb5a2f001cecae43e304e1a.tar.bz2
marcuscom-ports-792fe1fbeb8665d99cb5a2f001cecae43e304e1a.tar.lz
marcuscom-ports-792fe1fbeb8665d99cb5a2f001cecae43e304e1a.tar.xz
marcuscom-ports-792fe1fbeb8665d99cb5a2f001cecae43e304e1a.tar.zst
marcuscom-ports-792fe1fbeb8665d99cb5a2f001cecae43e304e1a.zip
One more try to fix cursor theme detection.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@9694 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/gnome-control-center/Makefile8
-rw-r--r--sysutils/gnome-control-center/files/patch-capplets_common_gnome-theme-info.c13
2 files changed, 17 insertions, 4 deletions
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 6d41191a6..f1565ae3a 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/gnome-control-center/Makefile,v 1.153 2007/09/17 16:16:24 ahze Exp $
+# $MCom: ports/sysutils/gnome-control-center/Makefile,v 1.154 2007/09/20 16:17:11 marcus Exp $
#
PORTNAME= gnome-control-center
PORTVERSION= 2.20.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -59,6 +59,10 @@ CONFIGURE_ARGS+=--disable-aboutme
PLIST_SUB+= ABOUTME="@comment "
.endif
+post-patch:
+ @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
+ ${WRKSRC}/capplets/common/gnome-theme-info.c
+
post-install:
@-update-desktop-database
diff --git a/sysutils/gnome-control-center/files/patch-capplets_common_gnome-theme-info.c b/sysutils/gnome-control-center/files/patch-capplets_common_gnome-theme-info.c
index d278a7ea6..5f5eb4bc1 100644
--- a/sysutils/gnome-control-center/files/patch-capplets_common_gnome-theme-info.c
+++ b/sysutils/gnome-control-center/files/patch-capplets_common_gnome-theme-info.c
@@ -1,5 +1,5 @@
---- capplets/common/gnome-theme-info.c.orig 2007-09-20 12:12:10.000000000 -0400
-+++ capplets/common/gnome-theme-info.c 2007-09-20 12:13:50.000000000 -0400
+--- capplets/common/gnome-theme-info.c.orig 2007-08-27 04:09:06.000000000 -0400
++++ capplets/common/gnome-theme-info.c 2007-09-20 15:24:56.000000000 -0400
@@ -1845,7 +1845,7 @@ read_cursor_fonts (void)
theme_info->thumbnail = gdk_pixbuf_new_from_file (filename, NULL);
g_free (filename);
@@ -9,3 +9,12 @@
theme_info->path = g_strdup (theme_info->name);
if (!strcmp (theme_info->path, cursor_font))
+@@ -1974,7 +1974,7 @@ gnome_theme_init (gboolean *monitor_not_
+ gnome_vfs_uri_unref (top_theme_dir_uri);
+
+ /* The weird /usr/share/icons */
+- top_theme_dir_uri = gnome_vfs_uri_new ("/usr/share/icons");
++ top_theme_dir_uri = gnome_vfs_uri_new ("%%LOCALBASE%%/lib/X11/icons");
+ if (!gnome_vfs_uri_exists (top_theme_dir_uri))
+ gnome_vfs_make_directory_for_uri (top_theme_dir_uri, 0775);
+ result = add_top_icon_theme_dir_monitor (top_theme_dir_uri, &real_monitor_not_added, 2, NULL);