1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-23 04:23:08 +00:00

Canonicalize librsvg dependency

- Use USE_GNOME=librsvg2 where possible
- Reduce scope of D18878
This commit is contained in:
Tobias Kortkamp 2019-09-13 12:44:02 +00:00
parent 72e206b848
commit 5fdbc9c995
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=511954
8 changed files with 13 additions and 14 deletions

View File

@ -162,8 +162,7 @@ RAW_IMPLIES= LCMS2
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

View File

@ -161,8 +161,7 @@ RAW_IMPLIES= LCMS2
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

View File

@ -17,6 +17,7 @@ OPTIONS_DEFINE= LIBRSVG2
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"

View File

@ -40,7 +40,7 @@ LIBWMF_CONFIGURE_WITH= libwmf
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

View File

@ -103,8 +103,8 @@ QT5_VARS_OFF= FORCE_IGNORE+="Qt5Widgets Qt5WebKitWidgets"
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

View File

@ -106,8 +106,8 @@ QT5_VARS_OFF= FORCE_IGNORE+="Qt5Widgets Qt5WebKitWidgets"
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

View File

@ -16,7 +16,6 @@ BUILD_DEPENDS= gawk:lang/gawk
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 @@ CONFIGURE_ARGS+=--with-pkglibdata
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

View File

@ -20,8 +20,9 @@ PORTDOCS= README CHANGES.ru README.ru
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