Page MenuHomeFreeBSD
Files F142624316

D18878.id66821.diff
No OneTemporary
Actions

D18878.id66821.diff
View Options

Index: Mk/Scripts/qa.sh
===================================================================
--- Mk/Scripts/qa.sh
+++ Mk/Scripts/qa.sh
@@ -420,6 +420,7 @@
elif [ ${pkg} = "devel/libIDL" ]; then warn "you need USE_GNOME+=libidl"
elif [ ${pkg} = "x11-fm/nautilus" ]; then warn "you need USE_GNOME+=nautilus3"
elif [ ${pkg} = "devel/ORBit2" ]; then warn "you need USE_GNOME+=orbit2"
+ elif [ ${pkg} = "graphics/librsvg2-rust" ]; then warn "you need USE_GNOME+=librsvg2"
# mate
# grep LIB_DEPENDS= Mk/Uses/mate.mk |sed -e 's|\(.*\)_LIB_DEPENDS.*:\(.*\)\/\(.*\)|elif [ ${pkg} = "\2/\3" ]; then warn "you need USE_MATE+=\1"|'
elif [ ${pkg} = "x11-fm/caja" ]; then warn "you need USE_MATE+=caja"
Index: Mk/Uses/gnome.mk
===================================================================
--- Mk/Uses/gnome.mk
+++ Mk/Uses/gnome.mk
@@ -265,7 +265,16 @@
vte3_LIB_DEPENDS= libvte-2.91.so:x11-toolkits/vte3
vte3_USE_GNOME_IMPL= gtk30
+# Use librsvg2-rust where lang/rust is available
+.if empty(ARCH:Naarch64:Narmv6:Narmv7:Namd64:Ni386:Npowerpc64)
+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
@@ -16,7 +16,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 \
@@ -56,8 +55,9 @@
SHEBANG_FILES= bin/shutter share/shutter/resources/system/upload_plugins/*.pm
SHUTTER_DESKTOP= share/applications/shutter.desktop
-USE_PERL5= run
USES= desktop-file-utils gettext-runtime gnome perl5 shebangfix
+USE_GNOME= librsvg2:run
+USE_PERL5= run
.include <bsd.port.options.mk>
Index: science/chemical-mime-data/Makefile
===================================================================
--- science/chemical-mime-data/Makefile
+++ science/chemical-mime-data/Makefile
@@ -10,11 +10,9 @@
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 gnome pathfix pkgconfig shared-mime-info \
tar:bzip2
-USE_GNOME= gnomemimedata intlhack libxslt:build
+USE_GNOME= gnomemimedata intlhack librsvg2:build libxslt: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 xorg
-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-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 xorg
USE_XORG= xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \

File Metadata

Mime Type
text/plain
Expires
Thu, Jan 22, 2:41 PM (4 h, 38 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27852558
Default Alt Text
D18878.id66821.diff (4 KB)

Event Timeline