On Fri, Feb 06, 2009 at 01:19:12AM +0000, Stefan Sperling wrote:
> Hi,
>
> it's currently not possible to use the extra themes (gtkrc files)
> provided in gtk2-clearlooks-engine with GNOME, because
> gtk2-clearlooks-engine conflicts with gtk-engines2, a dependency
> of GNOME. You cannot install both, and gtk-engines2 only provides
> the default gtkrc file for Clearlooks.
>
> The patch below splits the extra gtkrc files out into a separate
> -themes subpackage that has no overlapping files with gtk-engines2.
>
> With only this subpackage installed, extra Clearlooks themes are also
> available in GNOME (go to Preferences -> Appearance -> Theme,
> pick Clearlooks, click on Customize, and in the Controls tab
> you can pick the different styles).
>
> What do you think?
Oh, and while here, fix WANTLIB. New diff below.
Stefan
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/gtk2-clearlooks-engine/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile 15 Sep 2007 20:04:20 -0000 1.13
+++ Makefile 6 Feb 2009 01:23:24 -0000
@@ -1,10 +1,12 @@
# $OpenBSD: Makefile,v 1.13 2007/09/15 20:04:20 merdely Exp $
-COMMENT= GTK+ 2.x engine based on Bluecurve
+COMMENT-main= GTK+ 2.x engine based on Bluecurve
+COMMENT-themes= Themes for the Clearlooks GTK+ engine
VERSION= 0.6.2
DISTNAME= clearlooks-${VERSION}
-PKGNAME= gtk2-clearlooks-engine-${VERSION}p6
+PKGNAME-main= gtk2-clearlooks-engine-${VERSION}p6
+PKGNAME-themes= gtk2-clearlooks-themes-${VERSION}p6
CATEGORIES= x11
HOMEPAGE= http://clearlooks.sourceforge.net/
@@ -20,13 +22,16 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=clearlooks/}
EXTRACT_SUFX= .tar.bz2
-WANTLIB= ICE SM Xext Xrender freetype m X11 fontconfig z png \
- atk-1.0 gmodule-2.0 gobject-2.0 glib-2.0 \
- pango-1.0 pangoft2-1.0 pangocairo-1.0 cairo glitz
+WANTLIB-main= Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
+ Xi Xinerama Xrandr Xrender expat freetype fontconfig gio-2.0 \
+ iconv intl m X11 z pcre pixman-1 png atk-1.0 gmodule-2.0 \
+ gobject-2.0 glib-2.0 pango-1.0 pangoft2-1.0 pangocairo-1.0 \
+ cairo glitz
-MODULES= devel/gettext
-LIB_DEPENDS=
gdk-x11-2.0.>=600.10,gdk_pixbuf-2.0.>=600.10,gtk-x11-2.0.>=600.10::x11/gtk+2
+MODULES-main= devel/gettext
+LIB_DEPENDS-main=
gdk-x11-2.0.>=600.10,gdk_pixbuf-2.0.>=600.10,gtk-x11-2.0.>=600.10::x11/gtk+2
+MULTI_PACKAGES= -main -themes
SHARED_ONLY= Yes
USE_LIBTOOL= Yes
USE_X11= Yes
Index: pkg/DESCR
===================================================================
RCS file: pkg/DESCR
diff -N pkg/DESCR
--- pkg/DESCR 29 Oct 2005 11:26:25 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,3 +0,0 @@
-Clearlooks is a GTK+ 2.x engine written in C that transforms your
-GNOME/XFCE desktop into a modern looking environment. It is fast and
-easy on the eyes.
Index: pkg/DESCR-main
===================================================================
RCS file: pkg/DESCR-main
diff -N pkg/DESCR-main
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/DESCR-main 6 Feb 2009 01:23:24 -0000
@@ -0,0 +1,3 @@
+Clearlooks is a GTK+ 2.x engine written in C that transforms your
+GNOME/XFCE desktop into a modern looking environment. It is fast and
+easy on the eyes.
Index: pkg/DESCR-themes
===================================================================
RCS file: pkg/DESCR-themes
diff -N pkg/DESCR-themes
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/DESCR-themes 6 Feb 2009 01:23:24 -0000
@@ -0,0 +1,3 @@
+Extra themes for the Clearlooks GTK+ 2.x engine.
+This package does not conflict with gtk-engines2, so additional
+Clearlooks themes can be used in GNOME, too.
Index: pkg/PLIST
===================================================================
RCS file: pkg/PLIST
diff -N pkg/PLIST
--- pkg/PLIST 7 May 2007 08:45:22 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,56 +0,0 @@
-...@comment $OpenBSD: PLIST,v 1.4 2007/05/07 08:45:22 bernd Exp $
-...@conflict gtk-engines2-*
-...@conflict gnome-themes-*
-lib/gtk-2.0/2.10.0/engines/libclearlooks.a
-lib/gtk-2.0/2.10.0/engines/libclearlooks.la
-lib/gtk-2.0/2.10.0/engines/libclearlooks.so
-share/icons/Clearlooks/
-share/icons/Clearlooks/16x16/
-share/icons/Clearlooks/16x16/gtk/
-share/icons/Clearlooks/16x16/gtk/gtk-apply.png
-share/icons/Clearlooks/16x16/gtk/gtk-cancel.png
-share/icons/Clearlooks/16x16/gtk/gtk-go-back-ltr.png
-share/icons/Clearlooks/16x16/gtk/gtk-go-back-rtl.png
-share/icons/Clearlooks/16x16/gtk/gtk-go-down.png
-share/icons/Clearlooks/16x16/gtk/gtk-go-forward-ltr.png
-share/icons/Clearlooks/16x16/gtk/gtk-go-forward-rtl.png
-share/icons/Clearlooks/16x16/gtk/gtk-go-up.png
-share/icons/Clearlooks/16x16/gtk/gtk-goto-bottom.png
-share/icons/Clearlooks/16x16/gtk/gtk-goto-first-ltr.png
-share/icons/Clearlooks/16x16/gtk/gtk-goto-first-rtl.png
-share/icons/Clearlooks/16x16/gtk/gtk-goto-last-ltr.png
-share/icons/Clearlooks/16x16/gtk/gtk-goto-last-rtl.png
-share/icons/Clearlooks/16x16/gtk/gtk-goto-top.png
-share/icons/Clearlooks/16x16/gtk/gtk-refresh.png
-share/icons/Clearlooks/24x24/
-share/icons/Clearlooks/24x24/gtk/
-share/icons/Clearlooks/24x24/gtk/gtk-apply.png
-share/icons/Clearlooks/24x24/gtk/gtk-cancel.png
-share/icons/Clearlooks/24x24/gtk/gtk-go-back-ltr.png
-share/icons/Clearlooks/24x24/gtk/gtk-go-back-rtl.png
-share/icons/Clearlooks/24x24/gtk/gtk-go-down.png
-share/icons/Clearlooks/24x24/gtk/gtk-go-forward-ltr.png
-share/icons/Clearlooks/24x24/gtk/gtk-go-forward-rtl.png
-share/icons/Clearlooks/24x24/gtk/gtk-go-up.png
-share/icons/Clearlooks/24x24/gtk/gtk-goto-bottom.png
-share/icons/Clearlooks/24x24/gtk/gtk-goto-first-ltr.png
-share/icons/Clearlooks/24x24/gtk/gtk-goto-first-rtl.png
-share/icons/Clearlooks/24x24/gtk/gtk-goto-last-ltr.png
-share/icons/Clearlooks/24x24/gtk/gtk-goto-last-rtl.png
-share/icons/Clearlooks/24x24/gtk/gtk-goto-top.png
-share/icons/Clearlooks/24x24/gtk/gtk-ok.png
-share/icons/Clearlooks/24x24/gtk/gtk-refresh.png
-share/icons/Clearlooks/index.theme
-share/themes/Clearlooks/
-share/themes/Clearlooks-DeepSky/
-share/themes/Clearlooks-DeepSky/gtk-2.0/
-share/themes/Clearlooks-DeepSky/gtk-2.0/gtkrc
-share/themes/Clearlooks-Olive/
-share/themes/Clearlooks-Olive/gtk-2.0/
-share/themes/Clearlooks-Olive/gtk-2.0/gtkrc
-share/themes/Clearlooks-Quicksilver/
-share/themes/Clearlooks-Quicksilver/gtk-2.0/
-share/themes/Clearlooks-Quicksilver/gtk-2.0/gtkrc
-share/themes/Clearlooks/gtk-2.0/
-share/themes/Clearlooks/gtk-2.0/gtkrc
-share/themes/Clearlooks/index.theme
Index: pkg/PLIST-main
===================================================================
RCS file: pkg/PLIST-main
diff -N pkg/PLIST-main
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/PLIST-main 6 Feb 2009 01:23:24 -0000
@@ -0,0 +1,52 @@
+...@comment $OpenBSD: PLIST,v 1.4 2007/05/07 08:45:22 bernd Exp $
+...@conflict gtk-engines2-*
+...@conflict gnome-themes-*
+lib/gtk-2.0/
+lib/gtk-2.0/2.10.0/
+lib/gtk-2.0/2.10.0/engines/
+lib/gtk-2.0/2.10.0/engines/libclearlooks.a
+lib/gtk-2.0/2.10.0/engines/libclearlooks.la
+lib/gtk-2.0/2.10.0/engines/libclearlooks.so
+share/icons/
+share/icons/Clearlooks/
+share/icons/Clearlooks/16x16/
+share/icons/Clearlooks/16x16/gtk/
+share/icons/Clearlooks/16x16/gtk/gtk-apply.png
+share/icons/Clearlooks/16x16/gtk/gtk-cancel.png
+share/icons/Clearlooks/16x16/gtk/gtk-go-back-ltr.png
+share/icons/Clearlooks/16x16/gtk/gtk-go-back-rtl.png
+share/icons/Clearlooks/16x16/gtk/gtk-go-down.png
+share/icons/Clearlooks/16x16/gtk/gtk-go-forward-ltr.png
+share/icons/Clearlooks/16x16/gtk/gtk-go-forward-rtl.png
+share/icons/Clearlooks/16x16/gtk/gtk-go-up.png
+share/icons/Clearlooks/16x16/gtk/gtk-goto-bottom.png
+share/icons/Clearlooks/16x16/gtk/gtk-goto-first-ltr.png
+share/icons/Clearlooks/16x16/gtk/gtk-goto-first-rtl.png
+share/icons/Clearlooks/16x16/gtk/gtk-goto-last-ltr.png
+share/icons/Clearlooks/16x16/gtk/gtk-goto-last-rtl.png
+share/icons/Clearlooks/16x16/gtk/gtk-goto-top.png
+share/icons/Clearlooks/16x16/gtk/gtk-refresh.png
+share/icons/Clearlooks/24x24/
+share/icons/Clearlooks/24x24/gtk/
+share/icons/Clearlooks/24x24/gtk/gtk-apply.png
+share/icons/Clearlooks/24x24/gtk/gtk-cancel.png
+share/icons/Clearlooks/24x24/gtk/gtk-go-back-ltr.png
+share/icons/Clearlooks/24x24/gtk/gtk-go-back-rtl.png
+share/icons/Clearlooks/24x24/gtk/gtk-go-down.png
+share/icons/Clearlooks/24x24/gtk/gtk-go-forward-ltr.png
+share/icons/Clearlooks/24x24/gtk/gtk-go-forward-rtl.png
+share/icons/Clearlooks/24x24/gtk/gtk-go-up.png
+share/icons/Clearlooks/24x24/gtk/gtk-goto-bottom.png
+share/icons/Clearlooks/24x24/gtk/gtk-goto-first-ltr.png
+share/icons/Clearlooks/24x24/gtk/gtk-goto-first-rtl.png
+share/icons/Clearlooks/24x24/gtk/gtk-goto-last-ltr.png
+share/icons/Clearlooks/24x24/gtk/gtk-goto-last-rtl.png
+share/icons/Clearlooks/24x24/gtk/gtk-goto-top.png
+share/icons/Clearlooks/24x24/gtk/gtk-ok.png
+share/icons/Clearlooks/24x24/gtk/gtk-refresh.png
+share/icons/Clearlooks/index.theme
+share/themes/
+share/themes/Clearlooks/
+share/themes/Clearlooks/gtk-2.0/
+share/themes/Clearlooks/gtk-2.0/gtkrc
+share/themes/Clearlooks/index.theme
Index: pkg/PLIST-themes
===================================================================
RCS file: pkg/PLIST-themes
diff -N pkg/PLIST-themes
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/PLIST-themes 6 Feb 2009 01:23:24 -0000
@@ -0,0 +1,11 @@
+...@comment $OpenBSD$
+share/themes/
+share/themes/Clearlooks-DeepSky/
+share/themes/Clearlooks-DeepSky/gtk-2.0/
+share/themes/Clearlooks-DeepSky/gtk-2.0/gtkrc
+share/themes/Clearlooks-Olive/
+share/themes/Clearlooks-Olive/gtk-2.0/
+share/themes/Clearlooks-Olive/gtk-2.0/gtkrc
+share/themes/Clearlooks-Quicksilver/
+share/themes/Clearlooks-Quicksilver/gtk-2.0/
+share/themes/Clearlooks-Quicksilver/gtk-2.0/gtkrc
