Date: Mon, 1 May 2006 15:49:35 -0400 From: "michael johnson" <buhnux@gmail.com> To: "Michael Nottebrock" <lofi@freebsd.org> Cc: ports@freebsd.org, gnome@freebsd.org, kde@freebsd.org Subject: Re: [kde-freebsd] Re: HEADS UP: GNOME 2.14 being merged into the tree Message-ID: <b2203fed0605011249u755d6d3eu52ae7b19b13c9852@mail.gmail.com> In-Reply-To: <44566555.7010503@freebsd.org> References: <1146349274.16564.18.camel@shumai.marcuscom.com> <200604301950.27364.andy@athame.co.uk> <b2203fed0604301032t1798001dpa7c88c9616c52533@mail.gmail.com> <44562619.3090403@freebsd.org> <op.s8vsu4xo9aq2h7@mezz.mezzweb.com> <44563C14.1050104@freebsd.org> <b2203fed0605010953o57c631d1ua74d743c4b7a9202@mail.gmail.com> <445641CC.809@freebsd.org> <44564523.10709@freebsd.org> <44566555.7010503@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 5/1/06, Michael Nottebrock <lofi@freebsd.org> wrote: > > Michael Nottebrock schrieb: > > Michael Nottebrock schrieb: > >> michael johnson schrieb: > >> > >>> kdegraphics depends on xpdf and gnome depends on poppler. > >>> and xpdf and poppler conflict. However, kdegraphics could > >>> depend on poppler, it is a dropin replacement for xpdf. =3D) > >> That's doable, I'll get right on it. > > > > Actually, I think it would be best to split the poppler port up one mor= e > > time and create an extra port for the command line utilities, that way > > the conflict with xpdf can be resolved completely. Should I work on > that? > > Here's a poppler-utils port and the necessary diff to graphics/poppler. > > I've fired up a test build of kdegraphics against poppler now and will > probably have confirmation on things working or not by tomorrow. I have an idea, why not just leave kdegraphics depending on xpdf and we can go ahead and commit poppler-utils and bump PORTREVISION on poppler so kde and gnome will get along again. This way nobody on the kde side will have to rebuild anything. Michael Cheers, > -- > ,_, | Michael Nottebrock | lofi@freebsd.org > (/^ ^\) | FreeBSD - The Power to Serve | http://www.freebsd.org > \u/ | K Desktop Environment on FreeBSD | http://freebsd.kde.org > > > Index: Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > RCS file: /home/pcvs/ports/graphics/poppler/Makefile,v > retrieving revision 1.15 > diff -u -r1.15 Makefile > --- Makefile 30 Apr 2006 00:46:55 -0000 1.15 > +++ Makefile 1 May 2006 19:40:38 -0000 > @@ -8,7 +8,7 @@ > > PORTNAME=3D poppler > PORTVERSION=3D 0.5.1 > -PORTREVISION?=3D 0 > +PORTREVISION?=3D 1 > CATEGORIES=3D graphics print > MASTER_SITES=3D http://poppler.freedesktop.org/ > > @@ -17,7 +17,6 @@ > > LIB_DEPENDS=3D cairo.2:${PORTSDIR}/graphics/cairo > > -CONFLICTS=3D xpdf-[0-9]* > USE_GMAKE=3D yes > USE_X_PREFIX=3D yes > GNU_CONFIGURE=3D yes > @@ -45,12 +44,17 @@ > INSTALL_WRKSRC=3D ${WRKSRC}/qt > # blah.. USE_QT_VER can't be defined after bsd.port.pre.mk > .include "${PORTSDIR}/Mk/bsd.kde.mk" > +.elif ${SLAVEPORT}=3D=3D"utils" > +CONFIGURE_ARGS+=3D--enable-utils > +CONFLICTS=3D xpdf-[0-9]* > +BUILD_WRKSRC=3D ${WRKSRC}/utils > +INSTALL_WRKSRC=3D ${WRKSRC}/utils > +MAN1=3D pdffonts.1 pdfimages.1 pdfinfo.1 \ > + pdftohtml.1 pdftops.1 pdftotext.1 pdftoppm.1 > .endif > .else > CONFIGURE_ARGS+=3D--disable-poppler-glib --disable-poppler-qt \ > - --disable-poppler-qt4 > -MAN1=3D pdffonts.1 pdfimages.1 pdfinfo.1 \ > - pdftohtml.1 pdftops.1 pdftotext.1 pdftoppm.1 > + --disable-poppler-qt4 --disable-utils > .endif > > post-patch: > Index: pkg-plist > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > RCS file: /home/pcvs/ports/graphics/poppler/pkg-plist,v > retrieving revision 1.6 > diff -u -r1.6 pkg-plist > --- pkg-plist 30 Apr 2006 00:46:55 -0000 1.6 > +++ pkg-plist 1 May 2006 19:40:38 -0000 > @@ -1,10 +1,3 @@ > -bin/pdffonts > -bin/pdfimages > -bin/pdfinfo > -bin/pdftohtml > -bin/pdftoppm > -bin/pdftops > -bin/pdftotext > include/poppler/Annot.h > include/poppler/Array.h > include/poppler/BaseFile.h > @@ -49,8 +42,8 @@ > include/poppler/Stream-CCITT.h > include/poppler/Stream.h > include/poppler/TextOutputDev.h > -include/poppler/UTF8.h > include/poppler/UGooString.h > +include/poppler/UTF8.h > include/poppler/UnicodeMap.h > include/poppler/UnicodeMapTables.h > include/poppler/UnicodeTypeTable.h > Index: files/patch-utils_Makefile.in > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > RCS file: files/patch-utils_Makefile.in > diff -N files/patch-utils_Makefile.in > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ files/patch-utils_Makefile.in 1 May 2006 19:40:38 -0000 > @@ -0,0 +1,61 @@ > +--- utils/Makefile.in.orig Mon May 1 21:28:04 2006 > ++++ utils/Makefile.in Mon May 1 21:28:59 2006 > +@@ -61,42 +61,35 @@ > + pdffonts_OBJECTS =3D $(am_pdffonts_OBJECTS) > + pdffonts_LDADD =3D $(LDADD) > + am__DEPENDENCIES_1 =3D > +-pdffonts_DEPENDENCIES =3D $(top_builddir)/poppler/libpoppler.la \ > +- $(am__DEPENDENCIES_1) > ++pdffonts_DEPENDENCIES =3D $(am__DEPENDENCIES_1) > + am_pdfimages_OBJECTS =3D pdfimages.$(OBJEXT) ImageOutputDev.$(OBJEXT) \ > + $(am__objects_1) > + pdfimages_OBJECTS =3D $(am_pdfimages_OBJECTS) > + pdfimages_LDADD =3D $(LDADD) > +-pdfimages_DEPENDENCIES =3D $(top_builddir)/poppler/libpoppler.la \ > +- $(am__DEPENDENCIES_1) > ++pdfimages_DEPENDENCIES =3D $(am__DEPENDENCIES_1) > + am_pdfinfo_OBJECTS =3D pdfinfo.$(OBJEXT) $(am__objects_1) > + pdfinfo_OBJECTS =3D $(am_pdfinfo_OBJECTS) > + pdfinfo_LDADD =3D $(LDADD) > +-pdfinfo_DEPENDENCIES =3D $(top_builddir)/poppler/libpoppler.la \ > +- $(am__DEPENDENCIES_1) > ++pdfinfo_DEPENDENCIES =3D $(am__DEPENDENCIES_1) > + am_pdftohtml_OBJECTS =3D pdftohtml.$(OBJEXT) HtmlFonts.$(OBJEXT) \ > + HtmlLinks.$(OBJEXT) HtmlOutputDev.$(OBJEXT) $(am__objects_1) > + pdftohtml_OBJECTS =3D $(am_pdftohtml_OBJECTS) > + pdftohtml_LDADD =3D $(LDADD) > +-pdftohtml_DEPENDENCIES =3D $(top_builddir)/poppler/libpoppler.la \ > +- $(am__DEPENDENCIES_1) > ++pdftohtml_DEPENDENCIES =3D $(am__DEPENDENCIES_1) > + am__pdftoppm_SOURCES_DIST =3D pdftoppm.cc parseargs.c parseargs.h > + @BUILD_SPLASH_OUTPUT_TRUE@am_pdftoppm_OBJECTS =3D pdftoppm.$(OBJEXT) \ > + @BUILD_SPLASH_OUTPUT_TRUE@ $(am__objects_1) > + pdftoppm_OBJECTS =3D $(am_pdftoppm_OBJECTS) > + pdftoppm_LDADD =3D $(LDADD) > +-pdftoppm_DEPENDENCIES =3D $(top_builddir)/poppler/libpoppler.la \ > +- $(am__DEPENDENCIES_1) > ++pdftoppm_DEPENDENCIES =3D $(am__DEPENDENCIES_1) > + am_pdftops_OBJECTS =3D pdftops.$(OBJEXT) $(am__objects_1) > + pdftops_OBJECTS =3D $(am_pdftops_OBJECTS) > + pdftops_LDADD =3D $(LDADD) > +-pdftops_DEPENDENCIES =3D $(top_builddir)/poppler/libpoppler.la \ > +- $(am__DEPENDENCIES_1) > ++pdftops_DEPENDENCIES =3D $(am__DEPENDENCIES_1) > + am_pdftotext_OBJECTS =3D pdftotext.$(OBJEXT) $(am__objects_1) > + pdftotext_OBJECTS =3D $(am_pdftotext_OBJECTS) > + pdftotext_LDADD =3D $(LDADD) > +-pdftotext_DEPENDENCIES =3D $(top_builddir)/poppler/libpoppler.la \ > +- $(am__DEPENDENCIES_1) > ++pdftotext_DEPENDENCIES =3D $(am__DEPENDENCIES_1) > + DEFAULT_INCLUDES =3D -I. -I$(srcdir) -I$(top_builddir) > -I$(top_builddir)/poppler > + depcomp =3D $(SHELL) $(top_srcdir)/depcomp > + am__depfiles_maybe =3D depfiles > +@@ -294,7 +287,7 @@ > + $(UTILS_CFLAGS) > + > + LDADD =3D \ > +- $(top_builddir)/poppler/libpoppler.la \ > ++ -lpoppler \ > + $(UTILS_LIBS) > + > + > > > >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?b2203fed0605011249u755d6d3eu52ae7b19b13c9852>