summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2004-03-17 10:16:01 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2004-03-17 10:16:01 +0800
commit52380f42e8fb2cea14c37b390f8cc474f3430c71 (patch)
treef12f9dab3e5f96a33c292f6abcd9ccde522e5357
parenta60a90b6e53e35eaa676f82c0a92462a52b69def (diff)
downloadmarcuscom-ports-52380f42e8fb2cea14c37b390f8cc474f3430c71.tar
marcuscom-ports-52380f42e8fb2cea14c37b390f8cc474f3430c71.tar.gz
marcuscom-ports-52380f42e8fb2cea14c37b390f8cc474f3430c71.tar.bz2
marcuscom-ports-52380f42e8fb2cea14c37b390f8cc474f3430c71.tar.lz
marcuscom-ports-52380f42e8fb2cea14c37b390f8cc474f3430c71.tar.xz
marcuscom-ports-52380f42e8fb2cea14c37b390f8cc474f3430c71.tar.zst
marcuscom-ports-52380f42e8fb2cea14c37b390f8cc474f3430c71.zip
* Add a patch to fix a NULL pointer dereference in the Industrial theme
* Chase the module location for gtk20 git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@2105 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r--x11-toolkits/gnome-themes-extras/Makefile4
-rw-r--r--x11-toolkits/gnome-themes-extras/files/patch-Industrial_industrial_style.c10
-rw-r--r--x11-toolkits/gnome-themes-extras/pkg-plist4
3 files changed, 15 insertions, 3 deletions
diff --git a/x11-toolkits/gnome-themes-extras/Makefile b/x11-toolkits/gnome-themes-extras/Makefile
index 4b0cd0b48..af73e28dd 100644
--- a/x11-toolkits/gnome-themes-extras/Makefile
+++ b/x11-toolkits/gnome-themes-extras/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnome-themes-extras
PORTVERSION= 0.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.6
@@ -27,6 +27,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
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-toolkits/gnome-themes-extras/files/patch-Industrial_industrial_style.c b/x11-toolkits/gnome-themes-extras/files/patch-Industrial_industrial_style.c
new file mode 100644
index 000000000..a95963569
--- /dev/null
+++ b/x11-toolkits/gnome-themes-extras/files/patch-Industrial_industrial_style.c
@@ -0,0 +1,10 @@
+--- Industrial/industrial_style.c.orig Tue Mar 16 16:55:11 2004
++++ Industrial/industrial_style.c Tue Mar 16 16:58:23 2004
+@@ -1801,6 +1801,7 @@
+ gint width,
+ gint height)
+ {
++ g_return_if_fail (widget != NULL);
+ #if DEBUG
+ printf ("draw_shadow: %p %p %s %i %i %i %i\n", widget, window, detail, x, y,
+ width, height);
diff --git a/x11-toolkits/gnome-themes-extras/pkg-plist b/x11-toolkits/gnome-themes-extras/pkg-plist
index 2a7cf25a3..e1d9519c4 100644
--- a/x11-toolkits/gnome-themes-extras/pkg-plist
+++ b/x11-toolkits/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