1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-20 08:27:15 +00:00

- Update to 2.2.10 and unbreak (USE_GITHUB=yes)

This commit is contained in:
Max Khon 2016-10-04 16:06:57 +00:00
parent eefb1af100
commit f34b26b3ff
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=423278
15 changed files with 171 additions and 187 deletions

View File

@ -1,6 +1,6 @@
bin/eiskaltdcpp-cli-jsonrpc
bin/eiskaltdcpp-cli-xmlrpc
@sample etc/eiskaltdcpp/cli-jsonrpc-config.pl.sample
@sample etc/eiskaltdcpp/cli-xmlrpc-config.pl.sample
@sample %%ETCDIR%%/cli-jsonrpc-config.pl.sample
@sample %%ETCDIR%%/cli-xmlrpc-config.pl.sample
man/man1/eiskaltdcpp-cli-jsonrpc.1.gz
man/man1/eiskaltdcpp-cli-xmlrpc.1.gz

View File

@ -1,110 +1,110 @@
bin/eiskaltdcpp-gtk
man/man1/eiskaltdcpp-gtk.1.gz
share/applications/eiskaltdcpp-gtk.desktop
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
share/eiskaltdcpp/gtk/icons/hicolor/16x16/status/eiskaltdcpp-dc++-op.png
share/eiskaltdcpp/gtk/icons/hicolor/16x16/status/eiskaltdcpp-dc++.png
share/eiskaltdcpp/gtk/icons/hicolor/16x16/status/eiskaltdcpp-normal-fw-op.png
share/eiskaltdcpp/gtk/icons/hicolor/16x16/status/eiskaltdcpp-normal-fw.png
share/eiskaltdcpp/gtk/icons/hicolor/16x16/status/eiskaltdcpp-normal-op.png
share/eiskaltdcpp/gtk/icons/hicolor/16x16/status/eiskaltdcpp-normal.png
share/eiskaltdcpp/gtk/icons/hicolor/22x22/apps/eiskaltdcpp.png
share/eiskaltdcpp/gtk/icons/hicolor/22x22/categories/eiskaltdcpp-adls.png
share/eiskaltdcpp/gtk/icons/hicolor/22x22/categories/eiskaltdcpp-application-exit.png
share/eiskaltdcpp/gtk/icons/hicolor/22x22/categories/eiskaltdcpp-configure.png
share/eiskaltdcpp/gtk/icons/hicolor/22x22/categories/eiskaltdcpp-download.png
share/eiskaltdcpp/gtk/icons/hicolor/22x22/categories/eiskaltdcpp-edit-find.png
share/eiskaltdcpp/gtk/icons/hicolor/22x22/categories/eiskaltdcpp-favserver.png
share/eiskaltdcpp/gtk/icons/hicolor/22x22/categories/eiskaltdcpp-favusers.png
share/eiskaltdcpp/gtk/icons/hicolor/22x22/categories/eiskaltdcpp-find.png
share/eiskaltdcpp/gtk/icons/hicolor/22x22/categories/eiskaltdcpp-folder-blue.png
share/eiskaltdcpp/gtk/icons/hicolor/22x22/categories/eiskaltdcpp-go-down-search.png
share/eiskaltdcpp/gtk/icons/hicolor/22x22/categories/eiskaltdcpp-go-up-search.png
share/eiskaltdcpp/gtk/icons/hicolor/22x22/categories/eiskaltdcpp-gui.png
share/eiskaltdcpp/gtk/icons/hicolor/22x22/categories/eiskaltdcpp-hashing.png
share/eiskaltdcpp/gtk/icons/hicolor/22x22/categories/eiskaltdcpp-network-connect.png
share/eiskaltdcpp/gtk/icons/hicolor/22x22/categories/eiskaltdcpp-openlist.png
share/eiskaltdcpp/gtk/icons/hicolor/22x22/categories/eiskaltdcpp-own_filelist.png
share/eiskaltdcpp/gtk/icons/hicolor/22x22/categories/eiskaltdcpp-reconnect.png
share/eiskaltdcpp/gtk/icons/hicolor/22x22/categories/eiskaltdcpp-refrlist.png
share/eiskaltdcpp/gtk/icons/hicolor/22x22/categories/eiskaltdcpp-server.png
share/eiskaltdcpp/gtk/icons/hicolor/22x22/categories/eiskaltdcpp-spy.png
share/eiskaltdcpp/gtk/icons/hicolor/22x22/emotes/face-smile.png
share/eiskaltdcpp/gtk/icons/hicolor/22x22/status/eiskaltdcpp-go-down.png
share/eiskaltdcpp/gtk/icons/hicolor/22x22/status/eiskaltdcpp-go-up.png
share/eiskaltdcpp/gtk/icons/hicolor/22x22/status/eiskaltdcpp-server-red.png
share/eiskaltdcpp/gtk/icons/hicolor/22x22/status/eiskaltdcpp-server.png
share/eiskaltdcpp/gtk/icons/hicolor/22x22/status/eiskaltdcpp-users-red.png
share/eiskaltdcpp/gtk/icons/hicolor/22x22/status/eiskaltdcpp-users.png
share/eiskaltdcpp/gtk/icons/hicolor/22x22/status/icon_msg.png
share/eiskaltdcpp/gtk/themes/bw.theme
share/eiskaltdcpp/gtk/themes/gtk-theme.theme
share/eiskaltdcpp/gtk/themes/hicolor/16x16/status/humanity-dc++-fw-op.svg
share/eiskaltdcpp/gtk/themes/hicolor/16x16/status/humanity-dc++-fw.svg
share/eiskaltdcpp/gtk/themes/hicolor/16x16/status/humanity-dc++-op.svg
share/eiskaltdcpp/gtk/themes/hicolor/16x16/status/humanity-dc++.svg
share/eiskaltdcpp/gtk/themes/hicolor/16x16/status/humanity-normal-fw-op.svg
share/eiskaltdcpp/gtk/themes/hicolor/16x16/status/humanity-normal-fw.svg
share/eiskaltdcpp/gtk/themes/hicolor/16x16/status/humanity-normal-op.svg
share/eiskaltdcpp/gtk/themes/hicolor/16x16/status/humanity-normal.svg
share/eiskaltdcpp/gtk/themes/hicolor/22x22/status/linuxdcpp-dc++-fw-op.png
share/eiskaltdcpp/gtk/themes/hicolor/22x22/status/linuxdcpp-dc++-fw.png
share/eiskaltdcpp/gtk/themes/hicolor/22x22/status/linuxdcpp-dc++-op.png
share/eiskaltdcpp/gtk/themes/hicolor/22x22/status/linuxdcpp-dc++.png
share/eiskaltdcpp/gtk/themes/hicolor/22x22/status/linuxdcpp-download.png
share/eiskaltdcpp/gtk/themes/hicolor/22x22/status/linuxdcpp-normal-fw-op.png
share/eiskaltdcpp/gtk/themes/hicolor/22x22/status/linuxdcpp-normal-fw.png
share/eiskaltdcpp/gtk/themes/hicolor/22x22/status/linuxdcpp-normal-op.png
share/eiskaltdcpp/gtk/themes/hicolor/22x22/status/linuxdcpp-normal.png
share/eiskaltdcpp/gtk/themes/hicolor/22x22/status/linuxdcpp-upload.png
share/eiskaltdcpp/gtk/themes/hicolor/32x32/categories/applications.png
share/eiskaltdcpp/gtk/themes/hicolor/32x32/categories/away.png
share/eiskaltdcpp/gtk/themes/hicolor/32x32/categories/bw-connect.png
share/eiskaltdcpp/gtk/themes/hicolor/32x32/categories/bw-favorite-hubs.png
share/eiskaltdcpp/gtk/themes/hicolor/32x32/categories/bw-finished-downloads.png
share/eiskaltdcpp/gtk/themes/hicolor/32x32/categories/bw-finished-uploads.png
share/eiskaltdcpp/gtk/themes/hicolor/32x32/categories/bw-hash.png
share/eiskaltdcpp/gtk/themes/hicolor/32x32/categories/bw-preferences.png
share/eiskaltdcpp/gtk/themes/hicolor/32x32/categories/bw-public-hubs.png
share/eiskaltdcpp/gtk/themes/hicolor/32x32/categories/bw-queue.png
share/eiskaltdcpp/gtk/themes/hicolor/32x32/categories/bw-quit.png
share/eiskaltdcpp/gtk/themes/hicolor/32x32/categories/bw-search.png
share/eiskaltdcpp/gtk/themes/hicolor/32x32/categories/check.png
share/eiskaltdcpp/gtk/themes/hicolor/32x32/categories/close.png
share/eiskaltdcpp/gtk/themes/hicolor/32x32/categories/down1.png
share/eiskaltdcpp/gtk/themes/hicolor/32x32/categories/favorites.png
share/eiskaltdcpp/gtk/themes/hicolor/32x32/categories/go.png
share/eiskaltdcpp/gtk/themes/hicolor/32x32/categories/group.png
share/eiskaltdcpp/gtk/themes/hicolor/32x32/categories/paste.png
share/eiskaltdcpp/gtk/themes/hicolor/32x32/categories/reconect.png
share/eiskaltdcpp/gtk/themes/hicolor/32x32/categories/report.png
share/eiskaltdcpp/gtk/themes/hicolor/32x32/categories/up1.png
share/eiskaltdcpp/gtk/themes/hicolor/32x32/categories/user_black.png
share/eiskaltdcpp/gtk/themes/hicolor/32x32/categories/web.png
share/eiskaltdcpp/gtk/themes/hicolor/32x32/categories/zoom.png
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
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/eiskaltdcpp/gtk/ui/uploadqueue.ui
%%DATADIR%%/gtk/icons/hicolor/128x128/apps/eiskaltdcpp.png
%%DATADIR%%/gtk/icons/hicolor/16x16/status/eiskaltdcpp-dc++-fw-op.png
%%DATADIR%%/gtk/icons/hicolor/16x16/status/eiskaltdcpp-dc++-fw.png
%%DATADIR%%/gtk/icons/hicolor/16x16/status/eiskaltdcpp-dc++-op.png
%%DATADIR%%/gtk/icons/hicolor/16x16/status/eiskaltdcpp-dc++.png
%%DATADIR%%/gtk/icons/hicolor/16x16/status/eiskaltdcpp-normal-fw-op.png
%%DATADIR%%/gtk/icons/hicolor/16x16/status/eiskaltdcpp-normal-fw.png
%%DATADIR%%/gtk/icons/hicolor/16x16/status/eiskaltdcpp-normal-op.png
%%DATADIR%%/gtk/icons/hicolor/16x16/status/eiskaltdcpp-normal.png
%%DATADIR%%/gtk/icons/hicolor/22x22/apps/eiskaltdcpp.png
%%DATADIR%%/gtk/icons/hicolor/22x22/categories/eiskaltdcpp-adls.png
%%DATADIR%%/gtk/icons/hicolor/22x22/categories/eiskaltdcpp-application-exit.png
%%DATADIR%%/gtk/icons/hicolor/22x22/categories/eiskaltdcpp-configure.png
%%DATADIR%%/gtk/icons/hicolor/22x22/categories/eiskaltdcpp-download.png
%%DATADIR%%/gtk/icons/hicolor/22x22/categories/eiskaltdcpp-edit-find.png
%%DATADIR%%/gtk/icons/hicolor/22x22/categories/eiskaltdcpp-favserver.png
%%DATADIR%%/gtk/icons/hicolor/22x22/categories/eiskaltdcpp-favusers.png
%%DATADIR%%/gtk/icons/hicolor/22x22/categories/eiskaltdcpp-find.png
%%DATADIR%%/gtk/icons/hicolor/22x22/categories/eiskaltdcpp-folder-blue.png
%%DATADIR%%/gtk/icons/hicolor/22x22/categories/eiskaltdcpp-go-down-search.png
%%DATADIR%%/gtk/icons/hicolor/22x22/categories/eiskaltdcpp-go-up-search.png
%%DATADIR%%/gtk/icons/hicolor/22x22/categories/eiskaltdcpp-gui.png
%%DATADIR%%/gtk/icons/hicolor/22x22/categories/eiskaltdcpp-hashing.png
%%DATADIR%%/gtk/icons/hicolor/22x22/categories/eiskaltdcpp-network-connect.png
%%DATADIR%%/gtk/icons/hicolor/22x22/categories/eiskaltdcpp-openlist.png
%%DATADIR%%/gtk/icons/hicolor/22x22/categories/eiskaltdcpp-own_filelist.png
%%DATADIR%%/gtk/icons/hicolor/22x22/categories/eiskaltdcpp-reconnect.png
%%DATADIR%%/gtk/icons/hicolor/22x22/categories/eiskaltdcpp-refrlist.png
%%DATADIR%%/gtk/icons/hicolor/22x22/categories/eiskaltdcpp-server.png
%%DATADIR%%/gtk/icons/hicolor/22x22/categories/eiskaltdcpp-spy.png
%%DATADIR%%/gtk/icons/hicolor/22x22/emotes/face-smile.png
%%DATADIR%%/gtk/icons/hicolor/22x22/status/eiskaltdcpp-go-down.png
%%DATADIR%%/gtk/icons/hicolor/22x22/status/eiskaltdcpp-go-up.png
%%DATADIR%%/gtk/icons/hicolor/22x22/status/eiskaltdcpp-server-red.png
%%DATADIR%%/gtk/icons/hicolor/22x22/status/eiskaltdcpp-server.png
%%DATADIR%%/gtk/icons/hicolor/22x22/status/eiskaltdcpp-users-red.png
%%DATADIR%%/gtk/icons/hicolor/22x22/status/eiskaltdcpp-users.png
%%DATADIR%%/gtk/icons/hicolor/22x22/status/icon_msg.png
%%DATADIR%%/gtk/themes/bw.theme
%%DATADIR%%/gtk/themes/gtk-theme.theme
%%DATADIR%%/gtk/themes/hicolor/16x16/status/humanity-dc++-fw-op.svg
%%DATADIR%%/gtk/themes/hicolor/16x16/status/humanity-dc++-fw.svg
%%DATADIR%%/gtk/themes/hicolor/16x16/status/humanity-dc++-op.svg
%%DATADIR%%/gtk/themes/hicolor/16x16/status/humanity-dc++.svg
%%DATADIR%%/gtk/themes/hicolor/16x16/status/humanity-normal-fw-op.svg
%%DATADIR%%/gtk/themes/hicolor/16x16/status/humanity-normal-fw.svg
%%DATADIR%%/gtk/themes/hicolor/16x16/status/humanity-normal-op.svg
%%DATADIR%%/gtk/themes/hicolor/16x16/status/humanity-normal.svg
%%DATADIR%%/gtk/themes/hicolor/22x22/status/linuxdcpp-dc++-fw-op.png
%%DATADIR%%/gtk/themes/hicolor/22x22/status/linuxdcpp-dc++-fw.png
%%DATADIR%%/gtk/themes/hicolor/22x22/status/linuxdcpp-dc++-op.png
%%DATADIR%%/gtk/themes/hicolor/22x22/status/linuxdcpp-dc++.png
%%DATADIR%%/gtk/themes/hicolor/22x22/status/linuxdcpp-download.png
%%DATADIR%%/gtk/themes/hicolor/22x22/status/linuxdcpp-normal-fw-op.png
%%DATADIR%%/gtk/themes/hicolor/22x22/status/linuxdcpp-normal-fw.png
%%DATADIR%%/gtk/themes/hicolor/22x22/status/linuxdcpp-normal-op.png
%%DATADIR%%/gtk/themes/hicolor/22x22/status/linuxdcpp-normal.png
%%DATADIR%%/gtk/themes/hicolor/22x22/status/linuxdcpp-upload.png
%%DATADIR%%/gtk/themes/hicolor/32x32/categories/applications.png
%%DATADIR%%/gtk/themes/hicolor/32x32/categories/away.png
%%DATADIR%%/gtk/themes/hicolor/32x32/categories/bw-connect.png
%%DATADIR%%/gtk/themes/hicolor/32x32/categories/bw-favorite-hubs.png
%%DATADIR%%/gtk/themes/hicolor/32x32/categories/bw-finished-downloads.png
%%DATADIR%%/gtk/themes/hicolor/32x32/categories/bw-finished-uploads.png
%%DATADIR%%/gtk/themes/hicolor/32x32/categories/bw-hash.png
%%DATADIR%%/gtk/themes/hicolor/32x32/categories/bw-preferences.png
%%DATADIR%%/gtk/themes/hicolor/32x32/categories/bw-public-hubs.png
%%DATADIR%%/gtk/themes/hicolor/32x32/categories/bw-queue.png
%%DATADIR%%/gtk/themes/hicolor/32x32/categories/bw-quit.png
%%DATADIR%%/gtk/themes/hicolor/32x32/categories/bw-search.png
%%DATADIR%%/gtk/themes/hicolor/32x32/categories/check.png
%%DATADIR%%/gtk/themes/hicolor/32x32/categories/close.png
%%DATADIR%%/gtk/themes/hicolor/32x32/categories/down1.png
%%DATADIR%%/gtk/themes/hicolor/32x32/categories/favorites.png
%%DATADIR%%/gtk/themes/hicolor/32x32/categories/go.png
%%DATADIR%%/gtk/themes/hicolor/32x32/categories/group.png
%%DATADIR%%/gtk/themes/hicolor/32x32/categories/paste.png
%%DATADIR%%/gtk/themes/hicolor/32x32/categories/reconect.png
%%DATADIR%%/gtk/themes/hicolor/32x32/categories/report.png
%%DATADIR%%/gtk/themes/hicolor/32x32/categories/up1.png
%%DATADIR%%/gtk/themes/hicolor/32x32/categories/user_black.png
%%DATADIR%%/gtk/themes/hicolor/32x32/categories/web.png
%%DATADIR%%/gtk/themes/hicolor/32x32/categories/zoom.png
%%DATADIR%%/gtk/themes/hicolor/32x32/categories/zoom1.png
%%DATADIR%%/gtk/themes/humanity.theme
%%DATADIR%%/gtk/themes/linuxdcpp.theme
%%DATADIR%%/gtk/themes/mankthemedark.theme
%%DATADIR%%/gtk/ui/adlsearch.ui
%%DATADIR%%/gtk/ui/cmddebug.ui
%%DATADIR%%/gtk/ui/downloadqueue.ui
%%DATADIR%%/gtk/ui/favoritehubs.ui
%%DATADIR%%/gtk/ui/favoriteusers.ui
%%DATADIR%%/gtk/ui/finishedtransfers.ui
%%DATADIR%%/gtk/ui/hash.ui
%%DATADIR%%/gtk/ui/hub.ui
%%DATADIR%%/gtk/ui/mainwindow.ui
%%DATADIR%%/gtk/ui/privatemessage.ui
%%DATADIR%%/gtk/ui/publichubs.ui
%%DATADIR%%/gtk/ui/search.ui
%%DATADIR%%/gtk/ui/searchspy.ui
%%DATADIR%%/gtk/ui/settingsdialog.ui
%%DATADIR%%/gtk/ui/sharebrowser.ui
%%DATADIR%%/gtk/ui/transfers.ui
%%DATADIR%%/gtk/ui/uploadqueue.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
@ -112,6 +112,7 @@ share/locale/de/LC_MESSAGES/eiskaltdcpp-gtk.mo
share/locale/el/LC_MESSAGES/eiskaltdcpp-gtk.mo
share/locale/en/LC_MESSAGES/eiskaltdcpp-gtk.mo
share/locale/es/LC_MESSAGES/eiskaltdcpp-gtk.mo
share/locale/eu/LC_MESSAGES/eiskaltdcpp-gtk.mo
share/locale/fr/LC_MESSAGES/eiskaltdcpp-gtk.mo
share/locale/hu/LC_MESSAGES/eiskaltdcpp-gtk.mo
share/locale/it/LC_MESSAGES/eiskaltdcpp-gtk.mo
@ -119,5 +120,9 @@ share/locale/pl/LC_MESSAGES/eiskaltdcpp-gtk.mo
share/locale/pt_BR/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/sr@latin/LC_MESSAGES/eiskaltdcpp-gtk.mo
share/locale/sv_SE/LC_MESSAGES/eiskaltdcpp-gtk.mo
share/locale/uk/LC_MESSAGES/eiskaltdcpp-gtk.mo
share/locale/vi/LC_MESSAGES/eiskaltdcpp-gtk.mo
share/locale/zh_CN/LC_MESSAGES/eiskaltdcpp-gtk.mo

