aboutsummaryrefslogtreecommitdiff
path: root/archivers
diff options
context:
space:
mode:
authorMichael Nottebrock <lofi@FreeBSD.org>2006-02-01 09:13:29 +0000
committerMichael Nottebrock <lofi@FreeBSD.org>2006-02-01 09:13:29 +0000
commit79fc2a8db2d71f8c383c4457b4d8795116a4d927 (patch)
treeb56d5720d83221f3aedc320944c71e3cbfeca62f /archivers
parent42cde963dc826aaf2b5c33ccb358738cb38e8d4d (diff)
downloadports-79fc2a8db2d71f8c383c4457b4d8795116a4d927.tar.gz
ports-79fc2a8db2d71f8c383c4457b4d8795116a4d927.zip
Notes
Diffstat (limited to 'archivers')
-rw-r--r--archivers/ark/distinfo6
-rw-r--r--archivers/ark/files/patch-ark-filelistview.cpp11
-rw-r--r--archivers/ark/files/patch-kcalc_knumber-knumber_priv.cpp12
-rw-r--r--archivers/ark/files/patch-post-3.5.0-superkaramba156
-rw-r--r--archivers/ark/files/patch-post-3.5.1-superkaramba64
5 files changed, 67 insertions, 182 deletions
diff --git a/archivers/ark/distinfo b/archivers/ark/distinfo
index 883705d0b1f0..5faa42cb5708 100644
--- a/archivers/ark/distinfo
+++ b/archivers/ark/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdeutils-3.5.0.tar.bz2) = d6b2cbe8b7d15166eff261f20ece2718
-SHA256 (KDE/kdeutils-3.5.0.tar.bz2) = 23eeb281e6c361f62b0911cac9be782ba32f62a48a2931c972872b2a2e8c3625
-SIZE (KDE/kdeutils-3.5.0.tar.bz2) = 2958132
+MD5 (KDE/kdeutils-3.5.1.tar.bz2) = 1286c6a09b04452adfe492de2fad79bd
+SHA256 (KDE/kdeutils-3.5.1.tar.bz2) = 4d94e79f4fff451474ce94d354ac8b591114d5c7ac1644dbd3852ee97e773ca5
+SIZE (KDE/kdeutils-3.5.1.tar.bz2) = 2974660
diff --git a/archivers/ark/files/patch-ark-filelistview.cpp b/archivers/ark/files/patch-ark-filelistview.cpp
deleted file mode 100644
index dadc8edc030e..000000000000
--- a/archivers/ark/files/patch-ark-filelistview.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ark/filelistview.cpp.orig Mon Dec 19 15:40:44 2005
-+++ ark/filelistview.cpp Mon Dec 19 15:41:20 2005
-@@ -260,7 +260,7 @@
- * the next item is the next sibling of its parent, and so on.
- */
- FileLVI *nitem = static_cast<FileLVI*>( item->nextSibling() );
-- while ( !nitem and item->parent() )
-+ while ( !nitem && item->parent() )
- {
- item = static_cast<FileLVI*>( item->parent() );
- nitem = static_cast<FileLVI*>( item->parent()->nextSibling() );
diff --git a/archivers/ark/files/patch-kcalc_knumber-knumber_priv.cpp b/archivers/ark/files/patch-kcalc_knumber-knumber_priv.cpp
deleted file mode 100644
index 9e1b5377f7d1..000000000000
--- a/archivers/ark/files/patch-kcalc_knumber-knumber_priv.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
---- kcalc/knumber/knumber_priv.cpp.orig Tue Dec 20 14:54:29 2005
-+++ kcalc/knumber/knumber_priv.cpp Tue Dec 20 14:59:11 2005
-@@ -20,6 +20,9 @@
- #include <math.h>
- #include <config.h>
-
-+#ifdef HAVE_STDLIB_H
-+#include <stdlib.h>
-+#endif
- #include <qregexp.h>
- #include <qstring.h>
-
diff --git a/archivers/ark/files/patch-post-3.5.0-superkaramba b/archivers/ark/files/patch-post-3.5.0-superkaramba
deleted file mode 100644
index e2d73f7d566b..000000000000
--- a/archivers/ark/files/patch-post-3.5.0-superkaramba
+++ /dev/null
@@ -1,156 +0,0 @@
---- superkaramba/src/memsensor.cpp.orig Wed Dec 21 12:35:21 2005
-+++ superkaramba/src/memsensor.cpp Wed Dec 21 12:41:09 2005
-@@ -14,7 +14,7 @@
- #include <qstring.h>
- #include <qregexp.h>
-
--#ifdef __FreeBSD__
-+#ifdef Q_OS_FREEBSD
- #include <sys/time.h>
- #include <sys/param.h>
- #include <sys/sysctl.h>
-@@ -32,14 +32,14 @@
- #include <sys/swap.h>
- #endif
-
--#if defined __FreeBSD__ || defined(Q_OS_NETBSD)
-+#if defined Q_OS_FREEBSD || defined(Q_OS_NETBSD)
- /* define pagetok in terms of pageshift */
- #define pagetok(size) ((size) << pageshift)
- #endif
-
- MemSensor::MemSensor(int msec) : Sensor(msec)
- {
--#if defined __FreeBSD__ || defined(Q_OS_NETBSD)
-+#if defined Q_OS_FREEBSD || defined(Q_OS_NETBSD)
- /* get the page size with "getpagesize" and calculate pageshift from it */
- int pagesize = getpagesize();
- pageshift = 0;
-@@ -51,7 +51,7 @@
-
- /* we only need the amount of log(2)1024 for our conversion */
- pageshift -= 10;
--# if (defined(__FreeBSD__) && __FreeBSD_version < 500018)
-+# if (defined(Q_OS_FREEBSD) && __FreeBSD_version < 500018)
- connect(&ksp, SIGNAL(receivedStdout(KProcess *, char *, int )),
- this,SLOT(receivedStdout(KProcess *, char *, int )));
- connect(&ksp, SIGNAL(processExited(KProcess *)),
-@@ -62,7 +62,7 @@
- MaxSet = false;
-
- readValues();
--# elif defined __FreeBSD__
-+# elif defined Q_OS_FREEBSD
- kd = kvm_open("/dev/null", "/dev/null", "/dev/null", O_RDONLY, "kvm_open");
- # endif
- #else
-@@ -73,7 +73,7 @@
- MemSensor::~MemSensor()
- {}
-
--#ifdef __FreeBSD__
-+#ifdef Q_OS_FREEBSD
- void MemSensor::receivedStdout(KProcess *, char *buffer, int len )
- {
- buffer[len] = 0;
-@@ -87,7 +87,7 @@
-
- void MemSensor::processExited(KProcess *)
- {
--#ifdef __FreeBSD__
-+#ifdef Q_OS_FREEBSD
- QStringList stringList = QStringList::split('\n',sensorResult);
- sensorResult = "";
- QStringList itemsList = QStringList::split(' ', stringList[1]);
-@@ -99,7 +99,7 @@
-
- int MemSensor::getMemTotal()
- {
--#if defined __FreeBSD || defined(Q_OS_NETBSD)
-+#if defined Q_OS_FREEBSD || defined(Q_OS_NETBSD)
- static int mem = 0;
- size_t size = sizeof(mem);
-
-@@ -114,7 +114,7 @@
-
- int MemSensor::getMemFree()
- {
--#ifdef __FreeBSD__
-+#ifdef Q_OS_FREEBSD
- static int mem = 0;
- size_t size = sizeof(mem);
-
-@@ -138,7 +138,7 @@
-
- int MemSensor::getBuffers()
- {
--#ifdef __FreeBSD__
-+#ifdef Q_OS_FREEBSD
- static int mem = 0;
- size_t size = sizeof(mem);
-
-@@ -159,7 +159,7 @@
-
- int MemSensor::getCached()
- {
--#ifdef __FreeBSD__
-+#ifdef Q_OS_FREEBSD
- static int mem = 0;
- size_t size = sizeof(mem);
-
-@@ -179,7 +179,7 @@
-
- int MemSensor::getSwapTotal()
- {
--#ifdef __FreeBSD__
-+#ifdef Q_OS_FREEBSD
- # if __FreeBSD_version < 500018
- return(swapTotal);
- # else
-@@ -221,7 +221,7 @@
-
- int MemSensor::getSwapFree()
- {
--#ifdef __FreeBSD__
-+#ifdef Q_OS_FREEBSD
- # if __FreeBSD_version < 500018
- return(swapTotal - swapUsed);
- # else
-@@ -266,8 +266,8 @@
-
- void MemSensor::readValues()
- {
--#if defined __FreeBSD__ || defined(Q_OS_NETBSD)
--# if (defined(__FreeBSD__) && __FreeBSD_version < 500018)
-+#if defined Q_OS_FREEBSD || defined(Q_OS_NETBSD)
-+# if (defined(Q_OS_FREEBSD) && __FreeBSD_version < 500018)
- ksp.clearArguments();
- ksp << "swapinfo";
- ksp.start( KProcess::NotifyOnExit,KProcIO::Stdout);
-@@ -291,7 +291,7 @@
- SensorParams *sp;
- Meter *meter;
- QObjectListIt it( *objList );
--#if (defined(__FreeBSD__) && __FreeBSD_version < 500018)
-+#if (defined(Q_OS_FREEBSD) && __FreeBSD_version < 500018)
- bool set = false;
- #endif
- int totalMem = getMemTotal();
-@@ -303,7 +303,7 @@
- while (it != 0)
- {
- sp = (SensorParams*)(*it);
--#if (defined(__FreeBSD__) && __FreeBSD_version < 500018)
-+#if (defined(Q_OS_FREEBSD) && __FreeBSD_version < 500018)
- if ( (!MaxSet) && (totalSwap > 0) ) {
- setMaxValue(sp);
- bool set = true;
-@@ -331,7 +331,7 @@
- meter->setValue(format);
- ++it;
- }
--#if (defined(__FreeBSD__) && __FreeBSD_version < 500018)
-+#if (defined(Q_OS_FREEBSD) && __FreeBSD_version < 500018)
- if (set)
- MaxSet = true;
- #endif
diff --git a/archivers/ark/files/patch-post-3.5.1-superkaramba b/archivers/ark/files/patch-post-3.5.1-superkaramba
new file mode 100644
index 000000000000..264523346184
--- /dev/null
+++ b/archivers/ark/files/patch-post-3.5.1-superkaramba
@@ -0,0 +1,64 @@
+--- superkaramba/src/karamba.cpp.orig Sun Jan 29 20:28:05 2006
++++ superkaramba/src/karamba.cpp Sun Jan 29 20:55:33 2006
+@@ -544,7 +544,7 @@
+ QFileInfo info(path);
+ if( info.isRelative())
+ path = m_theme.path() +"/" + path;
+- (new karamba( path, false ))->show();
++ (new karamba( path, QString() ))->show();
+ }
+
+ if(lineParser.meter() == "<GROUP>")
+--- superkaramba/src/karambaapp.cpp.orig Sun Jan 29 21:01:46 2006
++++ superkaramba/src/karambaapp.cpp Sun Jan 29 21:02:23 2006
+@@ -279,7 +279,7 @@
+ {
+ karamba *mainWin = 0;
+
+- mainWin = new karamba(*it , false);
++ mainWin = new karamba(*it , QString());
+ mainWin->show();
+ result = true;
+ }
+--- superkaramba/src/karambainterface.cpp.orig Sun Jan 29 21:00:35 2006
++++ superkaramba/src/karambainterface.cpp Sun Jan 29 21:01:06 2006
+@@ -72,7 +72,7 @@
+ QFileInfo file(filename);
+ if(file.exists())
+ {
+- (new karamba(filename, false))->show();
++ (new karamba(filename, QString()))->show();
+ }
+ }
+
+--- superkaramba/src/misc_python.cpp.orig Sun Jan 29 20:58:06 2006
++++ superkaramba/src/misc_python.cpp Sun Jan 29 20:58:23 2006
+@@ -459,7 +459,7 @@
+
+ if( file.exists() )
+ {
+- currTheme = new karamba( filename, false );
++ currTheme = new karamba( filename, QString() );
+ currTheme->show();
+ }
+
+--- superkaramba/src/themesdlg.cpp.orig Sun Jan 29 21:03:36 2006
++++ superkaramba/src/themesdlg.cpp Sun Jan 29 21:04:22 2006
+@@ -195,7 +195,7 @@
+ ThemeFile* tf = w->themeFile();
+ if(tf)
+ {
+- (new karamba(tf->file(), false))->show();
++ (new karamba(tf->file(), QString()))->show();
+ }
+ }
+ }
+@@ -210,7 +210,7 @@
+ {
+ ThemeFile file(*it);
+ if(file.isValid())
+- (new karamba(*it, false))->show();
++ (new karamba(*it, QString()))->show();
+ }
+ }
+