[arch-commits] Commit in wireshark/trunk (02_enable-version.diff PKGBUILD)

[Guillaume Alaux]

    Date: Sunday, June 9, 2013 @ 22:35:44
  Author: guillaume
Revision: 188103

Upstream release

Modified:
  wireshark/trunk/PKGBUILD
Deleted:
  wireshark/trunk/02_enable-version.diff

------------------------+
 02_enable-version.diff |   11 -----------
 PKGBUILD               |   20 +++++++++++++++-----
 2 files changed, 15 insertions(+), 16 deletions(-)

Deleted: 02_enable-version.diff
===================================================================
--- 02_enable-version.diff	2013-06-09 14:14:21 UTC (rev 188102)
+++ 02_enable-version.diff	2013-06-09 20:35:44 UTC (rev 188103)
@@ -1,11 +0,0 @@
---- configure.in.init	2013-02-02 22:11:42.863854681 +0100
-+++ configure.in	2013-02-02 22:13:40.888683191 +0100
-@@ -185,7 +185,7 @@
- 		  [use GnuTLS library @<:@default=yes@:>@]),
-   with_gnutls="$withval", with_gnutls="yes")
- if test "x$with_gnutls" = "xyes"; then
--  PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 1.2.0 gnutls < 3],
-+  PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 1.2.0],
-         [
-                 echo "GnuTLS found, enabling SSL decryption"
-                 AC_DEFINE(HAVE_LIBGNUTLS, 1, [Define to use GnuTLS library])

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-06-09 14:14:21 UTC (rev 188102)
+++ PKGBUILD	2013-06-09 20:35:44 UTC (rev 188103)
@@ -3,7 +3,7 @@
 # Contributor: Florian Pritz <bluewind at jabber dot ccc dot de>
 pkgname=('wireshark-cli' 'wireshark-gtk')
 pkgbase=wireshark
-pkgver=1.8.7
+pkgver=1.10.0
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -12,14 +12,24 @@
 url='http://www.wireshark.org/'
 options=(!libtool)
 source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2
-        02_enable-version.diff)
-sha256sums=('5c7e429c1e410289b49d65a2e635e00c0becdcb56fe703a1d3e7b5e275fca842'
-            'dd71a9fc3443b5e586d9e50c31208d031f20d7b96cf72d9e4e0f02f2f175d00b')
+        01_fix_encoding_asn2deb_pod.patch
+        02_fix_encoding_idl2deb_pod.patch
+        03_force_utf8_for_pod2man.patch)
+sha256sums=('1f4b377ba6284a51797bcc437aa2918bfaeb5d30908cd6194bd09f7054c65add'
+            '0dfe86b1e4bbf4090035fc1fcd36c2790d418a5749e23a2a7e7285699a6c147d'
+            'a46f6e87477fcbf8289bfde5e525e6c0b4c3268bd1a2e189e3120bd3ad4f7c27'
+            '902f72132b9e0dd95f89ca0bcb216ef9c866ac11c842866781d239b6b7873daf')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
 
-  patch -p0 < ${srcdir}/02_enable-version.diff
+  # https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8774
+  for p in 01_fix_encoding_asn2deb_pod.patch \
+           02_fix_encoding_idl2deb_pod.patch \
+           03_force_utf8_for_pod2man.patch;
+  do
+    patch -p0 <${srcdir}/${p}
+  done
 
   ./autogen.sh
   ./configure \