diff options
| author | joerg <joerg@pkgsrc.org> | 2013-01-17 15:54:36 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2013-01-17 15:54:36 +0000 |
| commit | df700df19b47c1cea46bdf8373e4625b21e1a797 (patch) | |
| tree | 152719623f9cf83fac011eff3b030ade3a0ecf8f | |
| parent | 806661f471de2a6b30f8c8807136c01701d43aef (diff) | |
| download | pkgsrc-df700df19b47c1cea46bdf8373e4625b21e1a797.tar.gz | |
Allow building with new fribidi.
| -rw-r--r-- | graphics/kdegraphics3/Makefile | 8 | ||||
| -rw-r--r-- | graphics/kdegraphics3/distinfo | 3 | ||||
| -rw-r--r-- | graphics/kdegraphics3/patches/patch-ksvg_impl_libs_libtext2path_src_Converter.cpp | 15 |
3 files changed, 24 insertions, 2 deletions
diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile index a983e1f8375..647afa0904b 100644 --- a/graphics/kdegraphics3/Makefile +++ b/graphics/kdegraphics3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.107 2012/12/16 01:52:16 obache Exp $ +# $NetBSD: Makefile,v 1.108 2013/01/17 15:54:36 joerg Exp $ DISTNAME= kdegraphics-${_KDE_VERSION} PKGREVISION= 25 @@ -16,6 +16,12 @@ REPLACE_PERL+= kghostview/update-to-xt-names.pl CONFIGURE_ARGS+= --with-imlib-config=${X11PREFIX}/bin +FRIBIDI_LIBS= ${TOOLS_PATH.pkg-config} --libs fribidi +FRIBIDI_CFLAGS= ${TOOLS_PATH.pkg-config} --cflags fribidi + +CONFIGURE_ARGS+= FRIBIDI_LIBS=${FRIBIDI_LIBS:sh:Q} +CONFIGURE_ARGS+= FRIBIDI_CFLAGS=${FRIBIDI_CFLAGS:sh:Q} + SUBST_CLASSES+= kpdf SUBST_STAGE.kpdf= post-patch SUBST_MESSAGE.kpdf= Fixing hardcoded paths. diff --git a/graphics/kdegraphics3/distinfo b/graphics/kdegraphics3/distinfo index 549f2bb8273..15f537cefb0 100644 --- a/graphics/kdegraphics3/distinfo +++ b/graphics/kdegraphics3/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.55 2012/06/26 17:47:26 dholland Exp $ +$NetBSD: distinfo,v 1.56 2013/01/17 15:54:36 joerg Exp $ SHA1 (kdegraphics-3.5.10.tar.bz2) = 9634e3ab364d017152fb6d636efad8811aeec6c3 RMD160 (kdegraphics-3.5.10.tar.bz2) = 94278e4419ab99885fc9efae9b6ba5ba787f831e @@ -10,5 +10,6 @@ SHA1 (patch-ad) = 39f9af23006d6b8d09d0ecbb83a382df6b125152 SHA1 (patch-ae) = e1984e4441f2b96697ae7a17028bd59bacb7cc73 SHA1 (patch-af) = ab3eff6677c889dfd48b5aa6cc116a0da18dd925 SHA1 (patch-kmrml_kmrml_mrml__elements.h) = f832e7e0a83cec5214630fd871f2d7132b5219d9 +SHA1 (patch-ksvg_impl_libs_libtext2path_src_Converter.cpp) = 4a1588c91e94c09862e2b702c357b8c478d19add SHA1 (patch-kviewshell_documentWidget.cpp) = 605f44f574f8391b9947424d0fee926bc2f7a494 SHA1 (patch-kviewshell_plugins_djvu_libdjvu_GContainer.h) = ba805be065c9eb38b865d969e291ab5bb49b1798 diff --git a/graphics/kdegraphics3/patches/patch-ksvg_impl_libs_libtext2path_src_Converter.cpp b/graphics/kdegraphics3/patches/patch-ksvg_impl_libs_libtext2path_src_Converter.cpp new file mode 100644 index 00000000000..264a5587120 --- /dev/null +++ b/graphics/kdegraphics3/patches/patch-ksvg_impl_libs_libtext2path_src_Converter.cpp @@ -0,0 +1,15 @@ +$NetBSD: patch-ksvg_impl_libs_libtext2path_src_Converter.cpp,v 1.1 2013/01/17 15:54:36 joerg Exp $ + +--- ksvg/impl/libs/libtext2path/src/Converter.cpp.orig 2013-01-15 14:39:45.000000000 +0000 ++++ ksvg/impl/libs/libtext2path/src/Converter.cpp +@@ -22,8 +22,8 @@ + + #include "myboost/shared_ptr.hpp" + #include <fontconfig/fontconfig.h> +-#include <fribidi/fribidi.h> +-#include <fribidi/fribidi_types.h> ++#include <fribidi.h> ++#include <fribidi-types.h> + + #include "Font.h" + #include "Glyph.h" |