From 7c92c5fcfb5653f63243842299e413672653d1ad Mon Sep 17 00:00:00 2001 From: root Date: Fri, 8 Feb 2013 00:08:16 -0800 Subject: Fri Feb 8 00:08:16 PST 2013 --- community/brise/PKGBUILD | 10 +++--- community/cinnamon/PKGBUILD | 34 ++++++++++---------- community/cinnamon/cinnamon.install | 26 ++++++---------- community/directfb/PKGBUILD | 6 ++-- community/golangide/PKGBUILD | 6 ++-- community/highlight/PKGBUILD | 14 +++------ community/ibus-rime/PKGBUILD | 10 +++--- community/muffin/PKGBUILD | 13 +++++--- community/muffin/muffin.install | 11 ------- community/nodejs/PKGBUILD | 8 ++--- core/gzip/PKGBUILD | 11 ++++--- core/gzip/gzip-1.5-yesno-declaration.patch | 36 +++++++++++++++++++++ core/perl/PKGBUILD | 30 +++++++++--------- extra/facile/PKGBUILD | 23 +++++++------- extra/gimp/PKGBUILD | 6 ++-- extra/lftp/PKGBUILD | 6 ++-- extra/oxygen-gtk2/PKGBUILD | 14 ++++++--- extra/oxygen-gtk2/fix-regression.patch | 48 ++++++++++++++++++++++++++++ extra/postgresql-old-upgrade/PKGBUILD | 12 +++---- extra/postgresql/PKGBUILD | 26 +++++----------- extra/postgresql/postgresql.tmpfiles.conf | 2 +- extra/ruby/PKGBUILD | 4 +-- extra/sbcl/PKGBUILD | 6 ++-- extra/usermin/PKGBUILD | 48 ++++++++++++++-------------- extra/vim/PKGBUILD | 20 ++++++------ extra/webmin/PKGBUILD | 50 +++++++++++++++--------------- libre/cdfs-libre/PKGBUILD | 13 +++++--- libre/linux-libre-tools/PKGBUILD | 39 +++++++++++++++++------ libre/lirc-libre/PKGBUILD | 2 +- libre/tp_smapi-libre/PKGBUILD | 2 +- libre/vhba-module-libre/PKGBUILD | 2 +- libre/virtualbox-libre-modules/PKGBUILD | 4 +-- 32 files changed, 316 insertions(+), 226 deletions(-) create mode 100644 core/gzip/gzip-1.5-yesno-declaration.patch create mode 100644 extra/oxygen-gtk2/fix-regression.patch diff --git a/community/brise/PKGBUILD b/community/brise/PKGBUILD index 225429d81..9cc64b8c9 100644 --- a/community/brise/PKGBUILD +++ b/community/brise/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 82228 2013-01-12 17:11:20Z fyan $ +# $Id: PKGBUILD 83933 2013-02-07 02:02:02Z fyan $ # Maintainer: Felix Yan # Contributor: GONG Chen pkgname=brise -pkgver=0.16 +pkgver=0.18 pkgrel=1 pkgdesc="Rime schema repository" arch=('i686' 'x86_64') url="http://code.google.com/p/rimeime/" license=('GPL3') depends=() -makedepends=('cmake' 'librime>=0.9.3') +makedepends=('cmake' 'librime>=0.9.8') provides=('librime-data') -conflicts=('librime<0.9.3' 'ibus-rime<0.9.3') +conflicts=('librime<0.9.8' 'ibus-rime<0.9.8') source=("http://rimeime.googlecode.com/files/$pkgname-$pkgver.tar.gz") build() { @@ -24,4 +24,4 @@ package() { cd "${srcdir}/$pkgname" make DESTDIR="$pkgdir" install } -md5sums=('bc45f42852fd7bed59a171233d50cb79') +md5sums=('1ba32458c6c697c454d65b0764f925ad') diff --git a/community/cinnamon/PKGBUILD b/community/cinnamon/PKGBUILD index 09aa49021..ab7686196 100644 --- a/community/cinnamon/PKGBUILD +++ b/community/cinnamon/PKGBUILD @@ -1,30 +1,37 @@ -# $Id: PKGBUILD 83413 2013-01-31 17:33:38Z bpiotrowski $ +# $Id: PKGBUILD 83983 2013-02-07 22:10:55Z bgyorgy $ +# Contributor: M0Rf30 +# Contributor: unifiedlinux +# Contributor: CReimer pkgname=cinnamon pkgver=1.6.7 -pkgrel=5 +pkgrel=6 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience" arch=('i686' 'x86_64') url="http://cinnamon.linuxmint.com/" license=('GPL2') -depends=('caribou' 'gjs' 'gnome-bluetooth' 'gnome-control-center' 'gnome-panel' 'gnome-session' - 'gnome-settings-daemon' 'gnome-themes-standard' 'gstreamer0.10' 'libgnomekbd' 'muffin' - 'notification-daemon' 'python2-gconf' 'python2-imaging' 'python2-lxml' 'python2-dbus' 'gksu') +depends=('accountsservice' 'caribou' 'gjs' 'gnome-bluetooth' 'gnome-icon-theme' + 'gnome-menus' 'gnome-settings-daemon' 'gnome-session' 'gnome-themes-standard' + 'gstreamer0.10' 'libgnomekbd' 'networkmanager' 'muffin' 'python2-dbus' + 'python2-gconf' 'python2-imaging' 'python2-lxml') makedepends=('gnome-common' 'intltool') -optdepends=('nautilus: the official Gnome file manager') +optdepends=('gnome-control-center: open settings from various applets' + 'gnome-screensaver: lock screen' + 'nautilus: the official Gnome file manager') options=('!libtool' '!emptydirs') install=${pkgname}.install -source=("$pkgname.tar.gz::https://github.com/linuxmint/Cinnamon/tarball/$pkgver" +source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/tarball/$pkgver" "cinnamon-screensaver.desktop" "cinnamon2d-screensaver.desktop" - "fix-cursor-change.patch" "gnome-autogen.sh") +md5sums=('ea73c6367d43d82c61f977477bf0c08c' + 'd55c079cdc8bec606f510f87b2a6f776' + '5c6af851ab1cf7e9219f11d86353196a' + 'a925691c9b57a6a884dcf07da057fd1f') build() { cd ${srcdir}/linuxmint-Cinnamon* - patch -Np1 -i ${srcdir}/fix-cursor-change.patch - cp ${srcdir}/gnome-autogen.sh . sed -i 's/\ --warn-all\ --warn-error//' src/Makefile.am sed -i 's/gnome-autogen.sh/.\/gnome-autogen.sh/g' autogen.sh @@ -48,7 +55,6 @@ package() { # Python2 fix sed -i 's/bin\/python/bin\/python2/g' \ - "${pkgdir}/usr/bin/$pkgname-extension-tool" \ "${pkgdir}/usr/bin/$pkgname-launcher" \ "${pkgdir}/usr/bin/$pkgname-menu-editor" \ "${pkgdir}/usr/bin/$pkgname-settings" \ @@ -62,8 +68,4 @@ package() { cp $srcdir/cinnamon*-screensaver.desktop $pkgdir/etc/xdg/autostart } -md5sums=('ea73c6367d43d82c61f977477bf0c08c' - 'd55c079cdc8bec606f510f87b2a6f776' - '5c6af851ab1cf7e9219f11d86353196a' - '8d7a93a1eb0f1d44e4869abd342ed22a' - 'a925691c9b57a6a884dcf07da057fd1f') + diff --git a/community/cinnamon/cinnamon.install b/community/cinnamon/cinnamon.install index 0f1197226..901fd95c9 100644 --- a/community/cinnamon/cinnamon.install +++ b/community/cinnamon/cinnamon.install @@ -1,19 +1,19 @@ post_install() { glib-compile-schemas usr/share/glib-2.0/schemas - - if [[ ! -f '/usr/lib/libgnome-desktop-3.so.2' ]];then - - if [[ $(uname -m) == 'i686' ]];then - ln -s /usr/lib/libgnome-desktop-3.so /usr/lib/libgnome-desktop-3.so.2 - fi - - fi } pre_upgrade() { if [ -f /usr/share/gconf/schemas/cinnamon.schemas ]; then gconfpkg --uninstall cinnamon fi + + if [ "$(vercmp 1.6.7-6 "$2")" -eq 1 ]; then + if [[ -h '/usr/lib/libgnome-desktop-3.so.2' ]]; then + if [[ $(uname -m) == 'i686' ]]; then + unlink /usr/lib/libgnome-desktop-3.so.2 + fi + fi + fi } post_upgrade() { @@ -25,13 +25,5 @@ pre_remove() { } post_remove() { - glib-compile-schemas usr/share/glib-2.0/schemas - - if [[ ! -f '/usr/lib/libgnome-desktop-3.so.2' ]];then - - if [[ $(uname -m) == 'i686' ]];then - unlink /usr/lib/libgnome-desktop-3.so.2 - fi - - fi + post_install } diff --git a/community/directfb/PKGBUILD b/community/directfb/PKGBUILD index b7dbf0323..efd8ef9f6 100644 --- a/community/directfb/PKGBUILD +++ b/community/directfb/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 79438 2012-11-05 08:05:20Z ebelanger $ +# $Id: PKGBUILD 83935 2013-02-07 05:11:49Z eric $ # Maintainer: Jaroslav Lichtblau # Maintainer: Eric Bélanger pkgname=directfb -pkgver=1.6.2 +pkgver=1.6.3 pkgrel=1 pkgdesc="A thin library that provides hardware graphics acceleration, input device handling and abstraction, integrated windowing system on top of the Linux Framebuffer Device" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('LGPL') depends=('gcc-libs' 'libjpeg' 'sdl' 'libpng' 'freetype2') options=('!libtool') source=(http://www.directfb.org/downloads/Core/DirectFB-${pkgver%.*}/DirectFB-${pkgver}.tar.gz) -sha1sums=('a393a53130e6a80369b7081371cd23dd1cd5e192') +sha1sums=('0433c5999044ec9701481a92e50c0760cdb50c41') build() { cd "${srcdir}/DirectFB-${pkgver}" diff --git a/community/golangide/PKGBUILD b/community/golangide/PKGBUILD index 722b757d0..1d716610f 100644 --- a/community/golangide/PKGBUILD +++ b/community/golangide/PKGBUILD @@ -1,10 +1,10 @@ -#$Id: PKGBUILD 82408 2013-01-16 23:36:09Z arodseth $ +#$Id: PKGBUILD 83985 2013-02-07 22:46:23Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: spambanane # Contributor: Matteo pkgname=golangide -pkgver=16 +pkgver=17 pkgrel=1 pkgdesc='IDE for editing and building projects written in the Go programming language (now LiteIDE X)' license=('LGPL') @@ -19,7 +19,7 @@ _name=('Golang IDE') source=("$pkgname.tgz::https://nodeload.github.com/visualfc/liteide/tar.gz/master" 'golangide.png' 'golangide.sh') -sha256sums=('ad40b86cace58bf85bf94e09d9dfc353cbdb31f09566bfd9487d15f321fbe078' +sha256sums=('abc30259bc5d87d23713479e2e464cadd152e588a95400415f6a1247004cfeff' '47c52b22326034bd3d6a7b11b05a53c8b3838c08e145171cf5cad2ca00260697' 'aa5ea27f9c3626431a9cb45e5267771a1eeff48b2e3927c0574eaef9302cfd74') diff --git a/community/highlight/PKGBUILD b/community/highlight/PKGBUILD index 1b7755fdd..cea8e9b78 100644 --- a/community/highlight/PKGBUILD +++ b/community/highlight/PKGBUILD @@ -1,25 +1,21 @@ -# $Id: PKGBUILD 81704 2012-12-27 07:55:09Z bluewind $ +# $Id: PKGBUILD 83937 2013-02-07 08:11:31Z bluewind $ # Maintainer: Florian Pritz # Contributor: Jan Fader pkgbase=highlight pkgname=(highlight highlight-gui) -pkgver=3.12 -pkgrel=3 +pkgver=3.13 +pkgrel=1 url="http://www.andre-simon.de/doku/highlight/highlight.html" license=('GPL') arch=('i686' 'x86_64') makedepends=(qt lua51 boost) source=(http://www.andre-simon.de/zip/$pkgname-$pkgver.tar.bz2{,.asc}) -md5sums=('4b3f01e86a6b3fa25f3c4905a9cd63c7' - 'b784cd3f264a0f281da36f26c0c7f2c2') +md5sums=('2b5e217c80c441853360926dbb7777e9' + 'c68f6dd20af61ca1061d910879d910a8') build() { cd "$srcdir/$pkgbase-$pkgver" - sed -i 's#pkg-config --cflags lua#pkg-config --cflags lua5.1#' src/makefile - sed -i 's#pkg-config --libs lua#pkg-config --libs lua5.1#' src/makefile - sed -i 's#lua#lua5.1#g' src/gui-qt/highlight.pro - make make gui } diff --git a/community/ibus-rime/PKGBUILD b/community/ibus-rime/PKGBUILD index fe95d92c2..9ef07caed 100644 --- a/community/ibus-rime/PKGBUILD +++ b/community/ibus-rime/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 82426 2013-01-17 13:14:23Z fyan $ +# $Id: PKGBUILD 83942 2013-02-07 09:33:33Z fyan $ # Maintainer: Felix Yan # Contributor: GONG Chen # Contributor: 網軍總司令 pkgname=ibus-rime -pkgver=0.9.7 -pkgrel=2 +pkgver=0.9.8 +pkgrel=1 pkgdesc="Rime input method engine for ibus" arch=('i686' 'x86_64') url="http://code.google.com/p/rimeime/" license=('GPL3') -depends=('ibus' 'libnotify' 'librime>=0.9.3' 'brise') +depends=('ibus' 'libnotify' 'librime>=0.9.8' 'brise') makedepends=('cmake') install='ibus-rime.install' source=("http://rimeime.googlecode.com/files/$pkgname-$pkgver.tar.gz") @@ -25,4 +25,4 @@ package() { make DESTDIR="$pkgdir" install } -md5sums=('7234fd5ed900274f83c418c83ef3a630') +md5sums=('813148d4ddc9b14fe099d12a99befe63') diff --git a/community/muffin/PKGBUILD b/community/muffin/PKGBUILD index e974e7a99..cd001c143 100644 --- a/community/muffin/PKGBUILD +++ b/community/muffin/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 83448 2013-02-01 10:03:42Z foutrelis $ +# $Id: PKGBUILD 83982 2013-02-07 22:09:51Z bgyorgy $ # Contributor: Adam Hani Schakaki # Contributor: Ner0 pkgname=muffin pkgver=1.1.2 -pkgrel=2 +pkgrel=3 pkgdesc="Cinnamon window manager based on Mutter" arch=('i686' 'x86_64') url="https://github.com/linuxmint/muffin" license=('GPL') -depends=('libx11' 'libsm' 'clutter' 'gconf' 'gobject-introspection' 'gsettings-desktop-schemas' 'libcanberra' 'libxxf86vm' 'startup-notification' 'zenity' 'dconf') -makedepends=('libltdl' 'intltool' 'gnome-doc-utils' 'gnome-common' 'libice') +depends=('libsm' 'clutter' 'gobject-introspection' 'gsettings-desktop-schemas' \ + 'libcanberra' 'startup-notification' 'zenity' 'dconf') +makedepends=('intltool' 'gnome-doc-utils') provides=('muffin-wm') conflicts=('muffin-wm') replaces=('muffin-wm') @@ -23,7 +24,8 @@ build() { cd linuxmint-muffin-* autoreconf -vfi - PYTHON=python2 ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/muffin --localstatedir=/var --disable-static --disable-schemas-compile + PYTHON=python2 ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/muffin \ + --localstatedir=/var --disable-static --disable-schemas-compile make } @@ -32,4 +34,5 @@ package() { make DESTDIR="$pkgdir/" install } + # vim:set ts=2 sw=2 et: diff --git a/community/muffin/muffin.install b/community/muffin/muffin.install index c2e3c39c9..2daef58d5 100644 --- a/community/muffin/muffin.install +++ b/community/muffin/muffin.install @@ -2,20 +2,9 @@ post_install() { glib-compile-schemas usr/share/glib-2.0/schemas } -pre_upgrade() { - if [ -f /usr/share/gconf/schemas/muffin.schemas ]; then - /usr/sbin/gconfpkg --uninstall muffin - fi -} - post_upgrade() { post_install } - -pre_remove() { - pre_upgrade -} - post_remove() { post_install } diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD index 254b1213d..8d15d493d 100644 --- a/community/nodejs/PKGBUILD +++ b/community/nodejs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 82557 2013-01-20 20:44:15Z bpiotrowski $ +# $Id: PKGBUILD 83980 2013-02-07 20:46:58Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: James Campos @@ -8,8 +8,8 @@ # Contributor: TIanyi Cui pkgname=nodejs -pkgver=0.8.18 -pkgrel=2 +pkgver=0.8.19 +pkgrel=1 pkgdesc='Evented I/O for V8 javascript' arch=('i686' 'x86_64') url='http://nodejs.org/' @@ -18,7 +18,7 @@ depends=('openssl' 'python2') checkdepends=('curl') # curl used for check() options=('!emptydirs') source=(http://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.gz) -sha256sums=('1d63dd42f9bd22f087585ddf80a881c6acbe1664891b1dda3b71306fe9ae00f9') +sha256sums=('703207d7b394bd3d4035dc3c94b417ee441fd3ea66aa90cd3d7c9bb28e5f9df4') build() { cd node-v${pkgver} diff --git a/core/gzip/PKGBUILD b/core/gzip/PKGBUILD index f3a6aa28c..fc9052e7e 100644 --- a/core/gzip/PKGBUILD +++ b/core/gzip/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 176246 2013-01-28 00:29:24Z allan $ +# $Id: PKGBUILD 177557 2013-02-07 05:59:16Z allan $ # Maintainer: Allan McRae # Contributor: judd pkgname=gzip pkgver=1.5 -pkgrel=2 +pkgrel=3 pkgdesc="GNU compression utility" arch=('i686' 'x86_64') url="http://www.gnu.org/software/gzip/" @@ -12,13 +12,16 @@ license=('GPL3') groups=('base' 'base-devel') depends=('glibc' 'bash') install=gzip.install -source=(ftp://ftp.gnu.org/pub/gnu/gzip/gzip-$pkgver.tar.xz{,.sig}) +source=(ftp://ftp.gnu.org/pub/gnu/gzip/gzip-$pkgver.tar.xz{,.sig} + gzip-1.5-yesno-declaration.patch) md5sums=('2a431e169b6f62f7332ef6d47cc53bae' - '2de95937a3f65137acf9c55d4ad0447a') + '2de95937a3f65137acf9c55d4ad0447a' + 'd63249578de2eb6aadaded26918d8eed') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr + patch -p1 -i $srcdir/gzip-1.5-yesno-declaration.patch make } diff --git a/core/gzip/gzip-1.5-yesno-declaration.patch b/core/gzip/gzip-1.5-yesno-declaration.patch new file mode 100644 index 000000000..518ec6a49 --- /dev/null +++ b/core/gzip/gzip-1.5-yesno-declaration.patch @@ -0,0 +1,36 @@ +From e40a9b65ae95ed6face7ce1336905f0ab0a4992b Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Tue, 05 Feb 2013 21:37:40 +0000 +Subject: gzip: fix bug where you say "n" and gzip acts as if you said "y" + +Problem reported for GCC 4.7 x86-64 -O2 by Allan McRae in +. +* NEWS: Document this. Use consistent format in earlier note. +* gzip.c: Include yesno.h. +* gzip.h (yesno): Remove decl; that's yesno.h's job. +--- +diff --git a/gzip.c b/gzip.c +index b9b4d64..66529e0 100644 +--- a/gzip.c ++++ b/gzip.c +@@ -74,6 +74,7 @@ static char const *const license_msg[] = { + #include "ignore-value.h" + #include "stat-time.h" + #include "version.h" ++#include "yesno.h" + + /* configuration */ + +diff --git a/gzip.h b/gzip.h +index bf253d0..648073e 100644 +--- a/gzip.h ++++ b/gzip.h +@@ -321,6 +321,3 @@ extern void fprint_off (FILE *, off_t, int); + + /* in inflate.c */ + extern int inflate (void); +- +- /* in yesno.c */ +-extern int yesno (void); +-- +cgit v0.9.0.2 diff --git a/core/perl/PKGBUILD b/core/perl/PKGBUILD index 821b0837c..40f3545bc 100644 --- a/core/perl/PKGBUILD +++ b/core/perl/PKGBUILD @@ -1,12 +1,13 @@ -# $Id: PKGBUILD 173216 2012-12-13 12:43:19Z bluewind $ +# $Id: PKGBUILD 177560 2013-02-07 09:32:23Z bluewind $ # Maintainer: Florian Pritz -# Contributor: Angel Velasquez +# Contributor: Angel Velasquez # Contributor: kevin # Contributor: judd -# Contributor: francois +# Contributor: francois + pkgname=perl pkgver=5.16.2 -pkgrel=2 +pkgrel=3 pkgdesc="A highly capable, feature-rich programming language" arch=(i686 x86_64) license=('GPL' 'PerlArtistic') @@ -14,10 +15,10 @@ url="http://www.perl.org" groups=('base') depends=('gdbm' 'db' 'coreutils' 'glibc' 'sh') source=(http://www.cpan.org/src/5.0/perl-${pkgver}.tar.bz2 -cgi-cr-escaping.diff -perlbin.sh -perlbin.csh -provides.pl) + cgi-cr-escaping.diff + perlbin.sh + perlbin.csh + provides.pl) install=perl.install options=('makeflags' '!purge') md5sums=('2818ab01672f005a4e552a713aa27b08' @@ -45,7 +46,7 @@ build() { fi ./Configure -des -Dusethreads -Duseshrplib -Doptimize="${CFLAGS}" \ - -Dprefix=/usr -Dinstallprefix=${pkgdir}/usr -Dvendorprefix=/usr \ + -Dprefix=/usr -Dvendorprefix=/usr \ -Dprivlib=/usr/share/perl5/core_perl \ -Darchlib=/usr/lib/perl5/core_perl \ -Dsitelib=/usr/share/perl5/site_perl \ @@ -73,14 +74,15 @@ package() { provides=(${new_provides[@]}) cd ${srcdir}/${pkgname}-${pkgver} - make install + make DESTDIR="$pkgdir" install ### Perl Settings ### # Change man page extensions for site and vendor module builds. - # Use archlinux email address instead of my own. + # Set no mail address since bug reports should go to the bug tracker + # and not someone's email. sed -e '/^man1ext=/ s/1perl/1p/' -e '/^man3ext=/ s/3perl/3pm/' \ - -e "/^cf_email=/ s/'.*'/'kevin@archlinux.org'/" \ - -e "/^perladmin=/ s/'.*'/'kevin@archlinux.org'/" \ + -e "/^cf_email=/ s/'.*'/''/" \ + -e "/^perladmin=/ s/'.*'/''/" \ -i ${pkgdir}/usr/lib/perl5/core_perl/Config_heavy.pl ### CPAN Settings ### @@ -104,8 +106,6 @@ package() { (cd ${pkgdir}/usr/bin; mv perl${pkgver} perl) (cd ${pkgdir}/usr/bin/core_perl; ln -sf c2ph pstruct; ln -sf s2p psed) - grep -Rl "${pkgdir}" ${pkgdir}/usr | \ - xargs sed -i "s^${pkgdir}^^g" # Remove all pod files *except* those under /usr/share/perl5/core_perl/pod/ # (FS#16488) diff --git a/extra/facile/PKGBUILD b/extra/facile/PKGBUILD index 6048b3f72..af1da96fe 100644 --- a/extra/facile/PKGBUILD +++ b/extra/facile/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 168478 2012-10-12 13:06:17Z tpowa $ +# $Id: PKGBUILD 177541 2013-02-07 05:32:46Z eric $ # Maintainer: Tobias Powalowski pkgname=facile @@ -7,23 +7,24 @@ pkgrel=15 pkgdesc="A Functional Constraint Library" arch=(i686 x86_64) url="http://www.recherche.enac.fr/opti/facile/" -license="LGPL" +license=("LGPL") makedepends=('ocaml') depends=() source=(http://www.recherche.enac.fr/opti/facile/distrib/$pkgname-$pkgver.tar.gz ocaml-facile-ocaml-4.patch) - -md5sums=('ab673e1fc0859a42bcb639a02c2d7e9e') +md5sums=('ab673e1fc0859a42bcb639a02c2d7e9e' + '1ffc2f08c9f1db8ef0d444ec06f82b79') build() { - cd $startdir/src/$pkgname-$pkgver + cd "$srcdir/$pkgname-$pkgver" # fix ocaml4 patch -Np1 -i ../ocaml-facile-ocaml-4.patch ./configure - make || return 1 - mkdir -p $startdir/pkg/usr/lib/ocaml/facile - cd src - install -D -m 644 facile.cmxa facile.cmi facile.cma facile.a $startdir/pkg/usr/lib/ocaml/facile + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver/src" + install -d "$pkgdir/usr/lib/ocaml/facile" + install -D -m 644 facile.cmxa facile.cmi facile.cma facile.a "$pkgdir/usr/lib/ocaml/facile" } -md5sums=('ab673e1fc0859a42bcb639a02c2d7e9e' - '1ffc2f08c9f1db8ef0d444ec06f82b79') diff --git a/extra/gimp/PKGBUILD b/extra/gimp/PKGBUILD index f60ef6263..c31913967 100644 --- a/extra/gimp/PKGBUILD +++ b/extra/gimp/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166463 2012-09-08 07:14:12Z daniel $ +# $Id: PKGBUILD 177592 2013-02-07 18:51:36Z daniel $ # Maintainer: Daniel Isenmann pkgname=gimp -pkgver=2.8.2 +pkgver=2.8.4 pkgrel=1 pkgdesc="GNU Image Manipulation Program" arch=('i686' 'x86_64') @@ -22,7 +22,7 @@ conflicts=('gimp-devel') install=gimp.install source=(ftp://ftp.gimp.org/pub/gimp/v${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 linux.gpl uri-backend-libcurl.patch) -md5sums=('b542138820ca3a41cbd63fc331907955' +md5sums=('392592e8755d046317878d226145900f' 'bb27bc214261d36484093e857f015f38' 'e894f4b2ffa92c71448fdd350e9b78c6') diff --git a/extra/lftp/PKGBUILD b/extra/lftp/PKGBUILD index c127b4448..090e15b78 100644 --- a/extra/lftp/PKGBUILD +++ b/extra/lftp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 176998 2013-02-03 16:13:46Z andyrtr $ +# $Id: PKGBUILD 177576 2013-02-07 16:27:21Z andyrtr $ # Maintainer: Andreas Radke # Contributor: Aaron Griffin pkgname=lftp -pkgver=4.4.2 +pkgver=4.4.3 pkgrel=1 pkgdesc="Sophisticated command line based FTP client" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ optdepends=('perl: needed for convert-netscape-cookies and verify-file') url="http://lftp.yar.ru/" backup=('etc/lftp.conf') source=(http://ftp.yars.free.net/pub/source/lftp/${pkgname}-${pkgver}.tar.bz2) -md5sums=('8e974cd87c9d4362031f61351cfe742e') +md5sums=('59351bc6fd71e65485cb0b5dd6dbf07a') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/oxygen-gtk2/PKGBUILD b/extra/oxygen-gtk2/PKGBUILD index 53f8e7933..4c84a7685 100644 --- a/extra/oxygen-gtk2/PKGBUILD +++ b/extra/oxygen-gtk2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 176330 2013-01-30 13:08:58Z andrea $ +# $Id: PKGBUILD 177572 2013-02-07 13:44:31Z andrea $ # Maintainer: Andrea Scarpino # Contributor: birdflesh pkgname=oxygen-gtk2 pkgver=1.3.2 -pkgrel=1 +pkgrel=2 pkgdesc="Port of the default KDE widget theme (Oxygen) to GTK2" arch=('i686' 'x86_64') url='https://projects.kde.org/projects/playground/artwork/oxygen-gtk/' @@ -13,10 +13,16 @@ depends=('gtk2') conflicts=('oxygen-gtk') replaces=('oxygen-gtk') makedepends=('cmake') -source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('7c4ecfca330102b7ff50e472a62dfc60') +source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" + 'fix-regression.patch') +md5sums=('7c4ecfca330102b7ff50e472a62dfc60' + 'bced3ab820c3eafbb4e40a279d05bff6') build() { + cd ${pkgname}-${pkgver}/ + patch -p1 -i "${srcdir}"/fix-regression.patch + cd ../ + mkdir build cd build cmake ../${pkgname}-${pkgver} \ diff --git a/extra/oxygen-gtk2/fix-regression.patch b/extra/oxygen-gtk2/fix-regression.patch new file mode 100644 index 000000000..466b53c17 --- /dev/null +++ b/extra/oxygen-gtk2/fix-regression.patch @@ -0,0 +1,48 @@ +diff --git a/src/oxygenqtsettings.cpp b/src/oxygenqtsettings.cpp +index f2ad1af..9965086 100644 +--- a/src/oxygenqtsettings.cpp ++++ b/src/oxygenqtsettings.cpp +@@ -102,6 +102,9 @@ namespace Oxygen + + const bool forced( flags&Forced ); + ++ // no attempt at initializing if gtk settings is not yet set ++ if( !gtk_settings_get_default() ) return false; ++ + if( _initialized && !forced ) return false; + else if( !forced ) _initialized = true; + +diff --git a/src/oxygenstylewrapper.cpp b/src/oxygenstylewrapper.cpp +index ff0666b..a2572b0 100644 +--- a/src/oxygenstylewrapper.cpp ++++ b/src/oxygenstylewrapper.cpp +@@ -3741,6 +3741,10 @@ namespace Oxygen + #endif + + // style initialization ++ /* ++ this is normally achieved in theme_init, but is somehow not working with gnome shell ++ so that it is redone here, since duplication is avoided when initialization is called twice without modifications ++ */ + Style::instance().initialize(); + + // hooks +diff --git a/src/oxygentheme.cpp b/src/oxygentheme.cpp +index 50b04e2..9bc49e1 100644 +--- a/src/oxygentheme.cpp ++++ b/src/oxygentheme.cpp +@@ -52,12 +52,8 @@ void theme_init( GTypeModule* module ) + Oxygen::RCStyle::registerType( module ); + Oxygen::StyleWrapper::registerType( module ); + +- // initialize oxygen here, for XUL applications +- // special care is taken to not initialize everything +- Oxygen::ApplicationName applicationName; +- applicationName.initialize(); +- if( applicationName.isXul() ) +- { Oxygen::Style::instance().initialize( Oxygen::QtSettings::Forced | Oxygen::QtSettings::Colors ); } ++ // style initialization ++ Oxygen::Style::instance().initialize(); + + } + diff --git a/extra/postgresql-old-upgrade/PKGBUILD b/extra/postgresql-old-upgrade/PKGBUILD index b6134b23d..14044f911 100644 --- a/extra/postgresql-old-upgrade/PKGBUILD +++ b/extra/postgresql-old-upgrade/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 173844 2012-12-25 00:34:31Z foutrelis $ +# $Id: PKGBUILD 177586 2013-02-07 18:35:35Z dan $ # Maintainer: Dan McGee pkgname=postgresql-old-upgrade -pkgver=9.1.6 +pkgver=9.1.8 _majorver=${pkgver%.*} -pkgrel=2 +pkgrel=1 pkgdesc="PostgreSQL build for migrating between major versions with pg_upgrade" arch=('i686' 'x86_64') url="http://www.postgresql.org/" license=('custom:PostgreSQL') depends=("postgresql-libs>=${_majorver}" 'libxml2' 'openssl>=1.0.0') makedepends=('krb5' 'python2' 'perl' 'tcl>=8.6.0') -source=(ftp://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2) +source=(http://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2) build() { cd "${srcdir}/postgresql-${pkgver}" @@ -47,5 +47,5 @@ package() { rm -rf "${pkgdir}/opt/pgsql-${_majorver}/include/" } -md5sums=('000755f66c0de58bbd4cd2b89b45b8e2') -sha256sums=('6e396aca621a95b9f5f7292a79ebe6ce892e36c7f7021814e1bd94bcfc6c31e7') +md5sums=('54783b516880a586dcd7c07992d8c0b3') +sha256sums=('1d88f9dda24062dbfcc09aca9a316981f2aa93322613b853cf32d7a431b44c6d') diff --git a/extra/postgresql/PKGBUILD b/extra/postgresql/PKGBUILD index 50923c5c4..be2977ecf 100644 --- a/extra/postgresql/PKGBUILD +++ b/extra/postgresql/PKGBUILD @@ -1,36 +1,32 @@ -# $Id: PKGBUILD 173843 2012-12-25 00:34:29Z foutrelis $ +# $Id: PKGBUILD 177590 2013-02-07 18:51:10Z dan $ # Maintainer: Dan McGee pkgbase=postgresql pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql') -pkgver=9.2.2 +pkgver=9.2.3 _majorver=${pkgver%.*} -pkgrel=2 +pkgrel=1 arch=('i686' 'x86_64') url="http://www.postgresql.org/" license=('custom:PostgreSQL') makedepends=('krb5' 'libxml2' 'python2' 'perl' 'tcl>=8.6.0' 'openssl>=1.0.0') source=(http://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2 postgresql-run-socket.patch - postgresql.rcd postgresql.confd postgresql.pam postgresql.logrotate + postgresql.pam postgresql.logrotate postgresql.service postgresql.tmpfiles.conf postgresql-check-db-dir) -md5sums=('1cc388988e69bf75c6b55d59070100f6' +md5sums=('59f42a93695b0186ed5eb03c2653a7d4' '75c579eed03ffb2312631f0b649175b4' - '1ddd1df8010549f237e7983bb326025e' - 'a54d09a20ab1672adf08f037df188d53' '96f82c38f3f540b53f3e5144900acf17' 'd28e443f9f65a5712c52018b84e27137' '89b48774b0dae7c37fbb0e907c3c1db8' - 'd34e4ab6d589aa819a1e2829290a3b7c' + '1c5a1f99e8e93776c593c468e2612985' '505e0e4abfc746cae9558584d471a03c') -sha256sums=('e1a7a854a98896cb7fcd1696a76fca6f3bcac94d75e68a6154ffe2b69184f7f3' +sha256sums=('c4f5a63290c0c32d8d9899edee8188d0c8ab124a7199b154fac75e62eec35f7f' '8538619cb8bea51078b605ad64fe22abd6050373c7ae3ad6595178da52f6a7d9' - '9f6307b1358892e304f9474a456f0cb9160cfb8812a9da0430abe647f8a9cf45' - '3de5c059eead8816db15c2c5588e6196d6c4b0d704faf1a20912796cf589ba81' '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5' '6abb842764bbed74ea4a269d24f1e73d1c0b1d8ecd6e2e6fb5fb10590298605e' 'c69b614731fdd3f4e127540814f5999f423363523c5209e252e19b1d4362ad68' - 'd25980980b4c747a1a49d8d4736d8440a77fb8bc3275dbdc3dc6c4cf4ae8de07' + '7e086d70e0dcaa6ce45693b4e826ce92d770192b3aff5642319b1ef279d88dc4' '3a3279d290f556bf7a362670e32b491794f47ed218f6b8c6acef366a3291f669') build() { @@ -143,8 +139,6 @@ package_postgresql() { find "${pkgdir}/usr/include" -maxdepth 1 -type f -execdir rm {} + rmdir "${pkgdir}/usr/share/doc/postgresql/html" - # install launch script - install -D -m755 "${srcdir}/postgresql.rcd" "${pkgdir}/etc/rc.d/postgresql" install -D -m644 "${srcdir}/postgresql.tmpfiles.conf" \ "${pkgdir}/usr/lib/tmpfiles.d/postgresql.conf" install -D -m644 "${srcdir}/postgresql.service" \ @@ -152,10 +146,6 @@ package_postgresql() { install -D -m755 "${srcdir}/postgresql-check-db-dir" \ "${pkgdir}/usr/bin/postgresql-check-db-dir" - # install conf file - install -D -m644 "${srcdir}/postgresql.confd" \ - "${pkgdir}/etc/conf.d/postgresql" - install -D -m644 "${srcdir}/postgresql.pam" \ "${pkgdir}/etc/pam.d/postgresql" diff --git a/extra/postgresql/postgresql.tmpfiles.conf b/extra/postgresql/postgresql.tmpfiles.conf index 6c48e34ed..c2e0747da 100644 --- a/extra/postgresql/postgresql.tmpfiles.conf +++ b/extra/postgresql/postgresql.tmpfiles.conf @@ -1 +1 @@ -d /run/postgresql 0755 postgres postgres - +d /run/postgresql 0775 postgres postgres - diff --git a/extra/ruby/PKGBUILD b/extra/ruby/PKGBUILD index 72dbffeca..b960373e6 100644 --- a/extra/ruby/PKGBUILD +++ b/extra/ruby/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: Jeramy Rutley pkgname=('ruby' 'ruby-docs') -pkgver=1.9.3_p374 +pkgver=1.9.3_p385 pkgrel=1 arch=('i686' 'x86_64') url='http://www.ruby-lang.org/en/' @@ -13,7 +13,7 @@ makedepends=('openssl' 'tk' 'libffi' 'doxygen' 'graphviz' 'libyaml') options=('!emptydirs' '!makeflags') source=("ftp://ftp.ruby-lang.org/pub/ruby/${pkgver%.*}/ruby-${pkgver//_/-}.tar.bz2" 'gemrc') -md5sums=('944e73eba9ee9e1f2647ff32ec0b14b2' +md5sums=('5ec9aff670f4912b0f6f0e11e855ef6c' '6fb8e7a09955e0f64be3158fb4a27e7a') build() { diff --git a/extra/sbcl/PKGBUILD b/extra/sbcl/PKGBUILD index 19bd580ca..04a3dbeaf 100644 --- a/extra/sbcl/PKGBUILD +++ b/extra/sbcl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 174261 2013-01-03 12:31:28Z juergen $ +# $Id: PKGBUILD 177550 2013-02-07 05:42:47Z eric $ # Contributor: John Proctor # Contributor: Daniel White # Maintainer: Juergen Hoetzel @@ -49,8 +49,8 @@ package() { INSTALL_ROOT="$pkgdir/usr" sh install.sh - src/runtime/sbcl --core output/sbcl.core --script ${startdir}/src/arch-fixes.lisp - mv sbcl-new.core ${startdir}/pkg/usr/lib/sbcl/sbcl.core + src/runtime/sbcl --core output/sbcl.core --script "${srcdir}/arch-fixes.lisp" + mv sbcl-new.core "${pkgdir}/usr/lib/sbcl/sbcl.core" # sources mkdir -p "$pkgdir/usr/share/sbcl-source" diff --git a/extra/usermin/PKGBUILD b/extra/usermin/PKGBUILD index 04b7e7235..6a8640a5f 100644 --- a/extra/usermin/PKGBUILD +++ b/extra/usermin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 172026 2012-11-26 16:13:58Z tpowa $ +# $Id: PKGBUILD 177553 2013-02-07 05:50:05Z eric $ # Maintainer: Tobias Powalowski pkgname=usermin pkgver=1.530 @@ -48,8 +48,8 @@ source=(http://downloads.sourceforge.net/sourceforge/webadmin/$pkgname-$pkgver.t usermin.service ftp://ftp.archlinux.org/other/usermin/usermin-config.tar.bz2) -build() { - cd $startdir/src/$pkgname-$pkgver +package() { + cd "$srcdir"/$pkgname-$pkgver # remove modules we do not support @@ -67,26 +67,26 @@ build() { (find . -name '*.cgi' ; find . -name '*.pl') | perl perlpath.pl /usr/bin/perl - # create dirs - mkdir -p $startdir/pkg/opt/usermin - mkdir -p $startdir/pkg/var/log/usermin - mkdir -p $startdir/pkg/etc/usermin + mkdir -p "$pkgdir"/opt/usermin + mkdir -p "$pkgdir"/var/log/usermin + mkdir -p "$pkgdir"/etc/usermin # install pam stuff - install -D -m 644 usermin-pam $startdir/pkg/etc/pam.d/usermin + install -D -m 644 usermin-pam "$pkgdir"/etc/pam.d/usermin # remove other distros and add only Archlinux don't change next line else it will not work! rm os_list.txt echo 'Archlinux Any version generic-linux * -d "/etc/pacman.d"' >> os_list.txt # copy stuff to right dirs - cd $startdir/src/$pkgname-$pkgver - cp -rp * $startdir/pkg/opt/usermin - cd $startdir/src/usermin-config - cp -rfp * $startdir/pkg/opt/usermin + cd "$srcdir"/$pkgname-$pkgver + cp -rp * "$pkgdir"/opt/usermin + cd "$srcdir"/usermin-config + cp -rfp * "$pkgdir"/opt/usermin # define parameters for setup.sh - config_dir=$startdir/pkg/etc/usermin - var_dir=$startdir/pkg/var/log/usermin + config_dir="$pkgdir"/etc/usermin + var_dir="$pkgdir"/var/log/usermin perl=/usr/bin/perl autoos=1 port=20000 @@ -100,33 +100,33 @@ build() { nouninstall=1 noperlpath=1 atbootyn=n - tempdir=$startdir/pkg/tmp + tempdir="$pkgdir"/tmp export config_dir var_dir perl autoos port tempdir ssl nochown autothird nouninstall nostart noperlpath atbootyn login crypt # Fix setup.sh - sed -i -e 's:read atbootyn::g' -e 's:exit 13::g' $startdir/pkg/opt/usermin/setup.sh - $startdir/pkg/opt/usermin/setup.sh + sed -i -e 's:read atbootyn::g' -e 's:exit 13::g' "$pkgdir"/opt/usermin/setup.sh + "$pkgdir"/opt/usermin/setup.sh # Fixup the config files to use their real locations - sed -i 's:^pidfile=.*$:pidfile=/var/run/usermin.pid:' $startdir/pkg/etc/usermin/miniserv.conf - find $startdir/pkg/etc/usermin -type f -exec sed -i "s:$startdir/pkg::g" {} \; + sed -i 's:^pidfile=.*$:pidfile=/var/run/usermin.pid:' "$pkgdir"/etc/usermin/miniserv.conf + find "$pkgdir"/etc/usermin -type f -exec sed -i "s:$pkgdir::g" {} \; # make it only accessible by localhost - echo 'allow=127.0.0.1' >> $startdir/pkg/etc/usermin/miniserv.conf + echo 'allow=127.0.0.1' >> "$pkgdir"/etc/usermin/miniserv.conf # enable user and password login - sed -i -e '/localauth/d' $startdir/pkg/etc/usermin/miniserv.conf + sed -i -e '/localauth/d' "$pkgdir"/etc/usermin/miniserv.conf #install systemd service file - install -D -m 644 $startdir/src/usermin.service $startdir/pkg/usr/lib/systemd/system/usermin.service + install -D -m 644 "$srcdir"/usermin.service "$pkgdir"/usr/lib/systemd/system/usermin.service #install rc file - install -D -m 755 $startdir/src/usermin.rc $startdir/pkg/etc/rc.d/usermin + install -D -m 755 "$srcdir"/usermin.rc "$pkgdir"/etc/rc.d/usermin # delete temp dir - rm -r $startdir/pkg/tmp + rm -r "$pkgdir"/tmp #install license - install -m 644 -D $startdir/src/$pkgname-$pkgver/LICENCE $startdir/pkg/usr/share/licenses/usermin/LICENCE + install -m 644 -D "$srcdir"/$pkgname-$pkgver/LICENCE "$pkgdir"/usr/share/licenses/usermin/LICENCE } md5sums=('5a00ec2d294935676efc12f607446fb4' 'cfef4490cd1ef9517c0b39a7bd75c968' diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD index 8b44815b3..e96680658 100644 --- a/extra/vim/PKGBUILD +++ b/extra/vim/PKGBUILD @@ -6,8 +6,8 @@ pkgbase=vim pkgname=('vim' 'gvim' 'vim-runtime') _topver=7.3 -_patchlevel=754 -__hgrev=52bfa939fc07 +_patchlevel=798 +__hgrev=30b3b1da0350 _versiondir="vim${_topver//./}" pkgver=${_topver}.${_patchlevel} pkgrel=1 @@ -21,8 +21,8 @@ source=("ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz" 'vimrc' 'archlinux.vim' 'gvim.desktop') -md5sums=('187bec934962a7b5418dbe233e606eef' - '3a41d935a372c712088cdee997e1287f' +md5sums=('e4a759fdb7cf91d91fd4f8e4f44d5d9c' + 'ff8221082bdd0f9b63f57e5cc7773ee7' '6e7adfbd5d26c1d161030ec203a7f243' '20fceda56badf201695c57999b0bc609' '10353a61aadc3f276692d0e17db1478e' @@ -53,8 +53,8 @@ mksource() { gpg --detach-sign ${pkgname}-${pkgver}.tar.xz - scp ${pkgname}-${pkgver}.tar.xz ger:/srv/ftp/other/vim/ - scp ${pkgname}-${pkgver}.tar.xz.sig ger:/srv/ftp/other/vim/ + scp ${pkgname}-${pkgver}.tar.xz nym:/srv/ftp/other/vim/ + scp ${pkgname}-${pkgver}.tar.xz.sig nym:/srv/ftp/other/vim/ } build() { @@ -65,9 +65,7 @@ build() { vim-build/src/feature.h sed -i 's|^.*\(#define VIMRC_FILE.*"\) .*$|\1|' \ vim-build/src/feature.h - # fix python name - sed -i -e 's|vi_cv_path_python, python|vi_cv_path_python, python2|' \ - vim-build/src/configure.in + (cd vim-build/src && autoconf) cp -a vim-build gvim-build @@ -77,7 +75,7 @@ build() { ./configure \ --prefix=/usr \ --localstatedir=/var/lib/vim \ - --with-features=big \ + --with-features=huge \ --with-compiledby=ArchLinux \ --enable-gpm \ --enable-acl \ @@ -99,7 +97,7 @@ build() { ./configure \ --prefix=/usr \ --localstatedir=/var/lib/vim \ - --with-features=big \ + --with-features=huge \ --with-compiledby=ArchLinux \ --enable-gpm \ --enable-acl \ diff --git a/extra/webmin/PKGBUILD b/extra/webmin/PKGBUILD index f83690fe1..eb7ab19b2 100644 --- a/extra/webmin/PKGBUILD +++ b/extra/webmin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 172025 2012-11-26 16:13:54Z tpowa $ +# $Id: PKGBUILD 177556 2013-02-07 05:57:24Z eric $ # Maintainer: Tobias Powalowski pkgname=webmin pkgver=1.610 @@ -90,9 +90,9 @@ source=(http://downloads.sourceforge.net/sourceforge/webadmin/$pkgname-$pkgver.t webmin.service) options=(!strip) -build() { +package() { # NOTE: USE --asroot build option to avoid fakeroot error! - cd $startdir/src/$pkgname-$pkgver + cd "$srcdir"/$pkgname-$pkgver # add patches from webmin.com #for i in ../*.wbm #do tar xvf $i @@ -131,12 +131,12 @@ build() { (find . -name '*.cgi' ; find . -name '*.pl') | perl perlpath.pl /usr/bin/perl - # create dirs - mkdir -p $startdir/pkg/opt/webmin - mkdir -p $startdir/pkg/var/log/webmin - mkdir -p $startdir/pkg/etc/webmin + mkdir -p "$pkgdir"/opt/webmin + mkdir -p "$pkgdir"/var/log/webmin + mkdir -p "$pkgdir"/etc/webmin # install pam stuff - install -D -m 644 webmin-pam $startdir/pkg/etc/pam.d/webmin + install -D -m 644 webmin-pam "$pkgdir"/etc/pam.d/webmin # remove other distros and add only Archlinux don't change next line else it will not work! rm os_list.txt @@ -151,7 +151,7 @@ build() { sed -i -e 's:^noconfig=0:noconfig=1:g' defaultacl # Add pacman menu - cd $startdir/src/$pkgname-$pkgver + cd "$srcdir"/$pkgname-$pkgver cp -rf custom/ pacman cp -rf mscstyle3/custom mscstyle3/pacman sed -i -e 's:^noconfig=0:noconfig=1:g' -e 's:^edit=1:edit=0:g' pacman/defaultacl @@ -162,14 +162,14 @@ build() { sed -i -e 's:^index_title=.*:index_title=Pacman:g' pacman/lang/* # copy stuff to right dirs - cd $startdir/src/$pkgname-$pkgver - cp -rp * $startdir/pkg/opt/webmin - cd $startdir/src/webmin-config - cp -rfp * $startdir/pkg/opt/webmin + cd "$srcdir"/$pkgname-$pkgver + cp -rp * "$pkgdir"/opt/webmin + cd "$srcdir"/webmin-config + cp -rfp * "$pkgdir"/opt/webmin # define parameters for setup.sh - config_dir=$startdir/pkg/etc/webmin - var_dir=$startdir/pkg/var/log/webmin + config_dir="$pkgdir"/etc/webmin + var_dir="$pkgdir"/var/log/webmin perl=/usr/bin/perl autoos=1 port=10000 @@ -183,36 +183,36 @@ build() { nouninstall=1 noperlpath=1 atbootyn=n - tempdir=$startdir/pkg/tmp + tempdir="$pkgdir"/tmp export config_dir var_dir perl autoos port tempdir login crypt ssl nochown autothird nouninstall nostart noperlpath atbootyn # Fix setup.sh - sed -i -e 's:read atbootyn::g' -e 's:exit 13::g' $startdir/pkg/opt/webmin/setup.sh - $startdir/pkg/opt/webmin/setup.sh + sed -i -e 's:read atbootyn::g' -e 's:exit 13::g' "$pkgdir"/opt/webmin/setup.sh + "$pkgdir"/opt/webmin/setup.sh # Fixup the config files to use their real locations - sed -i 's:^pidfile=.*$:pidfile=/var/run/webmin.pid:' $startdir/pkg/etc/webmin/miniserv.conf - find $startdir/pkg/etc/webmin -type f -exec sed -i "s:$startdir/pkg::g" {} \; + sed -i 's:^pidfile=.*$:pidfile=/var/run/webmin.pid:' "$pkgdir"/etc/webmin/miniserv.conf + find "$pkgdir"/etc/webmin -type f -exec sed -i "s:$pkgdir::g" {} \; # make it only accessible by localhost - echo 'allow=127.0.0.1' >> $startdir/pkg/etc/webmin/miniserv.conf + echo 'allow=127.0.0.1' >> "$pkgdir"/etc/webmin/miniserv.conf # install pacman menu - cd $startdir/src/webmin-pacman/config - cp -rfp * $startdir/pkg/etc/webmin/pacman + cd "$srcdir"/webmin-pacman/config + cp -rfp * "$pkgdir"/etc/webmin/pacman #install rc file - install -D -m 755 $startdir/src/webmin.rc $startdir/pkg/etc/rc.d/webmin + install -D -m 755 "$srcdir"/webmin.rc "$pkgdir"/etc/rc.d/webmin # install systemd files install -D -m 644 $srcdir/webmin.service $pkgdir/usr/lib/systemd/system/webmin.service # delete temp dir - rm -r $startdir/pkg/tmp + rm -r "$pkgdir"/tmp # change sticky bit chmod 0644 $pkgdir/opt/webmin/man/config-generic-linux # install license - install -m 644 -D $startdir/src/$pkgname-$pkgver/LICENCE $startdir/pkg/usr/share/licenses/webmin/LICENCE + install -m 644 -D "$srcdir"/$pkgname-$pkgver/LICENCE "$pkgdir"/usr/share/licenses/webmin/LICENCE } md5sums=('e5f51402c09558ee688efea3d03a3d83' 'b0b3e3fb231a12e60165b6b4d604dcfa' diff --git a/libre/cdfs-libre/PKGBUILD b/libre/cdfs-libre/PKGBUILD index 8eada2132..12e461519 100644 --- a/libre/cdfs-libre/PKGBUILD +++ b/libre/cdfs-libre/PKGBUILD @@ -6,7 +6,7 @@ _pkgname=cdfs pkgname=cdfs-libre pkgver=2.6.27 -pkgrel=35 +pkgrel=36 pkgdesc="File system module that 'exports' all tracks and boot images on a CD as normal files (built for the linux-libre kernel package)" arch=(i686 x86_64 mips64el) url="http://www.elis.UGent.be/~ronsse/cdfs/" @@ -25,16 +25,21 @@ md5sums=('ac64c014a90e3c488394832ea29605b3' 'e934407b3460257a301822ffc4ab3933' '9215e7bdac728bd2f889fb525e543454') +_kernver=`pacman -Q linux-libre | cut -d . -f 2 | cut -f 1 -d -` +_kernverfull=`cat /usr/lib/modules/extramodules-3.${_kernver}-LIBRE/version` + build() { - _kernver=`pacman -Q linux-libre | cut -d . -f 2 | cut -f 1 -d -` depends=("linux-libre>=3.${_kernver}" "linux-libre<3.`expr ${_kernver} + 1`") - _kernverfull=`cat /usr/lib/modules/extramodules-3.${_kernver}-LIBRE/version` cd $srcdir/$_pkgname-$pkgver patch -p1 <$srcdir/cdfs-3.0.patch patch -p1 <$srcdir/cdfs-3.2.patch patch -p1 <$srcdir/cdfs-3.4.patch make KDIR=/usr/lib/modules/${_kernverfull}/build - install -Dm0644 cdfs.ko $pkgdir/usr/lib/modules/extramodules-3.${_kernver}-LIBRE/cdfs.ko sed -i "s|extramodules-.*-LIBRE|extramodules-3.${_kernver}-LIBRE|" $startdir/cdfs.install } + +package() { + cd $srcdir/$_pkgname-$pkgver + install -Dm0644 cdfs.ko $pkgdir/usr/lib/modules/extramodules-3.${_kernver}-LIBRE/cdfs.ko +} diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD index d3c01f28c..74216fe4c 100644 --- a/libre/linux-libre-tools/PKGBUILD +++ b/libre/linux-libre-tools/PKGBUILD @@ -3,12 +3,17 @@ # Maintainer (Parabola): André Silva pkgbase=linux-libre-tools -pkgname=('libtraceevent-libre' 'perf-libre' 'cpupower-libre' 'x86_energy_perf_policy-libre' 'usbip-libre') +pkgname=('linux-libre-tools-meta' + 'libtraceevent-libre' + 'perf-libre' + 'cpupower-libre' + 'x86_energy_perf_policy-libre' + 'usbip-libre') _basekernel=3.7 -#_sublevel=1 -#pkgver=${_basekernel}.${_sublevel} -pkgver=${_basekernel} -pkgrel=5 +_sublevel=6 +_pkgver=$_basekernel.$_sublevel +pkgver=$_basekernel +pkgrel=7 license=('GPL2') arch=('i686' 'x86_64' 'mips64el') url='http://linux-libre.fsfla.org/' @@ -23,13 +28,14 @@ makedepends+=('pciutils') # usbip-libre deps makedepends+=('glib2' 'sysfsutils') groups=("$pkgbase") -source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz" - #"http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz" +source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/$_basekernel-gnu/linux-libre-$_basekernel-gnu.tar.xz" + "http://linux-libre.fsfla.org/pub/linux-libre/releases/$_pkgver-gnu/patch-$_basekernel-gnu-$_pkgver-gnu.xz" 'cpupower.default' 'cpupower.systemd' 'cpupower.service' 'usbipd.service') md5sums=('06bf9601d859531e7378eb43d4ca7dd3' + '90b2c4b9a05b108219bd44ac4804db84' '56883c159381ba89e50ab8ea65efec77' '7e0710c2f31c1eb1e1417a7972e676b1' '2450e8ff41b30eb58d43b5fffbfde1f4' @@ -37,9 +43,11 @@ md5sums=('06bf9601d859531e7378eb43d4ca7dd3' build() { # apply stable patching set - if [ "${_basekernel}" != "${pkgver}" ]; then + if (( NOEXTRACT == 0 )) && [[ -e "$srcdir"/patch-$_basekernel-gnu-$_pkgver-gnu ]]; then msg2 'Applying stable patch set' - patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu" + cd linux-$pkgver + patch -Np1 -i "$srcdir"/patch-$_basekernel-gnu-$_pkgver-gnu + cd .. fi msg2 'Build libtraceevent-libre' @@ -81,6 +89,15 @@ build() { popd } +package_linux-libre-tools-meta() { + pkgdesc='Linux kernel tools meta package' + groups=() + depends=('libtraceevent-libre' 'perf-libre' 'cpupower-libre' 'x86_energy_perf_policy-libre' 'usbip-libre') + replaces=('linux-tools-meta') + conflicts=('linux-tools-meta') + provides=("linux-tools-meta=$pkgver") +} + package_libtraceevent-libre() { pkgdesc='Linux kernel trace event library' depends=('glibc') @@ -109,6 +126,10 @@ package_perf-libre() { NO_GTK2=1 \ PERF_VERSION=$pkgver-$pkgrel \ install install-man + # move completion in new directory + cd "$pkgdir" + install -Dm644 usr/etc/bash_completion.d/perf usr/share/bash-completion/perf + rm -r usr/etc } package_cpupower-libre() { diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD index 3210fad9f..63097f460 100644 --- a/libre/lirc-libre/PKGBUILD +++ b/libre/lirc-libre/PKGBUILD @@ -6,7 +6,7 @@ _pkgbase=lirc pkgbase=lirc-libre pkgname=('lirc-libre' 'lirc-utils-libre') pkgver=0.9.0 -pkgrel=36 +pkgrel=37 epoch=1 _extramodules=extramodules-3.7-LIBRE arch=('i686' 'x86_64' 'mips64el') diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD index 594e6e98b..86e933e40 100644 --- a/libre/tp_smapi-libre/PKGBUILD +++ b/libre/tp_smapi-libre/PKGBUILD @@ -11,7 +11,7 @@ _pkgname=tp_smapi pkgname=tp_smapi-libre pkgver=0.41 -pkgrel=13 +pkgrel=14 pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url='https://github.com/evgeni/tp_smapi' diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD index cfbe70292..a9e23cc0a 100644 --- a/libre/vhba-module-libre/PKGBUILD +++ b/libre/vhba-module-libre/PKGBUILD @@ -8,7 +8,7 @@ _pkgname=vhba-module pkgname=vhba-module-libre pkgver=20120422 _extramodules=extramodules-3.7-LIBRE -pkgrel=16 +pkgrel=17 pkgdesc="Kernel module that emulates SCSI devices (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url="http://cdemu.sourceforge.net/" diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD index 828e9e6aa..329ee26c4 100644 --- a/libre/virtualbox-libre-modules/PKGBUILD +++ b/libre/virtualbox-libre-modules/PKGBUILD @@ -1,13 +1,13 @@ # $Id$ # Maintainer: Ionut Biru -# Maintainer: Sébastien Luttringer +# Maintainer: Sébastien Luttringer # Maintainer (Parabola): Jorge López # Maintainer (Parabola): André Silva pkgbase=virtualbox-libre-modules pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules') pkgver=4.2.6 -pkgrel=5 +pkgrel=6 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') -- cgit v1.2.3-54-g00ecf