Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/kde
In directory
sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv16953/main/finkinfo/kde
Modified Files:
kdebase4-mac.info kdebase4-x11.info kdebase4.patch
Log Message:
fix 10.4 build
Index: kdebase4-mac.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/kde/kdebase4-mac.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- kdebase4-mac.info 18 Feb 2010 21:26:58 -0000 1.8
+++ kdebase4-mac.info 24 Feb 2010 23:29:21 -0000 1.9
@@ -59,7 +59,12 @@
Source: mirror:kde:stable/%v/src/kdebase-%v.tar.bz2
Source-MD5: ddfc358aebe5dc8f5de6f5d1ff7cb018
SourceDirectory: kdebase-%v
-PatchScript: perl -pi -e 's,Phonon/Global,Phonon/MediaObject,g'
apps/dolphin/src/panels/information/*.h
apps/dolphin/src/panels/information/*.cpp
+PatchScript: <<
+ %{default_script}
+ perl -pi -e 's,Phonon/Global,Phonon/MediaObject,g'
apps/dolphin/src/panels/information/*.h
apps/dolphin/src/panels/information/*.cpp
+<<
+PatchFile: kdebase4.patch
+PatchFile-MD5: d2a988e7312e8487e4a2cc5e3d39ae8b
CompileScript: <<
#!/bin/sh -ev
Index: kdebase4.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/kde/kdebase4.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kdebase4.patch 11 Mar 2009 21:03:36 -0000 1.1
+++ kdebase4.patch 24 Feb 2010 23:29:21 -0000 1.2
@@ -1,132 +1,50 @@
-diff -Nurd kdebase-4.2.1/apps/kinfocenter/base/info_osx.cpp
kdebase-4.2.1-new/apps/kinfocenter/base/info_osx.cpp
---- kdebase-4.2.1/apps/kinfocenter/base/info_osx.cpp 2008-04-18
03:21:39.000000000 -0400
-+++ kdebase-4.2.1-new/apps/kinfocenter/base/info_osx.cpp 2009-03-10
08:17:48.000000000 -0400
-@@ -32,9 +32,8 @@
- #include <stdio.h>
- #include <stdlib.h>
-
--#include <iostream.h>
-+#include <iostream>
-
--#include <qdict.h>
- #include <QFile>
- #include <QFontMetrics>
-
-@@ -51,7 +50,7 @@
-
- #include <machine/limits.h>
-
--bool GetInfo_CPU(QListView *lBox) {
-+bool GetInfo_CPU(QTreeWidget* tree) {
-
- QString cpustring;
+diff -Nurd kdebase-4.4.0/apps/konsole/src/CMakeLists.txt
kdebase-4.4.0-new/apps/konsole/src/CMakeLists.txt
+--- kdebase-4.4.0/apps/konsole/src/CMakeLists.txt 2009-03-27
10:46:28.000000000 -0400
++++ kdebase-4.4.0-new/apps/konsole/src/CMakeLists.txt 2010-02-24
13:49:20.000000000 -0500
+@@ -4,6 +4,10 @@
+ macro_bool_to_01(X11_Xrender_FOUND HAVE_XRENDER)
+ macro_log_feature(XKB_FOUND "XKB" "X keyboard extension" "http://www.x.org";
FALSE "" "Gives Konsole better keyboard support.")
-@@ -62,26 +61,26 @@
- ret=host_info(mach_host_self(), HOST_BASIC_INFO,
(host_info_t)&basic_info, &count);
- if (ret != KERN_SUCCESS) {
- kDebug() << "unable to get host information from mach";
-- return false;
- } else {
- kDebug() << "got Host Info: (" << basic_info.avail_cpus << ")
CPUs available";
- const NXArchInfo *archinfo;
- archinfo=NXGetArchInfoFromCpuType(basic_info.cpu_type,
basic_info.cpu_subtype);
-- new QListViewItem(lBox, i18n("Kernel is configured for %1
CPUs", basic_info.max_cpus));
++include(CheckIncludeFiles)
++check_include_files("sys/proc.h" HAVE_SYS_PROC_H)
++check_include_files("sys/proc_info.h" HAVE_SYS_PROC_INFO_H)
+
- for (int i = 1; i <= basic_info.avail_cpus; i++) {
-- cpustring = i18n("CPU %1: %2", i,
archinfo->description);
-- new QListViewItem(lBox, cpustring);
-+ QStringList list;
-+ list << QString(i) << archinfo->description;
-+ new QTreeWidgetItem(tree, list);
- }
- return true;
- }
- return false;
- }
-
--bool GetInfo_IRQ(QListView *) {
-+bool GetInfo_IRQ(QTreeWidget*) {
- return false;
- }
-
--bool GetInfo_DMA(QListView *) {
-+bool GetInfo_DMA(QTreeWidget*) {
- return false;
- }
-
-@@ -89,11 +88,11 @@
- return false;
- }
-
--bool GetInfo_IO_Ports(QListView *) {
-+bool GetInfo_IO_Ports(QTreeWidget*) {
- return false;
- }
-
--bool GetInfo_Sound(QListView *lBox) {
-+bool GetInfo_Sound(QTreeWidget *tree) {
- #ifdef HAVE_COREAUDIO
- #define qMaxStringSize 1024
- OSStatus status;
-@@ -118,7 +117,9 @@
- kDebug() << "get device name failed, status = " <<
(int)status;
- return false;
- }
-- new QListViewItem(lBox, i18n("Device Name: %1", deviceName));
-+ QStringList deviceList;
-+ deviceList << i18n("Device Name") << deviceName;
-+ new QTreeWidgetItem(tree, deviceList);
+ configure_file (config-konsole.h.cmake
${CMAKE_CURRENT_BINARY_DIR}/config-konsole.h )
- /* Manufacturer */
- status = AudioDeviceGetProperty(gOutputDeviceID, 1, 0,
kAudioDevicePropertyDeviceManufacturer, &propertySize, manufacturer);
-@@ -126,7 +127,9 @@
- kDebug() << "get manufacturer failed, status = " <<
(int)status;
- return false;
- }
-- new QListViewItem(lBox, i18n("Manufacturer: %1", manufacturer));
-+ QStringList manufacturerList;
-+ manufacturerList << i18n("Manufacturer") << manufacturer;
-+ new QTreeWidgetItem(tree, manufacturerList);
- return true;
- } else {
- return false;
-@@ -136,18 +139,22 @@
- #endif
- }
+ ### Tests
+diff -Nurd kdebase-4.4.0/apps/konsole/src/ProcessInfo.cpp
kdebase-4.4.0-new/apps/konsole/src/ProcessInfo.cpp
+--- kdebase-4.4.0/apps/konsole/src/ProcessInfo.cpp 2009-10-15
12:32:36.000000000 -0400
++++ kdebase-4.4.0-new/apps/konsole/src/ProcessInfo.cpp 2010-02-24
13:50:05.000000000 -0500
+@@ -19,6 +19,7 @@
--bool GetInfo_SCSI(QListView *lbox) {
-+bool GetInfo_SCSI(QTreeWidget*) {
- return false;
- }
+ // Own
+ #include "ProcessInfo.h"
++#include "config-konsole.h"
--bool GetInfo_Partitions(QListView *lbox) {
-+bool GetInfo_Partitions(QTreeWidget*) {
- return false;
- }
+ // Unix
+ #include <sys/socket.h>
+@@ -42,8 +43,12 @@
--bool GetInfo_XServer_and_Video(QListView *lBox) {
-- return GetInfo_XServer_Generic(lBox);
-+bool GetInfo_XServer_and_Video(QTreeWidget* tree) {
-+#ifdef Q_WS_X11
-+ return GetInfo_XServer_Generic(tree);
-+#else
-+ return false;
+ #if defined(Q_OS_MAC)
+ #include <sys/sysctl.h>
++#ifdef HAVE_SYS_PROC_INFO_H
+ #include <sys/proc_info.h>
+#endif
- }
-
--bool GetInfo_Devices(QListView *lbox) {
-+bool GetInfo_Devices(QTreeWidget* tree) {
- return false;
- }
-diff -Nurd kdebase-4.2.1/apps/nsplugins/sdk/prcpucfg.h
kdebase-4.2.1-new/apps/nsplugins/sdk/prcpucfg.h
---- kdebase-4.2.1/apps/nsplugins/sdk/prcpucfg.h 2008-03-13
03:46:40.000000000 -0400
-+++ kdebase-4.2.1-new/apps/nsplugins/sdk/prcpucfg.h 2009-03-10
08:18:19.000000000 -0400
-@@ -49,7 +49,7 @@
++#ifdef HAVE_SYS_PROC_H
+ #include <sys/proc.h>
++#endif
+ #include <kde_file.h>
+ #endif
- #define PR_AF_INET6 10 /* same as AF_INET6 */
+diff -Nurd kdebase-4.4.0/apps/konsole/src/config-konsole.h.cmake
kdebase-4.4.0-new/apps/konsole/src/config-konsole.h.cmake
+--- kdebase-4.4.0/apps/konsole/src/config-konsole.h.cmake 2008-01-04
18:54:02.000000000 -0500
++++ kdebase-4.4.0-new/apps/konsole/src/config-konsole.h.cmake 2010-02-24
13:46:59.000000000 -0500
+@@ -7,4 +7,8 @@
+ /* Defined if your system has XRender support */
+ #cmakedefine HAVE_XRENDER 1
--#ifdef __powerpc__
-+#if defined(__powerpc__) || defined(__POWERPC__)
++/* Defined if you have sys/proc.h */
++#cmakedefine HAVE_SYS_PROC_H 1
- #undef IS_LITTLE_ENDIAN
- #define IS_BIG_ENDIAN 1
++/* Defined if you have sys/proc_info.h */
++#cmakedefine HAVE_SYS_PROC_INFO_H 1
Index: kdebase4-x11.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/kde/kdebase4-x11.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- kdebase4-x11.info 18 Feb 2010 21:26:58 -0000 1.8
+++ kdebase4-x11.info 24 Feb 2010 23:29:21 -0000 1.9
@@ -59,7 +59,12 @@
Source: mirror:kde:stable/%v/src/kdebase-%v.tar.bz2
Source-MD5: ddfc358aebe5dc8f5de6f5d1ff7cb018
SourceDirectory: kdebase-%v
-PatchScript: perl -pi -e 's,Phonon/Global,Phonon/MediaObject,g'
apps/dolphin/src/panels/information/*.h
apps/dolphin/src/panels/information/*.cpp
+PatchScript: <<
+ %{default_script}
+ perl -pi -e 's,Phonon/Global,Phonon/MediaObject,g'
apps/dolphin/src/panels/information/*.h
apps/dolphin/src/panels/information/*.cpp
+<<
+PatchFile: kdebase4.patch
+PatchFile-MD5: d2a988e7312e8487e4a2cc5e3d39ae8b
CompileScript: <<
#!/bin/sh -ev
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
