tde-devels

devels@trinitydesktop.org

4 participants
3812 discussions

[PATCH tdenetwork 3/4] Fix a silly typo in the SMS protocol code.
by Nix 10 Jun '12

10 Jun '12

--- kopete/protocols/sms/services/smsclient.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kopete/protocols/sms/services/smsclient.cpp b/kopete/protocols/sms/services/smsclient.cpp index 9fb5a92..984e843 100644 --- a/kopete/protocols/sms/services/smsclient.cpp +++ b/kopete/protocols/sms/services/smsclient.cpp @@ -59,7 +59,7 @@ void SMSClient::send(const Kopete::Message& msg) m_msg = msg; KConfigGroup* c = m_account->configGroup(); - TQString provider = c->readEntry(TQString("%1:%2").arg("SMSClient").arg("ProviderName"); + TQString provider = c->readEntry(TQString("%1:%2").arg("SMSClient").arg("ProviderName")); if (provider.isNull()) { @@ -67,7 +67,7 @@ void SMSClient::send(const Kopete::Message& msg) return; } - TQString programName = c->readEntry(TQString("%1:%2").arg("SMSClient").arg("ProgramName"); + TQString programName = c->readEntry(TQString("%1:%2").arg("SMSClient").arg("ProgramName")); if (programName.isNull()) programName = "/usr/bin/sms_client"; @@ -97,14 +97,14 @@ TQWidget* SMSClient::configureWidget(TQWidget* parent) prefWidget->configDir->setMode(KFile::Directory); TQString configDir; if (m_account) - configDir = m_account->configGroup()->readEntry(TQString("%1:%2").arg("SMSClient").arg("ConfigDir"); + configDir = m_account->configGroup()->readEntry(TQString("%1:%2").arg("SMSClient").arg("ConfigDir")); if (configDir.isNull()) configDir = "/etc/sms"; prefWidget->configDir->setURL(configDir); TQString programName; if (m_account) - programName = m_account->configGroup()->readEntry(TQString("%1:%2").arg("SMSClient").arg("ProgramName"); + programName = m_account->configGroup()->readEntry(TQString("%1:%2").arg("SMSClient").arg("ProgramName")); if (programName.isNull()) programName = "/usr/bin/sms_client"; prefWidget->program->setURL(programName); -- 1.7.10.4.153.g8c399cf

1 0

[PATCH tdenetwork 2/4] Compile without V4L1 headers.
by Nix 10 Jun '12

10 Jun '12

These don't exist in recent Linux kernels. No V4L2 support yet, so you don't get video, and you have to remember to disable the motionautoaway plugin, but at least kopete builds again. --- kopete/ConfigureChecks.cmake | 7 +++++++ kopete/libkopete/avdevice/videocontrol.h | 2 -- kopete/libkopete/avdevice/videodevice.cpp | 2 -- kopete/libkopete/avdevice/videodevice.h | 10 +++++++--- kopete/libkopete/avdevice/videodevicepool.cpp | 2 -- kopete/libkopete/avdevice/videoinput.h | 2 -- 6 files changed, 14 insertions(+), 11 deletions(-) diff --git a/kopete/ConfigureChecks.cmake b/kopete/ConfigureChecks.cmake index aece436..70e97f5 100644 --- a/kopete/ConfigureChecks.cmake +++ b/kopete/ConfigureChecks.cmake @@ -26,3 +26,10 @@ if ( HAVE_LIBV4L1_VIDEODEV_H ) endif ( ) # -- End libv4l1-videodev.h ---------------------------------------------- +# -- Check for linux/videodev.h presence -------------------- +CHECK_INCLUDE_FILE ( "linux/videodev.h" HAVE_LINUX_VIDEODEV_H ) +if ( HAVE_LINUX_VIDEODEV_H ) + add_definitions( -DHAVE_LINUX_VIDEODEV_H ) +endif ( ) +# -- End linux-videodev.h ---------------------------------------------- + diff --git a/kopete/libkopete/avdevice/videocontrol.h b/kopete/libkopete/avdevice/videocontrol.h index c4db3b9..dbef6b5 100644 --- a/kopete/libkopete/avdevice/videocontrol.h +++ b/kopete/libkopete/avdevice/videocontrol.h @@ -15,8 +15,6 @@ ************************************************************************* */ -#define ENABLE_AV - #ifndef KOPETE_AVVIDEOCONTROL_H #define KOPETE_AVVIDEOCONTROL_H diff --git a/kopete/libkopete/avdevice/videodevice.cpp b/kopete/libkopete/avdevice/videodevice.cpp index ea23544..e12fb02 100644 --- a/kopete/libkopete/avdevice/videodevice.cpp +++ b/kopete/libkopete/avdevice/videodevice.cpp @@ -15,8 +15,6 @@ ************************************************************************* */ -#define ENABLE_AV - #include <cstdlib> #include <cerrno> #include <cstring> diff --git a/kopete/libkopete/avdevice/videodevice.h b/kopete/libkopete/avdevice/videodevice.h index 7bba507..7e57513 100644 --- a/kopete/libkopete/avdevice/videodevice.h +++ b/kopete/libkopete/avdevice/videodevice.h @@ -15,11 +15,11 @@ ************************************************************************* */ -#define ENABLE_AV - #ifndef KOPETE_AVVIDEODEVICELISTITEM_H #define KOPETE_AVVIDEODEVICELISTITEM_H +#define ENABLE_AV + #if defined HAVE_CONFIG_H #include <config.h> #endif @@ -54,8 +54,10 @@ #include <linux/kernel.h> #if defined(HAVE_LIBV4L1_VIDEODEV_H) #include <libv4l1-videodev.h> -#else +#elif defined(HAVE_LINUX_VIDEODEV_H) #include <linux/videodev.h> +#else +#undef ENABLE_AV #endif #define VIDEO_MODE_PAL_Nc 3 #define VIDEO_MODE_PAL_M 4 @@ -293,8 +295,10 @@ public: void enumerateMenu (void); #endif +#ifndef ENABLE_AV struct video_capability V4L_capabilities; struct video_buffer V4L_videobuffer; +#endif #endif TQValueVector<Kopete::AV::VideoInput> m_input; TQValueVector<Kopete::AV::VideoControl> m_control; diff --git a/kopete/libkopete/avdevice/videodevicepool.cpp b/kopete/libkopete/avdevice/videodevicepool.cpp index b725d5d..cbfe7cb 100644 --- a/kopete/libkopete/avdevice/videodevicepool.cpp +++ b/kopete/libkopete/avdevice/videodevicepool.cpp @@ -15,8 +15,6 @@ ************************************************************************* */ -#define ENABLE_AV - #include <assert.h> #include <cstdlib> #include <cerrno> diff --git a/kopete/libkopete/avdevice/videoinput.h b/kopete/libkopete/avdevice/videoinput.h index 9fc109a..dd7504f 100644 --- a/kopete/libkopete/avdevice/videoinput.h +++ b/kopete/libkopete/avdevice/videoinput.h @@ -15,8 +15,6 @@ ************************************************************************* */ -#define ENABLE_AV - #ifndef KOPETE_AVVIDEOINPUT_H #define KOPETE_AVVIDEOINPUT_H -- 1.7.10.4.153.g8c399cf

1 0

[PATCH tdenetwork 1/4] tde_message_error should be tde_message_fatal.
by Nix 10 Jun '12

10 Jun '12

tde_message_error does not exist, making the resulting error less than helpful. --- kopete/plugins/netmeeting/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kopete/plugins/netmeeting/CMakeLists.txt b/kopete/plugins/netmeeting/CMakeLists.txt index b6cc031..318b672 100644 --- a/kopete/plugins/netmeeting/CMakeLists.txt +++ b/kopete/plugins/netmeeting/CMakeLists.txt @@ -10,7 +10,7 @@ ################################################# if( NOT BUILD_KOPETE_PROTOCOL_MSN ) - tde_message_error( "netmeeting plugin needs msn protocol.\n Add -DBUILD_KOPETE_PROTOCOL_MSN=ON to cmake flags." ) + tde_message_fatal( "netmeeting plugin needs msn protocol.\n Add -DBUILD_KOPETE_PROTOCOL_MSN=ON to cmake flags." ) endif( ) include_directories( -- 1.7.10.4.153.g8c399cf

1 0

A bunch of trunk build patches coming
by Nix 10 Jun '12

10 Jun '12

So I just tried to migrate to trinity (from trunk as of two days ago, before the latest round of renaming patches). To keep things neat I'm sticking the whole thing excepting tqtinterface into a tree rooted at /usr/trinity/ (henceforward '$trinity_root'). I've built up to tdebase, I've noticed the following build problems (patches follow fixing those for which fixes seem practical). Non-build problems are mostly not mentioned here because I haven't restarted into TDE yet (I want to get more built before then). - If you install tqtinterface as suggested on the wiki, avahi-tqt fails to build: make[2]: Entering directory `/usr/src/kde/trinity/main/dependencies/x86_64-spindle/avahi-tqt' /usr/trinity/bin/moc moc qt-watch.cpp qt-watch.moc3 TQt meta object compiler moc: Too many input files specified This is in part because moc-tqt cannot be found. If we follow the wiki's instructions and install tqtinterface in /usr, it ends up in a different place from TQt and the configure-time search for tmoc fails. Moving tqtinterface into the $trinity_root fixes that, but then the hardwired -I/usr/include/tqt is wrong and the build fails again. The only fix I've found is to install tqtinterface into the $trinity_root, and then symlink /usr/include/tqt to that location. This is, not to put too fine a point on it, insane. I note that even if you *do* install tqtinterface into the $trinity_root, the pkg-config file ends up in ${prefix}/pkgconfig. This appears to be intentional, but is quite mystifying given that all you need to do to avoid it is to set PKG_CONFIG_PATH, which must be set anyway or the build of tqtinterface will fail (because qt-mt.pc is not in /usr/lib/pkgconfig but rather in $trinity_root/lib/pkgconfig.) Is the expectation nowadays that tqt3 is installed in /usr as well, or is this a bug? (I don't have a patch for this because I can't think of a non-insane fix.) - in konsole, meta is not recognized (only alt is). I have a pre-existing patch for this ancient KDE problem. - covariant return type checking is broken, because it's using the C compiler rather than the C++ compiler :) but even if that is fixed, the check still fails, because... - in the cmake FindTQt module, most of the CXXFLAGS are being missed out, leading to spurious failures in CheckCXXSourceRuns. Patches for the latter three problems follow (not as a single git patch series, though, because I can't figure out how to make one of those crossing multiple submodules: anyone?) -- NULL && (void)

2 2

update default - konqueror>Preview&Metadata>Maximum file size = 10M
by David C. Rankin 10 Jun '12

10 Jun '12

Darrell, Can we increase this default to about 10M? 1M is for 10 years ago :) -- David C. Rankin, J.D.,P.E.

2 5

Mime files in /opt/trinity/lib/mime
by Slávek Banko 10 Jun '12

10 Jun '12

Hi all, Chromium on my machine suddenly began to open PDF files in the GV. I began to wonder why and found that they follow entries in the file /etc/mailcap. It is generated automatically by update-mime using files in /usr/lib/mime. But some files are installed into /opt/trinity/lib/mime. I think we should fix that instead of /opt/trinity/lib/mime were all installed in /usr/lib/mime. What do you think? Slavek --

5 10

TDE 3.5.13 for Fedora 17
by Francois Andriot 10 Jun '12

10 Jun '12

Hello, a little message to inform you that TDE 3.5.13 (+some updates) is successfully compiled and packaged for Fedora 17 (gcc 4.7), i386 and x86_64. Now some work for Tim or anyone with sufficient access :-) Can you please: - Add Fedora 16 and Fedora 17 on the main page: http://www.trinitydesktop.org/ - Add Fedora 17 to the download instructions page: http://www.trinitydesktop.org/installation.php#redhat (copy/paste Fedora 16, replace f16 with f17 ...) - Enable the replication of the "f17" folder from my server to the TDE mirrors. I hope that we freeze a TDE 3.5.13.1 very soon so that I can build a Fedora 17 liveCD with the latest stable TDE version. Thanks François

3 14

[PATCH 1/2] Use check_cxx_source_runs for the covariant return test.
by Nix 09 Jun '12

09 Jun '12

--- CMakeLists.txt | 1 + khotkeys/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b87e76e..9e88e52 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,6 +23,7 @@ set( VERSION "R14" ) include( FindPkgConfig ) include( CheckIncludeFile ) include( CheckCSourceRuns ) +include( CheckCXXSourceRuns ) include( CheckCXXSourceCompiles ) include( CheckLibraryExists ) include( CheckFunctionExists ) diff --git a/khotkeys/CMakeLists.txt b/khotkeys/CMakeLists.txt index b2529ae..39c8411 100644 --- a/khotkeys/CMakeLists.txt +++ b/khotkeys/CMakeLists.txt @@ -9,7 +9,7 @@ # ################################################# -check_c_source_runs( " +check_cxx_source_runs( " class A { public: virtual A* me(); }; class X { public: int x; virtual void ff() {}; }; class B : public X, public A { public: virtual B* me(); }; -- 1.7.10.4.153.g8c399cf

1 1

[tdebase PATCH 2/2] konsole: treat Meta as a meta key as well as Alt.
by Nix 09 Jun '12

09 Jun '12

Some of us have a meta key that is more easily reachable than alt. (This is particularly common among Emacs users, but those of us with strange ergonomic keyboards are in this situation too.) --- konsole/konsole/TEmuVt102.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/konsole/konsole/TEmuVt102.cpp b/konsole/konsole/TEmuVt102.cpp index 76772ab..afdefbe 100644 --- a/konsole/konsole/TEmuVt102.cpp +++ b/konsole/konsole/TEmuVt102.cpp @@ -945,7 +945,8 @@ void TEmuVt102::onKeyPress( TQKeyEvent* ev ) encodeMode(MODE_AppScreen , BITS_AppScreen ) + // VT100 stuff encodeStat(TQt::ControlButton , BITS_Control ) + encodeStat(TQt::ShiftButton , BITS_Shift ) + - encodeStat(TQt::AltButton , BITS_Alt ), + encodeStat(TQt::AltButton , BITS_Alt ) + + encodeStat(TQt::MetaButton , BITS_Alt ), &cmd, &txt, &len, &metaspecified )) //printf("cmd: %d, %s, %d\n",cmd,txt,len); if (connected) @@ -977,7 +978,7 @@ void TEmuVt102::onKeyPress( TQKeyEvent* ev ) scr->setHistCursor(scr->getHistLines()); if (cmd==CMD_send) { - if ((ev->state() & TQt::AltButton) && !metaspecified ) sendString("\033"); + if (((ev->state() & TQt::AltButton) || (ev->state() & TQt::MetaButton)) && !metaspecified ) sendString("\033"); emit sndBlock(txt,len); return; } -- 1.7.10.4.153.g8c399cf

1 0

[PATCH main/common/cmake] Include the TQT_CFLAGS in TQT_CXX_FLAGS as well.
by Nix 09 Jun '12

09 Jun '12

That's the important set, -I and the like: TQT_CFLAGS_OTHER is less important (and often empty). --- modules/FindTQt.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/FindTQt.cmake b/modules/FindTQt.cmake index bf2ca8a..889a84c 100644 --- a/modules/FindTQt.cmake +++ b/modules/FindTQt.cmake @@ -86,6 +86,6 @@ tde_restore( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES ) # TQT_CXX_FLAGS -foreach( _flag ${TQT_CFLAGS_OTHER} ) +foreach( _flag ${TQT_CFLAGS} ${TQT_CFLAGS_OTHER} ) set( TQT_CXX_FLAGS "${TQT_CXX_FLAGS} ${_flag}" ) endforeach() -- 1.7.10.4.153.g8c399cf

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

tde-devels