Skip to content

Commit

Permalink
Fix building with Clang
Browse files Browse the repository at this point in the history
  • Loading branch information
adam committed Sep 30, 2012
1 parent 6821ec0 commit 8602c3d
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 2 deletions.
4 changes: 2 additions & 2 deletions misc/kdepimlibs4/Makefile
Original file line number Diff line number Diff line change
@@ -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/}
Expand All @@ -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"

Expand Down
30 changes: 30 additions & 0 deletions misc/kdepimlibs4/patches/patch-kldap_ber.cpp
Original file line number Diff line number Diff line change
@@ -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;

0 comments on commit 8602c3d

Please sign in to comment.