xumix писал(а): ↑28.12.2009 00:37
вытянуть trunk,
наложить патч
Код: Выделить всё
Index: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt (revision 704)
+++ trunk/CMakeLists.txt (working copy)
@@ -124,5 +124,8 @@
SET (HAVE_SSL 0)
SET (USING_OPENSSL 0)
ENDIF (OPENSSL_FOUND)
+IF (UNIX)
+SET (INOTIFY 1)
+ENDIF (UNIX)
ADD_SUBDIRECTORY (dclib)
ADD_SUBDIRECTORY (eiskaltdc)
Index: trunk/eiskaltdc/config.h.in
===================================================================
--- trunk/eiskaltdc/config.h.in (revision 704)
+++ trunk/eiskaltdc/config.h.in (working copy)
@@ -11,6 +11,7 @@
#cmakedefine HAVE_SYS_STAT_H 1
#cmakedefine HAVE_SYS_TYPES_H 1
#cmakedefine HAVE_UNISTD_H 1
+#cmakedefine INOTIFY 1
#define EISKALTDC_BUILD_INFO "Build date: ${BUILDDATE} svn: ${SVNVERSION}"
Index: trunk/eiskaltdc/dcgui.cpp
===================================================================
--- trunk/eiskaltdc/dcgui.cpp (revision 704)
+++ trunk/eiskaltdc/dcgui.cpp (working copy)
@@ -64,11 +64,9 @@
#include "dcquickconnect.h"
#include "dcfilehasher.h"
-#ifndef WIN32
-#ifndef OSX
+#ifdef INOTIFY
#include "dcinotifycontrol.h"
#endif
-#endif
#include "dcclient.h"
#include "dcantispam.h"
@@ -378,7 +376,7 @@
fileHubReconnect->setStatusTip(tr("Reconnect to the disconnected hub"));
connect(fileHubReconnect, SIGNAL(triggered()), this, SLOT(slotHubReconnect()));
-#ifndef WIN32
+#ifdef INOTIFY
fileInotifyEnable = new QAction(this);
fileInotifyEnable->setText(tr("Inotify enabled"));
fileInotifyEnable->setStatusTip(tr("Enables INotify support"));
@@ -896,7 +894,7 @@
pQuickOptionsMenu->addActions(fileDefaultDldGroup->actions());
pQuickOptionsMenu->setTitle(tr("Quick Options"));
pQuickOptionsMenu->setIcon(QIcon(DCIconLoader::Instance()->GetPixmap(eiQUICKOPTIONS)));
-#ifndef WIN32
+#ifdef INOTIFY
pInotify = new QMenu(this);
pInotify->setTitle(tr("INotify"));
pInotify->setIcon(QIcon(DCIconLoader::Instance()->GetPixmap(eiINOTIFY)));
@@ -910,7 +908,7 @@
pFileMenu->addAction(fileFileListBrowser);
pFileMenu->addAction(fileFileListBrowserLocal);
pFileMenu->addAction(fileFileHasher);
-#ifndef WIN32
+#ifdef INOTIFY
pFileMenu->addAction(fileInotify);
#endif
pFileMenu->addSeparator();
@@ -2893,8 +2891,7 @@
}
-#ifndef WIN32
-
+#ifdef INOTIFY
void DCGuiApp::slotInotify() {
if (DCInotifyControl::Instance()) {
Index: trunk/eiskaltdc/dcgui.h
===================================================================
--- trunk/eiskaltdc/dcgui.h (revision 704)
+++ trunk/eiskaltdc/dcgui.h (working copy)
@@ -21,7 +21,7 @@
#include <QProgressBar>
#include <QWheelEvent>
#include <QShowEvent>
-
+#include <config.h>
#include "dcapplicationevents.h"
#include "dcconfig.h"
#include "dcclient.h"
@@ -133,7 +133,7 @@
void slotFileQuickConnect();
/** */
void slotFileMenuBar();
-#ifndef WIN32
+#ifdef INOTIFY
/** */
void slotFileInotifyEnable();
#endif
@@ -244,7 +244,7 @@
void slotAutoAwayModeChanged(bool enabled);
/** */
void slotChildOnDie(QWidget*);
-#ifndef WIN32
+#ifdef INOTIFY
/** */
void slotInotify();
#endif
@@ -301,7 +301,7 @@
QMenu *pHelpMenu;
/** the window menu */
QMenu *pWindowMenu;
-#ifndef WIN32
+#ifdef INOTIFY
/** */
QMenu *pInotify;
#endif
@@ -356,7 +356,7 @@
/** */
QAction *viewMenuBarCompact;
-#ifndef WIN32
+#ifdef INOTIFY
/** */
QAction *fileInotify;
/** */
Index: trunk/eiskaltdc/dcinotifycontrol.cpp
===================================================================
--- trunk/eiskaltdc/dcinotifycontrol.cpp (revision 704)
+++ trunk/eiskaltdc/dcinotifycontrol.cpp (working copy)
@@ -6,9 +6,8 @@
* (at your option) any later version. *
* *
***************************************************************************/
-
-#ifndef WIN32
-#ifndef OSX
+#include <config.h>
+#ifdef INOTIFY
#include "dcinotifycontrol.h"
#include "dctransferview.h"
#include "dcconfig.h"
@@ -725,5 +724,5 @@
pushButton_QUIT->show();
}*/
-#endif //OSX
-#endif //WIN32
+#endif
+
Index: trunk/eiskaltdc/dcinotifycontrol.h
===================================================================
--- trunk/eiskaltdc/dcinotifycontrol.h (revision 704)
+++ trunk/eiskaltdc/dcinotifycontrol.h (working copy)
@@ -6,12 +6,11 @@
* (at your option) any later version. *
* *
***************************************************************************/
-
+#include <config.h>
+#ifdef INOTIFY
#ifndef DCINOTIFYCONTROL_H
#define DCINOTIFYCONTROL_H
-#ifndef WIN32
-#ifndef OSX
#include <QDialog>
#include <QWidget>
#include <QList>
@@ -105,6 +104,5 @@
return pInotifyControl;
}
-#endif //OSX
-#endif //WIN32
#endif
+#endif
Index: trunk/eiskaltdc/dcinotify.cpp
===================================================================
--- trunk/eiskaltdc/dcinotify.cpp (revision 704)
+++ trunk/eiskaltdc/dcinotify.cpp (working copy)
@@ -6,9 +6,8 @@
* (at your option) any later version. *
* *
***************************************************************************/
-
-#ifndef WIN32
-#ifndef OSX
+#include <config.h>
+#ifdef INOTIFY
#include "dcinotify.h"
#include <sys/inotify.h>
@@ -288,5 +287,4 @@
return c;
}
-#endif //OSX
-#endif //WIN32
+#endif
Index: trunk/eiskaltdc/dcinotify.h
===================================================================
--- trunk/eiskaltdc/dcinotify.h (revision 704)
+++ trunk/eiskaltdc/dcinotify.h (working copy)
@@ -6,12 +6,11 @@
* (at your option) any later version. *
* *
***************************************************************************/
-
+#include <config.h>
+#ifdef INOTIFY
#ifndef DCINOTIFY_H
#define DCINOTIFY_H
-#ifndef WIN32
-#ifndef OSX
#include <QObject>
#include <QThread>
#include <QList>
@@ -72,6 +71,5 @@
};
-#endif //OSX
-#endif //WIN32
-#endif // DCINOTIFY_H
+#endif
+#endif
попробовать собрать, если не соберётся выложить лог сборки.
xumix писал(а): ↑28.12.2009 02:02
в общем, собрать получилось, вырезам все упоминания inotify & co, но при запуске теперь:
Код: Выделить всё
xumix@xumix:Downloads/2009-12-27/stable% sudo /usr/local/bin/eiskaltdc
EiskaltDC: '1.0.40' using dclib: '0.3.23'
Checking Qt® version... compiled for '4.6.0' using '4.6.0'
Checking libxml2 version... compiled for '20706' using '20706'
I/O warning : failed to load external entity "/Users/xumix/.eiskaltdc/.dc/dclib.cfg"
I/O warning : failed to load external entity "/Users/xumix/.eiskaltdc/.dc/dcgui.cfg"
I/O warning : failed to load external entity "/Users/xumix/.eiskaltdc/.dc/emoticons-v2.xml"
I/O warning : failed to load external entity "/usr/local/bin/icons/emot/simple/emoticons-v2.xml"
I/O warning : failed to load external entity "/Users/xumix/.eiskaltdc/.dc/emoticons.xml"
I/O warning : failed to load external entity "/usr/local/bin/icons/emot/simple/emoticons.xml"
DCIconLoader::LoadPixmap: Can't load 'back.png'
DCIconLoader::LoadPixmap: Can't load 'ball_green.png'
DCIconLoader::LoadPixmap: Can't load 'ball_red.png'
DCIconLoader::LoadPixmap: Can't load 'ball_yellow.png'
DCIconLoader::LoadPixmap: Can't load 'bookmark_add.png'
DCIconLoader::LoadPixmap: Can't load 'bookmark_folder.png'
DCIconLoader::LoadPixmap: Can't load 'chat.png'
DCIconLoader::LoadPixmap: Can't load 'choose-language.png'
DCIconLoader::LoadPixmap: Can't load 'clear.png'
DCIconLoader::LoadPixmap: Can't load 'client.png'
DCIconLoader::LoadPixmap: Can't load 'colors.png'
DCIconLoader::LoadPixmap: Can't load 'configure.png'
DCIconLoader::LoadPixmap: Can't load 'configure_32x32.png'
DCIconLoader::LoadPixmap: Can't load 'connect.png'
DCIconLoader::LoadPixmap: Can't load 'connect_creating.png'
DCIconLoader::LoadPixmap: Can't load 'connect_no.png'
DCIconLoader::LoadPixmap: Can't load 'connected.png'
DCIconLoader::LoadPixmap: Can't load 'debug.png'
DCIconLoader::LoadPixmap: Can't load 'down.png'
DCIconLoader::LoadPixmap: Can't load 'download.png'
DCIconLoader::LoadPixmap: Can't load 'download_as.png'
DCIconLoader::LoadPixmap: Can't load 'edit.png'
DCIconLoader::LoadPixmap: Can't load 'editadd.png'
DCIconLoader::LoadPixmap: Can't load 'editcopy.png'
DCIconLoader::LoadPixmap: Can't load 'editdelete.png'
DCIconLoader::LoadPixmap: Can't load 'emoticon.png'
DCIconLoader::LoadPixmap: Can't load 'exit.png'
DCIconLoader::LoadPixmap: Can't load 'fileclose.png'
DCIconLoader::LoadPixmap: Can't load 'filefind.png'
DCIconLoader::LoadPixmap: Can't load 'filter.png'
DCIconLoader::LoadPixmap: Can't load 'find.png'
DCIconLoader::LoadPixmap: Can't load 'find_32x32.png'
DCIconLoader::LoadPixmap: Can't load 'folder_blue.png'
DCIconLoader::LoadPixmap: Can't load 'folder_blue_open.png'
DCIconLoader::LoadPixmap: Can't load 'folder_red.png'
DCIconLoader::LoadPixmap: Can't load 'globe.png'
DCIconLoader::LoadPixmap: Can't load 'go-next.png'
DCIconLoader::LoadPixmap: Can't load 'go-previous.png'
DCIconLoader::LoadPixmap: Can't load 'go-up.png'
DCIconLoader::LoadPixmap: Can't load 'gui.png'
DCIconLoader::LoadPixmap: Can't load 'help.png'
DCIconLoader::LoadPixmap: Can't load 'icon_appl.png'
DCIconLoader::LoadPixmap: Can't load 'icon_msg.png'
DCIconLoader::LoadPixmap: Can't load 'icons.png'
DCIconLoader::LoadPixmap: Can't load 'info.png'
DCIconLoader::LoadPixmap: Can't load 'inotify.png'
DCIconLoader::LoadPixmap: Can't load 'isaway.png'
DCIconLoader::LoadPixmap: Can't load 'log.png'
DCIconLoader::LoadPixmap: Can't load 'menu.png'
DCIconLoader::LoadPixmap: Can't load 'message.png'
DCIconLoader::LoadPixmap: Can't load 'next.png'
DCIconLoader::LoadPixmap: Can't load 'notconnected.png'
DCIconLoader::LoadPixmap: Can't load 'onlinemanual.png'
DCIconLoader::LoadPixmap: Can't load 'open.png'
DCIconLoader::LoadPixmap: Can't load 'other.png'
DCIconLoader::LoadPixmap: Can't load 'player_pause.png'
DCIconLoader::LoadPixmap: Can't load 'player_play.png'
DCIconLoader::LoadPixmap: Can't load 'quickoptions.png'
DCIconLoader::LoadPixmap: Can't load 'reconnect.png'
DCIconLoader::LoadPixmap: Can't load 'reload.png'
DCIconLoader::LoadPixmap: Can't load 'reload_32x32.png'
DCIconLoader::LoadPixmap: Can't load 'reload_plugins.png'
DCIconLoader::LoadPixmap: Can't load 'save.png'
DCIconLoader::LoadPixmap: Can't load 'server.png'
DCIconLoader::LoadPixmap: Can't load 'slots_up.png'
DCIconLoader::LoadPixmap: Can't load 'sort-down-arrow.png'
DCIconLoader::LoadPixmap: Can't load 'spam.png'
DCIconLoader::LoadPixmap: Can't load 'splash.png'
DCIconLoader::LoadPixmap: Can't load 'spy.png'
DCIconLoader::LoadPixmap: Can't load 'ssl_no.png'
DCIconLoader::LoadPixmap: Can't load 'ssl_yes.png'
DCIconLoader::LoadPixmap: Can't load 'support.png'
DCIconLoader::LoadPixmap: Can't load 'text-select-all.png'
DCIconLoader::LoadPixmap: Can't load 'transfer.png'
DCIconLoader::LoadPixmap: Can't load 'translate.png'
DCIconLoader::LoadPixmap: Can't load 'up.png'
DCIconLoader::LoadPixmap: Can't load 'update.png'
DCIconLoader::LoadPixmap: Can't load 'users.png'
DCIconLoader::LoadPixmap: Can't load 'users_32x32.png'
DCIconLoader::LoadPixmap: Can't load 'view-list-details.png'
DCIconLoader::LoadPixmap: Can't load 'view-list-icons.png'
DCIconLoader::LoadPixmap: Can't load 'view_sidetree.png'
DCIconLoader::LoadPixmap: Can't load 'vru.png'
DCIconLoader::LoadPixmap: Can't load 'windows_cl_all.png'
DCIconLoader::LoadPixmap: Can't load 'windows_cl_find.png'
DCIconLoader::LoadPixmap: Can't load 'windows_cl_hubs.png'
DCIconLoader::LoadPixmap: Can't load 'windows_cl_lists.png'
DCIconLoader::LoadPixmap: Can't load 'windows_cl_offline.png'
DCIconLoader::LoadPixmap: Can't load 'windows_horiz.png'
DCIconLoader::LoadPixmap: Can't load 'windows_icon.png'
DCIconLoader::LoadPixmap: Can't load 'windows_lists.png'
DCIconLoader::LoadPixmap: Can't load 'windows_tiled.png'
DCIconLoader::LoadPixmap: Can't load 'windows_vert.png'
DCIconLoader::LoadPixmap: Can't load 'windows_undock.png'
DCIconLoader::LoadPixmap: Can't load 'zoom-in.png'
DCIconLoader::LoadPixmap: Can't load 'zoom-out.png'
DCIconLoader::LoadPixmap: Can't load 'flag_belarus.png'
DCIconLoader::LoadPixmap: Can't load 'flag_bosnia.png'
DCIconLoader::LoadPixmap: Can't load 'flag_brazil.png'
DCIconLoader::LoadPixmap: Can't load 'flag_britain.png'
DCIconLoader::LoadPixmap: Can't load 'flag_czech.png'
DCIconLoader::LoadPixmap: Can't load 'flag_denmark.png'
DCIconLoader::LoadPixmap: Can't load 'flag_finland.png'
DCIconLoader::LoadPixmap: Can't load 'flag_france.png'
DCIconLoader::LoadPixmap: Can't load 'flag_germany.png'
DCIconLoader::LoadPixmap: Can't load 'flag_greece.png'
DCIconLoader::LoadPixmap: Can't load 'flag_hungary.png'
DCIconLoader::LoadPixmap: Can't load 'flag_iceland.png'
DCIconLoader::LoadPixmap: Can't load 'flag_italy.png'
DCIconLoader::LoadPixmap: Can't load 'flag_latvia.png'
DCIconLoader::LoadPixmap: Can't load 'flag_netherlands.png'
DCIconLoader::LoadPixmap: Can't load 'flag_norway.png'
DCIconLoader::LoadPixmap: Can't load 'flag_poland.png'
DCIconLoader::LoadPixmap: Can't load 'flag_romania.png'
DCIconLoader::LoadPixmap: Can't load 'flag_russia.png'
DCIconLoader::LoadPixmap: Can't load 'flag_serbia.png'
DCIconLoader::LoadPixmap: Can't load 'flag_slovakia.png'
DCIconLoader::LoadPixmap: Can't load 'flag_spain.png'
DCIconLoader::LoadPixmap: Can't load 'flag_sweden.png'
DCIconLoader::LoadPixmap: Can't load 'filetype-application.png'
DCIconLoader::LoadPixmap: Can't load 'filetype-archive.png'
DCIconLoader::LoadPixmap: Can't load 'filetype-document.png'
DCIconLoader::LoadPixmap: Can't load 'filetype-audio.png'
DCIconLoader::LoadPixmap: Can't load 'filetype-picture.png'
DCIconLoader::LoadPixmap: Can't load 'filetype-unknown.png'
DCIconLoader::LoadPixmap: Can't load 'filetype-video.png'
I/O warning : failed to load external entity "/Users/xumix/.eiskaltdc/.dc/dchub.cfg"
Renaming stored filelists ...
I/O warning : failed to load external entity "/Users/xumix/.eiskaltdc/.dc/dcfriendlist.cfg"
QWidget::insertAction: Attempt to insert null action
EiskaltDC: '1.0.40' using dclib: '0.3.23'
Checking Qt® version... compiled for '4.6.0' using '4.6.0'
Ignore wrong Parameter: ' c-'
Ignore wrong Parameter: '/Users/xumix/.eiskaltdc/.dc/'
handle crash
fcntl flock: Resource temporarily unavailable
Checking libxml2 version... compiled for '20706' using '20706'
CRASH: (null) 17245,11,/usr/local/bin/eiskaltdc
Init debug:
Configpath: ''
17245 11 /usr/local/bin/eiskaltdc
exit
неправильный путь до папки с ресурсами, исправить можно в настройках, путь должен быть вида @prefix@/share/eiskaltdc
