From 3f6e6048fea3b61c4d0b2c1e7385bc76882007a4 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 10 Jun 2013 00:13:24 -0700 Subject: Mon Jun 10 00:13:23 PDT 2013 --- extra/gnome-bluetooth/PKGBUILD | 14 ++--- extra/vlc/PKGBUILD | 8 ++- extra/wireshark/01_fix_encoding_asn2deb_pod.patch | 77 +++++++++++++++++++++++ extra/wireshark/02_enable-version.diff | 11 ---- extra/wireshark/02_fix_encoding_idl2deb_pod.patch | 77 +++++++++++++++++++++++ extra/wireshark/03_force_utf8_for_pod2man.patch | 22 +++++++ extra/wireshark/PKGBUILD | 22 +++++-- 7 files changed, 205 insertions(+), 26 deletions(-) create mode 100644 extra/wireshark/01_fix_encoding_asn2deb_pod.patch delete mode 100644 extra/wireshark/02_enable-version.diff create mode 100644 extra/wireshark/02_fix_encoding_idl2deb_pod.patch create mode 100644 extra/wireshark/03_force_utf8_for_pod2man.patch (limited to 'extra') diff --git a/extra/gnome-bluetooth/PKGBUILD b/extra/gnome-bluetooth/PKGBUILD index 1972b6636..d21ac7547 100644 --- a/extra/gnome-bluetooth/PKGBUILD +++ b/extra/gnome-bluetooth/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 187115 2013-06-04 04:38:37Z heftig $ +# $Id: PKGBUILD 188094 2013-06-09 11:29:56Z heftig $ # Maintainer: Ionut Biru # Contributor: Roman Kyrylych pkgname=gnome-bluetooth pkgver=3.8.1 -pkgrel=1 +pkgrel=2 pkgdesc="The GNOME Bluetooth Subsystem" -arch=('i686' 'x86_64') +arch=(i686 x86_64) url="http://live.gnome.org/GnomeBluetooth" -license=('GPL' 'LGPL') -depends=('gtk3' 'hicolor-icon-theme' 'libnotify') -makedepends=('intltool' 'gobject-introspection' 'itstool' 'docbook-xsl') -options=('!libtool' '!emptydirs') +license=(GPL LGPL) +depends=(gtk3 hicolor-icon-theme libnotify bluez4) +makedepends=(intltool gobject-introspection itstool docbook-xsl) +options=(!libtool !emptydirs) install=gnome-bluetooth.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz 61-gnome-bluetooth-rfkill.rules) diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index b72b168b1..9667b9e7e 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 186492 2013-05-27 19:38:42Z giovanni $ +# $Id: PKGBUILD 188100 2013-06-09 13:12:36Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Sarah Hay # Contributor: Martin Sandsmark pkgname=vlc pkgver=2.0.7 -pkgrel=1 +pkgrel=2 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64') url="http://www.videolan.org/vlc/" @@ -65,6 +65,10 @@ build() { sed -i -e 's:truetype/freefont:TTF:g' modules/text_renderer/freetype.c sed -i -e 's:truetype/ttf-dejavu:TTF:g' modules/visualization/projectm.cpp + # fix for flac-1.3.0 + sed -i -e 's:stream_decoder.h:FLAC/stream_decoder.h:' modules/codec/flac.c + sed -i -e 's:stream_encoder.h:FLAC/stream_encoder.h:' modules/codec/flac.c + CFLAGS+="-I/usr/include/samba-4.0" CPPFLAGS+="-I/usr/include/samba-4.0" \ ./configure --prefix=/usr \ --sysconfdir=/etc \ 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 [-a I] [--asn=I] [B<-d >I] [B<--dbopts=>I] [B<-e >I
] +-[B<--email=>I
] [B<-h>] [B<--help>] [B<-n >I] [B<--name=>I] [B<-p>] [B<--preserve>] [B<-v>] [B<--version>] ++B ++S<[ B<-a> EASN.1 fileE ]> ++S<[ B<--asn>=EASN.1 fileE ]> ++S<[ B<-d> EoptsE ]> ++S<[ B<--dbopts>=EoptsE ]> ++S<[ B<-e> EaddressE ]> ++S<[ B<--email>=EaddressE ]> ++S<[ B<-h> ]> ++S<[ B<--help> ]> ++S<[ B<-n> EnameE ]> ++S<[ B<--name>=EnameE ]> ++S<[ B<-p> ]> ++S<[ B<--preserve> ]> ++S< [B<-v> ]> ++S<[ B<--version> ]> + + =head1 DESCRIPTION + +@@ -19,31 +32,31 @@ + + =over 4 + +-=item B<-a >I B<--asn=>I ++=item -a EASN.1 fileE --asn=EASN.1 fileE + + ASN.1 file to use (mandatory). + +-=item B<-d >I B<--dbopts=>I ++=item -d EoptsE --dbopts=EoptsE + + options for dpkg-buildpackage. + +-=item B<-e >I
B<--email=>I
++=item -e EaddressE --email=EaddressE + + use e-mail address. + +-=item B<-h> B<--help> ++=item -h --help + + print help and exit. + +-=item B<-n >I B<--name=>I ++=item -n EnameE --name=EnameE + + 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 Author. ++B 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 [B<-d >I] [B<--dbopts=>I] [B<-e >I
] [B<--email=>I
] [-i I] +-[--idl=I] [B<-h>] [B<--help>] [B<-n >I] [B<--name=>I] [B<-p>] [B<--preserve>] [B<-v>] [B<--version>] +- ++B ++S< [ B<-d> EoptsE ]> ++S< [ B<--dbopts>=EoptsE ]> ++S< [ B<-e> EaddressE ]> ++S< [ B<--email>=EaddressE ]> ++S< [ B<-h> ]> ++S< [ B<--help> ]> ++S< [ B<-i> EidlfileE ]> ++S< [ B<--idl>=EidlfileE ]> ++S< [ B<-n> EnameE ]> ++S< [ B<--name>=EnameE ]> ++S< [ B<-p> ]> ++S< [ B<--preserve> ]> ++S< [ B<-v> ]> ++S< [ B<--version> ]> + + =head1 DESCRIPTION + +@@ -19,31 +31,31 @@ + + =over 4 + +-=item B<-d>I B<--dbopts=>I ++=item -d EoptsE --dbopts=EoptsE + + options for dpkg-buildpackage. + +-=item B<-e >I
B<--email=>I
++=item -e EaddressE --email=EaddressE + + use e-mail address. + +-=item B<-i >I B<--idl=>I ++=item -h --help + +-IDL file to use (mandatory) ++print help and exit. + +-=item B<-h> B<--help> ++=item -i EidlfileE --idl=EidlfileE + +-print help and exit. ++IDL file to use (mandatory) + +-=item B<-n >I B<--name=>I ++=item -n EnameE --name=EnameE + + 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 Author. ++B 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 6692971ec..8a3f13e9e 100644 --- a/extra/wireshark/PKGBUILD +++ b/extra/wireshark/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186024 2013-05-20 14:35:40Z guillaume $ +# $Id: PKGBUILD 188105 2013-06-09 20:39:09Z guillaume $ # Maintainer: Guillaume ALAUX # Contributor: Florian Pritz 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 @@ makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls' 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 \ -- cgit v1.2.3-54-g00ecf