Hi.
I'd like to remove the the rsvg gtk+2 theme bundled with librsvg. It's
but ugly and more a proof of concept than anything else (I doubt anyone
is using it). However, it will also remove the rsvg and rsvg-view
utilities (which I doubt most people use).
I need this for the ongoing gtk+3/gnome3/... development where I don't
want librsvg to depends on gtk+2 _and_ gtk+3.
If anyone of you guys cares about these 2 utilities, please speak up or
I'll commit the following diff within the next day.
(the other solution would be MULTI_PACKAGES but that would just add
unneeded complexity)
Thanks.
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/gnome/librsvg/Makefile,v
retrieving revision 1.60
diff -u -u -r1.60 Makefile
--- Makefile 4 Apr 2011 06:26:03 -0000 1.60
+++ Makefile 4 Apr 2011 08:59:23 -0000
@@ -5,6 +5,8 @@
GNOME_PROJECT= librsvg
GNOME_VERSION= 2.34.0
+REVISION= 0
+
SHARED_LIBS += rsvg-2 28.0 # .34.0
CATEGORIES= devel
@@ -15,13 +17,12 @@
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
-WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig
-WANTLIB += freetype gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
-WANTLIB += gthread-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 croco-0.6
-WANTLIB += pcre pixman-1 png pthread pthread-stubs xcb xml2 z
-WANTLIB += xcb-render gdk-x11-2.0 gdk_pixbuf-2.0
-WANTLIB += gtk-x11-2.0 GL Xxf86vm drm xcb-shm
+WANTLIB += GL X11 Xau Xdamage Xdmcp Xext Xfixes Xrender Xxf86vm
+WANTLIB += c cairo croco-0.6 drm expat fontconfig freetype gdk_pixbuf-2.0
+WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
+WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
+WANTLIB += png pthread pthread-stubs xcb xcb-render xcb-shm xml2
+WANTLIB += z
MODULES= devel/gettext \
x11/gnome \
@@ -35,7 +36,7 @@
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--disable-gtk-doc \
- --enable-gtk-theme \
+ --disable-gtk-theme \
--with-svgz \
--with-croco
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- patches/patch-configure 4 Apr 2011 06:26:03 -0000 1.10
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-configure,v 1.10 2011/04/04 06:26:03 ajacoutot Exp $
---- configure.orig Mon Apr 4 08:08:14 2011
-+++ configure Mon Apr 4 08:09:08 2011
-@@ -13014,7 +13014,8 @@ fi
- fi
- fi
-
--
-+# XXX force disable gtk+3
-+have_gtk_3=no
-
-
- if test "$enable_gtk_theme" = "yes"; then
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/gnome/librsvg/pkg/PLIST,v
retrieving revision 1.22
diff -u -u -r1.22 PLIST
--- pkg/PLIST 30 Sep 2010 07:23:47 -0000 1.22
+++ pkg/PLIST 4 Apr 2011 08:59:23 -0000
@@ -1,7 +1,5 @@
@comment $OpenBSD: PLIST,v 1.22 2010/09/30 07:23:47 ajacoutot Exp $
-bin/rsvg
@bin bin/rsvg-convert
-@bin bin/rsvg-view
include/librsvg-2.0/
include/librsvg-2.0/librsvg/
include/librsvg-2.0/librsvg/librsvg-enum-types.h
@@ -11,16 +9,10 @@
@comment lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-svg.a
@comment lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-svg.la
lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-svg.so
-@comment lib/gtk-2.0/2.10.0/engines/libsvg.a
-@comment lib/gtk-2.0/2.10.0/engines/libsvg.la
-lib/gtk-2.0/2.10.0/engines/libsvg.so
-@comment lib/gtk-3.0/
-@comment lib/gtk-3.0/engines/
lib/librsvg-2.a
lib/librsvg-2.la
@lib lib/librsvg-2.so.${LIBrsvg-2_VERSION}
lib/pkgconfig/librsvg-2.0.pc
-@man man/man1/rsvg.1
share/gtk-doc/html/rsvg-2.0/
share/gtk-doc/html/rsvg-2.0/RsvgHandle.html
share/gtk-doc/html/rsvg-2.0/annotation-glossary.html
@@ -50,14 +42,5 @@
share/gtk-doc/html/rsvg-2.0/up.png
share/pixmaps/
share/pixmaps/svg-viewer.svg
-share/themes/bubble/
-share/themes/bubble/gtk-2.0/
-share/themes/bubble/gtk-2.0/blue.svg
-share/themes/bubble/gtk-2.0/green.svg
-share/themes/bubble/gtk-2.0/gtkrc
-share/themes/bubble/gtk-2.0/orange.svg
-share/themes/bubble/gtk-2.0/purple.svg
-share/themes/bubble/gtk-2.0/red.svg
-@comment share/themes/bubble/gtk-3.0/
@exec %D/bin/gdk-pixbuf-query-loaders --update-cache
@unexec-delete %D/bin/gdk-pixbuf-query-loaders --update-cache
--
Antoine
