diff options
| author | adam <adam@pkgsrc.org> | 2012-09-30 13:15:03 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2012-09-30 13:15:03 +0000 |
| commit | ccdc6619f92398eaba5524a233dfc5c17c56935b (patch) | |
| tree | 3e27c64bfdc7b649234a6391d6933060d664f147 | |
| parent | 8741b74b40e104c74ed6e2c6d5de99132cd084f2 (diff) | |
| download | pkgsrc-ccdc6619f92398eaba5524a233dfc5c17c56935b.tar.gz | |
Fix building with Clang
| -rw-r--r-- | misc/kdepimlibs4/Makefile | 4 | ||||
| -rw-r--r-- | misc/kdepimlibs4/patches/patch-kldap_ber.cpp | 30 |
2 files changed, 32 insertions, 2 deletions
diff --git a/misc/kdepimlibs4/Makefile b/misc/kdepimlibs4/Makefile index 57096463a6b..c7b99178bc2 100644 --- a/misc/kdepimlibs4/Makefile +++ b/misc/kdepimlibs4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2012/09/15 10:05:39 obache Exp $ +# $NetBSD: Makefile,v 1.38 2012/09/30 13:15:03 adam Exp $ DISTNAME= kdepimlibs-${_KDE_VERSION} PKGNAME= ${DISTNAME:S/-4/4-4/} @@ -12,7 +12,7 @@ CMAKE_DEPENDENCIES_REWRITE= _KDE_build/KDEPimLibsDependencies.cmake REPLACE_PERL+= mailtransport/kconf_update/migrate-transports.pl -BUILDLINK_API_DEPENDS.akonadi+= akonadi>=1.5.52 +BUILDLINK_API_DEPENDS.akonadi+= akonadi>=1.5.52 .include "../../meta-pkgs/kde4/kde4.mk" diff --git a/misc/kdepimlibs4/patches/patch-kldap_ber.cpp b/misc/kdepimlibs4/patches/patch-kldap_ber.cpp new file mode 100644 index 00000000000..42b95ff9557 --- /dev/null +++ b/misc/kdepimlibs4/patches/patch-kldap_ber.cpp @@ -0,0 +1,30 @@ +$NetBSD: patch-kldap_ber.cpp,v 1.1 2012/09/30 13:15:04 adam Exp $ + +Fix building with Clang. + +--- kldap/ber.cpp.orig 2012-09-30 12:13:44.000000000 +0000 ++++ kldap/ber.cpp +@@ -128,7 +128,11 @@ int Ber::printf( const QString &format, + { + char fmt[2]; + va_list args; ++#ifdef __clang__ ++ va_start ( args, format.unicode() ); ++#else + va_start ( args, format ); ++#endif + fmt[1] = '\0'; + + int i = 0, ret = 0; +@@ -233,7 +237,11 @@ int Ber::scanf( const QString &format, . + { + char fmt[2]; + va_list args; ++#ifdef __clang__ ++ va_start ( args, format.unicode() ); ++#else + va_start ( args, format ); ++#endif + fmt[1] = '\0'; + + int i = 0, ret = 0; |