Date: Fri, 16 Sep 2005 13:10:23 GMT From: Mikhail Teterin <mi+kde@aldan.algebra.com> To: gnome@FreeBSD.org Subject: Re: ports/85966: graphics/librsvg2 build failed with WITH_MOZILLA_PLUGIN=true and WITH_MOZILLA=firefox Message-ID: <200509161310.j8GDANea012592@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/85966; it has been noted by GNATS.
From: Mikhail Teterin <mi+kde@aldan.algebra.com>
To: bug-followup@freebsd.org, mistral@imasy.or.jp
Cc:
Subject: Re: ports/85966: graphics/librsvg2 build failed with WITH_MOZILLA_PLUGIN=true and WITH_MOZILLA=firefox
Date: Fri, 16 Sep 2005 09:08:59 -0400
--Boundary-00=_sPsKDyxrhDAMgvC
Content-Type: text/plain;
charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Yoshihiko!
Please, try the attached fix (and update) for librsvg2. Yours,
-mi
--Boundary-00=_sPsKDyxrhDAMgvC
Content-Type: text/x-diff;
charset="us-ascii";
name="librsvg.update"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="librsvg.update"
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/graphics/librsvg2/Makefile,v
retrieving revision 1.46
diff -U2 -r1.46 Makefile
--- Makefile 17 Mar 2005 17:23:42 -0000 1.46
+++ Makefile 16 Sep 2005 04:59:58 -0000
@@ -7,9 +7,8 @@
PORTNAME= librsvg2
-PORTVERSION= 2.9.5
-PORTREVISION= 2
+PORTVERSION= 2.11.1
CATEGORIES= graphics gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.9
+MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:R}
DISTNAME= librsvg-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -19,7 +18,7 @@
BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2
-LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \
- popt.0:${PORTSDIR}/devel/popt \
- croco-${CROCO_VERSION}.3:${PORTSDIR}/textproc/libcroco
+LIB_DEPENDS= freetype:${PORTSDIR}/print/freetype2 \
+ popt:${PORTSDIR}/devel/popt \
+ croco-${CROCO_VERSION}:${PORTSDIR}/textproc/libcroco
RUN_DEPENDS= ${X11BASE}/lib/gtk-2.0/${GTK_VERSION}/engines/libmetal.so:${PORTSDIR}/x11-themes/gtk-engines2
@@ -101,5 +100,7 @@
.if defined(WITH_MOZILLA_PLUGIN)
.if defined(WITH_MOZILLA) && ${WITH_MOZILLA}=="firefox"
- @${REINPLACE_CMD} -e 's|mozilla-|firefox-|g' ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e 's|mozilla-|firefox-|g' \
+ -e 's|\$$_mozilla_include_dir/nspr|${LOCALBASE}/include/nspr|' \
+ ${WRKSRC}/configure
.else
@${REINPLACE_CMD} -e 's|mozilla-plugin|mozilla-plugin${HEADERS_SUFX}|g' \
@@ -111,6 +112,7 @@
@${REINPLACE_CMD} -E -e 's|O2|O|g' ${WRKSRC}/Makefile
-.if defined(WITH_MOZILLA_PLUGIN)
post-install:
+ -${RMDIR} ${PREFIX}/share/doc/librsvg/html ${PREFIX}/share/doc/librsvg
+.if defined(WITH_MOZILLA_PLUGIN)
${MKDIR} ${PREFIX}/lib/browser_plugins
${INSTALL_PROGRAM} ${WRKSRC}/moz-plugin/.libs/libmozsvgdec.so \
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/graphics/librsvg2/distinfo,v
retrieving revision 1.15
diff -U2 -r1.15 distinfo
--- distinfo 12 Mar 2005 10:39:25 -0000 1.15
+++ distinfo 16 Sep 2005 04:59:58 -0000
@@ -1,2 +1,2 @@
-MD5 (gnome2/librsvg-2.9.5.tar.bz2) = 44799d75e940eb4150acdae4f63cbe2a
-SIZE (gnome2/librsvg-2.9.5.tar.bz2) = 392785
+MD5 (gnome2/librsvg-2.11.1.tar.bz2) = 28400811169e8ed3cc31b5bb0e9555af
+SIZE (gnome2/librsvg-2.11.1.tar.bz2) = 385534
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/graphics/librsvg2/pkg-plist,v
retrieving revision 1.13
diff -U2 -r1.13 pkg-plist
--- pkg-plist 12 Mar 2005 10:39:25 -0000 1.13
+++ pkg-plist 16 Sep 2005 04:59:58 -0000
@@ -3,5 +3,4 @@
include/librsvg-2/librsvg/librsvg-enum-types.h
include/librsvg-2/librsvg/librsvg-features.h
-include/librsvg-2/librsvg/rsvg-gz.h
include/librsvg-2/librsvg/rsvg.h
%%PLUGIN%%lib/browser_plugins/libmozsvgdec.so
@@ -10,24 +9,24 @@
lib/librsvg-2.a
lib/librsvg-2.so
-lib/librsvg-2.so.11
+lib/librsvg-2.so.13
libdata/pkgconfig/librsvg-2.0.pc
-share/doc/librsvg/html/home.png
-share/doc/librsvg/html/index.html
-share/doc/librsvg/html/index.sgml
-share/doc/librsvg/html/ix01.html
-share/doc/librsvg/html/left.png
-share/doc/librsvg/html/right.png
-share/doc/librsvg/html/rn01.html
-share/doc/librsvg/html/rn02.html
-share/doc/librsvg/html/rn03.html
-share/doc/librsvg/html/rsvg-Convenience-Functions.html
-share/doc/librsvg/html/rsvg-Core-API.html
-share/doc/librsvg/html/rsvg-Creating-a-SVGZ-reader.html
-share/doc/librsvg/html/rsvg.devhelp
-share/doc/librsvg/html/rsvg.html
-share/doc/librsvg/html/up.png
+@comment share/doc/librsvg/html/home.png
+@comment share/doc/librsvg/html/index.html
+@comment share/doc/librsvg/html/index.sgml
+@comment share/doc/librsvg/html/ix01.html
+@comment share/doc/librsvg/html/left.png
+@comment share/doc/librsvg/html/right.png
+@comment share/doc/librsvg/html/rn01.html
+@comment share/doc/librsvg/html/rn02.html
+@comment share/doc/librsvg/html/rn03.html
+@comment share/doc/librsvg/html/rsvg-Convenience-Functions.html
+@comment share/doc/librsvg/html/rsvg-Core-API.html
+@comment share/doc/librsvg/html/rsvg-Creating-a-SVGZ-reader.html
+@comment share/doc/librsvg/html/rsvg.devhelp
+@comment share/doc/librsvg/html/rsvg.html
+@comment share/doc/librsvg/html/up.png
+@comment @dirrm share/doc/librsvg/html
+@comment @dirrm share/doc/librsvg
share/gnome/pixmaps/svg-viewer.svg
-@dirrm share/doc/librsvg/html
-@dirrm share/doc/librsvg
@dirrm include/librsvg-2/librsvg
@dirrm include/librsvg-2
Index: files/patch-rsvg-paint-server.c
===================================================================
RCS file: files/patch-rsvg-paint-server.c
diff -N files/patch-rsvg-paint-server.c
--- files/patch-rsvg-paint-server.c 12 Mar 2005 10:39:25 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
---- rsvg-paint-server.c.orig Tue Jan 25 23:39:10 2005
-+++ rsvg-paint-server.c Tue Jan 25 23:39:19 2005
-@@ -84,10 +84,10 @@
- const RsvgPSCtx *ctx)
- {
- RsvgPaintServerSolid *z = (RsvgPaintServerSolid *)self;
-+ ArtPixMaxDepth color[3];
- guint32 rgb = z->rgb;
- if (z->currentcolour)
- rgb = rsvg_state_current(ctx->ctx)->current_color;
-- ArtPixMaxDepth color[3];
-
- color[0] = ART_PIX_MAX_FROM_8 (rgb >> 16);
- color[1] = ART_PIX_MAX_FROM_8 ((rgb >> 8) & 0xff);
Index: files/patch-rsvg-shapes.c
===================================================================
RCS file: files/patch-rsvg-shapes.c
diff -N files/patch-rsvg-shapes.c
--- files/patch-rsvg-shapes.c 12 Mar 2005 10:39:25 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
---- rsvg-shapes.c.orig Tue Jan 25 23:43:50 2005
-+++ rsvg-shapes.c Tue Jan 25 23:44:01 2005
-@@ -2579,10 +2579,10 @@
- const char * id, *value;
- double vbox_x = 0, vbox_y = 0, vbox_w = 0, vbox_h = 0;
- gboolean has_vbox = FALSE, overflow = 0;
-- id = NULL;
- RsvgDefsDrawableSvg * svg;
- RsvgDefsDrawableGroup * group;
- RsvgState state;
-+ id = NULL;
- rsvg_state_init(&state);
-
- if (rsvg_property_bag_size (atts))
--Boundary-00=_sPsKDyxrhDAMgvC--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200509161310.j8GDANea012592>