Wed Jun 16 23:11:48 2010 UTC ()
Fix build with attica-0.1.4, and depend on it.

Patch from https://trac.macports.org/ticket/24947 via markd.

While here, included desktopdb.mk and bump PKGREVISION.


(wiz)
diff -r1.9 -r1.10 pkgsrc/x11/kdebase-runtime4/Makefile
diff -r1.9 -r1.10 pkgsrc/x11/kdebase-runtime4/distinfo
diff -r0 -r1.1 pkgsrc/x11/kdebase-runtime4/patches/patch-aa
cvs diff -r1.9 -r1.10 pkgsrc/x11/kdebase-runtime4/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/kdebase-runtime4/Attic/Makefile 2010/06/13 22:45:46 1.9
+++ pkgsrc/x11/kdebase-runtime4/Attic/Makefile 2010/06/16 23:11:48 1.10
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.9 2010/06/13 22:45:46 wiz Exp $ 1# $NetBSD: Makefile,v 1.10 2010/06/16 23:11:48 wiz Exp $
2 2
3DISTNAME= kdebase-runtime-${_KDE_VERSION} 3DISTNAME= kdebase-runtime-${_KDE_VERSION}
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= x11 5CATEGORIES= x11
6COMMENT= Runtime requirements for the KDE integrated X11 desktop 6COMMENT= Runtime requirements for the KDE integrated X11 desktop
7 7
8.include "../../meta-pkgs/kde4/Makefile.kde4" 8.include "../../meta-pkgs/kde4/Makefile.kde4"
9 9
10# BUILD_MAKE_FLAGS+= VERBOSE=1 10# BUILD_MAKE_FLAGS+= VERBOSE=1
11CMAKE_ARGS+= -DWITH_PulseAudio:BOOL=off 11CMAKE_ARGS+= -DWITH_PulseAudio:BOOL=off
12 12
13DEPENDS+= htdig>=3.2.0:../../www/htdig-devel 13DEPENDS+= htdig>=3.2.0:../../www/htdig-devel
14DEPENDS+= oxygen-icons-[0-9]*:../../graphics/oxygen-icons 14DEPENDS+= oxygen-icons-[0-9]*:../../graphics/oxygen-icons
15 15
16.include "options.mk" 16.include "options.mk"
17 17
@@ -32,19 +32,21 @@ REPLACE_PERL+= \ @@ -32,19 +32,21 @@ REPLACE_PERL+= \
32 khelpcenter/searchhandlers/khc_mansearch.pl \ 32 khelpcenter/searchhandlers/khc_mansearch.pl \
33 kioslave/info/kde-info2html 33 kioslave/info/kde-info2html
34 34
35CONF_FILES+= ${PREFIX}/share/examples/kdebase-runtime4/kde-information.menu \ 35CONF_FILES+= ${PREFIX}/share/examples/kdebase-runtime4/kde-information.menu \
36 ${PKG_SYSCONFDIR}/xdg/menus/kde-information.menu 36 ${PKG_SYSCONFDIR}/xdg/menus/kde-information.menu
37 37
38INSTALLATION_DIRS+= ${PKGMANDIR}/man1 38INSTALLATION_DIRS+= ${PKGMANDIR}/man1
39 39
40.include "../../meta-pkgs/kde4/kde4.mk" 40.include "../../meta-pkgs/kde4/kde4.mk"
41 41
42.include "../../archivers/xz/buildlink3.mk" 42.include "../../archivers/xz/buildlink3.mk"
43.include "../../graphics/exiv2/buildlink3.mk" 43.include "../../graphics/exiv2/buildlink3.mk"
44.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 44.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 45BUILDLINK_ABI_DEPENDS.attica?= attica>=0.1.4
45.include "../../misc/attica/buildlink3.mk" 46.include "../../misc/attica/buildlink3.mk"
46.include "../../multimedia/xine-lib/buildlink3.mk" 47.include "../../multimedia/xine-lib/buildlink3.mk"
47.include "../../net/openslp/buildlink3.mk" 48.include "../../net/openslp/buildlink3.mk"
 49.include "../../sysutils/desktop-file-utils/desktopdb.mk"
