| 1 |
yngwin 09/07/02 22:55:49 |
| 2 |
|
| 3 |
Added: btg-1.0.0-gcc44.patch btg-1.0.0-gnutls-pc.patch |
| 4 |
Log: |
| 5 |
Version bump, including patches and various ebuild improvements (see ChangeLog) |
| 6 |
(Portage version: 2.2_rc33/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 net-p2p/btg/files/btg-1.0.0-gcc44.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/btg/files/btg-1.0.0-gcc44.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/btg/files/btg-1.0.0-gcc44.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: btg-1.0.0-gcc44.patch |
| 15 |
=================================================================== |
| 16 |
--- btg-1.0.0/bcore/os/socket.cpp.orig 2009-07-01 15:32:51.000000000 +0200 |
| 17 |
+++ btg-1.0.0/bcore/os/socket.cpp 2009-07-01 15:34:42.000000000 +0200 |
| 18 |
@@ -32,6 +32,7 @@ |
| 19 |
{ |
| 20 |
#include <errno.h> |
| 21 |
#include <fcntl.h> |
| 22 |
+#include <stdio.h> |
| 23 |
} |
| 24 |
|
| 25 |
namespace btg |
| 26 |
--- btg-1.0.0/bcore/os/fileop.cpp.orig 2009-07-01 17:06:42.000000000 +0200 |
| 27 |
+++ btg-1.0.0/bcore/os/fileop.cpp 2009-07-01 17:07:22.000000000 +0200 |
| 28 |
@@ -24,6 +24,8 @@ |
| 29 |
|
| 30 |
#include <bcore/logmacro.h> |
| 31 |
|
| 32 |
+#include <cstdio> |
| 33 |
+ |
| 34 |
extern "C" |
| 35 |
{ |
| 36 |
// For getenv. |
| 37 |
--- btg-1.0.0/bcore/logger/logger.cpp.orig 2009-07-01 19:38:33.000000000 +0200 |
| 38 |
+++ btg-1.0.0/bcore/logger/logger.cpp 2009-07-01 19:39:02.000000000 +0200 |
| 39 |
@@ -22,6 +22,7 @@ |
| 40 |
|
| 41 |
#include "logger.h" |
| 42 |
#include "logif.h" |
| 43 |
+#include <cstdio> |
| 44 |
|
| 45 |
namespace btg |
| 46 |
{ |
| 47 |
|
| 48 |
|
| 49 |
|
| 50 |
1.1 net-p2p/btg/files/btg-1.0.0-gnutls-pc.patch |
| 51 |
|
| 52 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/btg/files/btg-1.0.0-gnutls-pc.patch?rev=1.1&view=markup |
| 53 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/btg/files/btg-1.0.0-gnutls-pc.patch?rev=1.1&content-type=text/plain |
| 54 |
|
| 55 |
Index: btg-1.0.0-gnutls-pc.patch |
| 56 |
=================================================================== |
| 57 |
--- btg-1.0.0/configure.in.orig 2009-07-01 15:08:38.000000000 +0200 |
| 58 |
+++ btg-1.0.0/configure.in 2009-07-01 15:08:47.000000000 +0200 |
| 59 |
@@ -144,11 +144,7 @@ |
| 60 |
|
| 61 |
AC_CACHE_SAVE |
| 62 |
|
| 63 |
-AM_PATH_LIBGNUTLS([1.0.0], [gnutlsfound=true], [gnutlsfound=false]) |
| 64 |
- |
| 65 |
-if test "$gnutlsfound" = "false"; then |
| 66 |
- AC_MSG_ERROR([unable to find libgnutls library, currently this is required.]) |
| 67 |
-fi |
| 68 |
+PKG_CHECK_MODULES(LIBGNUTLS, gnutls >= 1.0.0) |
| 69 |
|
| 70 |
AM_LIBGNUTLS_VERSION |
| 71 |
|
| 72 |
--- btg-1.0.0/m4/libgnutls-version.m4.orig 2008-06-14 08:29:51.000000000 +0200 |
| 73 |
+++ btg-1.0.0/m4/libgnutls-version.m4 2009-07-01 15:05:28.000000000 +0200 |
| 74 |
@@ -3,27 +3,15 @@ |
| 75 |
dnl |
| 76 |
|
| 77 |
AC_DEFUN([AM_LIBGNUTLS_VERSION], |
| 78 |
-[dnl |
| 79 |
-dnl Get the cflags and libraries from the libgnutls-config script |
| 80 |
-dnl |
| 81 |
-AC_ARG_WITH(libgnutls-prefix, |
| 82 |
- [ --with-libgnutls-prefix=PFX Prefix where libgnutls is installed (optional)], |
| 83 |
- libgnutls_config_prefix="$withval", libgnutls_config_prefix="") |
| 84 |
- |
| 85 |
- if test x$libgnutls_config_prefix != x ; then |
| 86 |
- if test x${LIBGNUTLS_CONFIG+set} != xset ; then |
| 87 |
- LIBGNUTLS_CONFIG=$libgnutls_config_prefix/bin/libgnutls-config |
| 88 |
- fi |
| 89 |
- fi |
| 90 |
- |
| 91 |
- AC_PATH_PROG(LIBGNUTLS_CONFIG, libgnutls-config, no) |
| 92 |
+[ |
| 93 |
+ PKG_CHECK_EXISTS(gnutls, [gnutls_exists=yes], [gnutls_exists=no]) |
| 94 |
|
| 95 |
- if test "$LIBGNUTLS_CONFIG" = "no" ; then |
| 96 |
+ if test "$gnutls_exists" = "no" ; then |
| 97 |
LIBGNUTLS_MAJOR_VER=0 |
| 98 |
LIBGNUTLS_MINOR_VER=0 |
| 99 |
else |
| 100 |
- LIBGNUTLS_MAJOR_VER=`$LIBGNUTLS_CONFIG $libgnutls_config_args --version|cut -d "." -f 1` |
| 101 |
- LIBGNUTLS_MINOR_VER=`$LIBGNUTLS_CONFIG $libgnutls_config_args --version|cut -d "." -f 2` |
| 102 |
+ LIBGNUTLS_MAJOR_VER=`pkg-config gnutls --modversion --silence-errors |cut -d "." -f 1` |
| 103 |
+ LIBGNUTLS_MINOR_VER=`pkg-config gnutls --modversion --silence-errors |cut -d "." -f 2` |
| 104 |
fi |
| 105 |
|
| 106 |
AC_DEFINE_UNQUOTED(GNUTLS_MAJOR_VER, [$LIBGNUTLS_MAJOR_VER], [gnutls major version]) |
Archives