diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2004-04-17 18:17:15 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2004-04-17 18:17:15 +0000 |
| commit | 324383867655cc1efa258dd9ef3ca72409fd8731 (patch) | |
| tree | d6e565b01239d5d21e7b58259719fd7eaeee0005 | |
| parent | Update to the 2004-04-14 snapshot, which should be nearly identical to the (diff) | |
Always add the default gtkrc file to the search path so that we know we'll
have some sane theme properties when using KDE 3 or GNOME 2.
Submitted by: kan
| -rw-r--r-- | x11-toolkits/gtk12/Makefile | 2 | ||||
| -rw-r--r-- | x11-toolkits/gtk12/files/patch-ad | 39 |
2 files changed, 33 insertions, 8 deletions
diff --git a/x11-toolkits/gtk12/Makefile b/x11-toolkits/gtk12/Makefile index 1b0cd70f33a1..8efe623af661 100644 --- a/x11-toolkits/gtk12/Makefile +++ b/x11-toolkits/gtk12/Makefile @@ -7,7 +7,7 @@ PORTNAME= gtk PORTVERSION= 1.2.10 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gtk+/1.2 diff --git a/x11-toolkits/gtk12/files/patch-ad b/x11-toolkits/gtk12/files/patch-ad index 77db6d51ce38..71121eda4feb 100644 --- a/x11-toolkits/gtk12/files/patch-ad +++ b/x11-toolkits/gtk12/files/patch-ad @@ -1,6 +1,8 @@ ---- gtk/gtkrc.c.orig Thu Mar 15 12:41:40 2001 -+++ gtk/gtkrc.c Mon Apr 2 10:29:36 2001 -@@ -262,5 +262,5 @@ +--- gtk/gtkrc.c.orig Thu Mar 15 13:41:40 2001 ++++ gtk/gtkrc.c Fri Apr 16 00:24:54 2004 +@@ -260,9 +260,9 @@ + + var = getenv("GTK_DATA_PREFIX"); if (var) - path = g_strdup_printf("%s%s", var, "/share/gtk/themes"); + path = g_strdup_printf("%s%s", var, "/share/themes"); @@ -8,13 +10,36 @@ - path = g_strdup_printf("%s%s", GTK_DATA_PREFIX, "/share/gtk/themes"); + path = g_strdup_printf("%s%s", GTK_DATA_PREFIX, "/share/themes"); -@@ -296,3 +296,3 @@ + for (n = 0; pixmap_path[n]; n++) ; + if (n >= GTK_RC_MAX_PIXMAP_PATHS - 1) +@@ -294,7 +294,7 @@ + + var = g_get_home_dir (); if (var) - module_path[n++] = g_strdup_printf("%s%s", var, "/.gtk/lib/themes/engines"); + module_path[n++] = g_strdup_printf("%s%s", var, "/.gtk/themes/engines"); module_path[n] = NULL; -@@ -328,3 +328,3 @@ + } + +@@ -312,6 +312,10 @@ + gtk_rc_default_files[0] = NULL; + init = TRUE; + ++ str = g_strdup_printf ("%s%s", GTK_SYSCONFDIR, "/gtkrc"); ++ gtk_rc_add_default_file (str); ++ g_free (str); ++ + var = getenv("GTK_RC_FILES"); + if (var) + { +@@ -326,10 +330,6 @@ + } + else { - str = g_strdup_printf ("%s%s", GTK_SYSCONFDIR, "/gtk/gtkrc"); -+ str = g_strdup_printf ("%s%s", GTK_SYSCONFDIR, "/gtkrc"); - gtk_rc_add_default_file (str); +- gtk_rc_add_default_file (str); +- g_free (str); +- + var = g_get_home_dir (); + if (var) + { |