diff options
53 files changed, 1344 insertions, 233 deletions
diff --git a/community/consonance/PKGBUILD b/community/consonance/PKGBUILD index eb5159c90..f70d45618 100644 --- a/community/consonance/PKGBUILD +++ b/community/consonance/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 76320 2012-09-15 20:11:01Z jsteel $ +# $Id: PKGBUILD 82327 2013-01-15 11:34:58Z allan $ # Maintainer: Jonathan Steel <mail at jsteel dot org> # Contributor: Auguste Pop <auguste [at] gmail [dot] com> # Contributor: boenki <boenki at gmx dot de> @@ -6,23 +6,27 @@ pkgname=consonance pkgver=0.5.1 -pkgrel=9 +pkgrel=10 pkgdesc="A lightweight GTK+ music manager that aims to be fast, bloat-free and light on memory consumption" arch=('i686' 'x86_64') url="http://sites.google.com/site/consonancemanager" license=('GPL') -depends=('curl' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'libao' 'libcdio' - 'libmad' 'libmodplug' 'libnotify' 'libsndfile' 'sqlite3' 'taglib') +depends=('curl' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'libao' 'libmad' + 'libcdio-paranoia' 'libmodplug' 'libnotify' 'libsndfile' 'sqlite3' + 'taglib') install=$pkgname.install source=($url/releases-1/$pkgname-$pkgver.tar.gz - libnotify.patch) + libnotify.patch + cdio-includes.patch) md5sums=('2a195dd2314f7b65cc57cc871a4c5a47' - 'caa1e8b41723950fd926bfefccbbd8ac') + 'caa1e8b41723950fd926bfefccbbd8ac' + '239b451ba8795f8c287e994a7e32d859') build() { cd "$srcdir"/$pkgname-$pkgver patch -Np1 -i "$srcdir"/libnotify.patch + patch -Np1 -i "$srcdir"/cdio-includes.patch ./configure --prefix=/usr diff --git a/community/consonance/cdio-includes.patch b/community/consonance/cdio-includes.patch new file mode 100644 index 000000000..c570468b1 --- /dev/null +++ b/community/consonance/cdio-includes.patch @@ -0,0 +1,12 @@ +diff -upr consonance-0.5.1.orig/src/cdda.h consonance-0.5.1/src/cdda.h +--- consonance-0.5.1.orig/src/cdda.h 2013-01-14 05:14:54.000000000 +0200 ++++ consonance-0.5.1/src/cdda.h 2013-01-14 05:15:16.000000000 +0200 +@@ -18,7 +18,7 @@ + #ifndef CDDA_H + #define CDDA_H + +-#include <cdio/cdda.h> ++#include <cdio/paranoia/cdda.h> + #include <cdio/cd_types.h> + + struct con_cdda_decoder { diff --git a/community/deadbeef/PKGBUILD b/community/deadbeef/PKGBUILD index 7f0ec76b1..e47224768 100644 --- a/community/deadbeef/PKGBUILD +++ b/community/deadbeef/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 79601 2012-11-08 19:11:56Z lfleischer $ +# $Id: PKGBUILD 82328 2013-01-15 11:34:59Z allan $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Alexey Yakovenko <waker@users.sourceforge.net> pkgname=deadbeef pkgver=0.5.6 -pkgrel=1 +pkgrel=2 pkgdesc='An audio player for GNU/Linux based on GTK2.' arch=('i686' 'x86_64') url='http://deadbeef.sourceforge.net' diff --git a/community/gemrb/PKGBUILD b/community/gemrb/PKGBUILD new file mode 100644 index 000000000..4a2ea9180 --- /dev/null +++ b/community/gemrb/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 82325 2013-01-15 11:15:34Z stativ $ +# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> +pkgname=gemrb +pkgver=0.7.2 +pkgrel=2 +pkgdesc="OSS implementation of Bioware's Infinity Engine which supports eg. Baldur's Gate" +arch=('i686' 'x86_64') +url="http://www.gemrb.org/" +license=('GPL') +depends=('python2' 'openal' 'libpng' 'sdl_mixer') +# optionally it is possible to build vlc plugin too +makedepends=('cmake') +install=gemrb.install +options=('!libtool') +source=("http://downloads.sourceforge.net/sourceforge/gemrb/$pkgname-$pkgver.tar.gz") +md5sums=('4260fcd42f42ce9232668b202b320b29') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + if [ ! -d "$srcdir/build" ] ; then + mkdir "$srcdir/build" + fi + cd "$srcdir/build" + + cmake -DCMAKE_INSTALL_PREFIX=/usr ../$pkgname-$pkgver + make +} + +package() { + cd "$srcdir"/build + make DESTDIR="$pkgdir" install +} + diff --git a/community/gemrb/gemrb.install b/community/gemrb/gemrb.install new file mode 100644 index 000000000..43ea46f2c --- /dev/null +++ b/community/gemrb/gemrb.install @@ -0,0 +1,24 @@ +post_install() { + cat << EOF + +Installing the games +-------------------- + 1. Install the game(s) (eg using wine or Unshield) + 2. Copy /etc/gemrb/GemRB.cfg.sample to ~/.gemrb/gemrb.cfg or to /etc/gemrb/gemrb.cfg + 3. Edit gemrb.cfg, mainly to set up the path to the game's data files. It is crucial to get this right. + 4. Now You can start the game by executing "gemrb" at the command line prompt + +EOF + +gtk-update-icon-cache -f /usr/share/icons/hicolor/ +} + +post_upgrade() { + post_install +} + +post_remove() { + echo "Don't forget to remove game data files." + post_install +} + diff --git a/community/gmerlin-avdecoder/PKGBUILD b/community/gmerlin-avdecoder/PKGBUILD index 9552e8e0d..cc0981f3c 100644 --- a/community/gmerlin-avdecoder/PKGBUILD +++ b/community/gmerlin-avdecoder/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 76151 2012-09-12 05:56:57Z ebelanger $ +# $Id: PKGBUILD 82330 2013-01-15 11:35:00Z allan $ # Maintainer: Mateusz Herych <heniekk@gmail.com> pkgname=gmerlin-avdecoder pkgver=1.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="Media decoding library" arch=('i686' 'x86_64') url="http://gmerlin.sourceforge.net/avdec_frame.html" diff --git a/community/gmerlin/PKGBUILD b/community/gmerlin/PKGBUILD index 84b919bc2..6abb45988 100644 --- a/community/gmerlin/PKGBUILD +++ b/community/gmerlin/PKGBUILD @@ -1,28 +1,33 @@ -# $Id: PKGBUILD 76142 2012-09-12 05:13:57Z ebelanger $ +# $Id: PKGBUILD 82329 2013-01-15 11:35:00Z allan $ # Maintainer: Mateusz Herych <heniekk@gmail.com> pkgname=gmerlin pkgver=1.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="Multimedia architecture for Linux" arch=('i686' 'x86_64') url="http://openmovieeditor.sourceforge.net/HomePage" license=('GPL') -depends=('gavl' 'libxml2' 'gtk2' 'libxv' 'libvisual' 'libcdio>=0.82' 'musicbrainz' 'mjpegtools' 'hicolor-icon-theme' 'libgl') +depends=('gavl' 'libxml2' 'gtk2' 'libxv' 'libvisual' 'libcdio-paranoia' + 'musicbrainz' 'mjpegtools' 'hicolor-icon-theme' 'libgl') makedepends=('alsa-lib' 'jack' 'libquicktime' 'pulseaudio' 'v4l-utils' 'mesa') optdepends=('alsa-lib: for ALSA support' 'jack: for JACK support' 'libquicktime: for movie encoding' 'pulseaudio: for PulseAudio support' 'v4l-utils: for video conversion') -options=('!libtool' '!makeflags') +options=('!libtool') install=gmerlin.install -source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('2f2a0880e738e71486f04c929ba067f4') +source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz + cdio-api-fixes.patch) +md5sums=('2f2a0880e738e71486f04c929ba067f4' + 'd0e407f01435394a0cfe04acb3c1a4cc') build() { cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i "$srcdir/cdio-api-fixes.patch" + rm -rf cpuinfo.sh ./configure --prefix=/usr --without-doxygen diff --git a/community/gmerlin/cdio-api-fixes.patch b/community/gmerlin/cdio-api-fixes.patch new file mode 100644 index 000000000..14c934b16 --- /dev/null +++ b/community/gmerlin/cdio-api-fixes.patch @@ -0,0 +1,104 @@ +diff -upr gmerlin-1.2.0.orig/plugins/cdaudio/cdparanoia.c gmerlin-1.2.0/plugins/cdaudio/cdparanoia.c +--- gmerlin-1.2.0.orig/plugins/cdaudio/cdparanoia.c 2013-01-10 21:16:27.000000000 +0200 ++++ gmerlin-1.2.0/plugins/cdaudio/cdparanoia.c 2013-01-10 21:25:59.000000000 +0200 +@@ -28,8 +28,8 @@ + + #include "cdaudio.h" + #define DO_NOT_WANT_PARANOIA_COMPATIBILITY +-#include <cdio/cdda.h> +-#include <cdio/paranoia.h> ++#include <cdio/paranoia/cdda.h> ++#include <cdio/paranoia/paranoia.h> + + /* + * Ripping support +diff -upr gmerlin-1.2.0.orig/plugins/cdaudio/cdtext.c gmerlin-1.2.0/plugins/cdaudio/cdtext.c +--- gmerlin-1.2.0.orig/plugins/cdaudio/cdtext.c 2013-01-10 21:16:27.000000000 +0200 ++++ gmerlin-1.2.0/plugins/cdaudio/cdtext.c 2013-01-10 21:25:27.000000000 +0200 +@@ -34,7 +34,7 @@ + #include "cdaudio.h" + + #define GET_FIELD(dst, key) \ +- field = cdtext_get_const(key, cdtext); ++ field = cdtext_get_const(cdtext, key, i+1); + + #define GET_FIELD_DEFAULT(dst,key) \ + field = cdtext_get_const(key, cdtext); \ +@@ -64,30 +64,26 @@ int bg_cdaudio_get_metadata_cdtext(CdIo_ + + /* Get information for the whole disc */ + +- cdtext = cdio_get_cdtext (cdio, 0); ++ cdtext = cdio_get_cdtext (cdio); + + if(!cdtext) + return 0; + +- artist = cdtext_get_const(CDTEXT_PERFORMER, cdtext); +- author = cdtext_get_const(CDTEXT_COMPOSER, cdtext); /* Composer overwrites songwriter */ ++ artist = cdtext_get_const(cdtext, CDTEXT_FIELD_PERFORMER, 0); ++ author = cdtext_get_const(cdtext, CDTEXT_FIELD_COMPOSER, 0); /* Composer overwrites songwriter */ + + if(!author) +- author = cdtext_get_const(CDTEXT_SONGWRITER, cdtext); ++ author = cdtext_get_const(cdtext, CDTEXT_FIELD_SONGWRITER, 0); + +- album = cdtext_get_const(CDTEXT_TITLE, cdtext); +- genre = cdtext_get_const(CDTEXT_GENRE, cdtext); +- comment = cdtext_get_const(CDTEXT_MESSAGE, cdtext); ++ album = cdtext_get_const(cdtext, CDTEXT_FIELD_TITLE, 0); ++ genre = cdtext_get_const(cdtext, CDTEXT_FIELD_GENRE, 0); ++ comment = cdtext_get_const(cdtext, CDTEXT_FIELD_MESSAGE, 0); + + for(i = 0; i < idx->num_tracks; i++) + { + if(idx->tracks[i].is_audio) + { +- cdtext = cdio_get_cdtext (cdio, i+1); +- if(!cdtext) +- return 0; +- +- GET_FIELD(title, CDTEXT_TITLE); ++ GET_FIELD(title, CDTEXT_FIELD_TITLE); + + if(!title) + return 0; +@@ -95,7 +91,7 @@ int bg_cdaudio_get_metadata_cdtext(CdIo_ + gavl_metadata_set(&info[idx->tracks[i].index].metadata, + GAVL_META_TITLE, title); + +- if((field = cdtext_get_const(CDTEXT_PERFORMER, cdtext))) ++ if((field = cdtext_get_const(cdtext, CDTEXT_FIELD_PERFORMER, i+1))) + gavl_metadata_set(&info[idx->tracks[i].index].metadata, + GAVL_META_ARTIST, field); + else +@@ -103,10 +99,10 @@ int bg_cdaudio_get_metadata_cdtext(CdIo_ + GAVL_META_ARTIST, artist); + + +- if((field = cdtext_get_const(CDTEXT_COMPOSER, cdtext))) ++ if((field = cdtext_get_const(cdtext, CDTEXT_FIELD_COMPOSER, i+1))) + gavl_metadata_set(&info[idx->tracks[i].index].metadata, + GAVL_META_AUTHOR, field); +- else if((field = cdtext_get_const(CDTEXT_SONGWRITER, cdtext))) ++ else if((field = cdtext_get_const(cdtext, CDTEXT_FIELD_SONGWRITER, i+1))) + gavl_metadata_set(&info[idx->tracks[i].index].metadata, + GAVL_META_AUTHOR, field); + else if(author) +@@ -114,14 +110,14 @@ int bg_cdaudio_get_metadata_cdtext(CdIo_ + GAVL_META_AUTHOR, author); + + +- if((field = cdtext_get_const(CDTEXT_GENRE, cdtext))) ++ if((field = cdtext_get_const(cdtext, CDTEXT_FIELD_GENRE, i+1))) + gavl_metadata_set(&info[idx->tracks[i].index].metadata, + GAVL_META_GENRE, field); + else + gavl_metadata_set(&info[idx->tracks[i].index].metadata, + GAVL_META_GENRE, genre); + +- if((field = cdtext_get_const(CDTEXT_MESSAGE, cdtext))) ++ if((field = cdtext_get_const(cdtext, CDTEXT_FIELD_MESSAGE, i+1))) + gavl_metadata_set(&info[idx->tracks[i].index].metadata, + GAVL_META_COMMENT, field); + else diff --git a/community/mednafen/PKGBUILD b/community/mednafen/PKGBUILD index 802249f21..45e3fbb2e 100644 --- a/community/mednafen/PKGBUILD +++ b/community/mednafen/PKGBUILD @@ -1,16 +1,18 @@ -# Maintainer: Angel Velasquez <angvp@archlinux.org> +# $Id: PKGBUILD 82331 2013-01-15 11:35:02Z allan $ +# Maintainer: Jonathan Steel <mail at jsteel dot org> +# Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Daenyth <Daenyth+Arch [at] gmail [dot] com> # Contributor: kagan <juanynie@mi.madritel.es> pkgname=mednafen pkgver=0.8.D.3 -pkgrel=2 +pkgrel=3 pkgdesc="A command-line multi-system gaming emulator" url="http://mednafen.sourceforge.net/" license=('GPL') arch=('i686' 'x86_64') depends=('libcdio' 'libsamplerate' 'libogg' 'libvorbis' 'sdl' 'sdl_net' 'libsndfile' 'zlib') -makedepends=('pkgconfig' 'mesa') +makedepends=('pkgconfig' 'mesa' 'glu') changelog=ChangeLog source=(http://downloads.sourceforge.net/mednafen/$pkgname-$pkgver.tar.bz2 mednafen-0.8.13.3-zlib-1.2.6.patch) diff --git a/community/mplayer2/PKGBUILD b/community/mplayer2/PKGBUILD index dba41dccd..6a929a08e 100644 --- a/community/mplayer2/PKGBUILD +++ b/community/mplayer2/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 81010 2012-12-09 18:03:32Z bpiotrowski $ +# $Id: PKGBUILD 82332 2013-01-15 11:35:04Z allan $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Martin Panter <vadmium+aur@gmail.com> # Contributor: Stéphane Gaudreault <stephane@archlinux.org> pkgname=mplayer2 pkgver=20121128 -pkgrel=1 +pkgrel=2 pkgdesc='Advanced general-purpose media player. A fork of the original MPlayer project' arch=('i686' 'x86_64') license=('GPL') url="http://www.mplayer2.org/" install=$pkgname.install depends=('a52dec' 'aalib' 'cdparanoia' 'desktop-file-utils' 'enca' 'faad2' 'ffmpeg' 'fontconfig' - 'freetype2' 'jack' 'ladspa' 'lame' 'libass' 'libbluray' 'libcaca' 'libcdio' 'libdca' 'libdvdcss' + 'freetype2' 'jack' 'ladspa' 'lame' 'libass' 'libbluray' 'libcaca' 'libcdio-paranoia' 'libdca' 'libdvdcss' 'libdvdnav' 'libdvdread' 'libgl' 'libjpeg' 'libmad' 'libpulse' 'libquvi' 'libtheora' 'libvdpau' 'libxinerama' 'libxss' 'libxv' 'libxxf86dga' 'libxxf86vm' 'lirc-utils' 'mpg123' 'ncurses' 'sdl' 'ttf-dejavu') makedepends=('mesa' 'unzip' 'yasm' 'python' 'python-docutils') @@ -20,8 +20,10 @@ backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') provides=('mplayer') conflicts=('mplayer') options=(!emptydirs) -source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.xz) -md5sums=('696adb2503b2202fe39de6c98b573cd6') +source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.xz + cdio-api-fixes.patch) +md5sums=('696adb2503b2202fe39de6c98b573cd6' + '5ff5fa9d0fd50239ed3a1756b31e6a9d') build() { cd $srcdir/$pkgname-$pkgver @@ -29,6 +31,8 @@ build() { sed 's/gmplayer/mplayer/g' -i etc/mplayer.desktop find -type f -exec sed -e 's/python3/python/' -i {} \; + patch -Np1 -i $srcdir/cdio-api-fixes.patch + ./configure --prefix=/usr --confdir=/etc/mplayer \ --enable-translation --language=all \ --enable-runtime-cpudetection \ diff --git a/community/mplayer2/cdio-api-fixes.patch b/community/mplayer2/cdio-api-fixes.patch new file mode 100644 index 000000000..eeb9f0589 --- /dev/null +++ b/community/mplayer2/cdio-api-fixes.patch @@ -0,0 +1,50 @@ +diff -upr mplayer2-20121128.orig/stream/stream_cdda.c mplayer2-20121128/stream/stream_cdda.c +--- mplayer2-20121128.orig/stream/stream_cdda.c 2013-01-10 19:37:31.000000000 +0200 ++++ mplayer2-20121128/stream/stream_cdda.c 2013-01-10 20:23:25.000000000 +0200 +@@ -17,8 +17,8 @@ + */ + + #include "config.h" +-#include <cdio/cdda.h> +-#include <cdio/paranoia.h> ++#include <cdio/paranoia/cdda.h> ++#include <cdio/paranoia/paranoia.h> + #include <cdio/cdio.h> + + #include <stdio.h> +@@ -116,25 +116,25 @@ const m_option_t cdda_opts[] = { + }; + + static const char *cdtext_name[] = { +- [CDTEXT_ARRANGER] = "Arranger", +- [CDTEXT_COMPOSER] = "Composer", +- [CDTEXT_MESSAGE] = "Message", +- [CDTEXT_ISRC] = "ISRC", +- [CDTEXT_PERFORMER] = "Performer", +- [CDTEXT_SONGWRITER] = "Songwriter", +- [CDTEXT_TITLE] = "Title", +- [CDTEXT_UPC_EAN] = "UPC_EAN", ++ [CDTEXT_FIELD_ARRANGER] = "Arranger", ++ [CDTEXT_FIELD_COMPOSER] = "Composer", ++ [CDTEXT_FIELD_MESSAGE] = "Message", ++ [CDTEXT_FIELD_ISRC] = "ISRC", ++ [CDTEXT_FIELD_PERFORMER] = "Performer", ++ [CDTEXT_FIELD_SONGWRITER] = "Songwriter", ++ [CDTEXT_FIELD_TITLE] = "Title", ++ [CDTEXT_FIELD_UPC_EAN] = "UPC_EAN", + }; + + static bool print_cdtext(stream_t *s, int track) + { + cdda_priv* p = (cdda_priv*)s->priv; +- cdtext_t *text = cdio_get_cdtext(p->cd->p_cdio, track); ++ cdtext_t *text = cdio_get_cdtext(p->cd->p_cdio); + if (text) { + mp_msg(MSGT_SEEK, MSGL_INFO, "CD-Text (%s):\n", track ? "track" : "CD"); + for (int i = 0; i < sizeof(cdtext_name) / sizeof(cdtext_name[0]); i++) { + const char *name = cdtext_name[i]; +- const char *value = cdtext_get_const(i, text); ++ const char *value = cdtext_get_const(text, i, track); + if (name && value) + mp_msg(MSGT_SEEK, MSGL_INFO, " %s: '%s'\n", name, value); + } diff --git a/community/mythplugins/PKGBUILD b/community/mythplugins/PKGBUILD index 70ca80682..7eb180b74 100644 --- a/community/mythplugins/PKGBUILD +++ b/community/mythplugins/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 77158 2012-10-05 23:55:11Z jconder $ +# $Id: PKGBUILD 82334 2013-01-15 11:35:06Z allan $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> @@ -14,19 +14,22 @@ pkgname=('mythplugins-mytharchive' 'mythplugins-mythweb' 'mythplugins-mythzoneminder') pkgver=0.26.0 -pkgrel=1 +pkgrel=2 epoch=1 arch=('i686' 'x86_64') url="http://www.mythtv.org" license=('GPL') makedepends=('cdrkit' 'dvdauthor' 'dvd+rw-tools' 'ffmpeg' 'flac' 'libexif' - 'libvorbis' 'mplayer' 'mythtv' 'perl-datetime-format-iso8601' - 'perl-date-manip' 'perl-image-size' 'perl-json' 'perl-libwww' - 'perl-soap-lite' 'perl-xml-sax' 'perl-xml-simple' 'perl-xml-xpath' - 'python2-oauth' 'python-imaging' 'python2-pycurl' 'taglib' 'zlib') + 'libvorbis' 'mesa' 'mplayer' 'mythtv' + 'perl-datetime-format-iso8601' 'perl-date-manip' 'perl-image-size' + 'perl-json' 'perl-libwww' 'perl-soap-lite' 'perl-xml-sax' + 'perl-xml-simple' 'perl-xml-xpath' 'python2-oauth' 'python-imaging' + 'python2-pycurl' 'taglib' 'zlib') source=("ftp://ftp.osuosl.org/pub/mythtv/$pkgbase-$pkgver.tar.bz2" + 'cdparanoia.patch' 'mtd.rc') md5sums=('15bd7b2f4173488966f3d761e0eacffa' + '5de8dd79d0b8a2b006f3c3258938b6b7' '476c12ba074794ad7f4ae092bdf949d6') build() { @@ -36,6 +39,8 @@ build() { sed -re 's@/usr/local.*/usr/share@/usr/share@' -i 'mythweb/mythweb.php' sed -re 's@cstdio@cstdio>\n#include <unistd.h@' -i 'mythzoneminder/mythzmserver/zmserver.cpp' + patch -Np1 -i "$srcdir/cdparanoia.patch" + ./configure --prefix=/usr \ --enable-all \ --python=python2 @@ -78,7 +83,7 @@ package_mythplugins-mythgame() { package_mythplugins-mythmusic() { pkgdesc="Music playing plugin for MythTV" - depends=('mythtv' 'taglib') + depends=('mythtv' 'libcdio-paranoia' 'taglib') cd "$srcdir/$pkgbase-$pkgver/mythmusic" make INSTALL_ROOT="$pkgdir" install diff --git a/community/mythplugins/cdparanoia.patch b/community/mythplugins/cdparanoia.patch new file mode 100644 index 000000000..b4d1449d5 --- /dev/null +++ b/community/mythplugins/cdparanoia.patch @@ -0,0 +1,52 @@ +diff -Nru a/configure b/configure +--- a/configure 2012-10-02 23:30:24.000000000 +1300 ++++ b/configure 2013-01-09 14:54:40.448916370 +1300 +@@ -649,7 +649,7 @@ + echo "MythMusic requires FLAC." + fi + +- if ! check_lib cdio/cdio.h cdio_open -lcdio || ! check_lib cdio/cdda.h cdio_cddap_open -lcdio_cdda || ! check_lib cdio/paranoia.h cdio_paranoia_init -lcdio_paranoia ; then ++ if ! check_lib cdio/cdio.h cdio_open -lcdio || ! check_lib cdio/paranoia/cdda.h cdio_cddap_open -lcdio_cdda || ! check_lib cdio/paranoia/paranoia.h cdio_paranoia_init -lcdio_paranoia ; then + disable cdio + fi + +diff -Nru a/mythmusic/mythmusic/cddecoder.cpp b/mythmusic/mythmusic/cddecoder.cpp +--- a/mythmusic/mythmusic/cddecoder.cpp 2012-10-02 23:30:24.000000000 +1300 ++++ b/mythmusic/mythmusic/cddecoder.cpp 2013-01-09 14:53:37.031690618 +1300 +@@ -14,7 +14,7 @@ + #include <QString> + + // libcdio +-#include <cdio/cdda.h> ++#include <cdio/paranoia/cdda.h> + #include <cdio/logging.h> + + // MythTV +diff -Nru a/mythmusic/mythmusic/cddecoder.h b/mythmusic/mythmusic/cddecoder.h +--- a/mythmusic/mythmusic/cddecoder.h 2012-10-02 23:30:24.000000000 +1300 ++++ b/mythmusic/mythmusic/cddecoder.h 2013-01-09 14:53:12.328140979 +1300 +@@ -11,8 +11,8 @@ + #endif + + #ifdef HAVE_CDIO +-# include <cdio/cdda.h> +-# include <cdio/paranoia.h> ++# include <cdio/paranoia/cdda.h> ++# include <cdio/paranoia/paranoia.h> + #endif + + class Metadata; +diff -Nru a/mythmusic/mythmusic/cdrip.cpp b/mythmusic/mythmusic/cdrip.cpp +--- a/mythmusic/mythmusic/cdrip.cpp 2012-10-02 23:30:24.000000000 +1300 ++++ b/mythmusic/mythmusic/cdrip.cpp 2013-01-09 14:54:11.815330268 +1300 +@@ -8,8 +8,8 @@ + + #include "config.h" + #ifdef HAVE_CDIO +-# include <cdio/cdda.h> +-# include <cdio/paranoia.h> ++# include <cdio/paranoia/cdda.h> ++# include <cdio/paranoia/paranoia.h> + #endif //def HAVE_CDIO + + // C++ includes diff --git a/community/ncrack/PKGBUILD b/community/ncrack/PKGBUILD new file mode 100644 index 000000000..09e369a4d --- /dev/null +++ b/community/ncrack/PKGBUILD @@ -0,0 +1,25 @@ +# Maintainer: Daniel Micay <daneilmicay@gmail.com> +# Contributor: mickael9 <mickael9 at gmail dot com> + +pkgname=ncrack +pkgver=0.4a +_realver=0.4ALPHA +pkgrel=2 +pkgdesc='A high-speed network authentication cracking tool' +arch=(i686 x86_64) +url='http://nmap.org/ncrack/' +license=(GPL) +depends=(openssl) +source=("http://nmap.org/ncrack/dist/ncrack-${_realver}.tar.gz") +md5sums=('db9be165469c04650ddc7403b29eb472') + +build() { + cd "$srcdir/$pkgname-${_realver}" + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-${_realver}" + make install DESTDIR="$pkgdir" +} diff --git a/community/pragha/PKGBUILD b/community/pragha/PKGBUILD index ea590746b..10f1bfd2b 100644 --- a/community/pragha/PKGBUILD +++ b/community/pragha/PKGBUILD @@ -1,27 +1,32 @@ -# $Id: PKGBUILD 75419 2012-08-22 19:34:43Z ttopper $ +# $Id: PKGBUILD 82336 2013-01-15 11:35:08Z allan $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: Alois Nespor <alois.nespor@gmail.com> # Contributor: JerichoKru <jerichokru(AT)htomail.com> pkgname=pragha pkgver=1.1.1 -pkgrel=1 +pkgrel=2 pkgdesc="A lightweight GTK+ music manager - fork of Consonance Music Manager." arch=('i686' 'x86_64') url="http://pragha.wikispaces.com/" license=('GPL3') -depends=('libnotify' 'libcdio' 'gstreamer0.10-base' +depends=('libnotify' 'libcdio-paranoia' 'gstreamer0.10-base' 'taglib' 'hicolor-icon-theme' 'gtk2' 'dbus-glib' 'sqlite' 'desktop-file-utils' 'libclastfm') optdepends=('notification-daemon: OSD notification') replaces=('dissonance') install=pragha.install -source=("https://github.com/downloads/matiasdelellis/pragha/$pkgname-$pkgver.tar.bz2") -sha1sums=('a7b839df5799263f870ea65a7f272015e24637e9') +source=("https://github.com/downloads/matiasdelellis/pragha/$pkgname-$pkgver.tar.bz2" + cdio-includes.patch) +sha1sums=('a7b839df5799263f870ea65a7f272015e24637e9' + '05a2e007800dc5395a0bb7f026ec7e388cd9488c') build() { cd "$srcdir/$pkgname-$pkgver" + + patch -Np1 -i "$srcdir/cdio-includes.patch" + LIBS+="-ldbus-glib-1" ./configure --prefix=/usr make } @@ -29,7 +34,7 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir/" install - + install -m 644 "data/$pkgname.desktop" "$pkgdir/usr/share/applications" install -d "$pkgdir/usr/share/pixmaps" install -m 644 "data/$pkgname.png" "$pkgdir/usr/share/pixmaps/" diff --git a/community/pragha/cdio-includes.patch b/community/pragha/cdio-includes.patch new file mode 100644 index 000000000..9f93044d1 --- /dev/null +++ b/community/pragha/cdio-includes.patch @@ -0,0 +1,12 @@ +diff -upr pragha-1.1.1.orig/src/cdda.h pragha-1.1.1/src/cdda.h +--- pragha-1.1.1.orig/src/cdda.h 2013-01-14 04:58:09.000000000 +0200 ++++ pragha-1.1.1/src/cdda.h 2013-01-14 04:58:52.000000000 +0200 +@@ -21,7 +21,7 @@ + + #include <glib.h> + +-#include <cdio/cdda.h> ++#include <cdio/paranoia/cdda.h> + #include <cdio/cd_types.h> + #ifdef __CDIO_CONFIG_H__ + #include <cdio/cdio_unconfig.h> diff --git a/community/python2-pytables/PKGBUILD b/community/python2-pytables/PKGBUILD index 38eecfb91..52bdee71f 100644 --- a/community/python2-pytables/PKGBUILD +++ b/community/python2-pytables/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 76245 2012-09-15 08:49:57Z aginiewicz $ +# $Id: PKGBUILD 82342 2013-01-15 16:56:55Z aginiewicz $ # Maintainer: Andrzej Giniewicz <gginiu@gmail.com> # Contributor: Sebastien Binet <binet@cern.ch> pkgname=python2-pytables pkgver=2.4.0 -pkgrel=2 +pkgrel=3 arch=("i686" "x86_64") pkgdesc="PyTables is a package for managing hierarchical datasets and designed to efficiently and easily cope with extremely large amounts of data" url="http://www.pytables.org" diff --git a/community/qmmp/PKGBUILD b/community/qmmp/PKGBUILD index b8e2a1338..3b45257bf 100644 --- a/community/qmmp/PKGBUILD +++ b/community/qmmp/PKGBUILD @@ -1,15 +1,15 @@ -#$Id: PKGBUILD 82244 2013-01-13 12:33:54Z jlichtblau $ +#$Id: PKGBUILD 82337 2013-01-15 11:35:09Z allan $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=qmmp pkgver=0.6.6 -pkgrel=1 +pkgrel=2 pkgdesc="Qt4 based audio-player" arch=('i686' 'x86_64') url="http://qmmp.ylsoftware.com/" license=('GPL') depends=('alsa-lib' 'curl' 'hicolor-icon-theme' 'libmad' 'libvorbis' 'libogg' 'qt' 'taglib' 'xdg-utils') -makedepends=('cmake' 'flac' 'jack' 'libmpcdec' 'pulseaudio' 'ffmpeg' 'libcdio' 'libcddb' 'libmms' 'libsamplerate' 'libmodplug' 'libsndfile' 'wavpack' 'projectm' 'mesa') +makedepends=('cmake' 'flac' 'jack' 'libmpcdec' 'pulseaudio' 'ffmpeg' 'libcdio-paranoia' 'libcddb' 'libmms' 'libsamplerate' 'libmodplug' 'libsndfile' 'wavpack' 'projectm' 'mesa') optdepends=('flac: native FLAC support' 'jack: JACK sound output' 'libmpcdec: Musepack support' @@ -30,7 +30,7 @@ sha256sums=('dfa973cca80c020a85a11bb66701a3804f9fde326440abb179559c98bf3b5b99' build() { cd ${srcdir}/$pkgname-$pkgver -#patch -Np1 -i ${srcdir}/cdio-includes.patch + patch -Np1 -i ${srcdir}/cdio-includes.patch cmake . -DCMAKE_INSTALL_PREFIX=/usr make diff --git a/community/qmmp/qmmp.changelog b/community/qmmp/qmmp.changelog index 7a4a521d6..83a1d07a0 100644 --- a/community/qmmp/qmmp.changelog +++ b/community/qmmp/qmmp.changelog @@ -1,4 +1,7 @@ 2013-01-13 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * qmmp 0.6.6-2 libcdio/libcdio-paranoia rebuild + +2013-01-13 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * qmmp 0.6.6-1 2013-01-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> diff --git a/community/solfege/PKGBUILD b/community/solfege/PKGBUILD index 2b8624278..7fe94a67c 100644 --- a/community/solfege/PKGBUILD +++ b/community/solfege/PKGBUILD @@ -1,12 +1,11 @@ -# $Id: PKGBUILD 74889 2012-08-08 19:20:31Z giovanni $ +# $Id: PKGBUILD 82340 2013-01-15 15:31:26Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Corrado Primier <bardo@aur.archlinux.org> # Contributor: sickhate <sickhate@tux-linux.net> -# TODO: -# bring in pyalsa, csound, mma +# TODO: bring in pyalsa, csound, mma pkgname=solfege -pkgver=3.20.6 +pkgver=3.20.8 pkgrel=1 pkgdesc="Music education and ear training software" arch=('i686' 'x86_64') @@ -22,7 +21,7 @@ optdepends=('timidity++: or any MIDI player & MIDI-WAV converter' 'lilypond: for generating print-outs & score sheets' 'texlive-bin: use LaTeX to replace HTML reports with DVI') source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('078e3bb06df0355e8ed53ee633ed3abd') +md5sums=('401f421bde27112d7fa01aaccc080a95') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/xbmc/PKGBUILD b/community/xbmc/PKGBUILD index eb99ea59c..68aa6f7ed 100644 --- a/community/xbmc/PKGBUILD +++ b/community/xbmc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 79508 2012-11-06 11:41:31Z spupykin $ +# $Id: PKGBUILD 82338 2013-01-15 11:35:10Z allan $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com> @@ -9,7 +9,7 @@ _prefix=/usr pkgname=xbmc pkgver=11.0 -pkgrel=13 +pkgrel=14 pkgdesc="A software media player and entertainment hub for digital media" arch=('i686' 'x86_64') url="http://xbmc.org" @@ -32,13 +32,11 @@ optdepends=('libcec: support for Pulse-Eight USB-CEC adapter' 'xorg-xinit: autostart xbmc') install="${pkgname}.install" source=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz" - "xbmc.service") -sha256sums=('1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19' - '82ebca3d66155f889a3d70311b000ac8b911b062af8df308d6a86aecc6b1b52b') -sha256sums=('1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19' - '82ebca3d66155f889a3d70311b000ac8b911b062af8df308d6a86aecc6b1b52b') -sha256sums=('1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19' - '82ebca3d66155f889a3d70311b000ac8b911b062af8df308d6a86aecc6b1b52b') + "xbmc.service" + "cdio.patch") +md5sums=('9e8a26ee25173c7268abea7f1d82d428' + '76fae229ebc3bcfaab7e7f27e4fb51f5' + '49c0a7cbfca3666a24e8824950bd371b') build() { cd "${srcdir}/xbmc-$pkgver" @@ -46,6 +44,12 @@ build() { # fix lsb_release dependency sed -i -e 's:/usr/bin/lsb_release -d:cat /etc/arch-release:' xbmc/utils/SystemInfo.cpp + sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADER:' \ + lib/libid3tag/libid3tag/configure.ac \ + lib/libdvd/libdvdcss/configure.ac + + patch -p1 <$srcdir/cdio.patch + # Bootstrapping XBMC ./bootstrap diff --git a/community/xbmc/cdio.patch b/community/xbmc/cdio.patch new file mode 100644 index 000000000..0f74deaa4 --- /dev/null +++ b/community/xbmc/cdio.patch @@ -0,0 +1,39 @@ +diff -wbBur xbmc-11.0/xbmc/music/tags/MusicInfoTagLoaderCDDA.cpp xbmc-11.0.my/xbmc/music/tags/MusicInfoTagLoaderCDDA.cpp +--- xbmc-11.0/xbmc/music/tags/MusicInfoTagLoaderCDDA.cpp 2012-03-22 02:07:50.000000000 +0400 ++++ xbmc-11.0.my/xbmc/music/tags/MusicInfoTagLoaderCDDA.cpp 2013-01-09 14:40:10.670040454 +0400 +@@ -27,6 +27,10 @@ + #include "storage/MediaManager.h" + #include "utils/log.h" + ++#define CDTEXT_TITLE CDTEXT_FIELD_TITLE ++#define CDTEXT_PERFORMER CDTEXT_FIELD_PERFORMER ++#define CDTEXT_GENRE CDTEXT_FIELD_GENRE ++ + using namespace MUSIC_INFO; + + #ifdef HAS_DVD_DRIVE +diff -wbBur xbmc-11.0/xbmc/storage/cdioSupport.cpp xbmc-11.0.my/xbmc/storage/cdioSupport.cpp +--- xbmc-11.0/xbmc/storage/cdioSupport.cpp 2012-03-22 02:07:50.000000000 +0400 ++++ xbmc-11.0.my/xbmc/storage/cdioSupport.cpp 2013-01-09 14:51:40.276801092 +0400 +@@ -648,15 +648,18 @@ + CSingleLock lock(*m_cdio); + + // Get the CD-Text , if any +- cdtext_t *pcdtext = (cdtext_t *)::cdio_get_cdtext(cdio, trackNum); ++ cdtext_t *pcdtext = (cdtext_t *)::cdio_get_cdtext(cdio); + + if (pcdtext == NULL) + return ; + + // same ids used in libcdio and for our structure + the ids are consecutive make this copy loop safe. + for (int i = 0; i < MAX_CDTEXT_FIELDS; i++) +- if (pcdtext->field[i]) +- xcdt[(cdtext_field_t)i] = pcdtext->field[(cdtext_field_t)i]; ++ { ++ char *data = cdtext_get(pcdtext, (cdtext_field_t)i, trackNum); ++ if (data != NULL) ++ xcdt[(cdtext_field_t)i] = data; ++ } + } + + CCdInfo* CCdIoSupport::GetCdInfo(char* cDeviceFileName) diff --git a/community/xbmc/xbmc.service b/community/xbmc/xbmc.service index 23756cf03..431582f1b 100644 --- a/community/xbmc/xbmc.service +++ b/community/xbmc/xbmc.service @@ -6,7 +6,7 @@ After = remote-fs.target User = xbmc Group = xbmc Type = simple -ExecStart = /usr/bin/xinit /usr/bin/xbmc-standalone -- :0 +ExecStart = /usr/bin/xinit /usr/bin/xbmc-standalone -- :0 -nolisten tcp Restart = always [Install] diff --git a/core/shadow/PKGBUILD b/core/shadow/PKGBUILD index 0c5b601d2..9944945f4 100644 --- a/core/shadow/PKGBUILD +++ b/core/shadow/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 171874 2012-11-22 03:45:34Z dreisner $ +# $Id: PKGBUILD 175159 2013-01-15 17:39:52Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Maintainer: Aaron Griffin <aaron@archlinux.org> pkgname=shadow pkgver=4.1.5.1 -pkgrel=2 +pkgrel=3 pkgdesc="Password and account management tool suite with support for shadow files and PAM" arch=('i686' 'x86_64') url='http://pkg-shadow.alioth.debian.org/' @@ -20,7 +20,6 @@ options=('!libtool') install='shadow.install' source=("http://pkg-shadow.alioth.debian.org/releases/$pkgname-$pkgver.tar.bz2"{,.sig} LICENSE - adduser chgpasswd chpasswd defaults.pam @@ -34,7 +33,6 @@ source=("http://pkg-shadow.alioth.debian.org/releases/$pkgname-$pkgver.tar.bz2"{ sha1sums=('81f38720b953ef9c2c100c43d02dfe19cafd6c30' '126570e2939bf3b57f28df5197ab9309747a6b5c' '33a6cf1e44a1410e5c9726c89e5de68b78f5f922' - '78ec184a499f9708adcfcf0b7a3b22a60bf39f91' '4ad0e059406a305c8640ed30d93c2a1f62c2f4ad' '12427b1ca92a9b85ca8202239f0d9f50198b818f' '0e56fed7fc93572c6bf0d8f3b099166558bb46f1' @@ -53,7 +51,7 @@ build() { sed -i '/^user\(mod\|add\)_LDADD/s|$| -lattr|' src/Makefile.am # link to glibc's crypt(3) - LDFLAGS+=" -lcrypt" + export LIBS="-lcrypt" # need to offer these upstream patch -Np1 <"$srcdir/xstrdup.patch" @@ -81,9 +79,6 @@ package() { # license install -Dm644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/shadow/LICENSE" - # interactive useradd - install -Dm755 "$srcdir/adduser" "$pkgdir/usr/sbin/adduser" - # useradd defaults install -Dm644 "$srcdir/useradd.defaults" "$pkgdir/etc/default/useradd" diff --git a/core/systemd/0001-dbus-fix-serialization-of-calendar-timers.patch b/core/systemd/0001-dbus-fix-serialization-of-calendar-timers.patch new file mode 100644 index 000000000..0d9f1251d --- /dev/null +++ b/core/systemd/0001-dbus-fix-serialization-of-calendar-timers.patch @@ -0,0 +1,62 @@ +From 3761902e2e120849c283106fd4b78b6adec7367e Mon Sep 17 00:00:00 2001 +From: Lennart Poettering <lennart@poettering.net> +Date: Tue, 8 Jan 2013 20:00:01 +0100 +Subject: [PATCH] dbus: fix serialization of calendar timers + +--- + src/core/dbus-timer.c | 25 +++++++++++++++---------- + 1 file changed, 15 insertions(+), 10 deletions(-) + +diff --git a/src/core/dbus-timer.c b/src/core/dbus-timer.c +index 11d18cb..b22fcb5 100644 +--- a/src/core/dbus-timer.c ++++ b/src/core/dbus-timer.c +@@ -69,22 +69,28 @@ static int bus_timer_append_timers(DBusMessageIter *i, const char *property, voi + return -ENOMEM; + + LIST_FOREACH(value, k, p->values) { +- char *buf; ++ _cleanup_free_ char *buf = NULL; + const char *t; + size_t l; + bool b; + + t = timer_base_to_string(k->base); +- assert(endswith(t, "Sec")); + +- /* s/Sec/USec/ */ +- l = strlen(t); +- buf = new(char, l+2); +- if (!buf) +- return -ENOMEM; ++ if (endswith(t, "Sec")) { ++ ++ /* s/Sec/USec/ */ ++ l = strlen(t); ++ buf = new(char, l+2); ++ if (!buf) ++ return -ENOMEM; + +- memcpy(buf, t, l-3); +- memcpy(buf+l-3, "USec", 5); ++ memcpy(buf, t, l-3); ++ memcpy(buf+l-3, "USec", 5); ++ } else { ++ buf = strdup(t); ++ if (!buf) ++ return -ENOMEM; ++ } + + b = dbus_message_iter_open_container(&sub, DBUS_TYPE_STRUCT, NULL, &sub2) && + dbus_message_iter_append_basic(&sub2, DBUS_TYPE_STRING, &buf) && +@@ -92,7 +98,6 @@ static int bus_timer_append_timers(DBusMessageIter *i, const char *property, voi + dbus_message_iter_append_basic(&sub2, DBUS_TYPE_UINT64, &k->next_elapse) && + dbus_message_iter_close_container(&sub, &sub2); + +- free(buf); + if (!b) + return -ENOMEM; + } +-- +1.8.1 + diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD index 14a6f7910..8bae20a2b 100644 --- a/core/systemd/PKGBUILD +++ b/core/systemd/PKGBUILD @@ -3,8 +3,8 @@ pkgbase=systemd pkgname=('systemd' 'systemd-sysvcompat') -pkgver=196 -pkgrel=2 +pkgver=197 +pkgrel=4 arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/systemd" license=('GPL2' 'LGPL2.1' 'MIT') @@ -13,11 +13,13 @@ makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gobject-introspection 'linux-api-headers' 'pam' 'python' 'quota-tools' 'xz') options=('!libtool') source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" + '0001-dbus-fix-serialization-of-calendar-timers.patch' 'initcpio-hook-udev' 'initcpio-install-udev' 'initcpio-install-timestamp' 'use-split-usr-path.patch') -md5sums=('05ebd7f108e420e2b4e4810ea4b3c810' +md5sums=('56a860dceadfafe59f40141eb5223743' + '0341d680d5ab16bab3978bac96bf8797' 'e99e9189aa2f6084ac28b8ddf605aeb8' 'fb37e34ea006c79be1c54cbb0f803414' 'df69615503ad293c9ddf9d8b7755282d' @@ -29,7 +31,13 @@ build() { # hang onto this until we do the /{,s}bin merge patch -Np1 <"$srcdir/use-split-usr-path.patch" + # fix assertion failure when using calendar timers + # upstream 3761902e2e120849c283106fd4b78b6adec7367e + patch -Np1 <"$srcdir/0001-dbus-fix-serialization-of-calendar-timers.patch" + ./configure \ + PYTHON=python2 \ + PYTHON_CONFIG=python2-config \ --libexecdir=/usr/lib \ --localstatedir=/var \ --sysconfdir=/etc \ @@ -37,7 +45,11 @@ build() { --enable-gtk-doc \ --disable-audit \ --disable-ima \ - --with-distro=arch + --with-sysvinit-path= \ + --with-sysvrcnd-path= + + # can't use py3k yet with systemd-analyze -- the 'plot' verb will not work. + # https://pokersource.info/show_bug.cgi?id=50989 make } @@ -50,9 +62,9 @@ package_systemd() { pkgdesc="system and service manager" depends=('acl' 'bash' 'dbus-core' 'glib2' 'kbd' 'kmod' 'hwids' 'libcap' 'libgcrypt' 'pam' 'util-linux' 'xz') - provides=("libsystemd=$pkgver" "systemd-tools=$pkgver" "udev=$pkgver") - replaces=('libsystemd' 'systemd-tools' 'udev') - conflicts=('libsystemd' 'systemd-tools' 'udev') + provides=("libsystemd=$pkgver" 'nss-myhostname' "systemd-tools=$pkgver" "udev=$pkgver") + replaces=('libsystemd' 'nss-myhostname' 'systemd-tools' 'udev') + conflicts=('libsystemd' 'nss-myhostname' 'systemd-tools' 'udev') optdepends=('cryptsetup: required for encrypted block devices' 'libmicrohttpd: systemd-journal-gatewayd' 'quota-tools: kernel-level quota management' @@ -87,12 +99,6 @@ package_systemd() { done rm -rf "$pkgdir/etc/bash_completion.d" - # zsh completion isn't installed as part of 196 - # http://i.imgur.com/hMJgX.jpg - # TODO(dreisner): remove this for 197 - install -Dm644 "$pkgname-$pkgver/shell-completion/systemd-zsh-completion.zsh" \ - "$pkgdir/usr/share/zsh/site-functions/_systemd" - # don't write units to /etc by default -- we'll enable this on post_install # as a sane default rm "$pkgdir/etc/systemd/system/getty.target.wants/getty@tty1.service" @@ -101,10 +107,6 @@ package_systemd() { # get rid of RPM macros rm -r "$pkgdir/etc/rpm" - # can't use py3k yet with systemd-analyze -- the 'plot' verb will not work. - # https://pokersource.info/show_bug.cgi?id=50989 - sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze" - # the path to udevadm is hardcoded in some places install -d "$pkgdir/sbin" ln -s ../usr/bin/udevadm "$pkgdir/sbin/udevadm" diff --git a/core/systemd/systemd.install b/core/systemd/systemd.install index 457c81cf2..53cd4b4af 100644 --- a/core/systemd/systemd.install +++ b/core/systemd/systemd.install @@ -24,14 +24,28 @@ post_common() { fi } +mask_net_naming() { + if [ ! -e etc/udev/rules.d/80-net-name-slot.rules ]; then + printf >etc/udev/rules.d/80-net-name-slot.rules '# %s\n' \ + "This file masks persistent renaming rules for network devices. If you" \ + "delete this file, /usr/lib/udev/rules.d/80-net-name-slot.rules may" \ + "rename network devices according to ID_NET_NAME_{ONBOARD,SLOT,PATH}" \ + "properties of your network devices, with priority in that order. See" \ + "the output of 'udevadm test-builtin net_id /sys/class/net/\$interface'" \ + "for details on what that new name might be." \ + "" \ + "http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames" + fi +} + post_install() { post_common # enable getty@tty1 by default, but don't track the file systemctl enable getty@.service - echo ":: Append 'init=/bin/systemd' to your kernel command line in your" - echo " bootloader to replace sysvinit with systemd" + echo ":: Append 'init=/usr/lib/systemd/systemd' to your kernel command line in your" + echo " bootloader to replace sysvinit with systemd, or install systemd-sysvcompat" } post_upgrade() { @@ -50,11 +64,6 @@ post_upgrade() { printf ' controlled with the Storage setting in /etc/systemd/journald.conf\n' fi - if [ "$(vercmp 196-1 "$2")" -eq 1 ]; then - printf '==> The legacy configuration options are no longer supported in rc.conf,\n' - printf ' convert your rc.conf to the new configuration formats.\n' - fi - # logind's protocol changed. kindly restart the daemon to avoid locking # out further logins. if [ "$(vercmp 195 "$2")" -eq 1 ]; then @@ -62,6 +71,17 @@ post_upgrade() { systemctl restart systemd-logind.service fi fi + + if [ "$(vercmp 196-1 "$2")" -eq 1 ]; then + printf '==> The legacy configuration options are no longer supported in rc.conf,\n' + printf ' convert your rc.conf to the new configuration formats.\n' + fi + + if [ "$(vercmp 197-1 "$2")" -eq 1 ]; then + mask_net_naming + printf '==> Persistent net naming rules have been shipped as disabled.\n' + printf ' See /etc/udev/rules.d/80-net-name-slot.rules for more detail\n' + fi } # vim:set ts=2 sw=2 et: diff --git a/extra/gst-plugins-ugly/PKGBUILD b/extra/gst-plugins-ugly/PKGBUILD index 87b425caf..92bdec481 100644 --- a/extra/gst-plugins-ugly/PKGBUILD +++ b/extra/gst-plugins-ugly/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 173512 2012-12-19 19:49:27Z heftig $ +# $Id: PKGBUILD 175143 2013-01-15 11:34:05Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gst-plugins-ugly -pkgver=1.0.4 +pkgver=1.0.5 pkgrel=1 pkgdesc="GStreamer Multimedia Framework Ugly Plugins" arch=('i686' 'x86_64') @@ -11,12 +11,14 @@ url="http://gstreamer.freedesktop.org/" depends=('gst-plugins-base-libs' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr') options=(!libtool !emptydirs) source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz) -sha256sums=('509ec52b58523e6ab1f9d9facdbbf8417fb95bbcb1a90e1ec53f90019da710d8') +sha256sums=('a62a182ea96d9b2783b493b46d531914db9d2ebb9e537e9c84668fe752791331') build() { cd $pkgname-$pkgver sed -i '/AC_PATH_XTRA/d' configure.ac - autoreconf + aclocal -I m4 -I common/m4 + autoconf + automake --add-missing ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-static --enable-experimental \ --with-package-name="GStreamer Ugly Plugins (Archlinux)" \ diff --git a/extra/gstreamer0.10-ugly/PKGBUILD b/extra/gstreamer0.10-ugly/PKGBUILD index 0449c5324..12cf0a4e1 100644 --- a/extra/gstreamer0.10-ugly/PKGBUILD +++ b/extra/gstreamer0.10-ugly/PKGBUILD @@ -1,23 +1,26 @@ -# $Id: PKGBUILD 171265 2012-11-16 23:35:43Z ibiru $ +# $Id: PKGBUILD 175144 2013-01-15 11:34:09Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gstreamer0.10-ugly pkgname=('gstreamer0.10-ugly' 'gstreamer0.10-ugly-plugins') pkgver=0.10.19 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') license=('LGPL') makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr') url="http://gstreamer.freedesktop.org/" options=(!libtool) source=(${url}/src/gst-plugins-ugly/gst-plugins-ugly-${pkgver}.tar.xz - opencore-amr.patch) + opencore-amr.patch + cdio-cd-text-api.patch) md5sums=('ba26045c8c8c91f0d48d327ccf53ac0c' - 'd8feb6c99bfaff8be6b2c48ea4e98e47') + 'd8feb6c99bfaff8be6b2c48ea4e98e47' + '6c1c665f864387f3a77d32231fedeaab') build() { cd "${srcdir}/gst-plugins-ugly-${pkgver}" patch -Np0 -i "${srcdir}/opencore-amr.patch" + patch -Np1 -i "${srcdir}/cdio-cd-text-api.patch" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-static --enable-experimental \ --with-package-name="GStreamer Ugly Plugins (Archlinux)" \ diff --git a/extra/gstreamer0.10-ugly/cdio-cd-text-api.patch b/extra/gstreamer0.10-ugly/cdio-cd-text-api.patch new file mode 100644 index 000000000..cbd16b8e4 --- /dev/null +++ b/extra/gstreamer0.10-ugly/cdio-cd-text-api.patch @@ -0,0 +1,183 @@ +From 649bd92cd2600719862ad5189899212409dd0a67 Mon Sep 17 00:00:00 2001 +From: Leon Merten Lohse <leon@green-side.de> +Date: Thu, 03 May 2012 22:50:30 +0000 +Subject: cdio: compensate for libcdio's recent cd-text api changes + +https://bugzilla.gnome.org/show_bug.cgi?id=675112 + +Conflicts: + + ext/cdio/gstcdiocddasrc.c +--- +diff --git a/ext/cdio/gstcdio.c b/ext/cdio/gstcdio.c +index 2f58d18..483ebf5 100644 +--- a/ext/cdio/gstcdio.c ++++ b/ext/cdio/gstcdio.c +@@ -30,12 +30,16 @@ + GST_DEBUG_CATEGORY (gst_cdio_debug); + + void +-gst_cdio_add_cdtext_field (GstObject * src, cdtext_t * cdtext, ++gst_cdio_add_cdtext_field (GstObject * src, cdtext_t * cdtext, track_t track, + cdtext_field_t field, const gchar * gst_tag, GstTagList ** p_tags) + { + const gchar *txt; + ++#if LIBCDIO_VERSION_NUM > 83 ++ txt = cdtext_get_const (cdtext, field, track); ++#else + txt = cdtext_get_const (field, cdtext); ++#endif + if (txt == NULL || *txt == '\0') { + GST_DEBUG_OBJECT (src, "empty CD-TEXT field %u (%s)", field, gst_tag); + return; +@@ -57,6 +61,12 @@ gst_cdio_add_cdtext_field (GstObject * src, cdtext_t * cdtext, + } + + GstTagList * ++#if LIBCDIO_VERSION_NUM > 83 ++gst_cdio_get_cdtext (GstObject * src, cdtext_t * t, track_t track) ++{ ++ GstTagList *tags = NULL; ++ ++#else + gst_cdio_get_cdtext (GstObject * src, CdIo * cdio, track_t track) + { + GstTagList *tags = NULL; +@@ -67,14 +77,22 @@ gst_cdio_get_cdtext (GstObject * src, CdIo * cdio, track_t track) + GST_DEBUG_OBJECT (src, "no CD-TEXT for track %u", track); + return NULL; + } ++#endif + +- gst_cdio_add_cdtext_field (src, t, CDTEXT_PERFORMER, GST_TAG_ARTIST, &tags); +- gst_cdio_add_cdtext_field (src, t, CDTEXT_TITLE, GST_TAG_TITLE, &tags); ++ gst_cdio_add_cdtext_field (src, t, track, CDTEXT_FIELD_PERFORMER, ++ GST_TAG_ARTIST, &tags); ++ gst_cdio_add_cdtext_field (src, t, track, CDTEXT_FIELD_TITLE, GST_TAG_TITLE, ++ &tags); + + return tags; + } + + void ++#if LIBCDIO_VERSION_NUM > 83 ++gst_cdio_add_cdtext_album_tags (GstObject * src, cdtext_t * t, ++ GstTagList * tags) ++{ ++#else + gst_cdio_add_cdtext_album_tags (GstObject * src, CdIo * cdio, GstTagList * tags) + { + cdtext_t *t; +@@ -84,11 +102,14 @@ gst_cdio_add_cdtext_album_tags (GstObject * src, CdIo * cdio, GstTagList * tags) + GST_DEBUG_OBJECT (src, "no CD-TEXT for album"); + return; + } ++#endif + +- /* FIXME: map CDTEXT_PERFORMER to GST_TAG_ALBUM_ARTIST once we have that */ +- gst_cdio_add_cdtext_field (src, t, CDTEXT_TITLE, GST_TAG_ALBUM, &tags); +- gst_cdio_add_cdtext_field (src, t, CDTEXT_GENRE, GST_TAG_GENRE, &tags); +- ++ gst_cdio_add_cdtext_field (src, t, 0, CDTEXT_FIELD_PERFORMER, ++ GST_TAG_ALBUM_ARTIST, &tags); ++ gst_cdio_add_cdtext_field (src, t, 0, CDTEXT_FIELD_TITLE, GST_TAG_ALBUM, ++ &tags); ++ gst_cdio_add_cdtext_field (src, t, 0, CDTEXT_FIELD_GENRE, GST_TAG_GENRE, ++ &tags); + GST_DEBUG ("CD-TEXT album tags: %" GST_PTR_FORMAT, tags); + } + +diff --git a/ext/cdio/gstcdio.h b/ext/cdio/gstcdio.h +index ef31ed0..c6da580 100644 +--- a/ext/cdio/gstcdio.h ++++ b/ext/cdio/gstcdio.h +@@ -24,22 +24,38 @@ + #include <gst/gst.h> + #include <cdio/cdio.h> + #include <cdio/cdtext.h> ++#include <cdio/version.h> ++ ++#if LIBCDIO_VERSION_NUM <= 83 ++ #define CDTEXT_FIELD_PERFORMER CDTEXT_PERFORMER ++ #define CDTEXT_FIELD_GENRE CDTEXT_GENRE ++ #define CDTEXT_FIELD_TITLE CDTEXT_TITLE ++#endif + + GST_DEBUG_CATEGORY_EXTERN (gst_cdio_debug); + #define GST_CAT_DEFAULT gst_cdio_debug + + void gst_cdio_add_cdtext_field (GstObject * src, + cdtext_t * cdtext, ++ track_t track, + cdtext_field_t field, + const gchar * gst_tag, + GstTagList ** p_tags); + + GstTagList * gst_cdio_get_cdtext (GstObject * src, ++#if LIBCDIO_VERSION_NUM > 83 ++ cdtext_t * t, ++#else + CdIo * cdio, ++#endif + track_t track); + + void gst_cdio_add_cdtext_album_tags (GstObject * src, ++#if LIBCDIO_VERSION_NUM > 83 ++ cdtext_t * t, ++#else + CdIo * cdio, ++#endif + GstTagList * tags); + + #endif /* __GST_CDIO_H__ */ +diff --git a/ext/cdio/gstcdiocddasrc.c b/ext/cdio/gstcdiocddasrc.c +index 615a0c8..830839e 100644 +--- a/ext/cdio/gstcdiocddasrc.c ++++ b/ext/cdio/gstcdiocddasrc.c +@@ -206,6 +206,9 @@ gst_cdio_cdda_src_open (GstAudioCdSrc * audiocdsrc, const gchar * device) + GstCdioCddaSrc *src; + discmode_t discmode; + gint first_track, num_tracks, i; ++#if LIBCDIO_VERSION_NUM > 83 ++ cdtext_t *cdtext; ++#endif + + src = GST_CDIO_CDDA_SRC (audiocdsrc); + +@@ -232,8 +235,18 @@ gst_cdio_cdda_src_open (GstAudioCdSrc * audiocdsrc, const gchar * device) + if (src->read_speed != -1) + cdio_set_speed (src->cdio, src->read_speed); + ++#if LIBCDIO_VERSION_NUM > 83 ++ cdtext = cdio_get_cdtext (src->cdio); ++ ++ if (NULL == cdtext) ++ GST_DEBUG_OBJECT (src, "no CD-TEXT on disc"); ++ else ++ gst_cdio_add_cdtext_album_tags (GST_OBJECT_CAST (src), cdtext, ++ cddabasesrc->tags); ++#else + gst_cdio_add_cdtext_album_tags (GST_OBJECT_CAST (src), src->cdio, + cddabasesrc->tags); ++#endif + + GST_LOG_OBJECT (src, "%u tracks, first track: %d", num_tracks, first_track); + +@@ -250,8 +263,14 @@ gst_cdio_cdda_src_open (GstAudioCdSrc * audiocdsrc, const gchar * device) + * the right thing here (for cddb id calculations etc. as well) */ + track.start = cdio_get_track_lsn (src->cdio, i + first_track); + track.end = track.start + len_sectors - 1; /* -1? */ ++#if LIBCDIO_VERSION_NUM > 83 ++ if (NULL != cdtext) ++ track.tags = gst_cdio_get_cdtext (GST_OBJECT (src), cdtext, ++ i + first_track); ++#else + track.tags = gst_cdio_get_cdtext (GST_OBJECT (src), src->cdio, + i + first_track); ++#endif + + gst_audio_cd_src_add_track (GST_AUDIO_CD_SRC (src), &track); + } +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/gvfs/PKGBUILD b/extra/gvfs/PKGBUILD index e1f87de77..33d7f3172 100644 --- a/extra/gvfs/PKGBUILD +++ b/extra/gvfs/PKGBUILD @@ -1,20 +1,23 @@ -# $Id: PKGBUILD 173130 2012-12-11 14:42:18Z jgc $ +# $Id: PKGBUILD 175145 2013-01-15 11:34:12Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gvfs pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp') pkgver=1.14.2 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') license=('LGPL') -makedepends=('avahi' 'bluez' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio' 'libgphoto2' 'libimobiledevice' 'libsoup-gnome' 'smbclient' 'udisks2' 'libsecret' 'docbook-xsl' 'gtk3') +makedepends=('avahi' 'bluez' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio-paranoia' 'libgphoto2' 'libimobiledevice' 'libsoup-gnome' 'smbclient' 'udisks2' 'libsecret' 'docbook-xsl' 'gtk3') url="http://www.gnome.org" options=(!libtool) -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz) -sha256sums=('c3bbdac4bc89de82a2ba373799da80d24fb6a038a9893d9b54e2c9429c878fbc') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz + fix-paranoia-include.patch) +sha256sums=('c3bbdac4bc89de82a2ba373799da80d24fb6a038a9893d9b54e2c9429c878fbc' + '4385f9c5100bc0e01c59d07bef07737bb8155e60b56d3ee948e0b48ff207ff76') build() { cd "$pkgbase-$pkgver" + patch -Np0 -i ../fix-paranoia-include.patch ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --libexecdir=/usr/lib/gvfs \ @@ -24,7 +27,7 @@ build() { package_gvfs() { pkgdesc="Userspace virtual filesystem implemented as a pluggable module for gio" - depends=('avahi' 'dconf' 'fuse' 'libarchive' 'libcdio' 'libsoup-gnome' 'udisks2' 'libsecret') + depends=('avahi' 'dconf' 'fuse' 'libarchive' 'libcdio-paranoia' 'libsoup-gnome' 'udisks2' 'libsecret') optdepends=('gvfs-afc: AFC (mobile devices) support' 'gvfs-smb: SMB/CIFS (Windows client) support' 'gvfs-gphoto2: gphoto2 (PTP camera/MTP media player) support' diff --git a/extra/gvfs/fix-paranoia-include.patch b/extra/gvfs/fix-paranoia-include.patch new file mode 100644 index 000000000..02856a06f --- /dev/null +++ b/extra/gvfs/fix-paranoia-include.patch @@ -0,0 +1,11 @@ +--- daemon/gvfsbackendcdda.c.orig 2013-01-08 11:19:52.311593338 +0000 ++++ daemon/gvfsbackendcdda.c 2013-01-08 11:20:05.778169190 +0000 +@@ -55,7 +55,7 @@ + #include "gvfsjobenumerate.h" + + #define DO_NOT_WANT_PARANOIA_COMPATIBILITY +-#include <cdio/paranoia.h> ++#include <cdio/paranoia/paranoia.h> + #include <cdio/cdio.h> + + /* TODO: diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD index 99c677557..b611231dc 100644 --- a/extra/java7-openjdk/PKGBUILD +++ b/extra/java7-openjdk/PKGBUILD @@ -1,23 +1,24 @@ -# $Id: PKGBUILD 169300 2012-10-18 22:41:27Z andyrtr $ +# $Id: PKGBUILD 175162 2013-01-15 18:14:28Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Maintainer: Guillaume ALAUX <guillaume@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> -pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk' 'openjdk7-src') - # ToDo -demo -doc packages, see Debian file lists http://packages.debian.org/source/wheezy/openjdk-7 +pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk' + 'openjdk7-src' 'openjdk7-doc') pkgbase=java7-openjdk _java_ver=7 _updatever=u9 -_icedtea_ver=2.3.3 +_icedtea_ver=2.3.4 # check "${srcdir}/icedtea7"/Makefile.am -_CORBA_CHANGESET=9a95d714d136 -_HOTSPOT_CHANGESET=d2d0a106917c # see "${srcdir}/icedtea7"/hotspot.map -_JAXP_CHANGESET=f45296ac69be -_JAXWS_CHANGESET=03f54ef33914 -_JDK_CHANGESET=5ec94d162f05 -_LANGTOOLS_CHANGESET=ec73c6927fb7 -_OPENJDK_CHANGESET=301e79a966b4 +_CORBA_CHANGESET=dc9234e25ab0 +_JAXP_CHANGESET=aa3654afea12 +_JAXWS_CHANGESET=7182233cc27e +_JDK_CHANGESET=96d4f04f2b7c +_LANGTOOLS_CHANGESET=946195011b30 +_OPENJDK_CHANGESET=8bd8e70d4a03 + +_HOTSPOT_CHANGESET=beecf0b9e760 # see "${srcdir}/icedtea7"/hotspot.map _bootstrap=0 # 0/1 for quick build or full bootstrap @@ -49,14 +50,14 @@ source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar jdk7-openjdk.profile.csh jre7-openjdk.profile jre7-openjdk.profile.csh) -sha256sums=('e5ac5564e00c4a8d7b3376ed6de91b18a2587c8abdad802ccc92c780765b1073' - 'dce85d9bcc6e213240b6ad49755bf57fc60a515461664890efcce2ed615ca70b' - '4ad0ab1e0ab6f1e0402fd5a5f0b388bb33cc2c553df867e4c5e6ca78a4ede9bb' - 'b088dd5d383f27b2ccd433eebcbf3f73c016b3359abdae2a5575455d56668141' - '86dfb4fda79de7459b17b6efac6b8d5d6fd7bb1175b7e4ff22ba2ce4a903c05a' - '11a77a35661b2239e73c3fb1318fb6371d0cd7130594d1405df1cb1b17040ea6' - 'c7c67f6805d05c0fa5ddd2a7e406a6adcd0823dd008005563f2b2a88d1f3e6b6' - '872e9e0c36b9fd93e81ac131e60deadb0afa22aa77447150bb45ede77ee6db8b' +sha256sums=('ea859f37fb20904ffd40802a41396326f7e301fa6873d88d01bf4afef5a60ca8' + '3ea7c4acd4c2f7b91588231427a8685010f8ce7eb0b9610457d6a35bf2afd6bd' + '911a049e735c1ab0dfa65426ada7a11494d51fec88126d34588b23f06ef7acf8' + 'cc9a95c09be36753f9dd5aacd961400deddbdb757f8ea547cd7073f7ab7b87b7' + '7e694d90969413972a51ad1202f3c042b1eca92591e43f1f94f4421a6be5c590' + 'afba9798a4f2407bdf2cd58d0a99d94bb76ae15aec6ad9cfa0375fb255b0032b' + 'a9f56fbd58047adc9296800cd9c534375ef052074cd40ebc0da1f7db6ce09144' + 'de7a5397a83bb7c7be2458809b576133e8a3b75dc62d62d2f2983b97c220dc4f' '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f' '7b2db65bfb9d5014e1522178d65cabf05dfa85e0926cde5648b5a338db376479' 'b742113dc6debc3eb92a246e442595481c04a2a3973e7902b86037acb50050ea' @@ -296,7 +297,7 @@ package_jdk7-openjdk() { # Main files install -m755 -d ${pkgdir}/${_jvmdir}/ - cp -a demo include lib sample ${pkgdir}/${_jvmdir} + cp -a include lib ${pkgdir}/${_jvmdir} # 'bin' files pushd bin @@ -340,3 +341,12 @@ package_openjdk7-src() { install -D ${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image/src.zip \ ${pkgdir}/${_jvmdir}/src.zip } + +package_openjdk7-doc() { + pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - documentation" + + install -m755 -d ${pkgdir}/usr/share/doc/openjdk7-doc + for i in ${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/docs/*; do + cp -a $i ${pkgdir}/usr/share/doc/openjdk7-doc/ + done +} diff --git a/extra/libcdio-paranoia/PKGBUILD b/extra/libcdio-paranoia/PKGBUILD new file mode 100644 index 000000000..c66286d89 --- /dev/null +++ b/extra/libcdio-paranoia/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 174870 2013-01-08 10:06:34Z jgc $ +# Maintainer: +# Contributor: damir <damir@archlinux.org> + +pkgname=libcdio-paranoia +pkgver=10.2+0.90 +pkgrel=1 +pkgdesc="CD paranoia libraries from libcdio" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL') +url="http://www.gnu.org/software/libcdio/" +depends=('libcdio') +options=('!libtool') +source=(http://ftp.gnu.org/gnu/libcdio/${pkgname}-${pkgver}.tar.bz2{,.sig} + header-fix.patch) +md5sums=('432e9f1c5ceb645c4bca9db3f9297437' + '39766404d473ecda66c2f3a932d1c57c' + '1ebb33a1cfe00181de31138ef001e01b') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np0 -i ../header-fix.patch + sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac + aclocal + autoconf + automake --add-missing + ./configure --prefix=/usr --enable-cpp-progs --disable-static --disable-example-progs + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make -j1 DESTDIR="${pkgdir}" install + + #sed -i "/LIBCDIO_SOURCE_PATH/s|.*|/* #undef LIBCDIO_SOURCE_PATH */|" \ + # $pkgdir/usr/include/cdio/cdio_config.h +} diff --git a/extra/libcdio-paranoia/header-fix.patch b/extra/libcdio-paranoia/header-fix.patch new file mode 100644 index 000000000..15cf0e0e2 --- /dev/null +++ b/extra/libcdio-paranoia/header-fix.patch @@ -0,0 +1,13 @@ +--- include/cdio/paranoia/Makefile.am.orig 2013-01-08 10:40:32.237218755 +0000 ++++ include/cdio/paranoia/Makefile.am 2013-01-08 10:41:22.269997804 +0000 +@@ -3,8 +3,8 @@ + ######################################################## + # + +-libcdioincludedir=$(includedir)/cdio +-dist_libcdioinclude_HEADERS = cdda.h paranoia.h ++cdio_paranoia_includedir=$(includedir)/cdio/paranoia ++dist_cdio_paranoia_include_HEADERS = cdda.h paranoia.h + + EXTRA_DIST = version.h.in + BUILT_SOURCES = version.h diff --git a/extra/libcdio/PKGBUILD b/extra/libcdio/PKGBUILD index a532e0d77..e921dbde2 100644 --- a/extra/libcdio/PKGBUILD +++ b/extra/libcdio/PKGBUILD @@ -1,27 +1,30 @@ -# $Id: PKGBUILD 150880 2012-02-23 13:48:06Z allan $ +# $Id: PKGBUILD 175152 2013-01-15 11:44:42Z jgc $ # Maintainer: # Contributor: damir <damir@archlinux.org> pkgname=libcdio -pkgver=0.83 -pkgrel=1 +pkgver=0.90 +pkgrel=2 pkgdesc="GNU Compact Disc Input and Control Library" arch=('i686' 'x86_64') license=('GPL3') url="http://www.gnu.org/software/libcdio/" -depends=('libcddb' 'ncurses') +depends=('libcddb' 'ncurses' 'gcc-libs') options=('!libtool') install=libcdio.install source=(http://ftp.gnu.org/gnu/libcdio/${pkgname}-${pkgver}.tar.gz{,.sig} - libcdio-0.83-linking.patch) -md5sums=('b9e0f1bccb142e697cd834fe56b6e6fb' - 'a7864a4b572a1e2a28cc0a05aa4a67d3' - '5a7f50209c03d5919d5b932f07871af7') + libcdio-0.83-linking.patch + udf-Dont-return-freed-memory-from-udf_fopen.patch) +md5sums=('1b245b023fb03a58d030fd2800db3247' + '45100d90ea49d6f8481eddf709655c0f' + '5a7f50209c03d5919d5b932f07871af7' + 'b7b50c989575e5484d3992b455c9df48') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i $srcdir/libcdio-0.83-linking.patch - ./configure --prefix=/usr --disable-vcd-info --enable-cpp-progs + patch -Np1 -i ../libcdio-0.83-linking.patch + patch -Np1 -i ../udf-Dont-return-freed-memory-from-udf_fopen.patch + ./configure --prefix=/usr --disable-vcd-info --enable-cpp-progs --disable-static make } diff --git a/extra/libcdio/udf-Dont-return-freed-memory-from-udf_fopen.patch b/extra/libcdio/udf-Dont-return-freed-memory-from-udf_fopen.patch new file mode 100644 index 000000000..191e35341 --- /dev/null +++ b/extra/libcdio/udf-Dont-return-freed-memory-from-udf_fopen.patch @@ -0,0 +1,33 @@ +From 6c0251d145e44b7cdfeb9767c615646fb8f51320 Mon Sep 17 00:00:00 2001 +From: Christophe Fergeau <cfergeau@redhat.com> +Date: Thu, 22 Nov 2012 13:53:15 +0100 +Subject: [PATCH] udf: Don't return freed memory from udf_fopen + +When trying to open a file located in the root directory of the +UDF filesystem, we call udf_ff_open with the dirent corresponding +to the root dir and the filename. In this case, udf_ff_open will +return the same dirent as the one that was passed as argument, so +we must not free it as we'll be returning it. +This causes a crash with iso-read when trying to read a file located +at the root of the image. +--- + lib/udf/udf_fs.c | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/lib/udf/udf_fs.c b/lib/udf/udf_fs.c +index 5f5add7..1e0601e 100644 +--- a/lib/udf/udf_fs.c ++++ b/lib/udf/udf_fs.c +@@ -257,7 +257,8 @@ udf_fopen(udf_dirent_t *p_udf_root, const char *psz_name) + p_udf_root->psz_name, p_udf_root->b_dir, + p_udf_root->b_parent); + p_udf_file = udf_ff_traverse(p_udf_dirent, psz_token); +- udf_dirent_free(p_udf_dirent); ++ if (p_udf_file != p_udf_dirent) ++ udf_dirent_free(p_udf_dirent); + } + else if ( 0 == strncmp("/", psz_name, sizeof("/")) ) { + return udf_new_dirent(&p_udf_root->fe, p_udf_root->p_udf, +-- +1.7.2.5 + diff --git a/extra/pgbouncer/PKGBUILD b/extra/pgbouncer/PKGBUILD new file mode 100644 index 000000000..fb0277192 --- /dev/null +++ b/extra/pgbouncer/PKGBUILD @@ -0,0 +1,40 @@ +# Maintainer: Dan McGee <dan@archlinux.org> + +pkgname=pgbouncer +_dlid=3393 +pkgver=1.5.4 +pkgrel=4 +pkgdesc="A lightweight connection pooler for PostgreSQL" +arch=('i686' 'x86_64') +url="http://pgfoundry.org/projects/pgbouncer" +license=('BSD') +depends=('libevent>=2.0' 'postgresql') +makedepends=('asciidoc' 'xmlto') +backup=('etc/pgbouncer/pgbouncer.ini') +install=$pkgname.install +source=("http://pgfoundry.org/frs/download.php/${_dlid}/${pkgname}-${pkgver}.tar.gz" + pgbouncer.ini + pgbouncer.service + pgbouncer.tmpfiles.conf) +md5sums=('9ffaf2e6232e18e676651429813732df' + '810813b9ef8891be382be9ffdd425edc' + 'eede238f5ff3709dbfeef6dad3fbefc7' + '472659f4c5de2b59a420f5ca42327ec1') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --disable-debug + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install + install -D -m644 COPYRIGHT "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + install -D -m644 ../pgbouncer.ini "$pkgdir/etc/pgbouncer/pgbouncer.ini" + install -D -m644 ../pgbouncer.service "$pkgdir/usr/lib/systemd/system/pgbouncer.service" + install -D -m644 ../pgbouncer.tmpfiles.conf "$pkgdir/usr/lib/tmpfiles.d/pgbouncer.conf" + mkdir -p "$pkgdir/var/log/pgbouncer" +} + +# vim:set ts=2 sw=2 et: diff --git a/extra/pgbouncer/pgbouncer.ini b/extra/pgbouncer/pgbouncer.ini new file mode 100644 index 000000000..183c9c39d --- /dev/null +++ b/extra/pgbouncer/pgbouncer.ini @@ -0,0 +1,52 @@ +[pgbouncer] +logfile = /var/log/pgbouncer/pgbouncer.log +pidfile = /run/pgbouncer/pgbouncer.pid + +;; ip address or * which means all ip-s +;listen_addr = 127.0.0.1 +;listen_port = 6432 + +unix_socket_dir = /run/postgresql +unix_socket_mode = 0777 + +; any, trust, plain, crypt, md5 +auth_type = trust +auth_file = /etc/pgbouncer/userlist.txt + +; comma-separated list of users, who are allowed to change settings +admin_users = postgres + +; comma-separated list of users who are just allowed to use SHOW command +stats_users = stats, postgres + +; total number of clients that can connect +max_client_conn = 100 + +; default pool size. 20 is good number when transaction pooling +; is in use, in session pooling it needs to be the number of +; max clients you want to handle at any moment +default_pool_size = 20 + + +;; database name = connect string +;; +;; connect string params: +;; dbname= host= port= user= password= +;; client_encoding= datestyle= timezone= +;; pool_size= connect_query= +[databases] + +; foodb over unix socket +;foodb = + +; redirect bardb to bazdb on localhost +;bardb = host=localhost dbname=bazdb + +; acceess to dest database will go with single user +;forcedb = host=127.0.0.1 port=300 user=baz password=foo client_encoding=UNICODE datestyle=ISO connect_query='SELECT 1' + +; use custom pool sizes +;nondefaultdb = pool_size=50 reserve_pool=10 + +; fallback connect string +;* = host=testserver diff --git a/extra/pgbouncer/pgbouncer.install b/extra/pgbouncer/pgbouncer.install new file mode 100644 index 000000000..2f77ae50f --- /dev/null +++ b/extra/pgbouncer/pgbouncer.install @@ -0,0 +1,25 @@ +post_install() { + if ! getent group pgbouncer >/dev/null; then + groupadd -r pgbouncer + fi + if ! getent passwd pgbouncer >/dev/null; then + useradd -c 'PGBouncer user' -r -g pgbouncer -d '/etc/pgbouncer' -s /bin/bash pgbouncer + passwd -l pgbouncer >/dev/null + fi + chown pgbouncer:pgbouncer /var/log/pgbouncer + systemd-tmpfiles --create pgbouncer.conf + post_update +} + +post_update() { + gpasswd -a pgbouncer postgres +} + +post_remove() { + if getent passwd pgbouncer >/dev/null; then + userdel pgbouncer + fi + if getent group pgbouncer >/dev/null; then + groupdel pgbouncer + fi +} diff --git a/extra/pgbouncer/pgbouncer.service b/extra/pgbouncer/pgbouncer.service new file mode 100644 index 000000000..f5baad52b --- /dev/null +++ b/extra/pgbouncer/pgbouncer.service @@ -0,0 +1,11 @@ +[Unit] +Description=A lightweight connection pooler for PostgreSQL +After=network.target + +[Service] +User=pgbouncer +ExecStart=/usr/bin/pgbouncer /etc/pgbouncer/pgbouncer.ini +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target diff --git a/extra/pgbouncer/pgbouncer.tmpfiles.conf b/extra/pgbouncer/pgbouncer.tmpfiles.conf new file mode 100644 index 000000000..c8f708372 --- /dev/null +++ b/extra/pgbouncer/pgbouncer.tmpfiles.conf @@ -0,0 +1 @@ +d /run/pgbouncer 0755 pgbouncer pgbouncer - diff --git a/extra/qtwebkit/PKGBUILD b/extra/qtwebkit/PKGBUILD index 8c289f466..2fcb88791 100644 --- a/extra/qtwebkit/PKGBUILD +++ b/extra/qtwebkit/PKGBUILD @@ -1,106 +1,58 @@ -# $Id: PKGBUILD 159414 2012-05-23 22:31:17Z andrea $ +# $Id: PKGBUILD 175166 2013-01-15 21:24:56Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=qtwebkit -pkgver=2.2.2 +pkgver=2.3git20130115 pkgrel=1 arch=('i686' 'x86_64') url='http://trac.webkit.org/wiki/QtWebKit' pkgdesc='An open source web browser engine (Qt port)' license=('LGPL2.1' 'GPL3') -depends=('qt' 'gstreamer0.10-base') -makedepends=('python2' 'mesa' 'gperf') +depends=('qt' 'systemd' 'gstreamer0.10-base') +makedepends=('gperf' 'python2' 'ruby' 'git' 'mesa') conflicts=('qt<4.8') -_qtver=4.8.2 -source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}-source.tar.gz" - "ftp://ftp.archlinux.org/other/${pkgname}/qwebview-${_qtver}.tar.xz" - 'glibc.patch' - 'fix-build.patch') -sha1sums=('914d7cc099e5b6181c2d74fc7a74e1b4478b75a4' - '33c83272ed8110180ee6e7e3733e68cc513e2802' - '9e47ba5725a2ebd072b8bff31fa2f71aa83f0333' - 'c6dfb001b0412a8adfcb7f1f565a24314a753448') +_qtver=4.8.4 +source=("${pkgname}-${pkgver}.tar.gz"::"http://gitorious.org/webkit/qtwebkit-23/archive-tarball/${pkgname}-2.3" + "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${_qtver}.tar.gz" + 'use-python2.patch' + 'qwebview.patch' + 'enable-accelerated-compositing.patch') +sha1sums=('8d74fdb4354d1f1b4f3df0ec7b057a7516350372' + 'f5880f11c139d7d8d01ecb8d874535f7d9553198' + '315b6ff603f35e5492a036f7082f6aa075dfb607' + 'fed0c1a90e3997b5575dbc83d6ea23bc46097a6f' + '471032229c61a0f95e142c21370aab6d3f00ff7e') build() { - cd "${srcdir}"/${pkgname}-${pkgver}-source + cd webkit-qtwebkit-23 - patch -p1 -i "${srcdir}"/glibc.patch - patch -p1 -i "${srcdir}"/fix-build.patch + patch -p1 -i "${srcdir}"/use-python2.patch - # move headers - mv include Source/ + # Fixed upstream, https://bugs.webkit.org/show_bug.cgi?id=106892 + patch -p1 -i "${srcdir}"/enable-accelerated-compositing.patch - cd Source - qmake - cd ../ + export QTDIR=/usr + Tools/Scripts/build-webkit --qt \ + --makeargs="${MAKEFLAGS}" \ + --prefix=/usr \ + --no-webkit2 - make -C Source + cd ../ # Build the QWebView plugin (FS#27914) - cd "${srcdir}"/${pkgname}-${pkgver}-source/qwebview-${_qtver}/plugins/qwebview + cd qt-everywhere-opensource-src-${_qtver} + patch -p1 -i "${srcdir}"/qwebview.patch + cd tools/designer/src/plugins/qwebview qmake make } package() { - cd "${srcdir}"/${pkgname}-${pkgver}-source - make INSTALL_ROOT="${pkgdir}" -C Source install - - cd "${srcdir}"/${pkgname}-${pkgver}-source/qwebview-${_qtver}/plugins/qwebview - make INSTALL_ROOT="${pkgdir}" install -} - -_source() { - local _current_dir=$(pwd) - local _tmp=$(mktemp -d --tmpdir) - - cd _tmp - git clone git://gitorious.org/+qtwebkit-developers/webkit/qtwebkit.git - - # fetch the make-package.py script - git clone git://qt.gitorious.org/qtwebkit/tools.git - - # create the qtwebkit tarball - cd qtwebkit - git checkout -b ${pkgname}-${pkgver} ${pkgname}-${pkgver} - - sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \ - ../tools/make-package.py - python2 ../tools/make-package.py + cd webkit-qtwebkit-23 + make INSTALL_ROOT="${pkgdir}" -C WebKitBuild/Release install - mv ${pkgname}-${pkgver}-source.tar.gz ${_current_dir}/ - - cd .. - - # create the qwebview plugin tarball - mkdir qwebview-${_qtver} - cd qwebview-${_qtver} - wget http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${_qtver}.tar.gz - tar xf qt-everywhere-opensource-src-${_qtver}.tar.gz - mkdir -p ${pkgname}-${pkgver}-source/qwebview-${_qtver}/plugins/ - cp -ra qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview \ - ${pkgname}-${pkgver}-source/qwebview-${_qtver}/plugins/ - - cat > ${pkgname}-${pkgver}-source/qwebview-${_qtver}/plugins/plugins.pro <<"EOF" -TEMPLATE = subdirs -CONFIG += ordered - -REQUIRES = !CONFIG(static,shared|static) -contains(QT_CONFIG, webkit): SUBDIRS += qwebview -EOF - - cat > $(_tmp)/header.txt <<"EOF" -INCLUDEPATH += ../../../Source/include -LIBS += -L../../../Source/lib - -EOF - - cat $(_tmp)/header.txt qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/plugins.pri > \ - ${pkgname}-${pkgver}-source/qwebview-${_qtver}/plugins/plugins.pri - - tar cJf qwebview-${_qtver}.tar.xz ${pkgname}-${pkgver}-source - - mv qwebview-${_qtver}.tar.xz ${_current_dir}/ + cd ../ - rm -rf ${_tmp} + cd qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview + make INSTALL_ROOT="${pkgdir}" install } diff --git a/extra/qtwebkit/enable-accelerated-compositing.patch b/extra/qtwebkit/enable-accelerated-compositing.patch new file mode 100644 index 000000000..13474cd6a --- /dev/null +++ b/extra/qtwebkit/enable-accelerated-compositing.patch @@ -0,0 +1,11 @@ +Index: trunk/Source/WebCore/html/HTMLCanvasElement.cpp
+===================================================================
+--- trunk/Source/WebCore/html/HTMLCanvasElement.cpp (revision 139541)
++++ trunk/Source/WebCore/html/HTMLCanvasElement.cpp (revision 139742)
+@@ -190,5 +190,5 @@
+ Settings* settings = document()->settings();
+ if (settings && settings->webGLEnabled()
+-#if !PLATFORM(CHROMIUM) && !PLATFORM(GTK) && !PLATFORM(EFL)
++#if !PLATFORM(CHROMIUM) && !PLATFORM(GTK) && !PLATFORM(EFL) && !PLATFORM(QT)
+ && settings->acceleratedCompositingEnabled()
+ #endif
diff --git a/extra/qtwebkit/qwebview.patch b/extra/qtwebkit/qwebview.patch new file mode 100644 index 000000000..73d5d5032 --- /dev/null +++ b/extra/qtwebkit/qwebview.patch @@ -0,0 +1,21 @@ +--- qt-everywhere-opensource-src-4.8.4/tools/designer/src/plugins/plugins.pri~ 2013-01-09 12:56:08.915412090 +0000 ++++ qt-everywhere-opensource-src-4.8.4/tools/designer/src/plugins/plugins.pri 2013-01-09 12:58:06.911391299 +0000 +@@ -1,3 +1,6 @@ ++INCLUDEPATH += ../../../../../../webkit-qtwebkit-23/WebKitBuild/Release/include ++LIBS += -L../../../../../../webkit-qtwebkit-23/WebKitBuild/Release/lib ++ + CONFIG += designer + win32|mac: CONFIG+= debug_and_release + QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/designer +--- qt-everywhere-opensource-src-4.8.4/tools/designer/src/plugins/plugins.pro~ 2013-01-09 12:55:43.598892405 +0000 ++++ qt-everywhere-opensource-src-4.8.4/tools/designer/src/plugins/plugins.pro 2013-01-09 12:55:53.352169136 +0000 +@@ -2,9 +2,4 @@ + CONFIG += ordered + + REQUIRES = !CONFIG(static,shared|static) +-contains(QT_CONFIG, qt3support): SUBDIRS += widgets +-win32: SUBDIRS += activeqt +-# contains(QT_CONFIG, opengl): SUBDIRS += tools/view3d + contains(QT_CONFIG, webkit): SUBDIRS += qwebview +-contains(QT_CONFIG, phonon): SUBDIRS += phononwidgets +-contains(QT_CONFIG, declarative): SUBDIRS += qdeclarativeview diff --git a/extra/qtwebkit/use-python2.patch b/extra/qtwebkit/use-python2.patch new file mode 100644 index 000000000..b1444435b --- /dev/null +++ b/extra/qtwebkit/use-python2.patch @@ -0,0 +1,57 @@ +--- webkit-qtwebkit-23/Source/JavaScriptCore/DerivedSources.pri~ 2013-01-09 11:29:16.452266719 +0000 ++++ webkit-qtwebkit-23/Source/JavaScriptCore/DerivedSources.pri 2013-01-09 11:30:18.188538725 +0000 +@@ -85,14 +85,14 @@ + retgen.output = RegExpJitTables.h + retgen.script = $$PWD/create_regex_tables + retgen.input = retgen.script +-retgen.commands = python $$retgen.script > ${QMAKE_FILE_OUT} ++retgen.commands = python2 $$retgen.script > ${QMAKE_FILE_OUT} + GENERATORS += retgen + + #GENERATOR: "KeywordLookup.h": decision tree used by the lexer + klgen.output = KeywordLookup.h + klgen.script = $$PWD/KeywordLookupGenerator.py + klgen.input = KEYWORDLUT_FILES +-klgen.commands = python $$klgen.script ${QMAKE_FILE_NAME} > ${QMAKE_FILE_OUT} ++klgen.commands = python2 $$klgen.script ${QMAKE_FILE_NAME} > ${QMAKE_FILE_OUT} + GENERATORS += klgen + + EXTRACTOR_BINARY = LLIntOffsetsExtractor$$BIN_EXTENSION +@@ -117,7 +117,7 @@ + disassembler.input = DISASSEMBLER_FILES + disassembler.script = $$PWD/disassembler/udis86/itab.py + disassembler.depends = $$DISASSEMBLER_DEPENDENCY +- disassembler.commands = python $$disassembler.script ${QMAKE_FILE_NAME} --outputDir ${QMAKE_FUNC_FILE_OUT_PATH} ++ disassembler.commands = python2 $$disassembler.script ${QMAKE_FILE_NAME} --outputDir ${QMAKE_FUNC_FILE_OUT_PATH} + disassembler.CONFIG += no_link + GENERATORS += disassembler + } +--- webkit-qtwebkit-23/Source/WebCore/DerivedSources.pri~ 2013-01-09 11:46:01.165612894 +0000 ++++ webkit-qtwebkit-23/Source/WebCore/DerivedSources.pri 2013-01-09 11:46:27.465404725 +0000 +@@ -779,7 +779,7 @@ + inspectorValidate.output = InspectorProtocolVersion.h + inspectorValidate.input = INSPECTOR_JSON + inspectorValidate.script = $$PWD/inspector/generate-inspector-protocol-version +-inspectorValidate.commands = python $$inspectorValidate.script -o ${QMAKE_FILE_OUT} ${QMAKE_FILE_IN} ++inspectorValidate.commands = python2 $$inspectorValidate.script -o ${QMAKE_FILE_OUT} ${QMAKE_FILE_IN} + inspectorValidate.depends = $$PWD/inspector/generate-inspector-protocol-version + inspectorValidate.add_output_to_sources = false + GENERATORS += inspectorValidate +@@ -787,7 +787,7 @@ + inspectorJSON.output = InspectorFrontend.cpp InspectorBackendDispatcher.cpp InspectorTypeBuilder.cpp + inspectorJSON.input = INSPECTOR_JSON + inspectorJSON.script = $$PWD/inspector/CodeGeneratorInspector.py +-inspectorJSON.commands = python $$inspectorJSON.script $$PWD/inspector/Inspector.json --output_h_dir ${QMAKE_FUNC_FILE_OUT_PATH} --output_cpp_dir ${QMAKE_FUNC_FILE_OUT_PATH} ++inspectorJSON.commands = python2 $$inspectorJSON.script $$PWD/inspector/Inspector.json --output_h_dir ${QMAKE_FUNC_FILE_OUT_PATH} --output_cpp_dir ${QMAKE_FUNC_FILE_OUT_PATH} + inspectorJSON.depends = $$inspectorJSON.script + GENERATORS += inspectorJSON + +@@ -908,7 +908,7 @@ + entities.output = HTMLEntityTable.cpp + entities.input = HTML_ENTITIES + entities.script = $$PWD/html/parser/create-html-entity-table +-entities.commands = python $$entities.script -o ${QMAKE_FILE_OUT} $$HTML_ENTITIES ++entities.commands = python2 $$entities.script -o ${QMAKE_FILE_OUT} $$HTML_ENTITIES + entities.clean = ${QMAKE_FILE_OUT} + entities.depends = $$PWD/html/parser/create-html-entity-table + GENERATORS += entities diff --git a/extra/vcdimager/PKGBUILD b/extra/vcdimager/PKGBUILD index bc97912b3..9fd15ea08 100644 --- a/extra/vcdimager/PKGBUILD +++ b/extra/vcdimager/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 150884 2012-02-23 13:48:13Z allan $ +# $Id: PKGBUILD 175148 2013-01-15 11:34:24Z jgc $ # Maintainer: damir <damir@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=vcdimager pkgver=0.7.24 -pkgrel=2 +pkgrel=3 pkgdesc="A full-featured mastering suite for authoring disassembling and analyzing Video CD's and Super Video CD's" arch=('i686' 'x86_64') url="http://www.vcdimager.org/" license=('GPL') -depends=('libcdio>=0.82' 'libxml2>=2.7.3' 'popt') +depends=('libcdio' 'libxml2' 'popt') options=('!libtool') install=vcdimager.install source=(ftp://ftp.gnu.org/gnu/vcdimager/${pkgname}-${pkgver}.tar.gz @@ -24,11 +24,6 @@ build() { make } -check() { - cd "${srcdir}/${pkgname}-${pkgver}" - make check -} - package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index a451d73b0..baa8dc2fa 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 173231 2012-12-14 20:30:38Z giovanni $ +# $Id: PKGBUILD 175149 2013-01-15 11:34:26Z jgc $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Martin Sandsmark <martin.sandsmark@kde.org> pkgname=vlc pkgver=2.0.5 -pkgrel=1 +pkgrel=2 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64') url="http://www.videolan.org/vlc/" diff --git a/extra/xine-lib/PKGBUILD b/extra/xine-lib/PKGBUILD index e511a998f..20aec1e29 100644 --- a/extra/xine-lib/PKGBUILD +++ b/extra/xine-lib/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 169760 2012-10-27 23:42:28Z eric $ +# $Id: PKGBUILD 175150 2013-01-15 11:34:28Z jgc $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=xine-lib pkgver=1.2.2 -pkgrel=3 +pkgrel=4 pkgdesc="A multimedia playback engine" arch=('i686' 'x86_64') url="http://www.xine-project.org" diff --git a/libre/clementine-libre/PKGBUILD b/libre/clementine-libre/PKGBUILD index fb7beb4f6..2bfa111f8 100644 --- a/libre/clementine-libre/PKGBUILD +++ b/libre/clementine-libre/PKGBUILD @@ -4,18 +4,19 @@ #Contributor: Dany Martineau <dany.luc.martineau@gmail.com> #Maintainer (Parabola): André Silva <emulatorman@lavabit.com> #Contributor (Parabola): Kete <kete@ninthfloor.org> +#Contributor (Parabola): Márcio Silva <coadde@lavabit.com> _pkgname=clementine pkgname=clementine-libre pkgver=1.1.1 -pkgrel=2 +pkgrel=3 pkgdesc="A music player and library organizer, without spotify support" url="http://www.clementine-player.org/" license=('GPL') arch=('i686' 'x86_64') depends=('gstreamer0.10-base' 'taglib' 'glew' 'liblastfm' 'libgpod' 'libmtp' 'libplist' 'hicolor-icon-theme' 'qt' 'libimobiledevice' - 'sparsehash' 'qjson' 'libcdio' 'protobuf' 'qca' 'qca-ossl' 'gvfs') + 'sparsehash' 'qjson' 'libcdio-paranoia' 'protobuf' 'qca' 'qca-ossl' 'gvfs') makedepends=('cmake' 'boost' 'mesa') optdepends=('gstreamer0.10-base-plugins: for more open formats' 'gstreamer0.10-good-plugins: for use with "Good" plugin libraries' diff --git a/libre/iceape-l10n/PKGBUILD b/libre/iceape-l10n/PKGBUILD new file mode 100644 index 000000000..1170df1d5 --- /dev/null +++ b/libre/iceape-l10n/PKGBUILD @@ -0,0 +1,87 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> +# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> +# Contributor: fauno <fauno@kiwwwi.com.ar> +# Contributor: Figue <ffigue@gmail.com> +# Based on icecat-i18n package, which is in turn based on firefox-i18n + +# When updating to a newer upstream release: +# - Edit variables in in Makefile. +# - (optionally) edit PKGBUILD.in +# - Run 'make'. It will take care of everything else for you. + +_debname=iceape +_debver=2.7.11 +_debrel=1 +_debrepo=http://ftp.debian.org/debian/pool/main/ +debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } + +_langpacks=(be ca cs de en-GB es-AR es-ES fi fr gl hu it ja lt nb-NO nl pl pt-PT ru sk sv-SE tr zh-CN) + +pkgbase=iceape-l10n +pkgname=($(for lang in ${_langpacks[@]} + do echo $pkgbase-$lang | tr A-Z a-z + done)) +_pkgver=2.7.11 +pkgver=${_debver}.${_debrel} +pkgrel=1 + +pkgdesc="Language packs for Debian Iceape." +arch=('i686' 'x86_64' 'mips64el') +url="http://packages.debian.org/source/sid/iceape" +license=('MPL') +depends=("iceape-libre>=$pkgver") + +source=() +for lang in ${_langpacks[@]} +do + source+=("${_debrepo}/`debfile ${_debname}`-l10n-$(echo $lang | tr A-Z a-z)_${_debver}-${_debrel}_all.deb") +done + +build() { + cd "${srcdir}" + for f in *.deb + do + bsdtar xf $f + bsdtar xf data.tar.gz + done +} + +_path="/usr/lib/iceape/extensions" + + +for lang in ${_langpacks[@]} +do + eval " +package_iceape-l10n-$(echo $lang | tr A-Z a-z)() { + replaces=(iceape-i18n-$(echo $lang | tr A-Z a-z)) + conflicts=(iceape-i18n-$(echo $lang | tr A-Z a-z)) + provides=(iceape-i18n-$(echo $lang | tr A-Z a-z)) + install -Dm644 \"\$srcdir$_path/langpack-$lang@iceape.mozilla.org.xpi\" \"\$pkgdir$_path/langpack-$lang@iceape.mozilla.org.xpi\" +} +" +done + +md5sums=('fb27360aff6250e7d483803583a5cd78' + '236c7aacd7e6416a37aff95f7bfa6a80' + 'f17d76128ab529415078cafe63b61d50' + '07a5c72158427db8c5a990be6eb2d036' + 'fddbcf27d00f1f4d92fed197ace8dd1b' + '96eb3291200c44ffdc3ab1d1446f00b7' + '04dec3bee388ae66cd434342ab03074f' + 'bdef8b38501e7d6805b5304ef2bf8425' + '90b5d0ab0ab2eb3b75e5f80cb6d289bb' + '97f940c39b84a90b0e16eaeca4fa7806' + '34644b44381ae1da46f2fa308fd1cf34' + 'a6240664344798568276dd5dbdd27fb2' + '61aedef6a89b400584dde82b5e97ff0f' + 'abe7a9172876b30c4677b1f4c2237fc9' + '60f3c543fbdb72cc12aef8f2369101ff' + 'c002da281c0d0fa357f92edd2b8cd12c' + 'c17ab30f25f05024879afdf85fa4c516' + '250a08a999d6d1d6086ffbd17d60fbb4' + '609ce8793ea0d5465da7195e4d956fef' + '060226599bac5bc8ddb64417ef1a0108' + 'eaa827909690bfa8dfdc621164e23ca8' + '3fb66893b5ea3b959de48ef16fb26c74' + '6f2d77e767efa0b0d4cb56df9ccd0a2f') diff --git a/libre/icedove-l10n/PKGBUILD b/libre/icedove-l10n/PKGBUILD new file mode 100644 index 000000000..7e983a88c --- /dev/null +++ b/libre/icedove-l10n/PKGBUILD @@ -0,0 +1,97 @@ +# Maintainer: Márcio Silva <coadde@lavabit.com> +# Maintainer: André Silva <emulatorman@lavabit.com> + +pkgbase=icedove-l10n +pkgver=17.0.2.1 + +_langpacks=(ar ast be bg bn-BD br ca cs da de el en-GB en-US es-AR es-ES et eu fi fr fy-NL ga-IE gd gl he hr hu hy-AM id is it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr uk vi zh-CN zh-TW) + +pkgname=($(for lang in ${_langpacks[@]} + do echo $pkgbase-$lang | tr A-Z a-z + done)) + +pkgrel=1 +pkgdesc="Language packs for Debian Icedove." +arch=('i686' 'x86_64' 'mips64el') +url="http://packages.debian.org/source/experimental/icedove" +license=('MPL' 'GPL') +depends=("icedove-libre>=$pkgver") +_url=http://repo.parabolagnulinux.org/other/$pkgbase/releases/$pkgver + +source=() +for lang in ${_langpacks[@]} +do + source+=("langpack-$lang@icedove.mozilla.org.xpi::$_url/$lang.xpi") +done + +# Don't extract anything +noextract=(${source[@]##*/}) + +_path="/usr/lib/icedove/extensions/" + +for lang in ${_langpacks[@]} +do + eval " +package_icedove-l10n-$(echo $lang | tr A-Z a-z)() { + replaces=(icedove-i18n-$(echo $lang | tr A-Z a-z)) + conflicts=(icedove-i18n-$(echo $lang | tr A-Z a-z)) + install -Dm644 \"\$srcdir/langpack-$lang@icedove.mozilla.org.xpi\" \"\$pkgdir$_path/langpack-$lang@icedove.mozilla.org.xpi\" +} +" +done + +md5sums=('2586db5adf22dd42ae272d9fdc1b230e' + '20c25addb6e2cb3ffec146c1aca81848' + 'b067b93b7f8adaf83fb8ea72d58b6581' + 'ec62aaa9fff666c7071869cf45d2d113' + '12b0e70965d7317a31d7d7b35195ee67' + 'ff10849757b8157b73707ccfe572edf4' + '89c7ea5ca764a2a4e4fbb9a720b8bd97' + 'bf5cf9401ac5b10fa65a1e37a69b134d' + 'fc97d1b7c0a209351d00e48075715986' + '9439304cb4c13fbebb24872904df98f9' + 'cc6f97d63af3686e08a8624930c7784b' + '35a840226d1b8b3a0484f6327bd43b64' + '26bf1309ee516fd183eb6afdaf3d703f' + '9885394265e334d5026430c70d83669e' + 'd39ac07026e6fea2b6e8cf9420cdae3c' + 'c3154fd92db6387052b67154eee2c6cb' + '5cd99e7414eebcc92724752d569ae18f' + '48517d7a3295cab360e102945c4724f0' + '27dfcf129c0e1e752149f1065e7683e2' + '0f24e9851e14537f2d245ff7e0aae9e1' + '839ffc54ae6593ec4d170957750bd2f2' + '1a16c57b85ab9805bb7bc9afe8438efb' + '1481869608ec96bdd2867ff3d507010b' + '4e9633d016998af326fb0d759e4c03ce' + 'bcf6664cf8667f5425bad0c4e261f5f8' + 'a625dd60dffacfff6adab1a764f57721' + '5c7b974dfc964abc0625ac770c558f08' + '4c40f6e2da31675609b8fd6473f255a3' + 'd57c319232421f43638b1af551704464' + '155143f28edcb18cc39b1ad2b36e4945' + 'f54217af7efb23324012d1bb3510a17d' + 'd55d65f2c2b813da2a005beb751d3a8d' + '23b699906a9ddae4589b2bf69bc40d66' + 'b5c87362efedd884a5dbecff2f5c5dad' + 'bec280e6279fb279143a99e348ce610f' + 'd2eed0961cf3f684b20b4eb0a1d89189' + 'ef85215d35b1e76e0058b98a9885e09d' + '821d982f3c859b90615cefc321854fee' + '03d7b26f8a60a1172b7dad3b45870b0f' + '78b1830da6f93d87a491704c03bca2f3' + 'da602151f86db7d701b1806ad0972734' + '2db261b975a9c1199ef707c96a3ee677' + 'b04a05cb6e66c2cdf9893954fd8dae49' + 'c3d3969d4f590dfad0def596d1f5521f' + '4892a9c3e0554815448d604de3857b37' + 'b6250637b5beacec9ae6223b9878a53a' + '987f9765fd6ee3d080533c071dff6492' + '07e375fb25b3bd39ada11b6e18e7a836' + '204ad4b577b3b23c664a442766e88cc1' + '40b03dd5114095fbd15c943e7da3abfc' + 'e14c994576b6824ff36b3e0e2bba6157' + '4d1674a0f9d106c5a05c422742802add' + '0c13d6c651ae5cca046d976df7576119' + 'fd6da709c6937c419d2962275e3efdf1' + '8fc2d9cb6724cd6fa010c5870d4d3122') diff --git a/pcr/mednafen-wip/PKGBUILD b/pcr/mednafen-wip/PKGBUILD index 7e9a5323b..167a806e2 100755 --- a/pcr/mednafen-wip/PKGBUILD +++ b/pcr/mednafen-wip/PKGBUILD @@ -6,8 +6,9 @@ pkgbase=mednafen pkgname=mednafen-wip -pkgver=0.9.27 -_pkgver=441 +pkgflag=wip +pkgver=0.9.28 +_pkgver=450 pkgrel=1 pkgdesc='A command-line multi-system gaming emulator, WIP version' url="http://$pkgbase.sourceforge.net/" @@ -32,8 +33,8 @@ makedepends=( ) provides=$pkgbase conflicts=$pkgbase -source='http://forum.fobby.net/index.php?t=getfile&id='$_pkgver'&' -sha1sums=5be7597bb8fc9c47ae434d4a0aab16e13230b916 +source=$pkgbase-$pkgver-$pkgflag.tar.bz2::'http://forum.fobby.net/index.php?t=getfile&id='$_pkgver'&' +sha1sums=6948b0f06d72f8056690d229581e94408d40c918 build() { cd $srcdir/$pkgbase |