View File

@ -2,11 +2,10 @@
# $FreeBSD$
PORTNAME= eiskaltdcpp
PORTVERSION= 2.2.9
PORTREVISION= 3
PORTVERSION= 2.2.10
DISTVERSIONPREFIX= v
PORTREVISION= 0
CATEGORIES= net-p2p
MASTER_SITES= GOOGLE_CODE
PROJECTHOST= eiskaltdc
PKGNAMESUFFIX?= -lib
MAINTAINER= fjoe@FreeBSD.org
@ -14,7 +13,8 @@ COMMENT= Direct Connect client shared library
LICENSE= GPLv3
BROKEN= Unfetchable (google code has gone away)
USE_GITHUB= yes
GH_ACCOUNT= eiskaltdcpp
.if !defined (MASTERDIR)
LIB_DEPENDS= libboost_system.so:devel/boost-libs

View File

@ -1,2 +1,3 @@
SHA256 (eiskaltdcpp-2.2.9.tar.xz) = 3d9170645450f9cb0a605278b8646fec2110b9637910d86fd27cf245cbe24eaf
SIZE (eiskaltdcpp-2.2.9.tar.xz) = 2327732
TIMESTAMP = 1475570528
SHA256 (eiskaltdcpp-eiskaltdcpp-v2.2.10_GH0.tar.gz) = e461c8c499e459651d6382a6ded6788e5ac9a9c4ff26386c3cf073d94d606127
SIZE (eiskaltdcpp-eiskaltdcpp-v2.2.10_GH0.tar.gz) = 3843143

