Index: Mk/Scripts/qa.sh =================================================================== --- Mk/Scripts/qa.sh +++ Mk/Scripts/qa.sh @@ -396,6 +396,7 @@ ${pkg} = "www/libgtkhtml" -o \ ${pkg} = "x11-toolkits/libgtksourceviewmm" -o \ ${pkg} = "graphics/librsvg2" -o \ + ${pkg} = "graphics/librsvg2-rust" -o \ ${pkg} = "devel/libsigc++12" -o \ ${pkg} = "devel/libsigc++20" -o \ ${pkg} = "x11-toolkits/libwnck" -o \ Index: Mk/Uses/gnome.mk =================================================================== --- Mk/Uses/gnome.mk +++ Mk/Uses/gnome.mk @@ -271,7 +271,16 @@ vte3_LIB_DEPENDS= libvte-2.91.so:x11-toolkits/vte3 vte3_USE_GNOME_IMPL= gtk30 +# Use librsvg2-rust on tier 1 archs +.if ${ARCH} == amd64 || ${ARCH} == i386 +librsvg2_BUILD_DEPENDS= librsvg2-rust>=0:graphics/librsvg2-rust +librsvg2_LIB_DEPENDS= librsvg-2.so:graphics/librsvg2-rust +librsvg2_RUN_DEPENDS= librsvg2-rust>=0:graphics/librsvg2-rust +.else +librsvg2_BUILD_DEPENDS= librsvg2>=0:graphics/librsvg2 librsvg2_LIB_DEPENDS= librsvg-2.so:graphics/librsvg2 +librsvg2_RUN_DEPENDS= librsvg2>=0:graphics/librsvg2 +.endif librsvg2_USE_GNOME_IMPL=libgsf gdkpixbuf2 pango nautilus3_LIB_DEPENDS= libnautilus-extension.so:x11-fm/nautilus Index: deskutils/shutter/Makefile =================================================================== --- deskutils/shutter/Makefile +++ deskutils/shutter/Makefile @@ -14,7 +14,6 @@ LICENSE_COMB= multi RUN_DEPENDS= ImageMagick6>=6.9.3.1,1:graphics/ImageMagick6 \ - librsvg2>=2.40.6:graphics/librsvg2 \ p5-File-BaseDir>=0.03:devel/p5-File-BaseDir \ p5-File-Copy-Recursive>=0.38_1:devel/p5-File-Copy-Recursive \ p5-File-Spec-Native>=1.003_1:devel/p5-File-Spec-Native \ @@ -54,8 +53,9 @@ SHEBANG_FILES= bin/shutter share/shutter/resources/system/upload_plugins/*.pm SHUTTER_DESKTOP= share/applications/shutter.desktop +USES= desktop-file-utils gettext-runtime gnome perl5 shebangfix +USE_GNOME= librsvg2 USE_PERL5= run -USES= desktop-file-utils gettext-runtime perl5 shebangfix .include Index: graphics/ImageMagick6/Makefile =================================================================== --- graphics/ImageMagick6/Makefile +++ graphics/ImageMagick6/Makefile @@ -162,8 +162,7 @@ SVG_DESC= SVG vector image format support (via librsvg, implies the x11 option) SVG_CONFIGURE_WITH= rsvg -SVG_LIB_DEPENDS= librsvg-2.so:graphics/librsvg2 -SVG_USE= gnome=cairo,gdkpixbuf2 +SVG_USE= gnome=cairo,gdkpixbuf2,librsvg2 SVG_IMPLIES= X11 TIFF_CONFIGURE_WITH= tiff Index: graphics/ImageMagick7/Makefile =================================================================== --- graphics/ImageMagick7/Makefile +++ graphics/ImageMagick7/Makefile @@ -161,8 +161,7 @@ SVG_DESC= SVG vector image format support (via librsvg, implies the x11 option) SVG_CONFIGURE_WITH= rsvg -SVG_LIB_DEPENDS= librsvg-2.so:graphics/librsvg2 -SVG_USE= gnome=cairo,gdkpixbuf2 +SVG_USE= gnome=cairo,gdkpixbuf2,librsvg2 SVG_IMPLIES= X11 TIFF_CONFIGURE_WITH= tiff Index: graphics/fpc-rsvg/Makefile =================================================================== --- graphics/fpc-rsvg/Makefile +++ graphics/fpc-rsvg/Makefile @@ -17,6 +17,7 @@ LIBRSVG2_DESC= Install librsvg2 library OPTIONS_DEFAULT= LIBRSVG2 -LIBRSVG2_LIB_DEPENDS= librsvg-2.so:graphics/librsvg2 +LIBRSVG2_USES= gnome +LIBRSVG2_USE= GNOME=librsvg2 .include "${MASTERDIR}/Makefile" Index: graphics/gimageview/Makefile =================================================================== --- graphics/gimageview/Makefile +++ graphics/gimageview/Makefile @@ -40,7 +40,7 @@ LIBWMF_LIB_DEPENDS= libwmf.so:graphics/libwmf LIBRSVG2_CONFIGURE_WITH=librsvg -LIBRSVG2_LIB_DEPENDS= librsvg-2.so:graphics/librsvg2 +LIBRSVG2_USE= GNOME=librsvg2 LIBEXIF_CONFIGURE_ENABLE=exif # bundled exif is used LIBEXIF_BROKEN_OFF= does not build without libexif support Index: graphics/osg-devel/Makefile =================================================================== --- graphics/osg-devel/Makefile +++ graphics/osg-devel/Makefile @@ -103,8 +103,8 @@ SDL_USE= sdl=sdl SDL_VARS= FORCE_REQUIRE+=SDL SDL_VARS_OFF= FORCE_IGNORE+=SDL -SVG_LIB_DEPENDS= librsvg-2.so:graphics/librsvg2 -SVG_USE= gnome=cairo +SVG_USES= gnome +SVG_USE= gnome=cairo,librsvg2 SVG_VARS= FORCE_REQUIRE+=RSVG SVG_VARS_OFF= FORCE_IGNORE+=RSVG VNC_LIB_DEPENDS= libvncserver.so:net/libvncserver Index: graphics/osg/Makefile =================================================================== --- graphics/osg/Makefile +++ graphics/osg/Makefile @@ -106,8 +106,8 @@ SDL_USE= sdl=sdl SDL_VARS= FORCE_REQUIRE+=SDL SDL_VARS_OFF= FORCE_IGNORE+=SDL -SVG_LIB_DEPENDS= librsvg-2.so:graphics/librsvg2 -SVG_USE= gnome=cairo +SVG_USES= gnome +SVG_USE= gnome=cairo,librsvg2 SVG_VARS= FORCE_REQUIRE+=RSVG SVG_VARS_OFF= FORCE_IGNORE+=RSVG VNC_LIB_DEPENDS= libvncserver.so:net/libvncserver Index: multimedia/ffmpeg/Makefile =================================================================== --- multimedia/ffmpeg/Makefile +++ multimedia/ffmpeg/Makefile @@ -303,7 +303,8 @@ LIBBLURAY_CONFIGURE_ENABLE= libbluray # librsvg -LIBRSVG2_LIB_DEPENDS= librsvg-2.so:graphics/librsvg2 +LIBRSVG2_USES= gnome +LIBRSVG2_USE= GNOME=librsvg2 LIBRSVG2_CONFIGURE_ENABLE= librsvg # libxml Index: net-p2p/mldonkey/Makefile =================================================================== --- net-p2p/mldonkey/Makefile +++ net-p2p/mldonkey/Makefile @@ -68,11 +68,11 @@ .if ${PORT_OPTIONS:MGUI} BUILD_DEPENDS+= ${LOCALBASE}/lib/ocaml/site-lib/lablgtk2/lablrsvg.cma:x11-toolkits/ocaml-lablgtk2 -LIB_DEPENDS+= librsvg-2.so:graphics/librsvg2 CONFIGURE_ARGS+=--enable-gui=newgui2 # we don't need lablgtk as RUN dependency, but we need gtk+glib -USE_GNOME= gtk20 +USES+= gnome +USE_GNOME= gtk20 librsvg2 .endif # ${PORT_OPTIONS:MGUI} .if ${PORT_OPTIONS:MCORE} Index: science/chemical-mime-data/Makefile =================================================================== --- science/chemical-mime-data/Makefile +++ science/chemical-mime-data/Makefile @@ -10,10 +10,8 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Collection of chemical MIME types for UNIX desktops -BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/librsvg-2.0.pc:graphics/librsvg2 - USES= gettext-tools gmake pathfix pkgconfig tar:bzip2 shared-mime-info -USE_GNOME= gnomemimedata intlhack libxslt:build +USE_GNOME= gnomemimedata intlhack libxslt:build librsvg2:build GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-update-database CPPFLAGS+= -I${LOCALBASE}/include Index: www/midori/Makefile =================================================================== --- www/midori/Makefile +++ www/midori/Makefile @@ -12,8 +12,7 @@ LICENSE= LGPL21 MIT LICENSE_COMB= multi -BUILD_DEPENDS= rsvg-convert:graphics/librsvg2 \ - valac:lang/vala +BUILD_DEPENDS= valac:lang/vala LIB_DEPENDS= libnotify.so:devel/libnotify \ libjson-glib-1.0.so:devel/json-glib \ libsoup-2.4.so:devel/libsoup \ @@ -26,7 +25,8 @@ USES= cmake compiler:c++11-lang desktop-file-utils gettext gnome \ libarchive localbase:ldflags pkgconfig sqlite tar:bzip2 -USE_GNOME= cairo glib20 gtk30 intltool introspection libxml2 +USE_GNOME= cairo glib20 gtk30 intltool introspection librsvg2:build \ + libxml2 USE_XORG= xscrnsaver CFLAGS+= -Wno-return-type Index: x11-fm/librfm/Makefile =================================================================== --- x11-fm/librfm/Makefile +++ x11-fm/librfm/Makefile @@ -16,7 +16,6 @@ LIB_DEPENDS= libtubo.so:x11-fm/libtubo \ libdbh.so:databases/dbh \ libzip.so:archivers/libzip \ - librsvg-2.so:graphics/librsvg2 \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 @@ -26,7 +25,7 @@ INSTALLS_ICONS= yes USES= autoreconf gettext gnome gmake libtool:keepla pkgconfig tar:bzip2 GNU_CONFIGURE= yes -USE_GNOME= gtk20 intltool cairo libxml2 +USE_GNOME= gtk20 intltool cairo libxml2 librsvg2 USE_XORG+= x11 USE_LDCONFIG= yes INSTALL_TARGET= install-strip Index: x11-toolkits/gtk30/Makefile =================================================================== --- x11-toolkits/gtk30/Makefile +++ x11-toolkits/gtk30/Makefile @@ -27,13 +27,12 @@ libharfbuzz.so:print/harfbuzz RUN_DEPENDS+= hicolor-icon-theme>=0:misc/hicolor-icon-theme \ adwaita-icon-theme>=0:x11-themes/adwaita-icon-theme \ - at-spi2-atk>=0:accessibility/at-spi2-atk \ - librsvg2>=0:graphics/librsvg2 + at-spi2-atk>=0:accessibility/at-spi2-atk USE_PERL5= build USE_LDCONFIG= yes GNU_CONFIGURE= yes -USE_GNOME= atk cairo gdkpixbuf2 introspection:build pango +USE_GNOME= atk cairo gdkpixbuf2 introspection:build librsvg2:run pango USES= compiler:c11 gettext gmake gnome libtool localbase \ pathfix perl5 pkgconfig tar:xz USE_XORG= xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \ Index: x11/xxkb/Makefile =================================================================== --- x11/xxkb/Makefile +++ x11/xxkb/Makefile @@ -20,8 +20,9 @@ OPTIONS_DEFINE= LIBRSVG2 DOCS -LIBRSVG2_LIB_DEPENDS= librsvg-2.so:graphics/librsvg2 -LIBRSVG2_VARS= XMKMF_ARGS=-DWITH_SVG_SUPPORT +LIBRSVG2_USES= gnome +LIBRSVG2_USE= GNOME=librsvg2 +LIBRSVG2_VARS= XMKMF_ARGS=-DWITH_SVG_SUPPORT post-build: # Convert Russian language docs from archaic KOI8-R to modern UTF-8