Tue Jan 17 22:40:38 2012 UTC ()
Pullup ticket #3652 - requested by sbd
x11/kdebase-workspace4: build fix

Revisions pulled up:
- x11/kdebase-workspace4/Makefile                               1.34 via patch
- x11/kdebase-workspace4/PLIST.Linux                            1.1
- x11/kdebase-workspace4/distinfo                               1.19
- x11/kdebase-workspace4/patches/patch-plasma_generic_dataengines_rss_CMakeLists.txt 1.1

---
   Module Name:	pkgsrc
   Committed By:	sbd
   Date:		Tue Jan 17 00:44:56 UTC 2012

   Modified Files:
   	pkgsrc/x11/kdebase-workspace4: distinfo
   Added Files:
   	pkgsrc/x11/kdebase-workspace4/patches:
   	    patch-plasma_generic_dataengines_rss_CMakeLists.txt

   Log Message:
   Fix build with gcc45 and current boost libs

---
   Module Name:	pkgsrc
   Committed By:	sbd
   Date:		Tue Jan 17 00:57:55 UTC 2012

   Modified Files:
   	pkgsrc/x11/kdebase-workspace4: Makefile
   Added Files:
   	pkgsrc/x11/kdebase-workspace4: PLIST.Linux

   Log Message:
   Add PLIST.Linux for Linux only files.

   Bump PKGREVISION.


(tron)
diff -r1.31 -r1.31.2.1 pkgsrc/x11/kdebase-workspace4/Makefile
diff -r0 -r1.1.2.2 pkgsrc/x11/kdebase-workspace4/PLIST.Linux
diff -r1.18 -r1.18.2.1 pkgsrc/x11/kdebase-workspace4/distinfo
diff -r0 -r1.1.2.2 pkgsrc/x11/kdebase-workspace4/patches/patch-plasma_generic_dataengines_rss_CMakeLists.txt

cvs diff -r1.31 -r1.31.2.1 pkgsrc/x11/kdebase-workspace4/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/kdebase-workspace4/Attic/Makefile 2011/11/19 21:12:05 1.31
+++ pkgsrc/x11/kdebase-workspace4/Attic/Makefile 2012/01/17 22:40:37 1.31.2.1
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.31 2011/11/19 21:12:05 markd Exp $ 1# $NetBSD: Makefile,v 1.31.2.1 2012/01/17 22:40:37 tron Exp $
2 2
3DISTNAME= kdebase-workspace-${_KDE_VERSION} 3DISTNAME= kdebase-workspace-${_KDE_VERSION}
4PKGREVISION= 4 4PKGREVISION= 5
5CATEGORIES= x11 5CATEGORIES= x11
6COMMENT= base workspace for the KDE 4 integrated X11 desktop 6COMMENT= base workspace for the KDE 4 integrated X11 desktop
7 7
8.include "../../meta-pkgs/kde4/Makefile.kde4" 8.include "../../meta-pkgs/kde4/Makefile.kde4"
9 9
10DISTFILES= ${DEFAULT_DISTFILES} Daemon.png Daemon.README 10DISTFILES= ${DEFAULT_DISTFILES} Daemon.png Daemon.README
11DISTFILES+= NetBSD-flag-1.0.png 11DISTFILES+= NetBSD-flag-1.0.png
12SITES.Daemon.png= ${MASTER_SITE_LOCAL} 12SITES.Daemon.png= ${MASTER_SITE_LOCAL}
13SITES.Daemon.README= ${MASTER_SITE_LOCAL} 13SITES.Daemon.README= ${MASTER_SITE_LOCAL}
14SITES.NetBSD-flag-1.0.png= ${MASTER_SITE_LOCAL} 14SITES.NetBSD-flag-1.0.png= ${MASTER_SITE_LOCAL}
15 15
16EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} 16EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
17 17

File Added: pkgsrc/x11/kdebase-workspace4/Attic/PLIST.Linux
@comment $NetBSD: PLIST.Linux,v 1.1.2.2 2012/01/17 22:40:37 tron Exp $
bin/solid-bluetooth
bin/solid-network
bin/solid-powermanagement
lib/kde4/kcm_joystick.so
lib/kde4/kded_networkstatus.so
lib/kde4/solid_hal_power.so
share/kde4/services/joystick.desktop
share/kde4/services/kded/networkstatus.desktop
share/kde4/services/solidbackends/solid_hal_power.desktop

