pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/x11/kdebase3 Various kdebase updates.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/4dfb664f3dfc
branches:  trunk
changeset: 537204:4dfb664f3dfc
user:      markd <markd%pkgsrc.org@localhost>
date:      Fri Jan 04 21:05:56 2008 +0000

description:
Various kdebase updates.

Option to build kompmgr - from Sergey Svishchev
improved kdeeject script - from Sergey Svishchev

ksysguard tidyup, improved handling of process list.
infocenter tidyup

Add NetBSD support to kicker/applets/naughty (finally fixing PR 25052)

Bump PKGREVISION.

diffstat:

 x11/kdebase3/Makefile         |    5 +-
 x11/kdebase3/PLIST            |    3 +-
 x11/kdebase3/options.mk       |   12 ++-
 x11/kdebase3/patches/patch-aa |   22 +++-
 x11/kdebase3/patches/patch-af |   61 +++++++++++-
 x11/kdebase3/patches/patch-ah |  184 +++++++++++++++++++++++++++++++++++++++
 x11/kdebase3/patches/patch-bc |   25 ++++-
 x11/kdebase3/patches/patch-er |  194 ++++++++++++++++++++++++++++++++++++++---
 x11/kdebase3/patches/patch-fh |   37 ++++---
 x11/kdebase3/patches/patch-fi |   39 +++++--
 10 files changed, 520 insertions(+), 62 deletions(-)

diffs (truncated from 846 to 300 lines):

diff -r 20695065fe72 -r 4dfb664f3dfc x11/kdebase3/Makefile
--- a/x11/kdebase3/Makefile     Fri Jan 04 20:37:54 2008 +0000
+++ b/x11/kdebase3/Makefile     Fri Jan 04 21:05:56 2008 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.139 2007/12/27 08:01:20 markd Exp $
+# $NetBSD: Makefile,v 1.140 2008/01/04 21:05:56 markd Exp $
 
 DISTNAME=      kdebase-${_KDE_VERSION}
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    x11
 COMMENT=       Base modules for the KDE 3 integrated X11 desktop
 
@@ -32,7 +32,6 @@
 
 CONFIGURE_ARGS+=       --with-ssl-dir="${BUILDLINK_PREFIX.openssl}"
 CONFIGURE_ARGS+=       --with-ldap="${BUILDLINK_PREFIX.openldap-client}"
-CONFIGURE_ARGS+=       --without-composite
 CONFIGURE_ARGS+=       --without-java
 
 REPLACE_PERL+=         kcontrol/keys/convertShortcuts.pl \
diff -r 20695065fe72 -r 4dfb664f3dfc x11/kdebase3/PLIST
--- a/x11/kdebase3/PLIST        Fri Jan 04 20:37:54 2008 +0000
+++ b/x11/kdebase3/PLIST        Fri Jan 04 21:05:56 2008 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.48 2007/05/23 13:05:34 markd Exp $
+@comment $NetBSD: PLIST,v 1.49 2008/01/04 21:05:56 markd Exp $
 bin/appletproxy
 bin/drkonqi
 bin/extensionproxy
@@ -53,6 +53,7 @@
 bin/klocaldomainurifilterhelper
 bin/kmenuedit
 bin/knetattach
+${HAVE_COMPOSITE}bin/kompmgr
 bin/konqueror
 bin/konsole
 bin/kpager
diff -r 20695065fe72 -r 4dfb664f3dfc x11/kdebase3/options.mk
--- a/x11/kdebase3/options.mk   Fri Jan 04 20:37:54 2008 +0000
+++ b/x11/kdebase3/options.mk   Fri Jan 04 21:05:56 2008 +0000
@@ -1,11 +1,19 @@
-# $NetBSD: options.mk,v 1.2 2007/10/31 11:56:44 markd Exp $
+# $NetBSD: options.mk,v 1.3 2008/01/04 21:05:56 markd Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.kdebase
-PKG_SUPPORTED_OPTIONS= inet6 sasl samba debug pam
+PKG_SUPPORTED_OPTIONS= inet6 sasl samba debug pam composite
 PKG_SUGGESTED_OPTIONS= sasl
 
 .include "../../mk/bsd.options.mk"
 
