Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/bitcoin/PKGBUILD
	community/ecryptfs-utils/PKGBUILD
	community/erlang/PKGBUILD
	community/esmtp/PKGBUILD
	community/gmic/PKGBUILD
	community/ibus-sunpinyin/PKGBUILD
	community/libev/PKGBUILD
	community/libmirage/PKGBUILD
	community/libraw/PKGBUILD
	community/lilypond/PKGBUILD
	community/luajit/PKGBUILD
	community/matchbox-window-manager/PKGBUILD
	community/miniupnpc/PKGBUILD
	community/mplayer2/PKGBUILD
	community/mumble/PKGBUILD
	community/oss/PKGBUILD
	community/pidgin-lwqq/PKGBUILD
	community/postgis/PKGBUILD
	community/python2-pytables/PKGBUILD
	community/qmc2/PKGBUILD
	community/qtfm/PKGBUILD
	community/ruby-gtk3/PKGBUILD
	community/tea/PKGBUILD
	community/yacpi/PKGBUILD
	core/bridge-utils/PKGBUILD
	core/gcc/PKGBUILD
	core/libsasl/PKGBUILD
	core/lvm2/PKGBUILD
	core/net-tools/PKGBUILD
	core/ppp/PKGBUILD
	core/pptpclient/PKGBUILD
	core/sdparm/PKGBUILD
	core/systemd/PKGBUILD
	core/sysvinit-tools/PKGBUILD
	extra/aisleriot/PKGBUILD
	extra/arora/PKGBUILD
	extra/bluez-hcidump/PKGBUILD
	extra/bluez/PKGBUILD
	extra/cups/PKGBUILD
	extra/cyrus-sasl/PKGBUILD
	extra/dhcp/PKGBUILD
	extra/gnome-bluetooth/PKGBUILD
	extra/gnome-desktop/PKGBUILD
	extra/gnutls/PKGBUILD
	extra/gts/PKGBUILD
	extra/guile/PKGBUILD
	extra/harfbuzz/PKGBUILD
	extra/iptraf-ng/PKGBUILD
	extra/json-c/PKGBUILD
	extra/kdenetwork/PKGBUILD
	extra/kdepim/PKGBUILD
	extra/kdesdk-kate/PKGBUILD
	extra/libatasmart/PKGBUILD
	extra/libbsd/PKGBUILD
	extra/libdmtx/PKGBUILD
	extra/libhangul/PKGBUILD
	extra/libindi/PKGBUILD
	extra/libpeas/PKGBUILD
	extra/libsmbios/PKGBUILD
	extra/libspiro/PKGBUILD
	extra/libsrtp/PKGBUILD
	extra/libxml2/PKGBUILD
	extra/libxrender/PKGBUILD
	extra/libxvmc/PKGBUILD
	extra/llvm/PKGBUILD
	extra/maxima/PKGBUILD
	extra/msmtp/PKGBUILD
	extra/ortp/PKGBUILD
	extra/perl-dbd-sqlite/PKGBUILD
	extra/perl-yaml-syck/PKGBUILD
	extra/php/PKGBUILD
	extra/pm-utils/PKGBUILD
	extra/pulseaudio/PKGBUILD
	extra/pyqt4/PKGBUILD
	extra/scim-anthy/PKGBUILD
	extra/scim-chewing/PKGBUILD
	extra/scim-m17n/PKGBUILD
	extra/scim/PKGBUILD
	extra/ssmtp/PKGBUILD
	extra/texmacs/PKGBUILD
	extra/v86d/PKGBUILD
	extra/vlc/PKGBUILD
	extra/webkitgtk/PKGBUILD
	extra/webkitgtk2/PKGBUILD
	extra/wireshark/PKGBUILD
	extra/zsh/PKGBUILD
	libre/bogofilter-libre/PKGBUILD
	libre/ecasound-libre/PKGBUILD
	libre/libretools/libretools.install
	libre/mc-libre/PKGBUILD

5 files changed, 197 insertions, 21 deletions

