diff --git a/x11/gnome/librsvg/Makefile b/x11/gnome/librsvg/Makefile index 653cab43abf..d42da5628c7 100644 --- a/x11/gnome/librsvg/Makefile +++ b/x11/gnome/librsvg/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.157 2019/11/01 09:32:18 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.158 2019/11/16 17:43:48 ajacoutot Exp $ COMMENT= SAX-based render library for SVG files GNOME_PROJECT= librsvg -STABLE_VERSION= 2.47.0 +STABLE_VERSION= 2.47.1 OLD_VERSION= 2.40.20 DISTFILES= librsvg-${STABLE_VERSION}${EXTRACT_SUFX}:0 \ librsvg-${OLD_VERSION}${EXTRACT_SUFX}:1 @@ -15,7 +15,7 @@ MASTER_SITES1= ${MASTER_SITE_GNOME:=sources/${GNOME_PROJECT}/${OLD_VERSION:C/^( ### stable .if ${PROPERTIES:Mrust} -SHARED_LIBS += rsvg-2 39.1 # 48.0 +SHARED_LIBS += rsvg-2 39.2 # 48.0 GNOME_VERSION= ${STABLE_VERSION} BUILD_DEPENDS= lang/rust PKG_ARGS= -Dold=0 -Dstable=1 @@ -30,7 +30,8 @@ SHARED_LIBS += rsvg-2 38.2 # 42.20 GNOME_VERSION= ${OLD_VERSION} PATCH_LIST= old-patch-* PKG_ARGS= -Dold=1 -Dstable=0 -WANTLIB += ffi gmodule-2.0 pcre +WANTLIB += croco-0.6 ffi gmodule-2.0 pcre +LIB_DEPENDS += www/libcroco .endif CATEGORIES= devel graphics @@ -38,7 +39,7 @@ CATEGORIES= devel graphics # GPLv2/LGPLv2 PERMIT_PACKAGE= Yes -WANTLIB += X11 Xext Xrender c cairo croco-0.6 expat ffi fontconfig +WANTLIB += X11 Xext Xrender c cairo expat ffi fontconfig WANTLIB += freetype fribidi gdk_pixbuf-2.0 gio-2.0 glib-2.0 WANTLIB += gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 harfbuzz iconv WANTLIB += intl lzma m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre @@ -48,10 +49,9 @@ MODULES= x11/gnome MODGNOME_TOOLS= gobject-introspection vala -LIB_DEPENDS= devel/pango \ +LIB_DEPENDS += devel/pango \ graphics/gdk-pixbuf2 \ - textproc/libxml \ - www/libcroco + textproc/libxml CONFIGURE_STYLE= gnu CONFIGURE_ARGS= --disable-tools @@ -59,6 +59,8 @@ CONFIGURE_ARGS= --disable-tools # error: -Bsymbolic-functions requested but not supported by ld CONFIGURE_ARGS += --disable-Bsymbolic +DEBUG_PACKAGES= ${BUILD_PACKAGES} + post-patch: # permit patching libc-rs to support sparc64 (could be removed with libc>=0.2.63) -sed -i 's/"files":{[^}]*}/"files":{}/' \ diff --git a/x11/gnome/librsvg/distinfo b/x11/gnome/librsvg/distinfo index 5bfcbd90728..7d04495ed62 100644 --- a/x11/gnome/librsvg/distinfo +++ b/x11/gnome/librsvg/distinfo @@ -1,4 +1,4 @@ SHA256 (gnome/librsvg-2.40.20.tar.xz) = z/TdPDt4v+mdj8+tO4uh7uMomggjwOEY14EGvmuEySs= -SHA256 (gnome/librsvg-2.47.0.tar.xz) = JXVK2mYVMDvZM5rwVkX7JcFpszGZHBHdSgnagdmmWnw= +SHA256 (gnome/librsvg-2.47.1.tar.xz) = oVYZrzTV62krXTUAbPsZQN+Ntgj3aVUqGzUANe4muT4= SIZE (gnome/librsvg-2.40.20.tar.xz) = 1796376 -SIZE (gnome/librsvg-2.47.0.tar.xz) = 12822468 +SIZE (gnome/librsvg-2.47.1.tar.xz) = 13208528 diff --git a/x11/gnome/librsvg/pkg/PLIST b/x11/gnome/librsvg/pkg/PLIST index d37034e60a9..7dce0d45410 100644 --- a/x11/gnome/librsvg/pkg/PLIST +++ b/x11/gnome/librsvg/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.39 2019/09/05 21:01:22 sthen Exp $ +@comment $OpenBSD: PLIST,v 1.40 2019/11/16 17:43:48 ajacoutot Exp $ %%old%% %%stable%% @bin bin/rsvg-convert @@ -7,9 +7,9 @@ include/librsvg-2.0/librsvg/ include/librsvg-2.0/librsvg/librsvg-features.h include/librsvg-2.0/librsvg/rsvg-cairo.h include/librsvg-2.0/librsvg/rsvg.h -lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-svg.so +@so lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-svg.so lib/girepository-1.0/Rsvg-2.0.typelib -lib/librsvg-2.a +@static-lib lib/librsvg-2.a lib/librsvg-2.la @lib lib/librsvg-2.so.${LIBrsvg-2_VERSION} lib/pkgconfig/librsvg-2.0.pc