+.if !empty(PKG_OPTIONS:Mcomposite)
+CONFIGURE_ARGS+=       --with-composite
+PLIST_SUBST+=          HAVE_COMPOSITE=""
+.else
+CONFIGURE_ARGS+=       --without-composite
+PLIST_SUBST+=          HAVE_COMPOSITE="@comment "
+.endif
+
 .if !empty(PKG_OPTIONS:Msamba)
 .include "../../net/samba/buildlink3.mk"
 LIBS+=                 -L${BUILDLINK_PREFIX.samba}/lib/samba ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.samba}/lib/samba
diff -r 20695065fe72 -r 4dfb664f3dfc x11/kdebase3/patches/patch-aa
--- a/x11/kdebase3/patches/patch-aa     Fri Jan 04 20:37:54 2008 +0000
+++ b/x11/kdebase3/patches/patch-aa     Fri Jan 04 21:05:56 2008 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.17 2007/05/23 13:05:34 markd Exp $
+$NetBSD: patch-aa,v 1.18 2008/01/04 21:05:57 markd Exp $
 
---- configure.orig     2007-05-14 23:57:00.000000000 +1200
+--- configure.orig     2007-10-09 03:40:32.000000000 +1300
 +++ configure
-@@ -34288,7 +34288,7 @@ if { (eval echo "$as_me:$LINENO: \"$kde_
+@@ -31683,7 +31683,7 @@ if { (eval echo "$as_me:$LINENO: \"$kde_
        # if you're trying to debug this check and think it's incorrect,
        # better check your installation. The check _is_ correct - your
        # installation is not.
@@ -11,7 +11,7 @@
                kde_cv_uic_plugins=yes
        fi
  fi
-@@ -47113,6 +47113,23 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -42949,6 +42949,23 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
  
                    ac_cv_have_dpms="-lXdpms"
  
@@ -35,7 +35,7 @@
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
-@@ -50244,7 +50261,7 @@ fi
+@@ -45685,7 +45702,7 @@ fi
  
  
  case "$host" in
@@ -44,7 +44,7 @@
        FOUND_USBVIEW=yes
        ;;
  esac
-@@ -51868,7 +51885,7 @@ acimake:
+@@ -47101,7 +47118,7 @@ acimake:
  
  EOF
      if $XMKMF >&5 2>&1 && test -f Makefile; then
@@ -53,7 +53,15 @@
        kde_cv_defines_imake_version=$imkv
      else
          { echo "$as_me:$LINENO: result: failed" >&5
-@@ -60629,6 +60647,7 @@ fi
+@@ -49261,6 +49278,7 @@ fi
+ 
+ 
+ case "$host" in
++  *-*-netbsd*) LIB_KVM="-lkvm" ;;
+   *-*-freebsd*) LIB_KVM="-lkvm" ;;
+   *) LIB_KVM=""  ;;
+ esac
+@@ -54739,6 +54757,7 @@ fi
  case "$UNAME" in
        Linux) LIBHOSTS="$LIBSENSORS" ;;
        FreeBSD) LIBHOSTS="$LIBSENSORS -lkvm" ;;
diff -r 20695065fe72 -r 4dfb664f3dfc x11/kdebase3/patches/patch-af
--- a/x11/kdebase3/patches/patch-af     Fri Jan 04 20:37:54 2008 +0000
+++ b/x11/kdebase3/patches/patch-af     Fri Jan 04 21:05:56 2008 +0000
@@ -1,8 +1,16 @@
-$NetBSD: patch-af,v 1.8 2007/05/23 13:05:35 markd Exp $
+$NetBSD: patch-af,v 1.9 2008/01/04 21:05:57 markd Exp $
 
 --- kcontrol/info/info_netbsd.cpp.orig 2005-09-10 20:25:05.000000000 +1200
 +++ kcontrol/info/info_netbsd.cpp
