Fix some known compatibility problems with GNOME 2.6.

5 files changed, 18 insertions, 15 deletions

diff --git a/x11-themes/gnome-themes-extras/Makefile b/x11-themes/gnome-themes-extras/Makefile
index b8a1699ab1a0..13229e93b76a 100644
--- a/x11-themes/gnome-themes-extras/Makefile
+++ b/x11-themes/gnome-themes-extras/Makefile
@@ -21,12 +21,14 @@ USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_LIBTOOL_VER=13
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack libgnomeui
+USE_GNOME=	gnomehack libgnomeui lthack
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 CONFLICTS=	gtk-smooth-engine-*
 
+PLIST_SUB=	GTK_VERSION="2.4.0"
+
 post-patch:
 	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
 		"/^themedir =.*metacity-1$$/s|themes|gnome/themes|"
diff --git a/x11-themes/gnome-themes-extras/files/patch-Smooth::smooth_style.c b/x11-themes/gnome-themes-extras/files/patch-Smooth::smooth_style.c
new file mode 100644
index 000000000000..d3728a2302da
--- /dev/null
+++ b/x11-themes/gnome-themes-extras/files/patch-Smooth::smooth_style.c
@@ -0,0 +1,11 @@
+--- Smooth/smooth_style.c.orig	Thu Dec 11 10:05:56 2003
++++ Smooth/smooth_style.c	Thu Dec 11 10:06:13 2003
+@@ -707,7 +707,7 @@
+ {
+   g_return_if_fail(sanitize_parameters(style, window, &width, &height));
+ 
+-  if ((EDGE_LINE_STYLE(style,NULL) == SMOOTH_LINE_FLAT)  && DETAIL ("entry") && widget && (GTK_IS_SPIN_BUTTON (widget) || (widget->parent && GTK_IS_COMBO(widget->parent)))) 
++  if ((EDGE_LINE_STYLE(style,NULL) == SMOOTH_LINE_FLAT)  && DETAIL ("entry") && widget && (GTK_IS_SPIN_BUTTON (widget) || (widget->parent && GTK_IS_COMBO_BOX(widget->parent)))) 
+   {
+        gtk_paint_flat_box(style, window, widget->state, GTK_SHADOW_NONE, area, widget, "entry_bg", x, y, width, height);
+ 
diff --git a/x11-themes/gnome-themes-extras/files/patch-configure b/x11-themes/gnome-themes-extras/files/patch-configure
deleted file mode 100644
index 99515043d8c1..000000000000
--- a/x11-themes/gnome-themes-extras/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Thu Jun 12 03:11:39 2003
-+++ configure	Thu Jun 12 03:12:05 2003
-@@ -7905,6 +7905,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/x11-themes/gnome-themes-extras/pkg-descr b/x11-themes/gnome-themes-extras/pkg-descr
index c2f2a9463521..f77d2b9e9b07 100644
--- a/x11-themes/gnome-themes-extras/pkg-descr
+++ b/x11-themes/gnome-themes-extras/pkg-descr
@@ -1,2 +1,2 @@
-Extra GNOME 2 themes, not contained within the x11-toolkits/gnome-themes
-package.
+Commonly used GNOME 2 themes that are not a part of the 
+x11-toolkits/gnome-themes package.
diff --git a/x11-themes/gnome-themes-extras/pkg-plist b/x11-themes/gnome-themes-extras/pkg-plist
index 2a7cf25a354c..e1d9519c4a2b 100644
--- a/x11-themes/gnome-themes-extras/pkg-plist
+++ b/x11-themes/gnome-themes-extras/pkg-plist
@@ -1,5 +1,5 @@
-lib/gtk-2.0/2.2.0/engines/libindustrial.so
-lib/gtk-2.0/2.2.0/engines/libsmooth.so
+lib/gtk-2.0/%%GTK_VERSION%%/engines/libindustrial.so
+lib/gtk-2.0/%%GTK_VERSION%%/engines/libsmooth.so
 share/gnome/themes/Amaranth/metacity-1/left-side.png
 share/gnome/themes/Amaranth/metacity-1/metacity-theme-1.xml
 share/gnome/themes/Amaranth/metacity-1/right-side.png