diff --git a/.gitignore b/.gitignore index 85bdb6b..78ef2d1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ /krdc-icons.tar.bz2 -/kdenetwork-4.10.4.tar.xz /kdenetwork-4.10.5.tar.xz diff --git a/kdenetwork-4.10.0-kopete_system_iris.patch b/kdenetwork-4.10.0-kopete_system_iris.patch deleted file mode 100644 index 99cc7e1..0000000 --- a/kdenetwork-4.10.0-kopete_system_iris.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff -up kdenetwork-4.10.0/kopete/protocols/jabber/CMakeLists.txt.kopete_system_iris kdenetwork-4.10.0/kopete/protocols/jabber/CMakeLists.txt ---- kdenetwork-4.10.0/kopete/protocols/jabber/CMakeLists.txt.kopete_system_iris 2013-01-23 16:17:12.000000000 -0600 -+++ kdenetwork-4.10.0/kopete/protocols/jabber/CMakeLists.txt 2013-02-11 09:14:26.067395997 -0600 -@@ -1,19 +1,32 @@ - add_definitions(-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS -DIRIS_XMPP_JID_DEPRECATED) - - add_subdirectory( icons ) --add_subdirectory( libiris ) - - #FIXME:glib : necessary ? - include_directories( - ${KOPETE_INCLUDES} - ${CMAKE_CURRENT_SOURCE_DIR}/ui/ - ${CMAKE_CURRENT_SOURCE_DIR}/tasks/ -+) -+ -+if(USE_SYSTEM_IRIS) -+find_package(PkgConfig REQUIRED) -+pkg_check_modules(IRIS REQUIRED iris irisnet) -+include_directories( ${IRIS_INCLUDE_DIRS} ) -+link_directories( ${IRIS_LIBRARY_DIRS} ) -+else(USE_SYSTEM_IRIS) -+add_subdirectory( libiris ) -+ -+include_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/libiris/include/ - ${CMAKE_CURRENT_SOURCE_DIR}/libiris/iris/ - ${CMAKE_CURRENT_SOURCE_DIR}/libiris/iris/xmpp/jingle - ${QCA2_INCLUDE_DIR} - ) - -+link_directories( ${CMAKE_CURRENT_BINARY_DIR}/libiris/ ) -+endif(USE_SYSTEM_IRIS) -+ - if(BUILD_GOOGLETALK) - # We dont need other programs - set ( BUILD_libjingle_natserver false ) -@@ -43,9 +56,6 @@ IF(BUILD_JINGLE) - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/jingle) - ENDIF(BUILD_JINGLE) - --#link_directories( ${CMAKE_CURRENT_BINARY_DIR}/libiris/ ${CMAKE_CURRENT_BINARY_DIR}/jingle/ ) --link_directories( ${CMAKE_CURRENT_BINARY_DIR}/libiris/ ) -- - ########### next target ############### - - set(kopete_jabber_ui_SRCS -@@ -178,7 +188,12 @@ endif(BUILD_JINGLE) - kde4_add_plugin(kopete_jabber ${kopete_jabber_PART_SRCS}) - - --target_link_libraries(kopete_jabber ${KDE4_KDE3SUPPORT_LIBS} ${QCA2_LIBRARIES} ${KDE4_SOLID_LIBS} kopete iris_kopete) -+target_link_libraries(kopete_jabber ${KDE4_KDE3SUPPORT_LIBS} ${QCA2_LIBRARIES} ${KDE4_SOLID_LIBS} kopete) -+if(USE_SYSTEM_IRIS) -+target_link_libraries(kopete_jabber ${IRIS_LIBRARIES}) -+else(USE_SYSETM_IRIS) -+target_link_libraries(kopete_jabber iris_kopete) -+endif(USE_SYSTEM_IRIS) - if(BUILD_JINGLE) - target_link_libraries(kopete_jabber ortp asound speex) - endif(BUILD_JINGLE) diff --git a/kdenetwork-4.10.2-v4l_deprecations.patch b/kdenetwork-4.10.2-v4l_deprecations.patch deleted file mode 100644 index 09a167c..0000000 --- a/kdenetwork-4.10.2-v4l_deprecations.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -up kdenetwork-4.10.2/kopete/libkopete/avdevice/videodevice.cpp.v4l_deprecations kdenetwork-4.10.2/kopete/libkopete/avdevice/videodevice.cpp ---- kdenetwork-4.10.2/kopete/libkopete/avdevice/videodevice.cpp.v4l_deprecations 2013-02-28 23:22:39.148721688 -0600 -+++ kdenetwork-4.10.2/kopete/libkopete/avdevice/videodevice.cpp 2013-04-01 06:43:55.506441943 -0500 -@@ -3061,8 +3061,12 @@ const char *VideoDevice::getUnifiedV4L2S - case V4L2_CID_GAIN: return I18N_NOOP("Gain"); - case V4L2_CID_HFLIP: return I18N_NOOP("Horizontal Flip"); - case V4L2_CID_VFLIP: return I18N_NOOP("Vertical Flip"); -+#ifdef V4L2_CID_HCENTER // since kernel-3.9.0 - case V4L2_CID_HCENTER: return I18N_NOOP("Horizontal Center"); -+#endif -+#ifdef V4L2_CID_VCENTER // since kernel-3.9.0 - case V4L2_CID_VCENTER: return I18N_NOOP("Vertical Center"); -+#endif - #ifdef V4L2_CID_POWER_LINE_FREQUENCY // since kernel 2.6.25 - case V4L2_CID_POWER_LINE_FREQUENCY: return I18N_NOOP("Power Line Frequency"); - case V4L2_CID_HUE_AUTO: return I18N_NOOP("Automatic Hue"); diff --git a/kdenetwork-4.10.4-krdc_icon.patch b/kdenetwork-4.10.4-krdc_icon.patch deleted file mode 100644 index 45876bd..0000000 --- a/kdenetwork-4.10.4-krdc_icon.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -up kdenetwork-4.10.4/krdc/CMakeLists.txt.icon kdenetwork-4.10.4/krdc/CMakeLists.txt ---- kdenetwork-4.10.4/krdc/CMakeLists.txt.icon 2013-05-30 16:49:47.000000000 -0500 -+++ kdenetwork-4.10.4/krdc/CMakeLists.txt 2013-06-01 13:38:17.506707887 -0500 -@@ -87,7 +87,7 @@ kde4_add_ui_files(krdc_SRCS - config/general.ui - ) - --kde4_add_app_icon(krdc_SRCS "${KDE4_INSTALL_DIR}/share/icons/oxygen/*/apps/krdc.png") -+kde4_add_app_icon(krdc_SRCS "hi*-apps-krdc.png") - - kde4_add_executable(krdc ${krdc_SRCS}) - -@@ -124,3 +124,5 @@ endif() - if(NOT INSIDE_KDENETWORK) - macro_display_feature_log() - endif(NOT INSIDE_KDENETWORK) -+ -+kde4_install_icons( ${ICON_INSTALL_DIR} ) diff --git a/kdenetwork-4.10.5-freerdp.patch b/kdenetwork-4.10.5-freerdp.patch deleted file mode 100644 index 884d782..0000000 --- a/kdenetwork-4.10.5-freerdp.patch +++ /dev/null @@ -1,567 +0,0 @@ -diff -up kdenetwork-4.10.5/krdc/CMakeLists.txt.freerdp kdenetwork-4.10.5/krdc/CMakeLists.txt ---- kdenetwork-4.10.5/krdc/CMakeLists.txt.freerdp 2013-07-04 21:52:45.864029571 +0200 -+++ kdenetwork-4.10.5/krdc/CMakeLists.txt 2013-07-04 22:05:59.950275124 +0200 -@@ -29,7 +29,13 @@ endif(NOT INSIDE_KDENETWORK) - set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH}) - - macro_optional_find_package(LibVNCServer) --macro_log_feature(LIBVNCSERVER_FOUND "libvncserver" "VNC Server library" "http://libvncserver.sourceforge.net/" FALSE "0.9" "Needed to build Krfb and VNC support in Krdc") -+macro_log_feature(LIBVNCSERVER_FOUND "libvncserver" "VNC Server library" "http://libvncserver.sourceforge.net/" FALSE "0.9" "Needed to build Krfb and VNC support in KRDC") -+ -+FIND_PROGRAM(FREERDP_EXECUTABLE xfreerdp) -+if(FREERDP_EXECUTABLE) -+ set(FREERDP_EXECUTABLE_FOUND true) -+endif(FREERDP_EXECUTABLE) -+macro_log_feature(FREERDP_EXECUTABLE_FOUND "freerdp" "A free Remote Desktop Protocol (RDP) Implementation" "http://www.freerdp.com" FALSE "1.0.2" "Needed for RDP support in KRDC (at runtime)") - - # NX support is not ready for KDE 4.2; disabled (uwolfer) - # macro_optional_find_package(LibNXCL) -diff -up kdenetwork-4.10.5/krdc/core/krdc.kcfg.freerdp kdenetwork-4.10.5/krdc/core/krdc.kcfg ---- kdenetwork-4.10.5/krdc/core/krdc.kcfg.freerdp 2013-06-28 20:08:57.390483848 +0200 -+++ kdenetwork-4.10.5/krdc/core/krdc.kcfg 2013-07-04 21:52:45.865029569 +0200 -@@ -83,7 +83,7 @@ - 7 - - -- 0 -+ 2 - - - 0 -@@ -100,6 +100,15 @@ - - true - -+ -+ true -+ -+ -+ 2 -+ -+ -+ /media -+ - - - -diff -up kdenetwork-4.10.5/krdc/rdp/CMakeLists.txt.freerdp kdenetwork-4.10.5/krdc/rdp/CMakeLists.txt ---- kdenetwork-4.10.5/krdc/rdp/CMakeLists.txt.freerdp 2013-06-28 20:08:57.392483928 +0200 -+++ kdenetwork-4.10.5/krdc/rdp/CMakeLists.txt 2013-07-04 21:52:45.865029569 +0200 -@@ -1,9 +1,9 @@ - - if(Q_WS_X11) -- set(HAVE_RDESKTOP true) # TODO: implement cmake check? -+ set(HAVE_XFREERDP true) - endif(Q_WS_X11) - --if(HAVE_RDESKTOP) -+if(HAVE_XFREERDP) - add_definitions(-DKDE_DEFAULT_DEBUG_AREA=5012) - - include_directories( -@@ -49,4 +49,4 @@ if(HAVE_RDESKTOP) - - install(FILES rdp.protocol DESTINATION ${SERVICES_INSTALL_DIR}) - install(FILES smb2rdc.desktop DESTINATION ${SERVICES_INSTALL_DIR}/ServiceMenus) --endif(HAVE_RDESKTOP) -+endif(HAVE_XFREERDP) -diff -up kdenetwork-4.10.5/krdc/rdp/rdphostpreferences.cpp.freerdp kdenetwork-4.10.5/krdc/rdp/rdphostpreferences.cpp ---- kdenetwork-4.10.5/krdc/rdp/rdphostpreferences.cpp.freerdp 2013-06-28 20:08:57.392483928 +0200 -+++ kdenetwork-4.10.5/krdc/rdp/rdphostpreferences.cpp 2013-07-04 21:52:45.865029569 +0200 -@@ -1,6 +1,7 @@ - /**************************************************************************** - ** --** Copyright (C) 2007 Urs Wolfer -+** Copyright (C) 2007 - 2012 Urs Wolfer -+** Copyright (C) 2012 AceLan Kao - ** - ** This file is part of KDE. - ** -@@ -108,6 +109,9 @@ QWidget* RdpHostPreferences::createProto - rdpUi.kcfg_Sound->setCurrentIndex(sound()); - rdpUi.kcfg_Console->setChecked(console()); - rdpUi.kcfg_ExtraOptions->setText(extraOptions()); -+ rdpUi.kcfg_RemoteFX->setChecked(remoteFX()); -+ rdpUi.kcfg_Performance->setCurrentIndex(performance()); -+ rdpUi.kcfg_ShareMedia->setText(shareMedia()); - - connect(rdpUi.resolutionComboBox, SIGNAL(currentIndexChanged(int)), SLOT(updateWidthHeight(int))); - -@@ -172,6 +176,9 @@ void RdpHostPreferences::acceptConfig() - setSound(rdpUi.kcfg_Sound->currentIndex()); - setConsole(rdpUi.kcfg_Console->isChecked()); - setExtraOptions(rdpUi.kcfg_ExtraOptions->text()); -+ setRemoteFX(rdpUi.kcfg_RemoteFX->isChecked()); -+ setPerformance(rdpUi.kcfg_Performance->currentIndex()); -+ setShareMedia(rdpUi.kcfg_ShareMedia->text()); - } - - void RdpHostPreferences::setColorDepth(int colorDepth) -@@ -228,4 +235,36 @@ QString RdpHostPreferences::extraOptions - return m_configGroup.readEntry("extraOptions", Settings::extraOptions()); - } - -+void RdpHostPreferences::setRemoteFX(bool remoteFX) -+{ -+ m_configGroup.writeEntry("remoteFX", remoteFX); -+} -+ -+bool RdpHostPreferences::remoteFX() const -+{ -+ return m_configGroup.readEntry("remoteFX", Settings::remoteFX()); -+} -+ -+void RdpHostPreferences::setPerformance(int performance) -+{ -+ if (performance >= 0) -+ m_configGroup.writeEntry("performance", performance); -+} -+ -+int RdpHostPreferences::performance() const -+{ -+ return m_configGroup.readEntry("performance", Settings::performance()); -+} -+ -+void RdpHostPreferences::setShareMedia(const QString &shareMedia) -+{ -+ if (!shareMedia.isNull()) -+ m_configGroup.writeEntry("shareMedia", shareMedia); -+} -+ -+QString RdpHostPreferences::shareMedia() const -+{ -+ return m_configGroup.readEntry("shareMedia", Settings::shareMedia()); -+} -+ - #include "rdphostpreferences.moc" -diff -up kdenetwork-4.10.5/krdc/rdp/rdphostpreferences.h.freerdp kdenetwork-4.10.5/krdc/rdp/rdphostpreferences.h ---- kdenetwork-4.10.5/krdc/rdp/rdphostpreferences.h.freerdp 2013-06-28 20:08:57.392483928 +0200 -+++ kdenetwork-4.10.5/krdc/rdp/rdphostpreferences.h 2013-07-04 21:52:45.866029567 +0200 -@@ -1,6 +1,7 @@ - /**************************************************************************** - ** --** Copyright (C) 2007 Urs Wolfer -+** Copyright (C) 2007 - 2012 Urs Wolfer -+** Copyright (C) 2012 AceLan Kao - ** - ** This file is part of KDE. - ** -@@ -45,6 +46,12 @@ public: - bool console() const; - void setExtraOptions(const QString &extraOptions); - QString extraOptions() const; -+ void setRemoteFX(bool remoteFX); -+ bool remoteFX() const; -+ void setPerformance(int performance); -+ int performance() const; -+ void setShareMedia(const QString &shareMedia); -+ QString shareMedia() const; - - protected: - QWidget* createProtocolSpecificConfigPage(); -diff -up kdenetwork-4.10.5/krdc/rdp/rdppreferences.ui.freerdp kdenetwork-4.10.5/krdc/rdp/rdppreferences.ui ---- kdenetwork-4.10.5/krdc/rdp/rdppreferences.ui.freerdp 2013-06-28 20:08:57.392483928 +0200 -+++ kdenetwork-4.10.5/krdc/rdp/rdppreferences.ui 2013-07-04 21:52:45.866029567 +0200 -@@ -7,7 +7,7 @@ - 0 - 0 - 484 -- 406 -+ 452 - - - -@@ -415,6 +415,12 @@ - - - -+ -+ -+ 280 -+ 0 -+ -+ - - - On This Computer -@@ -432,6 +438,87 @@ - - - -+ -+ -+ -+ Performance: -+ -+ -+ kcfg_Performance -+ -+ -+ -+ -+ -+ -+ -+ 280 -+ 0 -+ -+ -+ -+ -+ Modem -+ -+ -+ -+ -+ Broadband -+ -+ -+ -+ -+ LAN -+ -+ -+ -+ -+ -+ -+ -+ RemoteFX: -+ -+ -+ kcfg_RemoteFX -+ -+ -+ -+ -+ -+ -+ Enable RemoteFX -+ -+ -+ RemoteFX covers a set of technologies that enhance visual experience of the Remote Desktop Protocol. -+ -+ -+ -+ -+ -+ -+ Share Media: -+ -+ -+ kcfg_ShareMedia -+ -+ -+ -+ -+ -+ -+ -+ 280 -+ 0 -+ -+ -+ -+ Share a local media directory with the remote host. -+ -+ -+ true -+ -+ -+ - - - -@@ -541,15 +628,15 @@ - - - -- KLineEdit -- QLineEdit --
klineedit.h
-- -- - KComboBox - QComboBox -
kcombobox.h
- -+ -+ KLineEdit -+ QLineEdit -+
klineedit.h
-+ - - - resolutionComboBox -@@ -558,6 +645,9 @@ - kcfg_ColorDepth - kcfg_KeyboardLayout - kcfg_Sound -+ kcfg_Performance -+ kcfg_RemoteFX -+ kcfg_ShareMedia - kcfg_Console - kcfg_ExtraOptions - kcfg_DefaultRdpUserName -diff -up kdenetwork-4.10.5/krdc/rdp/rdpview.cpp.freerdp kdenetwork-4.10.5/krdc/rdp/rdpview.cpp ---- kdenetwork-4.10.5/krdc/rdp/rdpview.cpp.freerdp 2013-06-28 20:08:57.392483928 +0200 -+++ kdenetwork-4.10.5/krdc/rdp/rdpview.cpp 2013-07-04 21:52:45.866029567 +0200 -@@ -1,7 +1,8 @@ - /**************************************************************************** - ** - ** Copyright (C) 2002 Arend van Beelen jr. --** Copyright (C) 2007 Urs Wolfer -+** Copyright (C) 2007 - 2012 Urs Wolfer -+** Copyright (C) 2012 AceLan Kao - ** - ** This file is part of KDE. - ** -@@ -167,39 +168,72 @@ bool RdpView::start() - arguments << "-X" << QString::number(m_container->winId()); - arguments << "-a" << QString::number((m_hostPreferences->colorDepth() + 1) * 8); - -- QString sound; - switch (m_hostPreferences->sound()) { -+ case 1: -+ arguments << "-o"; -+ break; -+ case 0: -+ arguments << "--plugin" << "rdpsnd"; -+ break; -+ case 2: -+ default: -+ break; -+ } -+ -+ if (!m_hostPreferences->shareMedia().isEmpty()) { -+ QStringList shareMedia; -+ shareMedia << "--plugin" << "rdpdr" << "--data" << "disk:media:" + m_hostPreferences->shareMedia() << "--"; -+ arguments += shareMedia; -+ } -+ -+ QString performance; -+ switch (m_hostPreferences->performance()) { - case 0: -- sound = "local"; -+ performance = "m"; - break; - case 1: -- sound = "remote"; -+ performance = "b"; - break; - case 2: -+ performance = "l"; -+ break; - default: -- sound = "off"; -+ break; - } -- arguments << "-r" << "sound:" + sound; -+ -+ arguments << "-x" << performance; - - if (m_hostPreferences->console()) { - arguments << "-0"; - } - -+ if (m_hostPreferences->remoteFX()) { -+ arguments << "--rfx"; -+ } -+ - if (!m_hostPreferences->extraOptions().isEmpty()) { - const QStringList additionalArguments = KShell::splitArgs(m_hostPreferences->extraOptions()); - arguments += additionalArguments; - } - -+ // krdc has no support for certificate management yet; it would not be possbile to connect to any host: -+ // "The host key for example.com has changed" ... -+ // "Add correct host key in ~/.freerdp/known_hosts to get rid of this message." -+ arguments << "--ignore-certificate"; -+ - arguments << (m_host + ':' + QString::number(m_port)); - -+ kDebug(5012) << "Starting xfreerdp with arguments:" << arguments; -+ - setStatus(Connecting); - - connect(m_process, SIGNAL(error(QProcess::ProcessError)), SLOT(processError(QProcess::ProcessError))); - connect(m_process, SIGNAL(readyReadStandardError()), SLOT(receivedStandardError())); -+ connect(m_process, SIGNAL(readyReadStandardOutput()), SLOT(receivedStandardOutput())); - connect(m_container, SIGNAL(clientClosed()), SLOT(connectionClosed())); - connect(m_container, SIGNAL(clientIsEmbedded()), SLOT(connectionOpened())); - -- m_process->start("rdesktop", arguments); -+ m_process->start("xfreerdp", arguments); - - return true; - } -@@ -242,45 +276,85 @@ void RdpView::connectionClosed() - m_quitFlag = true; - } - -+void RdpView::connectionError() -+{ -+ emit disconnectedError(); -+ connectionClosed(); -+} -+ - void RdpView::processError(QProcess::ProcessError error) - { -+ kDebug(5012) << "processError:" << error; - if (m_quitFlag) // do not try to show error messages while quitting (prevent crashes) - return; - - if (m_status == Connecting) { -- setStatus(Disconnected); -- - if (error == QProcess::FailedToStart) { -- KMessageBox::error(0, i18n("Could not start \"rdesktop\"; make sure rdesktop is properly installed."), -+ KMessageBox::error(0, i18n("Could not start \"xfreerdp\"; make sure xfreerdp is properly installed."), - i18n("RDP Failure")); -+ connectionError(); - return; - } -+ } -+} - -- if (m_clientVersion.isEmpty()) { -- KMessageBox::error(0, i18n("Connection attempt to host failed."), -- i18n("Connection Failure")); -- } else { -- KMessageBox::error(0, i18n("The version of \"rdesktop\" you are using (%1) is too old:\n" -- "rdesktop 1.3.2 or greater is required.", m_clientVersion), -+void RdpView::receivedStandardError() -+{ -+ const QString output(m_process->readAllStandardError()); -+ kDebug(5012) << "receivedStandardError:" << output; -+ QString line; -+ int i = 0; -+ while (!(line = output.section('\n', i, i)).isEmpty()) { -+ -+ // the following error is issued by freerdp because of a bug in freerdp 1.0.1 and below; -+ // see: https://github.com/FreeRDP/FreeRDP/pull/576 -+ //"X Error of failed request: BadWindow (invalid Window parameter) -+ // Major opcode of failed request: 7 (X_ReparentWindow) -+ // Resource id in failed request: 0x71303348 -+ // Serial number of failed request: 36 -+ // Current serial number in output stream: 36" -+ if (line.contains(QLatin1String("X_ReparentWindow"))) { -+ KMessageBox::error(0, i18n("The version of \"xfreerdp\" you are using is too old.\n" -+ "xfreerdp 1.0.2 or greater is required."), - i18n("RDP Failure")); -+ connectionError(); -+ return; - } -- emit disconnectedError(); -+ i++; - } - } - --void RdpView::receivedStandardError() -+void RdpView::receivedStandardOutput() - { -- const QString output(m_process->readAllStandardError()); -+ const QString output(m_process->readAllStandardOutput()); -+ kDebug(5012) << "receivedStandardOutput:" << output; - QString line; - int i = 0; - while (!(line = output.section('\n', i, i)).isEmpty()) { -- if (line.startsWith(QLatin1String("Version "))) { -- m_clientVersion = line.section(' ', 1, 1); -- m_clientVersion = m_clientVersion.left(m_clientVersion.length() - 1); -+ -+ // full xfreerdp message: "transport_connect: getaddrinfo (Name or service not known)" -+ if (line.contains(QLatin1String("Name or service not known"))) { -+ KMessageBox::error(0, i18n("Name or service not known."), -+ i18n("Connection Failure")); -+ connectionError(); -+ return; -+ -+ // full xfreerdp message: "unable to connect to example.com:3389" -+ } else if (line.contains(QLatin1String("unable to connect to"))) { -+ KMessageBox::error(0, i18n("Connection attempt to host failed."), -+ i18n("Connection Failure")); -+ connectionError(); -+ return; -+ -+ // looks like some generic xfreerdp error message, handle it if nothing was handled: -+ // "Error: protocol security negotiation failure" -+ } else if (line.contains(QLatin1String("Error: protocol security negotiation failure"))) { -+ KMessageBox::error(0, i18n("Connection attempt to host failed."), -+ i18n("Connection Failure")); -+ connectionError(); - return; -- } else { -- kDebug(5012) << "Process error output: " << line; - } -+ - i++; - } - } -diff -up kdenetwork-4.10.5/krdc/rdp/rdpviewfactory.cpp.freerdp kdenetwork-4.10.5/krdc/rdp/rdpviewfactory.cpp ---- kdenetwork-4.10.5/krdc/rdp/rdpviewfactory.cpp.freerdp 2013-06-28 20:08:57.393483968 +0200 -+++ kdenetwork-4.10.5/krdc/rdp/rdpviewfactory.cpp 2013-07-04 21:52:45.867029564 +0200 -@@ -37,7 +37,7 @@ RdpViewFactory::RdpViewFactory(QObject * - - m_connectToolTipString = i18n("Connect to a Windows Remote Desktop (RDP)"); - -- QMetaObject::invokeMethod(this, "checkRdektopAvailability", Qt::DirectConnection); -+ QMetaObject::invokeMethod(this, "checkFreerdpAvailability", Qt::DirectConnection); - } - - RdpViewFactory::~RdpViewFactory() -@@ -80,10 +80,10 @@ QString RdpViewFactory::connectToolTipTe - "Example: rdpserver:3389 (host:port)"); - } - --void RdpViewFactory::checkRdektopAvailability() -+void RdpViewFactory::checkFreerdpAvailability() - { -- if (KStandardDirs::findExe("rdesktop").isEmpty()) { -- m_connectToolTipString += '\n' + i18n("The application \"rdesktop\" cannot be found on your system; make sure it is properly installed " -+ if (KStandardDirs::findExe("xfreerdp").isEmpty()) { -+ m_connectToolTipString += '\n' + i18n("The application \"xfreerdp\" cannot be found on your system; make sure it is properly installed " - "if you need RDP support."); - } - } -diff -up kdenetwork-4.10.5/krdc/rdp/rdpviewfactory.h.freerdp kdenetwork-4.10.5/krdc/rdp/rdpviewfactory.h ---- kdenetwork-4.10.5/krdc/rdp/rdpviewfactory.h.freerdp 2013-06-28 20:08:57.393483968 +0200 -+++ kdenetwork-4.10.5/krdc/rdp/rdpviewfactory.h 2013-07-04 21:52:45.867029564 +0200 -@@ -53,7 +53,7 @@ public: - virtual QString connectToolTipText() const; - - private Q_SLOTS: -- void checkRdektopAvailability(); -+ void checkFreerdpAvailability(); - - private: - QString m_connectToolTipString; -diff -up kdenetwork-4.10.5/krdc/rdp/rdpview.h.freerdp kdenetwork-4.10.5/krdc/rdp/rdpview.h ---- kdenetwork-4.10.5/krdc/rdp/rdpview.h.freerdp 2013-06-28 20:08:57.392483928 +0200 -+++ kdenetwork-4.10.5/krdc/rdp/rdpview.h 2013-07-04 21:52:45.867029564 +0200 -@@ -84,17 +84,18 @@ private: - - // other properties - bool m_quitFlag; // if set: die -- QString m_clientVersion; // version number returned by rdesktop -- QX11EmbedContainer *m_container; // container for the rdesktop window -- QProcess *m_process; // rdesktop process -+ QX11EmbedContainer *m_container; // container for the xfreerdp window -+ QProcess *m_process; // xfreerdp process - - RdpHostPreferences *m_hostPreferences; - - private slots: -- void connectionOpened(); // called if rdesktop started -- void connectionClosed(); // called if rdesktop quits -- void processError(QProcess::ProcessError error); // called if rdesktop dies -- void receivedStandardError(); // catches rdesktop debug output -+ void connectionOpened(); // called if xfreerdp started -+ void connectionClosed(); // called if xfreerdp quits -+ void connectionError(); // called if xfreerdp quits with error -+ void processError(QProcess::ProcessError error); // called if xfreerdp dies -+ void receivedStandardError(); // catches xfreerdp debug output -+ void receivedStandardOutput(); // catches xfreerdp output - }; - - #endif diff --git a/kdenetwork-4.10.5-kget-doc.patch b/kdenetwork-4.10.5-kget-doc.patch deleted file mode 100644 index d484110..0000000 --- a/kdenetwork-4.10.5-kget-doc.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -up kdenetwork-4.10.5/kget/CMakeLists.txt.doc kdenetwork-4.10.5/kget/CMakeLists.txt ---- kdenetwork-4.10.5/kget/CMakeLists.txt.doc 2013-06-28 20:07:00.880861754 +0200 -+++ kdenetwork-4.10.5/kget/CMakeLists.txt 2013-07-04 22:46:57.926817860 +0200 -@@ -100,6 +100,7 @@ add_subdirectory(sounds) - add_subdirectory(desktop) - add_subdirectory(plasma) - add_subdirectory(tests) -+add_subdirectory(doc) - - macro_optional_find_package(KDE4Workspace) - macro_log_feature(KDE4WORKSPACE_FOUND "KDE4Workspace" "KDE4 workspace libraries, part of kdebase-workspace" "http://www.kde.org" FALSE "" "Allows 'shutdown after downloads completed' in kget") -diff -up kdenetwork-4.10.5/kget/doc/CMakeLists.txt.doc kdenetwork-4.10.5/kget/doc/CMakeLists.txt ---- kdenetwork-4.10.5/kget/doc/CMakeLists.txt.doc 2013-07-04 22:52:39.996059175 +0200 -+++ kdenetwork-4.10.5/kget/doc/CMakeLists.txt 2013-07-04 22:53:13.530983851 +0200 -@@ -1,2 +1,2 @@ - ########### install files ############### --kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en) -+kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kget) diff --git a/kdenetwork-4.10.5-kppp-strict-aliasing.patch b/kdenetwork-4.10.5-kppp-strict-aliasing.patch deleted file mode 100644 index be8b435..0000000 --- a/kdenetwork-4.10.5-kppp-strict-aliasing.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up kdenetwork-4.10.5/kppp/CMakeLists.txt.strict-aliasing kdenetwork-4.10.5/kppp/CMakeLists.txt ---- kdenetwork-4.10.5/kppp/CMakeLists.txt.strict-aliasing 2013-07-04 16:30:56.283149816 +0200 -+++ kdenetwork-4.10.5/kppp/CMakeLists.txt 2013-07-04 16:33:44.846797838 +0200 -@@ -26,6 +26,8 @@ if(NOT INSIDE_KDENETWORK) - include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES}) - endif(NOT INSIDE_KDENETWORK) - -+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing") -+ - check_include_files(sys/param.h HAVE_SYS_PARAM_H) - check_include_files(net/if_ppp.h HAVE_NET_IF_PPP_H) - check_include_files(linux/if_ppp.h HAVE_LINUX_IF_PPP_H) diff --git a/kdenetwork-4.10.5-mediastreamer29.patch b/kdenetwork-4.10.5-mediastreamer29.patch deleted file mode 100644 index fc8f80e..0000000 --- a/kdenetwork-4.10.5-mediastreamer29.patch +++ /dev/null @@ -1,65 +0,0 @@ ---- kdenetwork-4.10.5/kopete/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc 2013-06-28 21:08:21.977067748 +0300 -+++ kdenetwork-4.10.5/kopete/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc 2013-07-07 17:41:21.629547119 +0300 -@@ -143,7 +143,7 @@ void LinphoneMediaChannel::SetCodecs(con - LOG(LS_INFO) << "Using " << i->name << "/" << i->clockrate; - pt_ = i->id; - audio_stream_ = audio_stream_start(&av_profile, -1, "localhost", port1, i->id, 250, 0); /* -1 means that function will choose some free port */ -- port2 = rtp_session_get_local_port(audio_stream_->session); -+ port2 = rtp_session_get_local_port(audio_stream_->ms.session); - first = false; - } - } -@@ -154,7 +154,7 @@ void LinphoneMediaChannel::SetCodecs(con - // working with a buggy client; let's try PCMU. - LOG(LS_WARNING) << "Received empty list of codces; using PCMU/8000"; - audio_stream_ = audio_stream_start(&av_profile, -1, "localhost", port1, 0, 250, 0); /* -1 means that function will choose some free port */ -- port2 = rtp_session_get_local_port(audio_stream_->session); -+ port2 = rtp_session_get_local_port(audio_stream_->ms.session); - } - - } ---- kdenetwork-4.10.5/kopete/protocols/jabber/googletalk/libjingle/talk/p2p/base/stun.h 2013-06-28 21:08:21.972067548 +0300 -+++ kdenetwork-4.10.5/kopete/protocols/jabber/googletalk/libjingle/talk/p2p/base/stun.h 2013-07-08 00:21:15.690170614 +0300 -@@ -25,18 +25,8 @@ - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - --#ifndef __STUN_H__ --#define __STUN_H__ -- --// This file contains classes for dealing with the STUN and TURN protocols. --// Both protocols use the same wire format. -- --#include "talk/base/basictypes.h" --#include "talk/base/bytebuffer.h" --#include --#include -- --namespace cricket { -+#ifndef STUN__HH__IN__STUNREQUEST__HH__CYCLIC_PROBLEM_FIX -+#define STUN__HH__IN__STUNREQUEST__HH__CYCLIC_PROBLEM_FIX - - // These are the types of STUN & TURN messages as of last check. - enum StunMessageType { -@@ -55,6 +45,21 @@ enum StunMessageType { - STUN_DATA_INDICATION = 0x0115 - }; - -+#endif // STUN__HH__IN__STUNREQUEST__HH__CYCLIC_PROBLEM_FIX -+ -+#ifndef __STUN_H__ -+#define __STUN_H__ -+ -+// This file contains classes for dealing with the STUN and TURN protocols. -+// Both protocols use the same wire format. -+ -+#include "talk/base/basictypes.h" -+#include "talk/base/bytebuffer.h" -+#include -+#include -+ -+namespace cricket { -+ - // These are the types of attributes defined in STUN & TURN. Next to each is - // the name of the class (T is StunTAttribute) that implements that type. - enum StunAttributeType { diff --git a/kdenetwork-4.3.3-resolv-conf-path.patch b/kdenetwork-4.3.3-resolv-conf-path.patch deleted file mode 100644 index 012b8a8..0000000 --- a/kdenetwork-4.3.3-resolv-conf-path.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up kdenetwork-4.3.3/kppp/connect.cpp.resolv-conf-path kdenetwork-4.3.3/kppp/connect.cpp ---- kdenetwork-4.3.3/kppp/connect.cpp.resolv-conf-path 2008-01-05 00:59:27.000000000 +0100 -+++ kdenetwork-4.3.3/kppp/connect.cpp 2009-11-23 14:42:15.629662654 +0100 -@@ -1491,7 +1491,7 @@ void addpeerdns() { - int fd, fd2; - - if((fd = Requester::rq->openResolv(O_WRONLY|O_APPEND)) >= 0) { -- if((fd2 = open("/etc/ppp/resolv.conf", O_RDONLY)) >= 0) { -+ if((fd2 = open("/var/run/ppp/resolv.conf", O_RDONLY)) >= 0) { - char c; - int i = 0; - while(i++ < 100 && read(fd2, &c, 1) == 1) { -@@ -1502,7 +1502,7 @@ void addpeerdns() { - } - close(fd2); - } else -- fprintf(stderr, "failed to read from /etc/ppp/resolv.conf\n"); -+ fprintf(stderr, "failed to read from /var/run/ppp/resolv.conf\n"); - close(fd); - } - add_domain(gpppdata.domain()); diff --git a/kdenetwork-4.7.97-fix-for-g++47.patch b/kdenetwork-4.7.97-fix-for-g++47.patch deleted file mode 100644 index 45f8b35..0000000 --- a/kdenetwork-4.7.97-fix-for-g++47.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up kdenetwork-4.7.97/kopete/protocols/qq/evautil.cpp.fix-for-g++47 kdenetwork-4.7.97/kopete/protocols/qq/evautil.cpp ---- kdenetwork-4.7.97/kopete/protocols/qq/evautil.cpp.fix-for-g++47 2011-07-27 20:25:46.000000000 +0200 -+++ kdenetwork-4.7.97/kopete/protocols/qq/evautil.cpp 2012-01-05 14:15:01.660149348 +0100 -@@ -78,7 +78,9 @@ namespace Eva { - plain[0] = ( rand() & 0xf8 ) | pos; - memset( plain_pre, 0, 8 ); - memset( crypted_pre, 0, 8 ); -- memset( plain+1, rand()& 0xff, pos++ ); -+ if( pos ) -+ memset( plain+1, rand()& 0xff, pos ); -+ pos++; - - // pad 2 bytes - for( i = 0; i< 2; i++ ) diff --git a/kdenetwork-4.9.5-libjingle_openssl.patch b/kdenetwork-4.9.5-libjingle_openssl.patch deleted file mode 100644 index 946b6f4..0000000 --- a/kdenetwork-4.9.5-libjingle_openssl.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up kdenetwork-4.9.5/kopete/protocols/jabber/googletalk/libjingle/talk/base/openssladapter.cc.libjingle_openssl kdenetwork-4.9.5/kopete/protocols/jabber/googletalk/libjingle/talk/base/openssladapter.cc ---- kdenetwork-4.9.5/kopete/protocols/jabber/googletalk/libjingle/talk/base/openssladapter.cc.libjingle_openssl 2012-11-29 18:32:55.000000000 -0600 -+++ kdenetwork-4.9.5/kopete/protocols/jabber/googletalk/libjingle/talk/base/openssladapter.cc 2012-12-29 15:54:09.768759196 -0600 -@@ -648,7 +648,7 @@ OpenSSLAdapter::SSLPostConnectionCheck(S - int extension_nid = OBJ_obj2nid(X509_EXTENSION_get_object(extension)); - - if (extension_nid == NID_subject_alt_name) { --#if OPENSSL_VERSION_NUMBER >= 0x1000000fL -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L - const X509V3_EXT_METHOD* meth = X509V3_EXT_get(extension); - #else - X509V3_EXT_METHOD* meth = X509V3_EXT_get(extension); diff --git a/kdenetwork.spec b/kdenetwork.spec index 00725fa..cc0646e 100644 --- a/kdenetwork.spec +++ b/kdenetwork.spec @@ -1,139 +1,39 @@ -%if 0%{?fedora} -## disable: kopete can't use google talk http://bugzilla.redhat.com/963310 -#define use_system_iris 1 -%endif - -%if 0%{?fedora} > 18 -%define freerdp 1 -%endif - -%if 0%{?rhel} > 6 -%define freerdp 1 -%endif - Summary: KDE Network Applications Name: kdenetwork Epoch: 7 -Version: 4.10.5 -Release: 3%{?dist} +Version: 4.11.0 +Release: 6%{?dist} License: GPLv2 -URL: http://www.kde.org -%global revision %(echo %{version} | cut -d. -f3) -%if %{revision} >= 50 -%global stable unstable -%else -%global stable stable -%endif -Source0: http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.tar.xz -Source1: krdc-icons.tar.bz2 -Source2: kppp.console -Source3: kppp.pam - -# fixes build with linphone 3.6.1 (only in Rawhide F20 for now) https://bugs.kde.org/show_bug.cgi?id=318825 -# also commit needs to be backported https://projects.kde.org/projects/kde/kdenetwork/kopete/repository/revisions/16a4d05c11eb8b09dce64e3447a64d59461dd6cf -Patch1: kdenetwork-4.10.5-mediastreamer29.patch - -# rhbz#540433 - KPPP is unable to add DNS entries to /etc/resolv.conf -Patch2: kdenetwork-4.3.3-resolv-conf-path.patch - -# Fix build failure with g++4.7 -Patch3: kdenetwork-4.7.97-fix-for-g++47.patch - -# support USE_SYSTEM_IRIS build option -Patch4: kdenetwork-4.10.0-kopete_system_iris.patch - -# warning: dereferencing type-punned pointer will break strict-aliasing rules -Patch5: kdenetwork-4.10.5-kppp-strict-aliasing.patch - -## upstreamable patches -Patch50: kdenetwork-4.9.5-libjingle_openssl.patch -Patch51: kdenetwork-4.10.4-krdc_icon.patch -Patch52: kdenetwork-4.10.5-kget-doc.patch - -## upstream patches -Patch100: kdenetwork-4.10.5-freerdp.patch - -## security patches +URL: http://www.kde.org/ +BuildArch: noarch +Requires: %{name}-common = %{epoch}:%{version}-%{release} +Requires: kdenetwork-filesharing >= %{version} %if 0%{?fedora} -BuildRequires: openslp-devel -BuildRequires: pkgconfig(avahi-compat-libdns_sd) -BuildRequires: pkgconfig(libgadu) >= 1.8.0 -BuildRequires: pkgconfig(libotr) -BuildRequires: libktorrent-devel -BuildRequires: pkgconfig(nxcl) -%global telepathy 1 -BuildRequires: pkgconfig(TelepathyQt4) -BuildRequires: linphone-devel >= 2.3.0 +Requires: kdenetwork-strigi-analyzers >= %{epoch}:%{version} %endif -BuildRequires: boost-devel -BuildRequires: expat-devel -BuildRequires: giflib-devel -BuildRequires: gmp-devel -# gnutls-devel is needed for rfbclient -BuildRequires: gnutls-devel -BuildRequires: gpgme-devel -# libkonq -BuildRequires: kde-baseapps-devel >= %{version} -BuildRequires: kde-workspace-devel >= %{version} -BuildRequires: kdepimlibs-devel >= %{version} -BuildRequires: libjpeg-devel -BuildRequires: pkgconfig(alsa) -BuildRequires: pkgconfig(glib-2.0) -BuildRequires: pkgconfig(jasper) -BuildRequires: pkgconfig(libidn) -BuildRequires: pkgconfig(libmsn) -BuildRequires: pkgconfig(libpcre) -BuildRequires: pkgconfig(libstreamanalyzer) pkgconfig(libstreams) -BuildRequires: pkgconfig(libxslt) -BuildRequires: pkgconfig(meanwhile) -BuildRequires: pkgconfig(ortp) -%if 0%{?use_system_iris:1} -BuildRequires: pkgconfig(iris) >= 2.0.0 -%endif -BuildRequires: pkgconfig(qca2) -BuildRequires: pkgconfig(qimageblitz) -BuildRequires: pkgconfig(soprano) -BuildRequires: pkgconfig(speex) -BuildRequires: pkgconfig(sqlite3) -BuildRequires: pkgconfig(libv4l2) -BuildRequires: libvncserver-devel -BuildRequires: openldap-devel -%if 0%{?freerdp} -# freerdp support -BuildRequires: freerdp >= 1.0.2 -%endif -#----------------------------------------------------------------------------- -#-- The following OPTIONAL packages could NOT be located on your system. -#-- Consider installing them to enable more features from this software. -#----------------------------------------------------------------------------- -# * XMMS -# X MultiMedia System development libraries -# Used by the Kopete nowlistening plugin to support the XMMS player. - -Requires: %{name}-common = %{epoch}:%{version}-%{release} -Requires: %{name}-fileshare-samba = %{epoch}:%{version}-%{release} -Requires: %{name}-kdnssd = %{epoch}:%{version}-%{release} -Requires: %{name}-kget = %{epoch}:%{version}-%{release} -Requires: %{name}-kopete = %{epoch}:%{version}-%{release} -Requires: %{name}-kppp = %{epoch}:%{version}-%{release} -Requires: %{name}-krdc = %{epoch}:%{version}-%{release} -Requires: %{name}-krfb = %{epoch}:%{version}-%{release} +Requires: kdnssd >= %{version} +Requires: kget >= %{version} +Requires: kopete >= %{version} +Requires: kppp >= %{version} +Requires: krdc >= %{version} +Requires: krfb >= %{version} %description Networking applications, including: -* kget: downloader manager -* kopete: chat client -* kppp: dialer and front end for pppd -* krdc: a client for Desktop Sharing and other VNC servers -* krfb: Desktop Sharing server, allow others to access your desktop via VNC +* kdenetwork-filesharing: Network filesharing +* kdnssd: Network Monitor for DNS-SD services (Zeroconf) +* kget: Downloade manager +* kopete: Chat client +* kppp: Dialer and front end for pppd +* krdc: Remote desktop client +* krfb: Desktop sharing %package common Summary: Common files for %{name} -BuildArch: noarch -# when split occurred +# when (initial) split occurred Conflicts: kdenetwork < 7:4.6.95-10 Obsoletes: kdenetwork-libs < 7:4.6.95-10 %description common @@ -142,192 +42,19 @@ Obsoletes: kdenetwork-libs < 7:4.6.95-10 %package devel Summary: Development files for %{name} Requires: %{name}-common = %{epoch}:%{version}-%{release} -Requires: %{name}-kopete-devel = %{epoch}:%{version}-%{release} -Requires: %{name}-krdc-devel = %{epoch}:%{version}-%{release} -BuildArch: noarch +Requires: kopete-devel >= %{version} +Requires: krdc-devel >= %{version} %description devel %{summary}. -%package fileshare-samba -Summary: Share files via samba -Requires: %{name}-common = %{epoch}:%{version}-%{release} -Requires: samba -%description fileshare-samba -%{summary}. - -%package strigi-analyzers -Summary: meta information plugin for BitTorrent files -Requires: %{name}-common = %{epoch}:%{version}-%{release} -%description strigi-analyzers -%{summary}. - -%package kdnssd -Summary: Kdnssd -Requires: %{name}-common = %{epoch}:%{version}-%{release} -%description kdnssd -%{summary}. - -%package kget -Summary: A downloader manager -Requires: %{name}-common = %{epoch}:%{version}-%{release} -Requires: %{name}-kget-libs%{?_isa} = %{epoch}:%{version}-%{release} -%description kget -%{summary}. - -%package kget-libs -Summary: Runtime libraries for %{name} -Requires: %{name}-kget = %{epoch}:%{version}-%{release} -%description kget-libs -%{summary}. - -%package kppp -Summary: A dialer and front end for pppd -Requires: %{name}-common = %{epoch}:%{version}-%{release} -Requires: ppp -# consolehelper -Requires: usermode-gtk -%description kppp -%{summary}. - -%package kopete -Summary: A chat client -Requires: %{name}-kopete-libs%{?_isa} = %{epoch}:%{version}-%{release} -Requires: kate-part >= %{version} -Requires: mozilla-filesystem -# jabber -Requires: qca-ossl%{?_isa} -%description kopete -%{summary}. - -%package kopete-libs -Summary: Runtime libraries for %{name} -Requires: %{name}-common = %{epoch}:%{version}-%{release} -Requires: %{name}-kopete = %{epoch}:%{version}-%{release} -%description kopete-libs -%{summary}. - -%package kopete-devel -Summary: Development files for Kopete -Requires: %{name}-kopete-libs%{?_isa} = %{epoch}:%{version}-%{release} -Requires: kdelibs4-devel -%description kopete-devel -%{summary}. - -%package krdc -Summary: A client for Desktop Sharing and other VNC servers -Requires: %{name}-krdc-libs%{?_isa} = %{epoch}:%{version}-%{release} -Requires: freerdp -%description krdc -%{summary}. - -%package krdc-libs -Summary: Runtime libraries for %{name} -Requires: %{name}-common = %{epoch}:%{version}-%{release} -Requires: %{name}-krdc = %{epoch}:%{version}-%{release} -%description krdc-libs -%{summary}. - -%package krdc-devel -Summary: Developer files for %{name} -Requires: %{name}-krdc-libs%{?_isa} = %{epoch}:%{version}-%{release} -Requires: kdelibs4-devel -%description krdc-devel -%{summary}. - -%package krfb -Summary: Desktop Sharing server, allow others to access your desktop via VNC -Requires: %{name}-krfb-libs%{?_isa} = %{epoch}:%{version}-%{release} -# https://bugzilla.redhat.com/655844 -Provides: bundled(libvncserver) -%description krfb -%{summary}. - -%package krfb-libs -Summary: Runtime libraries for %{name} -Requires: %{name}-common = %{epoch}:%{version}-%{release} -Requires: %{name}-krfb = %{epoch}:%{version}-%{release} -%description krfb-libs -%{summary}. - - %prep -%setup -q -n kdenetwork-%{version} -a1 -%if 0%{?fedora} > 18 -%patch1 -p1 -b .mediastreamer29 -%endif -%patch2 -p1 -b .resolv-conf-path -%patch3 -p1 -b .fix-for-g++47 -%patch4 -p1 -b .kopete_system_iris -%patch5 -p1 -b .strict-aliasing -%patch50 -p1 -b .libjingle_openssl -%patch51 -p1 -b .krdc_icon -%patch52 -p1 -b .doc - -%if 0%{?freerdp} -%patch100 -p1 -b .freerdp -%endif - -%if 0%{?use_system_iris:1} -mv kopete/protocols/jabber/libiris \ - kopete/protocols/jabber/libiris.BAK -%endif - -%if 0%{?rhel} -sed -i 's|macro_optional_add_subdirectory( kdenetwork-strigi-analyzers )|#macro_optional_add_subdirectory( kdenetwork-strigi-analyzers )|g' CMakeLists.txt -%endif %build -mkdir -p %{_target_platform} -pushd %{_target_platform} -%{cmake_kde4} \ - -DWITH_JINGLE=TRUE \ - -DMOZPLUGIN_INSTALL_DIR=%{_libdir}/mozilla/plugins \ - %{?use_system_iris:-DUSE_SYSTEM_IRIS:BOOL=ON} \ - .. -popd - -make %{?_smp_mflags} -C %{_target_platform} - +# blank %install -rm -rf %{buildroot} - -make install/fast DESTDIR=%{buildroot} -C %{_target_platform} - -# fix documentation multilib conflict in index.cache -for f in kget kopete kppp krdc krfb; do - bunzip2 %{buildroot}%{_kde4_docdir}/HTML/en/$f/index.cache.bz2 - sed -i -e 's!name="id[a-z]*[0-9]*"!!g' %{buildroot}%{_kde4_docdir}/HTML/en/$f/index.cache - sed -i -e 's!#id[a-z]*[0-9]*"!!g' %{buildroot}%{_kde4_docdir}/HTML/en/$f/index.cache - bzip2 -9 %{buildroot}%{_kde4_docdir}/HTML/en/$f/index.cache -done - -# Run kppp through consolehelper -mkdir -p %{buildroot}%{_sbindir} \ - %{buildroot}%{_sysconfdir}/security/console.apps \ - %{buildroot}%{_sysconfdir}/pam.d -chmod 0755 %{buildroot}%{_bindir}/kppp -mv %{buildroot}%{_bindir}/kppp %{buildroot}%{_sbindir} -ln -s consolehelper %{buildroot}%{_bindir}/kppp -install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/security/console.apps/kppp -install -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/pam.d/kppp - - -%find_lang kget --with-kde --without-mo -%find_lang kopete --with-kde --without-mo -%find_lang kppp --with-kde --without-mo -%find_lang krdc --with-kde --without-mo -%find_lang krfb --with-kde --without-mo - -# unpackaged files -rm -f %{buildroot}%{_kde4_libdir}/libkgetcore.so - - -%check -for f in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do - desktop-file-validate $f -done +# blank %files @@ -337,231 +64,36 @@ done # blank %files common -#doc README COPYING* -%files fileshare-samba -%{_kde4_libdir}/kde4/sambausershareplugin.so -%{_kde4_datadir}/kde4/services/sambausershareplugin.desktop -%if 0%{?fedora} -%files strigi-analyzers -%{_kde4_libdir}/strigi/strigita_torrent_analyzer.so -%endif +%changelog +* Thu Aug 22 2013 Rex Dieter 7:4.11.0-6 +- re-enable, all done. yay -%files kdnssd -%{_kde4_datadir}/kde4/services/zeroconf.protocol -%{_kde4_datadir}/kde4/services/kded/dnssdwatcher.desktop -%{_datadir}/dbus-1/interfaces/org.kde.kdnssd.xml -%dir %{_kde4_appsdir}/remoteview/ -%{_kde4_appsdir}/remoteview/zeroconf.desktop -%{_kde4_libdir}/kde4/kded_dnssdwatcher.so -%{_kde4_libdir}/kde4/kio_zeroconf.so - -%post kget -touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||: - -%posttrans kget -gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||: -update-desktop-database -q &> /dev/null ||: - -%postun kget -if [ $1 -eq 0 ] ; then - touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||: - gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||: - update-desktop-database -q &> /dev/null ||: -fi - -%files kget -f kget.lang -%{_kde4_bindir}/kget -%{_kde4_appsdir}/dolphinpart/kpartplugins/kget_plug_in.* -%{_kde4_appsdir}/kget/ -%{_kde4_appsdir}/kconf_update/kget* -%{_kde4_appsdir}/khtml/kpartplugins/kget_plug_in.* -%{_kde4_appsdir}/kwebkitpart/kpartplugins/kget_plug_in.* -%{_kde4_iconsdir}/hicolor/*/apps/kget.* -%{_datadir}/dbus-1/services/org.kde.kget.service -%{_kde4_datadir}/applications/kde4/kget.desktop -%{_kde4_datadir}/kde4/services/kget*.desktop -%{_kde4_datadir}/kde4/services/plasma-engine-kget.desktop -%{_kde4_datadir}/kde4/services/plasma-runner-kget.desktop -%{_kde4_datadir}/kde4/servicetypes/kget*.desktop -%{_kde4_datadir}/config.kcfg/kget*.kcfg -%{_kde4_datadir}/ontology/kde/kget* -%{_kde4_libdir}/kde4/kget_*.so -%{_kde4_datadir}/kde4/services/ServiceMenus/kget_download.desktop -%{_kde4_libdir}/kde4/kcm_kget_*.so -%{_kde4_libdir}/kde4/krunner_kget.so -%{_kde4_libdir}/kde4/plasma_engine_kget.so -%{_kde4_libdir}/kde4/plasma_kget_barapplet.so -%{_kde4_libdir}/kde4/plasma_kget_piechart.so - -%post kget-libs -p /sbin/ldconfig -%postun kget-libs -p /sbin/ldconfig - -%files kget-libs -%{_kde4_libdir}/libkgetcore.so.4* - -%post kopete -touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||: -touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||: - -%posttrans kopete -gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||: -gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||: -update-desktop-database -q &> /dev/null ||: - -%postun kopete -if [ $1 -eq 0 ] ; then - touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||: - touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||: - gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||: - gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||: - update-desktop-database -q &> /dev/null ||: -fi - -%files kopete -f kopete.lang -%if 0%{?fedora} -%{_kde4_bindir}/googletalk-call -%endif -%{_kde4_bindir}/kopete -%{_kde4_bindir}/winpopup* -%{_kde4_appsdir}/kopete* -%{_kde4_appsdir}/kconf_update/kopete* -%{_libdir}/mozilla/plugins/skypebuttons.so -%{_kde4_configdir}/kopeterc -%{_datadir}/dbus-1/interfaces/org.kde.Kopete.xml -%{_datadir}/dbus-1/interfaces/org.kde.kopete.*.xml -%{_kde4_datadir}/applications/kde4/kopete.desktop -%{_kde4_datadir}/config.kcfg/kopete* -%{_kde4_datadir}/sounds/Kopete_* -%{_kde4_datadir}/sounds/KDE-Im-Phone-Ring.wav -%{_kde4_datadir}/kde4/services/aim.protocol -%{_kde4_datadir}/kde4/services/callto.protocol -%{_kde4_datadir}/kde4/services/chatwindow.desktop -%{_kde4_datadir}/kde4/services/emailwindow.desktop -%{_kde4_datadir}/kde4/services/kopete_*.desktop -%{_kde4_datadir}/kde4/services/kconfiguredialog/ -%{_kde4_datadir}/kde4/services/skype.protocol -%{_kde4_datadir}/kde4/services/tel.protocol -%{_kde4_datadir}/kde4/services/xmpp.protocol -%{_kde4_datadir}/kde4/servicetypes/kopete*.desktop -%{_kde4_iconsdir}/hicolor/*/apps/kopete*.* -%{_kde4_iconsdir}/oxygen/*/actions/* -%if 0%{?fedora} -%{_kde4_iconsdir}/oxygen/*/status/object-locked*.* -%endif -%{_kde4_libdir}/kde4/kopete_*.so -%{_kde4_libdir}/kde4/kcm_kopete_*.so -%{_kde4_libdir}/libqgroupwise.so -%{_kde4_bindir}/kopete_latexconvert.sh -%{_kde4_libdir}/kde4/libchattexteditpart.so -%{_kde4_datadir}/config.kcfg/historyconfig.kcfg -%{_kde4_datadir}/config.kcfg/latexconfig.kcfg -%{_kde4_datadir}/config.kcfg/nowlisteningconfig.kcfg -%{_kde4_datadir}/config.kcfg/translatorconfig.kcfg -%{_kde4_datadir}/config.kcfg/urlpicpreview.kcfg -%{_kde4_datadir}/config.kcfg/webpresenceconfig.kcfg - -%post kopete-libs -p /sbin/ldconfig -%postun kopete-libs -p /sbin/ldconfig - -%files kopete-libs -%{_kde4_libdir}/kde4/plugins/accessible/ -%{_kde4_libdir}/libkopete*.so.* -%{_kde4_libdir}/libkyahoo.so* -%{_kde4_libdir}/liboscar.so* - -%files kopete-devel -%{_kde4_includedir}/kopete/ -%{_kde4_libdir}/libkopete*.so - -%post kppp -touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||: - -%posttrans kppp -gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||: - -%postun kppp -if [ $1 -eq 0 ] ; then - touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||: - gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||: -fi - -%files kppp -f kppp.lang -%{_sbindir}/kppp -%{_kde4_bindir}/kppp* -%config(noreplace) %{_sysconfdir}/security/console.apps/kppp -%config(noreplace) %{_sysconfdir}/pam.d/kppp -%{_kde4_appsdir}/kppp/ -%{_kde4_datadir}/applications/kde4/Kppp.desktop -%{_kde4_datadir}/applications/kde4/kppplogview.desktop -%{_kde4_iconsdir}/hicolor/*/apps/kppp.* -%{_datadir}/dbus-1/interfaces/org.kde.kppp.xml - -%post krdc -touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||: - -%posttrans krdc -gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||: - -%postun krdc -if [ $1 -eq 0 ] ; then - touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||: - gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||: -fi - -%files krdc -f krdc.lang -%{_kde4_bindir}/krdc -%{_kde4_appsdir}/krdc/ -%{_kde4_datadir}/applications/kde4/krdc.desktop -%{_kde4_datadir}/kde4/services/krdc_*.desktop -%{_kde4_datadir}/kde4/services/rdp.protocol -%{_kde4_datadir}/kde4/services/vnc.protocol -%{_kde4_datadir}/kde4/servicetypes/krdc*.desktop -%{_kde4_iconsdir}/hicolor/*/apps/krdc.* -%{_kde4_libdir}/kde4/kcm_krdc*.so -%{_kde4_datadir}/kde4/services/ServiceMenus/smb2rdc.desktop -%{_kde4_datadir}/config.kcfg/krdc.kcfg -%{_kde4_libdir}/kde4/krdc_*.so -%if 0%{?telepathy:1} -%{_kde4_bindir}/krdc_rfb_approver -%{_kde4_appsdir}/krdc_rfb_approver/ -%{_datadir}/dbus-1/services/org.freedesktop.Telepathy.Client.krdc_rfb_approver.service -%{_datadir}/dbus-1/services/org.freedesktop.Telepathy.Client.krdc_rfb_handler.service -%{_datadir}/telepathy/clients/krdc_rfb_approver.client -%{_datadir}/telepathy/clients/krdc_rfb_handler.client -%endif +* Wed Aug 21 2013 Jan Grulich - 7:4.11.0-5 +- disable some missing dependencies -%post krdc-libs -p /sbin/ldconfig -%postun krdc-libs -p /sbin/ldconfig - -%files krdc-libs -%{_kde4_libdir}/libkrdccore.so.4* - -%files krdc-devel -%{_kde4_includedir}/krdc/ -%{_kde4_libdir}/libkrdccore.so - -%files krfb -f krfb.lang -%{_kde4_bindir}/krfb -%{_kde4_appsdir}/krfb/ -%{_kde4_datadir}/applications/kde4/krfb.desktop -%{_kde4_datadir}/kde4/services/krfb_*.desktop -%{_kde4_datadir}/kde4/servicetypes/krfb*.desktop -%{_kde4_libdir}/kde4/krfb_*.so -%if 0%{?telepathy:1} -%{_datadir}/dbus-1/services/org.freedesktop.Telepathy.Client.krfb_rfb_handler.service -%{_datadir}/telepathy/clients/krfb_rfb_handler.client -%endif +* Wed Aug 14 2013 Rex Dieter 7:4.11.0-4 +- include strigi-analyzers only in fedora -%post krfb-libs -p /sbin/ldconfig -%postun krfb-libs -p /sbin/ldconfig +* Mon Aug 12 2013 Rex Dieter 7:4.11.0-3 +- epoch typo -%files krfb-libs -%{_kde4_libdir}/libkrfbprivate.so.4* +* Sun Aug 11 2013 Rex Dieter 7:4.11.0-2 +- Requires: kdenetwork-strigi-analyzers +* Thu Aug 08 2013 Than Ngo - 7:4.11.0-1 +- 4.11.0 + +* Mon Aug 05 2013 Rex Dieter 7:4.10.97-2 +- metapackage + +* Sat Aug 03 2013 Fedora Release Engineering - 7:4.10.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Tue Jul 30 2013 Petr Machata - 7:4.10.5-4 +- Rebuild for boost 1.54.0 -%changelog * Thu Jul 18 2013 Petr Pisar - 7:4.10.5-3 - Perl 5.18 rebuild diff --git a/kppp.console b/kppp.console deleted file mode 100644 index c8dca9c..0000000 --- a/kppp.console +++ /dev/null @@ -1,3 +0,0 @@ -USER=root -PROGRAM=/usr/sbin/kppp -SESSION=true diff --git a/kppp.pam b/kppp.pam deleted file mode 100644 index a3d8388..0000000 --- a/kppp.pam +++ /dev/null @@ -1,4 +0,0 @@ -#%PAM-1.0 -auth include config-util -account include config-util -session include config-util diff --git a/sources b/sources index dd33e56..e69de29 100644 --- a/sources +++ b/sources @@ -1,2 +0,0 @@ -7dd360a790100c952090410c2c89937c krdc-icons.tar.bz2 -b1321dd31d909475f1d4bf9942d2aaba kdenetwork-4.10.5.tar.xz