cvs diff -r1.18 -r1.18.2.1 pkgsrc/x11/kdebase-workspace4/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/kdebase-workspace4/Attic/distinfo 2011/11/19 21:12:05 1.18
+++ pkgsrc/x11/kdebase-workspace4/Attic/distinfo 2012/01/17 22:40:37 1.18.2.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.18 2011/11/19 21:12:05 markd Exp $ 1$NetBSD: distinfo,v 1.18.2.1 2012/01/17 22:40:37 tron Exp $
2 2
3SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b 3SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b
4RMD160 (Daemon.README) = 39edd92ed4314397080f32a8caff0ac3f716ecf4 4RMD160 (Daemon.README) = 39edd92ed4314397080f32a8caff0ac3f716ecf4
5Size (Daemon.README) = 2191 bytes 5Size (Daemon.README) = 2191 bytes
6SHA1 (Daemon.png) = e77a42c644beecd66c4b95c0ae68c08c728a4e6d 6SHA1 (Daemon.png) = e77a42c644beecd66c4b95c0ae68c08c728a4e6d
7RMD160 (Daemon.png) = eb317dc7ac501ee03aac1276856eee14674e3da7 7RMD160 (Daemon.png) = eb317dc7ac501ee03aac1276856eee14674e3da7
8Size (Daemon.png) = 15725 bytes 8Size (Daemon.png) = 15725 bytes
9SHA1 (NetBSD-flag-1.0.png) = a9cf264a52ae0a602eec956d91222e299c7dee5c 9SHA1 (NetBSD-flag-1.0.png) = a9cf264a52ae0a602eec956d91222e299c7dee5c
10RMD160 (NetBSD-flag-1.0.png) = 2eac20df70396169819059a704e6a85ae10234b0 10RMD160 (NetBSD-flag-1.0.png) = 2eac20df70396169819059a704e6a85ae10234b0
11Size (NetBSD-flag-1.0.png) = 4532 bytes 11Size (NetBSD-flag-1.0.png) = 4532 bytes
12SHA1 (kdebase-workspace-4.5.5.tar.bz2) = 38457b606bfc0b39842fb451566ddf49d145da82 12SHA1 (kdebase-workspace-4.5.5.tar.bz2) = 38457b606bfc0b39842fb451566ddf49d145da82
13RMD160 (kdebase-workspace-4.5.5.tar.bz2) = 351f05ae6a1b67b35de7460e1e4353ba3d16720e 13RMD160 (kdebase-workspace-4.5.5.tar.bz2) = 351f05ae6a1b67b35de7460e1e4353ba3d16720e
14Size (kdebase-workspace-4.5.5.tar.bz2) = 65688854 bytes 14Size (kdebase-workspace-4.5.5.tar.bz2) = 65688854 bytes
@@ -21,13 +21,14 @@ SHA1 (patch-af) = 00f4fd7dff0e44af433e52 @@ -21,13 +21,14 @@ SHA1 (patch-af) = 00f4fd7dff0e44af433e52
21SHA1 (patch-ag) = 415b06854b02d8dd0e2807d9c02a5cc754b59540 21SHA1 (patch-ag) = 415b06854b02d8dd0e2807d9c02a5cc754b59540
22SHA1 (patch-ah) = e4569e0671c55e990cbc0913e5abaead046a8e71 22SHA1 (patch-ah) = e4569e0671c55e990cbc0913e5abaead046a8e71
23SHA1 (patch-bb) = 3652162d6419963fdfcd952af116a0e944ad1618 23SHA1 (patch-bb) = 3652162d6419963fdfcd952af116a0e944ad1618
24SHA1 (patch-bc) = c4fabab37cc4cb70b974a9455c2d640b3bd63fd7 24SHA1 (patch-bc) = c4fabab37cc4cb70b974a9455c2d640b3bd63fd7
25SHA1 (patch-bd) = 9d02eaa299847ac32a128696bb6d35f73bae0551 25SHA1 (patch-bd) = 9d02eaa299847ac32a128696bb6d35f73bae0551
26SHA1 (patch-be) = e58dc4a0a7be7350251f26de34a8949e7508c983 26SHA1 (patch-be) = e58dc4a0a7be7350251f26de34a8949e7508c983
27SHA1 (patch-bo) = e682d488c61ca2540ed4b2112c9bffc45bbe5e8d 27SHA1 (patch-bo) = e682d488c61ca2540ed4b2112c9bffc45bbe5e8d
28SHA1 (patch-ca) = 61b886388aa5d0831581eacb7db79de0ae5eaf80 28SHA1 (patch-ca) = 61b886388aa5d0831581eacb7db79de0ae5eaf80
29SHA1 (patch-cb) = 8bfcc8b7e91eafd6b444f4103d3860fb6434a535 29SHA1 (patch-cb) = 8bfcc8b7e91eafd6b444f4103d3860fb6434a535
30SHA1 (patch-cc) = f0c92eb5edc2690008d028652820cad77bf50b07 30SHA1 (patch-cc) = f0c92eb5edc2690008d028652820cad77bf50b07
31SHA1 (patch-cd) = c9e7b32b39b8191f5f54a799bdfa7009136429f9 31SHA1 (patch-cd) = c9e7b32b39b8191f5f54a799bdfa7009136429f9
32SHA1 (patch-ce) = b02c04dae0005bec33a13ecf09254d35a0e4cd0b 32SHA1 (patch-ce) = b02c04dae0005bec33a13ecf09254d35a0e4cd0b
33SHA1 (patch-kcheckpass_checkpass_pam.c) = 7c897fe7fa078a7027a08de5de5ad4c17369f0df 33SHA1 (patch-kcheckpass_checkpass_pam.c) = 7c897fe7fa078a7027a08de5de5ad4c17369f0df
 34SHA1 (patch-plasma_generic_dataengines_rss_CMakeLists.txt) = 6a12cb3cb54a8b1899f29e7f50a1171862dce66e

File Added: pkgsrc/x11/kdebase-workspace4/patches/Attic/patch-plasma_generic_dataengines_rss_CMakeLists.txt
$NetBSD: patch-plasma_generic_dataengines_rss_CMakeLists.txt,v 1.1.2.2 2012/01/17 22:40:38 tron Exp $

--- plasma/generic/dataengines/rss/CMakeLists.txt.orig	2009-09-16 11:40:54.000000000 +0000
+++ plasma/generic/dataengines/rss/CMakeLists.txt
@@ -2,6 +2,8 @@ find_package(Boost REQUIRED)
 
 include_directories(${Boost_INCLUDE_DIR} ${KDEPIMLIBS_INCLUDE_DIR})
 
+add_definitions(${KDE4_ENABLE_EXCEPTIONS})
+
 set(rss_engine_SRCS
     rss.cpp
 )