From 9a55ee46b77804b051c649fbda0e45533903dc11 Mon Sep 17 00:00:00 2001 From: kervala Date: Sat, 25 Apr 2015 12:53:52 +0200 Subject: [PATCH] Removed dependency on libwww --HG-- branch : develop --- code/ryzom/client/src/CMakeLists.txt | 2 -- code/ryzom/client/src/interface_v3/chat_displayer.h | 5 ----- dist/debian/precise/debian/control | 6 +++--- dist/debian/precise/debian/rules | 2 +- dist/debian/trusty/debian/control | 6 +++--- dist/debian/trusty/debian/rules | 2 +- dist/debian/utopic/debian/control | 6 +++--- dist/debian/utopic/debian/rules | 2 +- dist/debian/vivid/debian/control | 6 +++--- dist/debian/vivid/debian/rules | 2 +- 10 files changed, 16 insertions(+), 23 deletions(-) diff --git a/code/ryzom/client/src/CMakeLists.txt b/code/ryzom/client/src/CMakeLists.txt index 9c2b4b431..610e434ef 100644 --- a/code/ryzom/client/src/CMakeLists.txt +++ b/code/ryzom/client/src/CMakeLists.txt @@ -81,7 +81,6 @@ INCLUDE_DIRECTORIES( ${LIBXML2_INCLUDE_DIR} ${LUA_INCLUDE_DIR} ${LUABIND_INCLUDE_DIR} - ${LIBWWW_INCLUDE_DIR} ${CURL_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR} ) @@ -101,7 +100,6 @@ TARGET_LINK_LIBRARIES(ryzom_client ${LUA_LIBRARIES} ${LUABIND_LIBRARIES} ${CURL_LIBRARIES} - ${LIBWWW_LIBRARIES} ${SEVENZIP_LIBRARY} ) diff --git a/code/ryzom/client/src/interface_v3/chat_displayer.h b/code/ryzom/client/src/interface_v3/chat_displayer.h index e2afc7207..5c46c81ca 100644 --- a/code/ryzom/client/src/interface_v3/chat_displayer.h +++ b/code/ryzom/client/src/interface_v3/chat_displayer.h @@ -25,11 +25,6 @@ #include "nel/misc/mutex.h" -// to fix a conflict with syslog.h being included by libwww -#ifdef LOG_WARNING -#undef LOG_WARNING -#endif - /** * class used to display console text commands in the chat window * \author Nicolas Brigand diff --git a/dist/debian/precise/debian/control b/dist/debian/precise/debian/control index cf8840bb2..6220c1c6b 100644 --- a/dist/debian/precise/debian/control +++ b/dist/debian/precise/debian/control @@ -6,12 +6,12 @@ Build-Depends: debhelper (>= 9), cmake(>= 2.6), libxml2-dev, libgl1-mesa-dev, libjpeg8-dev | libjpeg62-dev, libpng12-dev, libopenal-dev, libfreetype6-dev, libxxf86vm-dev, libxrandr-dev, libxrender-dev, libvorbis-dev, libsquish-dev, libcurl4-openssl-dev, libluabind-dev, - libboost-dev, libwww-dev, libmysqlclient-dev, + libboost-dev, libmysqlclient-dev, libcpptest-dev, libqt4-dev, libqt4-opengl-dev Standards-Version: 3.9.3 Section: games -Bugs: http://dev.ryzom.com/projects/ryzom/issues -Homepage: http://dev.ryzom.com +Bugs: https://bitbucket.org/ryzom/ryzomcore/issues +Homepage: https://bitbucket.org/ryzom/ryzomcore/ Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/nel/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/nel/?op=log diff --git a/dist/debian/precise/debian/rules b/dist/debian/precise/debian/rules index 2b329f3be..26ace8254 100755 --- a/dist/debian/precise/debian/rules +++ b/dist/debian/precise/debian/rules @@ -12,7 +12,7 @@ override_dh_strip: dh_strip -pryzom-tools --dbg-package=ryzom-tools-dbg override_dh_auto_configure: - dh_auto_configure -- -DLIBRARY_ARCHITECTURE=$(DEB_HOST_MULTIARCH) -DTARGET_CPU=$(DEB_HOST_GNU_CPU) -DWITH_SYMBOLS=ON -DNL_ETC_PREFIX=/etc/nel -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/games/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/games -DWITH_RYZOM_SERVER=OFF -DWITH_NEL_TESTS=OFF -DWITH_LIBWWW_STATIC=ON -DWITH_QT=ON + dh_auto_configure -- -DLIBRARY_ARCHITECTURE=$(DEB_HOST_MULTIARCH) -DTARGET_CPU=$(DEB_HOST_GNU_CPU) -DWITH_SYMBOLS=ON -DNL_ETC_PREFIX=/etc/nel -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/games/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/games -DWITH_RYZOM_SERVER=OFF -DWITH_NEL_TESTS=OFF -DWITH_QT=ON override_dh_install: dh_install diff --git a/dist/debian/trusty/debian/control b/dist/debian/trusty/debian/control index e662d1f37..4e41817dc 100644 --- a/dist/debian/trusty/debian/control +++ b/dist/debian/trusty/debian/control @@ -6,12 +6,12 @@ Build-Depends: debhelper (>= 9), cmake(>= 2.6), libxml2-dev, libgl1-mesa-dev, libjpeg8-dev | libjpeg62-dev, libpng12-dev, libopenal-dev, libfreetype6-dev, libxxf86vm-dev, libxrandr-dev, libxrender-dev, libvorbis-dev, libsquish-dev, libcurl4-openssl-dev, libluabind-dev, - libboost-dev, libwww-dev, libmysqlclient-dev, + libboost-dev, libmysqlclient-dev, libcpptest-dev, libqt4-dev, libqt4-opengl-dev Standards-Version: 3.9.5 Section: games -Bugs: http://dev.ryzom.com/projects/ryzom/issues -Homepage: http://dev.ryzom.com +Bugs: https://bitbucket.org/ryzom/ryzomcore/issues +Homepage: https://bitbucket.org/ryzom/ryzomcore/ Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/nel/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/nel/?op=log diff --git a/dist/debian/trusty/debian/rules b/dist/debian/trusty/debian/rules index 2b329f3be..26ace8254 100755 --- a/dist/debian/trusty/debian/rules +++ b/dist/debian/trusty/debian/rules @@ -12,7 +12,7 @@ override_dh_strip: dh_strip -pryzom-tools --dbg-package=ryzom-tools-dbg override_dh_auto_configure: - dh_auto_configure -- -DLIBRARY_ARCHITECTURE=$(DEB_HOST_MULTIARCH) -DTARGET_CPU=$(DEB_HOST_GNU_CPU) -DWITH_SYMBOLS=ON -DNL_ETC_PREFIX=/etc/nel -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/games/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/games -DWITH_RYZOM_SERVER=OFF -DWITH_NEL_TESTS=OFF -DWITH_LIBWWW_STATIC=ON -DWITH_QT=ON + dh_auto_configure -- -DLIBRARY_ARCHITECTURE=$(DEB_HOST_MULTIARCH) -DTARGET_CPU=$(DEB_HOST_GNU_CPU) -DWITH_SYMBOLS=ON -DNL_ETC_PREFIX=/etc/nel -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/games/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/games -DWITH_RYZOM_SERVER=OFF -DWITH_NEL_TESTS=OFF -DWITH_QT=ON override_dh_install: dh_install diff --git a/dist/debian/utopic/debian/control b/dist/debian/utopic/debian/control index e662d1f37..4e41817dc 100644 --- a/dist/debian/utopic/debian/control +++ b/dist/debian/utopic/debian/control @@ -6,12 +6,12 @@ Build-Depends: debhelper (>= 9), cmake(>= 2.6), libxml2-dev, libgl1-mesa-dev, libjpeg8-dev | libjpeg62-dev, libpng12-dev, libopenal-dev, libfreetype6-dev, libxxf86vm-dev, libxrandr-dev, libxrender-dev, libvorbis-dev, libsquish-dev, libcurl4-openssl-dev, libluabind-dev, - libboost-dev, libwww-dev, libmysqlclient-dev, + libboost-dev, libmysqlclient-dev, libcpptest-dev, libqt4-dev, libqt4-opengl-dev Standards-Version: 3.9.5 Section: games -Bugs: http://dev.ryzom.com/projects/ryzom/issues -Homepage: http://dev.ryzom.com +Bugs: https://bitbucket.org/ryzom/ryzomcore/issues +Homepage: https://bitbucket.org/ryzom/ryzomcore/ Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/nel/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/nel/?op=log diff --git a/dist/debian/utopic/debian/rules b/dist/debian/utopic/debian/rules index 2b329f3be..26ace8254 100755 --- a/dist/debian/utopic/debian/rules +++ b/dist/debian/utopic/debian/rules @@ -12,7 +12,7 @@ override_dh_strip: dh_strip -pryzom-tools --dbg-package=ryzom-tools-dbg override_dh_auto_configure: - dh_auto_configure -- -DLIBRARY_ARCHITECTURE=$(DEB_HOST_MULTIARCH) -DTARGET_CPU=$(DEB_HOST_GNU_CPU) -DWITH_SYMBOLS=ON -DNL_ETC_PREFIX=/etc/nel -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/games/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/games -DWITH_RYZOM_SERVER=OFF -DWITH_NEL_TESTS=OFF -DWITH_LIBWWW_STATIC=ON -DWITH_QT=ON + dh_auto_configure -- -DLIBRARY_ARCHITECTURE=$(DEB_HOST_MULTIARCH) -DTARGET_CPU=$(DEB_HOST_GNU_CPU) -DWITH_SYMBOLS=ON -DNL_ETC_PREFIX=/etc/nel -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/games/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/games -DWITH_RYZOM_SERVER=OFF -DWITH_NEL_TESTS=OFF -DWITH_QT=ON override_dh_install: dh_install diff --git a/dist/debian/vivid/debian/control b/dist/debian/vivid/debian/control index e662d1f37..4e41817dc 100644 --- a/dist/debian/vivid/debian/control +++ b/dist/debian/vivid/debian/control @@ -6,12 +6,12 @@ Build-Depends: debhelper (>= 9), cmake(>= 2.6), libxml2-dev, libgl1-mesa-dev, libjpeg8-dev | libjpeg62-dev, libpng12-dev, libopenal-dev, libfreetype6-dev, libxxf86vm-dev, libxrandr-dev, libxrender-dev, libvorbis-dev, libsquish-dev, libcurl4-openssl-dev, libluabind-dev, - libboost-dev, libwww-dev, libmysqlclient-dev, + libboost-dev, libmysqlclient-dev, libcpptest-dev, libqt4-dev, libqt4-opengl-dev Standards-Version: 3.9.5 Section: games -Bugs: http://dev.ryzom.com/projects/ryzom/issues -Homepage: http://dev.ryzom.com +Bugs: https://bitbucket.org/ryzom/ryzomcore/issues +Homepage: https://bitbucket.org/ryzom/ryzomcore/ Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/nel/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/nel/?op=log diff --git a/dist/debian/vivid/debian/rules b/dist/debian/vivid/debian/rules index 2b329f3be..26ace8254 100755 --- a/dist/debian/vivid/debian/rules +++ b/dist/debian/vivid/debian/rules @@ -12,7 +12,7 @@ override_dh_strip: dh_strip -pryzom-tools --dbg-package=ryzom-tools-dbg override_dh_auto_configure: - dh_auto_configure -- -DLIBRARY_ARCHITECTURE=$(DEB_HOST_MULTIARCH) -DTARGET_CPU=$(DEB_HOST_GNU_CPU) -DWITH_SYMBOLS=ON -DNL_ETC_PREFIX=/etc/nel -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/games/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/games -DWITH_RYZOM_SERVER=OFF -DWITH_NEL_TESTS=OFF -DWITH_LIBWWW_STATIC=ON -DWITH_QT=ON + dh_auto_configure -- -DLIBRARY_ARCHITECTURE=$(DEB_HOST_MULTIARCH) -DTARGET_CPU=$(DEB_HOST_GNU_CPU) -DWITH_SYMBOLS=ON -DNL_ETC_PREFIX=/etc/nel -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/games/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/games -DWITH_RYZOM_SERVER=OFF -DWITH_NEL_TESTS=OFF -DWITH_QT=ON override_dh_install: dh_install