diff options
28 files changed, 330 insertions, 163 deletions
diff --git a/community/geany-plugins/PKGBUILD b/community/geany-plugins/PKGBUILD index 1c6f29bdb..35c7e297d 100644 --- a/community/geany-plugins/PKGBUILD +++ b/community/geany-plugins/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 81106 2012-12-12 00:47:32Z eric $ +# $Id: PKGBUILD 81735 2012-12-27 22:27:45Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> # Contributor: djgera @@ -6,12 +6,12 @@ pkgname=geany-plugins pkgver=1.22 -pkgrel=4 +pkgrel=5 pkgdesc='Combined plugins release for Geany' arch=('x86_64' 'i686' 'mips64el') url='http://plugins.geany.org/' license=('GPL') -depends=('geany=1.22' 'lua' 'gtkspell' 'libwebkit' 'ctpl' 'gpgme' 'vte' 'desktop-file-utils' 'gtk-update-icon-cache') +depends=('geany=1.22' 'lua51' 'gtkspell' 'libwebkit' 'ctpl' 'gpgme' 'vte' 'desktop-file-utils' 'gtk-update-icon-cache') makedepends=('intltool' 'vala' 'gdb' 'cppcheck') optdepends=('hspell: hebrew spell checker') options=('!libtool') @@ -22,7 +22,8 @@ sha256sums=('a0dcf0cb00ac260670ef8fae682aade60c7c3075c88121fd21f3aecdff84e1ce') build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --libexecdir=/usr/lib --disable-geanylua + # the geanylua plugin currently doesn't work with lua 5.2, only 5.1 + ./configure --prefix=/usr --libexecdir=/usr/lib # --disable-geanylua make } diff --git a/community/geany-plugins/geany-plugins.install b/community/geany-plugins/geany-plugins.install index bce670aff..c7a5da359 100644 --- a/community/geany-plugins/geany-plugins.install +++ b/community/geany-plugins/geany-plugins.install @@ -10,3 +10,5 @@ post_upgrade() { post_remove() { post_install } + +# vim:set ts=2 sw=2 et: diff --git a/community/highlight/PKGBUILD b/community/highlight/PKGBUILD index 497291cc2..77b142f7a 100644 --- a/community/highlight/PKGBUILD +++ b/community/highlight/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 81109 2012-12-12 00:47:35Z eric $ +# $Id: PKGBUILD 81704 2012-12-27 07:55:09Z bluewind $ # Maintainer: Florian Pritz <flo@xinu.at> # Contributor: Jan Fader <jan.fader@web.de> pkgbase=highlight pkgname=(highlight highlight-gui) pkgver=3.12 -pkgrel=2 +pkgrel=3 url="http://www.andre-simon.de/doku/highlight/highlight.html" license=('GPL') arch=('i686' 'x86_64' 'mips64el') @@ -26,7 +26,7 @@ build() { package_highlight() { pkgdesc="Fast and flexible source code highlighter (CLI version)" - depends=('lua') + depends=('lua51') cd "$srcdir/$pkgbase-$pkgver" make DESTDIR="$pkgdir" install diff --git a/community/libaccounts-glib/PKGBUILD b/community/libaccounts-glib/PKGBUILD index 5ff11d482..23340fed6 100644 --- a/community/libaccounts-glib/PKGBUILD +++ b/community/libaccounts-glib/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 79487 2012-11-06 04:11:07Z bgyorgy $ +# $Id: PKGBUILD 81730 2012-12-27 21:37:34Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=libaccounts-glib -pkgver=1.3 +pkgver=1.4 pkgrel=1 pkgdesc="Glib-based client library for accessing the online accounts database" arch=('i686' 'x86_64' 'mips64el') @@ -14,22 +14,13 @@ options=('!libtool') source=(http://accounts-sso.googlecode.com/files/$pkgname-$pkgver.tar.gz fix-docdir.patch make-tests-optional.patch) -sha1sums=('a2bd07082e9e9235103051f6574b154182745aee' +sha1sums=('d5c9683a6d48b977fc85523575f00b9e9cd3daa0' '94291a58dbbd36f524538adbf6d0c5a55024a34c' '35732dc134c32af6ad1684d6388bad8ffe3f4dcc') build() { cd "$srcdir/$pkgname-$pkgver" - # Use the standard docdir location - # http://code.google.com/p/accounts-sso/issues/detail?id=123 - patch -Np1 -i "$srcdir/fix-docdir.patch" - - # Build tests optionally - # http://code.google.com/p/accounts-sso/issues/detail?id=124 - patch -Np1 -i "$srcdir/make-tests-optional.patch" - - autoreconf -fi ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-static \ PYTHON=python2 diff --git a/community/libmicrohttpd/PKGBUILD b/community/libmicrohttpd/PKGBUILD index 9dc92493a..c7cce110c 100644 --- a/community/libmicrohttpd/PKGBUILD +++ b/community/libmicrohttpd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 80762 2012-12-03 10:11:15Z spupykin $ +# $Id: PKGBUILD 81709 2012-12-27 13:15:11Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Norberto Lopes <shelika@mail.telepac.pt> # Contributor: Kao Dome <kaodome@gmail.com> @@ -6,8 +6,8 @@ # Contributor: Mathias Rohnstock <linksoft@gmx.de> pkgname=libmicrohttpd -pkgver=0.9.23 -pkgrel=2 +pkgver=0.9.24 +pkgrel=1 pkgdesc="a small C library that is supposed to make it easy to run an HTTP server as part of another application." arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/libmicrohttpd/" @@ -16,7 +16,7 @@ options=('!libtool') depends=('gnutls' 'libgcrypt') install=libmicrohttpd.install source=(ftp://ftp.gnu.org/gnu/libmicrohttpd/$pkgname-$pkgver.tar.gz) -md5sums=('efd038d93836adc0149beaa1c2927f61') +md5sums=('2891c82cc85a92e6944cacf9ae413f7c') build() { cd ${pkgname}-${pkgver} diff --git a/community/rxvt-unicode/PKGBUILD b/community/rxvt-unicode/PKGBUILD index f9f20d47d..cdcd4c69c 100644 --- a/community/rxvt-unicode/PKGBUILD +++ b/community/rxvt-unicode/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 71847 2012-06-02 10:32:52Z bluewind $ +# $Id: PKGBUILD 81737 2012-12-28 00:16:43Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: tobias <tobias@archlinux.org> # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org pkgname=rxvt-unicode -pkgver=9.15 -pkgrel=3 +pkgver=9.16 +pkgrel=1 pkgdesc='An unicode enabled rxvt-clone terminal emulator (urxvt)' arch=('i686' 'x86_64' 'mips64el') url='http://software.schmorp.de/pkg/rxvt-unicode.html' @@ -19,7 +19,7 @@ source=( 'urxvtc.desktop' 'urxvt-tabbed.desktop' ) -md5sums=('15595aa326167ac5eb68c28d95432faf' +md5sums=('2e2942e8367624affebc0568e3671b66' '88d8786d74b819450adf722180db09fd' 'bebf5b6b399b74b557fcedbdb47cc387' '2604896bb107fbb5511bfd6f46d65894') diff --git a/community/rygel/PKGBUILD b/community/rygel/PKGBUILD index 681e3500a..40be1228e 100644 --- a/community/rygel/PKGBUILD +++ b/community/rygel/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 80273 2012-11-18 23:53:28Z bgyorgy $ +# $Id: PKGBUILD 81715 2012-12-27 20:10:52Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=rygel -pkgver=0.16.3 +pkgver=0.16.4 pkgrel=1 pkgdesc="UPnP AV MediaServer and MediaRenderer that allows you to easily share audio, video and pictures, and control of media player on your home network" arch=('i686' 'x86_64' 'mips64el') @@ -19,7 +19,7 @@ backup=('etc/rygel.conf') options=('!libtool') install=$pkgname.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('a0325afabb6a91cbe958864183adce80ad88bcaa0fc8f8ed3f434ee0d09935bf') +sha256sums=('3cf338c120751ea068c90f65bfb2a63c436cdf59b02ce159b6376a349717ed7a') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/signon-plugin-oauth2/PKGBUILD b/community/signon-plugin-oauth2/PKGBUILD index a1d895fc1..4e95f1cb2 100644 --- a/community/signon-plugin-oauth2/PKGBUILD +++ b/community/signon-plugin-oauth2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 80671 2012-11-29 00:06:53Z bgyorgy $ +# $Id: PKGBUILD 81732 2012-12-27 21:40:51Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=signon-plugin-oauth2 _pkgname=signon-oauth2 -pkgver=0.13 +pkgver=0.14 pkgrel=1 pkgdesc="OAuth 2 plugin for signon" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('LGPL') depends=('signon-ui' 'qjson') makedepends=('signon') source=(http://accounts-sso.googlecode.com/files/$_pkgname-$pkgver.tar.bz2) -sha1sums=('74b4c31fcadf35b19c058c85b2e8f5566fcb281d') +sha1sums=('348c59af181c28ab3ac7b5fc76cd6758fc6b63e6') build() { cd "$srcdir/$_pkgname-$pkgver" diff --git a/community/virtkey/PKGBUILD b/community/virtkey/PKGBUILD index 4db74b450..a29c75190 100644 --- a/community/virtkey/PKGBUILD +++ b/community/virtkey/PKGBUILD @@ -4,14 +4,14 @@ pkgbase=virtkey pkgname=('python2-virtkey' 'python-virtkey') -pkgver=0.62.0 +pkgver=0.63.0 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="https://launchpad.net/virtkey" license=('LGPL') -makedepends=('python2' 'python' 'libxtst' 'gtk2') +makedepends=('python2' 'python' 'libxtst' 'libxkbfile' 'gtk2') source=(http://launchpad.net/$pkgbase/${pkgver%.*}/$pkgver/+download/$pkgbase-$pkgver.tar.gz) -md5sums=('2c6f2e5941501f74d754554c545a2186') +md5sums=('c1569fbb143692aafba00758041fad98') build() { cd "$srcdir" @@ -29,7 +29,7 @@ build() { package_python2-virtkey() { pkgdesc="Python 2 extension for emulating keypresses and getting layout information from the X server" - depends=('python2' 'libxtst' 'gtk2') + depends=('python2' 'libxtst' 'libxkbfile' 'gtk2') cd "$srcdir/python2-$pkgbase-$pkgver" @@ -38,7 +38,7 @@ package_python2-virtkey() { package_python-virtkey() { pkgdesc="Python extension for emulating keypresses and getting layout information from the X server" - depends=('python' 'libxtst' 'gtk2') + depends=('python' 'libxtst' 'libxkbfile' 'gtk2') cd "$srcdir/$pkgbase-$pkgver" diff --git a/community/xmlstarlet/PKGBUILD b/community/xmlstarlet/PKGBUILD index f10c67071..7b95c0191 100644 --- a/community/xmlstarlet/PKGBUILD +++ b/community/xmlstarlet/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 79551 2012-11-07 10:18:04Z spupykin $ +# $Id: PKGBUILD 81711 2012-12-27 13:15:34Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: PyroPeter <abi1789@googlemail.com> # Contributor: BlackEagle <ike.devolder@scarlet.be> # Contributor: chochem <chochem@gmail.com> pkgname=xmlstarlet -pkgver=1.4.0 +pkgver=1.4.1 pkgrel=1 pkgdesc="A set of tools to transform, query, validate, and edit XML documents" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ url="http://xmlstar.sourceforge.net/" license=('MIT') depends=('libxslt>=1.1.9') source=("xmlstarlet-$pkgver.tar.gz::http://sourceforge.net/projects/xmlstar/files/xmlstarlet/$pkgver/xmlstarlet-$pkgver.tar.gz/download") -md5sums=('9f1d8e23f6f3d4a688fe0c05610caff4') +md5sums=('fd78564417634583692b04193bc0bbc6') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/core/sed/PKGBUILD b/core/sed/PKGBUILD index 994ff8a2b..bbc9a1078 100644 --- a/core/sed/PKGBUILD +++ b/core/sed/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 142078 2011-11-04 23:36:15Z allan $ +# $Id: PKGBUILD 173887 2012-12-27 05:05:41Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=sed -pkgver=4.2.1 -pkgrel=4.2 +pkgver=4.2.2 +pkgrel=1 pkgdesc="GNU stream editor" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/sed" @@ -14,12 +14,12 @@ depends=('acl' 'sh') makedepends=('gettext') install=sed.install source=(ftp://ftp.gnu.org/pub/gnu/sed/${pkgname}-${pkgver}.tar.gz{,.sig}) -md5sums=('f0fd4d7da574d4707e442285fd2d3b86' - '91871b227dbf0916e019ba1fb0fbfdf3') +md5sums=('4111de4faa3b9848a0686b2f260c5056' + '86a5ab72f414d4cb38126e8e27cf0101') build() { cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --bindir=/bin --without-included-regex + ./configure --prefix=/usr make } @@ -31,4 +31,8 @@ check() { package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install + + mkdir $pkgdir/bin + ln -s ../usr/bin/sed $pkgdir/bin + } diff --git a/extra/doxygen/PKGBUILD b/extra/doxygen/PKGBUILD index a5dbb427c..448840e00 100644 --- a/extra/doxygen/PKGBUILD +++ b/extra/doxygen/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 165316 2012-08-15 13:47:42Z dan $ +# $Id: PKGBUILD 173919 2012-12-28 04:42:22Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgbase=doxygen pkgname=('doxygen' 'doxygen-docs') -pkgver=1.8.2 +pkgver=1.8.3 pkgrel=1 license=('GPL') arch=(i686 x86_64 'mips64el') url="http://www.doxygen.org/" -makedepends=('gcc-libs' 'flex' 'qt' 'texlive-core' 'ghostscript' 'texlive-latexextra') +makedepends=('gcc-libs' 'flex' 'qt' 'texlive-core' 'ghostscript' + 'texlive-latexextra' 'graphviz') source=(ftp://ftp.stack.nl/pub/users/dimitri/${pkgname}-${pkgver}.src.tar.gz) -md5sums=('6fa7baf995fa3f71cfc09e264ba88a83') -sha1sums=('7b88ade3989ce0f43f0fb2b2574436c4f1fa1c5a') +md5sums=('7004085a39217b4848e26ee726b3c9a7') +sha1sums=('3719f062bf88a3793dc94711d159205b8bb6fd19') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/exo/PKGBUILD b/extra/exo/PKGBUILD index f5d868ff6..62ae913bb 100644 --- a/extra/exo/PKGBUILD +++ b/extra/exo/PKGBUILD @@ -1,33 +1,27 @@ -# $Id: PKGBUILD 173786 2012-12-22 22:26:11Z foutrelis $ +# $Id: PKGBUILD 173898 2012-12-27 13:10:52Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: tobias <tobias funnychar archlinux.org> # Contributor: Aurelien Foret <orelien@chez.com> pkgname=exo -pkgver=0.10.1 -pkgrel=2 +pkgver=0.10.2 +pkgrel=1 pkgdesc="Extensions to Xfce by os-cillation" arch=('i686' 'x86_64' 'mips64el') url="http://www.xfce.org/" license=('GPL2' 'LGPL') groups=('xfce4') depends=('libxfce4ui' 'gtk2' 'hicolor-icon-theme' ) -makedepends=('perl-uri' 'intltool' 'gtk-doc' 'xorg-iceauth' 'xfce4-dev-tools') +makedepends=('perl-uri' 'intltool' 'gtk-doc' 'xorg-iceauth') optdepends=('perl-uri: for mail-compose helper script') options=('!libtool') install=$pkgname.install -source=(http://archive.xfce.org/src/xfce/$pkgname/0.10/$pkgname-$pkgver.tar.bz2 - drop-HAVE_GIO_UNIX-ifdef-and-load-gio-unix-2.0-pkg.patch) -sha256sums=('34a6d14c58a12d3372eb810d05ae425b8c8c32ec976b99b6ad274c3f7b3f6896' - '9983b3206391f0e86816d70ded4fc5ddd48ac27dd29b266d4ba4a930ca663626') +source=(http://archive.xfce.org/src/xfce/$pkgname/0.10/$pkgname-$pkgver.tar.bz2) +sha256sums=('b385828bf8a38204da3254b57fdfa25a72694495aa189fabd5040f707eec76ce') build() { cd "$srcdir/$pkgname-$pkgver" - # Fix launching of .desktop files (https://bugs.archlinux.org/task/33125) - patch -Np1 -i "$srcdir/drop-HAVE_GIO_UNIX-ifdef-and-load-gio-unix-2.0-pkg.patch" - NOCONFIGURE=1 xdt-autogen - # Python 2 fix export PYTHON=python2 diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index 188069d38..6727b9a08 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 173146 2012-12-11 15:31:20Z dan $ +# $Id: PKGBUILD 173917 2012-12-28 04:30:01Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=git -pkgver=1.8.0.2 +pkgver=1.8.0.3 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64 'mips64el') @@ -109,8 +109,8 @@ package() { install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket } -md5sums=('1aca109d4a719fe5bc43d25927fbc7d9' - 'ab83283a5b3c73ab711a9f02896ca12e' +md5sums=('6a32290550c9e8aa55aeb6e8db9c183f' + '962ba4fb286372386c83c3712d1fd59a' '8e2648910fd5dd4f1c41d3c7fa9e9156' '2e42bf97779a1c6411d89043334c9e78' '042524f942785772d7bd52a1f02fe5ae' diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD index 353d07263..46c0ab6d5 100644 --- a/extra/kdebase-workspace/PKGBUILD +++ b/extra/kdebase-workspace/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 172810 2012-12-06 08:19:33Z andrea $ +# $Id: PKGBUILD 173893 2012-12-27 10:15:03Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdebase-workspace _pkgname=kde-workspace pkgver=4.9.4 -pkgrel=1 +pkgrel=2 pkgdesc="Provides the interface and basic tools for the KDE workspace" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kde-workspace' diff --git a/extra/smplayer/PKGBUILD b/extra/smplayer/PKGBUILD index 5ef75191f..5eee90c6b 100644 --- a/extra/smplayer/PKGBUILD +++ b/extra/smplayer/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 167263 2012-09-29 13:32:07Z ibiru $ +# $Id: PKGBUILD 173913 2012-12-28 02:38:34Z foutrelis $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com> # Contributor: shamrok <szamrok@gmail.com> pkgname=smplayer -pkgver=0.8.1 +pkgver=0.8.3 pkgrel=1 pkgdesc="A complete front-end for MPlayer" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ license=('GPL') depends=('qt' 'mplayer') install=smplayer.install source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2) -md5sums=('39556a6113afcd9ceee071a8f85477dc') +md5sums=('48755bffdff3878df32d8c047d7a3d52') build() { cd "$pkgname-$pkgver" diff --git a/extra/tcl/PKGBUILD b/extra/tcl/PKGBUILD index 5b3c76238..e760e3735 100644 --- a/extra/tcl/PKGBUILD +++ b/extra/tcl/PKGBUILD @@ -1,20 +1,25 @@ -# $Id: PKGBUILD 173849 2012-12-25 00:34:44Z foutrelis $ +# $Id: PKGBUILD 173902 2012-12-27 19:20:12Z andyrtr $ # Maintainer: Allan McRae <allan@archlinux.org> # Committer: Judd Vinet <jvinet@zeroflux.org> pkgname=tcl pkgver=8.6.0 -pkgrel=1 +pkgrel=2 pkgdesc="The Tcl scripting language" arch=('i686' 'x86_64' 'mips64el') url="http://tcl.sourceforge.net/" license=('custom') source=(http://downloads.sourceforge.net/sourceforge/tcl/tcl${pkgver}-src.tar.gz) +# tcl E: Dependency zlib detected and not included (libraries ['usr/lib/libz.so.1'] needed in files ['usr/lib/libtcl8.6.so']) +# depends=('zlib') ??? md5sums=('573aa5fe678e9185ef2b3c56b24658d3') build() { cd ${srcdir}/tcl${pkgver}/unix + # maybe drop sqlite build at all? isn't this the same we already have in sqlite and sqlite-tcl pkg? + # rm -rf ${srcdir}/tcl${pkgver}/pkgs/sqlite3* + [[ $CARCH == "x86_64" ]] && BIT="--enable-64bit" ./configure --prefix=/usr --mandir=/usr/share/man --enable-threads $BIT @@ -38,4 +43,7 @@ package() # remove buildroot traces sed -i "s#${srcdir}#/usr/src#" ${pkgdir}/usr/lib/{tcl,tdbc1.0.0/tdbc,itcl4.0.0/itcl}Config.sh + + # fix a fileconflitct - FS#33201 + rm ${pkgdir}/usr/share/man/mann/sqlite3.n } diff --git a/extra/thunar/PKGBUILD b/extra/thunar/PKGBUILD index 77840cd1b..de4a198f9 100644 --- a/extra/thunar/PKGBUILD +++ b/extra/thunar/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 173051 2012-12-09 18:17:19Z foutrelis $ +# $Id: PKGBUILD 173900 2012-12-27 13:11:31Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Andrew Simmons <andrew.simmons@gmail.com> pkgname=thunar -pkgver=1.6.1 +pkgver=1.6.2 pkgrel=1 pkgdesc="Modern file manager for Xfce" arch=('i686' 'x86_64' 'mips64el') @@ -23,7 +23,7 @@ optdepends=('gvfs: for trash support, mounting with udisk and remote filesystems options=('!libtool') install=$pkgname.install source=(http://archive.xfce.org/src/xfce/$pkgname/1.6/Thunar-$pkgver.tar.bz2) -sha256sums=('a81021af558802b8c2c6cd7db47cca262477c4f3d2b6d8cfa8dbba88568048f1') +sha256sums=('7dbd172ae396e7a2533f47dc1ff703a9ea1a61af3edfdc6f4877b9b9331abd85') build() { cd "$srcdir/Thunar-$pkgver" diff --git a/extra/transmission/PKGBUILD b/extra/transmission/PKGBUILD index 64f106019..b39b80d0b 100644 --- a/extra/transmission/PKGBUILD +++ b/extra/transmission/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 170069 2012-10-31 13:47:37Z ibiru $ +# $Id: PKGBUILD 173915 2012-12-28 03:11:25Z foutrelis $ # Maintainer : Ionut Biru <ibiru@archlinux.org> pkgbase=transmission pkgname=('transmission-cli' 'transmission-gtk' 'transmission-qt') -pkgver=2.73 -pkgrel=2 +pkgver=2.75 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.transmissionbt.com/" license=('MIT') @@ -39,7 +39,6 @@ package_transmission-cli() { install -D -m644 "$srcdir/transmissiond.conf" "$pkgdir/etc/conf.d/transmissiond" install -D -m644 "$srcdir/transmission.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/transmission.conf" install -D -m644 "$srcdir/transmission.systemd" "$pkgdir/usr/lib/systemd/system/transmission.service" - ln -s transmission.service "$pkgdir/usr/lib/systemd/system/transmissiond.service" install -D -m644 COPYING "$pkgdir/usr/share/licenses/transmission-cli/COPYING" } @@ -71,7 +70,7 @@ package_transmission-qt() { install -D -m644 qt/icons/transmission.png "$pkgdir/usr/share/pixmaps/transmission-qt.png" install -D -m644 qt/transmission-qt.desktop "$pkgdir/usr/share/applications/transmission-qt.desktop" } -md5sums=('fae00b13a7b18f9dc16edef020edea85' +md5sums=('26b92e56e1574bb10443eccbf17443a7' '7d6186ee2a852ae3d44980f05063e194' 'db72b02fee139e8ab416324e6c044d76' '5c289c8901221a94be74665368ab5c2c' diff --git a/extra/transmission/transmission-cli.install b/extra/transmission/transmission-cli.install index 94a829f5c..b0832042c 100644 --- a/extra/transmission/transmission-cli.install +++ b/extra/transmission/transmission-cli.install @@ -1,10 +1,4 @@ post_install() { - cat << _EOF - - If you want to run the Transmission daemon at boot do: - systemctl enable transmissiond -_EOF - post_upgrade passwd -l transmission &>/dev/null } diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD index bc71be0c1..154da73f3 100644 --- a/libre/kdelibs-libre/PKGBUILD +++ b/libre/kdelibs-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 172900 2012-12-06 14:03:01Z andrea $ +# $Id: PKGBUILD 173890 2012-12-27 10:10:17Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,7 +6,7 @@ _pkgname=kdelibs pkgname=kdelibs-libre pkgver=4.9.4 -pkgrel=3 +pkgrel=4 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kdelibs' @@ -15,7 +15,7 @@ depends=('strigi' 'attica' 'libxss' 'soprano' 'krb5' 'grantlee' 'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt' 'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'docbook-xsl' 'upower' 'udisks' 'libxcursor' 'phonon' 'qtwebkit' - 'media-player-info' 'libxtst') + 'media-player-info' 'libxtst' 'libutempter') makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell' 'mesa') provides=("kdelibs=$pkgver") replaces=('kdelibs') diff --git a/libre/virtualbox-libre-modules-lts/PKGBUILD b/libre/virtualbox-libre-modules-lts/PKGBUILD index 0b43cbf0a..1833f020e 100644 --- a/libre/virtualbox-libre-modules-lts/PKGBUILD +++ b/libre/virtualbox-libre-modules-lts/PKGBUILD @@ -8,18 +8,19 @@ pkgbase=virtualbox-libre-modules-lts pkgname=('virtualbox-libre-host-modules-lts' 'virtualbox-libre-guest-modules-lts') pkgver=4.2.6 -pkgrel=1 +pkgrel=4 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') makedepends=('linux-libre-lts-headers' "virtualbox-libre-host-dkms>=$pkgver" "virtualbox-libre-guest-dkms>=$pkgver" - 'expac') + 'expac' + 'bc') build() { - # current kernel libre version _kernver=$(expac -Q '%v' linux-libre-lts-headers)-LIBRE-LTS + # dkms need modification to be run as user cp -r /var/lib/dkms . echo "dkms_tree='$srcdir/dkms'" > dkms.conf @@ -32,16 +33,17 @@ build() { } package_virtualbox-libre-host-modules-lts(){ - pkgdesc='Host kernel libre modules for VirtualBox' + _kernver=$(expac -Q '%v' linux-libre-lts-headers)-LIBRE-LTS + _extraver=extramodules-${_kernver%.*}-LIBRE-LTS + + pkgdesc='Host kernel modules for VirtualBox (built for the linux-libre-lts kernel package)' +# depends=("linux-libre-lts>=${_kernver%.*}" "linux-libre-lts<$(echo "${_kernver%.*}+0.1"|bc)") depends=('linux-libre-lts>=3.0' 'linux-libre-lts<3.1') replaces=('virtualbox-host-modules-lts' 'virtualbox-modules-lts' 'virtualbox-libre-modules-lts') conflicts=('virtualbox-host-modules-lts' 'virtualbox-modules-lts' 'virtualbox-libre-modules-lts') provides=("virtualbox-host-modules-lts=$pkgver" "virtualbox-libre-host-modules=$pkgver") install=virtualbox-libre-host-modules-lts.install - _kernver=$(expac -Q '%v' linux-libre-lts-headers)-LIBRE-LTS - _extraver=extramodules-${_kernver%.*}-LIBRE-LTS - install -dm755 "$pkgdir/usr/lib/modules/$_extraver" cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module" install -m644 * "$pkgdir/usr/lib/modules/$_extraver" @@ -50,17 +52,18 @@ package_virtualbox-libre-host-modules-lts(){ } package_virtualbox-libre-guest-modules-lts(){ - pkgdesc='Guest kernel libre modules for VirtualBox' + _kernver=$(expac -Q '%v' linux-libre-lts-headers)-LIBRE-LTS + _extraver=extramodules-${_kernver%.*}-LIBRE-LTS + + pkgdesc='Guest kernel modules for VirtualBox (built for the linux-libre-lts kernel package)' license=('GPL') +# depends=("linux-libre-lts>=${_kernver%.*}" "linux-libre-lts<$(echo "${_kernver%.*}+0.1"|bc)") depends=('linux-libre-lts>=3.0' 'linux-libre-lts<3.1') replaces=('virtualbox-guest-modules-lts' 'virtualbox-archlinux-modules-lts' 'virtualbox-libre-parabola-modules-lts') conflicts=('virtualbox-guest-modules-lts' 'virtualbox-archlinux-modules-lts' 'virtualbox-libre-parabola-modules-lts') provides=("virtualbox-guest-modules-lts=$pkgver" "virtualbox-libre-host-modules=$pkgver") install=virtualbox-libre-guest-modules-lts.install - _kernver=$(expac -Q '%v' linux-libre-lts-headers)-LIBRE-LTS - _extraver=extramodules-${_kernver%.*}-LIBRE-LTS - install -dm755 "$pkgdir/usr/lib/modules/$_extraver" cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module" install -m644 * "$pkgdir/usr/lib/modules/$_extraver" diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD index 948465a99..067a95fdd 100644 --- a/libre/virtualbox-libre-modules/PKGBUILD +++ b/libre/virtualbox-libre-modules/PKGBUILD @@ -7,18 +7,19 @@ pkgbase=virtualbox-libre-modules pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules') pkgver=4.2.6 -pkgrel=2 +pkgrel=4 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') makedepends=('linux-libre-headers' "virtualbox-libre-host-dkms>=$pkgver" "virtualbox-libre-guest-dkms>=$pkgver" - 'expac') + 'expac' + 'bc') build() { - # current kernel libre version _kernver=$(expac -Q '%v' linux-libre-headers)-LIBRE + # dkms need modification to be run as user cp -r /var/lib/dkms . echo "dkms_tree='$srcdir/dkms'" > dkms.conf @@ -31,16 +32,17 @@ build() { } package_virtualbox-libre-host-modules(){ + _kernver=$(expac -Q '%v' linux-libre-headers)-LIBRE + _extraver=extramodules-${_kernver%.*}-LIBRE + pkgdesc='Host kernel modules for VirtualBox (built for the linux-libre kernel package)' +# depends=("linux-libre>=${_kernver%.*}" "linux-libre<$(echo "${_kernver%.*}+0.1"|bc)") depends=('linux-libre>=3.7' 'linux-libre<3.8') provides=("virtualbox-host-modules=${pkgver}") replaces=('virtualbox-host-modules' 'virtualbox-modules' 'virtualbox-libre-modules') conflicts=('virtualbox-host-modules' 'virtualbox-modules' 'virtualbox-libre-modules') install=virtualbox-libre-host-modules.install - _kernver=$(expac -Q '%v' linux-libre-headers)-LIBRE - _extraver=extramodules-${_kernver%.*}-LIBRE - install -dm755 "$pkgdir/usr/lib/modules/$_extraver" cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module" install -m644 * "$pkgdir/usr/lib/modules/$_extraver" @@ -49,17 +51,18 @@ package_virtualbox-libre-host-modules(){ } package_virtualbox-libre-guest-modules(){ + _kernver=$(expac -Q '%v' linux-libre-headers)-LIBRE + _extraver=extramodules-${_kernver%.*}-LIBRE + pkgdesc='Guest kernel modules for VirtualBox (built for the linux-libre kernel package)' license=('GPL') +# depends=("linux-libre>=${_kernver%.*}" "linux-libre<$(echo "${_kernver%.*}+0.1"|bc)") depends=('linux-libre>=3.7' 'linux-libre<3.8') provides=("virtualbox-guest-modules=${pkgver}") replaces=('virtualbox-guest-modules' 'virtualbox-archlinux-modules' 'virtualbox-parabola-modules') conflicts=('virtualbox-guest-modules' 'virtualbox-archlinux-modules' 'virtualbox-parabola-modules') install=virtualbox-libre-guest-modules.install - _kernver=$(expac -Q '%v' linux-libre-headers)-LIBRE - _extraver=extramodules-${_kernver%.*}-LIBRE - install -dm755 "$pkgdir/usr/lib/modules/$_extraver" cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module" install -m644 * "$pkgdir/usr/lib/modules/$_extraver" diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD index a311a0f53..dc94a2a33 100644 --- a/libre/virtualbox-libre/PKGBUILD +++ b/libre/virtualbox-libre/PKGBUILD @@ -11,10 +11,9 @@ pkgname=('virtualbox-libre' 'virtualbox-libre-host-dkms' 'virtualbox-libre-guest-dkms' 'virtualbox-libre-sdk' - 'virtualbox-libre-guest-utils' - 'virtualbox-libre-ext-vnc') + 'virtualbox-libre-guest-utils') pkgver=4.2.6 -pkgrel=1 +pkgrel=1.1 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL' 'custom') @@ -29,7 +28,6 @@ makedepends=('alsa-lib' 'libidl2' 'libpulse' 'libstdc++5' - 'libvncserver' 'libxcursor' 'libxinerama' 'libxml2' @@ -109,8 +107,8 @@ md5sums=('d680aeb3b4379b8281527aeb012b2df5' 'c7951fe6888d939f3a7d0dafe477e82b' '4da8eeb2ece7e475fc7a0d1003da26c6' '5e4187af59726d71c5be48d0cd816c34' - '85141ccd2621a8e004b8f55c9a1f83eb' - '6c93159ec2a8f2b132d87cde7202749e') + '05d166104a66ee479896c941ac27a3d0' + '78168f8699aa01a632603f0d5b1b8281') build() { cd "VirtualBox-$pkgver" @@ -151,7 +149,6 @@ build() { ./configure --disable-docs \ --enable-webservice \ --enable-vde \ - --enable-vnc \ --disable-kmods source ./env.sh kmk all @@ -166,11 +163,6 @@ build() { sed -i 's:/opt/VirtualBox:/usr/share/virtualbox:' Makefile.kmk kmk all popd - - # build VNC pack - pushd src/VBox/ExtPacks/VNC - kmk packing - popd } package_virtualbox-libre() { @@ -356,18 +348,4 @@ package_virtualbox-libre-guest-utils(){ "$pkgdir/usr/lib/systemd/system/vboxservice.service" } -package_virtualbox-libre-ext-vnc() { - pkgdesc='VirtualBox VNC extension pack' - depends=('virtualbox-libre' 'libvncserver') - optdepends=('tigervnc: vnc client') - replaces=('virtualbox-ext-vnc') - conflicts=('virtualbox-ext-vnc') - provides=("virtualbox-ext-vnc=$pkgver") - install=virtualbox-libre-ext-vnc.install - - source "VirtualBox-$pkgver/env.sh" - cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/packages" - install -Dm644 VNC-*.vbox-extpack "$pkgdir/usr/share/virtualbox/extensions/VNC-${pkgver}.vbox-extpack" -} - # vim:set ts=4 sw=4 et: diff --git a/libre/virtualbox-libre/free-distros.patch b/libre/virtualbox-libre/free-distros.patch index 8004ee99a..91d15e380 100644 --- a/libre/virtualbox-libre/free-distros.patch +++ b/libre/virtualbox-libre/free-distros.patch @@ -502,7 +502,7 @@ index 6ae0372..df65e60 100644 1024, 4, 8 * _1G64, NetworkAdapterType_I82545EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_BusLogic, StorageBus_SCSI, ChipsetType_PIIX3, AudioControllerType_AC97 }, diff --git a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp -index c5a4cfe..b3e0247 100644 +index c5a4cfe..7d2b363 100644 --- a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp +++ b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp @@ -44,46 +44,33 @@ struct osTypePattern @@ -588,7 +588,7 @@ index c5a4cfe..b3e0247 100644 { QRegExp("Arc.*64", Qt::CaseInsensitive), "ArchLinux_64" }, { QRegExp("Arc", Qt::CaseInsensitive), "ArchLinux" }, { QRegExp("Deb.*64", Qt::CaseInsensitive), "Debian_64" }, -@@ -116,15 +103,50 @@ static const osTypePattern gs_OSTypePattern[] = +@@ -116,15 +103,51 @@ static const osTypePattern gs_OSTypePattern[] = { QRegExp("(Or)|(oel)", Qt::CaseInsensitive), "Oracle" }, { QRegExp("Knoppix", Qt::CaseInsensitive), "Linux26" }, { QRegExp("Dsl", Qt::CaseInsensitive), "Linux24" }, @@ -625,6 +625,7 @@ index c5a4cfe..b3e0247 100644 + { QRegExp("(Wi.*2003)|(W2K3)", Qt::CaseInsensitive), "Windows2003" }, + { QRegExp("((Wi.*V)|(Vista)).*64", Qt::CaseInsensitive), "WindowsVista_64" }, + { QRegExp("(Wi.*V)|(Vista)", Qt::CaseInsensitive), "WindowsVista" }, ++ { QRegExp("(Wi.*2012)|(W2K12)", Qt::CaseInsensitive), "Windows2012_64" }, + { QRegExp("((Wi.*2008)|(W2K8)).*64", Qt::CaseInsensitive), "Windows2008_64" }, + { QRegExp("(Wi.*2008)|(W2K8)", Qt::CaseInsensitive), "Windows2008" }, + { QRegExp("(Wi.*2000)|(W2K)", Qt::CaseInsensitive), "Windows2000" }, @@ -647,7 +648,7 @@ index c5a4cfe..b3e0247 100644 { QRegExp("L4", Qt::CaseInsensitive), "L4" }, { QRegExp("((Fr.*B)|(fbsd)).*64", Qt::CaseInsensitive), "FreeBSD_64" }, { QRegExp("(Fr.*B)|(fbsd)", Qt::CaseInsensitive), "FreeBSD" }, -@@ -137,6 +159,8 @@ static const osTypePattern gs_OSTypePattern[] = +@@ -137,6 +160,8 @@ static const osTypePattern gs_OSTypePattern[] = { QRegExp("(Mac)|(Tig)|(Leop)|(osx)", Qt::CaseInsensitive), "MacOS" }, { QRegExp("Net", Qt::CaseInsensitive), "Netware" }, { QRegExp("Rocki", Qt::CaseInsensitive), "JRockitVE" }, @@ -656,7 +657,7 @@ index c5a4cfe..b3e0247 100644 { QRegExp("Ot", Qt::CaseInsensitive), "Other" }, }; -@@ -231,11 +255,13 @@ UIWizardNewVMPageBasic1::UIWizardNewVMPageBasic1(const QString &strGroup) +@@ -231,11 +256,13 @@ UIWizardNewVMPageBasic1::UIWizardNewVMPageBasic1(const QString &strGroup) /* Create widgets: */ QVBoxLayout *pMainLayout = new QVBoxLayout(this); { @@ -720,10 +721,10 @@ index 9a31a4c..7db11ad 100644 </xsl:attribute> <xsl:apply-templates select="@*[name()!='OSType']" mode="v1.5"/> diff --git a/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc b/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc -index 075f097..3d311e1 100644 +index 4523dad..38ae21a 100644 --- a/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc +++ b/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc -@@ -70,6 +70,24 @@ +@@ -71,6 +71,24 @@ <file alias="os_oracle_64.png">images/os_oracle_64.png</file> <file alias="os_macosx.png">images/os_macosx.png</file> <file alias="os_macosx_64.png">images/os_macosx_64.png</file> @@ -749,10 +750,10 @@ index 075f097..3d311e1 100644 <file alias="hd_disabled_16px.png">images/hd_disabled_16px.png</file> <file alias="hd_32px.png">images/hd_32px.png</file> diff --git a/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp b/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp -index ec404df..c09e3b1 100644 +index 8af9597..39a8d39 100644 --- a/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp +++ b/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp -@@ -4334,11 +4334,11 @@ void VBoxGlobal::init() +@@ -4336,11 +4336,11 @@ void VBoxGlobal::init() {"OS2Warp45", ":/os_os2warp45.png"}, {"OS2eCS", ":/os_os2ecs.png"}, {"OS2", ":/os_os2_other.png"}, @@ -769,7 +770,7 @@ index ec404df..c09e3b1 100644 {"ArchLinux", ":/os_archlinux.png"}, {"ArchLinux_64", ":/os_archlinux_64.png"}, {"Debian", ":/os_debian.png"}, -@@ -4361,7 +4361,7 @@ void VBoxGlobal::init() +@@ -4363,7 +4363,7 @@ void VBoxGlobal::init() {"Xandros_64", ":/os_xandros_64.png"}, {"Oracle", ":/os_oracle.png"}, {"Oracle_64", ":/os_oracle_64.png"}, @@ -778,7 +779,7 @@ index ec404df..c09e3b1 100644 {"FreeBSD", ":/os_freebsd.png"}, {"FreeBSD_64", ":/os_freebsd_64.png"}, {"OpenBSD", ":/os_openbsd.png"}, -@@ -4377,6 +4377,25 @@ void VBoxGlobal::init() +@@ -4379,6 +4379,25 @@ void VBoxGlobal::init() {"MacOS", ":/os_macosx.png"}, {"MacOS_64", ":/os_macosx_64.png"}, {"JRockitVE", ":/os_jrockitve.png"}, @@ -1398,15 +1399,15 @@ index f902373..625da36 100644 --- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts +++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts @@ -4850,6 +4850,10 @@ - <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> - <translation>نوع سیستم عاملی که شما قصد دارید داخل ماشین مجازی را نصب کنید نشان میدهد،که بعنوان سیستم عامل مهمان شناخته میشود.</translation> + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation>نوع سیستم عاملی که شما قصد دارید داخل ماشین مجازی را نصب کنید نشان میدهد،که بعنوان سیستم عامل مهمان شناخته میشود.</translation> </message> + <message> + <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> + <translation type="unfinished"></translation> + </message> - </context> - <context> + </context> + <context> <name>UINetworkManagerDialog</name> diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fi.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fi.ts index 3f31f8f..9248344 100644 diff --git a/libre/virtualbox-libre/libre.patch b/libre/virtualbox-libre/libre.patch index 138bbd612..e93fe80e8 100644 --- a/libre/virtualbox-libre/libre.patch +++ b/libre/virtualbox-libre/libre.patch @@ -1,5 +1,5 @@ ---- VirtualBox-4.2.0.orig/Config.kmk 2012-09-13 05:26:16.000000000 -0300 -+++ VirtualBox-4.2.0/Config.kmk 2012-09-18 21:35:33.118487052 -0300 +--- VirtualBox-4.2.6.orig/Config.kmk 2012-12-19 16:24:34.000000000 -0200 ++++ VirtualBox-4.2.6/Config.kmk 2012-12-27 14:28:22.897125304 -0200 @@ -56,9 +56,6 @@ PROPS_SYSMODS_ACCUMULATE_L += INTERMEDIATES PROPS_MISCBINS_ACCUMULATE_L += INTERMEDIATES @@ -55,7 +55,16 @@ ifdef VBOX_WITH_PCI_PASSTHROUGH VBOX_WITH_PCI_PASSTHROUGH_IMPL = 1 endif -@@ -609,17 +596,6 @@ +@@ -580,8 +567,6 @@ + if1of ($(KBUILD_TARGET), darwin freebsd linux solaris win) + VBOX_WITH_CROGL = 1 + endif +-# Enable the VNC server extension pack (GPL only). +-#VBOX_WITH_EXTPACK_VNC = 1 + # Enable S3 support (requires libcurl) + VBOX_WITH_S3 = 1 + # Enable Host=>Guest Drag'n'Drop +@@ -621,17 +606,6 @@ endif ## @} @@ -73,7 +82,7 @@ ## @name Misc ## @{ # Enable Seamless mode -@@ -810,14 +786,6 @@ +@@ -822,14 +796,6 @@ # Skip stuff. # @@ -88,7 +97,7 @@ # VBOX_QUICK can be used by core developers to speed to the build ifdef VBOX_QUICK # undefine variables by assigning blank. -@@ -872,7 +840,6 @@ +@@ -884,7 +850,6 @@ VBOX_WITH_TESTSUITE= VBOX_WITH_QTGUI= VBOX_WITH_USB= @@ -96,7 +105,7 @@ VBOX_WITH_DOCS= VBOX_WITH_PDM_ASYNC_COMPLETION= VBOX_WITH_KCHMVIEWER= -@@ -894,7 +861,6 @@ +@@ -906,7 +871,6 @@ VBOX_WITH_CROGL= VBOX_WITH_DEBUGGER= VBOX_WITH_DOCS= @@ -104,7 +113,16 @@ VBOX_WITH_HARDENING= VBOX_WITH_HEADLESS= VBOX_WITH_HGCM= -@@ -985,9 +951,6 @@ +@@ -979,7 +943,7 @@ + # + # Indicate VBOX_ONLY build if any of the VBOX_ONLY_* variables are set. + # +-VBOX_ONLY_BUILD := $(strip $(foreach x, ADDITIONS DOCS EXTPACKS SDK TESTSUITE\ ++VBOX_ONLY_BUILD := $(strip $(foreach x, ADDITIONS DOCS SDK TESTSUITE\ + , $(if-expr defined(VBOX_ONLY_$(x)),VBOX_ONLY_$(x)))) + if $(words $(VBOX_ONLY_BUILD)) > 1 + $(error VBox: More than one VBOX_ONLY build enabled! $(VBOX_ONLY_BUILD)) +@@ -997,9 +961,6 @@ # ifdef VBOX_OSE VBOX_WITH_VRDP= @@ -114,7 +132,7 @@ VBOX_WITH_PCI_PASSTHROUGH_IMPL= VBOX_WITH_OS2_ADDITIONS_BIN= VBOX_WITH_SECURELABEL= -@@ -1118,10 +1081,6 @@ +@@ -1130,10 +1091,6 @@ VBOX_WITH_KCHMVIEWER= endif @@ -125,7 +143,7 @@ # # Mark OSE builds clearly, helps figuring out limitations more easily. # -@@ -1744,9 +1703,6 @@ +@@ -1738,9 +1695,6 @@ # bin2c (convert binary files into C arrays) VBOX_BIN2C ?= $(PATH_OBJ)/bin2c/bin2c$(HOSTSUFF_EXE) @@ -135,7 +153,7 @@ # VBoxCmp (simple /bin/cmp with more sensible output) VBOX_VBOXCMP ?= $(PATH_OBJ)/VBoxCmp/VBoxCmp$(HOSTSUFF_EXE) -@@ -2638,13 +2594,6 @@ +@@ -2632,13 +2586,6 @@ SDK_VBOX_OPENSSL2_LIBS = $(NO_SUCH_VARIABLE) endif @@ -149,7 +167,7 @@ SDK_VBOX_BLD_OPENSSL = . SDK_VBOX_BLD_OPENSSL_EXTENDS = VBOX_OPENSSL SDK_VBOX_BLD_OPENSSL_LIBS ?= \ -@@ -4100,99 +4049,6 @@ +@@ -4099,99 +4046,6 @@ TEMPLATE_VBOXMAINCLIENTDLL_LDFLAGS.darwin = $(filter-out -bind_at_load,$(TEMPLATE_VBOXMAINCLIENTEXE_LDFLAGS.darwin)) @@ -249,6 +267,131 @@ # # Qt 4 # Qt 4 +--- VirtualBox-4.2.6.orig/configure 2012-12-19 16:24:34.000000000 -0200 ++++ VirtualBox-4.2.6/configure 2012-12-27 14:26:25.743442978 -0200 +@@ -90,8 +90,6 @@ + WITH_HARDENING=1 + WITH_UDPTUNNEL=1 + WITH_VDE=0 +-WITH_VNC=0 +-WITH_EXTPACK=1 + WITH_DOCS=1 + BUILD_LIBXML2= + BUILD_LIBCURL= +@@ -124,8 +122,6 @@ + MESA="-lGL" + INCZ="" + LIBZ="-lz" +-INCVNCSERVER="" +-LIBVNCSERVER="-lvncserver" + INCDEVMAPPER="" + LIBDEVMAPPER="-ldevmapper" + CXX_FLAGS="" +@@ -930,47 +926,6 @@ + } + + # +-# Check for libvncserver, needed for VNC in OSE +-# +-check_vncserver() +-{ +- test_header libvncserver +- cat > $ODIR.tmp_src.cc <<EOF +-#include <cstdio> +-#include <rfb/rfbconfig.h> +- +-extern "C" int main() +-{ +- const char* v=LIBVNCSERVER_VERSION; +- unsigned int major = 0, minor = 0, micro = 0; +- +- for (; *v !='.' && *v != '\0'; v++) major = major*10 + *v-'0'; +- if (*v == '.') v++; +- for (; *v !='.' && *v != '\0'; v++) minor = minor*10 + *v-'0'; +- if (*v == '.') v++; +- for (; *v !='.' && *v != '\0'; v++) micro = micro*10 + *v-'0'; +- +- printf("found version %s", LIBVNCSERVER_PACKAGE_VERSION); +- if (major*10000 + minor*100 + micro >= 900) +- { +- printf(", OK.\n"); +- return 0; +- } +- else +- { +- printf(", expected version 0.9 or higher\n"); +- return 1; +- } +-} +-EOF +- if test_compile "$LIBVNCSERVER $INCVNCSERVER" libvncserver libvncserver; then +- if test_execute; then +- cnf_append "VBOX_WITH_EXTPACK_VNC" "1" +- fi +- fi +-} +- +-# + # Check for libcurl, needed by S3 + # + check_curl() +@@ -2173,8 +2128,6 @@ + [ $WITH_KMODS -eq 1 ] && echo " --disable-kmods don't build Linux kernel modules (host and guest)" + [ $WITH_OPENGL -eq 1 ] && echo " --disable-opengl disable OpenGL support (2D & 3D)" + [ $WITH_GSOAP -eq 0 ] && echo " --enable-webservice enable the webservice stuff" +-[ $OSE -eq 1 ] && echo " --enable-vnc enable the VNC server" +-[ $OSE -eq 0 ] && echo " --disable-extpack don't build the extpack" + [ $WITH_DOCS -eq 1 ] && echo " --disable-docs don't build the documentation" + [ "$OS" = "linux" -o "$OS" = "freebsd" ] && echo " --enable-vde enable VDE networking" + cat << EOF +@@ -2346,15 +2299,9 @@ + --enable-webservice) + [ $WITH_GSOAP -eq 0 ] && WITH_GSOAP=1 + ;; +- --enable-vnc) +- WITH_VNC=1 +- ;; + --disable-hardening) + WITH_HARDENING=0 + ;; +- --disable-extpack) +- WITH_EXTPACK=0 +- ;; + --disable-docs) + WITH_DOCS=0 + ;; +@@ -2512,15 +2459,6 @@ + echo >> $CNF + fi + +-# extpack +-if [ $OSE -eq 0 ]; then +- if [ $WITH_EXTPACK -eq 1 ]; then +- BUILD_LIBSSL=1 +- else +- cnf_append "VBOX_WITH_EXTPACK_PUEL_BUILD" "" +- fi +-fi +- + # headless + if [ -n "$HEADLESS" ]; then + cnf_append "VBOX_HEADLESS" "1" +@@ -2646,15 +2584,6 @@ + cnf_append "VBOX_WITH_DOCS_PACKING" "" + fi + +-# VNC server support +-if [ $OSE -ge 1 ]; then +- if [ $WITH_VNC = 1 ]; then +- check_vncserver +- else +- cnf_append "VBOX_WITH_EXTPACK_VNC" "" +- fi +-fi +- + # success! + echo + echo "Successfully generated '$CNF' and '$ENV'." --- VirtualBox-4.2.0.orig/Makefile.kmk 2012-08-29 11:13:46.000000000 -0300 +++ VirtualBox-4.2.0/Makefile.kmk 2012-09-18 23:43:54.750454776 -0300 @@ -378,7 +378,6 @@ diff --git a/pcr/ipmitool/PKGBUILD b/pcr/ipmitool/PKGBUILD new file mode 100644 index 000000000..38d4eb237 --- /dev/null +++ b/pcr/ipmitool/PKGBUILD @@ -0,0 +1,18 @@ +# Maintainer : Parabola GNU / Linux-libre Aurélien DESBRIÈRES <aurelien@cwb.IO> + +pkgname=ipmitool +pkgver=1.8.11 +pkgrel=1 +pkgdesc="Command-line interface to IPMI-enabled devices" +arch=(i686 x86_64) +url="http://ipmitool.sourceforge.net" +depends=('glibc' 'bash' 'openssl') +license=("BSD") +source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2) + +build() { + cd $startdir/src/$pkgname-$pkgver + ./configure --prefix=/usr --with-kerneldir + make || return 1 + make DESTDIR=${startdir}/pkg install +} diff --git a/pcr/ipmiutil/PKGBUILD b/pcr/ipmiutil/PKGBUILD new file mode 100644 index 000000000..132ea7c59 --- /dev/null +++ b/pcr/ipmiutil/PKGBUILD @@ -0,0 +1,27 @@ +# Contributor: goodmen <goodmenlinux@gmail.com> +# Contributor: Gergely Imreh <imrehgATgmailDOTcom> +# Contributors: champus, madeye, Ranguvar and ninja_pt +# Maintainer : Parabola GNU / Linux-libre Aurélien DESBRIÈRES <aurelien@cwb.IO> + +pkgname=ipmiutil +pkgver=2.7.5 +pkgrel=1 +pkgdesc="A simple program that lists results from the hardware detection library." +arch=('i686' 'x86_64') +url="http://sourceforge.net/projects/ipmiutil/" +license=('BSD2.0') +depends=('') +makedepends=('openssl') +options=('!emptydirs') +source=("http://prdownloads.sourceforge.net/ipmiutil/ipmiutil-${pkgver}.tar.gz") + +build() { + cd ${srcdir} + tar -xf ${pkgname}-${pkgver}.tar.gz + + cd ${srcdir}/${pkgname}-${pkgver} + + ./configure --enable-gpl + make -j1 || return 1 + make DESTDIR=${pkgdir} install || return 1 +} |