FreeBSD Bugzilla – Attachment 119379 Details for
Bug 161898
Update port: net-p2p/eiskaltdcpp-* to 2.2.4
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
file.diff
file.diff (text/plain), 46.21 KB, created by
gelraen.ua
on 2011-10-22 14:10:11 UTC
(
hide
)
Description:
file.diff
Filename:
MIME Type:
Creator:
gelraen.ua
Created:
2011-10-22 14:10:11 UTC
Size:
46.21 KB
patch
obsolete
>diff --git a/net-p2p/eiskaltdcpp-cli/Makefile b/net-p2p/eiskaltdcpp-cli/Makefile >new file mode 100644 >index 0000000..6657b5f >--- /dev/null >+++ b/net-p2p/eiskaltdcpp-cli/Makefile >@@ -0,0 +1,41 @@ >+# New ports collection makefile for: net-p2p/eiskaltdcpp-cli >+# Date created: 06 Oct @011 >+# Whom: Maxim Ignatenko <gelraen.ua@gmail.com> >+# >+# $FreeBSD$ >+# >+ >+PORTNAME= eiskaltdcpp-cli >+PORTVERSION= 2.2.4 >+CATEGORIES= net-p2p >+MASTER_SITES= GOOGLE_CODE >+DISTNAME= eiskaltdcpp-${DISTVERSION} >+ >+MAINTAINER= gelraen.ua@gmail.com >+COMMENT= Shared data for EiskaltDC++ GUIs >+ >+PROJECTHOST= eiskaltdc >+ >+LICENSE= GPLv3 >+ >+USE_XZ= yes >+NO_BUILD= yes >+USE_PERL5_RUN= yes >+ >+MAN1= ${PORTNAME}.1 >+MANCOMPRESSED= no >+ >+RUN_DEPENDS= p5-RPC-XML>=0:${PORTSDIR}/net/p5-RPC-XML \ >+ p5-Term-ShellUI>=0:${PORTSDIR}/shells/p5-Term-ShellUI >+ >+do-install: >+ @${INSTALL_SCRIPT} "${WRKSRC}/${PORTNAME}/cli.pl" "${PREFIX}/bin/eiskaltdcpp-cli" >+ @${INSTALL_MAN} "${WRKSRC}/${PORTNAME}/eiskaltdcpp-cli.1" "${PREFIX}/man/man1/" >+ @${MKDIR} "${PREFIX}/etc/eiskaltdcpp" || true >+ @${INSTALL_DATA} "${WRKSRC}/${PORTNAME}/config.pl" "${PREFIX}/etc/eiskaltdcpp/config.pl.dist" >+ @if [ ! -e "${PREFIX}/etc/eiskaltdcpp/config.pl" ]; then \ >+ ${CP} -v "${PREFIX}/etc/eiskaltdcpp/config.pl.dist" \ >+ "${PREFIX}/etc/eiskaltdcpp/config.pl"; \ >+ fi >+ >+.include <bsd.port.mk> >diff --git a/net-p2p/eiskaltdcpp-cli/distinfo b/net-p2p/eiskaltdcpp-cli/distinfo >new file mode 100644 >index 0000000..f94894f >--- /dev/null >+++ b/net-p2p/eiskaltdcpp-cli/distinfo >@@ -0,0 +1,2 @@ >+SHA256 (eiskaltdcpp-2.2.4.tar.xz) = a14d44ad1c48dc97354e17d3d8d8fc9bdd7be646d275603d092c6d9ebf7061b4 >+SIZE (eiskaltdcpp-2.2.4.tar.xz) = 2008920 >diff --git a/net-p2p/eiskaltdcpp-cli/files/patch-eiskaltdcpp-cli__cli.pl b/net-p2p/eiskaltdcpp-cli/files/patch-eiskaltdcpp-cli__cli.pl >new file mode 100644 >index 0000000..e222def >--- /dev/null >+++ b/net-p2p/eiskaltdcpp-cli/files/patch-eiskaltdcpp-cli__cli.pl >@@ -0,0 +1,12 @@ >+--- ./eiskaltdcpp-cli/cli.pl.orig 2011-10-02 18:12:43.000000000 +0300 >++++ ./eiskaltdcpp-cli/cli.pl 2011-10-06 09:30:39.000000000 +0300 >+@@ -36,8 +36,7 @@ >+ unshift @INC, >+ "$XDG_CONFIG_HOME/eiskaltdc++", >+ "~/.config/eiskaltdc++/", >+- "/usr/local/share/eiskaltdcpp/cli", >+- "/usr/share/eiskaltdcpp/cli" >++ "/usr/local/etc/eiskaltdcpp" >+ } >+ >+ # preparing terminal >diff --git a/net-p2p/eiskaltdcpp-cli/files/patch-eiskaltdcpp-cli__eiskaltdcpp-cli.1 b/net-p2p/eiskaltdcpp-cli/files/patch-eiskaltdcpp-cli__eiskaltdcpp-cli.1 >new file mode 100644 >index 0000000..e0ce652 >--- /dev/null >+++ b/net-p2p/eiskaltdcpp-cli/files/patch-eiskaltdcpp-cli__eiskaltdcpp-cli.1 >@@ -0,0 +1,11 @@ >+--- ./eiskaltdcpp-cli/eiskaltdcpp-cli.1.orig 2011-10-06 09:31:09.000000000 +0300 >++++ ./eiskaltdcpp-cli/eiskaltdcpp-cli.1 2011-10-06 09:32:23.000000000 +0300 >+@@ -29,7 +29,7 @@ >+ .B "~/.config/eiskaltdc++/" or "$XDG_CONFIG_HOME/eiskaltdc++/" >+ Directory with user configuration files and logs >+ .TP >+-.B "/usr/local/share/eiskaltdcpp/cli/" or "/usr/share/eiskaltdcpp/cli/" >++.B "/usr/local/etc/eiskaltdcpp/" >+ Directory with default configuration file >+ .SH "DOCUMENTATION" >+ .TP >diff --git a/net-p2p/eiskaltdcpp-cli/pkg-descr b/net-p2p/eiskaltdcpp-cli/pkg-descr >new file mode 100644 >index 0000000..e099bce >--- /dev/null >+++ b/net-p2p/eiskaltdcpp-cli/pkg-descr >@@ -0,0 +1,8 @@ >+EiskaltDC++ is a cross-platform program that uses the Direct Connect >+and ADC protocol. It is compatible with other DC clients, such as the >+original DC from Neomodus, DC++ and derivatives. EiskaltDC++ also >+interoperates with all common DC hub software. >+ >+This port contains XMLRPC CLI client for EiskaltDC++ daemon. >+ >+WWW: http://code.google.com/p/eiskaltdc/ >diff --git a/net-p2p/eiskaltdcpp-cli/pkg-plist b/net-p2p/eiskaltdcpp-cli/pkg-plist >new file mode 100644 >index 0000000..df0de11 >--- /dev/null >+++ b/net-p2p/eiskaltdcpp-cli/pkg-plist >@@ -0,0 +1,3 @@ >+bin/eiskaltdcpp-cli >+etc/eiskaltdcpp/config.pl.dist >+@dirrmtry etc/eiskaltdcpp >diff --git a/net-p2p/eiskaltdcpp-daemon/Makefile b/net-p2p/eiskaltdcpp-daemon/Makefile >index f6fa69e..9ed7788 100644 >--- a/net-p2p/eiskaltdcpp-daemon/Makefile >+++ b/net-p2p/eiskaltdcpp-daemon/Makefile >@@ -6,7 +6,7 @@ > # > > PORTNAME= eiskaltdcpp-daemon >-PORTVERSION= 2.2.1 >+PORTVERSION= 2.2.4 > CATEGORIES= net-p2p > MASTER_SITES= GOOGLE_CODE > DISTNAME= eiskaltdcpp-${DISTVERSION} >@@ -21,12 +21,14 @@ LIB_DEPENDS+= eiskaltdcpp:${PORTSDIR}/net-p2p/eiskaltdcpp-lib > PROJECTHOST= eiskaltdc > > USE_XZ= yes >-USE_GCC= 4.2+ >+USE_GCC= 4.4+ > USE_GETTEXT= yes > USE_CMAKE= yes > USE_OPENSSL= yes > MAKE_JOBS_SAFE= yes > >+OPTIONS= XMLRPC "XMLRPC interface support" on >+ > MAN1= ${PORTNAME}.1 > MANCOMPRESSED= yes > >@@ -38,12 +40,23 @@ CMAKE_ARGS+= -DUSE_QT:BOOL=OFF > CMAKE_ARGS+= -DUSE_GTK:BOOL=OFF > CMAKE_ARGS+= -DNO_UI_DAEMON:BOOL=ON > CMAKE_ARGS+= -DEISKALTDCPP_INCLUDE_DIR:STRING="${LOCALBASE}/include/eiskaltdcpp" >+CMAKE_ARGS+= -DUSE_IDNA:BOOL=OFF > CMAKE_ARGS+= -DCREATE_MO:BOOL=OFF > CMAKE_ARGS+= -DCMAKE_LIBRARY_PATH:PATH="${LOCALBASE}/lib:${PREFIX}/lib" >+CMAKE_ARGS+= -DCMAKE_SKIP_RPATH:BOOL=ON > > BUILD_WRKSRC= ${WRKSRC}/nasdc > INSTALL_WRKSRC= ${WRKSRC}/nasdc > >+.include <bsd.port.options.mk> >+ >+.if defined(WITH_XMLRPC) && !defined(WITHOUT_XMLRPC) >+LIB_DEPENDS+= xmlrpc++:${PORTSDIR}/net/xmlrpc-c-devel >+CMAKE_ARGS+= -DXMLRPC_DAEMON:BOOL=ON >+.else >+CMAKE_ARGS+= -DXMLRPC_DAEMON:BOOL=OFF >+.endif >+ > .include <bsd.port.pre.mk> > > .if ${OSVERSION} < 700024 >diff --git a/net-p2p/eiskaltdcpp-daemon/distinfo b/net-p2p/eiskaltdcpp-daemon/distinfo >index b90927d..f94894f 100644 >--- a/net-p2p/eiskaltdcpp-daemon/distinfo >+++ b/net-p2p/eiskaltdcpp-daemon/distinfo >@@ -1,2 +1,2 @@ >-SHA256 (eiskaltdcpp-2.2.1.tar.xz) = 2b2bd627a1325c595f604766404ca4f4787db1b49b4b0c5c5d8e88ddfc2a2c40 >-SIZE (eiskaltdcpp-2.2.1.tar.xz) = 1916680 >+SHA256 (eiskaltdcpp-2.2.4.tar.xz) = a14d44ad1c48dc97354e17d3d8d8fc9bdd7be646d275603d092c6d9ebf7061b4 >+SIZE (eiskaltdcpp-2.2.4.tar.xz) = 2008920 >diff --git a/net-p2p/eiskaltdcpp-daemon/files/patch-CMakeLists.txt b/net-p2p/eiskaltdcpp-daemon/files/patch-CMakeLists.txt >index f14f5c6..6667079 100644 >--- a/net-p2p/eiskaltdcpp-daemon/files/patch-CMakeLists.txt >+++ b/net-p2p/eiskaltdcpp-daemon/files/patch-CMakeLists.txt >@@ -1,8 +1,8 @@ >---- ./CMakeLists.txt.orig 2011-03-08 19:47:12.000000000 +0200 >-+++ ./CMakeLists.txt 2011-03-10 19:49:48.000000000 +0200 >-@@ -316,16 +316,14 @@ >- if (MINGW) >- set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--enable-auto-import") >+--- CMakeLists.txt.orig 2011-10-02 18:12:43.000000000 +0300 >++++ CMakeLists.txt 2011-10-03 10:40:18.000000000 +0300 >+@@ -370,16 +370,14 @@ >+ else (MINGW) >+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") > endif (MINGW) > - if (NOT APPLE) > - set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wl,--as-needed") >@@ -20,9 +20,9 @@ > ${eiskaltdcpp_SOURCE_DIR} > ${GMP_INCLUDE_DIR} > ) >-@@ -395,7 +393,9 @@ >- add_subdirectory (dht) >- endif (DHT) >+@@ -451,7 +449,9 @@ >+ add_subdirectory (dht) >+ endif (WITH_DHT) > > -add_subdirectory (dcpp) > +if (BUILD_LIB) >@@ -31,19 +31,3 @@ > > if (USE_QT) > add_subdirectory (eiskaltdcpp-qt) >-@@ -443,11 +443,11 @@ >- LOCALE_LIST "${LANGUAGES}" >- COPYRIGHT_HOLDER "EiskaltDC++ team" >- SOURCES "${DCPP_SRCS};${DCPP_HDRS}" >-- PO_DIR "${dcpp_SOURCE_DIR}/po" >-- POT_BUILD_DIR "${dcpp_SOURCE_DIR}/po" >-+ PO_DIR "${PROJECT_SOURCE_DIR}/po" >-+ POT_BUILD_DIR "${PROJECT_SOURCE_DIR}/po" >- #PO_PREFIX "" >-- PO_BUILD_DIR "${dcpp_SOURCE_DIR}/po" >-- MO_BUILD_DIR "${dcpp_BINARY_DIR}/locale" >-+ PO_BUILD_DIR "${PROJECT_SOURCE_DIR}/po" >-+ MO_BUILD_DIR "${PROJECT_BINARY_DIR}/locale" >- MO_INSTALL_DIR "/${LOCALE_DIR}" >- CREATE_POT_TARGET ${create_pot} >- CREATE_PO_TARGET ${create_po} >diff --git a/net-p2p/eiskaltdcpp-daemon/files/patch-cmake__CMakeLists.txt b/net-p2p/eiskaltdcpp-daemon/files/patch-cmake__CMakeLists.txt >new file mode 100644 >index 0000000..6780e45 >--- /dev/null >+++ b/net-p2p/eiskaltdcpp-daemon/files/patch-cmake__CMakeLists.txt >@@ -0,0 +1,85 @@ >+--- ./cmake/CMakeLists.txt.orig 2011-10-02 18:12:43.000000000 +0300 >++++ ./cmake/CMakeLists.txt 2011-10-10 11:10:30.000000000 +0300 >+@@ -37,12 +37,14 @@ >+ >+ endmacro(GET_RELATIVE_SOURCES) >+ >++if (BUILD_LIB) >+ get_absolute_sources(abs_dcpp_sources "${DCPP_SRCS};${DCPP_HDRS}") >+ get_relative_sources(rel_dcpp_sources "${dcpp_SOURCE_DIR}/po" "${abs_dcpp_sources}") >+ file(MAKE_DIRECTORY "${dcpp_BINARY_DIR}/po") >+ set(dcpp_files_from "${dcpp_BINARY_DIR}/po/libeiskaltdcpp_srcs.txt") >+ string(REGEX REPLACE ";" "\n" dcpp_contents "${rel_dcpp_sources}") >+ file(WRITE "${dcpp_files_from}" "${dcpp_contents}") >++endif (BUILD_LIB) >+ >+ if (USE_GTK) >+ get_absolute_sources(abs_gtk_cpp_sources "${GTK_SRCS};${GTK_HDRS}") >+@@ -163,6 +165,7 @@ >+ # if the po file doesn't exist. The case where a po file used to >+ # exist and no longer exists should never occur >+ >++ if (BUILD_LIB) >+ if(NOT EXISTS ${dcpp_SOURCE_DIR}/po/${LANG}.po) >+ add_custom_command( >+ OUTPUT ${dcpp_SOURCE_DIR}/po/${LANG}.po >+@@ -194,6 +197,7 @@ >+ WORKING_DIRECTORY ${dcpp_SOURCE_DIR}/po >+ COMMENT "pot-update [dcpp-${LANG}]: Updated po file." >+ ) >++ endif (BUILD_LIB) >+ >+ if (USE_GTK) >+ if(NOT EXISTS ${eiskaltdcpp-gtk_SOURCE_DIR}/po/${LANG}.po) >+@@ -231,15 +235,19 @@ >+ SET(pot-update-SRC ${pot-update-SRC} ${eiskaltdcpp-gtk_SOURCE_DIR}/po/${LANG}.po.dummy ) >+ endif (USE_GTK) >+ >++ if (BUILD_LIB) >+ SET(pot-update-SRC ${pot-update-SRC} ${dcpp_SOURCE_DIR}/po/${LANG}.po.dummy) >++ endif (BUILD_LIB) >+ endforeach(LANG ${LANGUAGES}) >+ >+ # Add to target list >++ if (BUILD_LIB) >+ SET(pot-update-SRC >+ ${pot-update-SRC} >+ ${dcpp_SOURCE_DIR}/po/libeiskaltdcpp.pot # should depend on languages >+ >+ ) >++ endif (BUILD_LIB) >+ if (USE_GTK) >+ SET(pot-update-SRC >+ ${pot-update-SRC} >+@@ -329,6 +337,7 @@ >+ >+ foreach(LANG ${LANGUAGES}) >+ >++ if (BUILD_LIB) >+ add_custom_command( >+ OUTPUT ${dcpp_BINARY_DIR}/locale/${LANG}/LC_MESSAGES >+ COMMAND ${CMAKE_COMMAND} -E make_directory >+@@ -346,6 +355,7 @@ >+ WORKING_DIRECTORY ${dcpp_SOURCE_DIR}/po >+ COMMENT "mo-update [dcpp-${LANG}]: Creating mo file." >+ ) >++ endif (BUILD_LIB) >+ if (USE_GTK) >+ add_custom_command( >+ OUTPUT ${eiskaltdcpp-gtk_BINARY_DIR}/locale/${LANG}/LC_MESSAGES >+@@ -377,6 +387,7 @@ >+ ) >+ endif (USE_GTK) >+ >++ if (BUILD_LIB) >+ install(FILES >+ ${dcpp_BINARY_DIR}/locale/${LANG}/LC_MESSAGES/libeiskaltdcpp.mo >+ DESTINATION ${LOCALE_DIR}/${LANG}/LC_MESSAGES) >+@@ -387,6 +398,7 @@ >+ set(mo-update-LANG-SRC ${mo-update-LANG-SRC} >+ ${dcpp_BINARY_DIR}/locale/${LANG}/LC_MESSAGES/libeiskaltdcpp.mo >+ ) >++ endif (BUILD_LIB) >+ >+ if(UPDATE_PO) >+ add_custom_target(mo-update-${LANG} >diff --git a/net-p2p/eiskaltdcpp-daemon/files/patch-nasdc__CMakeLists.txt b/net-p2p/eiskaltdcpp-daemon/files/patch-nasdc__CMakeLists.txt >index 549974f..55ce7fe 100644 >--- a/net-p2p/eiskaltdcpp-daemon/files/patch-nasdc__CMakeLists.txt >+++ b/net-p2p/eiskaltdcpp-daemon/files/patch-nasdc__CMakeLists.txt >@@ -1,24 +1,24 @@ >---- ./nasdc/CMakeLists.txt.orig 2011-03-08 19:47:12.000000000 +0200 >-+++ ./nasdc/CMakeLists.txt 2011-03-10 19:52:25.000000000 +0200 >-@@ -47,7 +47,16 @@ >- target_link_libraries (sampleclient ${XMLRPCLIBS}) >- endif() >+--- nasdc/CMakeLists.txt.orig 2011-10-02 18:12:43.000000000 +0300 >++++ nasdc/CMakeLists.txt 2011-10-03 10:51:06.000000000 +0300 >+@@ -49,7 +49,16 @@ >+ ${nasdc_SRCS} >+ ) > >--target_link_libraries (nasdc dcpp ${XMLRPCLIBS} ${RL_LIBS}) >+-target_link_libraries (nasdc dcpp ${XMLRPCLIBS}) > +if (BUILD_LIB) >-+ set(DCPP_LIB dcpp) >++ set(DCPP_LIB dcpp) > +else (BUILD_LIB) >-+ find_library(DCPP_LIB eiskaltdcpp) >-+ if (DCPP_LIB) >-+ message(STATUS "EiskaltDC++ shared library found at ${DCPP_LIB}") >-+ endif (DCPP_LIB) >++ find_library(DCPP_LIB eiskaltdcpp) >++ if (DCPP_LIB) >++ message(STATUS "EiskaltDC++ shared library found at ${DCPP_LIB}") >++ endif (DCPP_LIB) > +endif (BUILD_LIB) > + >-+target_link_libraries (nasdc ${DCPP_LIB} ${XMLRPCLIBS} ${RL_LIBS}) >++target_link_libraries (nasdc ${DCPP_LIB} ${XMLRPCLIBS}) > > if (UNIX) > set (BINDIR bin) >-@@ -77,5 +86,5 @@ >+@@ -81,5 +90,5 @@ > if (APPLE) > install (FILES ${PROJECT_BINARY_DIR}/eiskaltdcpp-daemon.1.gz DESTINATION ${PROJECT_NAME_GLOBAL}.app/man/man1) > elseif (UNIX AND NOT APPLE) >diff --git a/net-p2p/eiskaltdcpp-daemon/files/patch-nasdc__nasdc.cpp b/net-p2p/eiskaltdcpp-daemon/files/patch-nasdc__nasdc.cpp >deleted file mode 100644 >index 2a4db0d..0000000 >--- a/net-p2p/eiskaltdcpp-daemon/files/patch-nasdc__nasdc.cpp >+++ /dev/null >@@ -1,20 +0,0 @@ >---- ./nasdc/nasdc.cpp.orig 2011-03-08 19:47:12.000000000 +0200 >-+++ ./nasdc/nasdc.cpp 2011-03-10 19:49:48.000000000 +0200 >-@@ -23,7 +23,6 @@ >- #ifndef _WIN32 >- #include <syslog.h> >- #include <signal.h> >--#include "extra/stacktrace.h" >- #endif >- >- #ifdef CLI_DAEMON >-@@ -237,9 +236,6 @@ >- temp = (char *)NULL; >- prompt = "edcppd$ "; >- #endif >--#ifndef _WIN32 >-- signal(SIGSEGV, printBacktrace); >--#endif >- while (bServerRunning) { >- Thread::sleep(1); >- #ifdef CLI_DAEMON >diff --git a/net-p2p/eiskaltdcpp-data/Makefile b/net-p2p/eiskaltdcpp-data/Makefile >index 2294c6c..74ded2d 100644 >--- a/net-p2p/eiskaltdcpp-data/Makefile >+++ b/net-p2p/eiskaltdcpp-data/Makefile >@@ -6,7 +6,7 @@ > # > > PORTNAME= eiskaltdcpp-data >-PORTVERSION= 2.2.1 >+PORTVERSION= 2.2.4 > CATEGORIES= net-p2p > MASTER_SITES= GOOGLE_CODE > DISTNAME= eiskaltdcpp-${DISTVERSION} >diff --git a/net-p2p/eiskaltdcpp-data/distinfo b/net-p2p/eiskaltdcpp-data/distinfo >index b90927d..f94894f 100644 >--- a/net-p2p/eiskaltdcpp-data/distinfo >+++ b/net-p2p/eiskaltdcpp-data/distinfo >@@ -1,2 +1,2 @@ >-SHA256 (eiskaltdcpp-2.2.1.tar.xz) = 2b2bd627a1325c595f604766404ca4f4787db1b49b4b0c5c5d8e88ddfc2a2c40 >-SIZE (eiskaltdcpp-2.2.1.tar.xz) = 1916680 >+SHA256 (eiskaltdcpp-2.2.4.tar.xz) = a14d44ad1c48dc97354e17d3d8d8fc9bdd7be646d275603d092c6d9ebf7061b4 >+SIZE (eiskaltdcpp-2.2.4.tar.xz) = 2008920 >diff --git a/net-p2p/eiskaltdcpp-gtk/Makefile b/net-p2p/eiskaltdcpp-gtk/Makefile >index f205fb1..14f86bc 100644 >--- a/net-p2p/eiskaltdcpp-gtk/Makefile >+++ b/net-p2p/eiskaltdcpp-gtk/Makefile >@@ -6,7 +6,7 @@ > # > > PORTNAME= eiskaltdcpp-gtk >-PORTVERSION= 2.2.1 >+PORTVERSION= 2.2.4 > CATEGORIES= net-p2p > MASTER_SITES= GOOGLE_CODE > DISTNAME= eiskaltdcpp-${DISTVERSION} >@@ -23,7 +23,7 @@ CMAKE_ARGS+= -DBUILD_LIB:BOOL=OFF > PROJECTHOST= eiskaltdc > > USE_XZ= yes >-USE_GCC= 4.2+ >+USE_GCC= 4.4+ > USE_CMAKE= yes > USE_GETTEXT= yes > USE_OPENSSL= yes >@@ -36,16 +36,15 @@ OPTIONS= MINIUPNP "UPnP support" on \ > LIBGNOME2 "Sound notification support" off \ > LIBNOTIFY "Popup notification support" on > >-USE_GNOME= pango gtk20 glib20 libglade2 >+USE_GNOME= pango gtk20 glib20 > > CMAKE_ARGS+= -DUSE_QT:BOOL=OFF > CMAKE_ARGS+= -DUSE_GTK:BOOL=ON > CMAKE_ARGS+= -DEISKALTDCPP_INCLUDE_DIR:STRING="${LOCALBASE}/include/eiskaltdcpp" >-CMAKE_ARGS+= -DCREATE_MO:BOOL=OFF >+CMAKE_ARGS+= -DCREATE_MO:BOOL=ON > CMAKE_ARGS+= -DCMAKE_LIBRARY_PATH:PATH="${LOCALBASE}/lib:${PREFIX}/lib" >- >-BUILD_WRKSRC= ${WRKSRC}/${PORTNAME} >-INSTALL_WRKSRC= ${WRKSRC}/${PORTNAME} >+CMAKE_ARGS+= -DCMAKE_SKIP_RPATH:BOOL=ON >+CMAKE_ARGS+= -DINSTALL_DATA:BOOL=OFF > > .include <bsd.port.options.mk> > >diff --git a/net-p2p/eiskaltdcpp-gtk/distinfo b/net-p2p/eiskaltdcpp-gtk/distinfo >index b90927d..f94894f 100644 >--- a/net-p2p/eiskaltdcpp-gtk/distinfo >+++ b/net-p2p/eiskaltdcpp-gtk/distinfo >@@ -1,2 +1,2 @@ >-SHA256 (eiskaltdcpp-2.2.1.tar.xz) = 2b2bd627a1325c595f604766404ca4f4787db1b49b4b0c5c5d8e88ddfc2a2c40 >-SIZE (eiskaltdcpp-2.2.1.tar.xz) = 1916680 >+SHA256 (eiskaltdcpp-2.2.4.tar.xz) = a14d44ad1c48dc97354e17d3d8d8fc9bdd7be646d275603d092c6d9ebf7061b4 >+SIZE (eiskaltdcpp-2.2.4.tar.xz) = 2008920 >diff --git a/net-p2p/eiskaltdcpp-gtk/files/patch-CMakeLists.txt b/net-p2p/eiskaltdcpp-gtk/files/patch-CMakeLists.txt >index 87cd1d6..526a0d2 100644 >--- a/net-p2p/eiskaltdcpp-gtk/files/patch-CMakeLists.txt >+++ b/net-p2p/eiskaltdcpp-gtk/files/patch-CMakeLists.txt >@@ -1,6 +1,6 @@ >---- ./CMakeLists.txt.orig 2011-03-08 19:47:12.000000000 +0200 >-+++ ./CMakeLists.txt 2011-03-10 16:22:20.000000000 +0200 >-@@ -184,14 +184,14 @@ >+--- ./CMakeLists.txt.orig 2011-10-02 18:12:43.000000000 +0300 >++++ ./CMakeLists.txt 2011-10-10 11:16:46.000000000 +0300 >+@@ -212,14 +212,14 @@ > > if (USE_LIBGNOME2) > message (STATUS "Building with LibGnome2 support") >@@ -17,9 +17,9 @@ > else (USE_LIBNOTIFY) > message (STATUS "Building without libnotify support") > endif (USE_LIBNOTIFY) >-@@ -316,16 +316,14 @@ >- if (MINGW) >- set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--enable-auto-import") >+@@ -370,16 +370,14 @@ >+ else (MINGW) >+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") > endif (MINGW) > - if (NOT APPLE) > - set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wl,--as-needed") >@@ -37,9 +37,9 @@ > ${eiskaltdcpp_SOURCE_DIR} > ${GMP_INCLUDE_DIR} > ) >-@@ -395,7 +393,9 @@ >- add_subdirectory (dht) >- endif (DHT) >+@@ -451,7 +449,9 @@ >+ add_subdirectory (dht) >+ endif (WITH_DHT) > > -add_subdirectory (dcpp) > +if (BUILD_LIB) >@@ -48,19 +48,18 @@ > > if (USE_QT) > add_subdirectory (eiskaltdcpp-qt) >-@@ -443,11 +443,11 @@ >- LOCALE_LIST "${LANGUAGES}" >- COPYRIGHT_HOLDER "EiskaltDC++ team" >- SOURCES "${DCPP_SRCS};${DCPP_HDRS}" >-- PO_DIR "${dcpp_SOURCE_DIR}/po" >-- POT_BUILD_DIR "${dcpp_SOURCE_DIR}/po" >-+ PO_DIR "${PROJECT_SOURCE_DIR}/po" >-+ POT_BUILD_DIR "${PROJECT_SOURCE_DIR}/po" >- #PO_PREFIX "" >-- PO_BUILD_DIR "${dcpp_SOURCE_DIR}/po" >-- MO_BUILD_DIR "${dcpp_BINARY_DIR}/locale" >-+ PO_BUILD_DIR "${PROJECT_SOURCE_DIR}/po" >-+ MO_BUILD_DIR "${PROJECT_BINARY_DIR}/locale" >- MO_INSTALL_DIR "/${LOCALE_DIR}" >- CREATE_POT_TARGET ${create_pot} >- CREATE_PO_TARGET ${create_po} >+@@ -482,7 +482,7 @@ >+ add_subdirectory(cmake) >+ endif(GETTEXT_FOUND) >+ >+-if (USE_QT OR USE_GTK) >++if (INSTALL_DATA AND (USE_QT OR USE_GTK)) >+ >+ if (WITH_EXAMPLES) >+ install (DIRECTORY examples/ DESTINATION ${CLIENT_DATA_DIR}/examples >+@@ -524,4 +524,4 @@ >+ install (FILES icons/icon_128x128.png DESTINATION ${SHARE_DIR}/pixmaps/ RENAME eiskaltdcpp.png) >+ endif (NOT HAIKU) >+ endif (APPLE) >+-endif (USE_QT OR USE_GTK) >++endif (INSTALL_DATA AND (USE_QT OR USE_GTK)) >diff --git a/net-p2p/eiskaltdcpp-gtk/files/patch-cmake__CMakeLists.txt b/net-p2p/eiskaltdcpp-gtk/files/patch-cmake__CMakeLists.txt >new file mode 100644 >index 0000000..6780e45 >--- /dev/null >+++ b/net-p2p/eiskaltdcpp-gtk/files/patch-cmake__CMakeLists.txt >@@ -0,0 +1,85 @@ >+--- ./cmake/CMakeLists.txt.orig 2011-10-02 18:12:43.000000000 +0300 >++++ ./cmake/CMakeLists.txt 2011-10-10 11:10:30.000000000 +0300 >+@@ -37,12 +37,14 @@ >+ >+ endmacro(GET_RELATIVE_SOURCES) >+ >++if (BUILD_LIB) >+ get_absolute_sources(abs_dcpp_sources "${DCPP_SRCS};${DCPP_HDRS}") >+ get_relative_sources(rel_dcpp_sources "${dcpp_SOURCE_DIR}/po" "${abs_dcpp_sources}") >+ file(MAKE_DIRECTORY "${dcpp_BINARY_DIR}/po") >+ set(dcpp_files_from "${dcpp_BINARY_DIR}/po/libeiskaltdcpp_srcs.txt") >+ string(REGEX REPLACE ";" "\n" dcpp_contents "${rel_dcpp_sources}") >+ file(WRITE "${dcpp_files_from}" "${dcpp_contents}") >++endif (BUILD_LIB) >+ >+ if (USE_GTK) >+ get_absolute_sources(abs_gtk_cpp_sources "${GTK_SRCS};${GTK_HDRS}") >+@@ -163,6 +165,7 @@ >+ # if the po file doesn't exist. The case where a po file used to >+ # exist and no longer exists should never occur >+ >++ if (BUILD_LIB) >+ if(NOT EXISTS ${dcpp_SOURCE_DIR}/po/${LANG}.po) >+ add_custom_command( >+ OUTPUT ${dcpp_SOURCE_DIR}/po/${LANG}.po >+@@ -194,6 +197,7 @@ >+ WORKING_DIRECTORY ${dcpp_SOURCE_DIR}/po >+ COMMENT "pot-update [dcpp-${LANG}]: Updated po file." >+ ) >++ endif (BUILD_LIB) >+ >+ if (USE_GTK) >+ if(NOT EXISTS ${eiskaltdcpp-gtk_SOURCE_DIR}/po/${LANG}.po) >+@@ -231,15 +235,19 @@ >+ SET(pot-update-SRC ${pot-update-SRC} ${eiskaltdcpp-gtk_SOURCE_DIR}/po/${LANG}.po.dummy ) >+ endif (USE_GTK) >+ >++ if (BUILD_LIB) >+ SET(pot-update-SRC ${pot-update-SRC} ${dcpp_SOURCE_DIR}/po/${LANG}.po.dummy) >++ endif (BUILD_LIB) >+ endforeach(LANG ${LANGUAGES}) >+ >+ # Add to target list >++ if (BUILD_LIB) >+ SET(pot-update-SRC >+ ${pot-update-SRC} >+ ${dcpp_SOURCE_DIR}/po/libeiskaltdcpp.pot # should depend on languages >+ >+ ) >++ endif (BUILD_LIB) >+ if (USE_GTK) >+ SET(pot-update-SRC >+ ${pot-update-SRC} >+@@ -329,6 +337,7 @@ >+ >+ foreach(LANG ${LANGUAGES}) >+ >++ if (BUILD_LIB) >+ add_custom_command( >+ OUTPUT ${dcpp_BINARY_DIR}/locale/${LANG}/LC_MESSAGES >+ COMMAND ${CMAKE_COMMAND} -E make_directory >+@@ -346,6 +355,7 @@ >+ WORKING_DIRECTORY ${dcpp_SOURCE_DIR}/po >+ COMMENT "mo-update [dcpp-${LANG}]: Creating mo file." >+ ) >++ endif (BUILD_LIB) >+ if (USE_GTK) >+ add_custom_command( >+ OUTPUT ${eiskaltdcpp-gtk_BINARY_DIR}/locale/${LANG}/LC_MESSAGES >+@@ -377,6 +387,7 @@ >+ ) >+ endif (USE_GTK) >+ >++ if (BUILD_LIB) >+ install(FILES >+ ${dcpp_BINARY_DIR}/locale/${LANG}/LC_MESSAGES/libeiskaltdcpp.mo >+ DESTINATION ${LOCALE_DIR}/${LANG}/LC_MESSAGES) >+@@ -387,6 +398,7 @@ >+ set(mo-update-LANG-SRC ${mo-update-LANG-SRC} >+ ${dcpp_BINARY_DIR}/locale/${LANG}/LC_MESSAGES/libeiskaltdcpp.mo >+ ) >++ endif (BUILD_LIB) >+ >+ if(UPDATE_PO) >+ add_custom_target(mo-update-${LANG} >diff --git a/net-p2p/eiskaltdcpp-gtk/files/patch-eiskaltdcpp-gtk__CMakeLists.txt b/net-p2p/eiskaltdcpp-gtk/files/patch-eiskaltdcpp-gtk__CMakeLists.txt >index 0fef9a5..c6732f6 100644 >--- a/net-p2p/eiskaltdcpp-gtk/files/patch-eiskaltdcpp-gtk__CMakeLists.txt >+++ b/net-p2p/eiskaltdcpp-gtk/files/patch-eiskaltdcpp-gtk__CMakeLists.txt >@@ -1,16 +1,16 @@ >---- ./eiskaltdcpp-gtk/CMakeLists.txt.orig 2011-03-08 19:47:12.000000000 +0200 >-+++ ./eiskaltdcpp-gtk/CMakeLists.txt 2011-03-10 16:22:20.000000000 +0200 >+--- ./eiskaltdcpp-gtk/CMakeLists.txt.orig 2011-10-02 18:12:43.000000000 +0300 >++++ ./eiskaltdcpp-gtk/CMakeLists.txt 2011-10-10 11:10:30.000000000 +0300 > @@ -12,7 +12,7 @@ > set (GTK_SRCS @gtk_srcs@ PARENT_SCOPE) > set (GTK_HDRS @gtk_hdrs@ PARENT_SCOPE) >- set (GTK_GLADE @gtk_glade@ PARENT_SCOPE) >+ set (GTK_UI @gtk_ui@ PARENT_SCOPE) > -set (GTHREAD "-lgthread-2.0") > +find_library (GTHREAD "gthread-2.0") > >- include_directories ( >- ${GTK2_INCLUDE_DIRS} >-@@ -37,6 +37,10 @@ >- set_property(SOURCE ${PROJECT_SOURCE_DIR}/src/mainwindow.cc ${PROJECT_SOURCE_DIR}/src/hub.cc PROPERTY COMPILE_DEFINITIONS LUA_SCRIPT) >+ if (USE_GTK) >+ set(GTK_INCLUDE_DIRS ${GTK2_INCLUDE_DIRS}) >+@@ -44,6 +44,10 @@ >+ list (APPEND LIBS ${LUA_LIBRARIES}) > endif (LUA_SCRIPT) > > +if (USE_MINIUPNP OR FREE_SPACE_BAR_C) >@@ -20,7 +20,7 @@ > add_executable (eiskaltdcpp-gtk MACOSX_BUNDLE WIN32 > ${gtk_srcs} > ) >-@@ -71,10 +75,19 @@ >+@@ -90,10 +94,19 @@ > add_definitions(-DCLIENT_RES_DIR="${CLIENT_DATA_DIR}/gtk/resources") > endif (APPLE) > >@@ -42,7 +42,7 @@ > endif (APPLE) > > if (UNIX) >-@@ -113,6 +126,6 @@ >+@@ -131,6 +144,6 @@ > else (APPLE) > if (UNIX) > install (FILES eiskaltdcpp-gtk.desktop DESTINATION ${SHARE_DIR}/applications) >diff --git a/net-p2p/eiskaltdcpp-gtk/files/patch-eiskaltdcpp-gtk__src__wulfor.cc b/net-p2p/eiskaltdcpp-gtk/files/patch-eiskaltdcpp-gtk__src__wulfor.cc >deleted file mode 100644 >index c1df3a1..0000000 >--- a/net-p2p/eiskaltdcpp-gtk/files/patch-eiskaltdcpp-gtk__src__wulfor.cc >+++ /dev/null >@@ -1,18 +0,0 @@ >---- ./eiskaltdcpp-gtk/src/wulfor.cc.orig 2011-03-10 16:43:57.000000000 +0200 >-+++ ./eiskaltdcpp-gtk/src/wulfor.cc 2011-03-10 16:44:22.000000000 +0200 >-@@ -37,7 +37,6 @@ >- #define GUI_PACKAGE "eiskaltdcpp-gtk" >- >- #include "VersionGlobal.h" >--#include "extra/stacktrace.h" >- >- void printHelp() >- { >-@@ -135,7 +134,6 @@ >- g_set_application_name("EiskaltDC++ Gtk"); >- >- signal(SIGPIPE, SIG_IGN); >-- signal(SIGSEGV, printBacktrace); >- >- WulforSettingsManager::newInstance(); >- WulforManager::start(argc, argv); >diff --git a/net-p2p/eiskaltdcpp-gtk/pkg-plist b/net-p2p/eiskaltdcpp-gtk/pkg-plist >index ac48f8a..d5d0ec7 100644 >--- a/net-p2p/eiskaltdcpp-gtk/pkg-plist >+++ b/net-p2p/eiskaltdcpp-gtk/pkg-plist >@@ -1,21 +1,5 @@ > bin/eiskaltdcpp-gtk > share/applications/eiskaltdcpp-gtk.desktop >-share/eiskaltdcpp/gtk/glade/adlsearch.glade >-share/eiskaltdcpp/gtk/glade/cmddebug.glade >-share/eiskaltdcpp/gtk/glade/downloadqueue.glade >-share/eiskaltdcpp/gtk/glade/favoritehubs.glade >-share/eiskaltdcpp/gtk/glade/favoriteusers.glade >-share/eiskaltdcpp/gtk/glade/finishedtransfers.glade >-share/eiskaltdcpp/gtk/glade/hash.glade >-share/eiskaltdcpp/gtk/glade/hub.glade >-share/eiskaltdcpp/gtk/glade/mainwindow.glade >-share/eiskaltdcpp/gtk/glade/privatemessage.glade >-share/eiskaltdcpp/gtk/glade/publichubs.glade >-share/eiskaltdcpp/gtk/glade/search.glade >-share/eiskaltdcpp/gtk/glade/searchspy.glade >-share/eiskaltdcpp/gtk/glade/settingsdialog.glade >-share/eiskaltdcpp/gtk/glade/sharebrowser.glade >-share/eiskaltdcpp/gtk/glade/transfers.glade > share/eiskaltdcpp/gtk/icons/hicolor/128x128/apps/eiskaltdcpp.png > share/eiskaltdcpp/gtk/icons/hicolor/16x16/status/eiskaltdcpp-dc++-fw-op.png > share/eiskaltdcpp/gtk/icons/hicolor/16x16/status/eiskaltdcpp-dc++-fw.png >@@ -103,7 +87,35 @@ share/eiskaltdcpp/gtk/themes/hicolor/32x32/categories/zoom1.png > share/eiskaltdcpp/gtk/themes/humanity.theme > share/eiskaltdcpp/gtk/themes/linuxdcpp.theme > share/eiskaltdcpp/gtk/themes/mankthemedark.theme >-@dirrm share/eiskaltdcpp/gtk/glade >+share/eiskaltdcpp/gtk/ui/adlsearch.ui >+share/eiskaltdcpp/gtk/ui/cmddebug.ui >+share/eiskaltdcpp/gtk/ui/downloadqueue.ui >+share/eiskaltdcpp/gtk/ui/favoritehubs.ui >+share/eiskaltdcpp/gtk/ui/favoriteusers.ui >+share/eiskaltdcpp/gtk/ui/finishedtransfers.ui >+share/eiskaltdcpp/gtk/ui/hash.ui >+share/eiskaltdcpp/gtk/ui/hub.ui >+share/eiskaltdcpp/gtk/ui/mainwindow.ui >+share/eiskaltdcpp/gtk/ui/privatemessage.ui >+share/eiskaltdcpp/gtk/ui/publichubs.ui >+share/eiskaltdcpp/gtk/ui/search.ui >+share/eiskaltdcpp/gtk/ui/searchspy.ui >+share/eiskaltdcpp/gtk/ui/settingsdialog.ui >+share/eiskaltdcpp/gtk/ui/sharebrowser.ui >+share/eiskaltdcpp/gtk/ui/transfers.ui >+share/locale/be/LC_MESSAGES/eiskaltdcpp-gtk.mo >+share/locale/bg/LC_MESSAGES/eiskaltdcpp-gtk.mo >+share/locale/cs/LC_MESSAGES/eiskaltdcpp-gtk.mo >+share/locale/de/LC_MESSAGES/eiskaltdcpp-gtk.mo >+share/locale/en/LC_MESSAGES/eiskaltdcpp-gtk.mo >+share/locale/es/LC_MESSAGES/eiskaltdcpp-gtk.mo >+share/locale/fr/LC_MESSAGES/eiskaltdcpp-gtk.mo >+share/locale/hu/LC_MESSAGES/eiskaltdcpp-gtk.mo >+share/locale/pl/LC_MESSAGES/eiskaltdcpp-gtk.mo >+share/locale/ru/LC_MESSAGES/eiskaltdcpp-gtk.mo >+share/locale/sk/LC_MESSAGES/eiskaltdcpp-gtk.mo >+share/locale/sr/LC_MESSAGES/eiskaltdcpp-gtk.mo >+share/locale/uk/LC_MESSAGES/eiskaltdcpp-gtk.mo > @dirrm share/eiskaltdcpp/gtk/icons/hicolor/16x16/status > @dirrm share/eiskaltdcpp/gtk/icons/hicolor/16x16 > @dirrm share/eiskaltdcpp/gtk/icons/hicolor/22x22/emotes >@@ -123,5 +135,6 @@ share/eiskaltdcpp/gtk/themes/mankthemedark.theme > @dirrm share/eiskaltdcpp/gtk/themes/hicolor/16x16 > @dirrm share/eiskaltdcpp/gtk/themes/hicolor > @dirrm share/eiskaltdcpp/gtk/themes >+@dirrm share/eiskaltdcpp/gtk/ui > @dirrm share/eiskaltdcpp/gtk > @dirrmtry share/applications >diff --git a/net-p2p/eiskaltdcpp-lib/Makefile b/net-p2p/eiskaltdcpp-lib/Makefile >index 9384289..6625ed7 100644 >--- a/net-p2p/eiskaltdcpp-lib/Makefile >+++ b/net-p2p/eiskaltdcpp-lib/Makefile >@@ -6,7 +6,7 @@ > # > > PORTNAME= eiskaltdcpp-lib >-PORTVERSION= 2.2.1 >+PORTVERSION= 2.2.4 > CATEGORIES= net-p2p > MASTER_SITES= GOOGLE_CODE > DISTNAME= eiskaltdcpp-${DISTVERSION} >@@ -21,7 +21,7 @@ LIB_DEPENDS= boost_system:${PORTSDIR}/devel/boost-libs > PROJECTHOST= eiskaltdc > > USE_XZ= yes >-USE_GCC= 4.2+ >+USE_GCC= 4.4+ > USE_CMAKE= yes > USE_GETTEXT= yes > USE_OPENSSL= yes >@@ -29,7 +29,9 @@ USE_LDCONFIG= yes > MAKE_JOBS_SAFE= yes > > OPTIONS= LUA "Lua scripting support" off \ >- PCRE "PCRE support in ADL Search" off >+ PCRE "PCRE support in ADL Search" off \ >+ IDN "IDN support" on \ >+ DHT "DHT support" on > > .include <bsd.port.options.mk> > >@@ -38,6 +40,7 @@ CMAKE_ARGS+= -DUSE_QT:BOOL=OFF > CMAKE_ARGS+= -DUSE_GTK:BOOL=OFF > CMAKE_ARGS+= -DUSE_ASPELL:BOOL=OFF > CMAKE_ARGS+= -DUSE_MINIUPNP:BOOL=OFF >+CMAKE_ARGS+= -DCMAKE_SKIP_RPATH:BOOL=ON > > .if defined(WITH_LUA) && !defined(WITHOUT_LUA) > USE_LUA= 5.1 >@@ -54,6 +57,19 @@ CMAKE_ARGS+= -DPERL_REGEX:BOOL=ON > CMAKE_ARGS+= -DPERL_REGEX:BOOL=OFF > .endif > >+.if defined(WITH_IDN) && !defined(WITHOUT_IDN) >+LIB_DEPENDS+= idn:${PORTSDIR}/dns/libidn >+CMAKE_ARGS+= -DUSE_IDNA:BOOL=ON >+.else >+CMAKE_ARGS+= -DUSE_IDNA:BOOL=OFF >+.endif >+ >+.if defined(WITH_DHT) && !defined(WITHOUT_DHT) >+CMAKE_ARGS+= -DWITH_DHT:BOOL=ON >+.else >+CMAKE_ARGS+= -DWITH_DHT:BOOL=OFF >+.endif >+ > .if ${OSVERSION} < 700024 > USE_OPENSSL_PORT=yes > .endif >diff --git a/net-p2p/eiskaltdcpp-lib/distinfo b/net-p2p/eiskaltdcpp-lib/distinfo >index b90927d..f94894f 100644 >--- a/net-p2p/eiskaltdcpp-lib/distinfo >+++ b/net-p2p/eiskaltdcpp-lib/distinfo >@@ -1,2 +1,2 @@ >-SHA256 (eiskaltdcpp-2.2.1.tar.xz) = 2b2bd627a1325c595f604766404ca4f4787db1b49b4b0c5c5d8e88ddfc2a2c40 >-SIZE (eiskaltdcpp-2.2.1.tar.xz) = 1916680 >+SHA256 (eiskaltdcpp-2.2.4.tar.xz) = a14d44ad1c48dc97354e17d3d8d8fc9bdd7be646d275603d092c6d9ebf7061b4 >+SIZE (eiskaltdcpp-2.2.4.tar.xz) = 2008920 >diff --git a/net-p2p/eiskaltdcpp-lib/files/patch-dcpp__CMakeLists.txt b/net-p2p/eiskaltdcpp-lib/files/patch-dcpp__CMakeLists.txt >index f8df4c4..f6d06a7 100644 >--- a/net-p2p/eiskaltdcpp-lib/files/patch-dcpp__CMakeLists.txt >+++ b/net-p2p/eiskaltdcpp-lib/files/patch-dcpp__CMakeLists.txt >@@ -1,6 +1,6 @@ >---- ./dcpp/CMakeLists.txt.orig 2011-03-08 19:47:12.000000000 +0200 >-+++ ./dcpp/CMakeLists.txt 2011-03-09 19:22:26.000000000 +0200 >-@@ -30,8 +30,6 @@ >+--- dcpp/CMakeLists.txt.orig 2011-10-02 18:12:43.000000000 +0300 >++++ dcpp/CMakeLists.txt 2011-10-03 10:14:13.000000000 +0300 >+@@ -34,8 +34,6 @@ > set (APPLE_LIBS "iconv") > endif (APPLE) > >@@ -8,19 +8,19 @@ > - > add_library (dcpp ${LINK} ${dcpp_srcs}) > >- if (USE_DHT) >-@@ -71,8 +69,8 @@ >+ if (WITH_DHT) >+@@ -76,8 +74,8 @@ > endif (WIN32) > >- target_link_libraries (dcpp ${PTHREADS} ${BZIP2_LIBRARIES} ${ZLIB_LIBRARIES} >--${OPENSSL_LIBRARIES} ${GETTEXT_LIBRARIES} ${ICONV_LIBRARIES} ${WIN32_LIBS} ${APPLE_LIBS} ${LUA_LIBRARIES} ${UPNP} ${PCRE} ${DHT_LIB}) >+ target_link_libraries (dcpp ${DHT_LIB} ${PTHREADS} ${BZIP2_LIBRARIES} ${ZLIB_LIBRARIES} >+-${OPENSSL_LIBRARIES} ${GETTEXT_LIBRARIES} ${ICONV_LIBRARIES} ${WIN32_LIBS} ${APPLE_LIBS} ${LUA_LIBRARIES} ${UPNP} ${PCRE} ${IDNA_LIBRARIES}) > -set_target_properties(dcpp PROPERTIES VERSION ${SOVERSION} OUTPUT_NAME "eiskaltdcpp") >-+${OPENSSL_LIBRARIES} ${GETTEXT_LIBRARIES} ${ICONV_LIBRARIES} ${WIN32_LIBS} ${APPLE_LIBS} ${LUA_LIBRARIES} ${UPNP} ${PCRE} ${DHT_LIB} extra) >++${OPENSSL_LIBRARIES} ${GETTEXT_LIBRARIES} ${ICONV_LIBRARIES} ${WIN32_LIBS} ${APPLE_LIBS} ${LUA_LIBRARIES} ${UPNP} ${PCRE} ${IDNA_LIBRARIES} extra) > +set_target_properties(dcpp PROPERTIES SOVERSION 2 VERSION ${SOVERSION} OUTPUT_NAME "eiskaltdcpp") > > if (APPLE) > set (LIBDIR1 .) >-@@ -81,6 +79,6 @@ >+@@ -86,6 +84,6 @@ > > if (LINK STREQUAL SHARED) > install (TARGETS dcpp >diff --git a/net-p2p/eiskaltdcpp-lib/pkg-plist b/net-p2p/eiskaltdcpp-lib/pkg-plist >index 0904904..486dcca 100644 >--- a/net-p2p/eiskaltdcpp-lib/pkg-plist >+++ b/net-p2p/eiskaltdcpp-lib/pkg-plist >@@ -3,8 +3,6 @@ include/eiskaltdcpp/dcpp/AdcCommand.h > include/eiskaltdcpp/dcpp/AdcHub.h > include/eiskaltdcpp/dcpp/Atomic.h > include/eiskaltdcpp/dcpp/BZUtils.h >-include/eiskaltdcpp/dcpp/BitInputStream.h >-include/eiskaltdcpp/dcpp/BitOutputStream.h > include/eiskaltdcpp/dcpp/BloomFilter.h > include/eiskaltdcpp/dcpp/BufferedSocket.h > include/eiskaltdcpp/dcpp/BufferedSocketListener.h >@@ -61,6 +59,7 @@ include/eiskaltdcpp/dcpp/SSLSocket.h > include/eiskaltdcpp/dcpp/ScriptManager.h > include/eiskaltdcpp/dcpp/SearchManager.h > include/eiskaltdcpp/dcpp/SearchManagerListener.h >+include/eiskaltdcpp/dcpp/SearchQueue.h > include/eiskaltdcpp/dcpp/SearchResult.h > include/eiskaltdcpp/dcpp/Segment.h > include/eiskaltdcpp/dcpp/Semaphore.h >@@ -96,9 +95,15 @@ include/eiskaltdcpp/dcpp/WindowInfo.h > include/eiskaltdcpp/dcpp/WindowManager.h > include/eiskaltdcpp/dcpp/WindowManagerListener.h > include/eiskaltdcpp/dcpp/ZUtils.h >+include/eiskaltdcpp/dcpp/compiler.h >+include/eiskaltdcpp/dcpp/debug.h >+include/eiskaltdcpp/dcpp/format.h > include/eiskaltdcpp/dcpp/forward.h >+include/eiskaltdcpp/dcpp/noexcept.h > include/eiskaltdcpp/dcpp/stdinc.h >+include/eiskaltdcpp/dcpp/typedefs.h > include/eiskaltdcpp/dcpp/version.h >+include/eiskaltdcpp/dcpp/w.h > @dirrm include/eiskaltdcpp/dcpp > @dirrm include/eiskaltdcpp > lib/libeiskaltdcpp.so.2.2 >@@ -107,6 +112,7 @@ lib/libeiskaltdcpp.so > share/locale/be/LC_MESSAGES/libeiskaltdcpp.mo > share/locale/bg/LC_MESSAGES/libeiskaltdcpp.mo > share/locale/cs/LC_MESSAGES/libeiskaltdcpp.mo >+share/locale/de/LC_MESSAGES/libeiskaltdcpp.mo > share/locale/en/LC_MESSAGES/libeiskaltdcpp.mo > share/locale/es/LC_MESSAGES/libeiskaltdcpp.mo > share/locale/fr/LC_MESSAGES/libeiskaltdcpp.mo >diff --git a/net-p2p/eiskaltdcpp-qt/Makefile b/net-p2p/eiskaltdcpp-qt/Makefile >index c16a678..055d8e8 100644 >--- a/net-p2p/eiskaltdcpp-qt/Makefile >+++ b/net-p2p/eiskaltdcpp-qt/Makefile >@@ -6,7 +6,7 @@ > # > > PORTNAME= eiskaltdcpp-qt >-PORTVERSION= 2.2.1 >+PORTVERSION= 2.2.4 > CATEGORIES= net-p2p > MASTER_SITES= GOOGLE_CODE > DISTNAME= eiskaltdcpp-${DISTVERSION} >@@ -25,7 +25,7 @@ CMAKE_ARGS+= -DBUILD_LIB:BOOL=OFF > PROJECTHOST= eiskaltdc > > USE_XZ= yes >-USE_GCC= 4.2+ >+USE_GCC= 4.4+ > USE_GETTEXT= yes > USE_CMAKE= yes > USE_OPENSSL= yes >@@ -50,6 +50,7 @@ CMAKE_ARGS+= -DUSE_GTK:BOOL=OFF > CMAKE_ARGS+= -DEISKALTDCPP_INCLUDE_DIR:STRING="${LOCALBASE}/include/eiskaltdcpp" > CMAKE_ARGS+= -DCREATE_MO:BOOL=OFF > CMAKE_ARGS+= -DCMAKE_LIBRARY_PATH:PATH="${LOCALBASE}/lib:${PREFIX}/lib" >+CMAKE_ARGS+= -DCMAKE_SKIP_RPATH:BOOL=ON > > BUILD_WRKSRC= ${WRKSRC}/${PORTNAME} > INSTALL_WRKSRC= ${WRKSRC}/${PORTNAME} >diff --git a/net-p2p/eiskaltdcpp-qt/distinfo b/net-p2p/eiskaltdcpp-qt/distinfo >index b90927d..f94894f 100644 >--- a/net-p2p/eiskaltdcpp-qt/distinfo >+++ b/net-p2p/eiskaltdcpp-qt/distinfo >@@ -1,2 +1,2 @@ >-SHA256 (eiskaltdcpp-2.2.1.tar.xz) = 2b2bd627a1325c595f604766404ca4f4787db1b49b4b0c5c5d8e88ddfc2a2c40 >-SIZE (eiskaltdcpp-2.2.1.tar.xz) = 1916680 >+SHA256 (eiskaltdcpp-2.2.4.tar.xz) = a14d44ad1c48dc97354e17d3d8d8fc9bdd7be646d275603d092c6d9ebf7061b4 >+SIZE (eiskaltdcpp-2.2.4.tar.xz) = 2008920 >diff --git a/net-p2p/eiskaltdcpp-qt/files/patch-CMakeLists.txt b/net-p2p/eiskaltdcpp-qt/files/patch-CMakeLists.txt >index 3c65dc2..6667079 100644 >--- a/net-p2p/eiskaltdcpp-qt/files/patch-CMakeLists.txt >+++ b/net-p2p/eiskaltdcpp-qt/files/patch-CMakeLists.txt >@@ -1,8 +1,8 @@ >---- ./CMakeLists.txt.orig 2011-03-08 19:47:12.000000000 +0200 >-+++ ./CMakeLists.txt 2011-03-09 15:49:15.000000000 +0200 >-@@ -316,16 +316,14 @@ >- if (MINGW) >- set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--enable-auto-import") >+--- CMakeLists.txt.orig 2011-10-02 18:12:43.000000000 +0300 >++++ CMakeLists.txt 2011-10-03 10:40:18.000000000 +0300 >+@@ -370,16 +370,14 @@ >+ else (MINGW) >+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") > endif (MINGW) > - if (NOT APPLE) > - set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wl,--as-needed") >@@ -20,9 +20,9 @@ > ${eiskaltdcpp_SOURCE_DIR} > ${GMP_INCLUDE_DIR} > ) >-@@ -395,7 +393,9 @@ >- add_subdirectory (dht) >- endif (DHT) >+@@ -451,7 +449,9 @@ >+ add_subdirectory (dht) >+ endif (WITH_DHT) > > -add_subdirectory (dcpp) > +if (BUILD_LIB) >@@ -31,19 +31,3 @@ > > if (USE_QT) > add_subdirectory (eiskaltdcpp-qt) >-@@ -443,11 +443,11 @@ >- LOCALE_LIST "${LANGUAGES}" >- COPYRIGHT_HOLDER "EiskaltDC++ team" >- SOURCES "${DCPP_SRCS};${DCPP_HDRS}" >-- PO_DIR "${dcpp_SOURCE_DIR}/po" >-- POT_BUILD_DIR "${dcpp_SOURCE_DIR}/po" >-+ PO_DIR "${PROJECT_SOURCE_DIR}/po" >-+ POT_BUILD_DIR "${PROJECT_SOURCE_DIR}/po" >- #PO_PREFIX "" >-- PO_BUILD_DIR "${dcpp_SOURCE_DIR}/po" >-- MO_BUILD_DIR "${dcpp_BINARY_DIR}/locale" >-+ PO_BUILD_DIR "${PROJECT_SOURCE_DIR}/po" >-+ MO_BUILD_DIR "${PROJECT_BINARY_DIR}/locale" >- MO_INSTALL_DIR "/${LOCALE_DIR}" >- CREATE_POT_TARGET ${create_pot} >- CREATE_PO_TARGET ${create_po} >diff --git a/net-p2p/eiskaltdcpp-qt/files/patch-cmake__CMakeLists.txt b/net-p2p/eiskaltdcpp-qt/files/patch-cmake__CMakeLists.txt >new file mode 100644 >index 0000000..6780e45 >--- /dev/null >+++ b/net-p2p/eiskaltdcpp-qt/files/patch-cmake__CMakeLists.txt >@@ -0,0 +1,85 @@ >+--- ./cmake/CMakeLists.txt.orig 2011-10-02 18:12:43.000000000 +0300 >++++ ./cmake/CMakeLists.txt 2011-10-10 11:10:30.000000000 +0300 >+@@ -37,12 +37,14 @@ >+ >+ endmacro(GET_RELATIVE_SOURCES) >+ >++if (BUILD_LIB) >+ get_absolute_sources(abs_dcpp_sources "${DCPP_SRCS};${DCPP_HDRS}") >+ get_relative_sources(rel_dcpp_sources "${dcpp_SOURCE_DIR}/po" "${abs_dcpp_sources}") >+ file(MAKE_DIRECTORY "${dcpp_BINARY_DIR}/po") >+ set(dcpp_files_from "${dcpp_BINARY_DIR}/po/libeiskaltdcpp_srcs.txt") >+ string(REGEX REPLACE ";" "\n" dcpp_contents "${rel_dcpp_sources}") >+ file(WRITE "${dcpp_files_from}" "${dcpp_contents}") >++endif (BUILD_LIB) >+ >+ if (USE_GTK) >+ get_absolute_sources(abs_gtk_cpp_sources "${GTK_SRCS};${GTK_HDRS}") >+@@ -163,6 +165,7 @@ >+ # if the po file doesn't exist. The case where a po file used to >+ # exist and no longer exists should never occur >+ >++ if (BUILD_LIB) >+ if(NOT EXISTS ${dcpp_SOURCE_DIR}/po/${LANG}.po) >+ add_custom_command( >+ OUTPUT ${dcpp_SOURCE_DIR}/po/${LANG}.po >+@@ -194,6 +197,7 @@ >+ WORKING_DIRECTORY ${dcpp_SOURCE_DIR}/po >+ COMMENT "pot-update [dcpp-${LANG}]: Updated po file." >+ ) >++ endif (BUILD_LIB) >+ >+ if (USE_GTK) >+ if(NOT EXISTS ${eiskaltdcpp-gtk_SOURCE_DIR}/po/${LANG}.po) >+@@ -231,15 +235,19 @@ >+ SET(pot-update-SRC ${pot-update-SRC} ${eiskaltdcpp-gtk_SOURCE_DIR}/po/${LANG}.po.dummy ) >+ endif (USE_GTK) >+ >++ if (BUILD_LIB) >+ SET(pot-update-SRC ${pot-update-SRC} ${dcpp_SOURCE_DIR}/po/${LANG}.po.dummy) >++ endif (BUILD_LIB) >+ endforeach(LANG ${LANGUAGES}) >+ >+ # Add to target list >++ if (BUILD_LIB) >+ SET(pot-update-SRC >+ ${pot-update-SRC} >+ ${dcpp_SOURCE_DIR}/po/libeiskaltdcpp.pot # should depend on languages >+ >+ ) >++ endif (BUILD_LIB) >+ if (USE_GTK) >+ SET(pot-update-SRC >+ ${pot-update-SRC} >+@@ -329,6 +337,7 @@ >+ >+ foreach(LANG ${LANGUAGES}) >+ >++ if (BUILD_LIB) >+ add_custom_command( >+ OUTPUT ${dcpp_BINARY_DIR}/locale/${LANG}/LC_MESSAGES >+ COMMAND ${CMAKE_COMMAND} -E make_directory >+@@ -346,6 +355,7 @@ >+ WORKING_DIRECTORY ${dcpp_SOURCE_DIR}/po >+ COMMENT "mo-update [dcpp-${LANG}]: Creating mo file." >+ ) >++ endif (BUILD_LIB) >+ if (USE_GTK) >+ add_custom_command( >+ OUTPUT ${eiskaltdcpp-gtk_BINARY_DIR}/locale/${LANG}/LC_MESSAGES >+@@ -377,6 +387,7 @@ >+ ) >+ endif (USE_GTK) >+ >++ if (BUILD_LIB) >+ install(FILES >+ ${dcpp_BINARY_DIR}/locale/${LANG}/LC_MESSAGES/libeiskaltdcpp.mo >+ DESTINATION ${LOCALE_DIR}/${LANG}/LC_MESSAGES) >+@@ -387,6 +398,7 @@ >+ set(mo-update-LANG-SRC ${mo-update-LANG-SRC} >+ ${dcpp_BINARY_DIR}/locale/${LANG}/LC_MESSAGES/libeiskaltdcpp.mo >+ ) >++ endif (BUILD_LIB) >+ >+ if(UPDATE_PO) >+ add_custom_target(mo-update-${LANG} >diff --git a/net-p2p/eiskaltdcpp-qt/files/patch-eiskaltdcpp-qt__CMakeLists.txt b/net-p2p/eiskaltdcpp-qt/files/patch-eiskaltdcpp-qt__CMakeLists.txt >index 9f78c79..4e02989 100644 >--- a/net-p2p/eiskaltdcpp-qt/files/patch-eiskaltdcpp-qt__CMakeLists.txt >+++ b/net-p2p/eiskaltdcpp-qt/files/patch-eiskaltdcpp-qt__CMakeLists.txt >@@ -1,8 +1,8 @@ >---- ./eiskaltdcpp-qt/CMakeLists.txt.orig 2011-03-08 19:47:12.000000000 +0200 >-+++ ./eiskaltdcpp-qt/CMakeLists.txt 2011-03-09 15:49:15.000000000 +0200 >-@@ -356,6 +356,10 @@ >- set_property(SOURCE ${PROJECT_SOURCE_DIR}/src/main.cpp PROPERTY COMPILE_DEFINITIONS FORCE_XDG ) >- endif (FORCE_XDG) >+--- eiskaltdcpp-qt/CMakeLists.txt.orig 2011-10-02 18:12:43.000000000 +0300 >++++ eiskaltdcpp-qt/CMakeLists.txt 2011-10-03 11:20:59.000000000 +0300 >+@@ -359,6 +359,10 @@ >+ set_property(SOURCE ${PROJECT_SOURCE_DIR}/src/main.cpp PROPERTY COMPILE_DEFINITIONS ENABLE_STACKTRACE) >+ endif (ENABLE_STACKTRACE) > > +if (USE_MINIUPNP OR FREE_SPACE_BAR_C) > + list(APPEND LIBS extra) >@@ -11,7 +11,7 @@ > if (APPLE) > set (MACOSICON "${PROJECT_SOURCE_DIR}/../icons/icon_128x128.icns") > set (MACOSICONINBUNDLE "icon_128x128.icns") >-@@ -393,10 +397,19 @@ >+@@ -396,10 +400,19 @@ > add_definitions(-DCLIENT_RES_DIR="${CLIENT_DATA_DIR}/qt/resources") > endif (APPLE) > >@@ -33,12 +33,12 @@ > endif (APPLE) > > if (APPLE) >-@@ -464,7 +477,7 @@ >+@@ -469,7 +482,7 @@ > else (APPLE) > install (FILES ${PROJECT_BINARY_DIR}/default.rcc DESTINATION ${CLIENT_DATA_DIR}/qt/resources) >- if (UNIX) >+ if (UNIX AND NOT HAIKU) > - install (FILES ${PROJECT_BINARY_DIR}/eiskaltdcpp-qt.1.gz DESTINATION ${SHARE_DIR}/man/man1) > + install (FILES ${PROJECT_BINARY_DIR}/eiskaltdcpp-qt.1.gz DESTINATION man/man1) > install (FILES eiskaltdcpp-qt.desktop DESTINATION ${SHARE_DIR}/applications) >- endif (UNIX) >+ endif (UNIX AND NOT HAIKU) > endif (APPLE) >diff --git a/net-p2p/eiskaltdcpp-qt/files/patch-eiskaltdcpp-qt__src__main.cpp b/net-p2p/eiskaltdcpp-qt/files/patch-eiskaltdcpp-qt__src__main.cpp >deleted file mode 100644 >index f9ac3f6..0000000 >--- a/net-p2p/eiskaltdcpp-qt/files/patch-eiskaltdcpp-qt__src__main.cpp >+++ /dev/null >@@ -1,20 +0,0 @@ >---- ./eiskaltdcpp-qt/src/main.cpp.orig 2011-03-09 15:49:53.000000000 +0200 >-+++ ./eiskaltdcpp-qt/src/main.cpp 2011-03-09 15:50:14.000000000 +0200 >-@@ -58,8 +58,6 @@ >- #include <signal.h> >- #include <execinfo.h> >- >--#include "extra/stacktrace.h" >-- >- void installHandlers(); >- >- #ifdef FORCE_XDG >-@@ -214,8 +212,6 @@ >- std::cout << QObject::tr("Cannot handle SIGPIPE").toStdString() << std::endl; >- } >- >-- signal(SIGSEGV, printBacktrace); >-- >- std::cout << QObject::tr("Signal handlers installed.").toStdString() << std::endl; >- } >- >diff --git a/net-p2p/eiskaltdcpp-qt/pkg-plist b/net-p2p/eiskaltdcpp-qt/pkg-plist >index a3789cb..79e694c 100644 >--- a/net-p2p/eiskaltdcpp-qt/pkg-plist >+++ b/net-p2p/eiskaltdcpp-qt/pkg-plist >@@ -138,6 +138,75 @@ share/eiskaltdcpp/qt/icons/appl/faenza/view-close.png > share/eiskaltdcpp/qt/icons/appl/faenza/view-filter.png > share/eiskaltdcpp/qt/icons/appl/faenza/zoom-in.png > share/eiskaltdcpp/qt/icons/appl/faenza/zoom-out.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/adls.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/application-exit.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/application-x-archive.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/application-x-executable.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/audio-x-generic.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/ball_green.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/bookmark-new.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/chat.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/configure.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/console.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/default.qrc >+share/eiskaltdcpp/qt/icons/appl/monochrome/dialog-close.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/document-edit.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/download.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/edit-clear-locationbar-rtl.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/edit-clear.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/edit-copy.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/edit-delete.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/edit-find.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/eraser.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/face-smile.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/fav.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/favadd.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/favrem.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/favserver.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/favusers.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/find.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/folder-blue.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/freespace.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/go-down-search.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/go-down.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/go-up-search.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/go-up.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/gui.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/hashing.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/hubmsg.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/icon_appl.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/icon_appl_big.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/icon_msg.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/im-user-away.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/image-x-generic.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/list-add.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/log_file.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/message.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/network-connect.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/network-disconnect.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/openlist.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/own_filelist.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/plugin.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/pmmsg.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/qt-logo.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/reconnect.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/refrlist.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/reload.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/server.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/slow.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/slow_off.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/spam.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/spy.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/status.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/text-x-generic.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/transfer.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/unknown.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/users.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/video-x-generic.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/view-close.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/view-filter.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/zoom-in.png >+share/eiskaltdcpp/qt/icons/appl/monochrome/zoom-out.png > share/eiskaltdcpp/qt/icons/user/valknut/usericons.png > %%QTSCRIPT%%share/eiskaltdcpp/qt/qtscripts/amarok_nowplay/amarok.png > %%QTSCRIPT%%share/eiskaltdcpp/qt/qtscripts/amarok_nowplay/amarok.sh >@@ -171,6 +240,7 @@ share/eiskaltdcpp/qt/resources/default.rcc > share/eiskaltdcpp/qt/ts/be.qm > share/eiskaltdcpp/qt/ts/bg.qm > share/eiskaltdcpp/qt/ts/cs.qm >+share/eiskaltdcpp/qt/ts/de.qm > share/eiskaltdcpp/qt/ts/en.qm > share/eiskaltdcpp/qt/ts/es.qm > share/eiskaltdcpp/qt/ts/fr.qm >@@ -191,6 +261,7 @@ share/eiskaltdcpp/qt/ts/uk.qm > %%QTSCRIPT%%@dirrm share/eiskaltdcpp/qt/qtscripts > @dirrm share/eiskaltdcpp/qt/icons/appl/default > @dirrm share/eiskaltdcpp/qt/icons/appl/faenza >+@dirrm share/eiskaltdcpp/qt/icons/appl/monochrome > @dirrm share/eiskaltdcpp/qt/icons/appl > @dirrm share/eiskaltdcpp/qt/icons/user/default > @dirrm share/eiskaltdcpp/qt/icons/user/valknut
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 161898
: 119379