Date: Sat, 1 Mar 2003 18:32:26 -0500 From: The Anarcat <anarcat@anarcat.ath.cx> To: Joe Marcus Clarke <marcus@marcuscom.com> Cc: gnome@FreeBSD.ORG Subject: Re: Dia 0.91 RC4, mostly done Message-ID: <20030301233226.GN613@lenny.anarcat.ath.cx> In-Reply-To: <20030301172520.A1277@shumai.marcuscom.com> References: <20030301220959.GJ613@lenny.anarcat.ath.cx> <20030301171523.I1277@shumai.marcuscom.com> <20030301222445.GK613@lenny.anarcat.ath.cx> <20030301172520.A1277@shumai.marcuscom.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--PT0wT86ZVVq2zanE Content-Type: multipart/mixed; boundary="xn9xNsWbHJd/50IB" Content-Disposition: inline --xn9xNsWbHJd/50IB Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat Mar 01, 2003 at 05:26:14PM -0500, Joe Marcus Clarke wrote: > On Sat, 1 Mar 2003, The Anarcat wrote: >=20 > > On Sat Mar 01, 2003 at 05:16:24PM -0500, Joe Marcus Clarke wrote: > > > On Sat, 1 Mar 2003, The Anarcat wrote: > > > > > > > Hi. > > > > > > > > Is there someone else working on the port of the coming 0.91 Dia > > > > release? > > > > > > I was going to do it when the official release comes out. My > > > understanding is support will be going away for the GNOME 1 version, = so I > > > was going to do a replace in the tree (i.e. not create a dia2 or the > > > like). > > > > Agreed. I'm working on pre4 anyways, since I want to try it out right > > now. :) >=20 > Thanks! This will save me some time when it's officially released. There it is! With a cute screen shot showing anti-aliasing as the cherry on the top. :) http://anarcat.ath.cx/dia-0.91-pre4-preview.png I have been able to compile it, but I have to look through the dependency list which completely changed, as you can see on the picture. :( I think I'd need some help to figure that part out. There is info on what libs are required for dia at: http://www.lysator.liu.se/~alla/dia/faq.html#Compiling I don't really know how to fit this in freebsd's gnome schemes. My current patchset is attached. I can't work on that anymore today, I might be able to put some more work on this this week, but if you want to take it over, feel free. The install currently fails at: creating dia cp dia dia-bin gmake[2]: Entering directory `/usr/u/anarcat/dump/dia/work/dia-0.91-pre4/ap= p' /bin/sh ../mkinstalldirs /u/anarcat/bin /bin/sh ../libtool --mode=3Dinstall install -s -m 555 dia-bin /u/anarc= at/bin/dia-bin install -m 555 -s .libs/dia-bin /u/anarcat/bin/dia-bin install: .libs/dia-bin: No such file or directory gmake[2]: *** [install-binPROGRAMS] Error 71 gmake[2]: Leaving directory `/usr/u/anarcat/dump/dia/work/dia-0.91-pre4/app' gmake[1]: *** [install-am] Error 2 gmake[1]: Leaving directory `/usr/u/anarcat/dump/dia/work/dia-0.91-pre4/app' gmake: *** [install-recursive] Error 1 *** Error code 2 Stop in /usr/u/anarcat/dump/dia. lenny#=20 And that is pretty odd. Doing cp dia dia-bin in work/dia-0.91-pre4/app/.libs works, but I wonder why it doesn't work in the build itself. =3D=3D=3D> Registering installation for dia-0.91-pre4 lenny#=20 Groovy! Apart from the dia dia-bin bug above, the ports seems to compile cleanly and to go through the "make package deinstall reinstall deinstall ; pkg_add pkg.tgz" test correctly. Enjoy! A. --=20 Premature optimization is the root of all evil - Donald Knuth --xn9xNsWbHJd/50IB Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="dia-0.91-pre4.patch" Content-Transfer-Encoding: quoted-printable Only in /usr/ports/graphics/dia/files: patch-lib::charconv.c Only in /usr/ports/graphics/dia/files: patch-lib::font.c diff -ru /usr/ports/graphics/dia/Makefile ./Makefile --- /usr/ports/graphics/dia/Makefile Fri Sep 20 13:06:51 2002 +++ ./Makefile Sat Mar 1 16:45:13 2003 @@ -6,10 +6,10 @@ # =20 PORTNAME=3D dia -PORTVERSION=3D 0.90 +PORTVERSION=3D 0.91-pre4 CATEGORIES+=3D graphics gnome MASTER_SITES=3D ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR=3D sources/dia/0.90 +MASTER_SITE_SUBDIR=3D sources/dia/0.91 =20 MAINTAINER?=3D gnome@FreeBSD.org =20 @@ -21,7 +21,7 @@ USE_X_PREFIX=3D yes USE_GMAKE=3D yes USE_GNOMENG=3D yes -USE_GNOME=3D gnomeprefix gnomehack gnomelibs gdkpixbuf bonobo +USE_GNOME=3D gnomeprefix gnomehack USE_LIBTOOL=3D yes CONFIGURE_ARGS=3D --enable-gnome --enable-gnome-print --enable-bonobo \ --enable-freetype diff -ru /usr/ports/graphics/dia/distinfo ./distinfo --- /usr/ports/graphics/dia/distinfo Mon Jun 3 07:30:43 2002 +++ ./distinfo Sat Mar 1 16:43:36 2003 @@ -1 +1 @@ -MD5 (dia-0.90.tar.gz) =3D 62c80b2492e2b7d92bfbe360f46c157a +MD5 (dia-0.91-pre4.tar.gz) =3D 8d9f579801ff8905200bf62b3ba823d8 diff -ru /usr/ports/graphics/dia/files/patch-ad ./files/patch-ad --- /usr/ports/graphics/dia/files/patch-ad Fri Jul 12 08:05:25 2002 +++ ./files/patch-ad Sat Mar 1 16:51:16 2003 @@ -11,12 +11,3 @@ =20 # Always use our own libtool. LIBTOOL=3D'$(SHELL) $(top_builddir)/libtool' -@@ -7911,7 +7912,7 @@ -=20 -=20 - OLDCPPFLAGS=3D$CPPFLAGS --CPPFLAGS=3D"$CPPFLAGS `glib-config --cflags`" -+CPPFLAGS=3D"$CPPFLAGS `$GLIB_CONFIG --cflags`" -=20 -=20 - echo "$as_me:$LINENO: checking for nl_langinfo and CODESET" >&5 diff -ru /usr/ports/graphics/dia/files/patch-af ./files/patch-af --- /usr/ports/graphics/dia/files/patch-af Mon Jun 3 07:30:43 2002 +++ ./files/patch-af Sat Mar 1 16:53:16 2003 @@ -20,7 +20,7 @@ -@HAVE_BONOBO_FALSE@bin_PROGRAMS =3D dia$(EXEEXT) +@HAVE_BONOBO_TRUE@bin_PROGRAMS =3D dia-bin$(EXEEXT) dia-embedd$(EXEEXT) +@HAVE_BONOBO_FALSE@bin_PROGRAMS =3D dia-bin$(EXEEXT) - noinst_PROGRAMS =3D run_dia.sh run_diaconv.sh diaconv$(EXEEXT) + noinst_PROGRAMS =3D run_dia.sh PROGRAMS =3D $(bin_PROGRAMS) $(noinst_PROGRAMS) =20 @@ -532,6 +530,9 @@ diff -ru /usr/ports/graphics/dia/files/patch-objects::GRAFCET::boolequation= =2Ec ./files/patch-objects::GRAFCET::boolequation.c --- /usr/ports/graphics/dia/files/patch-objects::GRAFCET::boolequation.c Fr= i Jul 12 08:05:25 2002 +++ ./files/patch-objects::GRAFCET::boolequation.c Sat Mar 1 17:02:30 2003 @@ -1,21 +1,21 @@ =20 $FreeBSD: ports/graphics/dia/files/patch-objects::GRAFCET::boolequation.c,= v 1.1 2002/07/12 12:05:25 sobomax Exp $ =20 ---- objects/GRAFCET/boolequation.c 2002/07/12 11:18:01 1.1 -+++ objects/GRAFCET/boolequation.c 2002/07/12 11:24:38 -@@ -64,7 +64,7 @@ +--- objects/GRAFCET/boolequation.c.orig Mon Oct 7 19:09:05 2002 ++++ objects/GRAFCET/boolequation.c Sat Mar 1 16:59:45 2003 +@@ -58,7 +58,7 @@ =20 =20 /* utility */ --inline static gboolean isspecial(unichar c)=20 -+inline static gboolean dia_isspecial(unichar c)=20 +-inline static gboolean isspecial(gunichar c)=20 ++inline static gboolean dia_isspecial(gunichar c)=20 { switch (c) { case '!': -@@ -141,7 +141,7 @@ +@@ -136,7 +136,7 @@ + gchar *p1; c =3D g_utf8_get_char(*str); p1 =3D g_utf8_next_char(*str); - #endif - if (isspecial(c)) break; + if (dia_isspecial(c)) break; *str =3D p1; diff -ru /usr/ports/graphics/dia/pkg-plist ./pkg-plist --- /usr/ports/graphics/dia/pkg-plist Fri Jul 12 08:05:25 2002 +++ ./pkg-plist Sat Mar 1 18:09:57 2003 @@ -1,6 +1,5 @@ bin/dia bin/dia-bin -bin/dia-embedd lib/dia/libcgm_filter.so lib/dia/libchronogram_objects.so lib/dia/libcustom_objects.so @@ -20,8 +19,98 @@ lib/dia/libuml_objects.so lib/dia/libwpg_filter.so lib/dia/libxfig_filter.so +lib/dia/libbondgraph_objects.so +lib/dia/libdia.so +lib/dia/libmisc_objects.so +lib/dia/libpixbuf_filter.so +lib/dia/libxslt_filter.so share/gnome/apps/Applications/dia.desktop share/gnome/dia/dia_logo.png +share/gnome/dia/plugins/xslt/dia-uml2c++.xsl +share/gnome/dia/plugins/xslt/dia-uml2idl.xsl +share/gnome/dia/plugins/xslt/dia-uml2java.xsl +share/gnome/dia/plugins/xslt/dia-uml.xsl +share/gnome/dia/plugins/xslt/stylesheets.xml +share/gnome/dia/shapes/Assorted/arrow-chevron.png +share/gnome/dia/shapes/Assorted/arrow-chevron.shape +share/gnome/dia/shapes/Assorted/arrow-down.png +share/gnome/dia/shapes/Assorted/arrow-down.shape +share/gnome/dia/shapes/Assorted/arrow-left-notched.png +share/gnome/dia/shapes/Assorted/arrow-left-notched.shape +share/gnome/dia/shapes/Assorted/arrow-left-right-up.png +share/gnome/dia/shapes/Assorted/arrow-left-right-up.shape +share/gnome/dia/shapes/Assorted/arrow-left-right.png +share/gnome/dia/shapes/Assorted/arrow-left-right.shape +share/gnome/dia/shapes/Assorted/arrow-left-up.png +share/gnome/dia/shapes/Assorted/arrow-left-up.shape +share/gnome/dia/shapes/Assorted/arrow-left.png +share/gnome/dia/shapes/Assorted/arrow-left.shape +share/gnome/dia/shapes/Assorted/arrow-pentagon.png +share/gnome/dia/shapes/Assorted/arrow-pentagon.shape +share/gnome/dia/shapes/Assorted/arrow-quad.png +share/gnome/dia/shapes/Assorted/arrow-quad.shape +share/gnome/dia/shapes/Assorted/arrow-right-notched.png +share/gnome/dia/shapes/Assorted/arrow-right-notched.shape +share/gnome/dia/shapes/Assorted/arrow-right.png +share/gnome/dia/shapes/Assorted/arrow-right.shape +share/gnome/dia/shapes/Assorted/arrow-up-down-left.png +share/gnome/dia/shapes/Assorted/arrow-up-down-left.shape +share/gnome/dia/shapes/Assorted/arrow-up-down.png +share/gnome/dia/shapes/Assorted/arrow-up-down.shape +share/gnome/dia/shapes/Assorted/arrow-up.png +share/gnome/dia/shapes/Assorted/arrow-up.shape +share/gnome/dia/shapes/Assorted/circle-quarter.png +share/gnome/dia/shapes/Assorted/circle-quarter.shape +share/gnome/dia/shapes/Assorted/circle.png +share/gnome/dia/shapes/Assorted/circle.shape +share/gnome/dia/shapes/Assorted/cross-maltese.png +share/gnome/dia/shapes/Assorted/cross-maltese.shape +share/gnome/dia/shapes/Assorted/cross-swiss.png +share/gnome/dia/shapes/Assorted/cross-swiss.shape +share/gnome/dia/shapes/Assorted/diamond.png +share/gnome/dia/shapes/Assorted/diamond.shape +share/gnome/dia/shapes/Assorted/heart.png +share/gnome/dia/shapes/Assorted/heart.shape +share/gnome/dia/shapes/Assorted/heptagon.png +share/gnome/dia/shapes/Assorted/heptagon.shape +share/gnome/dia/shapes/Assorted/hexagon.png +share/gnome/dia/shapes/Assorted/hexagon.shape +share/gnome/dia/shapes/Assorted/moon-quarter.png +share/gnome/dia/shapes/Assorted/moon-quarter.shape +share/gnome/dia/shapes/Assorted/octagon.png +share/gnome/dia/shapes/Assorted/octagon.shape +share/gnome/dia/shapes/Assorted/parallelogram-horizontal.png +share/gnome/dia/shapes/Assorted/parallelogram-horizontal.shape +share/gnome/dia/shapes/Assorted/parallelogram-vertical.png +share/gnome/dia/shapes/Assorted/parallelogram-vertical.shape +share/gnome/dia/shapes/Assorted/pentagon.png +share/gnome/dia/shapes/Assorted/pentagon.shape +share/gnome/dia/shapes/Assorted/square.png +share/gnome/dia/shapes/Assorted/square.shape +share/gnome/dia/shapes/Assorted/star4.png +share/gnome/dia/shapes/Assorted/star4.shape +share/gnome/dia/shapes/Assorted/star4curved.png +share/gnome/dia/shapes/Assorted/star4curved.shape +share/gnome/dia/shapes/Assorted/star5.png +share/gnome/dia/shapes/Assorted/star5.shape +share/gnome/dia/shapes/Assorted/star6.png +share/gnome/dia/shapes/Assorted/star6.shape +share/gnome/dia/shapes/Assorted/star7.png +share/gnome/dia/shapes/Assorted/star7.shape +share/gnome/dia/shapes/Assorted/star8.png +share/gnome/dia/shapes/Assorted/star8.shape +share/gnome/dia/shapes/Assorted/star8curved.png +share/gnome/dia/shapes/Assorted/star8curved.shape +share/gnome/dia/shapes/Assorted/star8sharp.png +share/gnome/dia/shapes/Assorted/star8sharp.shape +share/gnome/dia/shapes/Assorted/sun.png +share/gnome/dia/shapes/Assorted/sun.shape +share/gnome/dia/shapes/Assorted/trapezoid.png +share/gnome/dia/shapes/Assorted/trapezoid.shape +share/gnome/dia/shapes/Assorted/triangle-isoceles.png +share/gnome/dia/shapes/Assorted/triangle-isoceles.shape +share/gnome/dia/shapes/Assorted/triangle-rightangle.png +share/gnome/dia/shapes/Assorted/triangle-rightangle.shape share/gnome/dia/shapes/Circuit/ground.shape share/gnome/dia/shapes/Circuit/ground.xpm share/gnome/dia/shapes/Circuit/hcapacitor.shape @@ -269,6 +358,8 @@ share/gnome/dia/shapes/Network/computer.xpm share/gnome/dia/shapes/Network/dat_external.shape share/gnome/dia/shapes/Network/dat_external.xpm +share/gnome/dia/shapes/Network/digitizing_board.shape +share/gnome/dia/shapes/Network/digitizing_board.png share/gnome/dia/shapes/Network/disc.shape share/gnome/dia/shapes/Network/disc.xpm share/gnome/dia/shapes/Network/diskette.shape @@ -299,6 +390,8 @@ share/gnome/dia/shapes/Network/pc_miditower.xpm share/gnome/dia/shapes/Network/pc_minitower.shape share/gnome/dia/shapes/Network/pc_minitower.xpm +share/gnome/dia/shapes/Network/plotter.shape +share/gnome/dia/shapes/Network/plotter.png share/gnome/dia/shapes/Network/printer.shape share/gnome/dia/shapes/Network/printer.xpm share/gnome/dia/shapes/Network/rj45plug.shape @@ -439,6 +532,12 @@ share/gnome/dia/shapes/sybase/rsm.xpm share/gnome/dia/shapes/sybase/stableq.shape share/gnome/dia/shapes/sybase/stableq.xpm +share/gnome/dia/sheets/Assorted.sheet +share/gnome/dia/sheets/ciscocomputer.sheet +share/gnome/dia/sheets/ciscohub.sheet +share/gnome/dia/sheets/ciscomisc.sheet +share/gnome/dia/sheets/cisconetwork.sheet +share/gnome/dia/sheets/ciscorouter.sheet share/gnome/dia/sheets/Circuit.sheet share/gnome/dia/sheets/Contact.sheet share/gnome/dia/sheets/EML.sheet @@ -511,6 +610,7 @@ @dirrm share/gnome/dia/sheets/GRAFCET @dirrm share/gnome/dia/sheets/ER @dirrm share/gnome/dia/sheets +@dirrm share/gnome/dia/shapes/Assorted @dirrm share/gnome/dia/shapes/sybase @dirrm share/gnome/dia/shapes/jigsaw @dirrm share/gnome/dia/shapes/SDL @@ -525,5 +625,7 @@ @dirrm share/gnome/dia/shapes/Civil @dirrm share/gnome/dia/shapes/Circuit @dirrm share/gnome/dia/shapes +@dirrm share/gnome/dia/plugins/xslt +@dirrm share/gnome/dia/plugins @dirrm share/gnome/dia @dirrm lib/dia --xn9xNsWbHJd/50IB-- --PT0wT86ZVVq2zanE Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (FreeBSD) iD8DBQE+YUMKttcWHAnWiGcRAk4tAJ4kZArhMT4tmWN2z9vZwz7Nh0BNSACdHq/R yANeFpVXEu6CRqg6l4zUBUU= =vbWs -----END PGP SIGNATURE----- --PT0wT86ZVVq2zanE-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-gnome" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030301233226.GN613>