View File

@ -1,5 +1,5 @@
--- ./cmake/CMakeLists.txt.orig 2011-10-02 18:12:43.000000000 +0300
+++ ./cmake/CMakeLists.txt 2011-10-10 11:10:30.000000000 +0300
--- cmake/CMakeLists.txt.orig 2015-04-19 21:57:16.000000000 +0000
+++ cmake/CMakeLists.txt 2016-10-04 14:43:18.859197000 +0000
@@ -37,12 +37,14 @@
endmacro(GET_RELATIVE_SOURCES)
@ -25,7 +25,7 @@
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."
COMMENT "pot-update {dcpp-${LANG}}: Updated po file."
)
+ endif (BUILD_LIB)
@ -57,26 +57,26 @@
+ if (BUILD_LIB)
add_custom_command(
OUTPUT ${dcpp_BINARY_DIR}/locale/${LANG}/LC_MESSAGES
COMMAND ${CMAKE_COMMAND} -E make_directory
@@ -346,6 +355,7 @@
OUTPUT ${dcpp_BINARY_DIR}/${LANG}_libeiskaltdcpp.mo
COMMAND ${GETTEXT_MSGFMT_EXECUTABLE}
@@ -339,6 +348,7 @@
WORKING_DIRECTORY ${dcpp_SOURCE_DIR}/po
COMMENT "mo-update [dcpp-${LANG}]: Creating mo file."
COMMENT "Creating mo file ${dcpp_BINARY_DIR}/${LANG}_libeiskaltdcpp.mo"
)
+ endif (BUILD_LIB)
if (USE_GTK OR USE_GTK3)
add_custom_command(
OUTPUT ${eiskaltdcpp-gtk_BINARY_DIR}/locale/${LANG}/LC_MESSAGES
@@ -374,12 +384,14 @@
@@ -360,12 +370,14 @@
)
endif (USE_GTK OR USE_GTK3)
+ if (BUILD_LIB)
set(mo-update-SRC ${mo-update-SRC}
${dcpp_BINARY_DIR}/locale/${LANG}/LC_MESSAGES/libeiskaltdcpp.mo
list(APPEND mo-update-SRC
${dcpp_BINARY_DIR}/${LANG}_libeiskaltdcpp.mo
)
set(mo-update-LANG-SRC ${mo-update-LANG-SRC}
${dcpp_BINARY_DIR}/locale/${LANG}/LC_MESSAGES/libeiskaltdcpp.mo
list(APPEND mo-update-LANG-SRC
${dcpp_BINARY_DIR}/${LANG}_libeiskaltdcpp.mo
)
+ endif (BUILD_LIB)

View File

@ -1,15 +1,15 @@
--- dcpp/CMakeLists.txt.orig 2011-10-02 18:12:43.000000000 +0300
+++ dcpp/CMakeLists.txt 2011-10-03 10:14:13.000000000 +0300
@@ -82,7 +82,7 @@
--- dcpp/CMakeLists.txt.orig 2015-04-19 21:57:16.000000000 +0000
+++ dcpp/CMakeLists.txt 2016-10-04 14:37:43.721262000 +0000
@@ -85,7 +85,7 @@
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} ${XATTR_LIBRARIES} ${HAIKU_LIB} ${Boost_LIBRARIES})
${OPENSSL_LIBRARIES} ${GETTEXT_LIBRARIES} ${ICONV_LIBRARIES} ${APPLE_LIBS} ${LUA_LIBRARIES} ${UPNP} ${PCRE} ${IDNA_LIBRARIES} ${XATTR_LIBRARIES} ${HAIKU_LIB} ${Boost_LIBRARIES})
-set_target_properties(dcpp PROPERTIES VERSION ${SOVERSION} OUTPUT_NAME "eiskaltdcpp")
+set_target_properties(dcpp PROPERTIES SOVERSION 2 VERSION ${SOVERSION} OUTPUT_NAME "eiskaltdcpp")
if (APPLE)
set (LIBDIR1 .)
@@ -91,7 +91,7 @@
@@ -94,7 +94,7 @@
if (LINK STREQUAL SHARED)
install (TARGETS dcpp

View File

@ -10,23 +10,3 @@
}
# preparing terminal
@@ -87,15 +86,16 @@
my $res;
# creating and configuring jsonrpc client
-my $client = eval
+my $client;
+eval
{
require JSON::RPC::Client;
- JSON::RPC::Client->new();
+ $client = JSON::RPC::Client->new();
}
or do
{
require JSON::RPC::Legacy::Client;
- JSON::RPC::Legacy::Client->new();
+ $client=JSON::RPC::Legacy::Client->new();
};
$client->version("2.0");
$client->ua->timeout(10);