-@@ -123,7 +123,7 @@ static bool GetDmesgInfo(QListView *lBox
+@@ -41,6 +41,7 @@
+ #include <qfontmetrics.h>
+ #include <qstrlist.h>
+ #include <qtextstream.h>
++#include <qregexp.h>
+ 
+ #include <kdebug.h>
+ #include <kio/global.h> /* for KIO::convertSize() */
+@@ -123,7 +124,7 @@ static bool GetDmesgInfo(QListView *lBox
        }
  
        QListViewItem *olditem = NULL;
@@ -11,7 +19,36 @@
                if (!seencpu) {
                        if (s.contains("cpu"))
                                seencpu = true;
-@@ -265,9 +265,11 @@ bool GetInfo_SCSI (QListView *lbox)
+@@ -134,9 +135,7 @@ static bool GetDmesgInfo(QListView *lBox
+                       s.contains("WARNING: old BSD partition ID!"))
+                       break;
+ 
+-              if (!filter
+-                  || (filter[0] == '^' && s.find(&filter[1]) == 0)
+-                  || (filter[0] != '^' && s.contains(filter))) {
++              if (!filter || s.contains(QRegExp(filter))) {
+                       if (func)
+                               func(lBox, s);
+                       else
+@@ -163,7 +162,7 @@ AddIRQLine(QListView *lBox, QString s)
+       int pos, irqnum;
+       char numstr[3];
+ 
+-      pos = s.find(" irq ");
++      pos = s.find(QRegExp("[ (]irq "));
+       irqnum = (pos < 0) ? 0 : atoi(&s.ascii()[pos+5]);
+       if (irqnum)
+               snprintf(numstr, 3, "%02d", irqnum);
+@@ -181,7 +180,7 @@ bool GetInfo_IRQ (QListView *lBox)
+       lBox->addColumn(i18n("Device"));
+       lBox->setSorting(0);
+       lBox->setShowSortIndicator(FALSE);
+-      (void) GetDmesgInfo(lBox, " irq ", AddIRQLine);
++      (void) GetDmesgInfo(lBox, "[ (]irq ", AddIRQLine);
+       return true;
+ }
+ 
+@@ -265,9 +264,11 @@ bool GetInfo_SCSI (QListView *lbox)
  bool GetInfo_Partitions (QListView *lbox)
  {
        int num; // number of mounts
@@ -25,7 +62,7 @@
  
        // get mount info
        if (!(num=getmntinfo(&mnt, MNT_WAIT))) {
-@@ -290,7 +292,11 @@ bool GetInfo_Partitions (QListView *lbox
+@@ -290,24 +291,31 @@ bool GetInfo_Partitions (QListView *lbox
                unsigned long long big[2];
                QString vv[5];
  
@@ -37,7 +74,19 @@
                big[0] *= mnt->f_blocks;
                big[1] *= mnt->f_bavail; // FIXME: use f_bfree if root?
  
-@@ -307,7 +313,11 @@ bool GetInfo_Partitions (QListView *lbox
+               // convert to strings
+               vv[0] = KIO::convertSize(big[0]);
+-              vv[1] = QString::fromLatin1("%1 (%2%%)")
++              vv[1] = QString("%1 (%2%)")
+                               .arg(KIO::convertSize(big[1]))
+                               .arg(mnt->f_blocks ? mnt->f_bavail*100/mnt->f_blocks : 0);
+ 
+-              // FIXME: these two are large enough to punctuate
+-              vv[2] = QString::number(mnt->f_files);
+-              vv[3] = QString::fromLatin1("%1 (%2%%) ")
++              vv[2] = QString("%L1").arg(mnt->f_files);
++              vv[3] = QString("%L1 (%2%) ")
+                               .arg(mnt->f_ffree)
                                .arg(mnt->f_files ? mnt->f_ffree*100/mnt->f_files : 0);
  
                vv[4] = QString::null;
@@ -49,7 +98,7 @@
                MNTF(ASYNC)
                MNTF(DEFEXPORTED)
                MNTF(EXKERB)
-@@ -316,7 +326,9 @@ bool GetInfo_Partitions (QListView *lbox
+@@ -316,7 +324,9 @@ bool GetInfo_Partitions (QListView *lbox
                MNTF(EXPORTED)
                MNTF(EXPUBLIC)
                MNTF(EXRDONLY)
diff -r 20695065fe72 -r 4dfb664f3dfc x11/kdebase3/patches/patch-ah
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/kdebase3/patches/patch-ah     Fri Jan 04 21:05:56 2008 +0000
@@ -0,0 +1,184 @@
+$NetBSD: patch-ah,v 1.11 2008/01/04 21:05:57 markd Exp $
+
+--- kicker/applets/naughty/NaughtyProcessMonitor.cpp.orig      2007-12-30 16:38:02.000000000 +1300
++++ kicker/applets/naughty/NaughtyProcessMonitor.cpp
+@@ -20,7 +20,7 @@
+ 
+ /* OpenBSD support by Jean-Yves Burlett <jean-yves%burlett.org@localhost> */
+ 
+-#ifdef __OpenBSD__
++#if defined(__OpenBSD__) || defined(__NetBSD__)
+ #include <sys/param.h>
+ #include <sys/proc.h>
+ #include <sys/sysctl.h>
+@@ -29,6 +29,11 @@
+ #include <stdlib.h>
+ #endif
+ 
++#ifdef __NetBSD__
++#include <kvm.h>
++#include <sys/sched.h>
++#endif
++
+ #include <sys/types.h>
+ #include <signal.h>
+ #include <unistd.h>
+@@ -67,10 +72,13 @@ class NaughtyProcessMonitorPrivate
+     QTimer * timer_;
+     QMap<ulong, uint> loadMap_;
+     QMap<ulong, uint> scoreMap_;
+-#ifdef __OpenBSD__
++#if defined(__OpenBSD__) || defined(__NetBSD__)
+     QMap<ulong, uint> cacheLoadMap_;
+     QMap<ulong, uid_t> uidMap_;
+ #endif
++#ifdef __NetBSD__
++    kvm_t *kd;
++#endif
+     uint oldLoad_;
+     uint triggerLevel_;
+ 
+@@ -95,11 +103,17 @@ NaughtyProcessMonitor::NaughtyProcessMon
+   d->interval_ = interval * 1000;
+   d->triggerLevel_ = triggerLevel;
+   d->timer_ = new QTimer(this);
++#ifdef __NetBSD__
++  d->kd = kvm_open(NULL, NULL, NULL, KVM_NO_FILES, "kvm_open");
++#endif
+   connect(d->timer_, SIGNAL(timeout()), this, SLOT(slotTimeout()));
+ }
+ 
+ NaughtyProcessMonitor::~NaughtyProcessMonitor()
+ {
++#ifdef __NetBSD__
++  kvm_close(d->kd);
++#endif
+   delete d;
+ }
+ 
+@@ -219,7 +233,7 @@ NaughtyProcessMonitor::canKill(ulong pid
+ //  uint d(l[4].toUInt());
+ 
+   return geteuid() == a;
+-#elif defined(__OpenBSD__)
++#elif defined(__OpenBSD__) || defined(__NetBSD__)
+   // simply check if entry exists in the uid map and use it
+   if (!d->uidMap_.contains(pid))
+       return false ;
+@@ -234,7 +248,7 @@ NaughtyProcessMonitor::canKill(ulong pid
+   QString
+ NaughtyProcessMonitor::processName(ulong pid) const
+ {
+-#if defined(__linux__) || defined(__OpenBSD__)
++#if defined(__linux__) || defined(__OpenBSD__) || defined(__NetBSD__)
+ #ifdef __linux__
+   QFile f("/proc/" + QString::number(pid) + "/cmdline");



Home | Main Index | Thread Index | Old Index