48.include "../../x11/kdelibs4/buildlink3.mk" 50.include "../../x11/kdelibs4/buildlink3.mk"
49 51
50.include "../../mk/bsd.pkg.mk" 52.include "../../mk/bsd.pkg.mk"
cvs diff -r1.9 -r1.10 pkgsrc/x11/kdebase-runtime4/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/kdebase-runtime4/Attic/distinfo 2010/06/02 10:14:15 1.9
+++ pkgsrc/x11/kdebase-runtime4/Attic/distinfo 2010/06/16 23:11:48 1.10
@@ -1,15 +1,16 @@ @@ -1,15 +1,16 @@
1$NetBSD: distinfo,v 1.9 2010/06/02 10:14:15 markd Exp $ 1$NetBSD: distinfo,v 1.10 2010/06/16 23:11:48 wiz Exp $
2 2
3SHA1 (kdebase-runtime-4.4.4.tar.bz2) = dee7405e7410a7583567a0cc1e76d0d1b0e917ca 3SHA1 (kdebase-runtime-4.4.4.tar.bz2) = dee7405e7410a7583567a0cc1e76d0d1b0e917ca
4RMD160 (kdebase-runtime-4.4.4.tar.bz2) = 3e0f12cd5dd48cd487a08d98c55977dff18cbb38 4RMD160 (kdebase-runtime-4.4.4.tar.bz2) = 3e0f12cd5dd48cd487a08d98c55977dff18cbb38
5Size (kdebase-runtime-4.4.4.tar.bz2) = 7331851 bytes 5Size (kdebase-runtime-4.4.4.tar.bz2) = 7331851 bytes
 6SHA1 (patch-aa) = 724a7a644a4ec4fcfd744c18798d552098762c2a
6SHA1 (patch-ab) = f6af1c3e2502a91add9ceaa5375e76aee1e8c20c 7SHA1 (patch-ab) = f6af1c3e2502a91add9ceaa5375e76aee1e8c20c
7SHA1 (patch-ac) = 6bb21775f48d7a7155712524162a2de736391f40 8SHA1 (patch-ac) = 6bb21775f48d7a7155712524162a2de736391f40
8SHA1 (patch-ad) = 285fbd72b3be665776acc61a55f3d65f35e338c4 9SHA1 (patch-ad) = 285fbd72b3be665776acc61a55f3d65f35e338c4
9SHA1 (patch-ae) = b2728696f413b146831db62e422adcf73b132126 10SHA1 (patch-ae) = b2728696f413b146831db62e422adcf73b132126
10SHA1 (patch-af) = 1a8f15ac1c8dadd59fe00ca7ca304ba41521f896 11SHA1 (patch-af) = 1a8f15ac1c8dadd59fe00ca7ca304ba41521f896
11SHA1 (patch-ag) = 5ca9064552379792c32577875d07562d3f736ab7 12SHA1 (patch-ag) = 5ca9064552379792c32577875d07562d3f736ab7
12SHA1 (patch-ah) = edda8d4ff8d1dc4a1aef8aafb2dc9cc7c9b11502 13SHA1 (patch-ah) = edda8d4ff8d1dc4a1aef8aafb2dc9cc7c9b11502
13SHA1 (patch-ai) = 3742a827c4b18cde06828ff585d3130062803b9a 14SHA1 (patch-ai) = 3742a827c4b18cde06828ff585d3130062803b9a
14SHA1 (patch-aj) = 33db436fd3e4e3a0412c67aad7d2af09691f5ba4 15SHA1 (patch-aj) = 33db436fd3e4e3a0412c67aad7d2af09691f5ba4
15SHA1 (patch-kdesud) = d26cc003542eb1a2922eeff313037746bd907dea 16SHA1 (patch-kdesud) = d26cc003542eb1a2922eeff313037746bd907dea
File Added: pkgsrc/x11/kdebase-runtime4/patches/Attic/patch-aa
$NetBSD: patch-aa,v 1.1 2010/06/16 23:11:48 wiz Exp $

https://trac.macports.org/ticket/24947

--- attica/kdeplugin/kdeplatformdependent.h.orig	2009-12-31 13:28:04.000000000 +0000
+++ attica/kdeplugin/kdeplatformdependent.h
@@ -47,6 +47,11 @@ public:
     KdePlatformDependent();
     virtual ~KdePlatformDependent();
     virtual QList<QUrl> getDefaultProviderFiles() const;
+    virtual void addDefaultProviderFile(const QUrl& url){}
+    virtual void removeDefaultProviderFile(const QUrl& url){}
+    virtual void enableProvider(const QUrl& baseUrl, bool enabled) const{}
+    virtual bool isEnabled(const QUrl& baseUrl) const{return true;}
+
     virtual QNetworkReply* post(const QNetworkRequest& request, const QByteArray& data);
     virtual QNetworkReply* post(const QNetworkRequest& request, QIODevice* data);
     virtual QNetworkReply* get(const QNetworkRequest& request);