diff options
Diffstat (limited to 'x11/kde4-workspace/files')
8 files changed, 11 insertions, 124 deletions
diff --git a/x11/kde4-workspace/files/kdm4.in b/x11/kde4-workspace/files/kdm4.in index 493263007b9a..5ef3706a987e 100644 --- a/x11/kde4-workspace/files/kdm4.in +++ b/x11/kde4-workspace/files/kdm4.in @@ -1,5 +1,7 @@ #!/bin/sh # +# $FreeBSD$ +# # PROVIDE: kdm4 # REQUIRE: LOGIN cleanvar moused syscons dbus hald # diff --git a/x11/kde4-workspace/files/patch-CMakeLists.txt b/x11/kde4-workspace/files/patch-CMakeLists.txt index 6fea1f815c21..24b0b4d2b235 100644 --- a/x11/kde4-workspace/files/patch-CMakeLists.txt +++ b/x11/kde4-workspace/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ ---- ./CMakeLists.txt.orig 2010-07-29 01:04:56.000000000 +0400 -+++ ./CMakeLists.txt 2010-08-03 14:45:37.785806201 +0400 -@@ -84,7 +84,7 @@ +--- ./CMakeLists.txt.orig 2011-07-19 23:37:36.000000000 +0200 ++++ ./CMakeLists.txt 2011-08-09 20:45:40.975563521 +0200 +@@ -90,7 +90,7 @@ configure_file(config-unix.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-unix.h ) configure_file(config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h ) if(NOT CMAKE_INSTALL_PREFIX STREQUAL "/usr") @@ -9,19 +9,3 @@ endif(NOT CMAKE_INSTALL_PREFIX STREQUAL "/usr") configure_file(startkde.cmake ${CMAKE_CURRENT_BINARY_DIR}/startkde @ONLY) endif(NOT WIN32) -@@ -223,13 +223,13 @@ - macro_write_basic_cmake_version_file(${CMAKE_CURRENT_BINARY_DIR}/KDE4WorkspaceConfigVersion.cmake - ${KDE4WORKSPACE_VERSION_MAJOR} ${KDE4WORKSPACE_VERSION_MINOR} ${KDE4WORKSPACE_VERSION_PATCH}) - --set(_KDE4WorkspaceConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/KDE4Workspace-${KDE4WORKSPACE_VERSION}/cmake) -+set(_KDE4WorkspaceConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/KDE4Workspace/cmake) - # places where find_package() looks for FooConfig.cmake files: - # CMake >= 2.6.0 looks in lib/Foo*/cmake/, CMake >= 2.6.3 also looks in - # lib/cmake/Foo*/, which packagers prefer. So they can set the KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR - # option to have kdepimlibs install its Config file there. Alex - if(KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR) -- set(_KDE4WorkspaceConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/KDE4Workspace-${KDE4WORKSPACE_VERSION} ) -+ set(_KDE4WorkspaceConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/KDE4Workspace ) - endif(KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR) - - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/KDE4WorkspaceConfig.cmake diff --git a/x11/kde4-workspace/files/patch-kinfocenter__Modules__base__CMakeLists.txt b/x11/kde4-workspace/files/patch-kinfocenter__Modules__base__CMakeLists.txt index c119c41f92ee..b8c999de736a 100644 --- a/x11/kde4-workspace/files/patch-kinfocenter__Modules__base__CMakeLists.txt +++ b/x11/kde4-workspace/files/patch-kinfocenter__Modules__base__CMakeLists.txt @@ -1,11 +1,10 @@ ---- ./kinfocenter/Modules/base/CMakeLists.txt.orig 2008-04-18 11:21:39.000000000 +0400 -+++ ./kinfocenter/Modules/base/CMakeLists.txt 2009-09-04 00:32:17.000000000 +0400 -@@ -2,7 +2,7 @@ +--- ./kinfocenter/Modules/base/CMakeLists.txt.orig 2011-05-20 22:32:07.000000000 +0200 ++++ ./kinfocenter/Modules/base/CMakeLists.txt 2011-08-09 20:48:13.345451554 +0200 +@@ -1,6 +1,6 @@ # 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 + + configure_file (../base/config-infocenter.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-infocenter.h ) diff --git a/x11/kde4-workspace/files/patch-kwin-kcmkwin-kwinrules_ruleswidget.cpp b/x11/kde4-workspace/files/patch-kwin-kcmkwin-kwinrules_ruleswidget.cpp index 946eb9395aae..0bf69a12c2cb 100644 --- a/x11/kde4-workspace/files/patch-kwin-kcmkwin-kwinrules_ruleswidget.cpp +++ b/x11/kde4-workspace/files/patch-kwin-kcmkwin-kwinrules_ruleswidget.cpp @@ -1,4 +1,4 @@ ---- ./kwin/kcmkwin/kwinrules/ruleswidget.cpp.orgi 2008-01-30 00:38:06.000000000 +0100 +--- ./kwin/kcmkwin/kwinrules/ruleswidget.cpp.orig 2008-01-30 00:38:06.000000000 +0100 +++ ./kwin/kcmkwin/kwinrules/ruleswidget.cpp 2008-01-30 00:38:38.000000000 +0100 @@ -30,6 +30,7 @@ diff --git a/x11/kde4-workspace/files/patch-plasma-generic-dataengines-geolocation-location_gps.cpp b/x11/kde4-workspace/files/patch-plasma-generic-dataengines-geolocation-location_gps.cpp deleted file mode 100644 index 7bdf60248966..000000000000 --- a/x11/kde4-workspace/files/patch-plasma-generic-dataengines-geolocation-location_gps.cpp +++ /dev/null @@ -1,54 +0,0 @@ ---- plasma/generic/dataengines/geolocation/location_gps.cpp.orig 2011-03-23 00:33:55.000000000 +0300 -+++ plasma/generic/dataengines/geolocation/location_gps.cpp 2011-03-23 00:48:57.000000000 +0300 -@@ -17,7 +17,7 @@ - - #include "location_gps.h" - --Gpsd::Gpsd(gps_data_t* gpsdata) -+Gpsd::Gpsd(gps_data_t gpsdata) - : m_gpsdata(gpsdata) - , m_abort(false) - { -@@ -41,24 +41,20 @@ - - void Gpsd::run() - { --#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 3 ) && defined( WATCH_ENABLE ) -- gps_stream(m_gpsdata, WATCH_ENABLE, NULL); --#else -- gps_query(m_gpsdata, "w+x\n"); --#endif -+ gps_stream(&m_gpsdata, WATCH_ENABLE, NULL); - - while (!m_abort) { - Plasma::DataEngine::Data d; - -- if (gps_poll(m_gpsdata) != -1) { -+ if (gps_read(&m_gpsdata) > 0) { - //kDebug() << "poll ok"; -- if (m_gpsdata->online) { -+ if (m_gpsdata.online) { - //kDebug() << "online"; -- if (m_gpsdata->status != STATUS_NO_FIX) { -+ if (m_gpsdata.status != STATUS_NO_FIX) { - //kDebug() << "fix"; - d["accuracy"] = 30; -- d["latitude"] = QString::number(m_gpsdata->fix.latitude); -- d["longitude"] = QString::number(m_gpsdata->fix.longitude); -+ d["latitude"] = QString::number(m_gpsdata.fix.latitude); -+ d["longitude"] = QString::number(m_gpsdata.fix.longitude); - } - } - } -@@ -73,8 +69,9 @@ - : GeolocationProvider(parent, args), - m_gpsd(0) - { -- gps_data_t* gpsdata = gps_open("localhost", DEFAULT_GPSD_PORT); -- if (gpsdata) { -+ gps_data_t gpsdata; -+ -+ if (gps_open("localhost", DEFAULT_GPSD_PORT, &gpsdata) == 0) { - kDebug() << "gpsd found."; - m_gpsd = new Gpsd(gpsdata); - connect(m_gpsd, SIGNAL(dataReady(const Plasma::DataEngine::Data&)), diff --git a/x11/kde4-workspace/files/patch-plasma-generic-dataengines-geolocation-location_gps.h b/x11/kde4-workspace/files/patch-plasma-generic-dataengines-geolocation-location_gps.h deleted file mode 100644 index f160691c8840..000000000000 --- a/x11/kde4-workspace/files/patch-plasma-generic-dataengines-geolocation-location_gps.h +++ /dev/null @@ -1,20 +0,0 @@ ---- plasma/generic/dataengines/geolocation/location_gps.h.orig 2011-03-23 00:37:50.000000000 +0300 -+++ plasma/generic/dataengines/geolocation/location_gps.h 2011-03-23 00:41:05.000000000 +0300 -@@ -29,7 +29,7 @@ - { - Q_OBJECT - public: -- Gpsd(gps_data_t* gpsdata); -+ Gpsd(gps_data_t gpsdata); - virtual ~Gpsd(); - - void update(); -@@ -41,7 +41,7 @@ - virtual void run(); - - private: -- gps_data_t* m_gpsdata; -+ gps_data_t m_gpsdata; - QMutex m_mutex; - QWaitCondition m_condition; - bool m_abort; diff --git a/x11/kde4-workspace/files/patch-plasma__generic__scriptengines__CMakeLists.txt b/x11/kde4-workspace/files/patch-plasma__generic__scriptengines__CMakeLists.txt deleted file mode 100644 index 70cbed35b559..000000000000 --- a/x11/kde4-workspace/files/patch-plasma__generic__scriptengines__CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ ---- ./plasma/generic/scriptengines/CMakeLists.txt.orig 2009-09-16 15:41:05.000000000 +0400 -+++ ./plasma/generic/scriptengines/CMakeLists.txt 2010-06-26 19:18:34.136233668 +0400 -@@ -1,11 +1,9 @@ --macro_optional_add_subdirectory(ruby) - - if(QT_QTWEBKIT_FOUND) - macro_optional_add_subdirectory(webkit) - endif(QT_QTWEBKIT_FOUND) - - if (PythonSupport_FOUND AND NOT WIN32) -- macro_optional_add_subdirectory(python) - endif (PythonSupport_FOUND AND NOT WIN32) - - if(GOOGLEGADGETS_FOUND) diff --git a/x11/kde4-workspace/files/pkg-message.in b/x11/kde4-workspace/files/pkg-message.in deleted file mode 100644 index d48b4affeea0..000000000000 --- a/x11/kde4-workspace/files/pkg-message.in +++ /dev/null @@ -1,10 +0,0 @@ -===================================================================== - -To enable KDE Display Manager (KDM), add the following lines -to /etc/rc.conf: -local_startup="${local_startup} %%PREFIX%%/etc/rc.d" -kdm4_enable="YES" - -You also need procfs to be mounted. See man procfs for details. - -===================================================================== |