diff options
9 files changed, 126 insertions, 2 deletions
diff --git a/x11/kde-workspace4/Makefile b/x11/kde-workspace4/Makefile index f598d3512c9..966793a06cb 100644 --- a/x11/kde-workspace4/Makefile +++ b/x11/kde-workspace4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2013/06/06 12:53:43 wiz Exp $ +# $NetBSD: Makefile,v 1.25 2013/06/22 22:39:10 jperkin Exp $ DISTNAME= kde-workspace-${_KDE_VERSION} PKGNAME= ${DISTNAME:S/-4/4-4/} @@ -52,6 +52,7 @@ REPLACE_PERL+= \ kcontrol/keys/convertShortcuts.pl \ kwin/data/kwin3_plugin.pl \ kwin/data/pluginlibFix.pl +REPLACE_SH+= libs/plasmagenericshell/widgetsexplorer/package/Messages.sh PY_PATCHPLIST= yes @@ -112,6 +113,9 @@ post-install: ${CP} -f ${WRKDIR}/kdmrc.ad kdmrc .endif +CFLAGS.SunOS+= -D__EXTENSIONS__ -D__uint16_t=uint16_t +LDFLAGS.SunOS+= -lsocket + BUILDLINK_DEPMETHOD.qt4-tools= full .include "../../meta-pkgs/kde4/kde4.mk" diff --git a/x11/kde-workspace4/distinfo b/x11/kde-workspace4/distinfo index c8806c7932c..18302e4073c 100644 --- a/x11/kde-workspace4/distinfo +++ b/x11/kde-workspace4/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2013/05/21 12:49:37 markd Exp $ +$NetBSD: distinfo,v 1.8 2013/06/22 22:39:10 jperkin Exp $ SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b RMD160 (Daemon.README) = 39edd92ed4314397080f32a8caff0ac3f716ecf4 @@ -17,6 +17,7 @@ SHA1 (patch-kdm_config.def) = ac0907cc59c5f0976cdbe152bb7fb0a4592bbe84 SHA1 (patch-kdm_kcm_main.cpp) = bb692c83fa189342105744cc9c3c180b970571b7 SHA1 (patch-kdm_kfrontend_CMakeLists.txt) = 0b0c541c7305d31e01a45f0a6a7f5ddb2d2e57fe SHA1 (patch-kdm_kfrontend_genkdmconf.c) = 12986752a1062199833df5aeba8163277ddb7361 +SHA1 (patch-kinfocenter_Modules_nics_nic.cpp) = 0f7e846eac8d694e0ab6018d4f4c571b4e0c84db SHA1 (patch-ksysguard_example_CMakeLists.txt) = bd10f03a308442b8febe8864010987fb504b2d21 SHA1 (patch-ksysguard_ksysguard_FreeBSD_ProcessList.c) = 716f1e75fb23f7d6ddf31092e9a60961f078845c SHA1 (patch-ksysguard_ksysguard_FreeBSD_cpuinfo.c) = e827d09a853b479294a7771b47534d4ba71ef7cb @@ -26,6 +27,10 @@ SHA1 (patch-ksysguard_ksysguardd_NetBSD_CPU.h) = e682d488c61ca2540ed4b2112c9bffc SHA1 (patch-ksysguard_ksysguardd_NetBSD_Memory.c) = 38f18a03c1b99fddbbc51fe52fd6e3b66e5d9f13 SHA1 (patch-ksysguard_ksysguardd_NetBSD_Memory.h) = e58dc4a0a7be7350251f26de34a8949e7508c983 SHA1 (patch-ksysguard_ksysguardd_NetBSD_ProcessList.c) = 0921fe9569bd54f5e381ebead738b95e431bb1d5 +SHA1 (patch-ksysguard_ksysguardd_Solaris_LoadAvg.c) = bc3c434d09485cdf03a357ab5621271adcc3627b +SHA1 (patch-kwin_effects_mousemark_mousemark.cpp) = dda913b1b9ae181aa8a7f07e2f7212bde5535ab7 +SHA1 (patch-kwin_killer_killer.cpp) = b64133ee8b96e4275ed1cbe68a64630e08f77154 +SHA1 (patch-kwin_utils.cpp) = c40ac1c919b77cdbc92afdbdf8565d7a546bf12c SHA1 (patch-libs_ksysguard_ksgrd_SensorManager.cpp) = 5fa92fa4876514198813f900f71f3364794b8248 SHA1 (patch-libs_ksysguard_processcore_CMakeLists.txt) = 61b886388aa5d0831581eacb7db79de0ae5eaf80 SHA1 (patch-libs_ksysguard_processcore_processes.cpp) = 8bfcc8b7e91eafd6b444f4103d3860fb6434a535 @@ -33,4 +38,6 @@ SHA1 (patch-libs_ksysguard_processcore_processes__netbsd__p.cpp) = 9fa5c51c28537 SHA1 (patch-mkpamserv) = 736fc439a34298f51c9fb09200b9dc8628eabc43 SHA1 (patch-plasma_generic_applets_digital-clock_clock.cpp) = dd052f6c36fbd62dd5fecc0bcf162f22e500463c SHA1 (patch-plasma_generic_dataengines_rss_CMakeLists.txt) = 6a12cb3cb54a8b1899f29e7f50a1171862dce66e +SHA1 (patch-plasma_generic_dataengines_time_solarsystem.h) = 474bbf3bc9f9bc0c75772f01218c1739d49fd31c +SHA1 (patch-plasma_generic_dataengines_time_timesource.h) = 85ccf0ed379c94e174880bc239daee60afccc788 SHA1 (patch-startkde.cmake) = bf651bde0a44520124453aa2f60fa956f237a6cf diff --git a/x11/kde-workspace4/patches/patch-kinfocenter_Modules_nics_nic.cpp b/x11/kde-workspace4/patches/patch-kinfocenter_Modules_nics_nic.cpp new file mode 100644 index 00000000000..3ebc9404bad --- /dev/null +++ b/x11/kde-workspace4/patches/patch-kinfocenter_Modules_nics_nic.cpp @@ -0,0 +1,15 @@ +$NetBSD: patch-kinfocenter_Modules_nics_nic.cpp,v 1.1 2013/06/22 22:39:10 jperkin Exp $ + +SunOS SIOCGIFHWADDR doesn't do what you think it does. + +--- kinfocenter/Modules/nics/nic.cpp.orig 2013-05-03 04:36:45.298121054 +0000 ++++ kinfocenter/Modules/nics/nic.cpp +@@ -217,7 +217,7 @@ QList<MyNIC*> findNICs() { + + ifcopy=*ifr; + result=-1; // if none of the two #ifs below matches, ensure that result!=0 so that "Unknown" is returned as result +-#ifdef SIOCGIFHWADDR ++#if defined(SIOCGIFHWADDR) && !defined(__sun) + result=ioctl(sockfd, SIOCGIFHWADDR, &ifcopy); + if (result==0) { + char *n = &ifcopy.ifr_ifru.ifru_hwaddr.sa_data[0]; diff --git a/x11/kde-workspace4/patches/patch-ksysguard_ksysguardd_Solaris_LoadAvg.c b/x11/kde-workspace4/patches/patch-ksysguard_ksysguardd_Solaris_LoadAvg.c new file mode 100644 index 00000000000..e8051415234 --- /dev/null +++ b/x11/kde-workspace4/patches/patch-ksysguard_ksysguardd_Solaris_LoadAvg.c @@ -0,0 +1,14 @@ +$NetBSD: patch-ksysguard_ksysguardd_Solaris_LoadAvg.c,v 1.1 2013/06/22 22:39:10 jperkin Exp $ + +Need string.h + +--- ksysguard/ksysguardd/Solaris/LoadAvg.c.orig 2013-05-03 04:36:45.431119797 +0000 ++++ ksysguard/ksysguardd/Solaris/LoadAvg.c +@@ -22,6 +22,7 @@ + + #include <stdio.h> + #include <stdlib.h> ++#include <string.h> + #include <unistd.h> + #include <sys/stat.h> + #include <sys/types.h> diff --git a/x11/kde-workspace4/patches/patch-kwin_effects_mousemark_mousemark.cpp b/x11/kde-workspace4/patches/patch-kwin_effects_mousemark_mousemark.cpp new file mode 100644 index 00000000000..8cdf81451f6 --- /dev/null +++ b/x11/kde-workspace4/patches/patch-kwin_effects_mousemark_mousemark.cpp @@ -0,0 +1,15 @@ +$NetBSD: patch-kwin_effects_mousemark_mousemark.cpp,v 1.1 2013/06/22 22:39:10 jperkin Exp $ + +Avoid "ambiguous call to overloaded function". + +--- kwin/effects/mousemark/mousemark.cpp.orig 2013-05-03 04:36:45.570118483 +0000 ++++ kwin/effects/mousemark/mousemark.cpp +@@ -84,7 +84,7 @@ void MouseMarkEffect::addRect(const QPoi + r->height = qAbs(p1.y()-p2.y()) + 1 + width_2; + // fast move -> large rect, <strike>tess...</strike> interpolate a line + if (r->width > 3*width/2 && r->height > 3*width/2) { +- const int n = sqrt(r->width*r->width + r->height*r->height) / width; ++ const int n = sqrt((float)(r->width*r->width + r->height*r->height)) / width; + XRectangle *rects = new XRectangle[n-1]; + const int w = p1.x() < p2.x() ? r->width : -r->width; + const int h = p1.y() < p2.y() ? r->height : -r->height; diff --git a/x11/kde-workspace4/patches/patch-kwin_killer_killer.cpp b/x11/kde-workspace4/patches/patch-kwin_killer_killer.cpp new file mode 100644 index 00000000000..435b554f5db --- /dev/null +++ b/x11/kde-workspace4/patches/patch-kwin_killer_killer.cpp @@ -0,0 +1,18 @@ +$NetBSD: patch-kwin_killer_killer.cpp,v 1.1 2013/06/22 22:39:10 jperkin Exp $ + +Consolidate pid_t types on SunOS. + +--- kwin/killer/killer.cpp.orig 2013-05-03 04:36:45.632117897 +0000 ++++ kwin/killer/killer.cpp +@@ -87,7 +87,11 @@ int main(int argc, char* argv[]) + if (::kill(pid, SIGKILL) && errno == EPERM) { + KAuth::Action killer("org.kde.ksysguard.processlisthelper.sendsignal"); + killer.setHelperID("org.kde.ksysguard.processlisthelper"); ++#ifdef __sun ++ killer.addArgument("pid0", (int)pid); ++#else + killer.addArgument("pid0", pid); ++#endif + killer.addArgument("pidcount", 1); + killer.addArgument("signal", SIGKILL); + if (killer.isValid()) { diff --git a/x11/kde-workspace4/patches/patch-kwin_utils.cpp b/x11/kde-workspace4/patches/patch-kwin_utils.cpp new file mode 100644 index 00000000000..061036983ab --- /dev/null +++ b/x11/kde-workspace4/patches/patch-kwin_utils.cpp @@ -0,0 +1,21 @@ +$NetBSD: patch-kwin_utils.cpp,v 1.1 2013/06/22 22:39:10 jperkin Exp $ + +Conditionalise getdomainname(). + +--- kwin/utils.cpp.orig 2013-05-03 04:36:45.662117614 +0000 ++++ kwin/utils.cpp +@@ -422,12 +422,14 @@ bool isLocalMachine(const QByteArray& ho + if (host == hostnamebuf) + return true; + } else { // e.g. LibreOffice likes to give FQDN, even if gethostname() doesn't include domain ++#ifdef HAVE_GETDOMAINNAME + QByteArray h = hostnamebuf; + if( getdomainname( hostnamebuf, sizeof hostnamebuf ) >= 0 ) { + hostnamebuf[sizeof(hostnamebuf)-1] = 0; + if( host == h + '.' + QByteArray( hostnamebuf )) + return true; + } ++#endif + } + } + return false; diff --git a/x11/kde-workspace4/patches/patch-plasma_generic_dataengines_time_solarsystem.h b/x11/kde-workspace4/patches/patch-plasma_generic_dataengines_time_solarsystem.h new file mode 100644 index 00000000000..844ccff079e --- /dev/null +++ b/x11/kde-workspace4/patches/patch-plasma_generic_dataengines_time_solarsystem.h @@ -0,0 +1,15 @@ +$NetBSD: patch-plasma_generic_dataengines_time_solarsystem.h,v 1.1 2013/06/22 22:39:10 jperkin Exp $ + +Avoid "sun" re-definition. + +--- plasma/generic/dataengines/time/solarsystem.h.orig 2013-05-03 04:36:45.790116404 +0000 ++++ plasma/generic/dataengines/time/solarsystem.h +@@ -22,6 +22,8 @@ + #include <QPair> + #include <QPointF> + ++#undef sun ++ + /* + * Mathematics, ideas, public domain code used for these classes from: + * http://www.stjarnhimlen.se/comp/tutorial.html diff --git a/x11/kde-workspace4/patches/patch-plasma_generic_dataengines_time_timesource.h b/x11/kde-workspace4/patches/patch-plasma_generic_dataengines_time_timesource.h new file mode 100644 index 00000000000..92515ef9be3 --- /dev/null +++ b/x11/kde-workspace4/patches/patch-plasma_generic_dataengines_time_timesource.h @@ -0,0 +1,15 @@ +$NetBSD: patch-plasma_generic_dataengines_time_timesource.h,v 1.1 2013/06/22 22:39:10 jperkin Exp $ + +Avoid "sun" re-definition. + +--- plasma/generic/dataengines/time/timesource.h.orig 2013-05-03 04:36:45.790116404 +0000 ++++ plasma/generic/dataengines/time/timesource.h +@@ -24,6 +24,8 @@ + + #include <Plasma/DataContainer> + ++#undef sun ++ + class Sun; + class Moon; + |