summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libre/hexchat-libre/PKGBUILD8
-rw-r--r--libre/libquicktime-libre/PKGBUILD16
-rw-r--r--libre/linux-libre-tools/PKGBUILD4
-rw-r--r--libre/mplayer-libre/PKGBUILD30
-rw-r--r--libre/mplayer-libre/subreader-fix-srt-parsing.patch60
-rw-r--r--libre/xchat-libre/PKGBUILD16
6 files changed, 38 insertions, 96 deletions
diff --git a/libre/hexchat-libre/PKGBUILD b/libre/hexchat-libre/PKGBUILD
index bab6e70c5..a377c189c 100644
--- a/libre/hexchat-libre/PKGBUILD
+++ b/libre/hexchat-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: PKGBUILD 91125 2013-05-19 21:58:09Z alucryd $
# Maintainer: Maxime Gauduin <alucryd@gmail.com>
# Contributor: TingPing <tingping@tingping.se>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -6,8 +6,8 @@
_pkgname=hexchat
pkgname=hexchat-libre
pkgver=2.9.5
-pkgrel=4
-pkgdesc="A popular and easy to use graphical IRC (chat) client, without non-free browser reference (Parabola rebranded)"
+pkgrel=5
+pkgdesc="A popular and easy to use graphical IRC (chat) client, without nonfree browser reference (Parabola rebranded)"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.hexchat.org/"
license=('GPL')
@@ -34,7 +34,7 @@ build() {
# Rebrand to Parabola
sed -i -e 's#ArchLinux#Parabola GNU/Linux-libre#' plugins/sysinfo/parse.c
-# Remove non-free browser references
+# Remove nonfree browser references
patch -p1 -i "${srcdir}/remove-non-free-suggestion.patch"
patch -p1 -i "${srcdir}/no-firefox.patch"
diff --git a/libre/libquicktime-libre/PKGBUILD b/libre/libquicktime-libre/PKGBUILD
index b800c1444..81165b02d 100644
--- a/libre/libquicktime-libre/PKGBUILD
+++ b/libre/libquicktime-libre/PKGBUILD
@@ -1,18 +1,19 @@
-# $Id$
-# Maintainer: Mateusz Herych <heniekk@gmail.com>
+# $Id: PKGBUILD 91608 2013-05-25 11:33:59Z bpiotrowski $
+# Maintainer: Federico Cinelli <cinelli@aur.archlinux.org>
+# Maintainer: Mateusz Herych <heniekk@gmail.com>
# Contributor (Parabola): Jorge Lopez <jorginho@lavabit.com>
pkgname=libquicktime-libre
_pkgname=libquicktime
pkgver=1.2.4
-pkgrel=2
-pkgdesc="A library for reading and writing quicktime files (no unfree faac support)."
+pkgrel=6
+pkgdesc="A library for reading and writing quicktime files, without nonfree faac support"
arch=('i686' 'x86_64')
license=('GPL')
url="http://libquicktime.sourceforge.net/"
-depends=('gtk2' 'ffmpeg' 'libxv' 'libgl' 'libxaw' 'x264' 'faad2')
+depends=('gtk2' 'ffmpeg' 'libxv' 'libxaw' 'faad2')
options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/$_pkgname/$_pkgname-$pkgver.tar.gz)
+source=("http://downloads.sourceforge.net/sourceforge/$_pkgname/$_pkgname-$pkgver.tar.gz")
sha256sums=('1c53359c33b31347b4d7b00d3611463fe5e942cae3ec0fefe0d2fd413fd47368')
provides=("$_pkgname=$pkgver")
conflicts=($_pkgname)
@@ -29,7 +30,6 @@ build() {
}
package() {
- cd $srcdir/$_pkgname-$pkgver
+ cd "$srcdir/$_pkgname-$pkgver"
make DESTDIR="$pkgdir" install
}
-
diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD
index 394563806..85ba7dba7 100644
--- a/libre/linux-libre-tools/PKGBUILD
+++ b/libre/linux-libre-tools/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 90492 2013-05-12 22:55:40Z seblu $
+# $Id: PKGBUILD 91131 2013-05-19 23:48:35Z seblu $
# Maintainer: Sébastien Luttringer <seblu@archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -13,7 +13,7 @@ _basekernel=3.9
#_sublevel=6
_pkgver=$_basekernel.$_sublevel
pkgver=$_basekernel
-pkgrel=2
+pkgrel=3
license=('GPL2')
arch=('i686' 'x86_64' 'mips64el')
url='http://linux-libre.fsfla.org/'
diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD
index 73f1135e0..80fd3622d 100644
--- a/libre/mplayer-libre/PKGBUILD
+++ b/libre/mplayer-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 185551 2013-05-14 23:48:31Z foutrelis $
+# $Id: PKGBUILD 186432 2013-05-26 10:14:39Z foutrelis $
# Maintainer : Ionut Biru <ibiru@archlinux.org>
# Contributor: Hugo Doria <hugo@archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -7,32 +7,30 @@
_pkgbase=mplayer
pkgbase=mplayer-libre
pkgname=('mplayer-libre' 'mencoder-libre')
-pkgver=35920
-pkgrel=3
+pkgver=36285
+pkgrel=1
arch=('i686' 'x86_64')
makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient'
'aalib' 'jack' 'libcaca' 'x264' 'faad2' 'lirc-utils' 'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx'
'libpulse' 'fribidi' 'unzip' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray' 'libcdio-paranoia' 'subversion')
license=('GPL')
url="http://www.mplayerhq.hu/"
-options=(!buildflags !emptydirs)
-source=(ftp://ftp.archlinux.org/other/packages/$_pkgbase/$_pkgbase-$pkgver.tar.xz mplayer.desktop cdio-includes.patch subreader-fix-srt-parsing.patch)
-md5sums=('5f96e829d711e7d1ea65e324710dca50'
+options=('!buildflags' '!emptydirs')
+source=(ftp://ftp.archlinux.org/other/packages/$_pkgbase/$_pkgbase-$pkgver.tar.xz
+ mplayer.desktop
+ cdio-includes.patch)
+md5sums=('5e4f0d4d039b0219514cf52ae6da831d'
'c0d6ef795cf6de48e3b87ff7c23f0319'
- '7b5be7191aafbea64218dc4916343bbc'
- '7cb6019018a95dcc3d1231e1aaa8bbdb')
+ '7b5be7191aafbea64218dc4916343bbc')
prepare() {
- cd "$srcdir/$_pkgbase"
+ cd "$srcdir/$_pkgbase-$pkgver"
patch -Np0 -i ../cdio-includes.patch
-
- # http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2139
- patch -Np1 -i ../subreader-fix-srt-parsing.patch
}
build() {
- cd "$srcdir/$_pkgbase"
+ cd "$srcdir/$_pkgbase-$pkgver"
./configure --prefix=/usr \
--enable-runtime-cpudetection \
@@ -68,7 +66,7 @@ package_mplayer-libre() {
replaces=('mplayer')
conflicts=('mplayer')
- cd "$srcdir/$_pkgbase"
+ cd "$srcdir/$_pkgbase-pkgver"
make DESTDIR="$pkgdir" install-mplayer install-mplayer-man
install -Dm644 etc/{codecs.conf,input.conf,example.conf} "$pkgdir/etc/mplayer/"
@@ -88,7 +86,7 @@ package_mencoder-libre() {
replaces=('mencoder')
conflicts=('mencoder')
- cd "$srcdir/$_pkgbase"
+ cd "$srcdir/$_pkgbase-$pkgver"
make DESTDIR="$pkgdir" install-mencoder install-mencoder-man
- find "$pkgdir/usr/share/man" -name 'mplayer.1' -exec bash -c 'mv "$1" "${1/mplayer/mencoder}"' _ {} \;
+ find "$pkgdir/usr/share/man" -name mplayer.1 -exec rename mplayer.1 mencoder.1 {} +
}
diff --git a/libre/mplayer-libre/subreader-fix-srt-parsing.patch b/libre/mplayer-libre/subreader-fix-srt-parsing.patch
deleted file mode 100644
index 84f2de4d9..000000000
--- a/libre/mplayer-libre/subreader-fix-srt-parsing.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From d98e61ea438db66323734ad1b6bea66411a3c97b Mon Sep 17 00:00:00 2001
-From: wm4 <wm4@nowhere>
-Date: Tue, 30 Apr 2013 00:09:31 +0200
-Subject: [PATCH] subreader: fix out of bound write access when parsing .srt
-
-This broke .srt subtitles on gcc-4.8. The breakage was relatively
-subtle: it set all hour components to 0, while everything else was
-parsed successfully.
-
-But the problem is really that sscanf wrote 1 byte past the sep
-variable (or more, for invalid/specially prepared input). The %[..]
-format specifier is unbounded. Fix that by letting sscanf drop the
-parsed contents with "*", and also make it skip only one input
-character by adding "1" (=> "%*1[...").
-
-The out of bound write could easily lead to security issues.
-
-Also, this change makes .srt subtitle parsing slightly more strict.
-Strictly speaking this is an unrelated change, but do it anyway. It's
-more correct.
----
- sub/subreader.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
- (foutrelis: adjusted variable names in first hunk to apply to mplayer)
-
-diff --git a/sub/subreader.c b/sub/subreader.c
-index 23da4c7..0f1b6c9 100644
---- a/sub/subreader.c
-+++ b/sub/subreader.c
-@@ -386,14 +386,14 @@ static subtitle *sub_ass_read_line_subviewer(stream_t *st, subtitle *current,
- int h1, m1, s1, ms1, h2, m2, s2, ms2, j = 0;
-
- while (!current->text[0]) {
-- char line[LINE_LEN + 1], full_line[LINE_LEN + 1], sep;
-+ char line[LINE_LEN + 1], full_line[LINE_LEN + 1];
- int i;
-
- /* Parse SubRip header */
- if (!stream_read_line(st, line, LINE_LEN, utf16))
- return NULL;
-- if (sscanf(line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d",
-- &h1, &m1, &s1, &sep, &ms1, &h2, &m2, &s2, &sep, &ms2) < 10)
-+ if (sscanf(line, "%d:%d:%d%*1[,.:]%d --> %d:%d:%d%*1[,.:]%d",
-+ &h1, &m1, &s1, &ms1, &h2, &m2, &s2, &ms2) < 8)
- continue;
-
- current->start = a1 * 360000 + a2 * 6000 + a3 * 100 + a4 / 10;
-@@ -450,7 +450,7 @@ static subtitle *sub_read_line_subviewer(stream_t *st,subtitle *current,
- return sub_ass_read_line_subviewer(st, current, args);
- while (!current->text[0]) {
- if (!stream_read_line (st, line, LINE_LEN, utf16)) return NULL;
-- if ((len=sscanf (line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d",&a1,&a2,&a3,(char *)&i,&a4,&b1,&b2,&b3,(char *)&i,&b4)) < 10)
-+ if ((len=sscanf (line, "%d:%d:%d%*1[,.:]%d --> %d:%d:%d%*1[,.:]%d",&a1,&a2,&a3,&a4,&b1,&b2,&b3,&b4)) < 8)
- continue;
- current->start = a1*360000+a2*6000+a3*100+a4/10;
- current->end = b1*360000+b2*6000+b3*100+b4/10;
---
-1.8.1.6
-
diff --git a/libre/xchat-libre/PKGBUILD b/libre/xchat-libre/PKGBUILD
index e7805a9b4..cc50fb44c 100644
--- a/libre/xchat-libre/PKGBUILD
+++ b/libre/xchat-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 176357 2013-01-30 21:29:22Z eric $
+# $Id: PKGBUILD 186065 2013-05-20 20:17:32Z eric $
# Maintainer: Eric Bélanger <eric@archlinux.org>
# Maintainer (ConnochaetOS): Henry Jensen <hjensen@connochaetos.org>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -6,8 +6,8 @@
_pkgname=xchat
pkgname=xchat-libre
pkgver=2.8.8
-pkgrel=12
-pkgdesc="A GTK+ based IRC client without non-free browser reference"
+pkgrel=13
+pkgdesc="A GTK+ based IRC client, without nonfree browser reference"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.xchat.org/"
provides=("xchat=$pkgver")
@@ -35,14 +35,18 @@ sha1sums=('e12305da42d1aacc26c2ca25e239f393d4dd3532'
'e6a3b69ba333fc7ba0f70792d78d44fba7c4a911'
'20aef0ae608af6b30e1b4249f9c53830f8f514f6')
-build() {
- cd "${srcdir}/${_pkgname}-${pkgver}"
+prepare() {
+ cd ${_pkgname}-${pkgver}
sed -i 's/GDK_HAND1/GDK_HAND2/' src/fe-gtk/xtext.c
patch -p1 -i "${srcdir}/xchat-2.8.8-libnotify07.patch"
patch -p1 -i "${srcdir}/xchat-2.8.8-link-against-libnotify.patch"
patch -p1 -i "${srcdir}/xchat-2.8.8-glib-2.31.patch"
patch -p1 -i "${srcdir}/remove-non-free-suggestion.patch"
patch -p1 -i "${srcdir}/no-firefox.patch"
+}
+
+build() {
+ cd ${_pkgname}-${pkgver}
autoconf
autoheader
@@ -52,7 +56,7 @@ build() {
}
package() {
- cd "${srcdir}/${_pkgname}-${pkgver}"
+ cd ${_pkgname}-${pkgver}
make DESTDIR="${pkgdir}" install
for i in 24 32 48 64 128 256 ; do
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-09 11:27:28 +0000