diff --git a/extra/wireshark/01_fix_encoding_asn2deb_pod.patch b/extra/wireshark/01_fix_encoding_asn2deb_pod.patch
new file mode 100644
index 000000000..0b8b91363
--- /dev/null
+++ b/extra/wireshark/01_fix_encoding_asn2deb_pod.patch
@@ -0,0 +1,77 @@
+--- doc/asn2deb.pod.orig	2013-06-06 21:30:28.314150100 +0200
++++ doc/asn2deb.pod	2013-06-06 21:31:59.448850746 +0200
+@@ -5,8 +5,21 @@
+ 
+ =head1 SYNOPSIS
+ 
+-B<asn2deb> [-a I<ASN.1 file>] [--asn=I<ASN.1 file>] [B<-d >I<opts>] [B<--dbopts=>I<opts>] [B<-e >I<address>]
+-[B<--email=>I<address>] [B<-h>] [B<--help>] [B<-n >I<name>] [B<--name=>I<name>] [B<-p>] [B<--preserve>] [B<-v>] [B<--version>]
++B<asn2deb>
++S<[ B<-a> E<lt>ASN.1 fileE<gt> ]>
++S<[ B<--asn>=E<lt>ASN.1 fileE<gt> ]>
++S<[ B<-d> E<lt>optsE<gt> ]>
++S<[ B<--dbopts>=E<lt>optsE<gt> ]>
++S<[ B<-e> E<lt>addressE<gt> ]>
++S<[ B<--email>=E<lt>addressE<gt> ]>
++S<[ B<-h> ]>
++S<[ B<--help> ]>
++S<[ B<-n> E<lt>nameE<gt> ]>
++S<[ B<--name>=E<lt>nameE<gt> ]>
++S<[ B<-p> ]>
++S<[ B<--preserve> ]>
++S< [B<-v> ]>
++S<[ B<--version> ]>
+ 
+ =head1 DESCRIPTION
+ 
+@@ -19,31 +32,31 @@
+ 
+ =over 4
+ 
+-=item B<-a >I<ASN.1 file> B<--asn=>I<ASN.1 file>
++=item -a E<lt>ASN.1 fileE<gt> --asn=E<lt>ASN.1 fileE<gt>
+ 
+ ASN.1 file to use (mandatory).
+ 
+-=item B<-d >I<opts> B<--dbopts=>I<opts>
++=item -d E<lt>optsE<gt> --dbopts=E<lt>optsE<gt>
+ 
+ options for dpkg-buildpackage.
+ 
+-=item B<-e >I<address> B<--email=>I<address>
++=item -e E<lt>addressE<gt> --email=E<lt>addressE<gt>
+ 
+ use e-mail address.
+ 
+-=item B<-h> B<--help>
++=item -h --help
+ 
+ print help and exit.
+ 
+-=item B<-n >I<name> B<--name=>I<name>
++=item -n E<lt>nameE<gt> --name=E<lt>nameE<gt>
+ 
+ use user name.
+ 
+-=item B<-p> B<--preserve>
++=item -p --preserve
+ 
+ do not overwrite files.
+ 
+-=item B<-v> B<--version>
++=item -v --version
+ 
+ print version and exit.
+ 
+@@ -68,8 +81,8 @@
+ 
+ =head1 AUTHOR
+ 
+-B<W. Borgert> Author. 
++B<W. Borgert> Author.
+ 
+ =head1 COPYRIGHT
+ 
+-Copyright (C) 2003, 2005 W. Borger
+\ No newline at end of file
++Copyright (C) 2003, 2005 W. Borger
diff --git a/extra/wireshark/02_enable-version.diff b/extra/wireshark/02_enable-version.diff
deleted file mode 100644
index db2f3726e..000000000
--- a/extra/wireshark/02_enable-version.diff
+++ /dev/null
@@ -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])
diff --git a/extra/wireshark/02_fix_encoding_idl2deb_pod.patch b/extra/wireshark/02_fix_encoding_idl2deb_pod.patch
new file mode 100644
index 000000000..bc4000b8f
--- /dev/null
+++ b/extra/wireshark/02_fix_encoding_idl2deb_pod.patch
@@ -0,0 +1,77 @@
+--- doc/idl2deb.pod.orig	2013-06-06 21:31:06.674726010 +0200
++++ doc/idl2deb.pod	2013-06-06 21:35:38.522125866 +0200
+@@ -5,9 +5,21 @@
+ 
+ =head1 SYNOPSIS
+ 
+-B<idl2deb> [B<-d >I<opts>] [B<--dbopts=>I<opts>] [B<-e >I<address>] [B<--email=>I<address>] [-i I<idlfile>]
+-[--idl=I<idlfile>] [B<-h>] [B<--help>] [B<-n >I<name>] [B<--name=>I<name>] [B<-p>] [B<--preserve>] [B<-v>] [B<--version>]
+-
++B<idl2deb>
++S< [ B<-d> E<lt>optsE<gt> ]>
++S< [ B<--dbopts>=E<lt>optsE<gt> ]>
++S< [ B<-e> E<lt>addressE<gt> ]>
++S< [ B<--email>=E<lt>addressE<gt> ]>
++S< [ B<-h> ]>
++S< [ B<--help> ]>
++S< [ B<-i> E<lt>idlfileE<gt> ]>
++S< [ B<--idl>=E<lt>idlfileE<gt> ]>
++S< [ B<-n> E<lt>nameE<gt> ]>
++S< [ B<--name>=E<lt>nameE<gt> ]>
++S< [ B<-p> ]>
++S< [ B<--preserve> ]>
++S< [ B<-v> ]>
++S< [ B<--version> ]>
+ 
+ =head1 DESCRIPTION
+ 
+@@ -19,31 +31,31 @@
+ 
+ =over 4
+ 
+-=item B<-d>I<opts> B<--dbopts=>I<opts>
++=item -d E<lt>optsE<gt> --dbopts=E<lt>optsE<gt>
+ 
+ options for dpkg-buildpackage.
+ 
+-=item B<-e >I<address> B<--email=>I<address>
++=item -e E<lt>addressE<gt> --email=E<lt>addressE<gt>
+ 
+ use e-mail address.
+ 
+-=item B<-i >I<idlfile> B<--idl=>I<idlfile>
++=item -h --help
+ 
+-IDL file to use (mandatory)
++print help and exit.
+ 
+-=item B<-h> B<--help>
++=item -i E<lt>idlfileE<gt> --idl=E<lt>idlfileE<gt>
+ 
+-print help and exit.
++IDL file to use (mandatory)
+ 
+-=item B<-n >I<name> B<--name=>I<name>
++=item -n E<lt>nameE<gt> --name=E<lt>nameE<gt>
+ 
+ use user name.
+ 
+-=item B<-p> B<--preserve>
++=item -p --preserve
+ 
+ do not overwrite files.
+ 
+-=item B<-v> B<--version>
++=item -v --version
+ 
+ print version and exit.
+ 
+@@ -67,7 +79,7 @@
+ 
+ =head1 AUTHOR
+ 
+-B<W. Borgert> Author. 
++B<W. Borgert> Author.
+ 
+ =head1 COPYRIGHT
+ 
diff --git a/extra/wireshark/03_force_utf8_for_pod2man.patch b/extra/wireshark/03_force_utf8_for_pod2man.patch
new file mode 100644
index 000000000..ace641100
--- /dev/null
+++ b/extra/wireshark/03_force_utf8_for_pod2man.patch
@@ -0,0 +1,22 @@
+--- doc/Makefile.am	(revision 49837)
++++ doc/Makefile.am	(working copy)
+@@ -123,6 +123,7 @@ 
+ 	$(AM_V_POD2MAN)$(POD2MAN)                       \
+ 	--center="The Wireshark Network Analyzer"       \
+ 	--release=$(VERSION)                            \
++	--utf8                                          \
+ 	$< > $@
+ 
+ .pod.html: ../config.h $(top_srcdir)/docbook/ws.css
+--- doc/wireshark.pod.template	(revision 49837)
++++ doc/wireshark.pod.template	(working copy)
+@@ -1,4 +1,9 @@ 
++=begin man
++
++=encoding utf8
++
++=end man
+
+ =head1 NAME
+ 
+ wireshark - Interactively dump and analyze network traffic
diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD
index 4e7d51f14..3db3d41be 100644
--- a/extra/wireshark/PKGBUILD
+++ b/extra/wireshark/PKGBUILD
@@ -1,32 +1,43 @@
-# $Id: PKGBUILD 186024 2013-05-20 14:35:40Z guillaume $
+# $Id: PKGBUILD 188206 2013-06-12 20:04:04Z guillaume $
 # Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
 # Contributor: Florian Pritz <bluewind at jabber dot ccc dot de>
 pkgname=('wireshark-cli' 'wireshark-gtk')
 pkgbase=wireshark
-pkgver=1.8.7
-pkgrel=1
+pkgver=1.10.0
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
-makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls'
+makedepends=('bison' 'flex' 'gtk3' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls'
              'libgcrypt' 'lua51' 'python')
 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 \
       --prefix=/usr \
       --with-ssl \
       --with-zlib=yes \
-      --with-lua
+      --with-lua \
+      --with-gtk3=yes
   make all
 }
 
@@ -56,7 +67,7 @@ package_wireshark-cli() {
 
 package_wireshark-gtk() {
   pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - GTK frontend'
-  depends=('gtk2' 'wireshark-cli' 'desktop-file-utils' 'hicolor-icon-theme')
+  depends=('gtk3' 'wireshark-cli' 'desktop-file-utils' 'hicolor-icon-theme')
   install=wireshark-gtk.install
   replaces=(wireshark)
   conflicts=(wireshark)