Author: evgeni Date: 2014-09-20 09:21:57 +0000 (Sat, 20 Sep 2014) New Revision: 15212
Added: packages/trunk/pokerth/debian/patches/10_fix_ftbfs_with_new_libircclient.patch Modified: packages/trunk/pokerth/debian/changelog packages/trunk/pokerth/debian/control packages/trunk/pokerth/debian/patches/series Log: Import NMU: Fix FTBFS with newer libircclient-dev by updating #include paths. Patch: 10_fix_ftbfs_with_new_libircclient.patch Closes: #759851. Thanks: Robert S. Edmonds <[email protected]> Modified: packages/trunk/pokerth/debian/changelog =================================================================== --- packages/trunk/pokerth/debian/changelog 2014-09-16 11:47:13 UTC (rev 15211) +++ packages/trunk/pokerth/debian/changelog 2014-09-20 09:21:57 UTC (rev 15212) @@ -1,3 +1,12 @@ +pokerth (1.1.1-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix FTBFS with newer libircclient-dev by updating #include paths. + (10_fix_ftbfs_with_new_libircclient.patch). + Closes: #759851. + + -- Robert S. Edmonds <[email protected]> Sat, 13 Sep 2014 16:31:53 -0400 + pokerth (1.1.1-2) unstable; urgency=medium * Build with Qt5 on kfreebsd-amd64, kfreebsd-i386, mips, mipsel, Modified: packages/trunk/pokerth/debian/control =================================================================== --- packages/trunk/pokerth/debian/control 2014-09-16 11:47:13 UTC (rev 15211) +++ packages/trunk/pokerth/debian/control 2014-09-20 09:21:57 UTC (rev 15212) @@ -12,7 +12,8 @@ libboost-iostreams-dev (>= 1.42.0), libboost-system-dev (>= 1.42.0), libboost-program-options-dev (>= 1.42.0), libboost-date-time-dev (>= 1.42.0), libboost-regex-dev (>= 1.42.0), libboost-random-dev (>= 1.42.0), - libircclient-dev, libtinyxml-dev, libprotobuf-dev, protobuf-compiler + libircclient-dev (>= 1.8-1~), libtinyxml-dev, libprotobuf-dev, + protobuf-compiler Standards-Version: 3.9.5 Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/pokerth/ Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/pokerth/ Added: packages/trunk/pokerth/debian/patches/10_fix_ftbfs_with_new_libircclient.patch =================================================================== --- packages/trunk/pokerth/debian/patches/10_fix_ftbfs_with_new_libircclient.patch (rev 0) +++ packages/trunk/pokerth/debian/patches/10_fix_ftbfs_with_new_libircclient.patch 2014-09-20 09:21:57 UTC (rev 15212) @@ -0,0 +1,30 @@ +Description: fix FTBFS with new libircclient + The current version of libircclient-dev drops the libircclient/ prefix on its + include files. Update the #includes used by pokerth to follow this change. +Bug: https://github.com/pokerth/pokerth/issues/282 +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=759851 +Forwarded: not-needed +Last-Update: 2014-09-13 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: pokerth-1.1.1/src/net/common/ircthread.cpp +=================================================================== +--- pokerth-1.1.1.orig/src/net/common/ircthread.cpp ++++ pokerth-1.1.1/src/net/common/ircthread.cpp +@@ -32,14 +32,14 @@ + #include <net/socket_helper.h> + #include <net/ircthread.h> + #include <net/socket_msg.h> +-#include <libircclient/libircclient.h> ++#include <libircclient.h> + + // We need to do the following to handle different versions of libircclient. + // Sadly, libircclient doesn't have actual definitions for its versions in its headers. + // However, we can use a definition that appeared in the same version we need + // to check for. Hacky, but hey, it works. + #ifdef LIBIRC_OPTION_SSL_NO_VERIFY +-#include <libircclient/libirc_rfcnumeric.h> ++#include <libirc_rfcnumeric.h> + #endif + + #include <boost/algorithm/string/predicate.hpp> Modified: packages/trunk/pokerth/debian/patches/series =================================================================== --- packages/trunk/pokerth/debian/patches/series 2014-09-16 11:47:13 UTC (rev 15211) +++ packages/trunk/pokerth/debian/patches/series 2014-09-20 09:21:57 UTC (rev 15212) @@ -1 +1,2 @@ 03_use_--as-needed.patch +10_fix_ftbfs_with_new_libircclient.patch _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