View File

@ -14,7 +14,7 @@
+ endif (DCPP_LIB)
+endif (BUILD_LIB)
+
+target_link_libraries (${PROJECT_NAME} ${DCPP_LIB} ${LIBS} ${Boost_LIBRARIES} ${GETTEXT_LIBRARIES} extra)
+target_link_libraries (${PROJECT_NAME} ${DCPP_LIB} ${LIBS} ${GETTEXT_LIBRARIES} extra)
if (CMAKE_BUILD_TYPE STREQUAL Debug)
add_definitions(-D_DEBUG)

View File

@ -1,5 +1,5 @@
--- ./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
--- eiskaltdcpp-gtk/CMakeLists.txt.orig 2015-04-19 21:57:16.000000000 +0000
+++ eiskaltdcpp-gtk/CMakeLists.txt 2016-10-04 14:44:37.733266000 +0000
@@ -12,7 +12,7 @@
if (USE_LIBGNOME2)
@ -19,9 +19,9 @@
message (STATUS "Building without libnotify support")
endif (USE_LIBNOTIFY)
@@ -39,7 +39,7 @@
set (GTK_SRCS @gtk_srcs@ PARENT_SCOPE)
set (GTK_HDRS @gtk_hdrs@ PARENT_SCOPE)
set (GTK_UI @gtk_ui@ PARENT_SCOPE)
set (GTK_SRCS ${gtk_srcs} PARENT_SCOPE)
set (GTK_HDRS ${gtk_hdrs} PARENT_SCOPE)
set (GTK_UI ${gtk_ui} PARENT_SCOPE)
-set (GTHREAD "-lgthread-2.0")
+find_library (GTHREAD "gthread-2.0")

