[kde-freebsd] Re: HEADS UP: GNOME 2.14 being merged into the tree (original) (raw)

michael johnson buhnux at gmail.com
Mon May 1 19:49:51 UTC 2006

On 5/1/06, Michael Nottebrock <lofi at 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. =) >> That's doable, I'll get right on it. > > Actually, I think it would be best to split the poppler port up one more > 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 at freebsd.org (/^ ^) | FreeBSD - The Power to Serve | http://www.freebsd.org \u/ | K Desktop Environment on FreeBSD | http://freebsd.kde.org

Index: Makefile =================================================================== 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= poppler PORTVERSION= 0.5.1 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= graphics print MASTERSITES= http://poppler.freedesktop.org/ @@ -17,7 +17,6 @@ LIBDEPENDS= cairo.2:${PORTSDIR}/graphics/cairo -CONFLICTS= xpdf-[0-9]* USEGMAKE= yes USEXPREFIX= yes GNUCONFIGURE= yes @@ -45,12 +44,17 @@ INSTALLWRKSRC= ${WRKSRC}/qt # blah.. USEQTVER can't be defined after bsd.port.pre.mk .include "${PORTSDIR}/Mk/bsd.kde.mk" +.elif ${SLAVEPORT}=="utils" +CONFIGUREARGS+=--enable-utils +CONFLICTS= xpdf-[0-9]* +BUILDWRKSRC= ${WRKSRC}/utils +INSTALLWRKSRC= ${WRKSRC}/utils _+MAN1= pdffonts.1 pdfimages.1 pdfinfo.1 _ + pdftohtml.1 pdftops.1 pdftotext.1 pdftoppm.1 .endif .else _CONFIGUREARGS+=--disable-poppler-glib --disable-poppler-qt _ - --disable-poppler-qt4 _-MAN1= 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 =================================================================== 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-utilsMakefile.in =================================================================== RCS file: files/patch-utilsMakefile.in diff -N files/patch-utilsMakefile.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-utilsMakefile.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 @@ + pdffontsOBJECTS = $(ampdffontsOBJECTS) + pdffontsLDADD = $(LDADD) + am_DEPENDENCIES1 = _+-pdffontsDEPENDENCIES = $(topbuilddir)/poppler/libpoppler.la _ +- $(am_DEPENDENCIES1) ++pdffontsDEPENDENCIES = $(am_DEPENDENCIES1) _+ ampdfimagesOBJECTS = pdfimages.$(OBJEXT) ImageOutputDev.$(OBJEXT) _ + $(am_objects1) + pdfimagesOBJECTS = $(ampdfimagesOBJECTS) + pdfimagesLDADD = $(LDADD) _+-pdfimagesDEPENDENCIES = $(topbuilddir)/poppler/libpoppler.la _ +- $(am_DEPENDENCIES1) ++pdfimagesDEPENDENCIES = $(am_DEPENDENCIES1) + ampdfinfoOBJECTS = pdfinfo.$(OBJEXT) $(am_objects1) + pdfinfoOBJECTS = $(ampdfinfoOBJECTS) + pdfinfoLDADD = $(LDADD) _+-pdfinfoDEPENDENCIES = $(topbuilddir)/poppler/libpoppler.la _ +- $(am_DEPENDENCIES1) ++pdfinfoDEPENDENCIES = $(am_DEPENDENCIES1) _+ ampdftohtmlOBJECTS = pdftohtml.$(OBJEXT) HtmlFonts.$(OBJEXT) _ + HtmlLinks.$(OBJEXT) HtmlOutputDev.$(OBJEXT) $(am_objects1) + pdftohtmlOBJECTS = $(ampdftohtmlOBJECTS) + pdftohtmlLDADD = $(LDADD) _+-pdftohtmlDEPENDENCIES = $(topbuilddir)/poppler/libpoppler.la _ +- $(am_DEPENDENCIES1) ++pdftohtmlDEPENDENCIES = $(am_DEPENDENCIES1) + am_pdftoppmSOURCESDIST = pdftoppm.cc parseargs.c parseargs.h _+ @BUILDSPLASHOUTPUTTRUE at ampdftoppmOBJECTS = pdftoppm.$(OBJEXT) _ + @BUILDSPLASHOUTPUTTRUE@ $(am_objects1) + pdftoppmOBJECTS = $(ampdftoppmOBJECTS) + pdftoppmLDADD = $(LDADD) _+-pdftoppmDEPENDENCIES = $(topbuilddir)/poppler/libpoppler.la _ +- $(am_DEPENDENCIES1) ++pdftoppmDEPENDENCIES = $(am_DEPENDENCIES1) + ampdftopsOBJECTS = pdftops.$(OBJEXT) $(am_objects1) + pdftopsOBJECTS = $(ampdftopsOBJECTS) + pdftopsLDADD = $(LDADD) _+-pdftopsDEPENDENCIES = $(topbuilddir)/poppler/libpoppler.la _ +- $(am_DEPENDENCIES1) ++pdftopsDEPENDENCIES = $(am_DEPENDENCIES1) + ampdftotextOBJECTS = pdftotext.$(OBJEXT) $(am_objects1) + pdftotextOBJECTS = $(ampdftotextOBJECTS) + pdftotextLDADD = $(LDADD) _+-pdftotextDEPENDENCIES = $(topbuilddir)/poppler/libpoppler.la _ +- $(am_DEPENDENCIES1) ++pdftotextDEPENDENCIES = $(am_DEPENDENCIES1) + DEFAULTINCLUDES = -I. -I$(srcdir) -I$(topbuilddir) -I$(topbuilddir)/poppler + depcomp = (SHELL)(SHELL) (SHELL)(topsrcdir)/depcomp + am_depfilesmaybe = depfiles +@@ -294,7 +287,7 @@ + $(UTILSCFLAGS) + _+ LDADD = _ _+- $(topbuilddir)/poppler/libpoppler.la _ _++ -lpoppler _ + $(UTILSLIBS) + +

More information about the freebsd-gnome mailing list