aboutsummaryrefslogtreecommitdiffstats
path: root/x11/kdebase4/files
diff options
context:
space:
mode:
authormakc <makc@FreeBSD.org>2010-09-03 05:06:27 +0800
committermakc <makc@FreeBSD.org>2010-09-03 05:06:27 +0800
commitdc5b133e16a9043584ef34d471cb91c78d80f04b (patch)
treeaa650908b305923c618f2e2be02443d132300ecb /x11/kdebase4/files
parent73e83539c84b4e57cee48894b310fdb1fd9721cb (diff)
downloadfreebsd-ports-gnome-dc5b133e16a9043584ef34d471cb91c78d80f04b.tar.gz
freebsd-ports-gnome-dc5b133e16a9043584ef34d471cb91c78d80f04b.tar.zst
freebsd-ports-gnome-dc5b133e16a9043584ef34d471cb91c78d80f04b.zip
KDE FreeBSD team presents KDE SC 4.5.1.
New ports added: misc/kde4-l10n-ia - Interlingua localization for KDE
Diffstat (limited to 'x11/kdebase4/files')
-rw-r--r--x11/kdebase4/files/patch-apps__kinfocenter__base__CMakeLists.txt11
-rw-r--r--x11/kdebase4/files/patch-apps__kinfocenter__base__info_fbsd.cpp57
-rw-r--r--x11/kdebase4/files/patch-apps__kinfocenter__info__CMakeLists.txt11
-rw-r--r--x11/kdebase4/files/patch-apps_cmake_modules_FindPCIUTILS.cmake15
4 files changed, 0 insertions, 94 deletions
diff --git a/x11/kdebase4/files/patch-apps__kinfocenter__base__CMakeLists.txt b/x11/kdebase4/files/patch-apps__kinfocenter__base__CMakeLists.txt
deleted file mode 100644
index 72b28620dcec..000000000000
--- a/x11/kdebase4/files/patch-apps__kinfocenter__base__CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./apps/kinfocenter/base/CMakeLists.txt.orig 2008-04-18 11:21:39.000000000 +0400
-+++ ./apps/kinfocenter/base/CMakeLists.txt 2009-09-04 00:32:17.000000000 +0400
-@@ -2,7 +2,7 @@
- # TODO: HAVE_LIBDEVINFO_H (for Solaris 7 and later)
- # to be set if both -ldevinfo and libdevinfo.h exist
-
--check_include_files(devinfo.h HAVE_DEVINFO_H) # info_fbsd.cpp
-+check_include_files("sys/types.h;devinfo.h" HAVE_DEVINFO_H) # info_fbsd.cpp
- check_include_files(fstab.h HAVE_FSTAB_H) # info_linux.cpp
- check_include_files(linux/raw.h HAVE_LINUX_RAW_H) # info_linux.cpp
- check_include_files(mntent.h HAVE_MNTENT_H) # info_linux.cpp
diff --git a/x11/kdebase4/files/patch-apps__kinfocenter__base__info_fbsd.cpp b/x11/kdebase4/files/patch-apps__kinfocenter__base__info_fbsd.cpp
deleted file mode 100644
index 026806449c4e..000000000000
--- a/x11/kdebase4/files/patch-apps__kinfocenter__base__info_fbsd.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
---- ./apps/kinfocenter/base/info_fbsd.cpp.orig 2009-04-15 14:25:24.000000000 +0400
-+++ ./apps/kinfocenter/base/info_fbsd.cpp 2009-09-22 21:33:38.000000000 +0400
-@@ -211,28 +211,17 @@
- FILE *pipe;
- QFile *pcicontrol;
- QString s, cmd;
-+ QTextStream *t;
- QTreeWidgetItem *olditem= NULL;
-
- pcicontrol = new QFile("/usr/sbin/pciconf");
-
- if (!pcicontrol->exists()) {
-+ QStringList list;
-+ list << i18n("Could not find any programs with which to query your system's PCI information");
-+ new QTreeWidgetItem(tree, list);
- delete pcicontrol;
-- pcicontrol = new QFile("/usr/X11R6/bin/scanpci");
-- if (!pcicontrol->exists()) {
-- delete pcicontrol;
-- pcicontrol = new QFile("/usr/X11R6/bin/pcitweak");
-- if (!pcicontrol->exists()) {
-- QStringList list;
-- list << i18n("Could not find any programs with which to query your system's PCI information");
-- new QTreeWidgetItem(tree, list);
-- delete pcicontrol;
-- return true;
-- } else {
-- cmd = "/usr/X11R6/bin/pcitweak -l 2>&1";
-- }
-- } else {
-- cmd = "/usr/X11R6/bin/scanpci";
-- }
-+ return true;
- } else {
- cmd = "/usr/sbin/pciconf -l -v 2>&1";
- }
-@@ -247,8 +236,19 @@
- /* This prints out a list of all the pci devies, perhaps eventually we could
- parse it as opposed to schlepping it into a listbox */
-
-+ t = new QTextStream(pipe, QIODevice::ReadOnly);
-+
-+ while (true) {
-+ s = t->readLine();
-+ if (s.isEmpty() )
-+ break;
-+ QStringList list;
-+ list << s;
-+ new QTreeWidgetItem(tree, list);
-+ }
-+
-+ delete t;
- pclose(pipe);
-- GetInfo_ReadfromPipe(tree, cmd.toLatin1(), true);
- }
-
- if (!tree->topLevelItemCount()) {
diff --git a/x11/kdebase4/files/patch-apps__kinfocenter__info__CMakeLists.txt b/x11/kdebase4/files/patch-apps__kinfocenter__info__CMakeLists.txt
deleted file mode 100644
index c3b3c28f59fe..000000000000
--- a/x11/kdebase4/files/patch-apps__kinfocenter__info__CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./apps/kinfocenter/info/CMakeLists.txt.orig 2008-04-23 19:51:22.000000000 +0400
-+++ ./apps/kinfocenter/info/CMakeLists.txt 2009-09-04 00:42:28.000000000 +0400
-@@ -12,7 +12,7 @@
-
- kde4_add_plugin(kcm_info ${kcm_info_PART_SRCS})
-
--target_link_libraries(kcm_info ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} ${X11_X11_LIB})
-+target_link_libraries(kcm_info ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} ${X11_X11_LIB} devinfo)
-
-
- install(TARGETS kcm_info DESTINATION ${PLUGIN_INSTALL_DIR} )
diff --git a/x11/kdebase4/files/patch-apps_cmake_modules_FindPCIUTILS.cmake b/x11/kdebase4/files/patch-apps_cmake_modules_FindPCIUTILS.cmake
deleted file mode 100644
index 1cd6d43a3e33..000000000000
--- a/x11/kdebase4/files/patch-apps_cmake_modules_FindPCIUTILS.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
---- ./apps/cmake/modules/FindPCIUTILS.cmake.orig 2008-08-07 15:20:57.000000000 +0000
-+++ ./apps/cmake/modules/FindPCIUTILS.cmake 2008-12-27 11:49:04.000000000 +0000
-@@ -14,7 +14,11 @@
- FIND_LIBRARY(PCIUTILS_LIBRARY NAMES pci)
- if(PCIUTILS_LIBRARY)
- FIND_LIBRARY(RESOLV_LIBRARY NAMES resolv)
-- set(PCIUTILS_LIBRARIES ${PCIUTILS_LIBRARY} ${RESOLV_LIBRARY})
-+ if(RESOLV_LIBRARY)
-+ set(PCIUTILS_LIBRARIES ${PCIUTILS_LIBRARY} ${RESOLV_LIBRARY})
-+ else(RESOLV_LIBRARY)
-+ set(PCIUTILS_LIBRARIES ${PCIUTILS_LIBRARY})
-+ endif(RESOLV_LIBRARY)
- endif(PCIUTILS_LIBRARY)
-
-