View File

@ -1,11 +0,0 @@
--- eiskaltdcpp-qt/src/HubFrame.cpp.orig 2013-08-29 21:25:02.000000000 +0400
+++ eiskaltdcpp-qt/src/HubFrame.cpp 2014-08-17 02:00:34.000000000 +0400
@@ -772,7 +772,7 @@
}
}
-HubFrame::HubFrame(QWidget *parent=NULL, QString hub="", QString encoding=""):
+HubFrame::HubFrame(QWidget *parent, QString hub, QString encoding):
QWidget(parent),
d_ptr(new HubFramePrivate())
{

View File

@ -1,11 +0,0 @@
--- eiskaltdcpp-qt/src/HubFrame.h.orig 2014-08-17 01:57:00.000000000 +0400
+++ eiskaltdcpp-qt/src/HubFrame.h 2014-08-17 01:57:33.000000000 +0400
@@ -128,7 +128,7 @@
typedef QMap<QString, QVariant> VarMap;
typedef QList<ShellCommandRunner*> ShellList;
- HubFrame(QWidget *parent, QString, QString);
+ HubFrame(QWidget *parent=NULL, QString hub="", QString encoding="");
~HubFrame();
bool parseForCmd(QString, QWidget *);

View File

@ -0,0 +1,10 @@
--- json/jsoncpp/src/json_reader.cpp.orig 2016-10-04 15:50:44.453094000 +0000
+++ json/jsoncpp/src/json_reader.cpp 2016-10-04 15:48:27.416705000 +0000
@@ -14,6 +14,7 @@
#include <cassert>
#include <cstring>
+#include <istream>
#include <stdexcept>
#if defined(_MSC_VER) && _MSC_VER >= 1400 // VC++ 8.0
#pragma warning( disable : 4996 ) // disable warning about strdup being deprecated.

View File

@ -1,11 +1,11 @@
--- json/CMakeLists.txt.orig 2013-08-29 21:25:02.000000000 +0400
+++ json/CMakeLists.txt 2014-08-14 09:48:27.364617149 +0400
--- json/CMakeLists.txt.orig 2015-04-19 21:57:16.000000000 +0000
+++ json/CMakeLists.txt 2016-10-04 14:36:02.121665000 +0000
@@ -12,7 +12,7 @@
${PROJECT_SOURCE_DIR}/jsonrpc-cpp/networking.cpp)
set_source_files_properties(${PROJECT_SOURCE_DIR}/jsonrpc-cpp/mongoose.c PROPERTIES COMPILE_FLAGS "-DNDEBUG -DNO_CGI -DNO_SSL")
#option (LOCAL_JSONCPP "Use local JsonCpp" ON)
#if (LOCAL_JSONCPP)
if (LOCAL_JSONCPP)
- set (JSONCPP_LIBRARY jsoncpp)
+ set (JSONCPP_LIBRARY jsoncpp ${CMAKE_THREAD_LIBS_INIT})
set (JSONCPP_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/jsoncpp/)
include_directories(${JSONCPP_INCLUDE_DIR})
aux_source_directory(${PROJECT_SOURCE_DIR}/jsoncpp/ jsoncpp_SRCS)
aux_source_directory(${PROJECT_SOURCE_DIR}/jsoncpp/src jsoncpp_SRCS)
add_library (jsoncpp STATIC ${jsoncpp_SRCS})

