diff options
29 files changed, 334 insertions, 139 deletions
diff --git a/community/fbreader/PKGBUILD b/community/fbreader/PKGBUILD index c82f3e848..f0485b887 100644 --- a/community/fbreader/PKGBUILD +++ b/community/fbreader/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 76103 2012-09-11 14:04:11Z spupykin $ +# $Id: PKGBUILD 80619 2012-11-27 09:41:32Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgname=fbreader -pkgver=0.99.2 +pkgver=0.99.3 pkgrel=1 pkgdesc="An e-book reader for Linux" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('GPL') depends=('fribidi' 'bzip2' 'curl' 'qt' 'liblinebreak' 'sqlite') makedepends=('ccache') source=(http://www.fbreader.org/files/desktop/fbreader-sources-$pkgver.tgz) -md5sums=('a6fce0b759c9cbaddfdd3482a9c148e1') +md5sums=('d3c39438f751c29b1fc06e91b3a4e9c3') build() { export TARGET_ARCH=desktop diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD index 5e2afb2e5..06bcb0b3e 100644 --- a/community/go/PKGBUILD +++ b/community/go/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 79946 2012-11-15 01:53:41Z arodseth $ +# $Id: PKGBUILD 80625 2012-11-27 11:18:45Z arodseth $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Rémy Oudompheng <remy@archlinux.org> @@ -10,7 +10,7 @@ pkgname=go pkgver=1.0.3 -pkgrel=3 +pkgrel=4 epoch=2 pkgdesc='Google Go compiler and tools' arch=('x86_64' 'i686') @@ -100,6 +100,9 @@ package() { # Remove object files from target src dir find $pkgdir/usr/lib/go/src/ -type f -name '*.[ao]' -delete + # Fix for FS#32813 + find $pkgdir -type f -name sql.go -exec chmod -x {} \; + # Remove all executable source files find $pkgdir/usr/lib/go/src/pkg -type f -executable -delete # Headers for C modules @@ -113,11 +116,6 @@ package() { # This is to make go get code.google.com/p/go-tour/gotour and # then running the gotour executable work out of the box. - # - # Also, /usr/bin is the place for system-wide executables, - # not /usr/lib/go/bin. Users should use different paths by - # setting the appropriate environment variables. - # ln -sf /usr/bin $pkgdir/usr/lib/go/bin # For godoc diff --git a/community/ipset/PKGBUILD b/community/ipset/PKGBUILD index 75a344047..2962b501d 100644 --- a/community/ipset/PKGBUILD +++ b/community/ipset/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 80367 2012-11-20 23:42:40Z seblu $ +# $Id: PKGBUILD 80629 2012-11-27 14:06:04Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> pkgname=ipset -pkgver=6.15 +pkgver=6.16 pkgrel=1 pkgdesc='Administration tool for IP sets' arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ source=("http://ipset.netfilter.org/$pkgname-$pkgver.tar.bz2" "$pkgname.rc" "$pkgname.systemd" "$pkgname.service") -md5sums=('5d957d0d27600882d600da8047f9c587' +md5sums=('7cbe3048a6424536d524b0d0680f4856' '3e606a2823a700b4e9c5f17511a6f6a5' 'de89b054d967036e08b13bc6a7235286' 'dfc3105b89ed41fc4a1feb4f4f13f2a3' diff --git a/community/libuser/PKGBUILD b/community/libuser/PKGBUILD index 639eade30..eb779f259 100644 --- a/community/libuser/PKGBUILD +++ b/community/libuser/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 71616 2012-05-31 09:49:00Z spupykin $ +# $Id: PKGBUILD 80627 2012-11-27 13:52:32Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Thomas Dziedzic < gostrc at gmail > pkgname=libuser -pkgver=0.57.6 +pkgver=0.58 pkgrel=1 pkgdesc='A standardized interface for manipulating and administering user and group accounts.' arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('python2' 'glib2' 'popt') options=('!libtool') backup=('etc/libuser.conf') source=("https://fedorahosted.org/releases/l/i/libuser/libuser-${pkgver}.tar.xz") -md5sums=('4a6410e51664570610da1b9a830ac8ec') +md5sums=('1fc3ef3f3a3955b2d78562ff4daed793') build() { cd ${pkgname}-${pkgver} diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD index 7cada4d07..956bebb79 100644 --- a/community/nodejs/PKGBUILD +++ b/community/nodejs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 78912 2012-10-27 18:07:12Z bpiotrowski $ +# $Id: PKGBUILD 80635 2012-11-27 18:58:23Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: James Campos <james.r.campos@gmail.com> @@ -8,7 +8,7 @@ # Contributor: TIanyi Cui <tianyicui@gmail.com> pkgname=nodejs -pkgver=0.8.14 +pkgver=0.8.15 pkgrel=1 pkgdesc='Evented I/O for V8 javascript' arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ depends=('openssl' 'python2' 'v8') checkdepends=('curl') # curl used for check() options=('!emptydirs') source=(http://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.gz) -md5sums=('284fd2c7578064c339d9cf6a3a475ac7') +md5sums=('6cb31180b07475db103e694f65e8bb9b') build() { cd node-v${pkgver} diff --git a/community/pekwm/PKGBUILD b/community/pekwm/PKGBUILD index 69e55e4c8..5d186c20a 100644 --- a/community/pekwm/PKGBUILD +++ b/community/pekwm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 80549 2012-11-24 20:32:23Z foutrelis $ +# $Id: PKGBUILD 80631 2012-11-27 14:08:01Z fyan $ # Maintainer: # Contributor: Kevin Piche <kevin@archlinux.org> # Contributor: Eddie Lozon <almostlucky@attbi.com> pkgname=pekwm -pkgver=0.1.15 +pkgver=0.1.16 pkgrel=1 pkgdesc="A small, fast, functional, and flexible window manager" arch=('i686' 'x86_64') @@ -25,8 +25,6 @@ backup=(etc/pekwm/autoproperties etc/pekwm/vars) source=("http://www.pekwm.org/projects/pekwm/files/${pkgname}-${pkgver}.tar.bz2" 'pekwm.desktop') -md5sums=('4db10ad191b77120429abd5a65c73cec' - '5a78fc6653fbb0b7282ecf7f1f81e2c5') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -47,3 +45,5 @@ package() { "${pkgdir}/usr/share/xsessions/${pkgname}.desktop" } # vim: ts=2 sw=2 et ft=sh +md5sums=('ec9bce332d0545c28f74ca4bf6b69cbb' + '5a78fc6653fbb0b7282ecf7f1f81e2c5') diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD index cce4b8e44..14a6f7910 100644 --- a/core/systemd/PKGBUILD +++ b/core/systemd/PKGBUILD @@ -1,36 +1,31 @@ # Maintainer: Dave Reisner <dreisner@archlinux.org> -# Contributor: Tom Gundersen <teg@jklm.no> +# Maintainer: Tom Gundersen <teg@jklm.no> pkgbase=systemd pkgname=('systemd' 'systemd-sysvcompat') -pkgver=195 +pkgver=196 pkgrel=2 arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/systemd" license=('GPL2' 'LGPL2.1' 'MIT') makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gobject-introspection' 'gperf' - 'gtk-doc' 'intltool' 'kmod' 'libcap' 'libgcrypt' 'libxslt' 'linux-api-headers' - 'pam' 'python' 'quota-tools' 'xz') + 'gtk-doc' 'intltool' 'kmod' 'libcap' 'libgcrypt' 'libmicrohttpd' 'libxslt' + 'linux-api-headers' 'pam' 'python' 'quota-tools' 'xz') options=('!libtool') source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" 'initcpio-hook-udev' 'initcpio-install-udev' 'initcpio-install-timestamp' - '0001-Reinstate-TIMEOUT-handling.patch' 'use-split-usr-path.patch') -md5sums=('38e8c8144e7e6e5bc3ce32eb4260e680' +md5sums=('05ebd7f108e420e2b4e4810ea4b3c810' 'e99e9189aa2f6084ac28b8ddf605aeb8' 'fb37e34ea006c79be1c54cbb0f803414' 'df69615503ad293c9ddf9d8b7755282d' - '5543be25f205f853a21fa5ee68e03f0d' - 'fd5b5f04ab0a847373d357555129d4c0') + '76bf83fe34c5b40533abc5dc940576a6') build() { cd "$pkgname-$pkgver" - # still waiting on ipw2x00, et al to get fixed... - patch -Np1 <"$srcdir/0001-Reinstate-TIMEOUT-handling.patch" - # hang onto this until we do the /{,s}bin merge patch -Np1 <"$srcdir/use-split-usr-path.patch" @@ -42,9 +37,7 @@ build() { --enable-gtk-doc \ --disable-audit \ --disable-ima \ - --with-distro=arch \ - --with-usb-ids-path=/usr/share/hwdata/usb.ids \ - --with-pci-ids-path=/usr/share/hwdata/pci.ids + --with-distro=arch make } @@ -60,13 +53,13 @@ package_systemd() { provides=("libsystemd=$pkgver" "systemd-tools=$pkgver" "udev=$pkgver") replaces=('libsystemd' 'systemd-tools' 'udev') conflicts=('libsystemd' 'systemd-tools' 'udev') - optdepends=('initscripts: legacy support for /etc/rc.conf' + optdepends=('cryptsetup: required for encrypted block devices' + 'libmicrohttpd: systemd-journal-gatewayd' + 'quota-tools: kernel-level quota management' 'python: systemd library bindings' 'python2-cairo: systemd-analyze' - 'python2-dbus: systemd-analyze' - 'systemd-sysvcompat: symlink package to provide sysvinit binaries' - 'cryptsetup: required for encrypted block devices' - 'quota-tools: kernel-level quota management') + 'python2-gobject: systemd-analyze' + 'systemd-sysvcompat: symlink package to provide sysvinit binaries') backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf etc/dbus-1/system.d/org.freedesktop.hostname1.conf etc/dbus-1/system.d/org.freedesktop.login1.conf @@ -89,11 +82,17 @@ package_systemd() { # move bash-completion and symlink for *ctl's install -Dm644 "$pkgdir/etc/bash_completion.d/systemd-bash-completion.sh" \ "$pkgdir/usr/share/bash-completion/completions/systemctl" - for ctl in {login,journal,timedate,locale,hostname}ctl; do + for ctl in {login,journal,timedate,locale,hostname,systemd-coredump}ctl udevadm; do ln -s systemctl "$pkgdir/usr/share/bash-completion/completions/$ctl" done rm -rf "$pkgdir/etc/bash_completion.d" + # zsh completion isn't installed as part of 196 + # http://i.imgur.com/hMJgX.jpg + # TODO(dreisner): remove this for 197 + install -Dm644 "$pkgname-$pkgver/shell-completion/systemd-zsh-completion.zsh" \ + "$pkgdir/usr/share/zsh/site-functions/_systemd" + # don't write units to /etc by default -- we'll enable this on post_install # as a sane default rm "$pkgdir/etc/systemd/system/getty.target.wants/getty@tty1.service" @@ -126,9 +125,6 @@ package_systemd() { install -Dm644 "$srcdir/initcpio-hook-udev" "$pkgdir/usr/lib/initcpio/hooks/udev" install -Dm644 "$srcdir/initcpio-install-timestamp" "$pkgdir/usr/lib/initcpio/install/timestamp" - # XXX: kill off coredump rule until the journal can recover coredumps - rm "$pkgdir/usr/lib/sysctl.d/coredump.conf" - ### split out manpages for sysvcompat rm -rf "$srcdir/_sysvcompat" install -dm755 "$srcdir"/_sysvcompat/usr/share/man/man8/ diff --git a/core/systemd/systemd.install b/core/systemd/systemd.install index aad9691b0..457c81cf2 100644 --- a/core/systemd/systemd.install +++ b/core/systemd/systemd.install @@ -4,10 +4,20 @@ sd_booted() { [ -e sys/fs/cgroup/systemd ] } +add_privs() { + if ! setcap "$2" "$1" 2>/dev/null; then + echo "==> Warning: setcap failed, falling back to setuid root on /$1" + chmod u+s "$1" + fi +} + post_common() { systemd-machine-id-setup - setcap cap_dac_override,cap_sys_ptrace+ep usr/bin/systemd-detect-virt + add_privs usr/bin/systemd-detect-virt 'cap_dac_override,cap_sys_ptrace+ep' + + udevadm hwdb --update + journalctl --update-catalog if sd_booted; then systemctl --system daemon-reexec @@ -40,6 +50,11 @@ post_upgrade() { printf ' controlled with the Storage setting in /etc/systemd/journald.conf\n' fi + if [ "$(vercmp 196-1 "$2")" -eq 1 ]; then + printf '==> The legacy configuration options are no longer supported in rc.conf,\n' + printf ' convert your rc.conf to the new configuration formats.\n' + fi + # logind's protocol changed. kindly restart the daemon to avoid locking # out further logins. if [ "$(vercmp 195 "$2")" -eq 1 ]; then diff --git a/core/systemd/use-split-usr-path.patch b/core/systemd/use-split-usr-path.patch index 2fd32998d..40dd62f90 100644 --- a/core/systemd/use-split-usr-path.patch +++ b/core/systemd/use-split-usr-path.patch @@ -1,6 +1,6 @@ --- a/src/core/main.c 2012-09-20 23:02:54.000000000 -0400 +++ b/src/core/main.c 2012-09-20 23:03:13.000000000 -0400 -@@ -1455,11 +1455,7 @@ +@@ -1487,11 +1487,7 @@ int main(int argc, char *argv[]) { /* Set up PATH unless it is already set */ setenv("PATH", diff --git a/extra/apr-util/PKGBUILD b/extra/apr-util/PKGBUILD index 4a8b38052..377e14c69 100644 --- a/extra/apr-util/PKGBUILD +++ b/extra/apr-util/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 149396 2012-02-07 13:30:38Z jgc $ +# $Id: PKGBUILD 172058 2012-11-27 12:16:31Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=apr-util -pkgver=1.4.1 +pkgver=1.5.1 pkgrel=1 pkgdesc="The Apache Portable Runtime" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ depends=('apr' 'gdbm' 'expat' 'db' 'libldap' 'unixodbc') options=('!libtool') license=('APACHE') source=("http://www.apache.org/dist/apr/apr-util-${pkgver}.tar.bz2") -md5sums=('52b31b33fb1aa16e65ddaefc76e41151') +md5sums=('9c1db8606e520f201c451ec9a0b095f6') build() { cd "${srcdir}/apr-util-${pkgver}" diff --git a/extra/enlightenment17/PKGBUILD b/extra/enlightenment17/PKGBUILD index c606dfdf9..5d9a31ee1 100644 --- a/extra/enlightenment17/PKGBUILD +++ b/extra/enlightenment17/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 171995 2012-11-25 21:24:57Z ronald $ +# $Id: PKGBUILD 172084 2012-11-27 19:02:07Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=enlightenment17 _pkgname=enlightenment -pkgver=0.17.0alpha5 -_pkgver=0.17.0-alpha5 +pkgver=0.17.0alpha6 +_pkgver=0.17.0-alpha6 pkgrel=1 pkgdesc="Enlightenment window manager DR17 (aka e17)" arch=('i686' 'x86_64') @@ -13,16 +13,19 @@ url="http://www.enlightenment.org" license=('BSD') depends=('alsa-lib' 'pm-utils' 'pam' 'shared-mime-info' 'hicolor-icon-theme' 'desktop-file-utils' 'e_dbus' 'edje' 'eeze' 'efreet' - 'eio' 'elementary' 'xcb-util-keysyms') + 'eio' 'elementary' 'xcb-util-keysyms' 'udisks' 'systemd') +optdepends=('connman: network module') provides=('notification-daemon' 'e') + backup=('etc/enlightenment/sysactions.conf') options=('!libtool' '!emptydirs') install=enlightenment17.install source=(http://download.enlightenment.org/releases/$_pkgname-$_pkgver.tar.gz - 'e-applications.menu' 'quickstart.patch') -sha1sums=('5d9fce8c1daabbadb5f4db8ea187d7a8340a5e31' + 'e-applications.menu' 'quickstart.patch' 'sysactions_systemd.patch') +sha1sums=('52d44b95a9fd2f4e9033ac65a4fd9ebcac70b9b0' 'e08cc63cb8a188a06705b42d03e032b9fcfa7ee5' - '3f53931ae86de8fe99e386aeb097521aac0decd8') + '3f53931ae86de8fe99e386aeb097521aac0decd8' + '86f1c5e36dc274c3101362532378be034e89c593') build() { cd "$srcdir/$_pkgname-$_pkgver" @@ -33,6 +36,9 @@ build() { patch -p0 < $srcdir/quickstart.patch + # default to systemd for sysactions + patch -Np0 < $srcdir/sysactions_systemd.patch + ./configure \ --prefix=/usr \ --sysconfdir=/etc \ @@ -78,4 +84,3 @@ package() { $pkgdir/etc/xdg/menus/e-applications.menu } - diff --git a/extra/enlightenment17/enlightenment17.install b/extra/enlightenment17/enlightenment17.install index 1182e768f..0e3216ffe 100644 --- a/extra/enlightenment17/enlightenment17.install +++ b/extra/enlightenment17/enlightenment17.install @@ -1,6 +1,11 @@ post_install() { update-mime-database usr/share/mime > /dev/null update-desktop-database -q + +cat << EOF +Enlightenment is configured to use systemd by default for shutdown/sleep purposes. +This can be changed in /etc/enlightenment/sysactions.conf. +EOF } post_upgrade() { diff --git a/extra/enlightenment17/sysactions_systemd.patch b/extra/enlightenment17/sysactions_systemd.patch new file mode 100644 index 000000000..5d535dd60 --- /dev/null +++ b/extra/enlightenment17/sysactions_systemd.patch @@ -0,0 +1,17 @@ +--- data/etc/sysactions.conf.in 2012-10-31 17:28:49.000000000 +0100 ++++ data/etc/sysactions.conf.in.bak 2012-11-27 19:27:15.955334382 +0100 +@@ -43,10 +43,10 @@ + # user and group name can use glob matches (* == all for example) like the + # shell. as can action names allowed or denied. + +-action: halt /sbin/shutdown -h now +-action: reboot /sbin/shutdown -r now +-action: suspend @SUSPEND@ +-action: hibernate @HIBERNATE@ ++action: halt /usr/bin/systemctl poweroff ++action: reboot /usr/bin/systemctl reboot ++action: suspend /usr/bin/systemctl suspend ++action: hibernate /usr/bin/systemctl hibernate + action: /bin/mount /bin/mount + action: /bin/umount /bin/umount + action: /usr/bin/eject /usr/bin/eject diff --git a/extra/fontconfig/PKGBUILD b/extra/fontconfig/PKGBUILD index f69861820..5f054d372 100644 --- a/extra/fontconfig/PKGBUILD +++ b/extra/fontconfig/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 166327 2012-09-06 13:53:52Z andyrtr $ +# $Id: PKGBUILD 172072 2012-11-27 15:23:20Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=fontconfig -pkgver=2.10.1 -pkgrel=2 +pkgver=2.10.2 +pkgrel=1 pkgdesc="A library for configuring and customizing font access" arch=(i686 x86_64) url="http://www.fontconfig.org/release/" @@ -11,10 +11,10 @@ license=('custom') depends=('expat' 'freetype2') options=('!libtool') install=fontconfig.install -source=(http://www.fontconfig.org/release/$pkgname-$pkgver.tar.gz +source=(http://www.fontconfig.org/release/$pkgname-$pkgver.tar.bz2 29-replace-bitmap-fonts.conf) -md5sums=('c94e380eea42f2f23ca9537035ef1899' - 'f6b67e8cc79197ed6abd4701911e83da') +sha256sums=('8ea8ef56738fd95f0be611015f89614fd4dec79ddac6b3ff26bc4a8338569952' + '5addef189c5e01679ce3b610f8864c59980029c98f323f40f8c9080429857fdc') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/glade/PKGBUILD b/extra/glade/PKGBUILD index 96b0cb3a1..449a5b84d 100644 --- a/extra/glade/PKGBUILD +++ b/extra/glade/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 171495 2012-11-18 05:17:05Z eric $ +# $Id: PKGBUILD 172080 2012-11-27 16:33:29Z jgc $ # Maintainer: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=glade -pkgver=3.14.1 -pkgrel=2 +pkgver=3.14.2 +pkgrel=1 pkgdesc="User interface builder for GTK+ and GNOME." arch=(i686 x86_64) license=('GPL' 'LGPL') @@ -15,7 +15,7 @@ options=('!libtool') url="http://glade.gnome.org/" install=glade.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('8484b62c7a4579ea3e5d98200b397a1baf0b621c0b0c70242ee1dbbe449eae20') +sha256sums=('d2e6b5a20cfdbc0a5ed49122ac7b4e3a10ba140ccfcaba60082e6e2b52a62ac6') build() { cd "$pkgname-$pkgver" diff --git a/extra/qjson/PKGBUILD b/extra/qjson/PKGBUILD index a9c5b6d47..318ffc64e 100644 --- a/extra/qjson/PKGBUILD +++ b/extra/qjson/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 171883 2012-11-22 10:46:44Z andrea $ +# $Id: PKGBUILD 172063 2012-11-27 13:49:24Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=qjson -pkgver=0.8.0 +pkgver=0.8.1 pkgrel=1 pkgdesc="A qt-based library that maps JSON data to QVariant objects" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ url="http://qjson.sourceforge.net" depends=('qt') makedepends=('cmake') source=(${pkgname}-${pkgver}.tar.gz::"https://github.com/flavio/${pkgname}/archive/${pkgver}.tar.gz") -md5sums=('e9537e6f596f21f0552978bf064a0415') +md5sums=('4eef13da988edf8f91c260a3e1baeea9') build() { mkdir build diff --git a/extra/udisks/PKGBUILD b/extra/udisks/PKGBUILD index b3b55b369..81b5020df 100644 --- a/extra/udisks/PKGBUILD +++ b/extra/udisks/PKGBUILD @@ -1,24 +1,25 @@ -# $Id: PKGBUILD 165623 2012-08-27 12:26:06Z heftig $ -# Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 172088 2012-11-27 19:16:47Z dreisner $ +# Maintainer: Tom Gundersen <teg@jklm.no> pkgname=udisks pkgver=1.0.4 -pkgrel=5 +pkgrel=6 pkgdesc="Disk Management Service" arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/udisks" license=('GPL') -depends=('udev' 'sg3_utils' 'glib2' 'dbus-glib' 'polkit' 'parted' 'device-mapper' 'libatasmart' 'lsof' 'eject') +depends=('systemd' 'util-linux' 'sg3_utils' 'glib2' 'dbus-glib' 'polkit' 'parted' 'device-mapper' 'libatasmart' 'lsof') makedepends=('intltool' 'docbook-xsl') options=(!libtool) -source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz udisks.service) -sha256sums=('854b89368733b9c3a577101b761ad5397ae75a05110c8698ac5b29de9a8bf8f5' - '0b9cbf41935feed3e4e2430fd4e06eb29864554dbb9f330c9d2a5fa2ef185131') +source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz udisks.service drop-pci-db.patch) build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libexecdir=/usr/lib/udisks --disable-static + + patch -p1 < ../drop-pci-db.patch + make } @@ -34,4 +35,10 @@ package() { install -Dm644 "$srcdir/udisks.service" "$pkgdir/usr/lib/systemd/system/udisks.service" echo "SystemdService=udisks.service" \ >> "$pkgdir/usr/share/dbus-1/system-services/org.freedesktop.UDisks.service" + + # install the /media folder + install -d -m 755 $pkgdir/media } +md5sums=('86c63b2b5484f2060499a052b5b6256b' + '5d80832b4d4da72beeb45c15b63a1481' + '773cccd70afd18ace4332037feff67ec') diff --git a/extra/udisks/drop-pci-db.patch b/extra/udisks/drop-pci-db.patch new file mode 100644 index 000000000..6de6f5653 --- /dev/null +++ b/extra/udisks/drop-pci-db.patch @@ -0,0 +1,28 @@ +commit c73b5ab54378ec6d7df9948c46ce87f98587af9a +Author: Tom Gundersen <teg@jklm.no> +Date: 2 days ago + + udev: remove redundant call to deprecated pci-db + + The binary is no longer shipped with systemd/udev. The functionality + is taken over by a builtin, which is ran for all devices, rendering + this rule superfluous. + + Cc: Jan de Groot <jgc@archlinux.org> + Signed-off-by: Tom Gundersen <teg@jklm.no> + +diff --git a/data/80-udisks.rules b/data/80-udisks.rules +index d1c8c5d..4bf2b37 100644 +--- a/data/80-udisks.rules ++++ b/data/80-udisks.rules +@@ -1,10 +1,6 @@ + # Do not edit this file, it will be overwritten on updates + # + +-# import names for PCI storage controllers +-# +-SUBSYSTEM=="pci", ACTION=="add|change", ENV{ID_MODEL_FROM_DATABASE}=="", ATTR{class}=="0x01*", IMPORT{program}="pci-db %p" +- + # Set eSATA port type for known eSATA CardBus adapters - first we want to ensure + # the device is on a cardbus controller (upper PCI device) - then we check + # vid/pid (lower PCI device) diff --git a/extra/v4l-utils/PKGBUILD b/extra/v4l-utils/PKGBUILD index 62ec3d6c4..476da0f2e 100644 --- a/extra/v4l-utils/PKGBUILD +++ b/extra/v4l-utils/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 158613 2012-05-05 03:14:18Z allan $ +# $Id: PKGBUILD 172061 2012-11-27 13:18:13Z tomegun $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=v4l-utils -pkgver=0.8.8 +pkgver=0.8.9 pkgrel=1 pkgdesc="Userspace tools and conversion library for Video 4 Linux" arch=('i686' 'x86_64') @@ -31,5 +31,5 @@ package() { mv "${pkgdir}/lib/udev" "${pkgdir}/usr/lib/" rm -rf "${pkgdir}/lib" } -md5sums=('40fdda3f4055ed818012d7a7b5ef5be5' - 'cceb1325f35789c95f875b705b3eb373') +md5sums=('cc4f34a1494275ed70f76f2a806dca6a' + 'ae8f4ed2ca0c1e006cb8c69b5a2982f7') diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD index 2247f0a8a..2325b8cd7 100644 --- a/libre/iceape-libre/PKGBUILD +++ b/libre/iceape-libre/PKGBUILD @@ -11,7 +11,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=${_debname} pkgname=${_debname}-libre pkgver=${_debver}.${_debrel} -pkgrel=1 +pkgrel=2 pkgdesc="A libre version of Debian Iceape, the Internet Suite based on Mozilla Seamonkey." arch=('i586' 'i686' 'x86_64' 'mips64el') license=('GPL2' 'MPL' 'LGPL') @@ -35,7 +35,7 @@ md5sums=('40473b4c662975eda865e1fc35c4953b' '7266333e31731af8bb50c2eca8d0bd26' '25b6fe16ac24cd5c852213e5c1adb272' 'c395d443a8c4c16880c7322bcf174743' - '433b5cd7f02f0ed8861237e877f51ebf') + 'ed7a06c9e73a9f3e023d7bff9878504b') build() { export QUILT_PATCHES=debian/patches diff --git a/libre/iceape-libre/libre.patch b/libre/iceape-libre/libre.patch index d25f8dbf5..9947b1bbe 100644 --- a/libre/iceape-libre/libre.patch +++ b/libre/iceape-libre/libre.patch @@ -3,13 +3,13 @@ @@ -1,23 +1,23 @@ # Default search engine -browser.search.defaultenginename=Google -+browser.search.defaultenginename=Duck Duck Go (Lite) ++browser.search.defaultenginename=Duck Duck Go (HTML) # Search engine order (order displayed in the search bar dropdown)s -browser.search.order.1=Google -browser.search.order.2=Yahoo -browser.search.order.3=Bing -+browser.search.order.1=Duck Duck Go (Lite) ++browser.search.order.1=Duck Duck Go (HTML) +browser.search.order.2=Seeks Search +browser.search.order.3=YaCy @@ -29,7 +29,7 @@ # to be searched and the user's search query. Place them in the appropriate location # for your locale's URL but do not translate them. -browser.search.siteSearchURL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms} -+browser.search.siteSearchURL=https://duckduckgo.com/lite/?q=site%3A{moz:domain}+{searchTerms} ++browser.search.siteSearchURL=https://duckduckgo.com/html/?q=site%3A{moz:domain}+{searchTerms} # increment this number when anything gets changed in the list below. This will # cause Firefox to re-read these prefs and inject any new handlers into the @@ -70,7 +70,7 @@ // The first character after a period must be alphabetic. -pref("keyword.URL", "http://www.google.com/search?ie=UTF-8&oe=utf-8&q="); -+pref("keyword.URL", "https://duckduckgo.com/lite/?q="); ++pref("keyword.URL", "https://duckduckgo.com/html/?q="); pref("keyword.enabled", false); pref("general.useragent.locale", "chrome://global/locale/intl.properties"); pref("general.useragent.compatMode.firefox", false); @@ -125,7 +125,7 @@ browser.startup.homepage=about: browser.throbber.url=about: -browser.search.defaulturl=http://www.google.com/search?q= -+browser.search.defaulturl=https://duckduckgo.com/lite/?q= ++browser.search.defaulturl=https://duckduckgo.com/html/?q= -browser.translation.service=http://translate.google.com/translate?prev=/language_tools&u= -browser.translation.serviceDomain=translate.google.com @@ -151,12 +151,12 @@ @@ -1,10 +1,10 @@ # Default search engine -browser.search.defaultenginename=Google -+browser.search.defaultenginename=Duck Duck Go (Lite) ++browser.search.defaultenginename=Duck Duck Go (HTML) # Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Google -browser.search.order.2=Yahoo -+browser.search.order.1=Duck Duck Go (Lite) ++browser.search.order.1=Duck Duck Go (HTML) +browser.search.order.2=Seeks Search # More information about this update link available in the update wizard. @@ -187,7 +187,7 @@ - <DT><A HREF="http://www.google.com/">Google</A> - <DT><A HREF="http://groups.google.com/">Google Groups</A> - <DT><A HREF="http://news.google.com/">Google News</A> -+ <DT><A HREF="https://duckduckgo.com/lite/">Duck Duck Go (Lite)</A> ++ <DT><A HREF="https://duckduckgo.com/html/">Duck Duck Go (HTML)</A> </DL><p> #unfilter emptyLines diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index fd050fb27..cb4ef9688 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -16,7 +16,7 @@ _pgo=false pkgname=icecat pkgver=14.0 -pkgrel=2 +pkgrel=3 pkgdesc='The GNUzilla web browser, based on Mozilla Firefox. SafeBrowsing and other Google services disabled!' arch=(i686 x86_64 mips64el) license=(GPL2 MPL LGPL) @@ -79,7 +79,7 @@ md5sums=( 3117865902d1a20ab61d75707be9888e ac29b01c189f20abae2f3eef1618ffc0 3009b176cc5f9b1e416b1bf7c45b064b - 72e6bb9ebebe555b4ab961add3df3b27 + 0fe48b455f9b0ad7993071cd766b3bbf e81ad01dbc16ba28bf92ba4b7c309ca7 d93fe402b87cd000a869e1fd6badc6c9 b320085e7effa2890a79f4f45760614b diff --git a/libre/icecat/libre.patch b/libre/icecat/libre.patch index 18dfcc177..b5a9acc0b 100644 --- a/libre/icecat/libre.patch +++ b/libre/icecat/libre.patch @@ -142,13 +142,13 @@ diff -Nur a/browser/locales/en-US/chrome/browser-region/region.properties b/brow @@ -1,28 +1,28 @@ # Default search engine -browser.search.defaultenginename=Google -+browser.search.defaultenginename=Duck Duck Go (Lite) ++browser.search.defaultenginename=Duck Duck Go (HTML) # Search engine order (order displayed in the search bar dropdown)s -browser.search.order.1=Duck Duck Go -browser.search.order.2=Google -browser.search.order.3=Yahoo -+browser.search.order.1=Duck Duck Go (Lite) ++browser.search.order.1=Duck Duck Go (HTML) +browser.search.order.2=Seeks Search +browser.search.order.3=YaCy @@ -169,14 +169,14 @@ diff -Nur a/browser/locales/en-US/chrome/browser-region/region.properties b/brow # Keyword URL (for location bar searches) -keyword.URL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q= -+keyword.URL=https://duckduckgo.com/lite/?q= ++keyword.URL=https://duckduckgo.com/html/?q= # URL for site-specific search engines # TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site # to be searched and the user's search query. Place them in the appropriate location # for your locale's URL but do not translate them. -browser.search.siteSearchURL=https://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms} -+browser.search.siteSearchURL=https://duckduckgo.com/lite/?q=site%3A{moz:domain}+{searchTerms} ++browser.search.siteSearchURL=https://duckduckgo.com/html/?q=site%3A{moz:domain}+{searchTerms} # increment this number when anything gets changed in the list below. This will # cause Firefox to re-read these prefs and inject any new handlers into the @@ -240,7 +240,7 @@ diff -Nur a/build/pgo/blueprint/elements.html b/build/pgo/blueprint/elements.htm <p> <a><a> anchor</a><br> - <a href="http://www.google.com"><a> a + href</a> -+ <a href="https://duckduckgo.com/lite"><a> a + href</a> ++ <a href="https://duckduckgo.com/html"><a> a + href</a> </p> <p> <abbr title="extended abbr text should show when mouse over"><abbr> abbr - extended text when mouseover.</abbr><br> @@ -252,7 +252,7 @@ diff -Nur a/dom/ipc/test.xul b/dom/ipc/test.xul </toolbar> - <browser type="content" src="http://www.google.com/" flex="1" id="page" remote="true"/> -+ <browser type="content" src="https://duckduckgo.com/lite" flex="1" id="page" remote="true"/> ++ <browser type="content" src="https://duckduckgo.com/html" flex="1" id="page" remote="true"/> <label id="messageLog" value="" crop="center"/> </window> diff -Nur a/layout/ipc/test-ipcbrowser.xul b/layout/ipc/test-ipcbrowser.xul @@ -263,7 +263,7 @@ diff -Nur a/layout/ipc/test-ipcbrowser.xul b/layout/ipc/test-ipcbrowser.xul </toolbar> - <browser type="content" src="http://www.google.com/" flex="1" id="content" -+ <browser type="content" src="https://duckduckgo.com/lite" flex="1" id="content" ++ <browser type="content" src="https://duckduckgo.com/html" flex="1" id="content" remote="true"/> </window> diff -Nur a/mobile/android/app/mobile.js b/mobile/android/app/mobile.js @@ -296,11 +296,11 @@ diff -Nur a/mobile/locales/en-US/chrome/region.properties b/mobile/locales/en-US @@ -1,18 +1,18 @@ # Default search engine -browser.search.defaultenginename=Google -+browser.search.defaultenginename=Duck Duck Go (Lite) ++browser.search.defaultenginename=Duck Duck Go (HTML) # Search engine order (order displayed in the search bar dropdown)s -browser.search.order.1=Google -+browser.search.order.1=Duck Duck Go (Lite) ++browser.search.order.1=Duck Duck Go (HTML) # This is the default set of web based feed handlers shown in the reader # selection UI @@ -315,7 +315,7 @@ diff -Nur a/mobile/locales/en-US/chrome/region.properties b/mobile/locales/en-US # Keyword URL (for location bar searches) -keyword.URL=https://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q= -+keyword.URL=https://duckduckgo.com/lite/?q= ++keyword.URL=https://duckduckgo.com/html/?q= # increment this number when anything gets changed in the list below. This will # cause Firefox to re-read these prefs and inject any new handlers into the @@ -366,7 +366,7 @@ diff -Nur a/mobile/xul/app/mobile.js b/mobile/xul/app/mobile.js pref("keyword.enabled", true); -pref("keyword.URL", "https://www.google.com/m?ie=UTF-8&oe=UTF-8&sourceid=navclient&q="); -+pref("keyword.URL","https://duckduckgo.com/lite/?q="); ++pref("keyword.URL","https://duckduckgo.com/html/?q="); pref("accessibility.typeaheadfind", false); pref("accessibility.typeaheadfind.timeout", 5000); @@ -378,7 +378,7 @@ diff -Nur a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js */ -pref("keyword.URL", "https://www.google.com/search?ie=UTF-8&oe=utf-8&q="); -+pref("keyword.URL","https://duckduckgo.com/lite/?q="); ++pref("keyword.URL","https://duckduckgo.com/html/?q="); pref("keyword.enabled", false); pref("general.useragent.locale", "chrome://global/locale/intl.properties"); pref("general.useragent.compatMode.firefox", false); diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 185f1c039..ab35bf55f 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -22,7 +22,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=iceweasel pkgname=iceweasel-libre pkgver=${_debver}.${_debrel} -pkgrel=1 +pkgrel=2 if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi if $_pgo; then @@ -57,7 +57,7 @@ md5sums=('3e555026478026987753b4859ec91d3b' 'eab149c1994ab14392e55af3abb08e80' 'ac29b01c189f20abae2f3eef1618ffc0' 'a485a2b5dc544a8a2bd40c985d2e5813' - '8768dfc39e9f1057c2956bf4405ae58e' + 'a54ac42a670b72deb38f17b571740a6e' 'abf5ecb74caa857abb42bcfbb3442d9c' '0d053487907de4376d67d8f499c5502b' '52e52f840a49eb1d14be1c0065b03a93' diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch index 7e7b7290f..183bcd4c6 100644 --- a/libre/iceweasel-libre/libre.patch +++ b/libre/iceweasel-libre/libre.patch @@ -51,13 +51,13 @@ diff -urN iceweasel-14.0.1.orig/browser/locales/en-US/chrome/browser-region/regi @@ -1,23 +1,23 @@ # Default search engine -browser.search.defaultenginename=Google -+browser.search.defaultenginename=Duck Duck Go (Lite) ++browser.search.defaultenginename=Duck Duck Go (HTML) # Search engine order (order displayed in the search bar dropdown)s -browser.search.order.1=Google -browser.search.order.2=Yahoo -browser.search.order.3=Bing -+browser.search.order.1=Duck Duck Go (Lite) ++browser.search.order.1=Duck Duck Go (HTML) +browser.search.order.2=Seeks Search +browser.search.order.3=YaCy @@ -77,7 +77,7 @@ diff -urN iceweasel-14.0.1.orig/browser/locales/en-US/chrome/browser-region/regi # to be searched and the user's search query. Place them in the appropriate location # for your locale's URL but do not translate them. -browser.search.siteSearchURL=https://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms} -+browser.search.siteSearchURL=https://duckduckgo.com/lite/?q=site%3A{moz:domain}+{searchTerms} ++browser.search.siteSearchURL=https://duckduckgo.com/html/?q=site%3A{moz:domain}+{searchTerms} # increment this number when anything gets changed in the list below. This will # cause Firefox to re-read these prefs and inject any new handlers into the @@ -119,7 +119,7 @@ diff -urN iceweasel-13.0.orig/build/pgo/blueprint/elements.html iceweasel-13.0/b <p> <a><a> anchor</a><br> - <a href="http://www.google.com"><a> a + href</a> -+ <a href="https://duckduckgo.com/lite"><a> a + href</a> ++ <a href="https://duckduckgo.com/html"><a> a + href</a> </p> <p> <abbr title="extended abbr text should show when mouse over"><abbr> abbr - extended text when mouseover.</abbr><br> @@ -131,7 +131,7 @@ diff -urN iceweasel-13.0.orig/dom/ipc/test.xul iceweasel-13.0/dom/ipc/test.xul </toolbar> - <browser type="content" src="http://www.google.com/" flex="1" id="page" remote="true"/> -+ <browser type="content" src="https://duckduckgo.com/lite" flex="1" id="page" remote="true"/> ++ <browser type="content" src="https://duckduckgo.com/html" flex="1" id="page" remote="true"/> <label id="messageLog" value="" crop="center"/> </window> diff -Naur iceweasel-14.0.1.orig/mobile/android/app/mobile.js iceweasel-14.0.1.orig/mobile/android/app/mobile.js @@ -163,7 +163,7 @@ diff -Naur iceweasel-14.0.1.orig/mobile/android/app/mobile.js iceweasel-14.0.1.o pref("keyword.enabled", true); -pref("keyword.URL", ""); -+pref("keyword.URL", "https://duckduckgo.com/lite/?q="); ++pref("keyword.URL", "https://duckduckgo.com/html/?q="); pref("accessibility.typeaheadfind", false); pref("accessibility.typeaheadfind.timeout", 5000); @@ -175,7 +175,7 @@ diff -urN iceweasel-13.0.orig/layout/ipc/test-ipcbrowser.xul iceweasel-13.0/layo </toolbar> - <browser type="content" src="http://www.google.com/" flex="1" id="content" -+ <browser type="content" src="https://duckduckgo.com/lite" flex="1" id="content" ++ <browser type="content" src="https://duckduckgo.com/html" flex="1" id="content" remote="true"/> </window> diff -urN iceweasel-14.0.1.orig/mobile/xul/app/mobile.js iceweasel-14.0.1/mobile/xul/app/mobile.js @@ -206,7 +206,7 @@ diff -urN iceweasel-14.0.1.orig/mobile/xul/app/mobile.js iceweasel-14.0.1/mobile pref("keyword.enabled", true); -pref("keyword.URL", "https://www.google.com/m?ie=UTF-8&oe=UTF-8&sourceid=navclient&q="); -+pref("keyword.URL", "https://duckduckgo.com/lite/?q="); ++pref("keyword.URL", "https://duckduckgo.com/html/?q="); pref("accessibility.typeaheadfind", false); pref("accessibility.typeaheadfind.timeout", 5000); @@ -216,11 +216,11 @@ diff -urN iceweasel-13.0.orig/mobile/locales/en-US/chrome/region.properties icew @@ -1,18 +1,18 @@ # Default search engine -browser.search.defaultenginename=Google -+browser.search.defaultenginename=Duck Duck Go (Lite) ++browser.search.defaultenginename=Duck Duck Go (HTML) # Search engine order (order displayed in the search bar dropdown)s -browser.search.order.1=Google -+browser.search.order.1=Duck Duck Go (Lite) ++browser.search.order.1=Duck Duck Go (HTML) # This is the default set of web based feed handlers shown in the reader # selection UI @@ -235,7 +235,7 @@ diff -urN iceweasel-13.0.orig/mobile/locales/en-US/chrome/region.properties icew # Keyword URL (for location bar searches) -keyword.URL=https://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q= -+keyword.URL=https://duckduckgo.com/lite/?q=site%3A{moz:domain}+{searchTerms} ++keyword.URL=https://duckduckgo.com/html/?q=site%3A{moz:domain}+{searchTerms} # increment this number when anything gets changed in the list below. This will # cause Firefox to re-read these prefs and inject any new handlers into the @@ -265,7 +265,7 @@ diff -urN iceweasel-14.0.orig/modules/libpref/src/init/all.js iceweasel-14.0/mod // The first character after a period must be alphabetic. -pref("keyword.URL", "https://www.google.com/search?ie=UTF-8&oe=utf-8&q="); -+pref("keyword.URL", "https://duckduckgo.com/lite/?q="); ++pref("keyword.URL", "https://duckduckgo.com/html/?q="); pref("keyword.enabled", false); pref("general.useragent.locale", "chrome://global/locale/intl.properties"); pref("general.useragent.compatMode.firefox", false); diff --git a/libre/kdebase-runtime-libre/PKGBUILD b/libre/kdebase-runtime-libre/PKGBUILD index 80537f26f..164cd19e9 100644 --- a/libre/kdebase-runtime-libre/PKGBUILD +++ b/libre/kdebase-runtime-libre/PKGBUILD @@ -6,7 +6,7 @@ _pkgname=kdebase-runtime pkgname=kdebase-runtime-libre pkgver=4.9.3 -pkgrel=1 +pkgrel=1.1 pkgdesc="Plugins and applications necessary for the running of KDE applications (without non-privacy search providers)" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kde-runtime' @@ -24,8 +24,10 @@ conflicts=("${_pkgname}") provides=("${_pkgname}=${pkgver}") install="${_pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.xz" + 'duckduckgo_html.desktop' 'duckduckgo_lite.desktop') sha1sums=('5245c1152680ad22dff21c44dad531eda736e769' + 'aa6f39f4b0ad3c110fd05cd6c41190afae9773dd' '265d4ca95c3a022b5f6f1d5daea6f8e3a25dee85') build() { @@ -34,6 +36,9 @@ build() { # Removing non-privacy search providers rm -v kde-runtime-${pkgver}/kurifilter-plugins/ikws/searchproviders/{7digital,acronym,altavista,amazon{,_mp3},amg,austronaut,backports,baidu,bing,blip,cia,dbug,deb,duckduckgo{,_info,_shopping},facebook,ecosia,feedster,flickr,flickrcc,froogle,google,google_advanced,google_code,google_groups,google_images,google_lucky,google_maps,google_movie,google_news,gracenote,imdb,jeeves,katatudo,magnatune,metacrawler,msdn,nl-telephone,nl-teletekst,python,rpmfind,tvtome,uspto,vimeo,vivisimo,voila,yahoo,yahoo_image,yahoo_local,yahoo_shopping,yahoo_video,youtube}.desktop +# Adding DuckDuckGo HTML + cp -v duckduckgo_html.desktop "kde-runtime-${pkgver}/kurifilter-plugins/ikws/searchproviders" + # Adding DuckDuckGo Lite cp -v duckduckgo_lite.desktop "kde-runtime-${pkgver}/kurifilter-plugins/ikws/searchproviders" diff --git a/libre/kdebase-runtime-libre/duckduckgo_html.desktop b/libre/kdebase-runtime-libre/duckduckgo_html.desktop new file mode 100644 index 000000000..ba6a602ad --- /dev/null +++ b/libre/kdebase-runtime-libre/duckduckgo_html.desktop @@ -0,0 +1,113 @@ +[Desktop Entry] +Charset= +Hidden=false +Keys=duckduckgo,dd,dukgo +Name=Duck Duck Go HTML +Name[ar]=Duck Duck Go HTML +Name[ast]=Duck Duck Go HTML +Name[bg]=Duck Duck Go HTML +Name[bn]=Duck Duck Go HTML +Name[bs]=Dak dak go HTML +Name[ca]=Duck Duck Go HTML +Name[ca@valencia]=Duck Duck Go HTML +Name[cs]=Duck Duck Go HTML +Name[da]=Duck Duck Go HTML +Name[de]=Duck Duck Go HTML +Name[el]=Duck Duck Go HTML +Name[en_GB]=Duck Duck Go HTML +Name[eo]=Duck Duck Go HTML +Name[es]=Duck Duck Go HTML +Name[et]=Duck Duck Go HTML +Name[eu]=Duck Duck Go HTML +Name[fa]=Duck Duck Go HTML +Name[fi]=Duck Duck Go HTML +Name[fr]=Duck Duck Go HTML +Name[ga]=Duck Duck Go HTML +Name[gl]=Duck Duck Go HTML +Name[gu]=Duck Duck Go HTML +Name[he]=Duck Duck Go HTML +Name[hi]=Duck Duck Go HTML +Name[hr]=Duck Duck Go HTML +Name[hu]=Duck Duck Go HTML +Name[ia]=Duck Duck Go HTML +Name[id]=Duck Duck Go HTML +Name[is]=Duck Duck Go HTML +Name[it]=Duck Duck Go HTML +Name[ja]=Duck Duck Go HTML +Name[kk]=Duck Duck Go HTML +Name[km]=Duck Duck Go HTML +Name[kn]=Duck Duck Go HTML +Name[ko]=Duck Duck Go HTML +Name[lt]=Duck Duck Go HTML +Name[lv]=Duck Duck Go HTML +Name[ml]=Duck Duck Go HTML +Name[nb]=Duck Duck Go HTML +Name[nds]=Duck Duck Go HTML +Name[nl]=Duck Duck Go HTML +Name[nn]=Duck Duck Go HTML +Name[pa]=Duck Duck Go HTML +Name[pl]=Duck Duck Go HTML +Name[pt]=Duck Duck Go HTML +Name[pt_BR]=Duck Duck Go HTML +Name[ro]=Duck Duck Go HTML +Name[ru]=Поиск Duck Duck Go HTML +Name[si]=Duck Duck Go HTML +Name[sk]=Duck Duck Go HTML +Name[sl]=Duck Duck Go HTML +Name[sr]=Duck Duck Go HTML +Name[sr@ijekavian]=Duck Duck Go HTML +Name[sr@ijekavianlatin]=Duck Duck Go HTML +Name[sr@latin]=Duck Duck Go HTML +Name[sv]=Duck Duck Go HTML +Name[tg]=Duck Duck Go HTML +Name[th]=Duck Duck Go HTML +Name[tr]=Duck Duck Go HTML +Name[ug]=Duck Duck Go HTML +Name[uk]=Duck Duck Go HTML +Name[vi]=Duck Duck Go HTML +Name[wa]=Duck Duck Go HTML +Name[x-test]=xxDuck Duck Go HTMLxx +Name[zh_CN]=Duck Duck Go HTML +Name[zh_TW]=Duck Duck Go HTML +Query=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[bg]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[bn]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[ca]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[cs]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[da]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[de]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[el]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[eo]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[es]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[et]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[fi]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[fr]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[gl]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[hi]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[hu]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[ia]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[it]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[kk]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[km]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[nb]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[nl]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[pa]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[pl]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[pt]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[pt_BR]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[ro]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[ru]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[sl]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[sr]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[sr@ijekavian]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[sr@ijekavianlatin]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[sr@latin]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[sv]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[tr]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[uk]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[wa]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[x-test]=xxhttp://duckduckgo.com/html/?q=\\{@}&t=KDExx +Query[zh_CN]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[zh_TW]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +ServiceTypes=SearchProvider +Type=Service diff --git a/libre/kdebase-runtime-libre/duckduckgo_lite.desktop b/libre/kdebase-runtime-libre/duckduckgo_lite.desktop index 2b875b4c1..0da670dbe 100644 --- a/libre/kdebase-runtime-libre/duckduckgo_lite.desktop +++ b/libre/kdebase-runtime-libre/duckduckgo_lite.desktop @@ -1,13 +1,13 @@ [Desktop Entry] Charset= Hidden=false -Keys=duckduckgo,dd,dukgo +Keys=duckduckgolite,ddlite,dukgolite Name=Duck Duck Go Lite Name[ar]=Duck Duck Go Lite Name[ast]=Duck Duck Go Lite Name[bg]=Duck Duck Go Lite Name[bn]=Duck Duck Go Lite -Name[bs]=Dak dak go lite +Name[bs]=Dak dak go Lite Name[ca]=Duck Duck Go Lite Name[ca@valencia]=Duck Duck Go Lite Name[cs]=Duck Duck Go Lite diff --git a/~fauno/pandoc/PKGBUILD b/~fauno/pandoc/PKGBUILD index d3b88d3a0..18e249a47 100644 --- a/~fauno/pandoc/PKGBUILD +++ b/~fauno/pandoc/PKGBUILD @@ -15,6 +15,9 @@ options=(strip !makeflags !distcc) source=(https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-$pkgrel-any.src.tar.xz{,.sig} SRCBUILD) conflicts=('haskell-pandoc') optdepends=('texlive-most: for pdf creation') +md5sums=('912abc4574aea3c5203eff1b02ceafa9' + '7ac798d62f253535a2e194af5aa1c3c3' + 'e632f8c06be8284e17329a5d1c459e3b') # PKGBUILD functions build() { @@ -24,24 +27,30 @@ build() { while read _hkpkg; do pushd ${srcdir}/${pkgname}-${pkgver}/${_hkpkg} >/dev/null - extra="--prefix=${srcdir}/build/usr" + msg2 "Building $_hkpkg" + case $_hkpkg in $pkgname-$pkgver) - extra="--flags=\"executable -library\" --prefix=/usr --libdir=${srcdir}/build/usr/lib -v" ;; - citeproc-hs-*) - extra="--flags=\"embed_data_files\" --prefix=${srcdir}/build/usr -v" ;; - esac + HOME=${srcdir}/${pkgname}-${pkgver} \ + cabal configure --flags='-library' \ + --prefix=/usr \ + --libdir=${srcdir}/build/usr/lib -v - msg2 "Configuring $_hkpkg with $extra" - if [ "$_hkpkg" != "$pkgname-$pkgver" ]; then HOME=${srcdir}/${pkgname}-${pkgver} \ - cabal install $extra - else + cabal build + ;; + + citeproc-hs-*) HOME=${srcdir}/${pkgname}-${pkgver} \ - cabal configure $extra + cabal install --flags='embed_data_files' \ + --prefix=${srcdir}/build/usr -v + ;; + + *) HOME=${srcdir}/${pkgname}-${pkgver} \ - cabal build - fi + cabal install --prefix=${srcdir}/build/usr + ;; + esac popd >/dev/null done <BUILDORDER @@ -63,6 +72,3 @@ package() { find ${pkgdir}/usr/share -type f -exec chmod 644 {} \; find ${pkgdir}/usr/share -type d -exec chmod 755 {} \; } -md5sums=('912abc4574aea3c5203eff1b02ceafa9' - '7ac798d62f253535a2e194af5aa1c3c3' - 'e632f8c06be8284e17329a5d1c459e3b') |