r13167 - in packages/trunk/pokerth/debian: . patches
Evgeni Golov
evgeni at alioth.debian.org
Mon Jan 23 16:55:36 UTC 2012
Author: evgeni
Date: 2012-01-23 16:55:35 +0000 (Mon, 23 Jan 2012)
New Revision: 13167
Removed:
packages/trunk/pokerth/debian/patches/01_clean_libpokerth.patch
packages/trunk/pokerth/debian/patches/02_use_dejavu_fonts.patch
packages/trunk/pokerth/debian/patches/05_disable_gnu++0x.patch
packages/trunk/pokerth/debian/patches/06_fix_gcc46_ftbfs.patch
packages/trunk/pokerth/debian/patches/07_boost146_ftbfs.patch
packages/trunk/pokerth/debian/patches/07_boost146_ftbfs_upstream.patch
packages/trunk/pokerth/debian/patches/08_use_debian_libircclient.patch
packages/trunk/pokerth/debian/patches/09_use_debian_libtinyxml.patch
Modified:
packages/trunk/pokerth/debian/changelog
packages/trunk/pokerth/debian/patches/series
Log:
Drop obsolete patches and those applied upstream
Modified: packages/trunk/pokerth/debian/changelog
===================================================================
--- packages/trunk/pokerth/debian/changelog 2012-01-22 13:12:22 UTC (rev 13166)
+++ packages/trunk/pokerth/debian/changelog 2012-01-23 16:55:35 UTC (rev 13167)
@@ -11,8 +11,18 @@
[ Paul Wise ]
* Drop README.source, no longer needed
- -- Mark Vejvoda <mark_vejvoda at hotmail.com> Thu, 12 Jan 2012 23:55:32 -0800
+ [ Evgeni Golov ]
+ * Drop obsolete patches and those applied upstream:
+ - 01_clean_libpokerth.patch
+ - 02_use_dejavu_fonts.patch
+ - 05_disable_gnu++0x.patch
+ - 06_fix_gcc46_ftbfs.patch
+ - 07_boost146_ftbfs_upstream.patch
+ - 08_use_debian_libircclient.patch
+ - 09_use_debian_libtinyxml.patch
+ -- Evgeni Golov <evgeni at debian.org> Mon, 23 Jan 2012 17:11:51 +0100
+
pokerth (0.8.3-3) unstable; urgency=low
* Fix FTBFS with gcc-4.6 by not passing -no_dead_strip_inits_and_terms
Deleted: packages/trunk/pokerth/debian/patches/01_clean_libpokerth.patch
===================================================================
--- packages/trunk/pokerth/debian/patches/01_clean_libpokerth.patch 2012-01-22 13:12:22 UTC (rev 13166)
+++ packages/trunk/pokerth/debian/patches/01_clean_libpokerth.patch 2012-01-23 16:55:35 UTC (rev 13167)
@@ -1,38 +0,0 @@
-Author: Evgeni Golov <sargentd at die-welt.net>
-Description: Adds a quirk to correctly clean libpokerth
-Index: pokerth-0.8.3/pokerth_lib.pro
-===================================================================
---- pokerth-0.8.3.orig/pokerth_lib.pro 2011-05-05 13:28:39.062744728 +0200
-+++ pokerth-0.8.3/pokerth_lib.pro 2011-05-05 13:28:46.633739792 +0200
-@@ -10,6 +10,7 @@
- CONFIG += staticlib thread exceptions rtti stl warn_on
- UI_DIR = uics
- TARGET = lib/pokerth_lib
-+QMAKE_CLEAN += ./lib/libpokerth_lib.a
- MOC_DIR = mocs
- OBJECTS_DIR = obj
- DEFINES += ENABLE_IPV6
-Index: pokerth-0.8.3/pokerth_db.pro
-===================================================================
---- pokerth-0.8.3.orig/pokerth_db.pro 2011-05-05 13:30:03.995471166 +0200
-+++ pokerth-0.8.3/pokerth_db.pro 2011-05-05 13:30:24.284778063 +0200
-@@ -10,6 +10,7 @@
- CONFIG += staticlib thread exceptions rtti stl warn_on
- UI_DIR = uics
- TARGET = lib/pokerth_db
-+QMAKE_CLEAN += ./lib/libpokerth_db.a
- MOC_DIR = mocs
- OBJECTS_DIR = obj
- DEFINES += ENABLE_IPV6
-Index: pokerth-0.8.3/pokerth_protocol.pro
-===================================================================
---- pokerth-0.8.3.orig/pokerth_protocol.pro 2011-05-05 13:30:35.191330378 +0200
-+++ pokerth-0.8.3/pokerth_protocol.pro 2011-05-05 13:31:06.911120046 +0200
-@@ -9,6 +9,7 @@
- warn_on
- UI_DIR = uics
- TARGET = lib/pokerth_protocol
-+QMAKE_CLEAN += ./lib/libpokerth_protocol.a
- MOC_DIR = mocs
- OBJECTS_DIR = obj
- DEFINES += ENABLE_IPV6
Deleted: packages/trunk/pokerth/debian/patches/02_use_dejavu_fonts.patch
===================================================================
--- packages/trunk/pokerth/debian/patches/02_use_dejavu_fonts.patch 2012-01-22 13:12:22 UTC (rev 13166)
+++ packages/trunk/pokerth/debian/patches/02_use_dejavu_fonts.patch 2012-01-23 16:55:35 UTC (rev 13167)
@@ -1,17 +0,0 @@
-Author: Evgeni Golov <sargentd at die-welt.net>
-Description: Use DejaVu Sans instead of Bitstream Vera Sans
-License: GPL-2+
-
-Index: pokerth/src/gui/qt/styles/gametablestylereader.cpp
-===================================================================
---- pokerth.orig/src/gui/qt/styles/gametablestylereader.cpp 2010-07-26 08:27:09.000000000 +0200
-+++ pokerth/src/gui/qt/styles/gametablestylereader.cpp 2010-07-26 16:20:05.387430388 +0200
-@@ -51,7 +51,7 @@
- tabBarPaddingSide = "9";
- #else
- font1String = "font-family: \"Nimbus Sans L\";";
-- font2String = "font-family: \"Bitstream Vera Sans\";";
-+ font2String = "font-family: \"DejaVu Sans\";";
-
- tabBarPaddingTop = "0";
- tabBarPaddingSide = "9";
Deleted: packages/trunk/pokerth/debian/patches/05_disable_gnu++0x.patch
===================================================================
--- packages/trunk/pokerth/debian/patches/05_disable_gnu++0x.patch 2012-01-22 13:12:22 UTC (rev 13166)
+++ packages/trunk/pokerth/debian/patches/05_disable_gnu++0x.patch 2012-01-23 16:55:35 UTC (rev 13167)
@@ -1,67 +0,0 @@
-Description: Fix FTBFS with a combination of boost 1.42, gcc 4.5 and gnu++0x mode.
-
-diff --git a/chatcleaner.pro b/chatcleaner.pro
-index ed5d370..0e6ec3a 100644
---- a/chatcleaner.pro
-+++ b/chatcleaner.pro
-@@ -4,7 +4,7 @@
- CODECFORSRC = UTF-8
- QT += network
- QT -= gui
--QMAKE_CXXFLAGS += -std=gnu++0x
-+#QMAKE_CXXFLAGS += -std=gnu++0x
- TARGET = chatcleaner
- CONFIG += console
- CONFIG -= app_bundle
-diff --git a/pokerth_db.pro b/pokerth_db.pro
-index 2048e84..8986c61 100644
---- a/pokerth_db.pro
-+++ b/pokerth_db.pro
-@@ -14,7 +14,7 @@ MOC_DIR = mocs
- OBJECTS_DIR = obj
- DEFINES += ENABLE_IPV6
- QT -= core gui
--QMAKE_CXXFLAGS += -std=gnu++0x
-+#QMAKE_CXXFLAGS += -std=gnu++0x
- #PRECOMPILED_HEADER = src/pch_lib.h
-
- INCLUDEPATH += . \
-diff --git a/pokerth_game.pro b/pokerth_game.pro
-index 38d8023..701ebe0 100644
---- a/pokerth_game.pro
-+++ b/pokerth_game.pro
-@@ -15,7 +15,7 @@ CONFIG += qt \
- warn_on
- include(src/third_party/qtsingleapplication/qtsingleapplication.pri)
- QT += sql
--QMAKE_CXXFLAGS += -std=gnu++0x
-+#QMAKE_CXXFLAGS += -std=gnu++0x
- UI_DIR = uics
- MOC_DIR = mocs
- OBJECTS_DIR = obj
-diff --git a/pokerth_lib.pro b/pokerth_lib.pro
-index 74d9f1d..24108c3 100644
---- a/pokerth_lib.pro
-+++ b/pokerth_lib.pro
-@@ -14,7 +14,7 @@ MOC_DIR = mocs
- OBJECTS_DIR = obj
- DEFINES += ENABLE_IPV6
- QT -= core gui
--QMAKE_CXXFLAGS += -std=gnu++0x
-+#QMAKE_CXXFLAGS += -std=gnu++0x
- #PRECOMPILED_HEADER = src/pch_lib.h
-
- INCLUDEPATH += . \
-diff --git a/pokerth_server.pro b/pokerth_server.pro
-index a63bbaa..56de840 100644
---- a/pokerth_server.pro
-+++ b/pokerth_server.pro
-@@ -17,7 +17,7 @@ DEFINES += POKERTH_DEDICATED_SERVER
- DEFINES += ENABLE_IPV6
- DEFINES += PREFIX=\"$${PREFIX}\"
- QT -= core gui
--QMAKE_CXXFLAGS += -std=gnu++0x
-+#QMAKE_CXXFLAGS += -std=gnu++0x
- #PRECOMPILED_HEADER = src/pch_lib.h
-
- INCLUDEPATH += . \
Deleted: packages/trunk/pokerth/debian/patches/06_fix_gcc46_ftbfs.patch
===================================================================
--- packages/trunk/pokerth/debian/patches/06_fix_gcc46_ftbfs.patch 2012-01-22 13:12:22 UTC (rev 13166)
+++ packages/trunk/pokerth/debian/patches/06_fix_gcc46_ftbfs.patch 2012-01-23 16:55:35 UTC (rev 13167)
@@ -1,81 +0,0 @@
-From: Evgeni Golov <evgeni at debian.org>
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/pokerth/+bug/770849
-Subject: Don't pass -no_dead_strip_inits_and_terms on !MacOSX
- -no_dead_strip_inits_and_terms is a MacOSX-specific option, passing this
- on non-OSX systems may make gcc go error (like with 4.6 in Ubuntu).
-
-Index: pokerth-0.8.3/pokerth_game.pro
-===================================================================
---- pokerth-0.8.3.orig/pokerth_game.pro 2011-04-26 11:23:37.843733137 +0200
-+++ pokerth-0.8.3/pokerth_game.pro 2011-04-26 11:24:10.583387436 +0200
-@@ -371,8 +371,6 @@
- -lwldap32
- RC_FILE = pokerth.rc
- }
--unix:# workaround for problems with boost_filesystem exceptions
--QMAKE_LFLAGS += -no_dead_strip_inits_and_terms
- unix:!mac {
- # #### My release static build options
- # QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections
-@@ -482,6 +480,9 @@
- QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5
- QMAKE_CXXFLAGS -= -std=gnu++0x
-
-+ # workaround for problems with boost_filesystem exceptions
-+ QMAKE_LFLAGS += -no_dead_strip_inits_and_terms
-+
- # for universal-compilation on PPC-Mac uncomment the following line
- # on Intel-Mac you have to comment this line out or build will fail.
- # QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.4u.sdk/
-Index: pokerth-0.8.3/pokerth_server.pro
-===================================================================
---- pokerth-0.8.3.orig/pokerth_server.pro 2011-04-26 11:20:49.614063135 +0200
-+++ pokerth-0.8.3/pokerth_server.pro 2011-04-26 11:25:24.385591285 +0200
-@@ -183,11 +183,6 @@
- SOURCES += src/core/linux/convhelper.cpp
- }
-
--unix {
-- # workaround for problems with boost_filesystem exceptions
-- QMAKE_LFLAGS += -no_dead_strip_inits_and_terms
--}
--
- unix : !mac {
-
- ##### My release static build options
-@@ -299,6 +294,9 @@
- QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5
- QMAKE_CXXFLAGS -= -std=gnu++0x
-
-+ # workaround for problems with boost_filesystem exceptions
-+ QMAKE_LFLAGS += -no_dead_strip_inits_and_terms
-+
- # for universal-compilation on PPC-Mac uncomment the following line
- # on Intel-Mac you have to comment this line out or build will fail.
- # QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.4u.sdk/
-Index: pokerth-0.8.3/zlib_compress.pro
-===================================================================
---- pokerth-0.8.3.orig/zlib_compress.pro 2011-04-26 11:24:17.690444077 +0200
-+++ pokerth-0.8.3/zlib_compress.pro 2011-04-26 11:24:32.412489943 +0200
-@@ -41,11 +41,6 @@
- LIBS += -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lwinspool -lole32 -luuid -luser32 -lmsimg32 -lshell32 -lkernel32
- }
-
--unix {
-- # workaround for problems with boost_filesystem exceptions
-- QMAKE_LFLAGS += -no_dead_strip_inits_and_terms
--}
--
- unix : !mac {
-
- ##### My release static build options
-@@ -94,6 +89,9 @@
- CONFIG += ppc
- QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.3
-
-+ # workaround for problems with boost_filesystem exceptions
-+ QMAKE_LFLAGS += -no_dead_strip_inits_and_terms
-+
- # for universal-compilation on PPC-Mac uncomment the following line
- # on Intel-Mac you have to comment this line out or build will fail.
- # QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.4u.sdk/
Deleted: packages/trunk/pokerth/debian/patches/07_boost146_ftbfs.patch
===================================================================
--- packages/trunk/pokerth/debian/patches/07_boost146_ftbfs.patch 2012-01-22 13:12:22 UTC (rev 13166)
+++ packages/trunk/pokerth/debian/patches/07_boost146_ftbfs.patch 2012-01-23 16:55:35 UTC (rev 13167)
@@ -1,257 +0,0 @@
-From: Evgeni Golov <evgeni at debian.org>
-Subject: port to boost::filesystem v3 API
- Since boost 1.46 the v3 filesystem API is default (v2 was until 1.45).
- As v3 deprecates some functions, we have to port some code to it.
- See [1] for a list of deprecated functions.
- [1] http://live.boost.org/doc/libs/1_46_1/libs/filesystem/v3/doc/deprecated.html
-
-Index: pokerth-0.8.3/src/core/common/avatarmanager.cpp
-===================================================================
---- pokerth-0.8.3.orig/src/core/common/avatarmanager.cpp 2011-04-26 11:45:14.995555435 +0200
-+++ pokerth-0.8.3/src/core/common/avatarmanager.cpp 2011-04-26 11:47:10.252256814 +0200
-@@ -76,13 +76,13 @@
- path tmpDataPath(dataDir);
- {
- boost::mutex::scoped_lock lock(m_cacheDirMutex);
-- m_cacheDir = tmpCachePath.directory_string();
-+ m_cacheDir = tmpCachePath.string();
- }
- {
- boost::mutex::scoped_lock lock(m_avatarsMutex);
-- tmpRet = InternalReadDirectory((tmpDataPath / "gfx/avatars/default/people/").directory_string(), m_avatars);
-+ tmpRet = InternalReadDirectory((tmpDataPath / "gfx/avatars/default/people/").string(), m_avatars);
- retVal = retVal && tmpRet;
-- tmpRet = InternalReadDirectory((tmpDataPath / "gfx/avatars/default/misc/").directory_string(), m_avatars);
-+ tmpRet = InternalReadDirectory((tmpDataPath / "gfx/avatars/default/misc/").string(), m_avatars);
- retVal = retVal && tmpRet;
- }
- if (cacheDir.empty() || tmpCachePath.empty())
-@@ -90,7 +90,7 @@
- else
- {
- boost::mutex::scoped_lock lock(m_cachedAvatarsMutex);
-- tmpRet = InternalReadDirectory(tmpCachePath.directory_string(), m_cachedAvatars);
-+ tmpRet = InternalReadDirectory(tmpCachePath.string(), m_cachedAvatars);
- retVal = retVal && tmpRet;
- }
-
-@@ -102,7 +102,7 @@
- AvatarManager::AddSingleAvatar(const std::string &fileName)
- {
- path filePath(fileName);
-- string tmpFileName(filePath.file_string());
-+ string tmpFileName(filePath.string());
-
- if (!fileName.empty() && !tmpFileName.empty())
- {
-@@ -384,7 +384,7 @@
- {
- path tmpPath(cacheDir);
- tmpPath /= (md5buf.ToString() + ext);
-- string fileName(tmpPath.file_string());
-+ string fileName(tmpPath.string());
- ofstream o(fileName.c_str(), ios_base::out | ios_base::binary | ios_base::trunc);
- if (!o.fail())
- {
-@@ -456,7 +456,7 @@
- try
- {
- path cachePath(cacheDir);
-- cacheDir = cachePath.directory_string();
-+ cacheDir = cachePath.string();
- // Never delete anything if we do not have a special cache dir set.
- if (!cacheDir.empty())
- {
-@@ -474,7 +474,7 @@
- {
- bool keepFile = false;
- path filePath(i->second);
-- string fileString(filePath.file_string());
-+ string fileString(filePath.string());
- // Only consider files which are definitely in the cache dir.
- if (fileString.size() > cacheDir.size() && fileString.substr(0, cacheDir.size()) == cacheDir)
- {
-@@ -570,7 +570,7 @@
- {
- string md5sum(basename(i->path()));
- MD5Buf md5buf;
-- string fileName(i->path().file_string());
-+ string fileName(i->path().string());
- if (md5buf.FromString(md5sum))
- {
- // Only consider files with md5sum as name.
-Index: pokerth-0.8.3/src/net/common/downloaderthread.cpp
-===================================================================
---- pokerth-0.8.3.orig/src/net/common/downloaderthread.cpp 2011-04-26 11:47:50.274944396 +0200
-+++ pokerth-0.8.3/src/net/common/downloaderthread.cpp 2011-04-26 11:47:58.469856641 +0200
-@@ -90,7 +90,7 @@
- if (m_curDownloadData)
- {
- path filepath(m_curDownloadData->filename);
-- ifstream instream(filepath.file_string().c_str(), ios_base::in | ios_base::binary);
-+ ifstream instream(filepath.string().c_str(), ios_base::in | ios_base::binary);
- // Find out file size.
- // Not fully portable, but works on win/linux/mac.
- instream.seekg(0, ios_base::beg);
-@@ -128,7 +128,7 @@
- if (m_curDownloadData && !m_curDownloadData->filename.empty())
- {
- path filepath(m_curDownloadData->filename);
-- m_downloadHelper->Init(m_curDownloadData->address, filepath.file_string());
-+ m_downloadHelper->Init(m_curDownloadData->address, filepath.string());
- m_downloadInProgress = true;
- }
- }
-Index: pokerth-0.8.3/src/net/common/serverlobbythread.cpp
-===================================================================
---- pokerth-0.8.3.orig/src/net/common/serverlobbythread.cpp 2011-04-26 11:48:19.087120004 +0200
-+++ pokerth-0.8.3/src/net/common/serverlobbythread.cpp 2011-04-26 11:49:13.967835402 +0200
-@@ -215,7 +215,7 @@
- if (!logDir.empty())
- {
- logPath /= SERVER_STATISTICS_FILE_NAME;
-- m_statisticsFileName = logPath.directory_string();
-+ m_statisticsFileName = logPath.string();
- ReadStatisticsFile();
- }
- }
-@@ -1251,7 +1251,7 @@
- // Init finished - start session.
- EstablishSession(session);
- LOG_MSG("Client \"" << session.sessionData->GetClientAddr() << "\" uploaded avatar \""
-- << boost::filesystem::path(avatarFileName).file_string() << "\".");
-+ << boost::filesystem::path(avatarFileName).string() << "\".");
- }
- else
- SessionError(session, ERR_NET_WRONG_AVATAR_SIZE);
-Index: pokerth-0.8.3/src/net/common/uploaderthread.cpp
-===================================================================
---- pokerth-0.8.3.orig/src/net/common/uploaderthread.cpp 2011-04-26 11:48:05.320947260 +0200
-+++ pokerth-0.8.3/src/net/common/uploaderthread.cpp 2011-04-26 12:14:37.533604549 +0200
-@@ -74,7 +74,7 @@
- if (!data.filename.empty() && data.filesize > 0)
- {
- path filepath(data.filename);
-- m_uploadHelper->Init(data.address + filepath.leaf(), filepath.file_string(), data.user, data.pwd, data.filesize);
-+ m_uploadHelper->Init(data.address + filepath.filename().string(), filepath.string(), data.user, data.pwd, data.filesize);
- m_uploadInProgress = true;
- }
- }
-Index: pokerth-0.8.3/src/core/common/loghelper_server.cpp
-===================================================================
---- pokerth-0.8.3.orig/src/core/common/loghelper_server.cpp 2011-04-26 11:52:16.931549677 +0200
-+++ pokerth-0.8.3/src/core/common/loghelper_server.cpp 2011-04-26 11:52:22.314835127 +0200
-@@ -47,7 +47,7 @@
- path tmpLogFile(logDir);
- tmpLogFile /= SERVER_MSG_LOG_FILE_NAME;
-
-- g_logFile = tmpLogFile.directory_string();
-+ g_logFile = tmpLogFile.string();
- g_logLevel = logLevel;
- }
-
-Index: pokerth-0.8.3/src/gui/qt/qttools/nonqthelper/nonqthelper.cpp
-===================================================================
---- pokerth-0.8.3.orig/src/gui/qt/qttools/nonqthelper/nonqthelper.cpp 2011-04-26 11:52:40.020484963 +0200
-+++ pokerth-0.8.3/src/gui/qt/qttools/nonqthelper/nonqthelper.cpp 2011-04-26 11:52:46.675601596 +0200
-@@ -55,5 +55,5 @@
- boost::filesystem::path startPath(argv0);
- startPath = startPath.remove_leaf();
- startPath /= "data";
-- return stringToUtf8(startPath.directory_string());
-+ return stringToUtf8(startPath.string());
- }
-Index: pokerth-0.8.3/src/net/common/clientstate.cpp
-===================================================================
---- pokerth-0.8.3.orig/src/net/common/clientstate.cpp 2011-04-26 11:50:48.791248999 +0200
-+++ pokerth-0.8.3/src/net/common/clientstate.cpp 2011-04-26 11:51:41.492253721 +0200
-@@ -194,7 +194,7 @@
- // Download and compare md5.
- tmpServerListPath = change_extension(tmpServerListPath, extension(tmpServerListPath) + ".md5");
- boost::shared_ptr<DownloadHelper> downloader(new DownloadHelper);
-- downloader->Init(serverListUrl + ".md5", tmpServerListPath.directory_string());
-+ downloader->Init(serverListUrl + ".md5", tmpServerListPath.string());
- ClientStateSynchronizingServerList::Instance().SetDownloadHelper(downloader);
- client->SetState(ClientStateSynchronizingServerList::Instance());
- }
-@@ -202,7 +202,7 @@
- {
- // Download server list.
- boost::shared_ptr<DownloadHelper> downloader(new DownloadHelper);
-- downloader->Init(serverListUrl, tmpServerListPath.directory_string());
-+ downloader->Init(serverListUrl, tmpServerListPath.string());
- ClientStateDownloadingServerList::Instance().SetDownloadHelper(downloader);
- client->SetState(ClientStateDownloadingServerList::Instance());
- }
-@@ -270,7 +270,7 @@
- // Compare the md5 sums.
- string tmpMd5;
- {
-- ifstream inFile(md5ServerListPath.directory_string().c_str(), ios_base::in);
-+ ifstream inFile(md5ServerListPath.string().c_str(), ios_base::in);
- if (inFile.fail())
- throw ClientException(__FILE__, __LINE__, ERR_SOCK_OPEN_MD5_FAILED, 0);
- inFile >> tmpMd5;
-@@ -279,7 +279,7 @@
- if (!downloadedMd5.FromString(tmpMd5))
- throw ClientException(__FILE__, __LINE__, ERR_SOCK_INVALID_SERVERLIST_MD5, 0);
- MD5Buf currentMd5;
-- if (!CryptHelper::MD5Sum(serverListPath.directory_string(), currentMd5))
-+ if (!CryptHelper::MD5Sum(serverListPath.string(), currentMd5))
- throw ClientException(__FILE__, __LINE__, ERR_SOCK_INVALID_SERVERLIST_MD5, 0);
- if (downloadedMd5 == currentMd5)
- {
-@@ -402,8 +402,8 @@
-
- // Unzip the file using zlib.
- try {
-- ifstream inFile(zippedServerListPath.directory_string().c_str(), ios_base::in | ios_base::binary);
-- ofstream outFile(xmlServerListPath.directory_string().c_str(), ios_base::out);
-+ ifstream inFile(zippedServerListPath.string().c_str(), ios_base::in | ios_base::binary);
-+ ofstream outFile(xmlServerListPath.string().c_str(), ios_base::out);
- boost::iostreams::filtering_streambuf<boost::iostreams::input> in;
- in.push(boost::iostreams::zlib_decompressor());
- in.push(inFile);
-@@ -417,7 +417,7 @@
- xmlServerListPath = zippedServerListPath;
-
- // Parse the server address.
-- TiXmlDocument doc(xmlServerListPath.directory_string());
-+ TiXmlDocument doc(xmlServerListPath.string());
-
- if (doc.LoadFile())
- {
-Index: pokerth-0.8.3/src/pokerth_server.cpp
-===================================================================
---- pokerth-0.8.3.orig/src/pokerth_server.cpp 2011-04-26 11:51:55.450400982 +0200
-+++ pokerth-0.8.3/src/pokerth_server.cpp 2011-04-26 11:52:07.096855087 +0200
-@@ -151,7 +151,7 @@
- {
- path tmpPidPath(myConfig->readConfigString("LogDir"));
- tmpPidPath /= "pokerth.pid";
-- pidFile = tmpPidPath.directory_string();
-+ pidFile = tmpPidPath.string();
- }
- {
- ofstream pidStream(pidFile.c_str(), ios_base::out | ios_base::trunc);
-Index: pokerth-0.8.3/src/zlib_compress.cpp
-===================================================================
---- pokerth-0.8.3.orig/src/zlib_compress.cpp 2011-04-26 11:50:16.855487998 +0200
-+++ pokerth-0.8.3/src/zlib_compress.cpp 2011-04-26 11:50:32.733380435 +0200
-@@ -49,13 +49,13 @@
- return 2;
- }
- try {
-- ifstream inFile(inputFilePath.directory_string().c_str(), ios_base::in);
-- ofstream outFile(outputFilePath.directory_string().c_str(), ios_base::out | ios_base::binary);
-+ ifstream inFile(inputFilePath.string().c_str(), ios_base::in);
-+ ofstream outFile(outputFilePath.string().c_str(), ios_base::out | ios_base::binary);
- boost::iostreams::filtering_streambuf<boost::iostreams::output> out;
- out.push(boost::iostreams::zlib_compressor());
- out.push(outFile);
- boost::iostreams::copy(inFile, out);
-- cout << "Compression of \"" << inputFilePath.directory_string() << "\" to \"" << outputFilePath.directory_string() << "\" was successful." << endl;
-+ cout << "Compression of \"" << inputFilePath.string() << "\" to \"" << outputFilePath.string() << "\" was successful." << endl;
- } catch (...)
- {
- cerr << "Compression failed." << endl;
Deleted: packages/trunk/pokerth/debian/patches/07_boost146_ftbfs_upstream.patch
===================================================================
--- packages/trunk/pokerth/debian/patches/07_boost146_ftbfs_upstream.patch 2012-01-22 13:12:22 UTC (rev 13166)
+++ packages/trunk/pokerth/debian/patches/07_boost146_ftbfs_upstream.patch 2012-01-23 16:55:35 UTC (rev 13167)
@@ -1,39 +0,0 @@
-From: Lothar May <lotodore at pokerth.net>
-Subject: force boost::filesystem v2 API
- Since boost 1.46 the v3 filesystem API is default (v2 was until 1.45).
- By using BOOST_FILESYSTEM_VERSION=2, we can force the use of v2
- until boost 1.48 is released.
-
-Index: pokerth/pokerth_server.pro
-===================================================================
---- pokerth/pokerth_server.pro (revision 2787)
-+++ pokerth/pokerth_server.pro (revision 2841)
-@@ -15,5 +15,5 @@
- OBJECTS_DIR = obj
- DEFINES += POKERTH_DEDICATED_SERVER
--DEFINES += ENABLE_IPV6
-+DEFINES += ENABLE_IPV6 BOOST_FILESYSTEM_VERSION=2
- DEFINES += PREFIX=\"$${PREFIX}\"
- QT -= core gui
-Index: pokerth/pokerth_lib.pro
-===================================================================
---- pokerth/pokerth_lib.pro (revision 2839)
-+++ pokerth/pokerth_lib.pro (revision 2841)
-@@ -13,5 +13,5 @@
- MOC_DIR = mocs
- OBJECTS_DIR = obj
--DEFINES += ENABLE_IPV6
-+DEFINES += ENABLE_IPV6 BOOST_FILESYSTEM_VERSION=2
- QT -= core gui
- #QMAKE_CXXFLAGS += -std=gnu++0x
-Index: pokerth/pokerth_game.pro
-===================================================================
---- pokerth/pokerth_game.pro (revision 2838)
-+++ pokerth/pokerth_game.pro (revision 2841)
-@@ -20,5 +20,5 @@
- MOC_DIR = mocs
- OBJECTS_DIR = obj
--DEFINES += ENABLE_IPV6
-+DEFINES += ENABLE_IPV6 BOOST_FILESYSTEM_VERSION=2
- DEFINES += PREFIX=\"$${PREFIX}\"
- TARGET = pokerth
Deleted: packages/trunk/pokerth/debian/patches/08_use_debian_libircclient.patch
===================================================================
--- packages/trunk/pokerth/debian/patches/08_use_debian_libircclient.patch 2012-01-22 13:12:22 UTC (rev 13166)
+++ packages/trunk/pokerth/debian/patches/08_use_debian_libircclient.patch 2012-01-23 16:55:35 UTC (rev 13167)
@@ -1,18 +0,0 @@
-From: Evgeni Golov <evgeni at debian.org>
-Subject: stop using src/third_party/libircclient
- Use libircclient from the system, not the one shipped in the tarball.
-
-Index: PokerTH-0.9.1-src/pokerth_game.pro
-===================================================================
---- PokerTH-0.9.1-src-orig/pokerth_game.pro 2012-01-09 13:06:38.000000000 -0800
-+++ PokerTH-0.9.1-src/pokerth_game.pro 2012-01-13 20:01:20.734402187 -0800
-@@ -303,7 +305,8 @@
- LIBS += -lpokerth_lib \
- -lpokerth_db \
- -lpokerth_protocol \
-- -lcurl
-+ -lcurl \
-+ -lircclient
-
- win32 {
- DEFINES += CURL_STATICLIB
Deleted: packages/trunk/pokerth/debian/patches/09_use_debian_libtinyxml.patch
===================================================================
--- packages/trunk/pokerth/debian/patches/09_use_debian_libtinyxml.patch 2012-01-22 13:12:22 UTC (rev 13166)
+++ packages/trunk/pokerth/debian/patches/09_use_debian_libtinyxml.patch 2012-01-23 16:55:35 UTC (rev 13167)
@@ -1,177 +0,0 @@
-From: Evgeni Golov <evgeni at debian.org>
-Subject: stop using src/third_party/tinyxml
- Use tinyxml from the system, not the one shipped in the tarball.
-
-Index: pokerth-0.8.3/chatcleaner.pro
-===================================================================
---- pokerth-0.8.3.orig/chatcleaner.pro 2011-05-05 13:39:04.791688475 +0200
-+++ pokerth-0.8.3/chatcleaner.pro 2011-05-05 13:43:11.686916788 +0200
-@@ -12,12 +12,10 @@
- OBJECTS_DIR = obj
- TEMPLATE = app
- INCLUDEPATH += src/ \
-- src/third_party/tinyxml \
- src/chatcleaner/ \
- src/third_party/asn1/ \
- src/net/
- DEPENDPATH += src/ \
-- src/third_party/tinyxml \
- src/chatcleaner/ \
- src/third_party/asn1/ \
- src/net/
-@@ -27,10 +25,6 @@
- badwordcheck.cpp \
- textfloodcheck.cpp \
- cleanerconfig.cpp \
-- tinystr.cpp \
-- tinyxml.cpp \
-- tinyxmlerror.cpp \
-- tinyxmlparser.cpp \
- capsfloodcheck.cpp \
- letterrepeatingcheck.cpp \
- urlcheck.cpp
-@@ -39,14 +33,13 @@
- badwordcheck.h \
- textfloodcheck.h \
- cleanerconfig.h \
-- tinyxml.h \
-- tinystr.h \
- capsfloodcheck.h \
- letterrepeatingcheck.h \
- urlcheck.h
- LIBPATH += lib
- LIBS += -lpokerth_lib \
-- -lpokerth_protocol
-+ -lpokerth_protocol \
-+ -ltinyxml
- win32 {
- LIBPATH += ../boost/stage/lib
- INCLUDEPATH += ../boost/
-Index: pokerth-0.8.3/pokerth_game.pro
-===================================================================
---- pokerth-0.8.3.orig/pokerth_game.pro 2011-05-05 13:39:04.771691128 +0200
-+++ pokerth-0.8.3/pokerth_game.pro 2011-05-05 13:43:11.686916788 +0200
-@@ -33,7 +33,6 @@
- src/engine/local_engine \
- src/engine/network_engine \
- src/config \
-- src/third_party/tinyxml \
- src/third_party/asn1 \
- src/gui/qt \
- src/gui/qt/connecttoserverdialog \
-@@ -71,7 +70,6 @@
- src/gui \
- src/net \
- src/core/common \
-- src/third_party/tinyxml \
- src/engine/local_engine \
- src/engine/network_engine \
- src/gui/qt \
-@@ -131,8 +129,6 @@
- src/net/socket_msg.h \
- src/net/socket_startup.h \
- src/net/net_helper.h \
-- src/third_party/tinyxml/tinystr.h \
-- src/third_party/tinyxml/tinyxml.h \
- src/engine/local_engine/cardsvalue.h \
- src/engine/local_engine/localboard.h \
- src/engine/local_engine/localenginefactory.h \
-@@ -298,7 +294,8 @@
- -lpokerth_db \
- -lpokerth_protocol \
- -lcurl \
-- -lircclient
-+ -lircclient \
-+ -ltinyxml
-
- win32 {
- DEFINES += CURL_STATICLIB
-Index: pokerth-0.8.3/pokerth_lib.pro
-===================================================================
---- pokerth-0.8.3.orig/pokerth_lib.pro 2011-05-05 13:39:55.628940582 +0200
-+++ pokerth-0.8.3/pokerth_lib.pro 2011-05-05 13:43:11.686916788 +0200
-@@ -18,7 +18,8 @@
- #QMAKE_CXXFLAGS += -std=gnu++0x
- #PRECOMPILED_HEADER = src/pch_lib.h
-
--LIBS += -lircclient
-+LIBS += -lircclient \
-+ -ltinyxml
-
- INCLUDEPATH += . \
- src \
-@@ -30,7 +31,6 @@
- src/engine/local_engine \
- src/engine/network_engine \
- src/config \
-- src/third_party/tinyxml \
- src/third_party/asn1 \
- src/core
-
-@@ -44,7 +44,6 @@
- src/gui/generic \
- src/net \
- src/core/common \
-- src/third_party/tinyxml \
- src/engine/local_engine \
- src/engine/network_engine \
- src/net/common \
-@@ -107,8 +106,6 @@
- src/net/downloadhelper.h \
- src/net/encodedpacket.h \
- src/net/internalchatcleanerpacket.h \
-- src/third_party/tinyxml/tinystr.h \
-- src/third_party/tinyxml/tinyxml.h \
- src/engine/local_engine/cardsvalue.h \
- src/engine/local_engine/localboard.h \
- src/engine/local_engine/localenginefactory.h \
-@@ -152,10 +149,6 @@
- src/core/common/crypthelper.cpp \
- src/core/common/avatarmanager.cpp \
- src/core/common/pokerthexception.cpp \
-- src/third_party/tinyxml/tinystr.cpp \
-- src/third_party/tinyxml/tinyxml.cpp \
-- src/third_party/tinyxml/tinyxmlerror.cpp \
-- src/third_party/tinyxml/tinyxmlparser.cpp \
- src/engine/local_engine/cardsvalue.cpp \
- src/engine/local_engine/localboard.cpp \
- src/engine/local_engine/localenginefactory.cpp \
-Index: pokerth-0.8.3/pokerth_server.pro
-===================================================================
---- pokerth-0.8.3.orig/pokerth_server.pro 2011-05-05 13:39:04.779690067 +0200
-+++ pokerth-0.8.3/pokerth_server.pro 2011-05-05 13:43:11.686916788 +0200
-@@ -31,7 +31,6 @@
- src/engine/local_engine \
- src/engine/network_engine \
- src/config \
-- src/third_party/tinyxml \
- src/third_party/asn1 \
- src/core \
-
-@@ -45,7 +44,6 @@
- src/gui/generic \
- src/net \
- src/core/common \
-- src/third_party/tinyxml \
- src/engine/local_engine \
- src/engine/network_engine \
- src/net/common \
-@@ -78,8 +76,6 @@
- src/net/socket_msg.h \
- src/net/socket_startup.h \
- src/net/net_helper.h \
-- src/third_party/tinyxml/tinystr.h \
-- src/third_party/tinyxml/tinyxml.h \
- src/core/pokerthexception.h \
- src/core/convhelper.h \
- src/core/loghelper.h \
-@@ -116,7 +112,8 @@
- -lpokerth_db \
- -lpokerth_protocol \
- -lcurl \
-- -lircclient
-+ -lircclient \
-+ -ltinyxml
-
- win32 {
- DEFINES += CURL_STATICLIB
Modified: packages/trunk/pokerth/debian/patches/series
===================================================================
--- packages/trunk/pokerth/debian/patches/series 2012-01-22 13:12:22 UTC (rev 13166)
+++ packages/trunk/pokerth/debian/patches/series 2012-01-23 16:55:35 UTC (rev 13167)
@@ -1,8 +1 @@
-#01_clean_libpokerth.patch
-#02_use_dejavu_fonts.patch
03_use_--as-needed.patch
-#05_disable_gnu++0x.patch
-#06_fix_gcc46_ftbfs.patch
-#07_boost146_ftbfs_upstream.patch
-08_use_debian_libircclient.patch
-#09_use_debian_libtinyxml.patch
More information about the Pkg-games-commits
mailing list