View File

@ -103,9 +103,9 @@ include/eiskaltdcpp/dcpp/stdinc.h
include/eiskaltdcpp/dcpp/typedefs.h
include/eiskaltdcpp/dcpp/version.h
include/eiskaltdcpp/dcpp/w.h
lib/libeiskaltdcpp.so.2.2
lib/libeiskaltdcpp.so.2
lib/libeiskaltdcpp.so
lib/libeiskaltdcpp.so.2
lib/libeiskaltdcpp.so.2.2.10
share/locale/be/LC_MESSAGES/libeiskaltdcpp.mo
share/locale/bg/LC_MESSAGES/libeiskaltdcpp.mo
share/locale/cs/LC_MESSAGES/libeiskaltdcpp.mo
@ -113,6 +113,7 @@ share/locale/de/LC_MESSAGES/libeiskaltdcpp.mo
share/locale/el/LC_MESSAGES/libeiskaltdcpp.mo
share/locale/en/LC_MESSAGES/libeiskaltdcpp.mo
share/locale/es/LC_MESSAGES/libeiskaltdcpp.mo
share/locale/eu/LC_MESSAGES/libeiskaltdcpp.mo
share/locale/fr/LC_MESSAGES/libeiskaltdcpp.mo
share/locale/hu/LC_MESSAGES/libeiskaltdcpp.mo
share/locale/it/LC_MESSAGES/libeiskaltdcpp.mo
@ -120,5 +121,9 @@ share/locale/pl/LC_MESSAGES/libeiskaltdcpp.mo
share/locale/pt_BR/LC_MESSAGES/libeiskaltdcpp.mo
share/locale/ru/LC_MESSAGES/libeiskaltdcpp.mo
share/locale/sk/LC_MESSAGES/libeiskaltdcpp.mo
share/locale/sr/LC_MESSAGES/libeiskaltdcpp.mo
share/locale/sr@latin/LC_MESSAGES/libeiskaltdcpp.mo
share/locale/sv_SE/LC_MESSAGES/libeiskaltdcpp.mo
share/locale/uk/LC_MESSAGES/libeiskaltdcpp.mo
share/locale/vi/LC_MESSAGES/libeiskaltdcpp.mo
share/locale/zh_CN/LC_MESSAGES/libeiskaltdcpp.mo

View File

@ -265,6 +265,7 @@ share/applications/eiskaltdcpp-qt.desktop
%%DATADIR%%/qt/ts/el.qm
%%DATADIR%%/qt/ts/en.qm
%%DATADIR%%/qt/ts/es.qm
%%DATADIR%%/qt/ts/eu.qm
%%DATADIR%%/qt/ts/fr.qm
%%DATADIR%%/qt/ts/hu.qm
%%DATADIR%%/qt/ts/it.qm
@ -272,5 +273,9 @@ share/applications/eiskaltdcpp-qt.desktop
%%DATADIR%%/qt/ts/pt_BR.qm
%%DATADIR%%/qt/ts/ru.qm
%%DATADIR%%/qt/ts/sk.qm
%%DATADIR%%/qt/ts/sr.qm
%%DATADIR%%/qt/ts/sr@latin.qm
%%DATADIR%%/qt/ts/sv_SE.qm
%%DATADIR%%/qt/ts/uk.qm
%%DATADIR%%/qt/ts/vi.qm
%%DATADIR%%/qt/ts/zh_CN.qm