← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/inspircd/oneiric

« back to all changes in this revision

Viewing changes to debian/patches/03_use_pkg-config_gnutls.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Bradley Smith, Matt Arnold, Bradley Smith
  • Date: 2009-06-22 19:00:02 UTC
  • mfrom: (3.2.3 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090622190002-jppjv7zlff6ifw1q
Tags: 1.1.22+dfsg-4
http://bugs.debian.org/529823
http://bugs.debian.org/505368
[ Matt Arnold ]
* 03_use_pkg-config_gnutls.dpatch fix gnutls ftbfs Closes: 529823.
* Add pkg-config to build-depends
* Bump standards version no change
* 04_gcc44_fixes.dpatch fix ftbfs on GCC 4.4 Closes: #505368
  -- Patch thanks Martin Michlmayr

[ Bradley Smith ]
* Change section of inspircd-dbg to debug.
* Upgrade compat version to 7 and upgrade debhelper build-depends.
* Move dh_clean -k to dh_prep.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/03_use_pkg-config_gnutls.dpatch
 
1
#!/bin/sh -e
 
2
## 03_use_pkg-config_gnutls.dpatch
 
3
##
 
4
## DP: Use pkg-config to find gnutls.
 
5
## DP: Cherry picked from upstream.
 
6
 
 
7
if [ $# -ne 1 ]; then
 
8
    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
 
9
    exit 1
 
10
fi
 
11
 
 
12
[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
 
13
patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
 
14
 
 
15
case "$1" in
 
16
       -patch) patch $patch_opts -p1 < $0;;
 
17
       -unpatch) patch $patch_opts -p1 -R < $0;;
 
18
        *)
 
19
                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
 
20
                exit 1;;
 
21
esac
 
22
 
 
23
exit 0
 
24
 
 
25
@DPATCH@
 
26
diff -urbB inspircd-1.1.22+dfsg.orig/configure inspircd-1.1.22+dfsg/configure
 
27
--- inspircd-1.1.22+dfsg.orig/configure 2008-11-30 22:10:12.000000000 +0100
 
28
+++ inspircd-1.1.22+dfsg/configure      2009-06-20 09:02:41.000000000 +0200
 
29
@@ -135,7 +135,7 @@
 
30
 {
 
31
        $config{LIBRARY_DIR} = $opt_library_dir;
 
32
 }
 
33
-chomp($config{HAS_GNUTLS}   = `libgnutls-config --version 2>/dev/null | cut -c 1,2,3`); # GNUTLS Version.
 
34
+chomp($config{HAS_GNUTLS}   = `pkg-config --modversion gnutls 2>/dev/null | cut -c 1,2,3`); # GNUTLS Version.
 
35
 chomp($config{HAS_OPENSSL}  = `pkg-config --modversion openssl 2>/dev/null`);          # Openssl version
 
36
 chomp($gnutls_ver = $config{HAS_GNUTLS});
 
37
 chomp($openssl_ver = $config{HAS_OPENSSL});
 
38
diff -urbB inspircd-1.1.22+dfsg.orig/src/modules/extra/m_ssl_gnutls.cpp inspircd-1.1.22+dfsg/src/modules/extra/m_ssl_gnutls.cpp
 
39
--- inspircd-1.1.22+dfsg.orig/src/modules/extra/m_ssl_gnutls.cpp        2008-09-26 12:52:27.000000000 +0200
 
40
+++ inspircd-1.1.22+dfsg/src/modules/extra/m_ssl_gnutls.cpp     2009-06-20 08:57:55.000000000 +0200
 
41
@@ -32,8 +32,8 @@
 
42
 #endif
 
43
 
 
44
 /* $ModDesc: Provides SSL support for clients */
 
45
-/* $CompileFlags: exec("libgnutls-config --cflags") */
 
46
-/* $LinkerFlags: rpath("libgnutls-config --libs") exec("libgnutls-config --libs") */
 
47
+/* $CompileFlags: pkgconfincludes("gnutls","/gnutls/gnutls.h","") */
 
48
+/* $LinkerFlags: rpath("pkg-config --libs gnutls") pkgconflibs("gnutls","/libgnutls.so","-lgnutls") */
 
49
 /* $ModDep: transport.h */