From f38edbff3878008c8b2ae1ca8a496c349763017b Mon Sep 17 00:00:00 2001 From: root Date: Sun, 28 Apr 2013 01:12:25 -0700 Subject: Sun Apr 28 01:11:42 PDT 2013 --- community/bind/127.0.0.zone | 11 ++ community/bind/PKGBUILD | 85 +++++++++++++ community/bind/install | 21 ++++ community/bind/localhost.zone | 10 ++ community/bind/named | 49 ++++++++ community/bind/named.conf | 64 ++++++++++ community/bind/named.conf.d | 4 + community/bind/named.logrotate | 6 + community/bind/named.service | 11 ++ community/bind/remove-tools.patch | 12 ++ community/bind/tmpfiles.d | 1 + community/catdoc/PKGBUILD | 8 +- community/gtk-kde4/PKGBUILD | 34 ------ community/gtk-kde4/fix-permission.patch | 27 ----- community/gtkwave/PKGBUILD | 6 +- community/hubbub/PKGBUILD | 27 +++-- community/kde-gtk-config/PKGBUILD | 36 ++++++ community/kde-gtk-config/kde-gtk-config.install | 11 ++ community/kicad/PKGBUILD | 12 +- community/libcss/PKGBUILD | 17 +-- community/libdom/PKGBUILD | 32 +++++ community/libnsbmp/PKGBUILD | 20 ++-- community/libnsgif/PKGBUILD | 20 ++-- community/libwapcaplet/PKGBUILD | 14 ++- community/netsurf/PKGBUILD | 30 +++-- community/qupzilla/PKGBUILD | 9 +- core/glib2/PKGBUILD | 20 +++- core/glib2/gvariant-fix-annotation.patch | 25 ++++ ...-ce0022933c255313e010b27f977f4ae02aad1e7e.patch | 132 +++++++++++++++++++++ extra/bind/127.0.0.zone | 11 -- extra/bind/PKGBUILD | 85 ------------- extra/bind/install | 21 ---- extra/bind/localhost.zone | 10 -- extra/bind/named | 49 -------- extra/bind/named.conf | 64 ---------- extra/bind/named.conf.d | 4 - extra/bind/named.logrotate | 6 - extra/bind/named.service | 11 -- extra/bind/remove-tools.patch | 12 -- extra/bind/tmpfiles.d | 1 - extra/fetchmail/PKGBUILD | 9 +- extra/gdb/PKGBUILD | 15 ++- extra/gdb/gdb.install | 4 +- extra/git/PKGBUILD | 8 +- extra/tcl/PKGBUILD | 43 +++---- libre/bbswitch-libre/PKGBUILD | 2 +- libre/bumblebee-libre/PKGBUILD | 4 +- libre/cdfs-libre/PKGBUILD | 2 +- libre/linux-libre-kmod-alx/PKGBUILD | 4 +- libre/linux-libre-lts-kmod-alx/PKGBUILD | 4 +- libre/linux-libre-lts/PKGBUILD | 10 +- libre/linux-libre-lts/linux-libre-lts.install | 2 +- libre/linux-libre/PKGBUILD | 10 +- libre/linux-libre/linux-libre.install | 2 +- libre/lirc-libre/PKGBUILD | 2 +- libre/tp_smapi-libre-lts/PKGBUILD | 2 +- libre/tp_smapi-libre/PKGBUILD | 2 +- libre/vhba-module-libre/PKGBUILD | 2 +- libre/virtualbox-libre-modules-lts/PKGBUILD | 2 +- libre/virtualbox-libre-modules/PKGBUILD | 2 +- multilib-staging/lib32-cairo/PKGBUILD | 46 +++++++ multilib-staging/lib32-cairo/libpng16.patch | 40 +++++++ multilib-staging/lib32-gdk-pixbuf2/PKGBUILD | 46 +++++++ .../lib32-gdk-pixbuf2/gdk-pixbuf2.install | 11 ++ multilib-staging/lib32-libpng/PKGBUILD | 55 +++++++++ 65 files changed, 882 insertions(+), 475 deletions(-) create mode 100644 community/bind/127.0.0.zone create mode 100644 community/bind/PKGBUILD create mode 100644 community/bind/install create mode 100644 community/bind/localhost.zone create mode 100755 community/bind/named create mode 100644 community/bind/named.conf create mode 100644 community/bind/named.conf.d create mode 100644 community/bind/named.logrotate create mode 100644 community/bind/named.service create mode 100644 community/bind/remove-tools.patch create mode 100644 community/bind/tmpfiles.d delete mode 100644 community/gtk-kde4/PKGBUILD delete mode 100644 community/gtk-kde4/fix-permission.patch create mode 100644 community/kde-gtk-config/PKGBUILD create mode 100644 community/kde-gtk-config/kde-gtk-config.install create mode 100644 community/libdom/PKGBUILD create mode 100644 core/glib2/gvariant-fix-annotation.patch create mode 100644 core/glib2/partially-revert-ce0022933c255313e010b27f977f4ae02aad1e7e.patch delete mode 100644 extra/bind/127.0.0.zone delete mode 100644 extra/bind/PKGBUILD delete mode 100644 extra/bind/install delete mode 100644 extra/bind/localhost.zone delete mode 100755 extra/bind/named delete mode 100644 extra/bind/named.conf delete mode 100644 extra/bind/named.conf.d delete mode 100644 extra/bind/named.logrotate delete mode 100644 extra/bind/named.service delete mode 100644 extra/bind/remove-tools.patch delete mode 100644 extra/bind/tmpfiles.d create mode 100644 multilib-staging/lib32-cairo/PKGBUILD create mode 100644 multilib-staging/lib32-cairo/libpng16.patch create mode 100644 multilib-staging/lib32-gdk-pixbuf2/PKGBUILD create mode 100644 multilib-staging/lib32-gdk-pixbuf2/gdk-pixbuf2.install create mode 100644 multilib-staging/lib32-libpng/PKGBUILD diff --git a/community/bind/127.0.0.zone b/community/bind/127.0.0.zone new file mode 100644 index 000000000..509c311f6 --- /dev/null +++ b/community/bind/127.0.0.zone @@ -0,0 +1,11 @@ +$ORIGIN 0.0.127.in-addr.arpa. + +@ 1D IN SOA localhost. root.localhost. ( + 42 ; serial (yyyymmdd##) + 3H ; refresh + 15M ; retry + 1W ; expiry + 1D ) ; minimum ttl + + 1D IN NS localhost. +1 1D IN PTR localhost. diff --git a/community/bind/PKGBUILD b/community/bind/PKGBUILD new file mode 100644 index 000000000..4cff0b633 --- /dev/null +++ b/community/bind/PKGBUILD @@ -0,0 +1,85 @@ +# $Id: PKGBUILD 89171 2013-04-27 13:07:51Z bisson $ +# Maintainer: Gaetan Bisson +# Contributor: judd +# Contributor: Mario Vazquez + +pkgname=bind +_pkgver=9.9.2-P2 +pkgver=${_pkgver//-/.} +pkgrel=1 +pkgdesc='Berkeley Internet Name Daemon is the reference implementation of the DNS protocols' +url='http://www.isc.org/software/bind/' +license=('custom:ISC') +arch=('i686' 'x86_64') +options=('!makeflags' '!libtool') +depends=('openssl' 'krb5' 'libxml2') +source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz" + 'root.hint::http://www.internic.net/zones/named.root' + 'remove-tools.patch' + 'tmpfiles.d' + 'named' + 'named.conf' + 'named.conf.d' + 'named.service' + 'named.logrotate' + 'localhost.zone' + '127.0.0.zone') +sha1sums=('3aadeaf64164a31a1cf22737ff2eea706792b68d' + '029f89c49550c40ec7a95116b6a33f0e5a041094' + '14264affa71bcfe7703d0fb7c3556c4c47efaa8b' + 'c5a2bcd9b0f009ae71f3a03fbdbe012196962a11' + '47f9ac4f6f70bc9167c1cf7859a298531197ad20' + 'c71a7fc02d4bf0d55e8e29d1e014607ac1d58726' + '7848edbfb9a848843f57c11c02b0289eefd42d00' + '7de92fff4b90c4821b3b133a05affd186fb93951' + '3fe1f0b5c1a51dc1db9ebe5e173d18c52c97169b' + '76a0d4cd1b913db177a5a375bebc47e5956866ec' + '53be0f1437ebe595240d8dbdd819939582b97fb9') +provides=('dns-server') + +install=install +backup=('etc/logrotate.d/named' + 'etc/conf.d/named' + 'etc/named.conf') + +build() { + cd "${srcdir}/bind-${_pkgver}" + + patch -p1 -i ../remove-tools.patch + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-static \ + --disable-linux-caps \ + --with-openssl \ + --with-libxml2 \ + --with-libtool \ + + make +} + +package() { + cd "${srcdir}/bind-${_pkgver}" + + install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + + make DESTDIR="${pkgdir}" install + + rmdir "${pkgdir}/var/run" + install -d "${pkgdir}"/usr/share/doc/bind + install doc/arm/*.html "${pkgdir}"/usr/share/doc/bind + + install -D -m755 ../named "${pkgdir}"/etc/rc.d/named + install -D -m644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/named.conf + install -D -m644 ../named.conf.d "${pkgdir}"/etc/conf.d/named + install -D -m644 ../named.service "${pkgdir}"/usr/lib/systemd/system/named.service + install -D -m600 ../named.logrotate "${pkgdir}"/etc/logrotate.d/named + install -D -m640 -o 0 -g 40 ../named.conf "${pkgdir}"/etc/named.conf + + install -d -m750 -o 0 -g 40 "${pkgdir}"/var/named + install -m640 -o 0 -g 40 ../root.hint "${pkgdir}"/var/named + install -m640 -o 0 -g 40 ../127.0.0.zone "${pkgdir}"/var/named + install -m640 -o 0 -g 40 ../localhost.zone "${pkgdir}"/var/named +} diff --git a/community/bind/install b/community/bind/install new file mode 100644 index 000000000..287d0e05b --- /dev/null +++ b/community/bind/install @@ -0,0 +1,21 @@ +post_install() { + getent group named &>/dev/null || groupadd -g 40 named + getent passwd named &>/dev/null || useradd -u 40 -c "BIND DNS Server" -g named -d /var/named -s /bin/false named + passwd -l named &>/dev/null + + touch var/log/named.log + chown named:named var/log/named.log + + # create an rndc.key if it doesn't already exist + if [[ ! -s etc/rndc.key ]]; then + usr/sbin/rndc-confgen -r /dev/urandom -b 256 | head -n 5 >>etc/rndc.key + chown root:named etc/rndc.key + chmod 640 etc/rndc.key + fi +} + +pre_remove() { + getent passwd named &>/dev/null && userdel named >/dev/null + getent group named &>/dev/null && groupdel named >/dev/null + return 0 +} diff --git a/community/bind/localhost.zone b/community/bind/localhost.zone new file mode 100644 index 000000000..e3ff9641c --- /dev/null +++ b/community/bind/localhost.zone @@ -0,0 +1,10 @@ +$ORIGIN localhost. +@ 1D IN SOA @ root ( + 42 ; serial (yyyymmdd##) + 3H ; refresh + 15M ; retry + 1W ; expiry + 1D ) ; minimum ttl + + 1D IN NS @ + 1D IN A 127.0.0.1 diff --git a/community/bind/named b/community/bind/named new file mode 100755 index 000000000..65dd0fe82 --- /dev/null +++ b/community/bind/named @@ -0,0 +1,49 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/named + +PIDFILE=/run/named/named.pid +PID=$(cat $PIDFILE 2>/dev/null) +readlink -q /proc/$PID/exe | grep -q '^/usr/sbin/named' || { PID=; rm $PIDFILE 2>/dev/null; } + +case "$1" in + start) + stat_busy "Starting BIND" + [ -z "$PID" ] && /usr/sbin/named ${NAMED_ARGS} + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon named + stat_done + fi + ;; + stop) + stat_busy "Stopping BIND" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon named + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + reload) + stat_busy "Reloading BIND" + [ ! -z "$PID" ] && rndc reload &>/dev/null || kill -HUP $PID &>/dev/null + if [ $? -gt 0 ]; then + stat_fail + else + stat_done + fi + ;; + *) + echo "usage: $0 {start|stop|reload|restart}" +esac +exit 0 diff --git a/community/bind/named.conf b/community/bind/named.conf new file mode 100644 index 000000000..4aaf19a49 --- /dev/null +++ b/community/bind/named.conf @@ -0,0 +1,64 @@ +// +// /etc/named.conf +// + +options { + directory "/var/named"; + pid-file "/run/named/named.pid"; + auth-nxdomain yes; + datasize default; +// Uncomment these to enable IPv6 connections support +// IPv4 will still work: +// listen-on-v6 { any; }; +// Add this for no IPv4: +// listen-on { none; }; + + // Default security settings. + allow-recursion { 127.0.0.1; }; + allow-transfer { none; }; + allow-update { none; }; + version none; + hostname none; + server-id none; +}; + +zone "localhost" IN { + type master; + file "localhost.zone"; + allow-transfer { any; }; +}; + +zone "0.0.127.in-addr.arpa" IN { + type master; + file "127.0.0.zone"; + allow-transfer { any; }; +}; + +zone "." IN { + type hint; + file "root.hint"; +}; + +//zone "example.org" IN { +// type slave; +// file "example.zone"; +// masters { +// 192.168.1.100; +// }; +// allow-query { any; }; +// allow-transfer { any; }; +//}; + +logging { + channel xfer-log { + file "/var/log/named.log"; + print-category yes; + print-severity yes; + print-time yes; + severity info; + }; + category xfer-in { xfer-log; }; + category xfer-out { xfer-log; }; + category notify { xfer-log; }; +}; + diff --git a/community/bind/named.conf.d b/community/bind/named.conf.d new file mode 100644 index 000000000..aecbd2307 --- /dev/null +++ b/community/bind/named.conf.d @@ -0,0 +1,4 @@ +# +# Parameters to be passed to BIND +# +NAMED_ARGS="-u named" diff --git a/community/bind/named.logrotate b/community/bind/named.logrotate new file mode 100644 index 000000000..5f9a47693 --- /dev/null +++ b/community/bind/named.logrotate @@ -0,0 +1,6 @@ +/var/log/named.log { + missingok + postrotate + /bin/kill -HUP `cat /run/named/named.pid 2>/dev/null` 2>/dev/null || true + endscript +} diff --git a/community/bind/named.service b/community/bind/named.service new file mode 100644 index 000000000..c21f13f4b --- /dev/null +++ b/community/bind/named.service @@ -0,0 +1,11 @@ +[Unit] +Description=Internet domain name server +After=network.target + +[Service] +ExecStart=/usr/sbin/named -f -u named +ExecReload=/usr/sbin/rndc reload +ExecStop=/usr/sbin/rndc stop + +[Install] +WantedBy=multi-user.target diff --git a/community/bind/remove-tools.patch b/community/bind/remove-tools.patch new file mode 100644 index 000000000..29b4c9c5f --- /dev/null +++ b/community/bind/remove-tools.patch @@ -0,0 +1,12 @@ +diff -aur old/bin/Makefile.in new/bin/Makefile.in +--- old/bin/Makefile.in 2009-10-05 05:07:08.000000000 -0700 ++++ new/bin/Makefile.in 2011-08-28 19:14:17.025674400 -0700 +@@ -19,7 +19,7 @@ + VPATH = @srcdir@ + top_srcdir = @top_srcdir@ + +-SUBDIRS = named rndc dig dnssec tests tools nsupdate \ ++SUBDIRS = named rndc dnssec tests tools nsupdate \ + check confgen @PYTHON_TOOLS@ @PKCS11_TOOLS@ + TARGETS = + diff --git a/community/bind/tmpfiles.d b/community/bind/tmpfiles.d new file mode 100644 index 000000000..1cfc82d08 --- /dev/null +++ b/community/bind/tmpfiles.d @@ -0,0 +1 @@ +d /run/named 0750 named named - diff --git a/community/catdoc/PKGBUILD b/community/catdoc/PKGBUILD index bad621899..549cddb7d 100644 --- a/community/catdoc/PKGBUILD +++ b/community/catdoc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 75719 2012-08-29 11:08:22Z bisson $ +# $Id: PKGBUILD 89169 2013-04-27 12:49:08Z kkeen $ # Maintainer: Juergen Hoetzel # Contributor: Paulius Palevicius pkgname=catdoc -pkgver=0.94.3 +pkgver=0.94.4 pkgrel=1 pkgdesc="A convertor for Microsoft Word, Excel, PowerPoint and RTF Files to text" arch=('i686' 'x86_64') @@ -13,12 +13,12 @@ depends=('glibc') optdepends=('tk: for using wordview') options=('!makeflags') source=(http://ftp.de.debian.org/debian/pool/main/c/catdoc/${pkgname}_$pkgver.orig.tar.gz) -md5sums=('61212b9fd06b0a31aa7bc9a671130f57') +md5sums=('4820680e3611392caf2b4dd2413bfae5') build() { cd "$srcdir/$pkgname-$pkgver" sed -i 's/$(prefix)/$(installroot)$(prefix)/' desktop/Makefile.in - sed -i 's/0.94.2/0.94.3/' configure* doc/*.1 src/makefile.tc + sed -i 's/0.94.2/0.94.4/' configure* doc/*.1 src/makefile.tc ./configure --prefix=/usr --with-wish=/usr/bin/wish make } diff --git a/community/gtk-kde4/PKGBUILD b/community/gtk-kde4/PKGBUILD deleted file mode 100644 index 367b79207..000000000 --- a/community/gtk-kde4/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 57913 2011-11-04 12:08:54Z lcarlier $ -# Maintainer: Andrea Scarpino -# Contributor: Viliam Pucik - -pkgname=gtk-kde4 -pkgver=0.9.5b -pkgrel=2 -pkgdesc='Allows you to change style, icons, font of GTK applications in KDE4.' -arch=('i686' 'x86_64') -url='http://kde-look.org/content/show.php?content=74689' -license=('GPL') -depends=('kdebase-workspace' 'gtk-engines') -makedepends=('cmake' 'automoc4') -provides=('gtk-qt-engine') -source=("http://betta.houa.org/no-site/${pkgname}(src)${pkgver}.tar.gz" - 'fix-permission.patch') -md5sums=('d5998e4ccd4bd4b4d6a61e7afe8bbecb' - 'f52fa3288c728e5fad72c5d136b49bc5') - -build() { - cd ${pkgname} - - patch -p1 -i ${srcdir}/fix-permission.patch - cmake -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - - make -} - -package() { - cd ${pkgname} - - make DESTDIR=${pkgdir} install -} diff --git a/community/gtk-kde4/fix-permission.patch b/community/gtk-kde4/fix-permission.patch deleted file mode 100644 index 29d6c3903..000000000 --- a/community/gtk-kde4/fix-permission.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- gtk-kde4/CMakeLists.txt~ 2010-09-28 11:16:32.000000000 -0700 -+++ gtk-kde4/CMakeLists.txt 2010-10-26 12:31:35.400040780 -0700 -@@ -32,15 +32,8 @@ - - add_subdirectory(kcm/helper) - --INSTALL(FILES ${PROJECT_BINARY_DIR}/daemon/gtk-kde4 DESTINATION ${KDE4_BIN_INSTALL_DIR} PERMISSIONS WORLD_EXECUTE) --#INSTALL(FILES ${PROJECT_BINARY_DIR}/.gtkrc-2.0-kde4 DESTINATION $ENV{HOME} PERMISSIONS WORLD_READ) -- --string(LENGTH conf len) --IF (NOT len) -- INSTALL(FILES ${PROJECT_BINARY_DIR}/daemon/gtk-kde4.desktop DESTINATION $ENV{XDG_CONFIG_DIRS}/autostart PERMISSIONS WORLD_EXECUTE) --ELSE() -- INSTALL(FILES ${PROJECT_BINARY_DIR}/daemon/gtk-kde4.desktop DESTINATION /etc/xdg/autostart PERMISSIONS WORLD_EXECUTE WORLD_READ) --ENDIF() -+INSTALL(PROGRAMS daemon/gtk-kde4 DESTINATION ${KDE4_BIN_INSTALL_DIR}) -+INSTALL(PROGRAMS daemon/gtk-kde4.desktop DESTINATION /etc/xdg/autostart) - - FIND_PROGRAM(GETTEXT_MSGFMT_EXECUTABLE msgfmt) - -@@ -74,4 +67,4 @@ - - ENDFOREACH(_poFile ${PO_FILES}) - --ENDIF(NOT GETTEXT_MSGFMT_EXECUTABLE) -\ No newline at end of file -+ENDIF(NOT GETTEXT_MSGFMT_EXECUTABLE) diff --git a/community/gtkwave/PKGBUILD b/community/gtkwave/PKGBUILD index d7a20adce..ade697db8 100644 --- a/community/gtkwave/PKGBUILD +++ b/community/gtkwave/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 76513 2012-09-20 19:33:36Z kkeen $ +# $Id: PKGBUILD 89164 2013-04-27 12:32:34Z kkeen $ # Maintainer: Kyle Keen # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Jared Casper pkgname=gtkwave -pkgver=3.3.40 +pkgver=3.3.45 pkgrel=1 pkgdesc='A wave viewer which reads LXT, LXT2, VZT, GHW and VCD/EVCD files' arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ depends=('bzip2' 'xz' 'gtk2') makedepends=('gperf') install='gtkwave.install' source=("http://gtkwave.sourceforge.net/gtkwave-${pkgver}.tar.gz") -md5sums=('f7b4cd0d056084f6725173b7f939152c') +md5sums=('d746e1ce0584155e3af1d7ba5b0e56f0') build() { cd "${srcdir}/gtkwave-${pkgver}" diff --git a/community/hubbub/PKGBUILD b/community/hubbub/PKGBUILD index 5510e5d13..c22b6f1ea 100644 --- a/community/hubbub/PKGBUILD +++ b/community/hubbub/PKGBUILD @@ -1,32 +1,33 @@ -# $Id: PKGBUILD 70911 2012-05-18 23:52:08Z arodseth $ +# $Id: PKGBUILD 89120 2013-04-26 23:11:48Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Daniel J Griffiths # Contributor: Paulo Matias pkgname=hubbub -pkgver=0.1.2 +pkgver=0.2.0 pkgrel=1 -pkgdesc="HTML5 compliant parsing library" +pkgdesc='HTML5 compliant parsing library' arch=('x86_64' 'i686') -url="http://www.netsurf-browser.org/projects/hubbub/" +url='http://www.netsurf-browser.org/projects/hubbub/' license=('MIT') -depends=('libparserutils') -source=("http://www.netsurf-browser.org/projects/releases/$pkgname-$pkgver-src.tar.gz") -sha256sums=('95a1d5a71055b28a8e4ce4dc8516b8f0ed691c5ee03525bf73600495657f1b52') +depends=('libparserutils>=0.1.2') +makedepends=('netsurf-buildsystem') +source=("http://download.netsurf-browser.org/libs/releases/lib$pkgname-$pkgver-src.tar.gz") +sha256sums=('91c90965fdbbfb9137c7881b33736a03fc80bd16f5cd7808e1efff3d63000eaf') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/lib$pkgname-$pkgver" sed -i 's:-Werror::' Makefile - make PREFIX=/usr COMPONENT_TYPE="lib-shared" - make PREFIX=/usr COMPONENT_TYPE="lib-static" + make PREFIX=/usr COMPONENT_TYPE='lib-shared' + make PREFIX=/usr COMPONENT_TYPE='lib-static' } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/lib$pkgname-$pkgver" - make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE="lib-shared" - make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE="lib-static" + make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE='lib-shared' + make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE='lib-static' install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" } diff --git a/community/kde-gtk-config/PKGBUILD b/community/kde-gtk-config/PKGBUILD new file mode 100644 index 000000000..88840a813 --- /dev/null +++ b/community/kde-gtk-config/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 89140 2013-04-27 07:58:51Z lcarlier $ +# Maintainer: Laurent Carlier +# Contributor: birdflesh + +pkgname=kde-gtk-config +pkgver=2.2.1 +pkgrel=1 +pkgdesc="GTK2 and GTK3 Configurator for KDE" +arch=('i686' 'x86_64') +url="https://projects.kde.org/kde-gtk-config" +license=('GPL3') +depends=('kdelibs') +makedepends=('cmake' 'automoc4' 'gtk2' 'gtk3') +optdepends=('gtk2: GTK+ v2 support' + 'gtk3: GTK+ v3 support') +source=("http://download.kde.org/stable/$pkgname/$pkgver/src/$pkgname-$pkgver.tar.xz") +md5sums=('d155ed431d509e54a60383a70b700e1c') +install=$pkgname.install + +build() { + cd "$srcdir" + + mkdir -p build && cd build + + cmake ../$pkgname-$pkgver \ + -DQT_QMAKE_EXECUTABLE=qmake-qt4 \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package(){ + cd "$srcdir/build" + + make DESTDIR="$pkgdir" install +} diff --git a/community/kde-gtk-config/kde-gtk-config.install b/community/kde-gtk-config/kde-gtk-config.install new file mode 100644 index 000000000..6905e303e --- /dev/null +++ b/community/kde-gtk-config/kde-gtk-config.install @@ -0,0 +1,11 @@ +post_install() { +xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} \ No newline at end of file diff --git a/community/kicad/PKGBUILD b/community/kicad/PKGBUILD index 15518c6c7..fca285645 100644 --- a/community/kicad/PKGBUILD +++ b/community/kicad/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 85759 2013-03-06 14:22:48Z kkeen $ +# $Id: PKGBUILD 89177 2013-04-27 13:49:24Z kkeen $ # Maintainer: Kyle Keen # Contributor: Marq Schneider pkgname=kicad -pkgver=20130226 +pkgver=20130331 _pkgver=${pkgver:0:4}-${pkgver:4:2}-${pkgver:6:2} -_pkgbzr=3974 -pkgrel=4 +_pkgbzr=4008 +pkgrel=1 pkgdesc="Electronic schematic and printed circuit board (PCB) design tools" arch=('i686' 'x86_64') url="http://iut-tice.ujf-grenoble.fr/kicad/" @@ -16,9 +16,9 @@ makedepends=('cmake' 'zlib' 'mesa') optdepends=('kicad-docs-bzr: for documentation' 'kicad-library-bzr: for footprints') install=kicad.install -source=(http://iut-tice.ujf-grenoble.fr/cao/${pkgname}_sources_stable_${_pkgver}_BZR${_pkgbzr}.zip +source=(http://iut-tice.ujf-grenoble.fr/cao/${pkgname}-sources_stable_${_pkgver}_BZR${_pkgbzr}.zip kicad-boost-polygon-declare-gtlsort-earlier.patch) -md5sums=('9b7748efedc355473c72fdb7c37b0500' +md5sums=('9c88273a5b323b6622d1704a90ffa399' 'a2c39704238946e74a5ed0c38326345f') build() { diff --git a/community/libcss/PKGBUILD b/community/libcss/PKGBUILD index eb4ab2817..4c5fb155e 100644 --- a/community/libcss/PKGBUILD +++ b/community/libcss/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 70921 2012-05-19 18:26:38Z arodseth $ +# $Id: PKGBUILD 89131 2013-04-27 00:42:21Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Brad Fanella # Contributor: Daniel J Griffiths pkgname=libcss -pkgver=0.1.2 -pkgrel=2 -pkgdesc="CSS parser and selection engine" +pkgver=0.2.0 +pkgrel=1 +pkgdesc='CSS parser and selection engine' arch=('x86_64' 'i686') -url="http://www.netsurf-browser.org/projects/libcss/" +url='http://www.netsurf-browser.org/projects/libcss/' license=('MIT') -depends=('libparserutils>=0.1.1' 'libwapcaplet>=0.1.1') -source=("http://www.netsurf-browser.org/projects/releases/libcss-$pkgver-src.tar.gz") -sha256sums=('92c112a059bc5ae490392439401005b47ca5c270f891f6317b64aac738ae1f5e') +depends=('libparserutils>=0.1.2' 'libwapcaplet>=0.2.0') +makedepends=('netsurf-buildsystem') +source=("http://download.netsurf-browser.org/libs/releases/libcss-$pkgver-src.tar.gz") +sha256sums=('31b08f6f2259366ccad8b455440f364dc33e7dc78cdb0cf4905da56d5372f613') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/libdom/PKGBUILD b/community/libdom/PKGBUILD new file mode 100644 index 000000000..0ee76677c --- /dev/null +++ b/community/libdom/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 89135 2013-04-27 01:19:34Z arodseth $ +# Maintainer: Alexander Rødseth + +pkgname=libdom +pkgver=0.0.1 +pkgrel=1 +pkgdesc='Implementation of the W3C DOM' +arch=('x86_64' 'i686') +url='http://www.netsurf-browser.org/projects/libdom/' +license=('MIT') +depends=('hubbub>=0.2.0' 'libwapcaplet>=0.2.0' 'expat') +makedepends=('netsurf-buildsystem') +source=("http://download.netsurf-browser.org/libs/releases/$pkgname-$pkgver-src.tar.gz") +sha256sums=('2aa75861c8a8291b6b3d1a3856c65ca615677afeec64ccfdf35a113a292c36b1') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + export CFLAGS="-Wno-error=unused-but-set-variable" + make PREFIX=/usr COMPONENT_TYPE="lib-shared" + make PREFIX=/usr COMPONENT_TYPE="lib-static" +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE="lib-shared" + make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE="lib-static" + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/libnsbmp/PKGBUILD b/community/libnsbmp/PKGBUILD index 8193e85dd..6b01b1638 100644 --- a/community/libnsbmp/PKGBUILD +++ b/community/libnsbmp/PKGBUILD @@ -1,27 +1,29 @@ -# $Id: PKGBUILD 59663 2011-11-29 08:59:46Z arodseth $ +# $Id: PKGBUILD 89122 2013-04-26 23:30:55Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Paulo Matias # Contributor: Daniel J Griffiths + pkgname=libnsbmp -pkgver=0.0.3 -pkgrel=3 -pkgdesc="Decoding library for BMP and ICO image file formats" +pkgver=0.1.0 +pkgrel=1 +pkgdesc='Decoding library for BMP and ICO image file formats' arch=('x86_64' 'i686') -url="http://www.netsurf-browser.org/projects/libnsbmp/" +url='http://www.netsurf-browser.org/projects/libnsbmp/' license=('MIT') depends=('glibc') -source=("http://www.netsurf-browser.org/projects/releases/$pkgname-$pkgver-src.tar.gz") -md5sums=('52eef940713a4c8a7afbb6888583057c') +makedepends=('netsurf-buildsystem') +source=("http://download.netsurf-browser.org/libs/releases/$pkgname-$pkgver-src.tar.gz") +sha256sums=('fb576af6bd4d02d3626d5c2092bc06c80b2a80089a14decf40c813d9ec80ddc0') build() { - cd "$srcdir/$pkgname-$pkgver-src" + cd "$srcdir/$pkgname-$pkgver" make PREFIX=/usr COMPONENT_TYPE="lib-shared" make PREFIX=/usr COMPONENT_TYPE="lib-static" } package() { - cd "$srcdir/$pkgname-$pkgver-src" + cd "$srcdir/$pkgname-$pkgver" make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE="lib-shared" make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE="lib-static" diff --git a/community/libnsgif/PKGBUILD b/community/libnsgif/PKGBUILD index b31fff221..c17d5a370 100644 --- a/community/libnsgif/PKGBUILD +++ b/community/libnsgif/PKGBUILD @@ -1,20 +1,22 @@ -# $Id: PKGBUILD 59664 2011-11-29 09:06:33Z arodseth $ +# $Id: PKGBUILD 89124 2013-04-26 23:34:05Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Daniel J Griffiths # Contributor: Paulo Matias + pkgname=libnsgif -pkgver=0.0.3 -pkgrel=3 -pkgdesc="Decoding library for the GIF image file format" +pkgver=0.1.0 +pkgrel=1 +pkgdesc='Decoding library for the GIF image file format' arch=('x86_64' 'i686') -url="http://www.netsurf-browser.org/projects/libnsgif/" +url='http://www.netsurf-browser.org/projects/libnsgif/' license=('MIT') depends=('glibc') -source=("http://www.netsurf-browser.org/projects/releases/$pkgname-$pkgver-src.tar.gz") -md5sums=('d4fa9679939e9b1b243799d6a0623cec') +makedepends=('netsurf-buildsystem') +source=("http://download.netsurf-browser.org/libs/releases/$pkgname-$pkgver-src.tar.gz") +sha256sums=('e7dc7ee887fefc19e7c7985c5a2b057870e0fa3dd0dcfc1fdb4e98da1f36593c') build() { - cd "$srcdir/$pkgname-$pkgver-src" + cd "$srcdir/$pkgname-$pkgver" CFLAGS="$CFLAGS -fno-strict-aliasing" make PREFIX=/usr COMPONENT_TYPE="lib-shared" @@ -22,7 +24,7 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver-src" + cd "$srcdir/$pkgname-$pkgver" make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE="lib-shared" make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE="lib-static" diff --git a/community/libwapcaplet/PKGBUILD b/community/libwapcaplet/PKGBUILD index 62c641f11..e9425b8c5 100644 --- a/community/libwapcaplet/PKGBUILD +++ b/community/libwapcaplet/PKGBUILD @@ -1,17 +1,19 @@ -# $Id: PKGBUILD 70913 2012-05-18 23:56:14Z arodseth $ +# $Id: PKGBUILD 89126 2013-04-26 23:37:42Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Brad Fanella # Contributor: Daniel J Griffiths pkgname=libwapcaplet -pkgver=0.1.1 +pkgver=0.2.0 pkgrel=1 -pkgdesc="String internment library with rapid string comparison" +pkgdesc='String internment library with rapid string comparison' arch=('x86_64' 'i686') -url="http://www.netsurf-browser.org/projects/libwapcaplet/" +url='http://www.netsurf-browser.org/projects/libwapcaplet/' license=('MIT') -source=("http://www.netsurf-browser.org/projects/releases/$pkgname-$pkgver-src.tar.gz") -sha256sums=('cf05159d7d515523697ce07228cff6a6339dc6bdcfec3e02e3b72d8b773f5258') +depends=('glibc') +makedepends=('netsurf-buildsystem') +source=("http://download.netsurf-browser.org/libs/releases/$pkgname-$pkgver-src.tar.gz") +sha256sums=('5fb49841ba335b0c7a1420d92c3a60480df63696c50353c02724aa8c6b45cb24') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/netsurf/PKGBUILD b/community/netsurf/PKGBUILD index e24d0c0b3..1f760a693 100644 --- a/community/netsurf/PKGBUILD +++ b/community/netsurf/PKGBUILD @@ -1,45 +1,49 @@ -# $Id: PKGBUILD 81235 2012-12-13 22:54:07Z arodseth $ +# $Id: PKGBUILD 89138 2013-04-27 07:58:18Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Paulo Matias # Contributor: Georgij Kondratjev # Contributor: Daniel J Griffiths pkgname=netsurf -pkgver=2.9 -pkgrel=5 +pkgver=3.0 +pkgrel=1 pkgdesc='Lightweight and fast web browser' arch=('x86_64' 'i686') url='http://www.netsurf-browser.org/' license=('GPL') -depends=('libmng' 'curl' 'libglade' 'librsvg' 'desktop-file-utils' 'libnsbmp' 'libnsgif' 'libcss>=0.1.2' 'hubbub>=0.1.2' 'libwebp>=0.2.0' 'gstreamer0.10') -makedepends=('re2c' 'lcms' 'gendesk>=0.4.2') -provides=('netsurf') -conflicts=('netsurf') -install=netsurf.install +depends=('gtk2' 'libmng' 'curl' 'librsvg' 'desktop-file-utils' 'libnsbmp' 'libnsgif' 'libcss' 'libwebp' 'libdom') # 'libharu' 'gstreamer0.10' +makedepends=('js' 're2c' 'lcms' 'gendesk' 'netsurf-buildsystem' 'libglade') +install="$pkgname.install" source=("netsurf.png::http://ubuntu.allmyapps.com/data/n/e/netsurf-netsurf-web-browser/icon_48x48_netsurf.png" "http://download.$pkgname-browser.org/$pkgname/releases/source/$pkgname-$pkgver-src.tar.gz") sha256sums=('f0dbcc5d80bf03d706aa8b28a322aa7f169a40813848c2d1505691f6e2c7ef00' - 'f74767161fd7f3186e483b438a183f2ea3cae160020ad5dd63c75a4d78f5c797') + '7c6a48d3cc3e9a3e3a51b532ddf60f7697e97bf8b61a6d3b2ced1a2e89fbccc6') + _exec=('netsurf %U') _genericname=('Web Browser') _comment=('Lightweight web browser') _mimetype=('text/html;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/geo') -build() { +prepare() { cd "$srcdir" gendesk - cd "$pkgname" +} + +build() { + cd "$pkgname-$pkgver" make \ PREFIX=/usr \ TARGET=gtk \ NETSURF_USE_WEBP=YES \ - NETSURF_USE_VIDEO=YES + NETSURF_USE_VIDEO=NO \ + NETSURF_USE_MOZILLA_JS=YES \ + NETSURF_USE_HARU_PDF=NO } package() { - cd "$srcdir/$pkgname" + cd "$srcdir/$pkgname-$pkgver" make install PREFIX=/usr DESTDIR="$pkgdir" install -Dm644 "../$pkgname.png" \ diff --git a/community/qupzilla/PKGBUILD b/community/qupzilla/PKGBUILD index 516da13b9..55558bef9 100644 --- a/community/qupzilla/PKGBUILD +++ b/community/qupzilla/PKGBUILD @@ -1,10 +1,9 @@ -# $Id: PKGBUILD 87097 2013-03-27 02:25:04Z speps $ +# $Id: PKGBUILD 89115 2013-04-26 22:11:32Z speps $ # Maintainer: speps _name=QupZilla -_commit=953ca72 # pkgname=qupzilla -pkgver=1.4.1_git20130326 +pkgver=1.4.2 pkgrel=1 pkgdesc="Cross-platform QtWebKit browser" arch=(i686 x86_64) @@ -13,8 +12,8 @@ license=('GPL3') depends=('qtwebkit' 'hunspell') optdepends=('bash-completion: bash completion support') install="$pkgname.install" -source=("$pkgname-$pkgver.tar.gz::https://github.com/$_name/$pkgname/tarball/$_commit") -md5sums=('1b1b94a53a422436975b19f9ca05f006') +source=("$pkgname-$pkgver.tar.gz::https://github.com/$_name/$pkgname/tarball/v$pkgver") +md5sums=('e1989427fea976312ca4c0ec84ce41b2') build() { cd "$srcdir/$_name-$pkgname-"* diff --git a/core/glib2/PKGBUILD b/core/glib2/PKGBUILD index d277d9892..50260971f 100644 --- a/core/glib2/PKGBUILD +++ b/core/glib2/PKGBUILD @@ -1,21 +1,33 @@ -# $Id: PKGBUILD 183313 2013-04-21 22:06:25Z heftig $ +# $Id: PKGBUILD 183737 2013-04-27 14:20:45Z jgc $ # Maintainer: Jan de Groot pkgbase=glib2 pkgname=(glib2 glib2-docs) pkgver=2.36.1 -pkgrel=1 +pkgrel=3 pkgdesc="Common C routines used by GTK+ and other libs" url="http://www.gtk.org/" arch=(i686 x86_64) makedepends=('pkg-config' 'python2' 'libxslt' 'docbook-xml' 'pcre' 'libffi' 'elfutils') source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-$pkgver.tar.xz - revert-warn-glib-compile-schemas.patch) + revert-warn-glib-compile-schemas.patch + gvariant-fix-annotation.patch + partially-revert-ce0022933c255313e010b27f977f4ae02aad1e7e.patch) sha256sums=('7de37586794e92c024feebe5d306bf5f245fef4803c3666af1ae8dac6ee10b24' - '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97') + '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97' + 'ebbb0581322b1fc546f93f9d77f39f37584004086d2f6f2637a8bb7894e36b2b' + '5928ac4fd114cda846fe38a3b8bedc5b038dbf9e47f76029af7d75e5dc8ae5be') build() { cd glib-$pkgver + + # fix FS#34630 https://bugs.archlinux.org/task/34630 + export CFLAGS+=" -Wall" + + # Upstream fixes from 2.36 branch + patch -Np1 -i ../gvariant-fix-annotation.patch + patch -Np1 -i ../partially-revert-ce0022933c255313e010b27f977f4ae02aad1e7e.patch + patch -Rp1 -i ../revert-warn-glib-compile-schemas.patch PYTHON=/usr/bin/python2 ./configure --prefix=/usr --libdir=/usr/lib \ --sysconfdir=/etc \ diff --git a/core/glib2/gvariant-fix-annotation.patch b/core/glib2/gvariant-fix-annotation.patch new file mode 100644 index 000000000..ee10312c8 --- /dev/null +++ b/core/glib2/gvariant-fix-annotation.patch @@ -0,0 +1,25 @@ +From 7304bbd5d8ad56dcf3ee9fadf74f6104c49d4df7 Mon Sep 17 00:00:00 2001 +From: Giovanni Campagna +Date: Fri, 12 Apr 2013 15:25:15 +0000 +Subject: GVariant: fix transfer annotation + +g_variant_new_from_bytes() returns a floating reference, so it +must be annotated (transfer none) + +https://bugzilla.gnome.org/show_bug.cgi?id=697887 +--- +diff --git a/glib/gvariant-core.c b/glib/gvariant-core.c +index b96bc90..f823e01 100644 +--- a/glib/gvariant-core.c ++++ b/glib/gvariant-core.c +@@ -498,7 +498,7 @@ g_variant_alloc (const GVariantType *type, + * + * A reference is taken on @bytes. + * +- * Returns: a new #GVariant with a floating reference ++ * Returns: (transfer none): a new #GVariant with a floating reference + * + * Since: 2.36 + */ +-- +cgit v0.9.1 diff --git a/core/glib2/partially-revert-ce0022933c255313e010b27f977f4ae02aad1e7e.patch b/core/glib2/partially-revert-ce0022933c255313e010b27f977f4ae02aad1e7e.patch new file mode 100644 index 000000000..f623c1b21 --- /dev/null +++ b/core/glib2/partially-revert-ce0022933c255313e010b27f977f4ae02aad1e7e.patch @@ -0,0 +1,132 @@ +From f3b1054b0ebb4912f700e08da0c3d35c30113e79 Mon Sep 17 00:00:00 2001 +From: Ryan Lortie +Date: Tue, 23 Apr 2013 17:26:48 +0000 +Subject: Partially revert "Merge waitpid() from g_spawn_sync into gmain()" + +This partially reverts commit ce0022933c255313e010b27f977f4ae02aad1e7e. + +It used to be safe to use g_spawn_sync() from processes that had their +own SIGCHLD handler because it simply called wait(). When it was +changed to depend on the GLib child watching infrastructure this meant +that GLib had to own the SIGCHLD handler. + +This caused hangs in at least Pidgin. + +The patch contained two other improvements to the child watch code which +we want to keep, so only revert the changes to gspawn itself. + +https://bugzilla.gnome.org/show_bug.cgi?id=698081 +--- +diff --git a/glib/gspawn.c b/glib/gspawn.c +index 381ed5c..01cedf6 100644 +--- a/glib/gspawn.c ++++ b/glib/gspawn.c +@@ -47,7 +47,6 @@ + + #include "genviron.h" + #include "gmem.h" +-#include "gmain.h" + #include "gshell.h" + #include "gstring.h" + #include "gstrfuncs.h" +@@ -207,21 +206,6 @@ read_data (GString *str, + } + } + +-typedef struct { +- GMainLoop *loop; +- gint *status_p; +-} SyncWaitpidData; +- +-static void +-on_sync_waitpid (GPid pid, +- gint status, +- gpointer user_data) +-{ +- SyncWaitpidData *data = user_data; +- *(data->status_p) = status; +- g_main_loop_quit (data->loop); +-} +- + /** + * g_spawn_sync: + * @working_directory: (allow-none): child's current working directory, or %NULL to inherit parent's +@@ -277,7 +261,6 @@ g_spawn_sync (const gchar *working_directory, + GString *errstr = NULL; + gboolean failed; + gint status; +- SyncWaitpidData waitpid_data; + + g_return_val_if_fail (argv != NULL, FALSE); + g_return_val_if_fail (!(flags & G_SPAWN_DO_NOT_REAP_CHILD), FALSE); +@@ -410,32 +393,45 @@ g_spawn_sync (const gchar *working_directory, + close_and_invalidate (&outpipe); + if (errpipe >= 0) + close_and_invalidate (&errpipe); +- +- /* Now create a temporary main context and loop, with just one +- * waitpid source. We used to invoke waitpid() directly here, but +- * this way we unify with the worker thread in gmain.c. ++ ++ /* Wait for child to exit, even if we have ++ * an error pending. + */ +- { +- GMainContext *context; +- GMainLoop *loop; +- GSource *source; +- +- context = g_main_context_new (); +- loop = g_main_loop_new (context, TRUE); ++ again: ++ ++ ret = waitpid (pid, &status, 0); + +- waitpid_data.loop = loop; +- waitpid_data.status_p = &status; +- +- source = g_child_watch_source_new (pid); +- g_source_set_callback (source, (GSourceFunc)on_sync_waitpid, &waitpid_data, NULL); +- g_source_attach (source, context); +- g_source_unref (source); +- +- g_main_loop_run (loop); ++ if (ret < 0) ++ { ++ if (errno == EINTR) ++ goto again; ++ else if (errno == ECHILD) ++ { ++ if (exit_status) ++ { ++ g_warning ("In call to g_spawn_sync(), exit status of a child process was requested but ECHILD was received by waitpid(). Most likely the process is ignoring SIGCHLD, or some other thread is invoking waitpid() with a nonpositive first argument; either behavior can break applications that use g_spawn_sync either directly or indirectly."); ++ } ++ else ++ { ++ /* We don't need the exit status. */ ++ } ++ } ++ else ++ { ++ if (!failed) /* avoid error pileups */ ++ { ++ int errsv = errno; + +- g_main_context_unref (context); +- g_main_loop_unref (loop); +- } ++ failed = TRUE; ++ ++ g_set_error (error, ++ G_SPAWN_ERROR, ++ G_SPAWN_ERROR_READ, ++ _("Unexpected error in waitpid() (%s)"), ++ g_strerror (errsv)); ++ } ++ } ++ } + + if (failed) + { +-- +cgit v0.9.1 diff --git a/extra/bind/127.0.0.zone b/extra/bind/127.0.0.zone deleted file mode 100644 index 509c311f6..000000000 --- a/extra/bind/127.0.0.zone +++ /dev/null @@ -1,11 +0,0 @@ -$ORIGIN 0.0.127.in-addr.arpa. - -@ 1D IN SOA localhost. root.localhost. ( - 42 ; serial (yyyymmdd##) - 3H ; refresh - 15M ; retry - 1W ; expiry - 1D ) ; minimum ttl - - 1D IN NS localhost. -1 1D IN PTR localhost. diff --git a/extra/bind/PKGBUILD b/extra/bind/PKGBUILD deleted file mode 100644 index b491d68a9..000000000 --- a/extra/bind/PKGBUILD +++ /dev/null @@ -1,85 +0,0 @@ -# $Id: PKGBUILD 181006 2013-03-29 15:52:14Z bpiotrowski $ -# Maintainer: Gaetan Bisson -# Contributor: judd -# Contributor: Mario Vazquez - -pkgname=bind -_pkgver=9.9.2-P2 -pkgver=${_pkgver//-/.} -pkgrel=1 -pkgdesc='Berkeley Internet Name Daemon is the reference implementation of the DNS protocols' -url='http://www.isc.org/software/bind/' -license=('custom:ISC') -arch=('i686' 'x86_64') -options=('!makeflags' '!libtool') -depends=('openssl' 'krb5' 'libxml2') -source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz" - 'root.hint::http://www.internic.net/zones/named.root' - 'remove-tools.patch' - 'tmpfiles.d' - 'named' - 'named.conf' - 'named.conf.d' - 'named.service' - 'named.logrotate' - 'localhost.zone' - '127.0.0.zone') -sha1sums=('3aadeaf64164a31a1cf22737ff2eea706792b68d' - '029f89c49550c40ec7a95116b6a33f0e5a041094' - '14264affa71bcfe7703d0fb7c3556c4c47efaa8b' - 'c5a2bcd9b0f009ae71f3a03fbdbe012196962a11' - '47f9ac4f6f70bc9167c1cf7859a298531197ad20' - 'c71a7fc02d4bf0d55e8e29d1e014607ac1d58726' - '7848edbfb9a848843f57c11c02b0289eefd42d00' - '7de92fff4b90c4821b3b133a05affd186fb93951' - '3fe1f0b5c1a51dc1db9ebe5e173d18c52c97169b' - '76a0d4cd1b913db177a5a375bebc47e5956866ec' - '53be0f1437ebe595240d8dbdd819939582b97fb9') -provides=('dns-server') - -install=install -backup=('etc/logrotate.d/named' - 'etc/conf.d/named' - 'etc/named.conf') - -build() { - cd "${srcdir}/bind-${_pkgver}" - - patch -p1 -i ../remove-tools.patch - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-static \ - --disable-linux-caps \ - --with-openssl \ - --with-libxml2 \ - --with-libtool \ - - make -} - -package() { - cd "${srcdir}/bind-${_pkgver}" - - install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - - make DESTDIR="${pkgdir}" install - - rmdir "${pkgdir}/var/run" - install -d "${pkgdir}"/usr/share/doc/bind - install doc/arm/*.html "${pkgdir}"/usr/share/doc/bind - - install -D -m755 ../named "${pkgdir}"/etc/rc.d/named - install -D -m644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/named.conf - install -D -m644 ../named.conf.d "${pkgdir}"/etc/conf.d/named - install -D -m644 ../named.service "${pkgdir}"/usr/lib/systemd/system/named.service - install -D -m600 ../named.logrotate "${pkgdir}"/etc/logrotate.d/named - install -D -m640 -o 0 -g 40 ../named.conf "${pkgdir}"/etc/named.conf - - install -d -m750 -o 0 -g 40 "${pkgdir}"/var/named - install -m640 -o 0 -g 40 ../root.hint "${pkgdir}"/var/named - install -m640 -o 0 -g 40 ../127.0.0.zone "${pkgdir}"/var/named - install -m640 -o 0 -g 40 ../localhost.zone "${pkgdir}"/var/named -} diff --git a/extra/bind/install b/extra/bind/install deleted file mode 100644 index 287d0e05b..000000000 --- a/extra/bind/install +++ /dev/null @@ -1,21 +0,0 @@ -post_install() { - getent group named &>/dev/null || groupadd -g 40 named - getent passwd named &>/dev/null || useradd -u 40 -c "BIND DNS Server" -g named -d /var/named -s /bin/false named - passwd -l named &>/dev/null - - touch var/log/named.log - chown named:named var/log/named.log - - # create an rndc.key if it doesn't already exist - if [[ ! -s etc/rndc.key ]]; then - usr/sbin/rndc-confgen -r /dev/urandom -b 256 | head -n 5 >>etc/rndc.key - chown root:named etc/rndc.key - chmod 640 etc/rndc.key - fi -} - -pre_remove() { - getent passwd named &>/dev/null && userdel named >/dev/null - getent group named &>/dev/null && groupdel named >/dev/null - return 0 -} diff --git a/extra/bind/localhost.zone b/extra/bind/localhost.zone deleted file mode 100644 index e3ff9641c..000000000 --- a/extra/bind/localhost.zone +++ /dev/null @@ -1,10 +0,0 @@ -$ORIGIN localhost. -@ 1D IN SOA @ root ( - 42 ; serial (yyyymmdd##) - 3H ; refresh - 15M ; retry - 1W ; expiry - 1D ) ; minimum ttl - - 1D IN NS @ - 1D IN A 127.0.0.1 diff --git a/extra/bind/named b/extra/bind/named deleted file mode 100755 index 65dd0fe82..000000000 --- a/extra/bind/named +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/named - -PIDFILE=/run/named/named.pid -PID=$(cat $PIDFILE 2>/dev/null) -readlink -q /proc/$PID/exe | grep -q '^/usr/sbin/named' || { PID=; rm $PIDFILE 2>/dev/null; } - -case "$1" in - start) - stat_busy "Starting BIND" - [ -z "$PID" ] && /usr/sbin/named ${NAMED_ARGS} - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon named - stat_done - fi - ;; - stop) - stat_busy "Stopping BIND" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon named - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - reload) - stat_busy "Reloading BIND" - [ ! -z "$PID" ] && rndc reload &>/dev/null || kill -HUP $PID &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - ;; - *) - echo "usage: $0 {start|stop|reload|restart}" -esac -exit 0 diff --git a/extra/bind/named.conf b/extra/bind/named.conf deleted file mode 100644 index 4aaf19a49..000000000 --- a/extra/bind/named.conf +++ /dev/null @@ -1,64 +0,0 @@ -// -// /etc/named.conf -// - -options { - directory "/var/named"; - pid-file "/run/named/named.pid"; - auth-nxdomain yes; - datasize default; -// Uncomment these to enable IPv6 connections support -// IPv4 will still work: -// listen-on-v6 { any; }; -// Add this for no IPv4: -// listen-on { none; }; - - // Default security settings. - allow-recursion { 127.0.0.1; }; - allow-transfer { none; }; - allow-update { none; }; - version none; - hostname none; - server-id none; -}; - -zone "localhost" IN { - type master; - file "localhost.zone"; - allow-transfer { any; }; -}; - -zone "0.0.127.in-addr.arpa" IN { - type master; - file "127.0.0.zone"; - allow-transfer { any; }; -}; - -zone "." IN { - type hint; - file "root.hint"; -}; - -//zone "example.org" IN { -// type slave; -// file "example.zone"; -// masters { -// 192.168.1.100; -// }; -// allow-query { any; }; -// allow-transfer { any; }; -//}; - -logging { - channel xfer-log { - file "/var/log/named.log"; - print-category yes; - print-severity yes; - print-time yes; - severity info; - }; - category xfer-in { xfer-log; }; - category xfer-out { xfer-log; }; - category notify { xfer-log; }; -}; - diff --git a/extra/bind/named.conf.d b/extra/bind/named.conf.d deleted file mode 100644 index aecbd2307..000000000 --- a/extra/bind/named.conf.d +++ /dev/null @@ -1,4 +0,0 @@ -# -# Parameters to be passed to BIND -# -NAMED_ARGS="-u named" diff --git a/extra/bind/named.logrotate b/extra/bind/named.logrotate deleted file mode 100644 index 5f9a47693..000000000 --- a/extra/bind/named.logrotate +++ /dev/null @@ -1,6 +0,0 @@ -/var/log/named.log { - missingok - postrotate - /bin/kill -HUP `cat /run/named/named.pid 2>/dev/null` 2>/dev/null || true - endscript -} diff --git a/extra/bind/named.service b/extra/bind/named.service deleted file mode 100644 index c21f13f4b..000000000 --- a/extra/bind/named.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Internet domain name server -After=network.target - -[Service] -ExecStart=/usr/sbin/named -f -u named -ExecReload=/usr/sbin/rndc reload -ExecStop=/usr/sbin/rndc stop - -[Install] -WantedBy=multi-user.target diff --git a/extra/bind/remove-tools.patch b/extra/bind/remove-tools.patch deleted file mode 100644 index 29b4c9c5f..000000000 --- a/extra/bind/remove-tools.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -aur old/bin/Makefile.in new/bin/Makefile.in ---- old/bin/Makefile.in 2009-10-05 05:07:08.000000000 -0700 -+++ new/bin/Makefile.in 2011-08-28 19:14:17.025674400 -0700 -@@ -19,7 +19,7 @@ - VPATH = @srcdir@ - top_srcdir = @top_srcdir@ - --SUBDIRS = named rndc dig dnssec tests tools nsupdate \ -+SUBDIRS = named rndc dnssec tests tools nsupdate \ - check confgen @PYTHON_TOOLS@ @PKCS11_TOOLS@ - TARGETS = - diff --git a/extra/bind/tmpfiles.d b/extra/bind/tmpfiles.d deleted file mode 100644 index 1cfc82d08..000000000 --- a/extra/bind/tmpfiles.d +++ /dev/null @@ -1 +0,0 @@ -d /run/named 0750 named named - diff --git a/extra/fetchmail/PKGBUILD b/extra/fetchmail/PKGBUILD index 83ebe7b7f..b45c77d8d 100644 --- a/extra/fetchmail/PKGBUILD +++ b/extra/fetchmail/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 180506 2013-03-22 07:41:24Z pierre $ +# $Id: PKGBUILD 183744 2013-04-27 16:59:09Z pierre $ pkgname=fetchmail -pkgver=6.3.25 +pkgver=6.3.26 pkgrel=1 pkgdesc="A remote-mail retrieval utility" arch=('i686' 'x86_64') @@ -11,14 +11,13 @@ depends=('openssl') makedepends=('python2') optdepends=('tk: for using fetchmailconf' 'python2: for using fetchmailconf') -backup=('etc/conf.d/fetchmail') options=('!makeflags') install='fetchmail.install' source=("http://download.berlios.de/$pkgname/${pkgname}-${pkgver}.tar.xz" "http://download.berlios.de/$pkgname/${pkgname}-${pkgver}.tar.xz.asc" 'fetchmail.tmpfiles' 'fetchmail.service') -sha1sums=('a246a6a3caf90e1106448c9dde4463e87d816031' - '9a7f76c9fd9f85fc4b421e34fa8c15d2838d61fc' +sha1sums=('de8dbe62a8edfa232ee4278257a1fe67aa1c797a' + 'SKIP' '199ba749c829f22286c34aabcf8b7dd5bbd7c0e6' '69caf3fd4d4446db3bf53144e4fa8edbdbbfcd10') diff --git a/extra/gdb/PKGBUILD b/extra/gdb/PKGBUILD index 6e0648ba4..6cfef2bdf 100644 --- a/extra/gdb/PKGBUILD +++ b/extra/gdb/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 172148 2012-11-30 04:20:34Z allan $ +# $Id: PKGBUILD 183696 2013-04-27 07:01:47Z allan $ # Maintainer: Allan McRae # Contributor: Jan de Groot pkgname=gdb -pkgver=7.5.1 +pkgver=7.6 pkgrel=1 pkgdesc="The GNU Debugger" arch=('i686' 'x86_64') @@ -15,8 +15,15 @@ backup=('etc/gdb/gdbinit') options=('!libtool') install=gdb.install source=(http://ftp.gnu.org/gnu/gdb/${pkgname}-${pkgver}.tar.bz2{,.sig}) -md5sums=('3f48f468b24447cf24820054ff6e85b1' - '31ab569c78a01d3f946c6fe0336175fe') +md5sums=('fda57170e4d11cdde74259ca575412a8' + 'SKIP') + +prepare() { + cd ${srcdir}/${pkgname}-${pkgver} + + # hack! - libiberty configure tests for header files using "$CPP $CPPFLAGS" + sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" libiberty/configure +} build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/gdb/gdb.install b/extra/gdb/gdb.install index 986ec547c..e260d0225 100644 --- a/extra/gdb/gdb.install +++ b/extra/gdb/gdb.install @@ -1,7 +1,8 @@ infodir=usr/share/info -filelist=(annotate.info gdb.info gdb.info-1 gdb.info-2 gdb.info-3 gdb.info-4 gdbint.info gdbint.info-1 gdbint.info-2 stabs.info) +filelist=(annotate.info gdb.info{,-{1,2,3,4,5,6,7}} gdbint.info{,-{1,2}} stabs.info) post_install() { + [[ -x usr/bin/install-info ]] || return 0 for file in ${filelist[@]}; do install-info $infodir/$file.gz $infodir/dir 2> /dev/null done @@ -12,6 +13,7 @@ post_upgrade() { } pre_remove() { + [[ -x usr/bin/install-info ]] || return 0 for file in ${filelist[@]}; do install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null done diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index eb5b753b2..3cbc58c2c 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 182157 2013-04-08 13:21:41Z dan $ +# $Id: PKGBUILD 183712 2013-04-27 12:28:29Z dan $ # Maintainer: Dan McGee pkgname=git -pkgver=1.8.2.1 +pkgver=1.8.2.2 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64) @@ -107,7 +107,7 @@ package() { install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket } -md5sums=('3f6ebca116c627490e4ee1f1324d5e65' - '8ec6ab4d8c868305e9a679f5c3d2ccfa' +md5sums=('f7407df37facf579dcaa979266cc3c59' + '765e8b9bbed49333f78103c6afd1dd0b' '042524f942785772d7bd52a1f02fe5ae' 'f67869315c2cc112e076f0c73f248002') diff --git a/extra/tcl/PKGBUILD b/extra/tcl/PKGBUILD index bf83d62be..a52cb810b 100644 --- a/extra/tcl/PKGBUILD +++ b/extra/tcl/PKGBUILD @@ -1,44 +1,47 @@ -# $Id: PKGBUILD 173926 2012-12-28 05:57:13Z andyrtr $ -# Maintainer: Allan McRae -# Committer: Judd Vinet +# $Id: PKGBUILD 183693 2013-04-27 04:42:47Z eric $ +# Maintainer: Eric Bélanger pkgname=tcl pkgver=8.6.0 -pkgrel=3 +pkgrel=4 pkgdesc="The Tcl scripting language" arch=('i686' 'x86_64') url="http://tcl.sourceforge.net/" license=('custom') +depends=('zlib') source=(http://downloads.sourceforge.net/sourceforge/tcl/tcl${pkgver}-src.tar.gz) md5sums=('573aa5fe678e9185ef2b3c56b24658d3') -build() { - cd ${srcdir}/tcl${pkgver}/unix - +prepare() { + cd tcl${pkgver} # we build the tcl sqlite interface in sqlite-tcl package - rm -rf ${srcdir}/tcl${pkgver}/pkgs/sqlite3* - + rm -rf pkgs/sqlite3* + + sed -i 's/#define DUPTRAVERSE_MAX_DEPTH 500/#define DUPTRAVERSE_MAX_DEPTH 5000/' \ + generic/regc_nfa.c +} + +build() { + cd tcl${pkgver}/unix [[ $CARCH == "x86_64" ]] && BIT="--enable-64bit" ./configure --prefix=/usr --mandir=/usr/share/man --enable-threads $BIT - make } check() { - cd ${srcdir}/tcl${pkgver}/unix + cd tcl${pkgver}/unix make test } -package() -{ - cd ${srcdir}/tcl${pkgver}/unix - - make INSTALL_ROOT=${pkgdir} install install-private-headers - ln -sf tclsh8.6 ${pkgdir}/usr/bin/tclsh - +package() { + cd tcl${pkgver}/unix + make INSTALL_ROOT="${pkgdir}" install install-private-headers + find "${pkgdir}" -name '*.a' -type f -exec chmod 644 {} \; + ln -sf tclsh8.6 "${pkgdir}/usr/bin/tclsh" + # install license - install -Dm644 ../license.terms ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + install -Dm644 ../license.terms "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" # remove buildroot traces - sed -i "s#${srcdir}#/usr/src#" ${pkgdir}/usr/lib/{tcl,tdbc1.0.0/tdbc,itcl4.0.0/itcl}Config.sh + sed -i "s#${srcdir}#/usr/src#" "${pkgdir}"/usr/lib/{tcl,tdbc1.0.0/tdbc,itcl4.0.0/itcl}Config.sh } diff --git a/libre/bbswitch-libre/PKGBUILD b/libre/bbswitch-libre/PKGBUILD index 2b3d37e0b..9a39c7a8f 100644 --- a/libre/bbswitch-libre/PKGBUILD +++ b/libre/bbswitch-libre/PKGBUILD @@ -7,7 +7,7 @@ _pkgname=bbswitch pkgname=bbswitch-libre pkgver=0.6 _extramodules=extramodules-3.8-LIBRE # Don't forget to update bbswitch.install -pkgrel=3 +pkgrel=5 pkgdesc="Kernel module allowing to switch dedicated graphics card on Optimus laptops (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url=("http://github.com/Bumblebee-Project/bbswitch") diff --git a/libre/bumblebee-libre/PKGBUILD b/libre/bumblebee-libre/PKGBUILD index d07cb1c64..4ac8c524d 100644 --- a/libre/bumblebee-libre/PKGBUILD +++ b/libre/bumblebee-libre/PKGBUILD @@ -3,7 +3,7 @@ _pkgname=bumblebee pkgname=bumblebee-libre -pkgver=3.2 +pkgver=3.2.1 pkgrel=1 pkgdesc="NVIDIA Optimus support for GNU/Linux through VirtualGL, without nonfree nvidia driver support" arch=('i686' 'x86_64') @@ -27,7 +27,7 @@ backup=('etc/bumblebee/bumblebee.conf' 'etc/bumblebee/xorg.conf.nouveau') source=("http://www.bumblebee-project.org/${_pkgname}-${pkgver}.tar.gz" 'libre.patch') -md5sums=('690d0b3aea4ae1fc2a72fe2719ecfd74' +md5sums=('30974e677bb13e8a3825fd6f3e7d3b24' 'f8b6044310039911236f53a625c611a6') prepare() { diff --git a/libre/cdfs-libre/PKGBUILD b/libre/cdfs-libre/PKGBUILD index cbf479d1c..86ff43820 100644 --- a/libre/cdfs-libre/PKGBUILD +++ b/libre/cdfs-libre/PKGBUILD @@ -7,7 +7,7 @@ _pkgname=cdfs pkgname=cdfs-libre pkgver=2.6.27 _extramodules=extramodules-3.8-LIBRE # Don't forget to update cdfs.install -pkgrel=40 +pkgrel=42 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/" diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD index 6c04db17b..efe1c3371 100644 --- a/libre/linux-libre-kmod-alx/PKGBUILD +++ b/libre/linux-libre-kmod-alx/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: André Silva -_kernver=3.8.8 +_kernver=3.8.10 _kernrel=1 pkgname=('linux-libre-kmod-alx') _version=v3.8-rc7 _pkgver=3.8-rc7-1-u pkgver=3.8rc7.1 -pkgrel=14 +pkgrel=15 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD index d7902119f..ec552b834 100644 --- a/libre/linux-libre-lts-kmod-alx/PKGBUILD +++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: André Silva -_kernver=3.0.74 +_kernver=3.0.75 _kernrel=1 pkgname=('linux-libre-lts-kmod-alx') _version=v3.8-rc7 _pkgver=3.8-rc7-1-u pkgver=3.8rc7.1 -pkgrel=12 +pkgrel=13 pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index f4341cb83..a4f2d18ee 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 183082 2013-04-17 12:40:54Z tpowa $ +# $Id: PKGBUILD 183699 2013-04-27 07:33:10Z tpowa $ # Maintainer: Tobias Powalowski # Maintainer: Thomas Baechler # Maintainer (Parabola): André Silva @@ -7,10 +7,10 @@ pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.0 -_sublevel=74 +_sublevel=75 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.73 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.74 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'module-init-wait-3.0.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('5f64180fe7df4e574dac5911b78f5067' - 'a0984b44eba8de48e20357c9c146baf6' + '13ae458b95cc12f1fcf7e37e91206cbe' 'fe0e9b4415b82f306fc1b63eb9a742a4' '69a689019ea0b6ed46b387907f14bc8a' 'c072b17032e80debc6a8626299245d46' @@ -44,7 +44,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067' 'f36222e7ce20c8e4dc27376f9be60f6c' '670931649c60fcb3ef2e0119ed532bd4' '8a71abc4224f575008f974a099b5cf6f' - '624eacedd2a576161512ffefc1797bc1') + '8e9b3e526d0d339004e141fddf2390dc') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index b8118b60d..9f7b9706d 100644 --- a/libre/linux-libre-lts/linux-libre-lts.install +++ b/libre/linux-libre-lts/linux-libre-lts.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-lts -KERNEL_VERSION=3.0.74-1-LIBRE-LTS +KERNEL_VERSION=3.0.75-1-LIBRE-LTS # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 9d1e52de9..67bbcdc5d 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 183078 2013-04-17 12:08:12Z tpowa $ +# $Id: PKGBUILD 183701 2013-04-27 10:47:26Z tpowa $ # Maintainer: Tobias Powalowski # Maintainer: Thomas Baechler # Maintainer (Parabola): Nicolás Reynolds @@ -10,10 +10,10 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.8 -_sublevel=8 +_sublevel=10 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.7 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.9 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -31,7 +31,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'change-default-console-loglevel.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('84c2a77910932ffc7d958744ac9cf2f5' - 'cc93810441658cdf40a4bc051f8f4774' + 'fd9713a31ee671a9dec8ad0e65996c84' '9b425f069f920cdd6798b3adab79d3af' '9316ebdb21ea9948ae5c83795a3dcf61' 'e49ac236dfeef709f91a3d993ea7b62c' @@ -39,7 +39,7 @@ md5sums=('84c2a77910932ffc7d958744ac9cf2f5' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c' - 'fead20edc727fbb89789194eaebb6daa') + '259774469ac9b2b1f41cf2f978743055') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index c6fa71c97..fd8297ddf 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.8.8-1-LIBRE +KERNEL_VERSION=3.8.10-1-LIBRE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD index 0634f6f6c..07abf931b 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=42 +pkgrel=43 epoch=1 _extramodules=extramodules-3.8-LIBRE arch=('i686' 'x86_64' 'mips64el') diff --git a/libre/tp_smapi-libre-lts/PKGBUILD b/libre/tp_smapi-libre-lts/PKGBUILD index faf704096..f726d9a8c 100644 --- a/libre/tp_smapi-libre-lts/PKGBUILD +++ b/libre/tp_smapi-libre-lts/PKGBUILD @@ -12,7 +12,7 @@ pkgname=tp_smapi-libre-lts _pkgname=tp_smapi _extramodules=/usr/lib/modules/extramodules-3.0-LIBRE-LTS pkgver=0.41 -pkgrel=10 +pkgrel=12 pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre-lts kernel package)" arch=('i686' 'x86_64' 'mips64el') url='https://github.com/evgeni/tp_smapi' diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD index 51329569f..92e66fc6a 100644 --- a/libre/tp_smapi-libre/PKGBUILD +++ b/libre/tp_smapi-libre/PKGBUILD @@ -12,7 +12,7 @@ _pkgname=tp_smapi pkgname=tp_smapi-libre pkgver=0.41 -pkgrel=17 +pkgrel=19 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 5bbbf618d..3ba9ec1aa 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.8-LIBRE -pkgrel=20 +pkgrel=22 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-lts/PKGBUILD b/libre/virtualbox-libre-modules-lts/PKGBUILD index 172e318c5..175c9c49f 100644 --- a/libre/virtualbox-libre-modules-lts/PKGBUILD +++ b/libre/virtualbox-libre-modules-lts/PKGBUILD @@ -8,7 +8,7 @@ pkgbase=virtualbox-libre-modules-lts pkgname=('virtualbox-libre-host-modules-lts' 'virtualbox-libre-guest-modules-lts') pkgver=4.2.12 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD index 59816a051..713c61158 100644 --- a/libre/virtualbox-libre-modules/PKGBUILD +++ b/libre/virtualbox-libre-modules/PKGBUILD @@ -8,7 +8,7 @@ pkgbase=virtualbox-libre-modules pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules') pkgver=4.2.12 _extramodules=extramodules-3.8-LIBRE -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') diff --git a/multilib-staging/lib32-cairo/PKGBUILD b/multilib-staging/lib32-cairo/PKGBUILD new file mode 100644 index 000000000..87ddae50b --- /dev/null +++ b/multilib-staging/lib32-cairo/PKGBUILD @@ -0,0 +1,46 @@ +# $Id: PKGBUILD 89175 2013-04-27 13:22:02Z ioni $ +# Maintainer: Ionut Biru + +_pkgbasename=cairo +pkgname=lib32-$_pkgbasename +pkgver=1.12.14 +pkgrel=4 +pkgdesc="Cairo vector graphics library (32-bit)" +arch=('x86_64') +url="http://cairographics.org/" +license=('LGPL' 'MPL') +makedepends=('gcc-multilib' 'lib32-gtk2' 'lib32-mesa>=9.1' 'lib32-mesa-libgl>=9.1' 'mesa-libgl') # we need to avoid old libgl in [extra] +source=(http://cairographics.org/releases/${_pkgbasename}-${pkgver}.tar.xz + libpng16.patch) +options=(!libtool) +sha1sums=('9106ab09b2e7b9f90521b18dd4a7e9577eba6c15' + 'c9911f185637d266ce1d2985bd6fb7d0df3d75b2') + +build() { + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + cd "${srcdir}/${_pkgbasename}-${pkgver}" + + patch -Np1 -i ../libpng16.patch + ./configure --prefix=/usr \ + --libdir=/usr/lib32 \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-static \ + --enable-tee \ + --enable-gl \ + --enable-egl + # --disable-xlib-xcb + make +} + +package() { + depends=('lib32-libpng' 'lib32-libxext' 'lib32-libxrender' 'lib32-fontconfig' + 'lib32-pixman' 'lib32-glib2' 'lib32-mesa>=9.1' 'lib32-libgl' ${_pkgbasename}) + + cd "${srcdir}/${_pkgbasename}-${pkgver}" + make DESTDIR="${pkgdir}" install + rm -rf "${pkgdir}"/usr/{include,share,bin} +} diff --git a/multilib-staging/lib32-cairo/libpng16.patch b/multilib-staging/lib32-cairo/libpng16.patch new file mode 100644 index 000000000..c16317811 --- /dev/null +++ b/multilib-staging/lib32-cairo/libpng16.patch @@ -0,0 +1,40 @@ +From 2dd2c826a5b367d32cf2d48ed69754795990c5db Mon Sep 17 00:00:00 2001 +From: Chris Wilson +Date: Tue, 16 Apr 2013 09:58:56 +0000 +Subject: png: Avoid marking the surface as in error after a png warning + +It turns out that libpng will continue to load an image after throwing a +warning, and that libpng16 now throws warnings for images that libpng15 +and earlier loaded without error. As we were happily loading those +images into cairo surfaces before, we are therefore being overzealous +in throwing an error now - so just squelch the warning. + +Signed-off-by: Chris Wilson +--- +diff --git a/src/cairo-png.c b/src/cairo-png.c +index e74a4a8..068617d 100644 +--- a/src/cairo-png.c ++++ b/src/cairo-png.c +@@ -149,13 +149,13 @@ static void + png_simple_warning_callback (png_structp png, + png_const_charp error_msg) + { +- cairo_status_t *error = png_get_error_ptr (png); +- +- /* default to the most likely error */ +- if (*error == CAIRO_STATUS_SUCCESS) +- *error = _cairo_error (CAIRO_STATUS_NO_MEMORY); +- +- /* png does not expect to abort and will try to tidy up after a warning */ ++ /* png does not expect to abort and will try to tidy up and continue ++ * loading the image after a warning. So we also want to return the ++ * (incorrect?) surface. ++ * ++ * We use our own warning callback to squelch any attempts by libpng ++ * to write to stderr as we may not be in control of that output. ++ */ + } + + +-- +cgit v0.9.0.2-2-gbebe diff --git a/multilib-staging/lib32-gdk-pixbuf2/PKGBUILD b/multilib-staging/lib32-gdk-pixbuf2/PKGBUILD new file mode 100644 index 000000000..a517b2722 --- /dev/null +++ b/multilib-staging/lib32-gdk-pixbuf2/PKGBUILD @@ -0,0 +1,46 @@ +# $Id: PKGBUILD 89167 2013-04-27 12:41:00Z ioni $ +# Maintainer: Ionut Biru +_pkgbasename=gdk-pixbuf2 +pkgname=lib32-$_pkgbasename +pkgver=2.28.1 +pkgrel=2 +pkgdesc="An image loading library (32-bit)" +arch=('x86_64') +url="http://www.gtk.org/" +license=('LGPL2') +depends=(lib32-glib2 lib32-libpng lib32-libtiff lib32-libjpeg lib32-libx11 + $_pkgbasename) +makedepends=(gcc-multilib) +options=('!libtool' '!docs') +install=gdk-pixbuf2.install +source=(http://download.gnome.org/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-${pkgver}.tar.xz) +sha256sums=('bea0b743fdb5c3c8e23210f73623ec5f18f9ead2522942897fe739d80b50c2bb') + +build() { + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + cd "${srcdir}/gdk-pixbuf-${pkgver}" + + ./configure --prefix=/usr --libdir=/usr/lib32 \ + --without-libjasper \ + --with-x11 \ + --with-included-loaders=png + make +} + +package() { + cd "${srcdir}/gdk-pixbuf-${pkgver}" + + make DESTDIR="${pkgdir}" install + rm -rf "${pkgdir}"/etc + rm -rf "${pkgdir}"/usr/{include,share} + + cd "${pkgdir}"/usr/bin + mv gdk-pixbuf-query-loaders gdk-pixbuf-query-loaders-32 + rm gdk-pixbuf-pixdata + rm gdk-pixbuf-csource +} + +# vim:set ts=2 sw=2 et: diff --git a/multilib-staging/lib32-gdk-pixbuf2/gdk-pixbuf2.install b/multilib-staging/lib32-gdk-pixbuf2/gdk-pixbuf2.install new file mode 100644 index 000000000..92d58ef04 --- /dev/null +++ b/multilib-staging/lib32-gdk-pixbuf2/gdk-pixbuf2.install @@ -0,0 +1,11 @@ +post_install() { + usr/bin/gdk-pixbuf-query-loaders-32 --update-cache +} + +post_upgrade() { + post_install +} + +pre_remove() { + rm -f usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/loaders.cache +} diff --git a/multilib-staging/lib32-libpng/PKGBUILD b/multilib-staging/lib32-libpng/PKGBUILD new file mode 100644 index 000000000..fb0e987e1 --- /dev/null +++ b/multilib-staging/lib32-libpng/PKGBUILD @@ -0,0 +1,55 @@ +# $Id: PKGBUILD 89165 2013-04-27 12:32:54Z ioni $ +# Maintainer: Jan de Groot +# Contributor: dorphell +# Contributor: Travis Willard +# Contributor: Douglas Soares de Andrade + +_pkgbasename=libpng +pkgname=lib32-$_pkgbasename +pkgver=1.6.2 +_apngver=1.6.1 +_libversion=16 +pkgrel=1 +pkgdesc="A collection of routines used to create PNG format graphics files (32-bit)" +arch=('x86_64') +url="http://www.libpng.org/pub/png/libpng.html" +license=('custom') +depends=('lib32-zlib' $_pkgbasename) +makedepends=(gcc-multilib) +options=('!libtool') +source=("http://downloads.sourceforge.net/sourceforge/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.xz" + "http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-${_apngver}-apng.patch.gz") +md5sums=('9d838f6fca9948a9f360a0cc1b516d5f' + '39c34060c2f0e48f3849dcdbd4a16b7a') + +build() { + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + cd "${srcdir}/${_pkgbasename}-${pkgver}" + + # Add animated PNG (apng) support + # see http://sourceforge.net/projects/libpng-apng/ + patch -p1 -i "${srcdir}/libpng-${_apngver}-apng.patch" + + ./configure --prefix=/usr --libdir=/usr/lib32 --program-suffix=-32 + make +} + +package() { + cd "${srcdir}/${_pkgbasename}-${pkgver}" + + make DESTDIR="${pkgdir}" install + + cd contrib/pngminus + make PNGLIB="-L${pkgdir}/usr/lib32 -lpng" -f makefile.std png2pnm pnm2png + + rm -rf "${pkgdir}"/usr/{include,share} + + rm "$pkgdir/usr/bin/libpng-config" + ln -s "libpng${_libversion}-config-32" "$pkgdir/usr/bin/libpng-config-32" + + mkdir -p "$pkgdir/usr/share/licenses" + ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" +} -- cgit v1.2.3-54-g00ecf