summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Reynolds <fauno@kiwwwi.com.ar>2011-06-19 11:41:31 -0300
committerNicolas Reynolds <fauno@kiwwwi.com.ar>2011-06-19 11:41:31 -0300
commit8a79dffbc1b5f55765698c420217bb06f67bb684 (patch)
tree8f8b0ee50fcd68c6572d7e7f8ce26150ac1dd430
parent35d3377392b5d0678453096f87df70faf87f72c6 (diff)
parent5457eacc747fc3f91e10a1f452230b1feac39eff (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/camlp5-transitional/PKGBUILD community/camlp5/PKGBUILD community/compizconfig-backend-kconfig/PKGBUILD community/libtrash/PKGBUILD community/mediastreamer/PKGBUILD community/python-pycurl/PKGBUILD extra/alpine/PKGBUILD extra/anjuta-extras/PKGBUILD extra/aufs2-util/PKGBUILD extra/bitlbee/PKGBUILD extra/cups/PKGBUILD extra/dotconf/PKGBUILD extra/fbida/PKGBUILD extra/fvwm-devel/PKGBUILD extra/libdmtx/PKGBUILD extra/libindi/PKGBUILD extra/mousepad/PKGBUILD extra/pysmbc/PKGBUILD extra/rcs/PKGBUILD extra/xfprint/PKGBUILD multilib-testing/lib32-mesa/PKGBUILD multilib/lib32-llvm/PKGBUILD multilib/lib32-llvm/cindexer-clang-path.patch multilib/lib32-llvm/clang-plugin-loader-registry.patch multilib/lib32-llvm/clang-pure64.patch multilib/lib32-llvm/clang-toolchains-gcc-versions.patch multilib/lib32-llvm/enable-lto.patch multilib/lib32-mesa/PKGBUILD testing/mesa/PKGBUILD testing/perl/ChangeLog testing/perl/PKGBUILD
-rw-r--r--community/calibre/PKGBUILD8
-rw-r--r--community/calibre/desktop_integration.patch6
-rw-r--r--community/camlp5-transitional/PKGBUILD47
-rw-r--r--community/camlp5/PKGBUILD62
-rw-r--r--community/compizconfig-backend-kconfig/PKGBUILD34
-rw-r--r--community/dosbox/PKGBUILD37
-rw-r--r--community/dosbox/gcc46.patch12
-rw-r--r--community/ginac/PKGBUILD15
-rw-r--r--community/gnofract4d/PKGBUILD18
-rw-r--r--community/intel-tbb/PKGBUILD6
-rw-r--r--community/libtrash/PKGBUILD35
-rw-r--r--community/libtrash/libtrash.install15
-rw-r--r--community/libtrash/libtrash.patch11
-rw-r--r--community/libtrash/libtrash.sh3
-rw-r--r--community/mediastreamer/PKGBUILD25
-rw-r--r--community/mediastreamer/disable-v4l1.patch50
-rw-r--r--community/mediatomb/PKGBUILD15
-rw-r--r--community/mediatomb/gcc46.patch10
-rw-r--r--community/mongodb/PKGBUILD24
-rw-r--r--community/mongodb/gcc46fixes.diff132
-rw-r--r--community/mongodb/gcc46fixes2.diff26
-rw-r--r--community/python-pycurl/PKGBUILD22
-rw-r--r--community/sfml/use-system-libs.patch70
-rw-r--r--community/synfigstudio/images-makefile.patch49
-rw-r--r--extra/alpine/2.00-lpam.patch13
-rw-r--r--extra/alpine/CVE-2008-5514.patch20
-rw-r--r--extra/alpine/PKGBUILD44
-rw-r--r--extra/anjuta-extras/PKGBUILD26
-rw-r--r--extra/anjuta-extras/anjuta-extras.install17
-rw-r--r--extra/aufs2-util/PKGBUILD25
-rwxr-xr-xextra/aufs2-util/create-tarball.sh11
-rw-r--r--extra/bitlbee/PKGBUILD7
-rw-r--r--extra/bluez-hcidump/PKGBUILD8
-rw-r--r--extra/bochs/2.4.5-fetchcode.patch45
-rw-r--r--extra/celestia/libpng14.patch12
-rw-r--r--extra/cfitsio/PKGBUILD15
-rw-r--r--extra/cups/PKGBUILD52
-rwxr-xr-xextra/cups/cups58
-rw-r--r--extra/cups/cups.install12
-rw-r--r--extra/dotconf/PKGBUILD28
-rw-r--r--extra/fbida/ChangeLog21
-rw-r--r--extra/fbida/PKGBUILD49
-rw-r--r--extra/fbida/jinclude.h91
-rw-r--r--extra/fbida/libpng-1.4.patch17
-rw-r--r--extra/fbida/transupp.c1583
-rw-r--r--extra/fbida/transupp.h210
-rw-r--r--extra/fvwm-devel/PKGBUILD37
-rw-r--r--extra/fvwm-devel/fvwm-devel.desktop6
-rw-r--r--extra/fvwm/fvwm2.desktop8
-rw-r--r--extra/gnupg/PKGBUILD21
-rw-r--r--extra/happy/PKGBUILD12
-rw-r--r--extra/icewm/ChangeLog15
-rw-r--r--extra/icewm/icewm.desktop6
-rw-r--r--extra/indent/indent-2.2.9-file.diff12
-rw-r--r--extra/libdmtx/PKGBUILD18
-rw-r--r--extra/libindi/PKGBUILD24
-rw-r--r--extra/libindi/linking-pthread.patch11
-rw-r--r--extra/moc/curl-streams.diff28
-rw-r--r--extra/mousepad/PKGBUILD28
-rw-r--r--extra/mousepad/mousepad.install16
-rw-r--r--extra/mousepad/resensitize-find-button.patch28
-rw-r--r--extra/mpd/PKGBUILD8
-rw-r--r--extra/msmtp/PKGBUILD20
-rw-r--r--extra/obex-data-server/PKGBUILD14
-rw-r--r--extra/pycups/PKGBUILD6
-rw-r--r--extra/pysmbc/PKGBUILD18
-rw-r--r--extra/python2/CVE-2011-1521.patch98
-rw-r--r--extra/python2/python-2.7.1-fix-decimal-in-turkish-locale.patch48
-rw-r--r--extra/rcs/PKGBUILD39
-rw-r--r--extra/rcs/path.patch (renamed from extra/rcs/rcs-5.7.patch)0
-rw-r--r--extra/sip/PKGBUILD6
-rw-r--r--extra/system-config-printer/PKGBUILD44
-rw-r--r--extra/xfprint/PKGBUILD35
-rw-r--r--extra/xfprint/xfprint-manager-fix.diff29
-rw-r--r--extra/xfprint/xfprint.install11
-rw-r--r--staging/iproute2/PKGBUILD50
-rw-r--r--staging/iproute2/iproute2-fhs.patch84
-rw-r--r--staging/kdeaccessibility/PKGBUILD98
-rw-r--r--staging/kdeaccessibility/kdeaccessibility.install11
-rw-r--r--staging/kdeadmin/PKGBUILD80
-rw-r--r--staging/kdeadmin/kdeadmin.install11
-rw-r--r--staging/kdeadmin/syslog-path.patch11
-rw-r--r--staging/kdeartwork/PKGBUILD102
-rw-r--r--staging/kdebase-runtime/PKGBUILD38
-rw-r--r--staging/kdebase-runtime/kdebase-runtime.install12
-rw-r--r--staging/kdebase-workspace/PKGBUILD72
-rw-r--r--staging/kdebase-workspace/fixpath.patch34
-rw-r--r--staging/kdebase-workspace/kde-np.pam7
-rw-r--r--staging/kdebase-workspace/kde.pam7
-rw-r--r--staging/kdebase-workspace/kdebase-workspace.install25
-rw-r--r--staging/kdebase-workspace/kdm36
-rw-r--r--staging/kdebase-workspace/kdm-zsh-profile.patch11
-rw-r--r--staging/kdebase-workspace/kscreensaver.pam1
-rw-r--r--staging/kdebase-workspace/terminate-server.patch11
-rw-r--r--staging/kdebase/PKGBUILD129
-rw-r--r--staging/kdebase/kdebase.install11
-rw-r--r--staging/kdebindings/PKGBUILD71
-rw-r--r--staging/kdeedu/PKGBUILD270
-rw-r--r--staging/kdeedu/gpsd-2.96.patch43
-rw-r--r--staging/kdeedu/kdeedu.install11
-rw-r--r--staging/kdegames/PKGBUILD514
-rw-r--r--staging/kdegames/kdegames-kbattleship.install24
-rw-r--r--staging/kdegames/kdegames-kfourinline.install12
-rw-r--r--staging/kdegames/kdegames-kigo.install12
-rw-r--r--staging/kdegames/kdegames-kolf.install12
-rw-r--r--staging/kdegames/kdegames-kreversi.install22
-rw-r--r--staging/kdegames/kdegames-kspaceduel.install12
-rw-r--r--staging/kdegames/kdegames-ksquares.install22
-rw-r--r--staging/kdegames/kdegames-ktuberling.install12
-rw-r--r--staging/kdegames/kdegames-lskat.install12
-rw-r--r--staging/kdegames/kdegames-palapeli.install13
-rw-r--r--staging/kdegames/kdegames.install11
-rw-r--r--staging/kdegraphics/PKGBUILD141
-rw-r--r--staging/kdegraphics/kdegraphics.install11
-rw-r--r--staging/kdelibs/PKGBUILD63
-rw-r--r--staging/kdelibs/abs-syntax-highlight.patch12
-rw-r--r--staging/kdelibs/archlinux-menu.patch22
-rw-r--r--staging/kdelibs/kde-applications-menu.patch22
-rw-r--r--staging/kdelibs/kdelibs.install12
-rw-r--r--staging/kdemultimedia/PKGBUILD109
-rw-r--r--staging/kdemultimedia/kdemultimedia.install11
-rw-r--r--staging/kdemultimedia/mplayerthumbs.config2
-rw-r--r--staging/kdenetwork/PKGBUILD116
-rw-r--r--staging/kdenetwork/kdenetwork.install11
-rw-r--r--staging/kdepim-runtime/PKGBUILD32
-rw-r--r--staging/kdepim-runtime/kdepim-runtime.install12
-rw-r--r--staging/kdepim/PKGBUILD253
-rw-r--r--staging/kdepim/kdepim-kleopatra.install12
-rw-r--r--staging/kdepim/kdepim-kmail.install12
-rw-r--r--staging/kdepim/kdepim-korganizer.install12
-rw-r--r--staging/kdepim/kdepim.install11
-rw-r--r--staging/kdepimlibs/PKGBUILD32
-rw-r--r--staging/kdepimlibs/kdepimlibs.install11
-rw-r--r--staging/kdeplasma-addons/PKGBUILD603
-rw-r--r--staging/kdeplasma-addons/kdeplasma-addons-applets-lancelot.install12
-rw-r--r--staging/kdeplasma-addons/kdeplasma-addons-applets.install11
-rw-r--r--staging/kdetoys/PKGBUILD56
-rw-r--r--staging/kdetoys/kdetoys.install11
-rw-r--r--staging/kdeutils/PKGBUILD180
-rw-r--r--staging/kdeutils/kdeutils.install11
-rw-r--r--staging/kdewebdev/PKGBUILD67
-rw-r--r--staging/kdewebdev/kdewebdev.install11
-rw-r--r--staging/libmtp/PKGBUILD27
-rw-r--r--staging/libsasl/PKGBUILD54
-rw-r--r--staging/libsasl/cyrus-sasl-2.1.19-checkpw.c.patch170
-rw-r--r--staging/libsasl/cyrus-sasl-db.patch34
-rw-r--r--staging/perl/ChangeLog61
-rw-r--r--staging/perl/PKGBUILD94
-rw-r--r--staging/perl/fix-h2ph-and-tests.patch104
-rw-r--r--staging/perl/perl.install18
-rwxr-xr-xstaging/perl/perlbin.sh23
-rw-r--r--staging/rhythmbox/PKGBUILD43
-rw-r--r--staging/rhythmbox/rhythmbox.install22
-rw-r--r--testing/libevent/PKGBUILD33
-rw-r--r--testing/links/PKGBUILD49
-rw-r--r--testing/links/links.desktop7
-rw-r--r--testing/lirc/PKGBUILD103
-rw-r--r--testing/lirc/irexec.conf5
-rwxr-xr-xtesting/lirc/irexecd38
-rw-r--r--testing/lirc/kernel-2.6.39.patch54
-rw-r--r--testing/lirc/lirc.install16
-rw-r--r--testing/lirc/lirc.logrotate5
-rw-r--r--testing/lirc/lirc_atiusb-kfifo.patch31
-rw-r--r--testing/lirc/lirc_wpc8769l.patch88
-rwxr-xr-xtesting/lirc/lircd52
-rw-r--r--testing/lirc/lircd-handle-large-config.patch39
-rw-r--r--testing/lirc/lircd.conf8
-rwxr-xr-xtesting/lirc/lircmd36
-rw-r--r--testing/mdadm/PKGBUILD45
-rw-r--r--testing/mdadm/disable-werror.patch11
-rwxr-xr-xtesting/mdadm/mdadm37
-rw-r--r--testing/mdadm/mdadm.conf67
-rw-r--r--testing/mdadm/mdadm.install10
-rwxr-xr-xtesting/mdadm/mdadm_hook42
-rw-r--r--testing/mdadm/mdadm_install46
-rw-r--r--testing/mpd/PKGBUILD56
-rwxr-xr-xtesting/mpd/mpd36
-rw-r--r--testing/mpd/mpd.install18
-rw-r--r--testing/net-tools/net-tools.install12
-rw-r--r--testing/nouveau-drm-lts/COPYING48
-rw-r--r--testing/nouveau-drm-lts/Makefile102
-rw-r--r--testing/nouveau-drm-lts/PKGBUILD47
-rw-r--r--testing/nouveau-drm-lts/dont_check_for_pthread.patch49
-rw-r--r--testing/nouveau-drm-lts/nouveau-drm.install16
-rw-r--r--testing/openssh/PKGBUILD71
-rw-r--r--testing/openssh/authfile.c.patch198
-rwxr-xr-xtesting/openssh/sshd48
-rw-r--r--testing/openssh/sshd.confd4
-rw-r--r--testing/openssh/sshd.pam11
-rw-r--r--testing/python2/PKGBUILD87
-rw-r--r--testing/python2/python-2.7-db51.patch42
191 files changed, 1332 insertions, 8522 deletions
diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD
index 14ae58ba1..cb05d8e31 100644
--- a/community/calibre/PKGBUILD
+++ b/community/calibre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 49119 2011-06-11 10:20:21Z giovanni $
+# $Id: PKGBUILD 49493 2011-06-17 22:21:07Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Petrov Roman <nwhisper@gmail.com>
# Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com>
pkgname=calibre
-pkgver=0.8.5
+pkgver=0.8.6
pkgrel=1
pkgdesc="Ebook management application"
arch=('i686' 'x86_64')
@@ -20,8 +20,8 @@ optdepends=('ipython: to use calibre-debug')
install=calibre.install
source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
desktop_integration.patch)
-md5sums=('b6b07a35afe4dbf188f42e932536cca3'
- 'f4b80e3b34e34bce68b3f052ff52dee8')
+md5sums=('859d856bdcbd12189ffb91c581928ed9'
+ '253ce4fe5d01f8ff76b63cd3825755ea')
build() {
cd "${srcdir}/${pkgname}"
diff --git a/community/calibre/desktop_integration.patch b/community/calibre/desktop_integration.patch
index 40d48c03e..4dbf53757 100644
--- a/community/calibre/desktop_integration.patch
+++ b/community/calibre/desktop_integration.patch
@@ -1,6 +1,6 @@
---- a/src/calibre/linux.py 2011-05-27 18:42:14.000000000 +0200
-+++ b/src/calibre/linux.py 2011-05-29 14:57:49.000000000 +0200
-@@ -340,51 +340,39 @@
+--- a/src/calibre/linux.py 2011-06-17 19:56:05.000000000 +0200
++++ b/src/calibre/linux.py 2011-06-18 00:07:46.000000000 +0200
+@@ -339,51 +339,39 @@
with TemporaryDirectory() as tdir:
with CurrentDir(tdir):
diff --git a/community/camlp5-transitional/PKGBUILD b/community/camlp5-transitional/PKGBUILD
deleted file mode 100644
index 12cc3ac16..000000000
--- a/community/camlp5-transitional/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: George Giorgidze <giorgidze@gmail.com>
-# Contributor: Massimiliano Brocchini <brocchini@netseven.it>
-
-pkgname=camlp5-transitional
-pkgver=6.02.2
-pkgrel=1
-pkgdesc='Camlp5 is a preprocessor-pretty-printer of OCaml.'
-arch=('i686' 'x86_64' 'mips64el')
-url='http://pauillac.inria.fr/~ddr/camlp5/'
-license=('BSD')
-depends=('sh')
-makedepends=('ocaml')
-conflicts=('camlp5')
-options=('!makeflags')
-source=("http://pauillac.inria.fr/~ddr/camlp5/distrib/src/camlp5-${pkgver}.tgz"
- 'http://pauillac.inria.fr/~ddr/camlp5/distrib/src/patch-6.02.2-1'
- 'http://pauillac.inria.fr/~ddr/camlp5/distrib/src/patch-6.02.2-2'
- 'http://pauillac.inria.fr/~ddr/camlp5/distrib/src/patch-6.02.2-3')
-md5sums=('b495bf26355451186c6725ee01add0da'
- '3acab547f3c0acb3c09d1d707e6c5ee3'
- '2e911c01e7da967bf68deee13e9712c8'
- '6fa59ec7c684919b6c8e2eb2bcabcf93')
-
-build() {
- cd camlp5-${pkgver}
-
- patch -Np0 -i ${srcdir}/patch-6.02.2-1
- patch -Np0 -i ${srcdir}/patch-6.02.2-2
- patch -Np0 -i ${srcdir}/patch-6.02.2-3
-
- ./configure \
- -prefix '/usr' \
- -mandir '/usr/share/man' \
- -transitional
-
- make world.opt
-}
-
-package() {
- cd camlp5-${pkgver}
-
- make DESTDIR=${pkgdir} install
-
- install -D -m644 LICENSE \
- ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/community/camlp5/PKGBUILD b/community/camlp5/PKGBUILD
index 2a6d069f7..348a197d0 100644
--- a/community/camlp5/PKGBUILD
+++ b/community/camlp5/PKGBUILD
@@ -1,46 +1,62 @@
# Maintainer: Thomas Dziedzic < gostrc at gmail >
# Contributor: Nathan Owe <ndowens.aur at gmail dot com>
+# Contributor: George Giorgidze <giorgidze@gmail.com>
+# Contributor: Massimiliano Brocchini <brocchini@netseven.it>
-pkgname=camlp5
-pkgver=6.02.2
+pkgname=('camlp5' 'camlp5-transitional')
+pkgver=6.02.3
pkgrel=1
-pkgdesc='A preprocessor-pretty-printer of OCaml.'
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
url='http://pauillac.inria.fr/~ddr/camlp5/'
license=('BSD')
depends=('sh')
makedepends=('ocaml')
-conflicts=('camlp5-transitional')
options=('!makeflags')
-source=("http://pauillac.inria.fr/~ddr/camlp5/distrib/src/${pkgname}-${pkgver}.tgz"
- 'http://pauillac.inria.fr/~ddr/camlp5/distrib/src/patch-6.02.2-1'
- 'http://pauillac.inria.fr/~ddr/camlp5/distrib/src/patch-6.02.2-2'
- 'http://pauillac.inria.fr/~ddr/camlp5/distrib/src/patch-6.02.2-3')
-md5sums=('b495bf26355451186c6725ee01add0da'
- '3acab547f3c0acb3c09d1d707e6c5ee3'
- '2e911c01e7da967bf68deee13e9712c8'
- '6fa59ec7c684919b6c8e2eb2bcabcf93')
+source=("http://pauillac.inria.fr/~ddr/camlp5/distrib/src/camlp5-${pkgver}.tgz")
+md5sums=('a4f5e0dc13c43d50eb655c8e929f556e')
build() {
- cd ${pkgname}-${pkgver}
+ cp -r camlp5-${pkgver} camlp5-transitional-${pkgver}
- patch -Np0 -i ${srcdir}/patch-6.02.2-1
- patch -Np0 -i ${srcdir}/patch-6.02.2-2
- patch -Np0 -i ${srcdir}/patch-6.02.2-3
+ cd ${srcdir}/camlp5-${pkgver}
./configure \
-prefix '/usr' \
-mandir '/usr/share/man' \
- -strict
+ -strict
- make world.opt
+ make world.opt
+
+ cd ${srcdir}/camlp5-transitional-${pkgver}
+
+ ./configure \
+ -prefix '/usr' \
+ -mandir '/usr/share/man' \
+ -transitional
+
+ make world.opt
}
-package() {
- cd ${pkgname}-${pkgver}
+package_camlp5() {
+ pkgdesc='A preprocessor-pretty-printer of OCaml.'
+ conflicts=('camlp5-transitional')
+
+ cd camlp5-${pkgver}
+
+ make DESTDIR=${pkgdir} install
+
+ install -D -m644 LICENSE \
+ ${pkgdir}/usr/share/licenses/camlp5/LICENSE
+}
+
+package_camlp5-transitional() {
+ pkgdesc='A preprocessor-pretty-printer of OCaml. (transitional)'
+ conflicts=('camlp5')
+
+ cd camlp5-transitional-${pkgver}
- make DESTDIR=${pkgdir} install
+ make DESTDIR=${pkgdir} install
install -D -m644 LICENSE \
- ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+ ${pkgdir}/usr/share/licenses/camlp5-transitional/LICENSE
}
diff --git a/community/compizconfig-backend-kconfig/PKGBUILD b/community/compizconfig-backend-kconfig/PKGBUILD
deleted file mode 100644
index 49813cc10..000000000
--- a/community/compizconfig-backend-kconfig/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 4448 2009-10-23 09:02:36Z rvanharen $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: JJDaNiMoTh <jjdanimoth@gmail.com>
-# Contributor: kasa <biuta.jr@gmail.com>
-
-pkgname=compizconfig-backend-kconfig
-pkgver=0.8.4
-pkgrel=1
-pkgdesc="Compizconfig backend for kconfig"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://opencompositing.org"
-license=('GPL')
-depends=('libcompizconfig' 'kdelibs3' 'qt3')
-makedepends=('intltool' 'pkgconfig')
-conflicts=('compizconfig-backend-gconf-git')
-groups=('compiz-fusion-kde' 'compiz-fusion')
-options=('!libtool')
-source=(http://releases.compiz-fusion.org/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('a96a30aba5e5faf7aa7db440fe4891ca')
-
-build() {
- source /etc/profile.d/kde3.sh
- source /etc/profile.d/qt3.sh
- cd ${srcdir}/${pkgname}-${pkgver}
- ./configure \
- --prefix=/opt/kde \
- --without-arts \
- --with-kde-includes=/opt/kde/includes
-
- make || return 1
- make DESTDIR=${pkgdir} install || return 1
-
-}
-
diff --git a/community/dosbox/PKGBUILD b/community/dosbox/PKGBUILD
index 4358f1a53..1f88ecec8 100644
--- a/community/dosbox/PKGBUILD
+++ b/community/dosbox/PKGBUILD
@@ -1,37 +1,46 @@
-# $Id: PKGBUILD 46953 2011-05-13 20:41:08Z andrea $
+# $Id: PKGBUILD 49481 2011-06-17 21:30:52Z jelle $
# Maintainer :
+# Contribute : Jelle van der Waa <jelle@vdwaa.nl>
# Contributor: James Rayner <james@archlinux.org>
# Contributor: Ben <ben@benmazer.net>
pkgname=dosbox
pkgver=0.74
-pkgrel=1
+pkgrel=2
pkgdesc="An emulator with builtin DOS for running DOS Games"
arch=('i686' 'x86_64')
url="http://dosbox.sourceforge.net/"
license=('GPL')
-depends=('sdl_net' 'sdl_sound' 'libgl' 'libpng' 'alsa-lib' 'gcc-libs')
+depends=('sdl_net' 'zlib' 'sdl_sound' 'libgl' 'libpng' 'alsa-lib' 'gcc-libs')
makedepends=('mesa')
source=("http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz"
- 'dosbox.png' 'dosbox.desktop')
-md5sums=('b9b240fa87104421962d14eee71351e8'
- '2aac25fc06979e375953fcc36824dc5e'
- '85169ca599028bee8e29e0b3b7b34dd8')
+ 'dosbox.png' 'dosbox.desktop' 'gcc46.patch')
build(){
cd ${srcdir}/${pkgname}-${pkgver}
- sed -i 's/png_check_sig/png_sig_cmp/' configure || return 1
- ./configure --prefix=/usr \
- --sysconfdir=/etc/dosbox || return 1
- make || return 1
+ patch -Np1 -i $srcdir/gcc46.patch
+ sed -i 's/png_check_sig/png_sig_cmp/' configure
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc/dosbox
+ make
}
package() {
cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install || return 1
+ make DESTDIR=${pkgdir} install
+
+
+ # install docs, make does not install them
+ install -d $pkgdir/usr/share/doc/$pkgname
+ install -Dm644 $srcdir/$pkgname-$pkgver/README $pkgdir/usr/share/doc/$pkgname/README
+ install -Dm644 $srcdir/$pkgname-$pkgver/docs/README.video $pkgdir/usr/share/doc/$pkgname/README.video
install -Dm644 ${srcdir}/${pkgname}.png \
- ${pkgdir}/usr/share/pixmaps/${pkgname}.png || return 1
+ ${pkgdir}/usr/share/pixmaps/${pkgname}.png
install -Dm644 ${srcdir}/${pkgname}.desktop \
- ${pkgdir}/usr/share/applications/${pkgname}.desktop || return 1
+ ${pkgdir}/usr/share/applications/${pkgname}.desktop
}
+md5sums=('b9b240fa87104421962d14eee71351e8'
+ '2aac25fc06979e375953fcc36824dc5e'
+ '85169ca599028bee8e29e0b3b7b34dd8'
+ '3fba2e3c7c43290319b2928f40ed30e5')
diff --git a/community/dosbox/gcc46.patch b/community/dosbox/gcc46.patch
new file mode 100644
index 000000000..eae9ae63e
--- /dev/null
+++ b/community/dosbox/gcc46.patch
@@ -0,0 +1,12 @@
+diff -aur dosbox-0.74/include/dos_inc.h dosbox-0.74.new//include/dos_inc.h
+--- dosbox-0.74/include/dos_inc.h 2010-05-10 17:43:54.000000000 +0000
++++ dosbox-0.74.new//include/dos_inc.h 2011-06-17 20:42:43.982548979 +0000
+@@ -28,6 +28,8 @@
+ #include "mem.h"
+ #endif
+
++#include <stddef.h> //for offsetof
++
+ #ifdef _MSC_VER
+ #pragma pack (1)
+ #endif
diff --git a/community/ginac/PKGBUILD b/community/ginac/PKGBUILD
index ea833edc6..e2a1ec1af 100644
--- a/community/ginac/PKGBUILD
+++ b/community/ginac/PKGBUILD
@@ -1,10 +1,9 @@
-# $Id: PKGBUILD 38846 2011-02-02 01:49:37Z ebelanger $
# Maintainer: Thomas Dziedzic < gostrc at gmail >
# Contributor: Thomas Baechler <thomas@archlinux.org>
pkgname=ginac
-pkgver=1.5.8
-pkgrel=2
+pkgver=1.6.0
+pkgrel=1
pkgdesc='A set of libraries that allow the creation of integrated systems that embed symbolic manipulations.'
arch=('i686' 'x86_64' 'mips64el')
url='http://www.ginac.de'
@@ -12,11 +11,11 @@ license=('GPL')
depends=('cln')
makedepends=('transfig')
options=('!libtool')
-source=("ftp://ftpthep.physik.uni-mainz.de/pub/GiNaC/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('8693b3c9c3467694032ce9c8b3063d4c')
+source=("ftp://ftpthep.physik.uni-mainz.de/pub/GiNaC/ginac-${pkgver}.tar.bz2")
+md5sums=('6d1385b440c00705a368ad51d60a292d')
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd ginac-${pkgver}
./configure \
--prefix=/usr
@@ -27,7 +26,7 @@ build() {
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd ginac-${pkgver}
- make DESTDIR="${pkgdir}" install
+ make DESTDIR=${pkgdir} install
}
diff --git a/community/gnofract4d/PKGBUILD b/community/gnofract4d/PKGBUILD
index 710c25735..b29cf52b1 100644
--- a/community/gnofract4d/PKGBUILD
+++ b/community/gnofract4d/PKGBUILD
@@ -2,8 +2,8 @@
# Contributor: Angelo Theodorou <encelo@users.sourceforge.net>
pkgname=gnofract4d
-pkgver=3.13
-pkgrel=2
+pkgver=3.14
+pkgrel=1
pkgdesc='A fractal browser with PyGTK gui'
arch=('i686' 'x86_64' 'mips64el')
url='http://gnofract4d.sourceforge.net'
@@ -11,24 +11,20 @@ license=('custom')
depends=('pygtk' 'libjpeg' 'libpng' 'shared-mime-info')
options=('!strip')
install='gnofract4d.install'
-source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz"
- 'imageIO.cpp.patch')
-md5sums=('d739eb0a61bc518ada8f5b8952298166'
- 'ff29a621a27a3836de211c577f6ab9a4')
+source=("http://downloads.sourceforge.net/sourceforge/gnofract4d/gnofract4d-${pkgver}.tar.gz")
+md5sums=('5c4956ff9aed37b5ad8b984e3673937d')
build() {
- cd ${pkgname}-${pkgver}
-
- patch -p0 < ${srcdir}/imageIO.cpp.patch
+ cd gnofract4d-${pkgver}
python2 setup.py build
}
package() {
- cd ${pkgname}-${pkgver}
+ cd gnofract4d-${pkgver}
python2 setup.py install --root=${pkgdir} --optimize=1
install -D -m644 COPYING \
- ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
+ ${pkgdir}/usr/share/licenses/gnofract4d/COPYING
}
diff --git a/community/intel-tbb/PKGBUILD b/community/intel-tbb/PKGBUILD
index 14e589d8e..add437082 100644
--- a/community/intel-tbb/PKGBUILD
+++ b/community/intel-tbb/PKGBUILD
@@ -2,14 +2,14 @@
# Contributor: Denis Martinez <deuns.martinez AT gmail.com>
pkgname=intel-tbb
-pkgver=3.0_20101215
+pkgver=3.0_20110427
pkgrel=1
pkgdesc='An award-winning C++ runtime library that abstracts the low-level threading details necessary for optimal multi-core performance.'
arch=('i686' 'x86_64' 'mips64el')
url='http://www.threadingbuildingblocks.org/'
license=('GPL')
-source=("http://www.threadingbuildingblocks.org/uploads/77/164/3.0%20Update%205/tbb30_20101215oss_src.tgz")
-md5sums=('d1f65b7ba8bafda5a8616dfc8159ea05')
+source=("http://threadingbuildingblocks.org/uploads/77/171/3.0%20update%207/tbb30_20110427oss_src.tgz")
+md5sums=('ba406f4767592179e7930e790036f00a')
build() {
cd tbb${pkgver/\./}oss
diff --git a/community/libtrash/PKGBUILD b/community/libtrash/PKGBUILD
deleted file mode 100644
index f6abf71ca..000000000
--- a/community/libtrash/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 24969 2010-08-29 20:08:31Z jlichtblau $
-# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
-# Contributor: arjan <arjan@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=libtrash
-pkgver=3.2
-pkgrel=2
-pkgdesc="A shared, preloaded library that implements a trash can under Linux"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://pages.stern.nyu.edu/~marriaga/software/libtrash/"
-license=('GPL')
-depends=('glibc')
-makedepends=('patch' 'python')
-install=$pkgname.install
-source=(http://pages.stern.nyu.edu/~marriaga/software/libtrash/$pkgname-latest.tgz libtrash.patch libtrash.sh)
-md5sums=('147f645738088c83738259376737bc42'
- '662e030819f2954b59e7646c77855f6c'
- 'de716ae481adc8e88ddd32ea72808230')
-
-build() {
- cd ${srcdir}/$pkgname-$pkgver
-
- patch -Np1 -i $startdir/src/libtrash.patch
-
- install -d ${pkgdir}/usr/lib ${pkgdir}/etc/profile.d
- make INSTLIBDIR=${pkgdir}/usr/lib SYSCONFFILE=${pkgdir}/etc
-}
-
-package() {
- cd ${srcdir}/$pkgname-$pkgver
-
- make INSTLIBDIR=${pkgdir}/usr/lib SYSCONFFILE=${pkgdir}/etc install
- install -D -m 644 ${srcdir}/libtrash.sh ${pkgdir}/etc/profile.d/libtrash.sh
-}
diff --git a/community/libtrash/libtrash.install b/community/libtrash/libtrash.install
deleted file mode 100644
index 9b1d1db9d..000000000
--- a/community/libtrash/libtrash.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
- echo ">> To enable libtrash at login:"
- echo ">> chmod 755 /etc/profile.d/libtrash.sh"
- echo ">> To enable libtrash at any moment:"
- echo ">> . /etc/profile.d/libtrash.sh"
- echo ">> To disable libtrash at any moment:"
- echo ">> unset LD_PRELOAD"
- echo ">> WARNING: fakeroot will not work while libtrash is enabled."
- echo ">> Disable libtrash before using fakeroot!"
-}
-
-post_upgrade() {
- post_install
-}
-
diff --git a/community/libtrash/libtrash.patch b/community/libtrash/libtrash.patch
deleted file mode 100644
index df08f9174..000000000
--- a/community/libtrash/libtrash.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urN libtrash-2.1/src/Makefile libtrash-2.1-new/src/Makefile
---- libtrash-2.1/src/Makefile 2003-06-24 16:35:25.000000000 -0700
-+++ libtrash-2.1-new/src/Makefile 2003-07-13 01:35:35.000000000 -0700
-@@ -29,7 +29,6 @@
- TRASH_OFF=YES install libtrash.so.${VERSION} ${INSTLIBDIR}/libtrash.so.${VERSION}
- TRASH_OFF=YES ln -sf libtrash.so.${VERSION} ${INSTLIBDIR}/libtrash.so
- TRASH_OFF=YES install libtrash.conf.sys --mode a=r ${SYSCONFFILE}
-- ldconfig
-
- clean:
- rm -f *~
diff --git a/community/libtrash/libtrash.sh b/community/libtrash/libtrash.sh
deleted file mode 100644
index d2850a56e..000000000
--- a/community/libtrash/libtrash.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-export LD_PRELOAD=/usr/lib/libtrash.so.3.2
diff --git a/community/mediastreamer/PKGBUILD b/community/mediastreamer/PKGBUILD
deleted file mode 100644
index cc81012ba..000000000
--- a/community/mediastreamer/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 44001 2011-04-01 15:25:02Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Adrià Arrufat <swiftscythe@gmail.com>
-
-pkgname=mediastreamer
-pkgver=2.7.3
-pkgrel=1
-pkgdesc="A library written in C that allows you to create and run audio and video streams."
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.linphone.org"
-license=('GPL')
-depends=('ortp' 'speex' 'v4l-utils' 'ffmpeg')
-makedepends=('cmake' 'automoc4')
-source=("http://download-mirror.savannah.gnu.org/releases/linphone/mediastreamer/mediastreamer-$pkgver.tar.gz"
- "disable-v4l1.patch")
-md5sums=('5213307f557d86aa648f1a53a885138c'
- '7ee15689eed1adbdcf0ddab8fadca34a')
-
-build() {
- cd "$srcdir"/$pkgname-$pkgver/
- patch -p2 <$srcdir/disable-v4l1.patch
- ./configure --prefix=/usr
- make
- make DESTDIR=${pkgdir} install
-}
diff --git a/community/mediastreamer/disable-v4l1.patch b/community/mediastreamer/disable-v4l1.patch
deleted file mode 100644
index 9f6cb84d4..000000000
--- a/community/mediastreamer/disable-v4l1.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -wbBur linphone-3.4.3/mediastreamer2/src/Makefile.am linphone-3.4.3.my/mediastreamer2/src/Makefile.am
---- linphone-3.4.3/mediastreamer2/src/Makefile.am 2011-02-09 08:43:11.000000000 +0000
-+++ linphone-3.4.3.my/mediastreamer2/src/Makefile.am 2011-04-01 14:54:04.000000000 +0000
-@@ -117,7 +117,7 @@
- endif
-
- if BUILD_V4L
--libmediastreamer_la_SOURCES+=msv4l.c msv4l2.c
-+libmediastreamer_la_SOURCES+=msv4l2.c
- endif
-
- if BUILD_WIN32
-diff -wbBur linphone-3.4.3/mediastreamer2/src/Makefile.in linphone-3.4.3.my/mediastreamer2/src/Makefile.in
---- linphone-3.4.3/mediastreamer2/src/Makefile.in 2011-03-28 18:34:07.000000000 +0000
-+++ linphone-3.4.3.my/mediastreamer2/src/Makefile.in 2011-04-01 14:55:00.000000000 +0000
-@@ -54,7 +54,7 @@
- @BUILD_MACAQSND_TRUE@am__append_12 = aqsnd.c
- @BUILD_PULSEAUDIO_TRUE@am__append_13 = pulseaudio.c
- @BUILD_MACOSX_TRUE@@BUILD_VIDEO_TRUE@am__append_14 = msv4m.m
--@BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE@am__append_15 = msv4l.c msv4l2.c
-+@BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE@am__append_15 = msv4l2.c
- @BUILD_VIDEO_TRUE@@BUILD_WIN32_TRUE@am__append_16 = msdscap-mingw.cc drawdib-display.c
- @BUILD_THEORA_TRUE@@BUILD_VIDEO_TRUE@am__append_17 = theora.c
- @BUILD_FFMPEG_TRUE@@BUILD_VIDEO_TRUE@am__append_18 = videoenc.c \
-@@ -135,7 +135,7 @@
- audiostream.c msspeex.c speexec.c gsm.c winsnd3.c \
- msfileplayer_win.c msfilerec_win.c msfileplayer.c msfilerec.c \
- msresample.c alsa.c oss.c arts.c pasnd.c macsnd.c msiounit.c \
-- aqsnd.c pulseaudio.c msv4m.m msv4l.c msv4l2.c msdscap-mingw.cc \
-+ aqsnd.c pulseaudio.c msv4m.m msv4l2.c msdscap-mingw.cc \
- drawdib-display.c theora.c videoenc.c videodec.c pixconv.c \
- sizeconv.c nowebcam.c nowebcam.h swscale.h ffmpeg-priv.h \
- h264dec.c jpegwriter.c videoout.c x11video.c rfc2429.h \
-@@ -156,7 +156,7 @@
- @BUILD_MACAQSND_TRUE@am__objects_12 = aqsnd.lo
- @BUILD_PULSEAUDIO_TRUE@am__objects_13 = pulseaudio.lo
- @BUILD_MACOSX_TRUE@@BUILD_VIDEO_TRUE@am__objects_14 = msv4m.lo
--@BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE@am__objects_15 = msv4l.lo msv4l2.lo
-+@BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE@am__objects_15 = msv4l2.lo
- @BUILD_VIDEO_TRUE@@BUILD_WIN32_TRUE@am__objects_16 = msdscap-mingw.lo \
- @BUILD_VIDEO_TRUE@@BUILD_WIN32_TRUE@ drawdib-display.lo
- @BUILD_THEORA_TRUE@@BUILD_VIDEO_TRUE@am__objects_17 = theora.lo
-@@ -600,7 +600,6 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mssndcard.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msspeex.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msticker.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msv4l.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msv4l2.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msv4m.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msvideo.Plo@am__quote@
diff --git a/community/mediatomb/PKGBUILD b/community/mediatomb/PKGBUILD
index f04da8eb5..f0801b70e 100644
--- a/community/mediatomb/PKGBUILD
+++ b/community/mediatomb/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 36085 2010-12-27 00:44:09Z jconder $
+# $Id: PKGBUILD 49488 2011-06-17 21:55:59Z jelle $
# Contributor: William Rea <sillywilly@gmail.com>
# Contributor: Nikhil Bysani <nikron@gmail.com>
# Contributor: Mika Hynnä <igheax@gmail.com>
@@ -6,23 +6,26 @@
pkgname=mediatomb
pkgver=0.12.1
-pkgrel=3
+pkgrel=4
pkgdesc="Free UPnP/DLNA media server"
arch=('i686' 'x86_64' 'mips64el')
url="http://mediatomb.cc/"
license=('GPL')
-depends=('libexif' 'taglib' 'sqlite3' 'spidermonkey' 'curl' 'ffmpegthumbnailer')
+depends=('libexif' 'libmp4v2' 'taglib' 'sqlite3' 'spidermonkey' 'curl' 'ffmpegthumbnailer')
backup=('etc/conf.d/mediatomb')
install=mediatomb.install
source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
'mediatomb.rc'
- 'mediatomb.conf')
+ 'mediatomb.conf'
+ 'gcc46.patch')
md5sums=('e927dd5dc52d3cfcebd8ca1af6f0d3c2'
'aa1191ec508d8bd4b3b9a5fe48efc079'
- 'bec297e4178332a26b42bbde873b94cd')
+ 'bec297e4178332a26b42bbde873b94cd'
+ '0ae34c0d73b76e3d215887834c3c08cf')
build() {
cd "$srcdir/$pkgname-$pkgver"
+ patch -Np1 -i $srcdir/gcc46.patch
./configure --prefix=/usr \
--disable-mysql \
@@ -39,5 +42,5 @@ package() {
install -D -m0755 "$srcdir/mediatomb.rc" "$pkgdir/etc/rc.d/mediatomb"
install -D -m0755 "$srcdir/mediatomb.conf" "$pkgdir/etc/conf.d/mediatomb"
- mkdir -p "$pkgdir/var/lib/mediatomb"
+ install -d "$pkgdir/var/lib/mediatomb"
}
diff --git a/community/mediatomb/gcc46.patch b/community/mediatomb/gcc46.patch
new file mode 100644
index 000000000..0f4fe490f
--- /dev/null
+++ b/community/mediatomb/gcc46.patch
@@ -0,0 +1,10 @@
+--- a/src/zmm/object.h
++++ b/src/zmm/object.h
+@@ -33,6 +33,7 @@
+ #define __ZMM_OBJECT_H__
+
+ #include <new> // for size_t
++#include <cstddef>
+ #include "atomic.h"
+
+ namespace zmm
diff --git a/community/mongodb/PKGBUILD b/community/mongodb/PKGBUILD
index 3e20e38ea..fe2cac7f9 100644
--- a/community/mongodb/PKGBUILD
+++ b/community/mongodb/PKGBUILD
@@ -3,8 +3,8 @@
# Contributor: Alec Thomas
pkgname=mongodb
-pkgver=1.8.1
-pkgrel=2
+pkgver=1.8.2
+pkgrel=1
pkgdesc='A high-performance, open source, schema-free document-oriented database.'
arch=('i686' 'x86_64' 'mips64el')
url='http://www.mongodb.org'
@@ -16,25 +16,15 @@ backup=('etc/mongodb.conf')
install="mongodb.install"
source=("http://downloads.mongodb.org/src/mongodb-src-r${pkgver}.tar.gz"
'mongodb.rc'
- 'mongodb.conf'
- 'gcc46fixes.diff'
- 'gcc46fixes2.diff')
-md5sums=('e75a5cae641a53760df8cb866ad5d929'
+ 'mongodb.conf')
+md5sums=('951fb1a75d90fc822cf4528585a970cf'
'859f8f9bb32ef2bd21fec55ae9a87d0a'
- '9e0ea3f96732bb7811f0b64dace56440'
- 'e90c78350e25df2d24f98e4767677d4b'
- '5097de6ce2c347c3703ab8cf5a611052')
+ '9e0ea3f96732bb7811f0b64dace56440')
build() {
export SCONSFLAGS="$MAKEFLAGS"
- cd ${pkgname}-src-r${pkgver}
-
- patch -Np1 -i ${srcdir}/gcc46fixes.diff
- patch -Np1 -i ${srcdir}/gcc46fixes2.diff
-
- # scons is "special"
- sed -i 's/-Wall -Wsign-compare/& -DBOOST_FILESYSTEM_VERSION=2/' SConstruct
+ cd mongodb-src-r${pkgver}
scons \
all \
@@ -42,7 +32,7 @@ build() {
}
package() {
- cd ${pkgname}-src-r${pkgver}
+ cd mongodb-src-r${pkgver}
scons \
install \
diff --git a/community/mongodb/gcc46fixes.diff b/community/mongodb/gcc46fixes.diff
deleted file mode 100644
index 487c88f16..000000000
--- a/community/mongodb/gcc46fixes.diff
+++ /dev/null
@@ -1,132 +0,0 @@
-commit fa7cd65e480d80ba1cd196bdcec8f4714e361e8e
-Author: Mathias Stearn <redbeard0531@gmail.com>
-Date: Sun Apr 3 19:10:36 2011 -0400
-
- g++ 4.6 compile (new -Wunused-but-set-variable warning)
-
-diff --git a/db/btree.cpp b/db/btree.cpp
-index 2758f72..4162d6a 100644
---- a/db/btree.cpp
-+++ b/db/btree.cpp
-@@ -1226,8 +1226,6 @@ namespace mongo {
- out() << " " << thisLoc.toString() << ".insertHere " << key.toString() << '/' << recordLoc.toString() << ' '
- << lchild.toString() << ' ' << rchild.toString() << " keypos:" << keypos << endl;
-
-- DiskLoc oldLoc = thisLoc;
--
- if ( !basicInsert(thisLoc, keypos, recordLoc, key, order) ) {
- // If basicInsert() fails, the bucket will be packed as required by split().
- thisLoc.btreemod()->split(thisLoc, keypos, recordLoc, key, order, lchild, rchild, idx);
-diff --git a/db/dbcommands.cpp b/db/dbcommands.cpp
-index 2580f86..56c0fce 100644
---- a/db/dbcommands.cpp
-+++ b/db/dbcommands.cpp
-@@ -1460,7 +1460,7 @@ namespace mongo {
- uassert( 13049, "godinsert must specify a collection", !coll.empty() );
- string ns = dbname + "." + coll;
- BSONObj obj = cmdObj[ "obj" ].embeddedObjectUserCheck();
-- DiskLoc loc = theDataFileMgr.insertWithObjMod( ns.c_str(), obj, true );
-+ theDataFileMgr.insertWithObjMod( ns.c_str(), obj, true );
- return true;
- }
- } cmdGodInsert;
-diff --git a/db/index.cpp b/db/index.cpp
-index c696e27..218ecb3 100644
---- a/db/index.cpp
-+++ b/db/index.cpp
-@@ -127,7 +127,6 @@ namespace mongo {
- void getIndexChanges(vector<IndexChanges>& v, NamespaceDetails& d, BSONObj newObj, BSONObj oldObj, bool &changedId) {
- int z = d.nIndexesBeingBuilt();
- v.resize(z);
-- NamespaceDetails::IndexIterator i = d.ii();
- for( int i = 0; i < z; i++ ) {
- IndexDetails& idx = d.idx(i);
- BSONObj idxKey = idx.info.obj().getObjectField("key"); // eg { ts : 1 }
-diff --git a/db/update.cpp b/db/update.cpp
-index e173902..85c3f9c 100644
---- a/db/update.cpp
-+++ b/db/update.cpp
-@@ -992,7 +992,7 @@ namespace mongo {
- BSONObj newObj = mss->createNewFromMods();
- checkTooLarge(newObj);
- assert(nsdt);
-- DiskLoc newLoc = theDataFileMgr.updateRecord(ns, d, nsdt, r, loc , newObj.objdata(), newObj.objsize(), debug);
-+ theDataFileMgr.updateRecord(ns, d, nsdt, r, loc , newObj.objdata(), newObj.objsize(), debug);
- }
-
- if ( logop ) {
-diff --git a/dbtests/queryoptimizertests.cpp b/dbtests/queryoptimizertests.cpp
-index acf9217..2d6f752 100644
---- a/dbtests/queryoptimizertests.cpp
-+++ b/dbtests/queryoptimizertests.cpp
-@@ -1558,7 +1558,6 @@ namespace QueryOptimizerTests {
- theDataFileMgr.insertWithObjMod( ns(), temp );
- }
- BSONObj hint = fromjson( "{$hint:{a:1,b:1}}" );
-- BSONElement hintElt = hint.firstElement();
- auto_ptr< FieldRangeSet > frs( new FieldRangeSet( ns(), fromjson( "{a:5,b:{$in:[2,3,6,9,11]}}" ) ) );
- QueryPlan qp( nsd(), 1, *frs, *frs, fromjson( "{a:5,b:{$in:[2,3,6,9,11]}}" ), BSONObj() );
- boost::shared_ptr<Cursor> c = qp.newCursor();
-@@ -1581,7 +1580,6 @@ namespace QueryOptimizerTests {
- theDataFileMgr.insertWithObjMod( ns(), temp );
- }
- BSONObj hint = fromjson( "{$hint:{a:1,b:1}}" );
-- BSONElement hintElt = hint.firstElement();
- auto_ptr< FieldRangeSet > frs( new FieldRangeSet( ns(), fromjson( "{a:{$gte:5},b:{$in:[2,3,6,9,11]}}" ) ) );
- QueryPlan qp( nsd(), 1, *frs, *frs, fromjson( "{a:{$gte:5},b:{$in:[2,3,6,9,11]}}" ), BSONObj() );
- boost::shared_ptr<Cursor> c = qp.newCursor();
-diff --git a/shell/shell_utils.cpp b/shell/shell_utils.cpp
-index 6c398ef..53484fd 100644
---- a/shell/shell_utils.cpp
-+++ b/shell/shell_utils.cpp
-@@ -260,7 +260,7 @@ namespace mongo {
- BSONElement e = oneArg(args);
- bool found = false;
-
-- path root( args.firstElement().valuestrsafe() );
-+ path root( e.valuestrsafe() );
- if ( boost::filesystem::exists( root ) ) {
- found = true;
- boost::filesystem::remove_all( root );
-diff --git a/tools/tool.cpp b/tools/tool.cpp
-index 92a4bd4..150481b 100644
---- a/tools/tool.cpp
-+++ b/tools/tool.cpp
-@@ -413,14 +413,14 @@ namespace mongo {
- ProgressMeter m( fileLength );
-
- while ( read < fileLength ) {
-- int readlen = fread(buf, 4, 1, file);
-+ fread(buf, 4, 1, file);
- int size = ((int*)buf)[0];
- if ( size >= BUF_SIZE ) {
- cerr << "got an object of size: " << size << " terminating..." << endl;
- }
- uassert( 10264 , "invalid object size" , size < BUF_SIZE );
-
-- readlen = fread(buf+4, size-4, 1, file);
-+ fread(buf+4, size-4, 1, file);
-
- BSONObj o( buf );
- if ( _objcheck && ! o.valid() ) {
-diff --git a/util/ramlog.h b/util/ramlog.h
-index fc588e6..b2f3aa0 100644
---- a/util/ramlog.h
-+++ b/util/ramlog.h
-@@ -108,7 +108,6 @@ namespace mongo {
- vector<const char*> v;
- get( v );
-
-- bool first = true;
- s << "<pre>\n";
- for( int i = 0; i < (int)v.size(); i++ ) {
- assert( strlen(v[i]) > 20 );
-@@ -126,7 +125,7 @@ namespace mongo {
- stringstream r;
- if( nr == 1 ) r << "repeat last line";
- else r << "repeats last " << nr << " lines; ends " << string(v[last]+4,0,15);
-- first = false; s << html::a("", r.str(), clean(v,i,x.str()));
-+ s << html::a("", r.str(), clean(v,i,x.str()));
- }
- else s << x.str();
- s << '\n';
diff --git a/community/mongodb/gcc46fixes2.diff b/community/mongodb/gcc46fixes2.diff
deleted file mode 100644
index 17257b136..000000000
--- a/community/mongodb/gcc46fixes2.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-commit 5931bc0231c91ecdfc5dd313d8cce578eae426bb
-Author: Eliot Horowitz <eliot@10gen.com>
-Date: Wed Mar 30 01:01:18 2011 -0400
-
- remove unused variable
-
-diff --git a/db/commands.cpp b/db/commands.cpp
-index c301fb3..0bbd765 100644
---- a/db/commands.cpp
-+++ b/db/commands.cpp
-@@ -127,7 +127,6 @@ namespace mongo {
- if ( strcmp(p, ".$cmd") != 0 ) return false;
-
- bool ok = false;
-- bool valid = false;
-
- BSONElement e = jsobj.firstElement();
- map<string,Command*>::iterator i;
-@@ -138,7 +137,6 @@ namespace mongo {
- migrated over to the command object format.
- */
- else if ( (i = _commands->find(e.fieldName())) != _commands->end() ) {
-- valid = true;
- string errmsg;
- Command *c = i->second;
- if ( c->adminOnly() && !startsWith(ns, "admin.") ) {
diff --git a/community/python-pycurl/PKGBUILD b/community/python-pycurl/PKGBUILD
deleted file mode 100644
index 55c5f9284..000000000
--- a/community/python-pycurl/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# $Id: PKGBUILD 25898 2010-09-11 12:22:23Z andrea $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
-# Contributor: kontrast <kontr4st@gmail.com>
-
-pkgname=python-pycurl
-pkgver=7.19.0
-pkgrel=5
-pkgdesc="A Python interface to libcurl"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://pycurl.sourceforge.net"
-license=('GPL')
-depends=('python2' 'curl')
-replaces=('pycurl')
-provides=('pycurl')
-source=("http://pycurl.sourceforge.net/download/pycurl-${pkgver}.tar.gz")
-md5sums=('919d58fe37e69fe87ce4534d8b6a1c7b')
-
-package() {
- cd ${srcdir}/pycurl-${pkgver}
- python2 setup.py install --curl-config=/usr/bin/curl-config --prefix ${pkgdir}/usr
-}
diff --git a/community/sfml/use-system-libs.patch b/community/sfml/use-system-libs.patch
deleted file mode 100644
index 5d3200225..000000000
--- a/community/sfml/use-system-libs.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-Only in SFML-1.6-old/lib: libsfml-graphics.so.1.6
-Binary files SFML-1.6-old/lib/libsfml-network.so.1.6 and SFML-1.6/lib/libsfml-network.so.1.6 differ
-Binary files SFML-1.6-old/lib/libsfml-system.so.1.6 and SFML-1.6/lib/libsfml-system.so.1.6 differ
-Binary files SFML-1.6-old/lib/libsfml-window.so.1.6 and SFML-1.6/lib/libsfml-window.so.1.6 differ
-diff -ur SFML-1.6-old/src/SFML/Graphics/ImageLoader.cpp SFML-1.6/src/SFML/Graphics/ImageLoader.cpp
---- SFML-1.6-old/src/SFML/Graphics/ImageLoader.cpp 2010-01-27 15:00:05.000000000 +0100
-+++ SFML-1.6/src/SFML/Graphics/ImageLoader.cpp 2010-08-16 12:27:33.983627625 +0200
-@@ -28,10 +28,10 @@
- #include <SFML/Graphics/ImageLoader.hpp>
- extern "C"
- {
-- #include <SFML/Graphics/libjpeg/jpeglib.h>
-- #include <SFML/Graphics/libjpeg/jerror.h>
-+ #include <jpeglib.h>
-+ #include <jerror.h>
- }
--#include <SFML/Graphics/libpng/png.h>
-+#include <png.h>
- #include <SFML/Graphics/SOIL/SOIL.h>
- #include <iostream>
-
-Only in SFML-1.6-old/src/SFML/Graphics: ImageLoader.cpp.rej
-diff -ur SFML-1.6-old/src/SFML/Graphics/Makefile SFML-1.6/src/SFML/Graphics/Makefile
---- SFML-1.6-old/src/SFML/Graphics/Makefile 2010-01-27 15:00:05.000000000 +0100
-+++ SFML-1.6/src/SFML/Graphics/Makefile 2010-08-16 12:25:13.663501212 +0200
-@@ -1,15 +1,5 @@
- SRC = $(wildcard *.cpp)
--SRCGLEW = $(wildcard ./GLEW/*.c)
--SRCJPEG = $(wildcard ./libjpeg/*.c)
--SRCPNG = $(wildcard ./libpng/*.c)
--SRCSOIL = $(wildcard ./SOIL/*.c)
--SRCZLIB = $(wildcard ./zlib/*.c)
- OBJ = $(SRC:.cpp=.o)
--OBJGLEW = $(SRCGLEW:.c=.o)
--OBJJPEG = $(SRCJPEG:.c=.o)
--OBJPNG = $(SRCPNG:.c=.o)
--OBJSOIL = $(SRCSOIL:.c=.o)
--OBJZLIB = $(SRCZLIB:.c=.o)
-
- ifeq ($(STATIC), yes)
- LIB = libsfml-graphics-s.a
-@@ -23,22 +13,19 @@
-
- all: $(LIB)
-
--libsfml-graphics-s.a: $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
-- $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
-+libsfml-graphics-s.a: $(OBJ)
-+ $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) -static -lGLEW -ljpeg -lpng -lsoil -lz -lSOIL
-
--libsfml-graphics.so: $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
-- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB) -lfreetype -lX11 -lGL
-+libsfml-graphics.so: $(OBJ)
-+ $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) -lGLEW -ljpeg -lpng -lSOIL -lz -lfreetype -lX11 -lGL
-
- $(OBJ): %.o: %.cpp
- $(CPP) -o $@ -c $< $(CFLAGS) -I/usr/include/freetype2
-
--$(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB): %.o: %.c
-- $(CC) -o $@ -c $< $(CFLAGSEXT) -DSTBI_FAILURE_USERMSG
--
- .PHONY: clean mrproper
-
- clean:
-- @rm -rf $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
-+ @rm -rf $(OBJ)
-
- mrproper: clean
- @rm -rf $(LIBNAME)
-Only in SFML-1.6-old/src/SFML/Graphics: Makefile.rej
diff --git a/community/synfigstudio/images-makefile.patch b/community/synfigstudio/images-makefile.patch
deleted file mode 100644
index cb209b40e..000000000
--- a/community/synfigstudio/images-makefile.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- images-old/Makefile 2008-10-22 23:16:32.000000000 -0700
-+++ images/Makefile 2008-10-22 23:15:16.000000000 -0700
-@@ -223,7 +223,7 @@
- top_builddir = ..
- top_srcdir = ..
- SYNFIG = synfig
--EXT = png
-+EXT = mng
- EXTRA_DIST = installer_logo.sif installer_logo_osx.sif \
- splash_screen.sifz splash_screen-0.61.08.sif \
- splash_screen-0.61.07.sif about_icon.sif angle_icon.sif \
-@@ -650,31 +650,37 @@
- $(SYNFIG) -q $< -o $@ --time 0
- echo " File \"images\\$@\"" >>./images.nsh
- echo " Delete \"\$$INSTDIR\\share\\pixmaps\\$@\"" >>./unimages.nsh
-+ mogrify -format png $@
-
- .sifz.$(EXT):
- $(SYNFIG) -q $< -o $@ --time 0
- echo " File \"images\\$@\"" >>./images.nsh
- echo " Delete \"\$$INSTDIR\\share\\pixmaps\\$@\"" >>./unimages.nsh
-+ mogrify -format png $@
-
- keyframe_lock_all.$(EXT): $(srcdir)/keyframe_lock_icon.sif
- $(SYNFIG) -q $< -o $@ --time 0
- echo " File \"images\\$@\"" >>./images.nsh
- echo " Delete \"\$$INSTDIR\\share\\pixmaps\\$@\"" >>./unimages.nsh
-+ mogrify -format png $@
-
- keyframe_lock_past.$(EXT): $(srcdir)/keyframe_lock_icon.sif
- $(SYNFIG) -q $< -o $@ --time 0 -c PastOnly
- echo " File \"images\\$@\"" >>./images.nsh
- echo " Delete \"\$$INSTDIR\\share\\pixmaps\\$@\"" >>./unimages.nsh
-+ mogrify -format png $@
-
- keyframe_lock_future.$(EXT): $(srcdir)/keyframe_lock_icon.sif
- $(SYNFIG) -q $< -o $@ --time 0 -c FutureOnly
- echo " File \"images\\$@\"" >>./images.nsh
- echo " Delete \"\$$INSTDIR\\share\\pixmaps\\$@\"" >>./unimages.nsh
-+ mogrify -format png $@
-
- keyframe_lock_none.$(EXT): $(srcdir)/keyframe_lock_icon.sif
- $(SYNFIG) -q $< -o $@ --time 0 -c Disabled
- echo " File \"images\\$@\"" >>./images.nsh
- echo " Delete \"\$$INSTDIR\\share\\pixmaps\\$@\"" >>./unimages.nsh
-+ mogrify -format png $@
-
- #.sif.png:
- # $(SYNFIG) -q $< -o $@ --time 0
diff --git a/extra/alpine/2.00-lpam.patch b/extra/alpine/2.00-lpam.patch
deleted file mode 100644
index 69e66d7ef..000000000
--- a/extra/alpine/2.00-lpam.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- alpine-2.00.orig/alpine/Makefile.in
-+++ alpine-2.00/alpine/Makefile.in
-@@ -169,7 +169,7 @@
- LIBICONV = @LIBICONV@
- LIBINTL = @LIBINTL@
- LIBOBJS = @LIBOBJS@
--LIBS = @LIBS@
-+LIBS = @LIBS@ -lpam
- LIBTOOL = @LIBTOOL@
- LN = @LN@
- LN_S = @LN_S@
- LTLIBICONV = @LTLIBICONV@
- LTLIBINTL = @LTLIBINTL@
diff --git a/extra/alpine/CVE-2008-5514.patch b/extra/alpine/CVE-2008-5514.patch
deleted file mode 100644
index 594bea0b2..000000000
--- a/extra/alpine/CVE-2008-5514.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- alpine-2.00/imap/src/c-client/rfc822.c
-+++ alpine-2.00/imap/src/c-client/rfc822.c
-@@ -1351,6 +1351,7 @@
-
- static long rfc822_output_char (RFC822BUFFER *buf,int c)
- {
-+ if ((buf->cur == buf->end) && !rfc822_output_flush (buf)) return NIL;
- *buf->cur++ = c; /* add character, soutr buffer if full */
- return (buf->cur == buf->end) ? rfc822_output_flush (buf) : LONGT;
- }
-@@ -1374,7 +1375,8 @@
- len -= i;
- }
- /* soutr buffer now if full */
-- if (len && !rfc822_output_flush (buf)) return NIL;
-+ if ((len || (buf->cur == buf->end)) && !rfc822_output_flush (buf))
-+ return NIL;
- }
- return LONGT;
- }
diff --git a/extra/alpine/PKGBUILD b/extra/alpine/PKGBUILD
deleted file mode 100644
index e70e9a75a..000000000
--- a/extra/alpine/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 121113 2011-04-29 02:56:31Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=alpine
-pkgver=2.00
-pkgrel=13
-_patchlevel=79
-pkgdesc="The Apache-licensed PINE (a tool for reading, sending, and managing electronic messages)"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.washington.edu/alpine/"
-license=('APACHE')
-depends=('libldap' 'krb5' 'gettext')
-optdepends=('aspell: for spell-checking support')
-provides=('pine')
-conflicts=('pine')
-replaces=('pine')
-options=('!makeflags')
-source=(ftp://ftp.cac.washington.edu/${pkgname}/${pkgname}.tar.bz2 \
- http://staff.washington.edu/chappa/alpine/patches/alpine-${pkgver}/all_${_patchlevel}.patch.gz \
- 2.00-lpam.patch CVE-2008-5514.patch)
-md5sums=('84e44cbf71ed674800a5d57eed9c1c52'
- 'd7dffd121c9a1cac4c458c0ff71df1ce'
- 'cd3911c16fc6a072e853c0ccfc35857c'
- '1b52a54a656979116c09fb1d948a4325')
-sha1sums=('dcbd3c5419954f484ccf706feaba31ce48cdebc4'
- 'd3acbf0e46c50feb2e822ef3bdc0a0f43c007294'
- '1b39525f91ebd5a9de5a1e04f5554f6fa5f58ae3'
- 'bc61d76a237ff42b00b3f60f2e6fc5c45e261dbb')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -p1 < ../all_${_patchlevel}.patch
- patch -p1 < ../2.00-lpam.patch
- patch -p1 < ../CVE-2008-5514.patch
- ./configure --prefix=/usr --without-passfile --without-tcl \
- --disable-shared --with-system-pinerc=/etc/alpine.d/pine.conf \
- --with-system-fixed-pinerc=/etc/alpine.d/pine.conf.fixed
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/anjuta-extras/PKGBUILD b/extra/anjuta-extras/PKGBUILD
deleted file mode 100644
index 00431e08f..000000000
--- a/extra/anjuta-extras/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 105124 2011-01-06 17:19:56Z ibiru $
-# Mantainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=anjuta-extras
-pkgver=2.32.1.1
-pkgrel=1
-pkgdesc="Anjuta Integrated Development Environment extra plugins"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-depends=('anjuta>=2.32.0.0' 'libgnomecanvas>=2.30.2' 'graphviz>=2.26.3' 'valgrind')
-makedepends=('intltool')
-install=anjuta-extras.install
-url="http://anjuta.sourceforge.net/"
-source=(ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.32/${pkgname}-${pkgver}.tar.bz2)
-options=('!libtool' '!emptydirs')
-sha256sums=('0461b78eaa11b7a930001024c4db2484863b35f5f52acaa23c568bc6355414a4')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-static
- make
- make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
- install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
- gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain anjuta-extras ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/extra/anjuta-extras/anjuta-extras.install b/extra/anjuta-extras/anjuta-extras.install
deleted file mode 100644
index 2c23edf15..000000000
--- a/extra/anjuta-extras/anjuta-extras.install
+++ /dev/null
@@ -1,17 +0,0 @@
-pkgname=anjuta
-
-post_install() {
- usr/sbin/gconfpkg --install ${pkgname}
-}
-
-pre_upgrade() {
- pre_remove $1
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- usr/sbin/gconfpkg --uninstall ${pkgname}
-}
diff --git a/extra/aufs2-util/PKGBUILD b/extra/aufs2-util/PKGBUILD
deleted file mode 100644
index 7ae215d03..000000000
--- a/extra/aufs2-util/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 114820 2011-03-16 06:31:06Z tpowa $
-# Contributor: Paul Mattal <paul@mattal.com>
-# Maintainer: Paul Mattal <pjmattal@elys.com>
-pkgname=aufs2-util
-pkgver=20110314
-pkgrel=1
-pkgdesc="Another Unionfs Implementation that supports NFS branches"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://aufs.sourceforge.net/"
-license=('GPL2')
-depends=('glibc')
-makedepends=('aufs2>=2.6.38_20110314' 'kernel26-headers')
-replaces=('aufs-utils')
-source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-
-build() {
- cd $srcdir/$pkgname-$pkgver
- make
-}
-
-package() {
- cd $srcdir/$pkgname-$pkgver
- make DESTDIR=$pkgdir install
-}
-md5sums=('bf0f9c86361e12a3181fb3891e57cd8d')
diff --git a/extra/aufs2-util/create-tarball.sh b/extra/aufs2-util/create-tarball.sh
deleted file mode 100755
index 361cbbc38..000000000
--- a/extra/aufs2-util/create-tarball.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-GITSNAPSHOT=20110314
-# aufs2 (no -xx) for the latest -rc version.
-git clone http://git.c3sl.ufpr.br/pub/scm/aufs/aufs2-util.git aufs2-util.git
-cd aufs2-util.git
-#git checkout origin/aufs2${AUFS2VERSION}
-git checkout origin/aufs2.1
-cd ..
-rm -rf aufs2-util-${GITSNAPSHOT}
-cp -a aufs2-util.git aufs2-util-${GITSNAPSHOT}
-tar -czf aufs2-util-${GITSNAPSHOT}.tar.gz --exclude=.git aufs2-util-${GITSNAPSHOT}
diff --git a/extra/bitlbee/PKGBUILD b/extra/bitlbee/PKGBUILD
index 9a43341f5..2fbdf9266 100644
--- a/extra/bitlbee/PKGBUILD
+++ b/extra/bitlbee/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 127301 2011-06-12 14:10:02Z bisson $
+# $Id: PKGBUILD 127641 2011-06-17 11:09:38Z bisson $
# Contributor: FUBAR <mrfubar@gmail.com>
# Contributor: simo <simo@archlinux.org>
# Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org>
@@ -7,7 +7,7 @@
pkgname=bitlbee
pkgver=3.0.3
-pkgrel=1
+pkgrel=2
pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC'
arch=('i686' 'x86_64' 'mips64el')
url='http://www.bitlbee.org/'
@@ -31,9 +31,12 @@ build() {
--etcdir=/etc/bitlbee \
--pidfile=/var/run/bitlbee/bitlbee.pid \
--ipcsocket=/var/run/bitlbee/bitlbee.sock \
+ --systemdsystemunitdir=/lib/systemd/system \
+ --ssl=openssl \
--strip=0 \
--otr=1 \
--ssl=gnutls
+
make
}
diff --git a/extra/bluez-hcidump/PKGBUILD b/extra/bluez-hcidump/PKGBUILD
index 3604fffb9..95651cdbe 100644
--- a/extra/bluez-hcidump/PKGBUILD
+++ b/extra/bluez-hcidump/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 108242 2011-01-30 15:00:57Z andrea $
+# $Id: PKGBUILD 127665 2011-06-17 17:18:51Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Geoffroy carrier <geoffroy@archlinux.org>
# Contributor: Giovanni Scafora <giovanni@archlinux.org>
pkgname=bluez-hcidump
-pkgver=2.0
+pkgver=2.1
pkgrel=1
pkgdesc="Bluetooth HCI package analyzer"
url="http://www.bluez.org/"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL2')
depends=('glibc' 'bluez')
-source=(http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.gz)
-md5sums=('5c2e3ef0a68b2845047867ba51ff8ac9')
+source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.gz")
+md5sums=('b160f0672276398344eebe9df1b37a2c')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/bochs/2.4.5-fetchcode.patch b/extra/bochs/2.4.5-fetchcode.patch
deleted file mode 100644
index ef980a340..000000000
--- a/extra/bochs/2.4.5-fetchcode.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- cpu/fetchdecode.cc.orig 2010-04-16 15:52:44.000000000 -0400
-+++ cpu/fetchdecode.cc 2010-10-07 13:23:06.000000000 -0400
-@@ -1,5 +1,5 @@
- /////////////////////////////////////////////////////////////////////////
--// $Id: fetchdecode.cc,v 1.266 2010/04/16 19:52:44 sshwarts Exp $
-+// $Id: fetchdecode.cc,v 1.267 2010/04/29 21:04:23 sshwarts Exp $
- /////////////////////////////////////////////////////////////////////////
- //
- // Copyright (C) 2001-2009 The Bochs Project
-@@ -474,7 +474,7 @@
- /* 0F 0D /wr */ { 0, BX_IA_PREFETCHW }, // 3DNow! PREFETCH on AMD, NOP on Intel
- /* 0F 0E /wr */ { 0, BX_IA_FEMMS }, // 3DNow! FEMMS
- #if BX_SUPPORT_3DNOW
-- /* 0F 0F /wr */ { BxImmediate_Ib, BX_IA_ERROR, Bx3DNowOpcodeInfo },
-+ /* 0F 0F /wr */ { BxImmediate_Ib, BX_IA_ERROR },
- #else
- /* 0F 0F /wr */ { 0, BX_IA_ERROR },
- #endif
-@@ -1025,7 +1025,7 @@
- /* 0F 0D /dr */ { 0, BX_IA_PREFETCHW }, // 3DNow! PREFETCH on AMD, NOP on Intel
- /* 0F 0E /dr */ { 0, BX_IA_FEMMS }, // 3DNow! FEMMS
- #if BX_SUPPORT_3DNOW
-- /* 0F 0F /dr */ { BxImmediate_Ib, BX_IA_ERROR, Bx3DNowOpcodeInfo },
-+ /* 0F 0F /dr */ { BxImmediate_Ib, BX_IA_ERROR },
- #else
- /* 0F 0F /dr */ { 0, BX_IA_ERROR },
- #endif
-@@ -1583,7 +1583,7 @@
- /* 0F 0D /wm */ { 0, BX_IA_PREFETCHW }, // 3DNow! PREFETCH on AMD, NOP on Intel
- /* 0F 0E /wm */ { 0, BX_IA_FEMMS }, // 3DNow! FEMMS
- #if BX_SUPPORT_3DNOW
-- /* 0F 0F /wm */ { BxImmediate_Ib, BX_IA_ERROR, Bx3DNowOpcodeInfo },
-+ /* 0F 0F /wm */ { BxImmediate_Ib, BX_IA_ERROR },
- #else
- /* 0F 0F /wm */ { 0, BX_IA_ERROR },
- #endif
-@@ -2134,7 +2134,7 @@
- /* 0F 0D /dm */ { 0, BX_IA_PREFETCHW }, // 3DNow! PREFETCH on AMD, NOP on Intel
- /* 0F 0E /dm */ { 0, BX_IA_FEMMS }, // 3DNow! FEMMS
- #if BX_SUPPORT_3DNOW
-- /* 0F 0F /dm */ { BxImmediate_Ib, BX_IA_ERROR, Bx3DNowOpcodeInfo },
-+ /* 0F 0F /dm */ { BxImmediate_Ib, BX_IA_ERROR },
- #else
- /* 0F 0F /dm */ { 0, BX_IA_ERROR },
- #endif
diff --git a/extra/celestia/libpng14.patch b/extra/celestia/libpng14.patch
deleted file mode 100644
index 1d47637b9..000000000
--- a/extra/celestia/libpng14.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur celestia-1.6.0.orig/src/celengine/image.cpp celestia-1.6.0/src/celengine/image.cpp
---- celestia-1.6.0.orig/src/celengine/image.cpp 2009-06-22 18:44:08.000000000 +0300
-+++ celestia-1.6.0/src/celengine/image.cpp 2010-01-18 23:27:55.000000000 +0200
-@@ -737,7 +737,7 @@
-
- if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
- {
-- png_set_gray_1_2_4_to_8(png_ptr);
-+ png_set_expand_gray_1_2_4_to_8(png_ptr);
- }
-
- if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))
diff --git a/extra/cfitsio/PKGBUILD b/extra/cfitsio/PKGBUILD
index e15426633..5f1992744 100644
--- a/extra/cfitsio/PKGBUILD
+++ b/extra/cfitsio/PKGBUILD
@@ -1,27 +1,28 @@
-# $Id: PKGBUILD 117363 2011-03-31 21:07:25Z andrea $
+# $Id: PKGBUILD 127670 2011-06-17 17:20:53Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
pkgname=cfitsio
-pkgver=3.270
-_pkgver=3270
+pkgver=3.280
+_pkgver=3280
pkgrel=1
pkgdesc="A library of C and Fortran subroutines for reading and writing data files in FITS (Flexible Image Transport System) data format"
arch=('i686' 'x86_64' 'mips64el')
url="http://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html"
license=('GPL2')
+depends=('glibc')
makedepends=('pkgconfig')
options=('!libtool')
source=("ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/${pkgname}${_pkgver}.tar.gz")
-md5sums=('2a72b323de3f40ad1a671f2167500336')
+md5sums=('fdb9c0f51678b47e78592c70fb5dc793')
build() {
- cd ${srcdir}/${pkgname}
+ cd "${srcdir}"/${pkgname}
./configure --prefix=/usr
make shared
}
package() {
- cd ${srcdir}/${pkgname}
- make DESTDIR=${pkgdir} install
+ cd "${srcdir}"/${pkgname}
+ make DESTDIR="${pkgdir}" install
}
diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD
index 76f44a6a8..4fcd1e8d9 100644
--- a/extra/cups/PKGBUILD
+++ b/extra/cups/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 126330 2011-06-04 22:35:21Z andyrtr $
+# $Id: PKGBUILD 127716 2011-06-17 19:45:36Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
pkgbase="cups"
pkgname=('libcups' 'cups')
pkgver=1.4.6
-pkgrel=3
-arch=('i686' 'x86_64' 'mips64el')
+pkgrel=4
+arch=('i686' 'x86_64')
license=('GPL')
url="http://www.cups.org/"
-makedepends=('libtiff>=3.9.2-2' 'libpng>=1.4.0' 'acl' 'openslp' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'poppler>=0.12.3'
- 'xinetd' 'gzip' 'autoconf' 'libusb-compat' 'dbus-core' 'avahi' 'hicolor-icon-theme')
+makedepends=('libtiff>=3.9.2-2' 'libpng>=1.4.0' 'acl' 'openslp' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'poppler>=0.12.3'
+ 'xinetd' 'gzip' 'autoconf' 'php' 'libusb-compat' 'dbus-core' 'avahi' 'hicolor-icon-theme')
source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2
cups-avahi.patch
cups cups.logrotate cups.pam)
#options=('!emptydirs')
md5sums=('de8fb5a29c36554925c0c6a6e2c0dae1'
'8ebd390197501ffd709f0ee546937fd5'
- '5c85b7d8d2ddd02c2c64955cebbf55ea'
+ '9657daa21760bb0b5fa3d8b51d5e01a1'
'f861b18f4446c43918c8643dcbbd7f6d'
'96f82c38f3f540b53f3e5144900acf17')
@@ -32,14 +32,36 @@ build() {
autoconf -I config-scripts
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
- --with-logdir=/var/log/cups -with-docdir=/usr/share/cups/doc \
- --with-cups-user=daemon --with-cups-group=lp --enable-pam=yes \
- --disable-ldap --libdir=/usr/lib --enable-raw-printing \
- --enable-dbus --with-dbusdir=/etc/dbus-1 --enable-ssl=yes --enable-gnutls --disable-threads --enable-avahi\
- --with-php=/usr/bin/php-cgi --with-pdftops=pdftops --with-optim="$CFLAGS"
+ --libdir=/usr/lib \
+ --with-logdir=/var/log/cups \
+ --with-docdir=/usr/share/cups/doc \
+ --with-cups-user=daemon \
+ --with-cups-group=lp \
+ --enable-pam=yes \
+ --disable-ldap \
+ --enable-raw-printing \
+ --enable-dbus --with-dbusdir=/etc/dbus-1 \
+ --enable-ssl=yes --enable-gnutls \
+ --disable-threads \
+ --enable-avahi\
+ --with-php=/usr/bin/php-cgi \
+ --with-pdftops=pdftops \
+ --with-optim="$CFLAGS"
+
+ #reminder
+ #Restored support for GNU TLS and OpenSSL with threading enabled (STR #3605) in cups 1.5b1
+
make
}
+check() {
+ cd "$srcdir/$pkgbase-$pkgver"
+ #httpAddrGetList(workstation64): FAIL
+ #1 TESTS FAILED!
+ #make[1]: *** [testhttp] Error 1
+ make -k check || /bin/true
+}
+
package_libcups() {
pkgdesc="The CUPS Printing System - client libraries and headers"
depends=('gnutls>=2.8.3' 'libtiff>=3.9.2-2' 'libpng>=1.4.0' 'krb5' 'avahi')
@@ -66,12 +88,12 @@ backup=(etc/cups/cupsd.conf
etc/logrotate.d/cups
etc/pam.d/cups
etc/xinetd.d/cups-lpd)
-depends=('acl' 'openslp' 'pam' "libcups>=${pkgver}" 'xdg-utils' 'poppler>=0.12.3' 'libusb-compat' 'dbus-core' 'hicolor-icon-theme')
+depends=('acl' 'openslp' 'pam' "libcups>=${pkgver}" 'poppler>=0.12.3' 'libusb-compat' 'dbus-core' 'hicolor-icon-theme')
optdepends=('php: for included phpcups.so module'
'ghostscript: for non-PostScript printers to print with CUPS to convert PostScript to raster images'
'foomatic-db: drivers use Ghostscript to convert PostScript to a printable form directly'
'foomatic-db-engine: drivers use Ghostscript to convert PostScript to a printable form directly'
- 'foomatic-db-nonfree: drivers use Ghostscript to convert PostScript to a printable form directly')
+ 'xdg-utils: xdg .desktop file support')
cd ${srcdir}/${pkgbase}-${pkgver}
make BUILDROOT=${pkgdir} install-data install-exec
@@ -95,7 +117,9 @@ optdepends=('php: for included phpcups.so module'
# install ssl directory where to store the certs, solves some samba issues
install -dm700 -g lp ${pkgdir}/etc/cups/ssl
- install -dm511 -g lp ${pkgdir}/var/run/cups/certs
+ # remove directory from package, we create it in cups rc.d file
+ rm -rf ${pkgdir}/var/run
+# install -dm511 -g lp ${pkgdir}/var/run/cups/certs
# install some more configuration files that will get filled by cupsd
touch ${pkgdir}/etc/cups/printers.conf
diff --git a/extra/cups/cups b/extra/cups/cups
index 4afaf5a7c..744c8e663 100755
--- a/extra/cups/cups
+++ b/extra/cups/cups
@@ -1,38 +1,68 @@
#!/bin/bash
+daemon_name=cupsd
+
. /etc/rc.conf
. /etc/rc.d/functions
+#. /etc/conf.d/$daemon_name.conf
+
+get_pid() {
+ pidof -o %PPID $daemon_name
+}
-PID=`pidof -o %PPID /usr/sbin/cupsd`
case "$1" in
start)
- stat_busy "Starting CUPS Daemon"
- [ -z "$PID" ] && /usr/sbin/cupsd
- if [ $? -gt 0 ]; then
- stat_fail
+ stat_busy "Starting $daemon_name daemon"
+
+ PID=$(get_pid)
+ if [ -z "$PID" ]; then
+ [ -f /var/run/$daemon_name.pid ] && rm -f /var/run/$daemon_name.pid
+ # RUN
+ $daemon_name
+ #
+ if [ $? -gt 0 ]; then
+ stat_fail
+ exit 1
+ else
+ echo $(get_pid) > /var/run/$daemon_name.pid
+ add_daemon $daemon_name
+ stat_done
+ fi
else
- echo $(pidof -o %PPID -x /usr/sbin/cupsd) > /var/run/cups.pid
- add_daemon cups
- stat_done
+ stat_fail
+ exit 1
fi
;;
+
stop)
- stat_busy "Stopping CUPS Daemon"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
+ stat_busy "Stopping $daemon_name daemon"
+ PID=$(get_pid)
+ # KILL
+ [ ! -z "$PID" ] && kill $PID &> /dev/null
+ #
if [ $? -gt 0 ]; then
stat_fail
+ exit 1
else
- rm /var/run/cups.pid
- rm_daemon cups
+ rm -f /var/run/$daemon_name.pid &> /dev/null
+ rm_daemon $daemon_name
stat_done
fi
;;
+
restart)
$0 stop
- sleep 1
+ sleep 3
$0 start
;;
+
+ status)
+ stat_busy "Checking $daemon_name status";
+ ck_status $daemon_name
+ ;;
+
*)
- echo "usage: $0 {start|stop|restart}"
+ echo "usage: $0 {start|stop|restart|status}"
esac
+
exit 0
diff --git a/extra/cups/cups.install b/extra/cups/cups.install
index e92e17ed3..c4307912b 100644
--- a/extra/cups/cups.install
+++ b/extra/cups/cups.install
@@ -1,5 +1,7 @@
post_install() {
- xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+ if [ -x usr/bin/xdg-icon-resource ]; then
+ xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+ fi
echo ">> If you use an HTTPS connection to CUPS, the first time you access"
echo ">> the interface it may take a very long time before the site comes up."
echo ">> This is because the first request triggers the generation of the CUPS"
@@ -7,9 +9,13 @@ post_install() {
}
post_upgrade() {
- xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+ if [ -x usr/bin/xdg-icon-resource ]; then
+ xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+ fi
}
post_remove() {
- xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+ if [ -x usr/bin/xdg-icon-resource ]; then
+ xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+ fi
}
diff --git a/extra/dotconf/PKGBUILD b/extra/dotconf/PKGBUILD
index f8c0b9061..c33a2d0e5 100644
--- a/extra/dotconf/PKGBUILD
+++ b/extra/dotconf/PKGBUILD
@@ -1,38 +1,28 @@
-# $Id$
+# $Id: PKGBUILD 127711 2011-06-17 18:24:49Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Chris Brannon <cmbrannon@cox.net>
pkgname=dotconf
pkgver=1.3
-pkgrel=1
+pkgrel=2
pkgdesc='A C library for parsing configuration files'
-url="http://www.opentts.org/projects/dotconf/"
-arch=('i686' 'x86_64' 'mips64el')
+url="https://github.com/williamh/dotconf"
+arch=('i686' 'x86_64')
depends=('glibc')
makedepends=('pkgconfig' 'findutils')
license=('LGPL2.1')
-source=("http://files.opentts.org/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('35c19ec9b96648f53e987e47e52dbc4c')
+source=(${pkgname}-${pkgver}.tar.gz::"https://github.com/williamh/${pkgname}/tarball/v${pkgver}")
+md5sums=('36bfdde245072fc2f4f5766b7db97c45')
options=('!libtool')
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd "${srcdir}"/williamh-${pkgname}-4cd7b3a
+ autoreconf -i
./configure --prefix=/usr
make
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd "${srcdir}"/williamh-${pkgname}-4cd7b3a
make DESTDIR="${pkgdir}" install
-
- # There are no manpages. Docu consists of textfiles and small examples.
- # "make install" didn't install the docu, so do it manually.
- install -d ${pkgdir}/usr/share/doc/${pkgname}
- cp -a doc/*.txt README examples/ ${pkgdir}/usr/share/doc/${pkgname}
- # Get rid of files specific to Microsoft products:
- find ${pkgdir}/usr/share/doc/${pkgname} -name '*.dsp' | xargs rm -f
-
- # Dotconf uses libpool internally for memory management. No need to install.
- rm -f ${pkgdir}/usr/lib/libpool.a
- rm -f ${pkgdir}/usr/include/libpool.h
}
diff --git a/extra/fbida/ChangeLog b/extra/fbida/ChangeLog
deleted file mode 100644
index 7e67308c0..000000000
--- a/extra/fbida/ChangeLog
+++ /dev/null
@@ -1,21 +0,0 @@
-2010-03-02 Eric Belanger <eric@archlinux.org>
-
- * fbida 2.07-5
- * Fixed exiftran (close FS#18302)
- * Removed backup array
-
-2010-01-17 Eric Belanger <eric@archlinux.org>
-
- * fbida 2.07-4
- * Rebuilt for libpng 1.4 and libjpeg 8
-
-2009-08-10 Eric Belanger <eric@archlinux.org>
-
- * fbida 2.07-3
- * Fixed compatibility problem with libjpeg 7 (close FS#15875)
-
-2009-07-01 Eric Belanger <eric@archlinux.org>
-
- * fbida 2.07-2
- * Rebuild against libjpeg 7
- * Added ChangeLog
diff --git a/extra/fbida/PKGBUILD b/extra/fbida/PKGBUILD
index 06f3d750b..b6081ed88 100644
--- a/extra/fbida/PKGBUILD
+++ b/extra/fbida/PKGBUILD
@@ -1,42 +1,27 @@
-# $Id: PKGBUILD 70970 2010-03-02 20:48:52Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: damir <damir@archlinux.org>
+# $Id: PKGBUILD 127739 2011-06-18 00:11:19Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
pkgname=fbida
-pkgver=2.07
-pkgrel=5
+pkgver=2.08
+pkgrel=1
pkgdesc="Few applications to display and elementary edit images: fbi, fbgs, ida, exiftran"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://linux.bytesex.org/fbida/"
+arch=('i686' 'x86_64')
+url="http://www.kraxel.org/blog/linux/fbida/"
license=('GPL2')
-depends=('giflib' 'libtiff' 'libjpeg' 'libexif' 'lesstif' 'libxpm' 'libpng' 'libx11' 'libxext' 'fontconfig')
+depends=('giflib' 'libtiff' 'libexif' 'lesstif' 'libpng' 'fontconfig')
+makedepends=('libxpm')
optdepends=('ghostscript: to use fbgs')
-replaces=('fbi')
-provides=('fbi')
-source=(http://dl.bytesex.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz libpng-1.4.patch \
- transupp.h transupp.c jinclude.h)
-md5sums=('3e05910fb7c1d9b2bd3e272d96db069c' '31b5a5318c16808d55403e06110ff5a5'\
- '785d928f4ff04e06bd2c8acc6b6c5e7b' 'f2d6f905c4ce6098f6c1af77a0a4eef8'\
- 'dbde79bc104a2caa9316cc2a9df7fd25')
-sha1sums=('4758178299e09d5251b9cf20337a81cc20553d45' 'dcb39c82e7e6f4d7d6e8d0e95c661f83a2655c7f'\
- '5028318704fbc8f476f858d24b39cf454a16fe85' '0d9f58703d2eb4ce2d11f42a1ad01d958efe3312'\
- '31ab682733b096b3a98c0a35f9b54a7936e480d5')
+source=(http://www.kraxel.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+md5sums=('9b3693ab26a58194e36b479bffb61ed0')
+sha1sums=('597e0953c68112bf7c363b1ccaa94e72100b116a')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- patch -p1 < ../libpng-1.4.patch || return 1
-
-# Using source code from libjpeg 8a
- rm jpeg/*
- cp ${srcdir}/transupp.h jpeg/
- cp ${srcdir}/transupp.c jpeg/
- cp ${srcdir}/jinclude.h jpeg/
-
- make Make.config || return 1
- for config in HAVE_LIB{SANE,CURL,LIRC}; do
- sed -i "s/$config.*/$config := no/" Make.config || return 1
- done
- make CC=gcc || return 1
- make DESTDIR="${pkgdir}" prefix=/usr install || return 1
+ sed -i 's/ungif/gif/' GNUmakefile
+ make
}
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" prefix=/usr install
+}
diff --git a/extra/fbida/jinclude.h b/extra/fbida/jinclude.h
deleted file mode 100644
index 0a4f15146..000000000
--- a/extra/fbida/jinclude.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * jinclude.h
- *
- * Copyright (C) 1991-1994, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file exists to provide a single place to fix any problems with
- * including the wrong system include files. (Common problems are taken
- * care of by the standard jconfig symbols, but on really weird systems
- * you may have to edit this file.)
- *
- * NOTE: this file is NOT intended to be included by applications using the
- * JPEG library. Most applications need only include jpeglib.h.
- */
-
-
-/* Include auto-config file to find out which system include files we need. */
-
-#include "jconfig.h" /* auto configuration options */
-#define JCONFIG_INCLUDED /* so that jpeglib.h doesn't do it again */
-
-/*
- * We need the NULL macro and size_t typedef.
- * On an ANSI-conforming system it is sufficient to include <stddef.h>.
- * Otherwise, we get them from <stdlib.h> or <stdio.h>; we may have to
- * pull in <sys/types.h> as well.
- * Note that the core JPEG library does not require <stdio.h>;
- * only the default error handler and data source/destination modules do.
- * But we must pull it in because of the references to FILE in jpeglib.h.
- * You can remove those references if you want to compile without <stdio.h>.
- */
-
-#ifdef HAVE_STDDEF_H
-#include <stddef.h>
-#endif
-
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-
-#ifdef NEED_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-
-#include <stdio.h>
-
-/*
- * We need memory copying and zeroing functions, plus strncpy().
- * ANSI and System V implementations declare these in <string.h>.
- * BSD doesn't have the mem() functions, but it does have bcopy()/bzero().
- * Some systems may declare memset and memcpy in <memory.h>.
- *
- * NOTE: we assume the size parameters to these functions are of type size_t.
- * Change the casts in these macros if not!
- */
-
-#ifdef NEED_BSD_STRINGS
-
-#include <strings.h>
-#define MEMZERO(target,size) bzero((void *)(target), (size_t)(size))
-#define MEMCOPY(dest,src,size) bcopy((const void *)(src), (void *)(dest), (size_t)(size))
-
-#else /* not BSD, assume ANSI/SysV string lib */
-
-#include <string.h>
-#define MEMZERO(target,size) memset((void *)(target), 0, (size_t)(size))
-#define MEMCOPY(dest,src,size) memcpy((void *)(dest), (const void *)(src), (size_t)(size))
-
-#endif
-
-/*
- * In ANSI C, and indeed any rational implementation, size_t is also the
- * type returned by sizeof(). However, it seems there are some irrational
- * implementations out there, in which sizeof() returns an int even though
- * size_t is defined as long or unsigned long. To ensure consistent results
- * we always use this SIZEOF() macro in place of using sizeof() directly.
- */
-
-#define SIZEOF(object) ((size_t) sizeof(object))
-
-/*
- * The modules that use fread() and fwrite() always invoke them through
- * these macros. On some systems you may need to twiddle the argument casts.
- * CAUTION: argument order is different from underlying functions!
- */
-
-#define JFREAD(file,buf,sizeofbuf) \
- ((size_t) fread((void *) (buf), (size_t) 1, (size_t) (sizeofbuf), (file)))
-#define JFWRITE(file,buf,sizeofbuf) \
- ((size_t) fwrite((const void *) (buf), (size_t) 1, (size_t) (sizeofbuf), (file)))
diff --git a/extra/fbida/libpng-1.4.patch b/extra/fbida/libpng-1.4.patch
deleted file mode 100644
index f8a80d4b2..000000000
--- a/extra/fbida/libpng-1.4.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Naur fbida-2.07-orig/rd/read-png.c fbida-2.07/rd/read-png.c
---- fbida-2.07-orig/rd/read-png.c 2010-01-18 00:02:02.000000000 -0500
-+++ fbida-2.07/rd/read-png.c 2010-01-18 00:06:09.000000000 -0500
-@@ -69,8 +69,11 @@
- if (h->color_type == PNG_COLOR_TYPE_PALETTE)
- png_set_palette_to_rgb(h->png);
- if (h->color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
-- png_set_gray_1_2_4_to_8(h->png);
--
-+#if PNG_LIBPNG_VER < 10400
-+ png_set_gray_1_2_4_to_8(h->png);
-+#else
-+ png_set_expand_gray_1_2_4_to_8(h->png);
-+#endif
- if (png_get_bKGD(h->png, h->info, &file_bg)) {
- png_set_background(h->png,file_bg,PNG_BACKGROUND_GAMMA_FILE,1,1.0);
- } else {
diff --git a/extra/fbida/transupp.c b/extra/fbida/transupp.c
deleted file mode 100644
index 406054482..000000000
--- a/extra/fbida/transupp.c
+++ /dev/null
@@ -1,1583 +0,0 @@
-/*
- * transupp.c
- *
- * Copyright (C) 1997-2009, Thomas G. Lane, Guido Vollbeding.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains image transformation routines and other utility code
- * used by the jpegtran sample application. These are NOT part of the core
- * JPEG library. But we keep these routines separate from jpegtran.c to
- * ease the task of maintaining jpegtran-like programs that have other user
- * interfaces.
- */
-
-/* Although this file really shouldn't have access to the library internals,
- * it's helpful to let it call jround_up() and jcopy_block_row().
- */
-#define JPEG_INTERNALS
-
-#include "jinclude.h"
-#include "jpeglib.h"
-#include "transupp.h" /* My own external interface */
-#include <ctype.h> /* to declare isdigit() */
-
-
-#if TRANSFORMS_SUPPORTED
-
-/*
- * Lossless image transformation routines. These routines work on DCT
- * coefficient arrays and thus do not require any lossy decompression
- * or recompression of the image.
- * Thanks to Guido Vollbeding for the initial design and code of this feature,
- * and to Ben Jackson for introducing the cropping feature.
- *
- * Horizontal flipping is done in-place, using a single top-to-bottom
- * pass through the virtual source array. It will thus be much the
- * fastest option for images larger than main memory.
- *
- * The other routines require a set of destination virtual arrays, so they
- * need twice as much memory as jpegtran normally does. The destination
- * arrays are always written in normal scan order (top to bottom) because
- * the virtual array manager expects this. The source arrays will be scanned
- * in the corresponding order, which means multiple passes through the source
- * arrays for most of the transforms. That could result in much thrashing
- * if the image is larger than main memory.
- *
- * If cropping or trimming is involved, the destination arrays may be smaller
- * than the source arrays. Note it is not possible to do horizontal flip
- * in-place when a nonzero Y crop offset is specified, since we'd have to move
- * data from one block row to another but the virtual array manager doesn't
- * guarantee we can touch more than one row at a time. So in that case,
- * we have to use a separate destination array.
- *
- * Some notes about the operating environment of the individual transform
- * routines:
- * 1. Both the source and destination virtual arrays are allocated from the
- * source JPEG object, and therefore should be manipulated by calling the
- * source's memory manager.
- * 2. The destination's component count should be used. It may be smaller
- * than the source's when forcing to grayscale.
- * 3. Likewise the destination's sampling factors should be used. When
- * forcing to grayscale the destination's sampling factors will be all 1,
- * and we may as well take that as the effective iMCU size.
- * 4. When "trim" is in effect, the destination's dimensions will be the
- * trimmed values but the source's will be untrimmed.
- * 5. When "crop" is in effect, the destination's dimensions will be the
- * cropped values but the source's will be uncropped. Each transform
- * routine is responsible for picking up source data starting at the
- * correct X and Y offset for the crop region. (The X and Y offsets
- * passed to the transform routines are measured in iMCU blocks of the
- * destination.)
- * 6. All the routines assume that the source and destination buffers are
- * padded out to a full iMCU boundary. This is true, although for the
- * source buffer it is an undocumented property of jdcoefct.c.
- */
-
-
-LOCAL(void)
-do_crop (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
- JDIMENSION x_crop_offset, JDIMENSION y_crop_offset,
- jvirt_barray_ptr *src_coef_arrays,
- jvirt_barray_ptr *dst_coef_arrays)
-/* Crop. This is only used when no rotate/flip is requested with the crop. */
-{
- JDIMENSION dst_blk_y, x_crop_blocks, y_crop_blocks;
- int ci, offset_y;
- JBLOCKARRAY src_buffer, dst_buffer;
- jpeg_component_info *compptr;
-
- /* We simply have to copy the right amount of data (the destination's
- * image size) starting at the given X and Y offsets in the source.
- */
- for (ci = 0; ci < dstinfo->num_components; ci++) {
- compptr = dstinfo->comp_info + ci;
- x_crop_blocks = x_crop_offset * compptr->h_samp_factor;
- y_crop_blocks = y_crop_offset * compptr->v_samp_factor;
- for (dst_blk_y = 0; dst_blk_y < compptr->height_in_blocks;
- dst_blk_y += compptr->v_samp_factor) {
- dst_buffer = (*srcinfo->mem->access_virt_barray)
- ((j_common_ptr) srcinfo, dst_coef_arrays[ci], dst_blk_y,
- (JDIMENSION) compptr->v_samp_factor, TRUE);
- src_buffer = (*srcinfo->mem->access_virt_barray)
- ((j_common_ptr) srcinfo, src_coef_arrays[ci],
- dst_blk_y + y_crop_blocks,
- (JDIMENSION) compptr->v_samp_factor, FALSE);
- for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) {
- jcopy_block_row(src_buffer[offset_y] + x_crop_blocks,
- dst_buffer[offset_y],
- compptr->width_in_blocks);
- }
- }
- }
-}
-
-
-LOCAL(void)
-do_flip_h_no_crop (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
- JDIMENSION x_crop_offset,
- jvirt_barray_ptr *src_coef_arrays)
-/* Horizontal flip; done in-place, so no separate dest array is required.
- * NB: this only works when y_crop_offset is zero.
- */
-{
- JDIMENSION MCU_cols, comp_width, blk_x, blk_y, x_crop_blocks;
- int ci, k, offset_y;
- JBLOCKARRAY buffer;
- JCOEFPTR ptr1, ptr2;
- JCOEF temp1, temp2;
- jpeg_component_info *compptr;
-
- /* Horizontal mirroring of DCT blocks is accomplished by swapping
- * pairs of blocks in-place. Within a DCT block, we perform horizontal
- * mirroring by changing the signs of odd-numbered columns.
- * Partial iMCUs at the right edge are left untouched.
- */
- MCU_cols = srcinfo->output_width /
- (dstinfo->max_h_samp_factor * dstinfo->min_DCT_h_scaled_size);
-
- for (ci = 0; ci < dstinfo->num_components; ci++) {
- compptr = dstinfo->comp_info + ci;
- comp_width = MCU_cols * compptr->h_samp_factor;
- x_crop_blocks = x_crop_offset * compptr->h_samp_factor;
- for (blk_y = 0; blk_y < compptr->height_in_blocks;
- blk_y += compptr->v_samp_factor) {
- buffer = (*srcinfo->mem->access_virt_barray)
- ((j_common_ptr) srcinfo, src_coef_arrays[ci], blk_y,
- (JDIMENSION) compptr->v_samp_factor, TRUE);
- for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) {
- /* Do the mirroring */
- for (blk_x = 0; blk_x * 2 < comp_width; blk_x++) {
- ptr1 = buffer[offset_y][blk_x];
- ptr2 = buffer[offset_y][comp_width - blk_x - 1];
- /* this unrolled loop doesn't need to know which row it's on... */
- for (k = 0; k < DCTSIZE2; k += 2) {
- temp1 = *ptr1; /* swap even column */
- temp2 = *ptr2;
- *ptr1++ = temp2;
- *ptr2++ = temp1;
- temp1 = *ptr1; /* swap odd column with sign change */
- temp2 = *ptr2;
- *ptr1++ = -temp2;
- *ptr2++ = -temp1;
- }
- }
- if (x_crop_blocks > 0) {
- /* Now left-justify the portion of the data to be kept.
- * We can't use a single jcopy_block_row() call because that routine
- * depends on memcpy(), whose behavior is unspecified for overlapping
- * source and destination areas. Sigh.
- */
- for (blk_x = 0; blk_x < compptr->width_in_blocks; blk_x++) {
- jcopy_block_row(buffer[offset_y] + blk_x + x_crop_blocks,
- buffer[offset_y] + blk_x,
- (JDIMENSION) 1);
- }
- }
- }
- }
- }
-}
-
-
-LOCAL(void)
-do_flip_h (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
- JDIMENSION x_crop_offset, JDIMENSION y_crop_offset,
- jvirt_barray_ptr *src_coef_arrays,
- jvirt_barray_ptr *dst_coef_arrays)
-/* Horizontal flip in general cropping case */
-{
- JDIMENSION MCU_cols, comp_width, dst_blk_x, dst_blk_y;
- JDIMENSION x_crop_blocks, y_crop_blocks;
- int ci, k, offset_y;
- JBLOCKARRAY src_buffer, dst_buffer;
- JBLOCKROW src_row_ptr, dst_row_ptr;
- JCOEFPTR src_ptr, dst_ptr;
- jpeg_component_info *compptr;
-
- /* Here we must output into a separate array because we can't touch
- * different rows of a single virtual array simultaneously. Otherwise,
- * this is essentially the same as the routine above.
- */
- MCU_cols = srcinfo->output_width /
- (dstinfo->max_h_samp_factor * dstinfo->min_DCT_h_scaled_size);
-
- for (ci = 0; ci < dstinfo->num_components; ci++) {
- compptr = dstinfo->comp_info + ci;
- comp_width = MCU_cols * compptr->h_samp_factor;
- x_crop_blocks = x_crop_offset * compptr->h_samp_factor;
- y_crop_blocks = y_crop_offset * compptr->v_samp_factor;
- for (dst_blk_y = 0; dst_blk_y < compptr->height_in_blocks;
- dst_blk_y += compptr->v_samp_factor) {
- dst_buffer = (*srcinfo->mem->access_virt_barray)
- ((j_common_ptr) srcinfo, dst_coef_arrays[ci], dst_blk_y,
- (JDIMENSION) compptr->v_samp_factor, TRUE);
- src_buffer = (*srcinfo->mem->access_virt_barray)
- ((j_common_ptr) srcinfo, src_coef_arrays[ci],
- dst_blk_y + y_crop_blocks,
- (JDIMENSION) compptr->v_samp_factor, FALSE);
- for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) {
- dst_row_ptr = dst_buffer[offset_y];
- src_row_ptr = src_buffer[offset_y];
- for (dst_blk_x = 0; dst_blk_x < compptr->width_in_blocks; dst_blk_x++) {
- if (x_crop_blocks + dst_blk_x < comp_width) {
- /* Do the mirrorable blocks */
- dst_ptr = dst_row_ptr[dst_blk_x];
- src_ptr = src_row_ptr[comp_width - x_crop_blocks - dst_blk_x - 1];
- /* this unrolled loop doesn't need to know which row it's on... */
- for (k = 0; k < DCTSIZE2; k += 2) {
- *dst_ptr++ = *src_ptr++; /* copy even column */
- *dst_ptr++ = - *src_ptr++; /* copy odd column with sign change */
- }
- } else {
- /* Copy last partial block(s) verbatim */
- jcopy_block_row(src_row_ptr + dst_blk_x + x_crop_blocks,
- dst_row_ptr + dst_blk_x,
- (JDIMENSION) 1);
- }
- }
- }
- }
- }
-}
-
-
-LOCAL(void)
-do_flip_v (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
- JDIMENSION x_crop_offset, JDIMENSION y_crop_offset,
- jvirt_barray_ptr *src_coef_arrays,
- jvirt_barray_ptr *dst_coef_arrays)
-/* Vertical flip */
-{
- JDIMENSION MCU_rows, comp_height, dst_blk_x, dst_blk_y;
- JDIMENSION x_crop_blocks, y_crop_blocks;
- int ci, i, j, offset_y;
- JBLOCKARRAY src_buffer, dst_buffer;
- JBLOCKROW src_row_ptr, dst_row_ptr;
- JCOEFPTR src_ptr, dst_ptr;
- jpeg_component_info *compptr;
-
- /* We output into a separate array because we can't touch different
- * rows of the source virtual array simultaneously. Otherwise, this
- * is a pretty straightforward analog of horizontal flip.
- * Within a DCT block, vertical mirroring is done by changing the signs
- * of odd-numbered rows.
- * Partial iMCUs at the bottom edge are copied verbatim.
- */
- MCU_rows = srcinfo->output_height /
- (dstinfo->max_v_samp_factor * dstinfo->min_DCT_v_scaled_size);
-
- for (ci = 0; ci < dstinfo->num_components; ci++) {
- compptr = dstinfo->comp_info + ci;
- comp_height = MCU_rows * compptr->v_samp_factor;
- x_crop_blocks = x_crop_offset * compptr->h_samp_factor;
- y_crop_blocks = y_crop_offset * compptr->v_samp_factor;
- for (dst_blk_y = 0; dst_blk_y < compptr->height_in_blocks;
- dst_blk_y += compptr->v_samp_factor) {
- dst_buffer = (*srcinfo->mem->access_virt_barray)
- ((j_common_ptr) srcinfo, dst_coef_arrays[ci], dst_blk_y,
- (JDIMENSION) compptr->v_samp_factor, TRUE);
- if (y_crop_blocks + dst_blk_y < comp_height) {
- /* Row is within the mirrorable area. */
- src_buffer = (*srcinfo->mem->access_virt_barray)
- ((j_common_ptr) srcinfo, src_coef_arrays[ci],
- comp_height - y_crop_blocks - dst_blk_y -
- (JDIMENSION) compptr->v_samp_factor,
- (JDIMENSION) compptr->v_samp_factor, FALSE);
- } else {
- /* Bottom-edge blocks will be copied verbatim. */
- src_buffer = (*srcinfo->mem->access_virt_barray)
- ((j_common_ptr) srcinfo, src_coef_arrays[ci],
- dst_blk_y + y_crop_blocks,
- (JDIMENSION) compptr->v_samp_factor, FALSE);
- }
- for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) {
- if (y_crop_blocks + dst_blk_y < comp_height) {
- /* Row is within the mirrorable area. */
- dst_row_ptr = dst_buffer[offset_y];
- src_row_ptr = src_buffer[compptr->v_samp_factor - offset_y - 1];
- src_row_ptr += x_crop_blocks;
- for (dst_blk_x = 0; dst_blk_x < compptr->width_in_blocks;
- dst_blk_x++) {
- dst_ptr = dst_row_ptr[dst_blk_x];
- src_ptr = src_row_ptr[dst_blk_x];
- for (i = 0; i < DCTSIZE; i += 2) {
- /* copy even row */
- for (j = 0; j < DCTSIZE; j++)
- *dst_ptr++ = *src_ptr++;
- /* copy odd row with sign change */
- for (j = 0; j < DCTSIZE; j++)
- *dst_ptr++ = - *src_ptr++;
- }
- }
- } else {
- /* Just copy row verbatim. */
- jcopy_block_row(src_buffer[offset_y] + x_crop_blocks,
- dst_buffer[offset_y],
- compptr->width_in_blocks);
- }
- }
- }
- }
-}
-
-
-LOCAL(void)
-do_transpose (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
- JDIMENSION x_crop_offset, JDIMENSION y_crop_offset,
- jvirt_barray_ptr *src_coef_arrays,
- jvirt_barray_ptr *dst_coef_arrays)
-/* Transpose source into destination */
-{
- JDIMENSION dst_blk_x, dst_blk_y, x_crop_blocks, y_crop_blocks;
- int ci, i, j, offset_x, offset_y;
- JBLOCKARRAY src_buffer, dst_buffer;
- JCOEFPTR src_ptr, dst_ptr;
- jpeg_component_info *compptr;
-
- /* Transposing pixels within a block just requires transposing the
- * DCT coefficients.
- * Partial iMCUs at the edges require no special treatment; we simply
- * process all the available DCT blocks for every component.
- */
- for (ci = 0; ci < dstinfo->num_components; ci++) {
- compptr = dstinfo->comp_info + ci;
- x_crop_blocks = x_crop_offset * compptr->h_samp_factor;
- y_crop_blocks = y_crop_offset * compptr->v_samp_factor;
- for (dst_blk_y = 0; dst_blk_y < compptr->height_in_blocks;
- dst_blk_y += compptr->v_samp_factor) {
- dst_buffer = (*srcinfo->mem->access_virt_barray)
- ((j_common_ptr) srcinfo, dst_coef_arrays[ci], dst_blk_y,
- (JDIMENSION) compptr->v_samp_factor, TRUE);
- for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) {
- for (dst_blk_x = 0; dst_blk_x < compptr->width_in_blocks;
- dst_blk_x += compptr->h_samp_factor) {
- src_buffer = (*srcinfo->mem->access_virt_barray)
- ((j_common_ptr) srcinfo, src_coef_arrays[ci],
- dst_blk_x + x_crop_blocks,
- (JDIMENSION) compptr->h_samp_factor, FALSE);
- for (offset_x = 0; offset_x < compptr->h_samp_factor; offset_x++) {
- dst_ptr = dst_buffer[offset_y][dst_blk_x + offset_x];
- src_ptr = src_buffer[offset_x][dst_blk_y + offset_y + y_crop_blocks];
- for (i = 0; i < DCTSIZE; i++)
- for (j = 0; j < DCTSIZE; j++)
- dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j];
- }
- }
- }
- }
- }
-}
-
-
-LOCAL(void)
-do_rot_90 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
- JDIMENSION x_crop_offset, JDIMENSION y_crop_offset,
- jvirt_barray_ptr *src_coef_arrays,
- jvirt_barray_ptr *dst_coef_arrays)
-/* 90 degree rotation is equivalent to
- * 1. Transposing the image;
- * 2. Horizontal mirroring.
- * These two steps are merged into a single processing routine.
- */
-{
- JDIMENSION MCU_cols, comp_width, dst_blk_x, dst_blk_y;
- JDIMENSION x_crop_blocks, y_crop_blocks;
- int ci, i, j, offset_x, offset_y;
- JBLOCKARRAY src_buffer, dst_buffer;
- JCOEFPTR src_ptr, dst_ptr;
- jpeg_component_info *compptr;
-
- /* Because of the horizontal mirror step, we can't process partial iMCUs
- * at the (output) right edge properly. They just get transposed and
- * not mirrored.
- */
- MCU_cols = srcinfo->output_height /
- (dstinfo->max_h_samp_factor * dstinfo->min_DCT_h_scaled_size);
-
- for (ci = 0; ci < dstinfo->num_components; ci++) {
- compptr = dstinfo->comp_info + ci;
- comp_width = MCU_cols * compptr->h_samp_factor;
- x_crop_blocks = x_crop_offset * compptr->h_samp_factor;
- y_crop_blocks = y_crop_offset * compptr->v_samp_factor;
- for (dst_blk_y = 0; dst_blk_y < compptr->height_in_blocks;
- dst_blk_y += compptr->v_samp_factor) {
- dst_buffer = (*srcinfo->mem->access_virt_barray)
- ((j_common_ptr) srcinfo, dst_coef_arrays[ci], dst_blk_y,
- (JDIMENSION) compptr->v_samp_factor, TRUE);
- for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) {
- for (dst_blk_x = 0; dst_blk_x < compptr->width_in_blocks;
- dst_blk_x += compptr->h_samp_factor) {
- if (x_crop_blocks + dst_blk_x < comp_width) {
- /* Block is within the mirrorable area. */
- src_buffer = (*srcinfo->mem->access_virt_barray)
- ((j_common_ptr) srcinfo, src_coef_arrays[ci],
- comp_width - x_crop_blocks - dst_blk_x -
- (JDIMENSION) compptr->h_samp_factor,
- (JDIMENSION) compptr->h_samp_factor, FALSE);
- } else {
- /* Edge blocks are transposed but not mirrored. */
- src_buffer = (*srcinfo->mem->access_virt_barray)
- ((j_common_ptr) srcinfo, src_coef_arrays[ci],
- dst_blk_x + x_crop_blocks,
- (JDIMENSION) compptr->h_samp_factor, FALSE);
- }
- for (offset_x = 0; offset_x < compptr->h_samp_factor; offset_x++) {
- dst_ptr = dst_buffer[offset_y][dst_blk_x + offset_x];
- if (x_crop_blocks + dst_blk_x < comp_width) {
- /* Block is within the mirrorable area. */
- src_ptr = src_buffer[compptr->h_samp_factor - offset_x - 1]
- [dst_blk_y + offset_y + y_crop_blocks];
- for (i = 0; i < DCTSIZE; i++) {
- for (j = 0; j < DCTSIZE; j++)
- dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j];
- i++;
- for (j = 0; j < DCTSIZE; j++)
- dst_ptr[j*DCTSIZE+i] = -src_ptr[i*DCTSIZE+j];
- }
- } else {
- /* Edge blocks are transposed but not mirrored. */
- src_ptr = src_buffer[offset_x]
- [dst_blk_y + offset_y + y_crop_blocks];
- for (i = 0; i < DCTSIZE; i++)
- for (j = 0; j < DCTSIZE; j++)
- dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j];
- }
- }
- }
- }
- }
- }
-}
-
-
-LOCAL(void)
-do_rot_270 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
- JDIMENSION x_crop_offset, JDIMENSION y_crop_offset,
- jvirt_barray_ptr *src_coef_arrays,
- jvirt_barray_ptr *dst_coef_arrays)
-/* 270 degree rotation is equivalent to
- * 1. Horizontal mirroring;
- * 2. Transposing the image.
- * These two steps are merged into a single processing routine.
- */
-{
- JDIMENSION MCU_rows, comp_height, dst_blk_x, dst_blk_y;
- JDIMENSION x_crop_blocks, y_crop_blocks;
- int ci, i, j, offset_x, offset_y;
- JBLOCKARRAY src_buffer, dst_buffer;
- JCOEFPTR src_ptr, dst_ptr;
- jpeg_component_info *compptr;
-
- /* Because of the horizontal mirror step, we can't process partial iMCUs
- * at the (output) bottom edge properly. They just get transposed and
- * not mirrored.
- */
- MCU_rows = srcinfo->output_width /
- (dstinfo->max_v_samp_factor * dstinfo->min_DCT_v_scaled_size);
-
- for (ci = 0; ci < dstinfo->num_components; ci++) {
- compptr = dstinfo->comp_info + ci;
- comp_height = MCU_rows * compptr->v_samp_factor;
- x_crop_blocks = x_crop_offset * compptr->h_samp_factor;
- y_crop_blocks = y_crop_offset * compptr->v_samp_factor;
- for (dst_blk_y = 0; dst_blk_y < compptr->height_in_blocks;
- dst_blk_y += compptr->v_samp_factor) {
- dst_buffer = (*srcinfo->mem->access_virt_barray)
- ((j_common_ptr) srcinfo, dst_coef_arrays[ci], dst_blk_y,
- (JDIMENSION) compptr->v_samp_factor, TRUE);
- for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) {
- for (dst_blk_x = 0; dst_blk_x < compptr->width_in_blocks;
- dst_blk_x += compptr->h_samp_factor) {
- src_buffer = (*srcinfo->mem->access_virt_barray)
- ((j_common_ptr) srcinfo, src_coef_arrays[ci],
- dst_blk_x + x_crop_blocks,
- (JDIMENSION) compptr->h_samp_factor, FALSE);
- for (offset_x = 0; offset_x < compptr->h_samp_factor; offset_x++) {
- dst_ptr = dst_buffer[offset_y][dst_blk_x + offset_x];
- if (y_crop_blocks + dst_blk_y < comp_height) {
- /* Block is within the mirrorable area. */
- src_ptr = src_buffer[offset_x]
- [comp_height - y_crop_blocks - dst_blk_y - offset_y - 1];
- for (i = 0; i < DCTSIZE; i++) {
- for (j = 0; j < DCTSIZE; j++) {
- dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j];
- j++;
- dst_ptr[j*DCTSIZE+i] = -src_ptr[i*DCTSIZE+j];
- }
- }
- } else {
- /* Edge blocks are transposed but not mirrored. */
- src_ptr = src_buffer[offset_x]
- [dst_blk_y + offset_y + y_crop_blocks];
- for (i = 0; i < DCTSIZE; i++)
- for (j = 0; j < DCTSIZE; j++)
- dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j];
- }
- }
- }
- }
- }
- }
-}
-
-
-LOCAL(void)
-do_rot_180 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
- JDIMENSION x_crop_offset, JDIMENSION y_crop_offset,
- jvirt_barray_ptr *src_coef_arrays,
- jvirt_barray_ptr *dst_coef_arrays)
-/* 180 degree rotation is equivalent to
- * 1. Vertical mirroring;
- * 2. Horizontal mirroring.
- * These two steps are merged into a single processing routine.
- */
-{
- JDIMENSION MCU_cols, MCU_rows, comp_width, comp_height, dst_blk_x, dst_blk_y;
- JDIMENSION x_crop_blocks, y_crop_blocks;
- int ci, i, j, offset_y;
- JBLOCKARRAY src_buffer, dst_buffer;
- JBLOCKROW src_row_ptr, dst_row_ptr;
- JCOEFPTR src_ptr, dst_ptr;
- jpeg_component_info *compptr;
-
- MCU_cols = srcinfo->output_width /
- (dstinfo->max_h_samp_factor * dstinfo->min_DCT_h_scaled_size);
- MCU_rows = srcinfo->output_height /
- (dstinfo->max_v_samp_factor * dstinfo->min_DCT_v_scaled_size);
-
- for (ci = 0; ci < dstinfo->num_components; ci++) {
- compptr = dstinfo->comp_info + ci;
- comp_width = MCU_cols * compptr->h_samp_factor;
- comp_height = MCU_rows * compptr->v_samp_factor;
- x_crop_blocks = x_crop_offset * compptr->h_samp_factor;
- y_crop_blocks = y_crop_offset * compptr->v_samp_factor;
- for (dst_blk_y = 0; dst_blk_y < compptr->height_in_blocks;
- dst_blk_y += compptr->v_samp_factor) {
- dst_buffer = (*srcinfo->mem->access_virt_barray)
- ((j_common_ptr) srcinfo, dst_coef_arrays[ci], dst_blk_y,
- (JDIMENSION) compptr->v_samp_factor, TRUE);
- if (y_crop_blocks + dst_blk_y < comp_height) {
- /* Row is within the vertically mirrorable area. */
- src_buffer = (*srcinfo->mem->access_virt_barray)
- ((j_common_ptr) srcinfo, src_coef_arrays[ci],
- comp_height - y_crop_blocks - dst_blk_y -
- (JDIMENSION) compptr->v_samp_factor,
- (JDIMENSION) compptr->v_samp_factor, FALSE);
- } else {
- /* Bottom-edge rows are only mirrored horizontally. */
- src_buffer = (*srcinfo->mem->access_virt_barray)
- ((j_common_ptr) srcinfo, src_coef_arrays[ci],
- dst_blk_y + y_crop_blocks,
- (JDIMENSION) compptr->v_samp_factor, FALSE);
- }
- for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) {
- dst_row_ptr = dst_buffer[offset_y];
- if (y_crop_blocks + dst_blk_y < comp_height) {
- /* Row is within the mirrorable area. */
- src_row_ptr = src_buffer[compptr->v_samp_factor - offset_y - 1];
- for (dst_blk_x = 0; dst_blk_x < compptr->width_in_blocks; dst_blk_x++) {
- dst_ptr = dst_row_ptr[dst_blk_x];
- if (x_crop_blocks + dst_blk_x < comp_width) {
- /* Process the blocks that can be mirrored both ways. */
- src_ptr = src_row_ptr[comp_width - x_crop_blocks - dst_blk_x - 1];
- for (i = 0; i < DCTSIZE; i += 2) {
- /* For even row, negate every odd column. */
- for (j = 0; j < DCTSIZE; j += 2) {
- *dst_ptr++ = *src_ptr++;
- *dst_ptr++ = - *src_ptr++;
- }
- /* For odd row, negate every even column. */
- for (j = 0; j < DCTSIZE; j += 2) {
- *dst_ptr++ = - *src_ptr++;
- *dst_ptr++ = *src_ptr++;
- }
- }
- } else {
- /* Any remaining right-edge blocks are only mirrored vertically. */
- src_ptr = src_row_ptr[x_crop_blocks + dst_blk_x];
- for (i = 0; i < DCTSIZE; i += 2) {
- for (j = 0; j < DCTSIZE; j++)
- *dst_ptr++ = *src_ptr++;
- for (j = 0; j < DCTSIZE; j++)
- *dst_ptr++ = - *src_ptr++;
- }
- }
- }
- } else {
- /* Remaining rows are just mirrored horizontally. */
- src_row_ptr = src_buffer[offset_y];
- for (dst_blk_x = 0; dst_blk_x < compptr->width_in_blocks; dst_blk_x++) {
- if (x_crop_blocks + dst_blk_x < comp_width) {
- /* Process the blocks that can be mirrored. */
- dst_ptr = dst_row_ptr[dst_blk_x];
- src_ptr = src_row_ptr[comp_width - x_crop_blocks - dst_blk_x - 1];
- for (i = 0; i < DCTSIZE2; i += 2) {
- *dst_ptr++ = *src_ptr++;
- *dst_ptr++ = - *src_ptr++;
- }
- } else {
- /* Any remaining right-edge blocks are only copied. */
- jcopy_block_row(src_row_ptr + dst_blk_x + x_crop_blocks,
- dst_row_ptr + dst_blk_x,
- (JDIMENSION) 1);
- }
- }
- }
- }
- }
- }
-}
-
-
-LOCAL(void)
-do_transverse (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
- JDIMENSION x_crop_offset, JDIMENSION y_crop_offset,
- jvirt_barray_ptr *src_coef_arrays,
- jvirt_barray_ptr *dst_coef_arrays)
-/* Transverse transpose is equivalent to
- * 1. 180 degree rotation;
- * 2. Transposition;
- * or
- * 1. Horizontal mirroring;
- * 2. Transposition;
- * 3. Horizontal mirroring.
- * These steps are merged into a single processing routine.
- */
-{
- JDIMENSION MCU_cols, MCU_rows, comp_width, comp_height, dst_blk_x, dst_blk_y;
- JDIMENSION x_crop_blocks, y_crop_blocks;
- int ci, i, j, offset_x, offset_y;
- JBLOCKARRAY src_buffer, dst_buffer;
- JCOEFPTR src_ptr, dst_ptr;
- jpeg_component_info *compptr;
-
- MCU_cols = srcinfo->output_height /
- (dstinfo->max_h_samp_factor * dstinfo->min_DCT_h_scaled_size);
- MCU_rows = srcinfo->output_width /
- (dstinfo->max_v_samp_factor * dstinfo->min_DCT_v_scaled_size);
-
- for (ci = 0; ci < dstinfo->num_components; ci++) {
- compptr = dstinfo->comp_info + ci;
- comp_width = MCU_cols * compptr->h_samp_factor;
- comp_height = MCU_rows * compptr->v_samp_factor;
- x_crop_blocks = x_crop_offset * compptr->h_samp_factor;
- y_crop_blocks = y_crop_offset * compptr->v_samp_factor;
- for (dst_blk_y = 0; dst_blk_y < compptr->height_in_blocks;
- dst_blk_y += compptr->v_samp_factor) {
- dst_buffer = (*srcinfo->mem->access_virt_barray)
- ((j_common_ptr) srcinfo, dst_coef_arrays[ci], dst_blk_y,
- (JDIMENSION) compptr->v_samp_factor, TRUE);
- for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) {
- for (dst_blk_x = 0; dst_blk_x < compptr->width_in_blocks;
- dst_blk_x += compptr->h_samp_factor) {
- if (x_crop_blocks + dst_blk_x < comp_width) {
- /* Block is within the mirrorable area. */
- src_buffer = (*srcinfo->mem->access_virt_barray)
- ((j_common_ptr) srcinfo, src_coef_arrays[ci],
- comp_width - x_crop_blocks - dst_blk_x -
- (JDIMENSION) compptr->h_samp_factor,
- (JDIMENSION) compptr->h_samp_factor, FALSE);
- } else {
- src_buffer = (*srcinfo->mem->access_virt_barray)
- ((j_common_ptr) srcinfo, src_coef_arrays[ci],
- dst_blk_x + x_crop_blocks,
- (JDIMENSION) compptr->h_samp_factor, FALSE);
- }
- for (offset_x = 0; offset_x < compptr->h_samp_factor; offset_x++) {
- dst_ptr = dst_buffer[offset_y][dst_blk_x + offset_x];
- if (y_crop_blocks + dst_blk_y < comp_height) {
- if (x_crop_blocks + dst_blk_x < comp_width) {
- /* Block is within the mirrorable area. */
- src_ptr = src_buffer[compptr->h_samp_factor - offset_x - 1]
- [comp_height - y_crop_blocks - dst_blk_y - offset_y - 1];
- for (i = 0; i < DCTSIZE; i++) {
- for (j = 0; j < DCTSIZE; j++) {
- dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j];
- j++;
- dst_ptr[j*DCTSIZE+i] = -src_ptr[i*DCTSIZE+j];
- }
- i++;
- for (j = 0; j < DCTSIZE; j++) {
- dst_ptr[j*DCTSIZE+i] = -src_ptr[i*DCTSIZE+j];
- j++;
- dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j];
- }
- }
- } else {
- /* Right-edge blocks are mirrored in y only */
- src_ptr = src_buffer[offset_x]
- [comp_height - y_crop_blocks - dst_blk_y - offset_y - 1];
- for (i = 0; i < DCTSIZE; i++) {
- for (j = 0; j < DCTSIZE; j++) {
- dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j];
- j++;
- dst_ptr[j*DCTSIZE+i] = -src_ptr[i*DCTSIZE+j];
- }
- }
- }
- } else {
- if (x_crop_blocks + dst_blk_x < comp_width) {
- /* Bottom-edge blocks are mirrored in x only */
- src_ptr = src_buffer[compptr->h_samp_factor - offset_x - 1]
- [dst_blk_y + offset_y + y_crop_blocks];
- for (i = 0; i < DCTSIZE; i++) {
- for (j = 0; j < DCTSIZE; j++)
- dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j];
- i++;
- for (j = 0; j < DCTSIZE; j++)
- dst_ptr[j*DCTSIZE+i] = -src_ptr[i*DCTSIZE+j];
- }
- } else {
- /* At lower right corner, just transpose, no mirroring */
- src_ptr = src_buffer[offset_x]
- [dst_blk_y + offset_y + y_crop_blocks];
- for (i = 0; i < DCTSIZE; i++)
- for (j = 0; j < DCTSIZE; j++)
- dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j];
- }
- }
- }
- }
- }
- }
- }
-}
-
-
-/* Parse an unsigned integer: subroutine for jtransform_parse_crop_spec.
- * Returns TRUE if valid integer found, FALSE if not.
- * *strptr is advanced over the digit string, and *result is set to its value.
- */
-
-LOCAL(boolean)
-jt_read_integer (const char ** strptr, JDIMENSION * result)
-{
- const char * ptr = *strptr;
- JDIMENSION val = 0;
-
- for (; isdigit(*ptr); ptr++) {
- val = val * 10 + (JDIMENSION) (*ptr - '0');
- }
- *result = val;
- if (ptr == *strptr)
- return FALSE; /* oops, no digits */
- *strptr = ptr;
- return TRUE;
-}
-
-
-/* Parse a crop specification (written in X11 geometry style).
- * The routine returns TRUE if the spec string is valid, FALSE if not.
- *
- * The crop spec string should have the format
- * <width>x<height>{+-}<xoffset>{+-}<yoffset>
- * where width, height, xoffset, and yoffset are unsigned integers.
- * Each of the elements can be omitted to indicate a default value.
- * (A weakness of this style is that it is not possible to omit xoffset
- * while specifying yoffset, since they look alike.)
- *
- * This code is loosely based on XParseGeometry from the X11 distribution.
- */
-
-GLOBAL(boolean)
-jtransform_parse_crop_spec (jpeg_transform_info *info, const char *spec)
-{
- info->crop = FALSE;
- info->crop_width_set = JCROP_UNSET;
- info->crop_height_set = JCROP_UNSET;
- info->crop_xoffset_set = JCROP_UNSET;
- info->crop_yoffset_set = JCROP_UNSET;
-
- if (isdigit(*spec)) {
- /* fetch width */
- if (! jt_read_integer(&spec, &info->crop_width))
- return FALSE;
- info->crop_width_set = JCROP_POS;
- }
- if (*spec == 'x' || *spec == 'X') {
- /* fetch height */
- spec++;
- if (! jt_read_integer(&spec, &info->crop_height))
- return FALSE;
- info->crop_height_set = JCROP_POS;
- }
- if (*spec == '+' || *spec == '-') {
- /* fetch xoffset */
- info->crop_xoffset_set = (*spec == '-') ? JCROP_NEG : JCROP_POS;
- spec++;
- if (! jt_read_integer(&spec, &info->crop_xoffset))
- return FALSE;
- }
- if (*spec == '+' || *spec == '-') {
- /* fetch yoffset */
- info->crop_yoffset_set = (*spec == '-') ? JCROP_NEG : JCROP_POS;
- spec++;
- if (! jt_read_integer(&spec, &info->crop_yoffset))
- return FALSE;
- }
- /* We had better have gotten to the end of the string. */
- if (*spec != '\0')
- return FALSE;
- info->crop = TRUE;
- return TRUE;
-}
-
-
-/* Trim off any partial iMCUs on the indicated destination edge */
-
-LOCAL(void)
-trim_right_edge (jpeg_transform_info *info, JDIMENSION full_width)
-{
- JDIMENSION MCU_cols;
-
- MCU_cols = info->output_width / info->iMCU_sample_width;
- if (MCU_cols > 0 && info->x_crop_offset + MCU_cols ==
- full_width / info->iMCU_sample_width)
- info->output_width = MCU_cols * info->iMCU_sample_width;
-}
-
-LOCAL(void)
-trim_bottom_edge (jpeg_transform_info *info, JDIMENSION full_height)
-{
- JDIMENSION MCU_rows;
-
- MCU_rows = info->output_height / info->iMCU_sample_height;
- if (MCU_rows > 0 && info->y_crop_offset + MCU_rows ==
- full_height / info->iMCU_sample_height)
- info->output_height = MCU_rows * info->iMCU_sample_height;
-}
-
-
-/* Request any required workspace.
- *
- * This routine figures out the size that the output image will be
- * (which implies that all the transform parameters must be set before
- * it is called).
- *
- * We allocate the workspace virtual arrays from the source decompression
- * object, so that all the arrays (both the original data and the workspace)
- * will be taken into account while making memory management decisions.
- * Hence, this routine must be called after jpeg_read_header (which reads
- * the image dimensions) and before jpeg_read_coefficients (which realizes
- * the source's virtual arrays).
- *
- * This function returns FALSE right away if -perfect is given
- * and transformation is not perfect. Otherwise returns TRUE.
- */
-
-GLOBAL(boolean)
-jtransform_request_workspace (j_decompress_ptr srcinfo,
- jpeg_transform_info *info)
-{
- jvirt_barray_ptr *coef_arrays;
- boolean need_workspace, transpose_it;
- jpeg_component_info *compptr;
- JDIMENSION xoffset, yoffset;
- JDIMENSION width_in_iMCUs, height_in_iMCUs;
- JDIMENSION width_in_blocks, height_in_blocks;
- int ci, h_samp_factor, v_samp_factor;
-
- /* Determine number of components in output image */
- if (info->force_grayscale &&
- srcinfo->jpeg_color_space == JCS_YCbCr &&
- srcinfo->num_components == 3)
- /* We'll only process the first component */
- info->num_components = 1;
- else
- /* Process all the components */
- info->num_components = srcinfo->num_components;
-
- /* Compute output image dimensions and related values. */
- jpeg_core_output_dimensions(srcinfo);
-
- /* Return right away if -perfect is given and transformation is not perfect.
- */
- if (info->perfect) {
- if (info->num_components == 1) {
- if (!jtransform_perfect_transform(srcinfo->output_width,
- srcinfo->output_height,
- srcinfo->min_DCT_h_scaled_size,
- srcinfo->min_DCT_v_scaled_size,
- info->transform))
- return FALSE;
- } else {
- if (!jtransform_perfect_transform(srcinfo->output_width,
- srcinfo->output_height,
- srcinfo->max_h_samp_factor * srcinfo->min_DCT_h_scaled_size,
- srcinfo->max_v_samp_factor * srcinfo->min_DCT_v_scaled_size,
- info->transform))
- return FALSE;
- }
- }
-
- /* If there is only one output component, force the iMCU size to be 1;
- * else use the source iMCU size. (This allows us to do the right thing
- * when reducing color to grayscale, and also provides a handy way of
- * cleaning up "funny" grayscale images whose sampling factors are not 1x1.)
- */
- switch (info->transform) {
- case JXFORM_TRANSPOSE:
- case JXFORM_TRANSVERSE:
- case JXFORM_ROT_90:
- case JXFORM_ROT_270:
- info->output_width = srcinfo->output_height;
- info->output_height = srcinfo->output_width;
- if (info->num_components == 1) {
- info->iMCU_sample_width = srcinfo->min_DCT_v_scaled_size;
- info->iMCU_sample_height = srcinfo->min_DCT_h_scaled_size;
- } else {
- info->iMCU_sample_width =
- srcinfo->max_v_samp_factor * srcinfo->min_DCT_v_scaled_size;
- info->iMCU_sample_height =
- srcinfo->max_h_samp_factor * srcinfo->min_DCT_h_scaled_size;
- }
- break;
- default:
- info->output_width = srcinfo->output_width;
- info->output_height = srcinfo->output_height;
- if (info->num_components == 1) {
- info->iMCU_sample_width = srcinfo->min_DCT_h_scaled_size;
- info->iMCU_sample_height = srcinfo->min_DCT_v_scaled_size;
- } else {
- info->iMCU_sample_width =
- srcinfo->max_h_samp_factor * srcinfo->min_DCT_h_scaled_size;
- info->iMCU_sample_height =
- srcinfo->max_v_samp_factor * srcinfo->min_DCT_v_scaled_size;
- }
- break;
- }
-
- /* If cropping has been requested, compute the crop area's position and
- * dimensions, ensuring that its upper left corner falls at an iMCU boundary.
- */
- if (info->crop) {
- /* Insert default values for unset crop parameters */
- if (info->crop_xoffset_set == JCROP_UNSET)
- info->crop_xoffset = 0; /* default to +0 */
- if (info->crop_yoffset_set == JCROP_UNSET)
- info->crop_yoffset = 0; /* default to +0 */
- if (info->crop_xoffset >= info->output_width ||
- info->crop_yoffset >= info->output_height)
- ERREXIT(srcinfo, JERR_BAD_CROP_SPEC);
- if (info->crop_width_set == JCROP_UNSET)
- info->crop_width = info->output_width - info->crop_xoffset;
- if (info->crop_height_set == JCROP_UNSET)
- info->crop_height = info->output_height - info->crop_yoffset;
- /* Ensure parameters are valid */
- if (info->crop_width <= 0 || info->crop_width > info->output_width ||
- info->crop_height <= 0 || info->crop_height > info->output_height ||
- info->crop_xoffset > info->output_width - info->crop_width ||
- info->crop_yoffset > info->output_height - info->crop_height)
- ERREXIT(srcinfo, JERR_BAD_CROP_SPEC);
- /* Convert negative crop offsets into regular offsets */
- if (info->crop_xoffset_set == JCROP_NEG)
- xoffset = info->output_width - info->crop_width - info->crop_xoffset;
- else
- xoffset = info->crop_xoffset;
- if (info->crop_yoffset_set == JCROP_NEG)
- yoffset = info->output_height - info->crop_height - info->crop_yoffset;
- else
- yoffset = info->crop_yoffset;
- /* Now adjust so that upper left corner falls at an iMCU boundary */
- info->output_width =
- info->crop_width + (xoffset % info->iMCU_sample_width);
- info->output_height =
- info->crop_height + (yoffset % info->iMCU_sample_height);
- /* Save x/y offsets measured in iMCUs */
- info->x_crop_offset = xoffset / info->iMCU_sample_width;
- info->y_crop_offset = yoffset / info->iMCU_sample_height;
- } else {
- info->x_crop_offset = 0;
- info->y_crop_offset = 0;
- }
-
- /* Figure out whether we need workspace arrays,
- * and if so whether they are transposed relative to the source.
- */
- need_workspace = FALSE;
- transpose_it = FALSE;
- switch (info->transform) {
- case JXFORM_NONE:
- if (info->x_crop_offset != 0 || info->y_crop_offset != 0)
- need_workspace = TRUE;
- /* No workspace needed if neither cropping nor transforming */
- break;
- case JXFORM_FLIP_H:
- if (info->trim)
- trim_right_edge(info, srcinfo->output_width);
- if (info->y_crop_offset != 0)
- need_workspace = TRUE;
- /* do_flip_h_no_crop doesn't need a workspace array */
- break;
- case JXFORM_FLIP_V:
- if (info->trim)
- trim_bottom_edge(info, srcinfo->output_height);
- /* Need workspace arrays having same dimensions as source image. */
- need_workspace = TRUE;
- break;
- case JXFORM_TRANSPOSE:
- /* transpose does NOT have to trim anything */
- /* Need workspace arrays having transposed dimensions. */
- need_workspace = TRUE;
- transpose_it = TRUE;
- break;
- case JXFORM_TRANSVERSE:
- if (info->trim) {
- trim_right_edge(info, srcinfo->output_height);
- trim_bottom_edge(info, srcinfo->output_width);
- }
- /* Need workspace arrays having transposed dimensions. */
- need_workspace = TRUE;
- transpose_it = TRUE;
- break;
- case JXFORM_ROT_90:
- if (info->trim)
- trim_right_edge(info, srcinfo->output_height);
- /* Need workspace arrays having transposed dimensions. */
- need_workspace = TRUE;
- transpose_it = TRUE;
- break;
- case JXFORM_ROT_180:
- if (info->trim) {
- trim_right_edge(info, srcinfo->output_width);
- trim_bottom_edge(info, srcinfo->output_height);
- }
- /* Need workspace arrays having same dimensions as source image. */
- need_workspace = TRUE;
- break;
- case JXFORM_ROT_270:
- if (info->trim)
- trim_bottom_edge(info, srcinfo->output_width);
- /* Need workspace arrays having transposed dimensions. */
- need_workspace = TRUE;
- transpose_it = TRUE;
- break;
- }
-
- /* Allocate workspace if needed.
- * Note that we allocate arrays padded out to the next iMCU boundary,
- * so that transform routines need not worry about missing edge blocks.
- */
- if (need_workspace) {
- coef_arrays = (jvirt_barray_ptr *)
- (*srcinfo->mem->alloc_small) ((j_common_ptr) srcinfo, JPOOL_IMAGE,
- SIZEOF(jvirt_barray_ptr) * info->num_components);
- width_in_iMCUs = (JDIMENSION)
- jdiv_round_up((long) info->output_width,
- (long) info->iMCU_sample_width);
- height_in_iMCUs = (JDIMENSION)
- jdiv_round_up((long) info->output_height,
- (long) info->iMCU_sample_height);
- for (ci = 0; ci < info->num_components; ci++) {
- compptr = srcinfo->comp_info + ci;
- if (info->num_components == 1) {
- /* we're going to force samp factors to 1x1 in this case */
- h_samp_factor = v_samp_factor = 1;
- } else if (transpose_it) {
- h_samp_factor = compptr->v_samp_factor;
- v_samp_factor = compptr->h_samp_factor;
- } else {
- h_samp_factor = compptr->h_samp_factor;
- v_samp_factor = compptr->v_samp_factor;
- }
- width_in_blocks = width_in_iMCUs * h_samp_factor;
- height_in_blocks = height_in_iMCUs * v_samp_factor;
- coef_arrays[ci] = (*srcinfo->mem->request_virt_barray)
- ((j_common_ptr) srcinfo, JPOOL_IMAGE, FALSE,
- width_in_blocks, height_in_blocks, (JDIMENSION) v_samp_factor);
- }
- info->workspace_coef_arrays = coef_arrays;
- } else
- info->workspace_coef_arrays = NULL;
-
- return TRUE;
-}
-
-
-/* Transpose destination image parameters */
-
-LOCAL(void)
-transpose_critical_parameters (j_compress_ptr dstinfo)
-{
- int tblno, i, j, ci, itemp;
- jpeg_component_info *compptr;
- JQUANT_TBL *qtblptr;
- JDIMENSION jtemp;
- UINT16 qtemp;
-
- /* Transpose image dimensions */
- jtemp = dstinfo->image_width;
- dstinfo->image_width = dstinfo->image_height;
- dstinfo->image_height = jtemp;
- itemp = dstinfo->min_DCT_h_scaled_size;
- dstinfo->min_DCT_h_scaled_size = dstinfo->min_DCT_v_scaled_size;
- dstinfo->min_DCT_v_scaled_size = itemp;
-
- /* Transpose sampling factors */
- for (ci = 0; ci < dstinfo->num_components; ci++) {
- compptr = dstinfo->comp_info + ci;
- itemp = compptr->h_samp_factor;
- compptr->h_samp_factor = compptr->v_samp_factor;
- compptr->v_samp_factor = itemp;
- }
-
- /* Transpose quantization tables */
- for (tblno = 0; tblno < NUM_QUANT_TBLS; tblno++) {
- qtblptr = dstinfo->quant_tbl_ptrs[tblno];
- if (qtblptr != NULL) {
- for (i = 0; i < DCTSIZE; i++) {
- for (j = 0; j < i; j++) {
- qtemp = qtblptr->quantval[i*DCTSIZE+j];
- qtblptr->quantval[i*DCTSIZE+j] = qtblptr->quantval[j*DCTSIZE+i];
- qtblptr->quantval[j*DCTSIZE+i] = qtemp;
- }
- }
- }
- }
-}
-
-
-/* Adjust Exif image parameters.
- *
- * We try to adjust the Tags ExifImageWidth and ExifImageHeight if possible.
- */
-
-LOCAL(void)
-adjust_exif_parameters (JOCTET FAR * data, unsigned int length,
- JDIMENSION new_width, JDIMENSION new_height)
-{
- boolean is_motorola; /* Flag for byte order */
- unsigned int number_of_tags, tagnum;
- unsigned int firstoffset, offset;
- JDIMENSION new_value;
-
- if (length < 12) return; /* Length of an IFD entry */
-
- /* Discover byte order */
- if (GETJOCTET(data[0]) == 0x49 && GETJOCTET(data[1]) == 0x49)
- is_motorola = FALSE;
- else if (GETJOCTET(data[0]) == 0x4D && GETJOCTET(data[1]) == 0x4D)
- is_motorola = TRUE;
- else
- return;
-
- /* Check Tag Mark */
- if (is_motorola) {
- if (GETJOCTET(data[2]) != 0) return;
- if (GETJOCTET(data[3]) != 0x2A) return;
- } else {
- if (GETJOCTET(data[3]) != 0) return;
- if (GETJOCTET(data[2]) != 0x2A) return;
- }
-
- /* Get first IFD offset (offset to IFD0) */
- if (is_motorola) {
- if (GETJOCTET(data[4]) != 0) return;
- if (GETJOCTET(data[5]) != 0) return;
- firstoffset = GETJOCTET(data[6]);
- firstoffset <<= 8;
- firstoffset += GETJOCTET(data[7]);
- } else {
- if (GETJOCTET(data[7]) != 0) return;
- if (GETJOCTET(data[6]) != 0) return;
- firstoffset = GETJOCTET(data[5]);
- firstoffset <<= 8;
- firstoffset += GETJOCTET(data[4]);
- }
- if (firstoffset > length - 2) return; /* check end of data segment */
-
- /* Get the number of directory entries contained in this IFD */
- if (is_motorola) {
- number_of_tags = GETJOCTET(data[firstoffset]);
- number_of_tags <<= 8;
- number_of_tags += GETJOCTET(data[firstoffset+1]);
- } else {
- number_of_tags = GETJOCTET(data[firstoffset+1]);
- number_of_tags <<= 8;
- number_of_tags += GETJOCTET(data[firstoffset]);
- }
- if (number_of_tags == 0) return;
- firstoffset += 2;
-
- /* Search for ExifSubIFD offset Tag in IFD0 */
- for (;;) {
- if (firstoffset > length - 12) return; /* check end of data segment */
- /* Get Tag number */
- if (is_motorola) {
- tagnum = GETJOCTET(data[firstoffset]);
- tagnum <<= 8;
- tagnum += GETJOCTET(data[firstoffset+1]);
- } else {
- tagnum = GETJOCTET(data[firstoffset+1]);
- tagnum <<= 8;
- tagnum += GETJOCTET(data[firstoffset]);
- }
- if (tagnum == 0x8769) break; /* found ExifSubIFD offset Tag */
- if (--number_of_tags == 0) return;
- firstoffset += 12;
- }
-
- /* Get the ExifSubIFD offset */
- if (is_motorola) {
- if (GETJOCTET(data[firstoffset+8]) != 0) return;
- if (GETJOCTET(data[firstoffset+9]) != 0) return;
- offset = GETJOCTET(data[firstoffset+10]);
- offset <<= 8;
- offset += GETJOCTET(data[firstoffset+11]);
- } else {
- if (GETJOCTET(data[firstoffset+11]) != 0) return;
- if (GETJOCTET(data[firstoffset+10]) != 0) return;
- offset = GETJOCTET(data[firstoffset+9]);
- offset <<= 8;
- offset += GETJOCTET(data[firstoffset+8]);
- }
- if (offset > length - 2) return; /* check end of data segment */
-
- /* Get the number of directory entries contained in this SubIFD */
- if (is_motorola) {
- number_of_tags = GETJOCTET(data[offset]);
- number_of_tags <<= 8;
- number_of_tags += GETJOCTET(data[offset+1]);
- } else {
- number_of_tags = GETJOCTET(data[offset+1]);
- number_of_tags <<= 8;
- number_of_tags += GETJOCTET(data[offset]);
- }
- if (number_of_tags < 2) return;
- offset += 2;
-
- /* Search for ExifImageWidth and ExifImageHeight Tags in this SubIFD */
- do {
- if (offset > length - 12) return; /* check end of data segment */
- /* Get Tag number */
- if (is_motorola) {
- tagnum = GETJOCTET(data[offset]);
- tagnum <<= 8;
- tagnum += GETJOCTET(data[offset+1]);
- } else {
- tagnum = GETJOCTET(data[offset+1]);
- tagnum <<= 8;
- tagnum += GETJOCTET(data[offset]);
- }
- if (tagnum == 0xA002 || tagnum == 0xA003) {
- if (tagnum == 0xA002)
- new_value = new_width; /* ExifImageWidth Tag */
- else
- new_value = new_height; /* ExifImageHeight Tag */
- if (is_motorola) {
- data[offset+2] = 0; /* Format = unsigned long (4 octets) */
- data[offset+3] = 4;
- data[offset+4] = 0; /* Number Of Components = 1 */
- data[offset+5] = 0;
- data[offset+6] = 0;
- data[offset+7] = 1;
- data[offset+8] = 0;
- data[offset+9] = 0;
- data[offset+10] = (JOCTET)((new_value >> 8) & 0xFF);
- data[offset+11] = (JOCTET)(new_value & 0xFF);
- } else {
- data[offset+2] = 4; /* Format = unsigned long (4 octets) */
- data[offset+3] = 0;
- data[offset+4] = 1; /* Number Of Components = 1 */
- data[offset+5] = 0;
- data[offset+6] = 0;
- data[offset+7] = 0;
- data[offset+8] = (JOCTET)(new_value & 0xFF);
- data[offset+9] = (JOCTET)((new_value >> 8) & 0xFF);
- data[offset+10] = 0;
- data[offset+11] = 0;
- }
- }
- offset += 12;
- } while (--number_of_tags);
-}
-
-
-/* Adjust output image parameters as needed.
- *
- * This must be called after jpeg_copy_critical_parameters()
- * and before jpeg_write_coefficients().
- *
- * The return value is the set of virtual coefficient arrays to be written
- * (either the ones allocated by jtransform_request_workspace, or the
- * original source data arrays). The caller will need to pass this value
- * to jpeg_write_coefficients().
- */
-
-GLOBAL(jvirt_barray_ptr *)
-jtransform_adjust_parameters (j_decompress_ptr srcinfo,
- j_compress_ptr dstinfo,
- jvirt_barray_ptr *src_coef_arrays,
- jpeg_transform_info *info)
-{
- /* If force-to-grayscale is requested, adjust destination parameters */
- if (info->force_grayscale) {
- /* First, ensure we have YCbCr or grayscale data, and that the source's
- * Y channel is full resolution. (No reasonable person would make Y
- * be less than full resolution, so actually coping with that case
- * isn't worth extra code space. But we check it to avoid crashing.)
- */
- if (((dstinfo->jpeg_color_space == JCS_YCbCr &&
- dstinfo->num_components == 3) ||
- (dstinfo->jpeg_color_space == JCS_GRAYSCALE &&
- dstinfo->num_components == 1)) &&
- srcinfo->comp_info[0].h_samp_factor == srcinfo->max_h_samp_factor &&
- srcinfo->comp_info[0].v_samp_factor == srcinfo->max_v_samp_factor) {
- /* We use jpeg_set_colorspace to make sure subsidiary settings get fixed
- * properly. Among other things, it sets the target h_samp_factor &
- * v_samp_factor to 1, which typically won't match the source.
- * We have to preserve the source's quantization table number, however.
- */
- int sv_quant_tbl_no = dstinfo->comp_info[0].quant_tbl_no;
- jpeg_set_colorspace(dstinfo, JCS_GRAYSCALE);
- dstinfo->comp_info[0].quant_tbl_no = sv_quant_tbl_no;
- } else {
- /* Sorry, can't do it */
- ERREXIT(dstinfo, JERR_CONVERSION_NOTIMPL);
- }
- } else if (info->num_components == 1) {
- /* For a single-component source, we force the destination sampling factors
- * to 1x1, with or without force_grayscale. This is useful because some
- * decoders choke on grayscale images with other sampling factors.
- */
- dstinfo->comp_info[0].h_samp_factor = 1;
- dstinfo->comp_info[0].v_samp_factor = 1;
- }
-
- /* Correct the destination's image dimensions as necessary
- * for rotate/flip, resize, and crop operations.
- */
- dstinfo->jpeg_width = info->output_width;
- dstinfo->jpeg_height = info->output_height;
-
- /* Transpose destination image parameters */
- switch (info->transform) {
- case JXFORM_TRANSPOSE:
- case JXFORM_TRANSVERSE:
- case JXFORM_ROT_90:
- case JXFORM_ROT_270:
- transpose_critical_parameters(dstinfo);
- break;
- default:
- break;
- }
-
- /* Adjust Exif properties */
- if (srcinfo->marker_list != NULL &&
- srcinfo->marker_list->marker == JPEG_APP0+1 &&
- srcinfo->marker_list->data_length >= 6 &&
- GETJOCTET(srcinfo->marker_list->data[0]) == 0x45 &&
- GETJOCTET(srcinfo->marker_list->data[1]) == 0x78 &&
- GETJOCTET(srcinfo->marker_list->data[2]) == 0x69 &&
- GETJOCTET(srcinfo->marker_list->data[3]) == 0x66 &&
- GETJOCTET(srcinfo->marker_list->data[4]) == 0 &&
- GETJOCTET(srcinfo->marker_list->data[5]) == 0) {
- /* Suppress output of JFIF marker */
- dstinfo->write_JFIF_header = FALSE;
- /* Adjust Exif image parameters */
- if (dstinfo->jpeg_width != srcinfo->image_width ||
- dstinfo->jpeg_height != srcinfo->image_height)
- /* Align data segment to start of TIFF structure for parsing */
- adjust_exif_parameters(srcinfo->marker_list->data + 6,
- srcinfo->marker_list->data_length - 6,
- dstinfo->jpeg_width, dstinfo->jpeg_height);
- }
-
- /* Return the appropriate output data set */
- if (info->workspace_coef_arrays != NULL)
- return info->workspace_coef_arrays;
- return src_coef_arrays;
-}
-
-
-/* Execute the actual transformation, if any.
- *
- * This must be called *after* jpeg_write_coefficients, because it depends
- * on jpeg_write_coefficients to have computed subsidiary values such as
- * the per-component width and height fields in the destination object.
- *
- * Note that some transformations will modify the source data arrays!
- */
-
-GLOBAL(void)
-jtransform_execute_transform (j_decompress_ptr srcinfo,
- j_compress_ptr dstinfo,
- jvirt_barray_ptr *src_coef_arrays,
- jpeg_transform_info *info)
-{
- jvirt_barray_ptr *dst_coef_arrays = info->workspace_coef_arrays;
-
- /* Note: conditions tested here should match those in switch statement
- * in jtransform_request_workspace()
- */
- switch (info->transform) {
- case JXFORM_NONE:
- if (info->x_crop_offset != 0 || info->y_crop_offset != 0)
- do_crop(srcinfo, dstinfo, info->x_crop_offset, info->y_crop_offset,
- src_coef_arrays, dst_coef_arrays);
- break;
- case JXFORM_FLIP_H:
- if (info->y_crop_offset != 0)
- do_flip_h(srcinfo, dstinfo, info->x_crop_offset, info->y_crop_offset,
- src_coef_arrays, dst_coef_arrays);
- else
- do_flip_h_no_crop(srcinfo, dstinfo, info->x_crop_offset,
- src_coef_arrays);
- break;
- case JXFORM_FLIP_V:
- do_flip_v(srcinfo, dstinfo, info->x_crop_offset, info->y_crop_offset,
- src_coef_arrays, dst_coef_arrays);
- break;
- case JXFORM_TRANSPOSE:
- do_transpose(srcinfo, dstinfo, info->x_crop_offset, info->y_crop_offset,
- src_coef_arrays, dst_coef_arrays);
- break;
- case JXFORM_TRANSVERSE:
- do_transverse(srcinfo, dstinfo, info->x_crop_offset, info->y_crop_offset,
- src_coef_arrays, dst_coef_arrays);
- break;
- case JXFORM_ROT_90:
- do_rot_90(srcinfo, dstinfo, info->x_crop_offset, info->y_crop_offset,
- src_coef_arrays, dst_coef_arrays);
- break;
- case JXFORM_ROT_180:
- do_rot_180(srcinfo, dstinfo, info->x_crop_offset, info->y_crop_offset,
- src_coef_arrays, dst_coef_arrays);
- break;
- case JXFORM_ROT_270:
- do_rot_270(srcinfo, dstinfo, info->x_crop_offset, info->y_crop_offset,
- src_coef_arrays, dst_coef_arrays);
- break;
- }
-}
-
-/* jtransform_perfect_transform
- *
- * Determine whether lossless transformation is perfectly
- * possible for a specified image and transformation.
- *
- * Inputs:
- * image_width, image_height: source image dimensions.
- * MCU_width, MCU_height: pixel dimensions of MCU.
- * transform: transformation identifier.
- * Parameter sources from initialized jpeg_struct
- * (after reading source header):
- * image_width = cinfo.image_width
- * image_height = cinfo.image_height
- * MCU_width = cinfo.max_h_samp_factor * cinfo.block_size
- * MCU_height = cinfo.max_v_samp_factor * cinfo.block_size
- * Result:
- * TRUE = perfect transformation possible
- * FALSE = perfect transformation not possible
- * (may use custom action then)
- */
-
-GLOBAL(boolean)
-jtransform_perfect_transform(JDIMENSION image_width, JDIMENSION image_height,
- int MCU_width, int MCU_height,
- JXFORM_CODE transform)
-{
- boolean result = TRUE; /* initialize TRUE */
-
- switch (transform) {
- case JXFORM_FLIP_H:
- case JXFORM_ROT_270:
- if (image_width % (JDIMENSION) MCU_width)
- result = FALSE;
- break;
- case JXFORM_FLIP_V:
- case JXFORM_ROT_90:
- if (image_height % (JDIMENSION) MCU_height)
- result = FALSE;
- break;
- case JXFORM_TRANSVERSE:
- case JXFORM_ROT_180:
- if (image_width % (JDIMENSION) MCU_width)
- result = FALSE;
- if (image_height % (JDIMENSION) MCU_height)
- result = FALSE;
- break;
- default:
- break;
- }
-
- return result;
-}
-
-#endif /* TRANSFORMS_SUPPORTED */
-
-
-/* Setup decompression object to save desired markers in memory.
- * This must be called before jpeg_read_header() to have the desired effect.
- */
-
-GLOBAL(void)
-jcopy_markers_setup (j_decompress_ptr srcinfo, JCOPY_OPTION option)
-{
-#ifdef SAVE_MARKERS_SUPPORTED
- int m;
-
- /* Save comments except under NONE option */
- if (option != JCOPYOPT_NONE) {
- jpeg_save_markers(srcinfo, JPEG_COM, 0xFFFF);
- }
- /* Save all types of APPn markers iff ALL option */
- if (option == JCOPYOPT_ALL) {
- for (m = 0; m < 16; m++)
- jpeg_save_markers(srcinfo, JPEG_APP0 + m, 0xFFFF);
- }
-#endif /* SAVE_MARKERS_SUPPORTED */
-}
-
-/* Copy markers saved in the given source object to the destination object.
- * This should be called just after jpeg_start_compress() or
- * jpeg_write_coefficients().
- * Note that those routines will have written the SOI, and also the
- * JFIF APP0 or Adobe APP14 markers if selected.
- */
-
-GLOBAL(void)
-jcopy_markers_execute (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
- JCOPY_OPTION option)
-{
- jpeg_saved_marker_ptr marker;
-
- /* In the current implementation, we don't actually need to examine the
- * option flag here; we just copy everything that got saved.
- * But to avoid confusion, we do not output JFIF and Adobe APP14 markers
- * if the encoder library already wrote one.
- */
- for (marker = srcinfo->marker_list; marker != NULL; marker = marker->next) {
- if (dstinfo->write_JFIF_header &&
- marker->marker == JPEG_APP0 &&
- marker->data_length >= 5 &&
- GETJOCTET(marker->data[0]) == 0x4A &&
- GETJOCTET(marker->data[1]) == 0x46 &&
- GETJOCTET(marker->data[2]) == 0x49 &&
- GETJOCTET(marker->data[3]) == 0x46 &&
- GETJOCTET(marker->data[4]) == 0)
- continue; /* reject duplicate JFIF */
- if (dstinfo->write_Adobe_marker &&
- marker->marker == JPEG_APP0+14 &&
- marker->data_length >= 5 &&
- GETJOCTET(marker->data[0]) == 0x41 &&
- GETJOCTET(marker->data[1]) == 0x64 &&
- GETJOCTET(marker->data[2]) == 0x6F &&
- GETJOCTET(marker->data[3]) == 0x62 &&
- GETJOCTET(marker->data[4]) == 0x65)
- continue; /* reject duplicate Adobe */
-#ifdef NEED_FAR_POINTERS
- /* We could use jpeg_write_marker if the data weren't FAR... */
- {
- unsigned int i;
- jpeg_write_m_header(dstinfo, marker->marker, marker->data_length);
- for (i = 0; i < marker->data_length; i++)
- jpeg_write_m_byte(dstinfo, marker->data[i]);
- }
-#else
- jpeg_write_marker(dstinfo, marker->marker,
- marker->data, marker->data_length);
-#endif
- }
-}
diff --git a/extra/fbida/transupp.h b/extra/fbida/transupp.h
deleted file mode 100644
index 7c16c19c4..000000000
--- a/extra/fbida/transupp.h
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
- * transupp.h
- *
- * Copyright (C) 1997-2009, Thomas G. Lane, Guido Vollbeding.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains declarations for image transformation routines and
- * other utility code used by the jpegtran sample application. These are
- * NOT part of the core JPEG library. But we keep these routines separate
- * from jpegtran.c to ease the task of maintaining jpegtran-like programs
- * that have other user interfaces.
- *
- * NOTE: all the routines declared here have very specific requirements
- * about when they are to be executed during the reading and writing of the
- * source and destination files. See the comments in transupp.c, or see
- * jpegtran.c for an example of correct usage.
- */
-
-/* If you happen not to want the image transform support, disable it here */
-#ifndef TRANSFORMS_SUPPORTED
-#define TRANSFORMS_SUPPORTED 1 /* 0 disables transform code */
-#endif
-
-/*
- * Although rotating and flipping data expressed as DCT coefficients is not
- * hard, there is an asymmetry in the JPEG format specification for images
- * whose dimensions aren't multiples of the iMCU size. The right and bottom
- * image edges are padded out to the next iMCU boundary with junk data; but
- * no padding is possible at the top and left edges. If we were to flip
- * the whole image including the pad data, then pad garbage would become
- * visible at the top and/or left, and real pixels would disappear into the
- * pad margins --- perhaps permanently, since encoders & decoders may not
- * bother to preserve DCT blocks that appear to be completely outside the
- * nominal image area. So, we have to exclude any partial iMCUs from the
- * basic transformation.
- *
- * Transpose is the only transformation that can handle partial iMCUs at the
- * right and bottom edges completely cleanly. flip_h can flip partial iMCUs
- * at the bottom, but leaves any partial iMCUs at the right edge untouched.
- * Similarly flip_v leaves any partial iMCUs at the bottom edge untouched.
- * The other transforms are defined as combinations of these basic transforms
- * and process edge blocks in a way that preserves the equivalence.
- *
- * The "trim" option causes untransformable partial iMCUs to be dropped;
- * this is not strictly lossless, but it usually gives the best-looking
- * result for odd-size images. Note that when this option is active,
- * the expected mathematical equivalences between the transforms may not hold.
- * (For example, -rot 270 -trim trims only the bottom edge, but -rot 90 -trim
- * followed by -rot 180 -trim trims both edges.)
- *
- * We also offer a lossless-crop option, which discards data outside a given
- * image region but losslessly preserves what is inside. Like the rotate and
- * flip transforms, lossless crop is restricted by the JPEG format: the upper
- * left corner of the selected region must fall on an iMCU boundary. If this
- * does not hold for the given crop parameters, we silently move the upper left
- * corner up and/or left to make it so, simultaneously increasing the region
- * dimensions to keep the lower right crop corner unchanged. (Thus, the
- * output image covers at least the requested region, but may cover more.)
- *
- * We also provide a lossless-resize option, which is kind of a lossless-crop
- * operation in the DCT coefficient block domain - it discards higher-order
- * coefficients and losslessly preserves lower-order coefficients of a
- * sub-block.
- *
- * Rotate/flip transform, resize, and crop can be requested together in a
- * single invocation. The crop is applied last --- that is, the crop region
- * is specified in terms of the destination image after transform/resize.
- *
- * We also offer a "force to grayscale" option, which simply discards the
- * chrominance channels of a YCbCr image. This is lossless in the sense that
- * the luminance channel is preserved exactly. It's not the same kind of
- * thing as the rotate/flip transformations, but it's convenient to handle it
- * as part of this package, mainly because the transformation routines have to
- * be aware of the option to know how many components to work on.
- */
-
-
-/* Short forms of external names for systems with brain-damaged linkers. */
-
-#ifdef NEED_SHORT_EXTERNAL_NAMES
-#define jtransform_parse_crop_spec jTrParCrop
-#define jtransform_request_workspace jTrRequest
-#define jtransform_adjust_parameters jTrAdjust
-#define jtransform_execute_transform jTrExec
-#define jtransform_perfect_transform jTrPerfect
-#define jcopy_markers_setup jCMrkSetup
-#define jcopy_markers_execute jCMrkExec
-#endif /* NEED_SHORT_EXTERNAL_NAMES */
-
-
-/*
- * Codes for supported types of image transformations.
- */
-
-typedef enum {
- JXFORM_NONE, /* no transformation */
- JXFORM_FLIP_H, /* horizontal flip */
- JXFORM_FLIP_V, /* vertical flip */
- JXFORM_TRANSPOSE, /* transpose across UL-to-LR axis */
- JXFORM_TRANSVERSE, /* transpose across UR-to-LL axis */
- JXFORM_ROT_90, /* 90-degree clockwise rotation */
- JXFORM_ROT_180, /* 180-degree rotation */
- JXFORM_ROT_270 /* 270-degree clockwise (or 90 ccw) */
-} JXFORM_CODE;
-
-/*
- * Codes for crop parameters, which can individually be unspecified,
- * positive, or negative. (Negative width or height makes no sense, though.)
- */
-
-typedef enum {
- JCROP_UNSET,
- JCROP_POS,
- JCROP_NEG
-} JCROP_CODE;
-
-/*
- * Transform parameters struct.
- * NB: application must not change any elements of this struct after
- * calling jtransform_request_workspace.
- */
-
-typedef struct {
- /* Options: set by caller */
- JXFORM_CODE transform; /* image transform operator */
- boolean perfect; /* if TRUE, fail if partial MCUs are requested */
- boolean trim; /* if TRUE, trim partial MCUs as needed */
- boolean force_grayscale; /* if TRUE, convert color image to grayscale */
- boolean crop; /* if TRUE, crop source image */
-
- /* Crop parameters: application need not set these unless crop is TRUE.
- * These can be filled in by jtransform_parse_crop_spec().
- */
- JDIMENSION crop_width; /* Width of selected region */
- JCROP_CODE crop_width_set;
- JDIMENSION crop_height; /* Height of selected region */
- JCROP_CODE crop_height_set;
- JDIMENSION crop_xoffset; /* X offset of selected region */
- JCROP_CODE crop_xoffset_set; /* (negative measures from right edge) */
- JDIMENSION crop_yoffset; /* Y offset of selected region */
- JCROP_CODE crop_yoffset_set; /* (negative measures from bottom edge) */
-
- /* Internal workspace: caller should not touch these */
- int num_components; /* # of components in workspace */
- jvirt_barray_ptr * workspace_coef_arrays; /* workspace for transformations */
- JDIMENSION output_width; /* cropped destination dimensions */
- JDIMENSION output_height;
- JDIMENSION x_crop_offset; /* destination crop offsets measured in iMCUs */
- JDIMENSION y_crop_offset;
- int iMCU_sample_width; /* destination iMCU size */
- int iMCU_sample_height;
-} jpeg_transform_info;
-
-
-#if TRANSFORMS_SUPPORTED
-
-/* Parse a crop specification (written in X11 geometry style) */
-EXTERN(boolean) jtransform_parse_crop_spec
- JPP((jpeg_transform_info *info, const char *spec));
-/* Request any required workspace */
-EXTERN(boolean) jtransform_request_workspace
- JPP((j_decompress_ptr srcinfo, jpeg_transform_info *info));
-/* Adjust output image parameters */
-EXTERN(jvirt_barray_ptr *) jtransform_adjust_parameters
- JPP((j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
- jvirt_barray_ptr *src_coef_arrays,
- jpeg_transform_info *info));
-/* Execute the actual transformation, if any */
-EXTERN(void) jtransform_execute_transform
- JPP((j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
- jvirt_barray_ptr *src_coef_arrays,
- jpeg_transform_info *info));
-/* Determine whether lossless transformation is perfectly
- * possible for a specified image and transformation.
- */
-EXTERN(boolean) jtransform_perfect_transform
- JPP((JDIMENSION image_width, JDIMENSION image_height,
- int MCU_width, int MCU_height,
- JXFORM_CODE transform));
-
-/* jtransform_execute_transform used to be called
- * jtransform_execute_transformation, but some compilers complain about
- * routine names that long. This macro is here to avoid breaking any
- * old source code that uses the original name...
- */
-#define jtransform_execute_transformation jtransform_execute_transform
-
-#endif /* TRANSFORMS_SUPPORTED */
-
-
-/*
- * Support for copying optional markers from source to destination file.
- */
-
-typedef enum {
- JCOPYOPT_NONE, /* copy no optional markers */
- JCOPYOPT_COMMENTS, /* copy only comment (COM) markers */
- JCOPYOPT_ALL /* copy all optional markers */
-} JCOPY_OPTION;
-
-#define JCOPYOPT_DEFAULT JCOPYOPT_COMMENTS /* recommended default */
-
-/* Setup decompression object to save desired markers in memory */
-EXTERN(void) jcopy_markers_setup
- JPP((j_decompress_ptr srcinfo, JCOPY_OPTION option));
-/* Copy markers saved in the given source object to the destination object */
-EXTERN(void) jcopy_markers_execute
- JPP((j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
- JCOPY_OPTION option));
diff --git a/extra/fvwm-devel/PKGBUILD b/extra/fvwm-devel/PKGBUILD
deleted file mode 100644
index 2946b9132..000000000
--- a/extra/fvwm-devel/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 122676 2011-05-06 03:54:22Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=fvwm-devel
-pkgver=2.7.0
-pkgrel=2
-pkgdesc="A multiple large virtual desktop window manager originally derived from twm"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.fvwm.org"
-license=('GPL' 'custom')
-depends=('imlib' 'fribidi' 'perl' 'libstroke' 'libxpm' 'librsvg' 'libxinerama' 'libxcursor')
-makedepends=('libxslt')
-conflicts=('fvwm')
-provides=("fvwm=${pkgver}")
-options=('!emptydirs')
-source=(ftp://ftp.fvwm.org/pub/fvwm/version-2/fvwm-${pkgver}.tar.bz2 fvwm-devel.desktop)
-md5sums=('c7dbb0c067f570e478005edb95dcccc3'
- '3f5bcb246e035ff29aa5bf54487a3db4')
-sha1sums=('bc8f84902b0926df171d059eff75780a25c8a97a'
- '17db773870637b410ceb4f68743dbd517bc5c599')
-
-build() {
- cd "${srcdir}/fvwm-${pkgver}"
- ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib --with-stroke-library
- make
-}
-
-package() {
- cd "${srcdir}/fvwm-${pkgver}"
- make DESTDIR="${pkgdir}" install
-
- install -d "${pkgdir}/etc/fvwm"
- install -D -m644 sample.fvwmrc/* "${pkgdir}/etc/fvwm"
- rm -f "${pkgdir}"/etc/fvwm/Makefile*
- install -D -m644 ../fvwm-devel.desktop "${pkgdir}/usr/share/xsessions/fvwm-devel.desktop"
- install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
-}
diff --git a/extra/fvwm-devel/fvwm-devel.desktop b/extra/fvwm-devel/fvwm-devel.desktop
deleted file mode 100644
index dac786fb8..000000000
--- a/extra/fvwm-devel/fvwm-devel.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=XSession
-Exec=/usr/bin/fvwm
-TryExec=/usr/bin/fvwm
-Name=fvwm-devel
diff --git a/extra/fvwm/fvwm2.desktop b/extra/fvwm/fvwm2.desktop
deleted file mode 100644
index 5df7750b1..000000000
--- a/extra/fvwm/fvwm2.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=FVWM2
-Comment=The fvwm2 window manager
-Exec=fvwm2
-# no icon yet, only the top three are currently used
-Icon=
-Type=Application
diff --git a/extra/gnupg/PKGBUILD b/extra/gnupg/PKGBUILD
index 6e11ee821..85a7bfa18 100644
--- a/extra/gnupg/PKGBUILD
+++ b/extra/gnupg/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 101334 2010-11-28 23:08:17Z tpowa $
+# $Id: PKGBUILD 127729 2011-06-17 22:03:38Z andyrtr $
# Maintainer: Andreas Radke <andyrtr at archlinux.org>
# Committer: Judd Vinet <jvinet@zeroflux.org>
pkgname=gnupg
pkgver=1.4.11
-pkgrel=2
+pkgrel=3
pkgdesc="GNU Privacy Guard - a PGP replacement tool"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL3')
@@ -15,14 +15,21 @@ md5sums=('411744e1ef8ce90b87938c4203f001f1')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
- ./configure --prefix=/usr --libexecdir=/usr/lib # docdir can't be set properly
- make || return 1
- ln -s ${pkgname}-${pkgver}/scripts ..
+ ./configure --prefix=/usr \
+ --libexecdir=/usr/lib \
+ --enable-noexecstack
+ make
+ #ln -s ${pkgname}-${pkgver}/scripts .. # seems obsolete now
}
-
+
+check() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make -k check #All 27 tests passed
+}
+
package () {
cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install || return 1
+ make DESTDIR=${pkgdir} install
# fix fileconflict with gnupg2 pkg
rm ${pkgdir}/usr/share/man/man1/gpg-zip.1
diff --git a/extra/happy/PKGBUILD b/extra/happy/PKGBUILD
index 5adad741a..f9cb98065 100644
--- a/extra/happy/PKGBUILD
+++ b/extra/happy/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 103748 2010-12-22 17:23:27Z remy $
+# $Id: PKGBUILD 127724 2011-06-17 20:54:42Z eric $
# Maintainer: simo <simo@archlinux.org>
# Contributor: Vesa Kaihlavirta <vegai@iki.fi>
@@ -10,21 +10,21 @@ url="http://www.haskell.org/happy/"
arch=('i686' 'x86_64' 'mips64el')
license=("custom:BSD3")
depends=(gmp)
-makedepends=(ghc=7.0.1 haskell-mtl=2.0.1.0)
+makedepends=(ghc=7.0.2 haskell-mtl=2.0.1.0)
options=(strip)
source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz)
md5sums=('7d4d1425f5068633cd477a2b2216880d')
build() {
- cd ${srcdir}/${pkgname}-${pkgver}
+ cd "${srcdir}/${pkgname}-${pkgver}"
runhaskell Setup.lhs configure -O --prefix=/usr
runhaskell Setup.lhs build
}
package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- runhaskell Setup.lhs copy --destdir=${pkgdir}
- install -D -m644 LICENSE $startdir/pkg/usr/share/licenses/$pkgname/LICENSE
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ runhaskell Setup.lhs copy --destdir="${pkgdir}"
+ install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
}
diff --git a/extra/icewm/ChangeLog b/extra/icewm/ChangeLog
deleted file mode 100644
index b3e46cb6f..000000000
--- a/extra/icewm/ChangeLog
+++ /dev/null
@@ -1,15 +0,0 @@
-2010-01-18 Eric Belanger <eric@archlinux.org>
-
- * icewm 1.2.37-3
- * Rebuilt for libpng 1.4 and libjpeg 8
-
-2009-01-30 Eric Belanger <eric@archlinux.org>
-
- * icewm 1.2.37-1
- * Upstream update
-
-2008-10-18 Eric Belanger <eric@archlinux.org>
-
- * icewm 1.2.36-1
- * Upstream update
- * Added ChangeLog
diff --git a/extra/icewm/icewm.desktop b/extra/icewm/icewm.desktop
deleted file mode 100644
index e5ff5dce6..000000000
--- a/extra/icewm/icewm.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=XSession
-Exec=/usr/bin/icewm-session
-TryExec=/usr/bin/icewm-session
-Name=icewm
diff --git a/extra/indent/indent-2.2.9-file.diff b/extra/indent/indent-2.2.9-file.diff
deleted file mode 100644
index 511995c0b..000000000
--- a/extra/indent/indent-2.2.9-file.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur indent-2.2.9.orig/src/indent.h indent-2.2.9/src/indent.h
---- indent-2.2.9.orig/src/indent.h 2002-11-10 22:02:48.000000000 +0100
-+++ indent-2.2.9/src/indent.h 2005-10-30 11:53:10.000000000 +0100
-@@ -96,8 +96,6 @@
- /* Size of the input program, not including the ' \n\0' we add at the end */
- extern unsigned long in_prog_size;
-
--/* The output file. */
--extern FILE *output;
-
-
-
diff --git a/extra/libdmtx/PKGBUILD b/extra/libdmtx/PKGBUILD
index df4990dcc..30f02eb3c 100644
--- a/extra/libdmtx/PKGBUILD
+++ b/extra/libdmtx/PKGBUILD
@@ -1,26 +1,26 @@
-# $Id: PKGBUILD 107616 2011-01-26 22:10:46Z andrea $
+# $Id: PKGBUILD 127675 2011-06-17 17:32:51Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: jose <jose1711 [at] gmail (dot) com>
pkgname=libdmtx
-pkgver=0.7.2
-pkgrel=2
+pkgver=0.7.4
+pkgrel=1
pkgdesc="A software for reading and writing Data Matrix 2D barcodes"
-url=('http://www.libdmtx.org/')
-arch=('i686' 'x86_64' 'mips64el')
+url="http://www.libdmtx.org/"
+arch=('i686' 'x86_64')
license=('GPL2')
-depends=('imagemagick')
+depends=('glibc' 'imagemagick')
source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('0684cf3857591e777b57248d652444ae')
+md5sums=('d3a4c0becd92895eb606dbdb78b023e2')
options=('!libtool')
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd "${srcdir}"/${pkgname}-${pkgver}
./configure --prefix=/usr
make
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd "${srcdir}"/${pkgname}-${pkgver}
make DESTDIR="${pkgdir}" install
}
diff --git a/extra/libindi/PKGBUILD b/extra/libindi/PKGBUILD
index 0b70ae5ff..0de4645b0 100644
--- a/extra/libindi/PKGBUILD
+++ b/extra/libindi/PKGBUILD
@@ -3,29 +3,23 @@
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
pkgname=libindi
-pkgver=0.7.2
+pkgver=0.8
pkgrel=1
pkgdesc="A distributed control protocol designed to operate astronomical instrumentation"
url="http://www.indilib.org/index.php?title=Main_Page"
license=('GPL2')
-arch=('i686' 'x86_64' 'mips64el')
-depends=('gcc-libs' 'zlib' 'libnova' 'cfitsio')
-makedepends=('pkgconfig' 'cmake')
+arch=('i686' 'x86_64')
+depends=('libnova' 'cfitsio' 'boost-libs')
+makedepends=('pkgconfig' 'cmake' 'boost')
provides=('indilib')
replaces=('indilib')
conflicts=('indilib')
options=('!libtool')
-source=("http://downloads.sourceforge.net/indi/${pkgname}_${pkgver}.tar.gz"
- 'linking-pthread.patch')
-md5sums=('a78a77dc2322a46f5bf4c5d75380e8b0'
- '1ebc282e259cb0c9c52cad3dadd5e044')
+source=("http://downloads.sourceforge.net/indi/${pkgname}_${pkgver}.tar.gz")
+md5sums=('ca2b7c56431eb5e08218929e5eb72150')
build() {
- # fixed upstream
- cd ${srcdir}/${pkgname}-${pkgver}
- patch -Np2 -i ${srcdir}/linking-pthread.patch
-
- cd ${srcdir}
+ cd "${srcdir}"
mkdir build
cd build
cmake ../${pkgname}-${pkgver} \
@@ -35,6 +29,6 @@ build() {
}
package() {
- cd ${srcdir}/build
- make DESTDIR=${pkgdir} install
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
}
diff --git a/extra/libindi/linking-pthread.patch b/extra/libindi/linking-pthread.patch
deleted file mode 100644
index c012707a2..000000000
--- a/extra/libindi/linking-pthread.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- trunk/libindi/CMakeLists.txt 2010/11/20 11:45:07 397
-+++ trunk/libindi/CMakeLists.txt 2010/12/01 08:36:20 412
-@@ -164,7 +164,7 @@
- ############# INDI Client Library ################
- ##################################################
- add_library(indiclient STATIC ${indibase_SRCS})
--target_link_libraries(indiclient indi)
-+target_link_libraries(indiclient indi pthread)
- install(TARGETS indiclient ARCHIVE DESTINATION lib${LIB_POSTFIX})
-
- #####################################
diff --git a/extra/moc/curl-streams.diff b/extra/moc/curl-streams.diff
deleted file mode 100644
index 2dbc38d54..000000000
--- a/extra/moc/curl-streams.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -u moc-2.4.4/io_curl.c moc-2.4.4/io_curl.c
---- a/io_curl.c 2007-07-08 08:54:45.000000000 +0200
-+++ b/io_curl.c 2011-05-18 09:09:40.000000000 +0200
-@@ -338,6 +338,8 @@
- fd_set read_fds, write_fds, exc_fds;
- int max_fd;
- int ret;
-+ long milliseconds;
-+ struct timeval timeout;
-
- logit ("Doing select()...");
-
-@@ -356,8 +358,14 @@
- if (s->curl.wake_up_pipe[0] > max_fd)
- max_fd = s->curl.wake_up_pipe[0];
-
-+ curl_multi_timeout(s->curl.multi_handle, &milliseconds);
-+ if(milliseconds <= 0)
-+ milliseconds = 1000; /* just a cautionary default */
-+ timeout.tv_sec = milliseconds / 1000;
-+ timeout.tv_usec = (milliseconds % 1000) * 1000;
-+
- ret = select (max_fd + 1, &read_fds, &write_fds,
-- &exc_fds, NULL);
-+ &exc_fds, &timeout);
-
- if (ret < 0 && errno == EINTR) {
- logit ("Interrupted");
diff --git a/extra/mousepad/PKGBUILD b/extra/mousepad/PKGBUILD
deleted file mode 100644
index dbaf0b3c9..000000000
--- a/extra/mousepad/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 58320 2009-11-07 00:36:34Z allan $
-# Maintainer: tobias [tobias at archlinux.org]
-
-pkgname=mousepad
-pkgver=0.2.16
-pkgrel=2
-pkgdesc="Simple Text Editor for Xfce4 (based on Gedit)"
-arch=(i686 x86_64 'mips64el')
-groups=('xfce4')
-license="GPL2"
-depends=('libxfcegui4>=4.6.0' 'desktop-file-utils')
-makedepends=('pkgconfig' 'intltool' 'perl')
-options=('!libtool')
-url=('http://www.xfce.org/~benny/apps.html')
-install=${pkgname}.install
-source=(http://www.xfce.org/archive/xfce-4.6.0/src/${pkgname}-${pkgver}.tar.bz2
- resensitize-find-button.patch)
-md5sums=('d98854edb76d823ac20b266fdf5a64a1'
- '1fbc153fbd47ebb95d93f7084dea93e0')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- patch -Np1 -i $srcdir/resensitize-find-button.patch
- ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/xfce4 \
- --localstatedir=/var --disable-static
- make || return 1
- make DESTDIR=${pkgdir} install || return 1
-}
diff --git a/extra/mousepad/mousepad.install b/extra/mousepad/mousepad.install
deleted file mode 100644
index e7ca93e53..000000000
--- a/extra/mousepad/mousepad.install
+++ /dev/null
@@ -1,16 +0,0 @@
-post_install() {
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- update-desktop-database -q
-}
-
-op=$1
-shift
-
-$op $*
diff --git a/extra/mousepad/resensitize-find-button.patch b/extra/mousepad/resensitize-find-button.patch
deleted file mode 100644
index db79adc4d..000000000
--- a/extra/mousepad/resensitize-find-button.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- mousepad-0.2.16.orig/src/search.c
-+++ mousepad-0.2.16/src/search.c
-@@ -210,8 +210,11 @@
- G_CALLBACK(toggle_sensitivity), NULL);
- g_signal_connect(G_OBJECT(entry_find), "delete-text",
- G_CALLBACK(toggle_sensitivity), NULL);
-- if (sd->search.string_find)
-+ if (sd->search.string_find) {
- gtk_entry_set_text(GTK_ENTRY(entry_find), sd->search.string_find);
-+ gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog),
-+ GTK_RESPONSE_OK, TRUE);
-+ }
-
- gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK);
- gtk_entry_set_activates_default(GTK_ENTRY(entry_find), TRUE);
-@@ -275,8 +278,11 @@
- G_CALLBACK(toggle_sensitivity), NULL);
- g_signal_connect(G_OBJECT(entry_find), "delete-text",
- G_CALLBACK(toggle_sensitivity), NULL);
-- if (sd->search.string_find)
-+ if (sd->search.string_find) {
- gtk_entry_set_text(GTK_ENTRY(entry_find), sd->search.string_find);
-+ gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog),
-+ GTK_RESPONSE_OK, TRUE);
-+ }
- label_replace = gtk_label_new_with_mnemonic(_("Re_place with: "));
- gtk_misc_set_alignment(GTK_MISC(label_replace), 0, 0.5);
- gtk_table_attach_defaults(GTK_TABLE(table), label_replace, 0, 1, 1, 2);
diff --git a/extra/mpd/PKGBUILD b/extra/mpd/PKGBUILD
index 5d5972060..5c40e219d 100644
--- a/extra/mpd/PKGBUILD
+++ b/extra/mpd/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 119766 2011-04-14 20:23:04Z schiv $
+# $Id: PKGBUILD 127604 2011-06-16 17:50:00Z angvp $
# Maintainer: Angel Velasquez <angvp@archlinux.org>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
# Contributor: Ben <ben@benmazer.net>
pkgname=mpd
-pkgver=0.16.2
-pkgrel=3
+pkgver=0.16.3
+pkgrel=1
pkgdesc="Music daemon that plays MP3, FLAC, and Ogg Vorbis files"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
@@ -18,7 +18,7 @@ makedepends=('pkgconfig' 'doxygen')
install=${pkgname}.install
source=("http://downloads.sourceforge.net/musicpd/${pkgname}-${pkgver}.tar.bz2"
'mpd')
-md5sums=('dedb75cef8e489f3de5231031876fb77'
+md5sums=('6e708c02b0e8c288aec855eecf441a5a'
'e5669c2bff4031928531e52475addeb1')
build() {
diff --git a/extra/msmtp/PKGBUILD b/extra/msmtp/PKGBUILD
index f02caf326..ff1e47629 100644
--- a/extra/msmtp/PKGBUILD
+++ b/extra/msmtp/PKGBUILD
@@ -1,17 +1,18 @@
-# $Id: PKGBUILD 122860 2011-05-06 19:46:40Z eric $
+# $Id: PKGBUILD 127745 2011-06-18 02:59:47Z eric $
# Maintainer: tobias <tobias@archlinux.org>
# Contributor: Ben Mazer <blm@groknil.org>
pkgname=msmtp
pkgver=1.4.24
-pkgrel=1
+pkgrel=2
pkgdesc="A mini smtp client"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL3')
url="http://msmtp.sourceforge.net"
depends=('gnutls' 'libidn')
+makedepends=('texlive-core')
provides=('smtp-forwarder')
-install=${pkgname}.install
+install=msmtp.install
source=(http://download.sourceforge.net/sourceforge/msmtp/${pkgname}-${pkgver}.tar.bz2)
md5sums=('3ed704fbd3e7419cab5c65bb7928d9ba')
@@ -19,12 +20,19 @@ build() {
cd "${srcdir}/${pkgname}-${pkgver}"
./configure --prefix=/usr --sysconfdir=/etc --with-ssl=gnutls
make
+ make -C doc html pdf
}
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
+ make DESTDIR="${pkgdir}" install
+ make DESTDIR="${pkgdir}" -C doc install-html install-pdf
- # this can not be the default
- #install -Dm644 doc/msmtprc-system.example "${pkgdir}"/etc/msmtprc
+# Installing example configs and scripts to /usr/share/doc/msmtp
+# as they are not installed by default (Debian and Gentoo do it this way)
+ install -d "${pkgdir}/usr/share/doc/msmtp"
+ cp -r scripts/{find_alias,msmtp-gnome-tool,msmtpqueue,msmtpq,set_sendmail} "${pkgdir}/usr/share/doc/msmtp/"
+ install -D -m644 doc/*.example "${pkgdir}/usr/share/doc/msmtp/"
+
+ install -D -m644 scripts/vim/msmtp.vim "${pkgdir}/usr/share/vim/vimfiles/syntax/msmtp.vim"
}
diff --git a/extra/obex-data-server/PKGBUILD b/extra/obex-data-server/PKGBUILD
index e32a76f8f..0da129c3d 100644
--- a/extra/obex-data-server/PKGBUILD
+++ b/extra/obex-data-server/PKGBUILD
@@ -1,28 +1,28 @@
-# $Id: PKGBUILD 101379 2010-11-29 00:46:39Z andrea $
+# $Id: PKGBUILD 127685 2011-06-17 17:49:02Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
# Contributor: Roman Kyrylych <roman@archlinux.org>
# Contributor: Keerthi <keerthi.linux@gmail.com>
pkgname=obex-data-server
-pkgver=0.4.5
-pkgrel=3
+pkgver=0.4.6
+pkgrel=1
pkgdesc="A D-Bus service providing high-level OBEX client and server side functionality"
arch=('i686' 'x86_64' 'mips64el')
url="http://wiki.muiline.com/obex-data-server"
license=('GPL')
depends=('dbus-glib' 'openobex' 'imagemagick')
source=("http://tadas.dailyda.com/software/${pkgname}-${pkgver}.tar.gz")
-md5sums=('8b11e7527c1e3a36a2a9a0c52816ec7b')
+md5sums=('961ca5db6fe9c97024e133cc6203cc4d')
build() {
- cd ${srcdir}/${pkgname}-${pkgver}
+ cd "${srcdir}"/${pkgname}-${pkgver}
./configure --prefix=/usr \
--sysconfdir=/etc
make
}
package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
+ cd "${srcdir}"/${pkgname}-${pkgver}
+ make DESTDIR="${pkgdir}" install
}
diff --git a/extra/pycups/PKGBUILD b/extra/pycups/PKGBUILD
index 0989e1289..91fc194fb 100644
--- a/extra/pycups/PKGBUILD
+++ b/extra/pycups/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 118849 2011-04-08 14:57:23Z andrea $
+# $Id: PKGBUILD 127690 2011-06-17 17:53:00Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: nesl247 <nesl247@gmail.com>
pkgname=pycups
-pkgver=1.9.55
+pkgver=1.9.57
pkgrel=1
pkgdesc="Python CUPS Bindings"
url="http://cyberelk.net/tim/software/pycups/"
@@ -11,7 +11,7 @@ arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
depends=('libcups' 'python2')
source=("http://cyberelk.net/tim/data/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('b2a5082cfacc3350b53e7fee188b2dc5')
+md5sums=('64e328e2c628e41862efe97f04e66da4')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/pysmbc/PKGBUILD b/extra/pysmbc/PKGBUILD
index d78a0214a..6a0855ee6 100644
--- a/extra/pysmbc/PKGBUILD
+++ b/extra/pysmbc/PKGBUILD
@@ -1,24 +1,24 @@
-# $Id: PKGBUILD 103364 2010-12-18 14:48:53Z andrea $
+# $Id: PKGBUILD 127695 2011-06-17 17:55:40Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Shane Peelar <lookatyouhacker@gm@il(d0t)c0m>
pkgname=pysmbc
-pkgver=1.0.10
+pkgver=1.0.11
pkgrel=1
-pkgdesc="Python libsmbclient bindings"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://cyberelk.net/tim/software/pysmbc/"
+pkgdesc="Python bindings for libsmbclient"
+arch=('i686' 'x86_64')
+url="http://pypi.python.org/pypi/pysmbc/"
license=('GPL')
depends=('python2' 'smbclient')
-source=("http://cyberelk.net/tim/data/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('72cc12d6c037c68ca81355151a58083b')
+source=("http://pypi.python.org/packages/source/p/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('8593053cfe3cc0b79d8c4ab892044d4b')
build(){
- cd ${srcdir}/${pkgname}-${pkgver}
+ cd "${srcdir}/${pkgname}-${pkgver}"
python2 setup.py build
}
package() {
- cd ${srcdir}/${pkgname}-${pkgver}
+ cd "${srcdir}/${pkgname}-${pkgver}"
python2 setup.py install --root="$pkgdir" --optimize=1
}
diff --git a/extra/python2/CVE-2011-1521.patch b/extra/python2/CVE-2011-1521.patch
deleted file mode 100644
index d68ec3323..000000000
--- a/extra/python2/CVE-2011-1521.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-diff -Naur Python-2.7.1.ori/Lib/test/test_urllib2.py Python-2.7.1/Lib/test/test_urllib2.py
---- Python-2.7.1.ori/Lib/test/test_urllib2.py 2010-11-21 21:04:33.000000000 -0800
-+++ Python-2.7.1/Lib/test/test_urllib2.py 2011-04-15 05:02:13.278853672 -0700
-@@ -969,6 +969,27 @@
- self.assertEqual(count,
- urllib2.HTTPRedirectHandler.max_redirections)
-
-+ def test_invalid_redirect(self):
-+ from_url = "http://example.com/a.html"
-+ valid_schemes = ['http', 'https', 'ftp']
-+ invalid_schemes = ['file', 'imap', 'ldap']
-+ schemeless_url = "example.com/b.html"
-+ h = urllib2.HTTPRedirectHandler()
-+ o = h.parent = MockOpener()
-+ req = Request(from_url)
-+
-+ for scheme in invalid_schemes:
-+ invalid_url = scheme + '://' + schemeless_url
-+ self.assertRaises(urllib2.HTTPError, h.http_error_302,
-+ req, MockFile(), 302, "Security Loophole",
-+ MockHeaders({"location": invalid_url}))
-+
-+ for scheme in valid_schemes:
-+ valid_url = scheme + '://' + schemeless_url
-+ h.http_error_302(req, MockFile(), 302, "That's fine",
-+ MockHeaders({"location": valid_url}))
-+ self.assertEqual(o.req.get_full_url(), valid_url)
-+
- def test_cookie_redirect(self):
- # cookies shouldn't leak into redirected requests
- from cookielib import CookieJar
-diff -Naur Python-2.7.1.ori/Lib/test/test_urllib.py Python-2.7.1/Lib/test/test_urllib.py
---- Python-2.7.1.ori/Lib/test/test_urllib.py 2010-11-21 05:34:58.000000000 -0800
-+++ Python-2.7.1/Lib/test/test_urllib.py 2011-04-15 05:02:13.278853672 -0700
-@@ -161,6 +161,20 @@
- finally:
- self.unfakehttp()
-
-+ def test_invalid_redirect(self):
-+ # urlopen() should raise IOError for many error codes.
-+ self.fakehttp("""HTTP/1.1 302 Found
-+Date: Wed, 02 Jan 2008 03:03:54 GMT
-+Server: Apache/1.3.33 (Debian GNU/Linux) mod_ssl/2.8.22 OpenSSL/0.9.7e
-+Location: file:README
-+Connection: close
-+Content-Type: text/html; charset=iso-8859-1
-+""")
-+ try:
-+ self.assertRaises(IOError, urllib.urlopen, "http://python.org/")
-+ finally:
-+ self.unfakehttp()
-+
- def test_empty_socket(self):
- # urlopen() raises IOError if the underlying socket does not send any
- # data. (#1680230)
-diff -Naur Python-2.7.1.ori/Lib/urllib2.py Python-2.7.1/Lib/urllib2.py
---- Python-2.7.1.ori/Lib/urllib2.py 2010-11-20 03:24:08.000000000 -0800
-+++ Python-2.7.1/Lib/urllib2.py 2011-04-15 05:02:13.278853672 -0700
-@@ -579,6 +579,17 @@
-
- newurl = urlparse.urljoin(req.get_full_url(), newurl)
-
-+ # For security reasons we do not allow redirects to protocols
-+ # other than HTTP, HTTPS or FTP.
-+ newurl_lower = newurl.lower()
-+ if not (newurl_lower.startswith('http://') or
-+ newurl_lower.startswith('https://') or
-+ newurl_lower.startswith('ftp://')):
-+ raise HTTPError(newurl, code,
-+ msg + " - Redirection to url '%s' is not allowed" %
-+ newurl,
-+ headers, fp)
-+
- # XXX Probably want to forget about the state of the current
- # request, although that might interact poorly with other
- # handlers that also use handler-specific request attributes
-diff -Naur Python-2.7.1.ori/Lib/urllib.py Python-2.7.1/Lib/urllib.py
---- Python-2.7.1.ori/Lib/urllib.py 2010-11-21 21:04:33.000000000 -0800
-+++ Python-2.7.1/Lib/urllib.py 2011-04-15 05:02:13.278853672 -0700
-@@ -644,6 +644,18 @@
- fp.close()
- # In case the server sent a relative URL, join with original:
- newurl = basejoin(self.type + ":" + url, newurl)
-+
-+ # For security reasons we do not allow redirects to protocols
-+ # other than HTTP, HTTPS or FTP.
-+ newurl_lower = newurl.lower()
-+ if not (newurl_lower.startswith('http://') or
-+ newurl_lower.startswith('https://') or
-+ newurl_lower.startswith('ftp://')):
-+ raise IOError('redirect error', errcode,
-+ errmsg + " - Redirection to url '%s' is not allowed" %
-+ newurl,
-+ headers)
-+
- return self.open(newurl)
-
- def http_error_301(self, url, fp, errcode, errmsg, headers, data=None):
diff --git a/extra/python2/python-2.7.1-fix-decimal-in-turkish-locale.patch b/extra/python2/python-2.7.1-fix-decimal-in-turkish-locale.patch
deleted file mode 100644
index 57f527f40..000000000
--- a/extra/python2/python-2.7.1-fix-decimal-in-turkish-locale.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -up Python-2.7.1/Lib/decimal.py.fix-decimal-in-turkish-locale Python-2.7.1/Lib/decimal.py
---- Python-2.7.1/Lib/decimal.py.fix-decimal-in-turkish-locale 2010-07-08 17:22:54.000000000 -0400
-+++ Python-2.7.1/Lib/decimal.py 2011-04-12 11:30:40.850350842 -0400
-@@ -1720,8 +1720,6 @@ class Decimal(object):
- # here self was representable to begin with; return unchanged
- return Decimal(self)
-
-- _pick_rounding_function = {}
--
- # for each of the rounding functions below:
- # self is a finite, nonzero Decimal
- # prec is an integer satisfying 0 <= prec < len(self._int)
-@@ -1788,6 +1786,17 @@ class Decimal(object):
- else:
- return -self._round_down(prec)
-
-+ _pick_rounding_function = dict(
-+ ROUND_DOWN = '_round_down',
-+ ROUND_UP = '_round_up',
-+ ROUND_HALF_UP = '_round_half_up',
-+ ROUND_HALF_DOWN = '_round_half_down',
-+ ROUND_HALF_EVEN = '_round_half_even',
-+ ROUND_CEILING = '_round_ceiling',
-+ ROUND_FLOOR = '_round_floor',
-+ ROUND_05UP = '_round_05up',
-+ )
-+
- def fma(self, other, third, context=None):
- """Fused multiply-add.
-
-@@ -3705,18 +3714,6 @@ _numbers.Number.register(Decimal)
-
- ##### Context class #######################################################
-
--
--# get rounding method function:
--rounding_functions = [name for name in Decimal.__dict__.keys()
-- if name.startswith('_round_')]
--for name in rounding_functions:
-- # name is like _round_half_even, goes to the global ROUND_HALF_EVEN value.
-- globalname = name[1:].upper()
-- val = globals()[globalname]
-- Decimal._pick_rounding_function[val] = name
--
--del name, val, globalname, rounding_functions
--
- class _ContextManager(object):
- """Context manager class to support localcontext().
diff --git a/extra/rcs/PKGBUILD b/extra/rcs/PKGBUILD
index 314abdba5..b034c7cda 100644
--- a/extra/rcs/PKGBUILD
+++ b/extra/rcs/PKGBUILD
@@ -1,22 +1,31 @@
-# $Id: PKGBUILD 78028 2010-04-19 08:23:42Z dgriffiths $
-# Maintainer: dorphell <dorphell@archlinux.org>
+# $Id: PKGBUILD 127635 2011-06-17 10:04:08Z bisson $
+# Contributor: dorphell <dorphell@archlinux.org>
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+
pkgname=rcs
pkgver=5.7
-pkgrel=5
-pkgdesc="Revision Control System"
-arch=('i686' 'x86_64' 'mips64el')
+pkgrel=6
+pkgdesc='Revision Control System'
+arch=('i686' 'x86_64')
url="http://www.cs.purdue.edu/homes/trinkle/RCS/"
license=('GPL')
-depends=('glibc')
-source=(http://www.cs.purdue.edu/homes/trinkle/RCS/rcs-${pkgver}.tar.Z \
- rcs-5.7.patch)
-md5sums=('423282f0edb353296d9f3498ab683abf' '7ae4b7cb79259ccdf5eee0ab94fe2a2a')
+source=("http://www.cs.purdue.edu/homes/trinkle/RCS/rcs-${pkgver}.tar.Z" \
+ 'path.patch')
+sha1sums=('976774bda26a7743b8375797f92fbd18e51ac7a2'
+ '0f0be997e5d018e0d638b5f16430423ccb3774be')
build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- patch -Np1 -i ../rcs-5.7.patch || return 1
- ./configure --prefix=/usr || return 1
- make || return 1
- make prefix=${pkgdir}/usr man1dir=${pkgdir}/usr/share/man/man1 \
- man5dir=${pkgdir}/usr/share/man/man5 install || return 1
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -p1 -i ../path.patch
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make install \
+ prefix="${pkgdir}"/usr \
+ man1dir="${pkgdir}"/usr/share/man/man1 \
+ man5dir="${pkgdir}"/usr/share/man/man5 \
+
}
diff --git a/extra/rcs/rcs-5.7.patch b/extra/rcs/path.patch
index 0f062b357..0f062b357 100644
--- a/extra/rcs/rcs-5.7.patch
+++ b/extra/rcs/path.patch
diff --git a/extra/sip/PKGBUILD b/extra/sip/PKGBUILD
index 57a5f4fac..510afc089 100644
--- a/extra/sip/PKGBUILD
+++ b/extra/sip/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 122180 2011-05-02 17:30:24Z andrea $
+# $Id: PKGBUILD 127700 2011-06-17 17:59:14Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
# Contributor: riai <riai@bigfoot.com>, Ben <ben@benmazer.net>
pkgbase=sip
pkgname=('sip' 'python2-sip')
-pkgver=4.12.2
+pkgver=4.12.3
pkgrel=1
arch=('i686' 'x86_64')
url="http://www.riverbankcomputing.com/software/sip/"
license=('custom:"sip"')
makedepends=('python' 'python2')
source=("http://www.riverbankcomputing.com/static/Downloads/sip4/${pkgbase}-${pkgver}.tar.gz")
-md5sums=('9df80f88e0e4022cdd8a8891c6c38048')
+md5sums=('d0f1fa60494db04b4d115d4c2d92f79e')
build() {
cd "${srcdir}"
diff --git a/extra/system-config-printer/PKGBUILD b/extra/system-config-printer/PKGBUILD
index d6c9ea126..1e1d98fce 100644
--- a/extra/system-config-printer/PKGBUILD
+++ b/extra/system-config-printer/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 117485 2011-04-04 07:01:13Z andrea $
+# $Id: PKGBUILD 127705 2011-06-17 18:04:06Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgbase=system-config-printer
pkgname=('system-config-printer-common'
'system-config-printer-gnome')
-pkgver=1.3.2
+pkgver=1.3.3
pkgrel=1
pkgdesc="A CUPS printer configuration tool and status applet"
url="http://cyberelk.net/tim/software/system-config-printer/"
@@ -12,10 +12,10 @@ arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
makedepends=('intltool' 'python2' 'xmlto' 'docbook-xsl' 'desktop-file-utils' 'libcups' 'libxml2')
source=("http://cyberelk.net/tim/data/${pkgbase}/1.3/${pkgbase}-${pkgver}.tar.xz")
-md5sums=('34a0ce9a11be5695b3b4065e4f17b009')
+md5sums=('658516848c6ced2b1acc6d3525d27204')
build() {
- cd ${srcdir}/${pkgbase}-${pkgver}
+ cd "${srcdir}"/${pkgbase}-${pkgver}
sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
-e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
@@ -39,8 +39,8 @@ package_system-config-printer-common() {
provides=("system-config-printer=${pkgver}")
conflicts=('system-config-printer')
- cd ${srcdir}/${pkgbase}-${pkgver}
- install -d ${pkgdir}/usr/share/${pkgbase}
+ cd "${srcdir}"/${pkgbase}-${pkgver}
+ install -d "${pkgdir}"/usr/share/${pkgbase}
install -m644 config.py \
debug.py \
installpackage.py \
@@ -52,27 +52,27 @@ package_system-config-printer-common() {
smburi.py \
statereason.py \
XmlHelper.py \
- ${pkgdir}/usr/share/${pkgbase}/
+ "${pkgdir}"/usr/share/${pkgbase}/
install -m755 pysmb.py \
- ${pkgdir}/usr/share/${pkgbase}/
+ "${pkgdir}"/usr/share/${pkgbase}/
- install -d ${pkgdir}/etc/dbus-1/system.d/
+ install -d "${pkgdir}"/etc/dbus-1/system.d/
install -m644 dbus/com.redhat.NewPrinterNotification.conf \
dbus/com.redhat.PrinterDriversInstaller.conf \
- ${pkgdir}/etc/dbus-1/system.d/
- install -d ${pkgdir}/etc/cupshelpers/
- install -m644 xml/preferreddrivers.xml ${pkgdir}/etc/cupshelpers/
+ "${pkgdir}"/etc/dbus-1/system.d/
+ install -d "${pkgdir}"/etc/cupshelpers/
+ install -m644 xml/preferreddrivers.xml "${pkgdir}"/etc/cupshelpers/
- install -d ${pkgdir}/lib/udev/rules.d
+ install -d "${pkgdir}"/lib/udev/rules.d
install -m755 udev/{udev-add-printer,udev-configure-printer} \
- ${pkgdir}/lib/udev/
+ "${pkgdir}"/lib/udev/
install -m644 udev/70-printers.rules \
- ${pkgdir}/lib/udev/rules.d
+ "${pkgdir}"/lib/udev/rules.d
for file in build/lib/cupshelpers/*.py; do
install -Dm644 $file \
- ${pkgdir}/usr/lib/python2.7/site-packages/cupshelpers/$(basename $file)
+ "${pkgdir}"/usr/lib/python2.7/site-packages/cupshelpers/$(basename $file)
done
}
@@ -81,11 +81,11 @@ package_system-config-printer-gnome() {
depends=('system-config-printer-common' 'gnome-icon-theme' 'python-notify')
optdependence=('gnome-keyring: password management')
- cd ${srcdir}/${pkgbase}-${pkgver}
+ cd "${srcdir}"/${pkgbase}-${pkgver}
make DESTDIR="${pkgdir}" install
# files provided by system-config-printer-common
- cd ${pkgdir}/usr/share/${pkgbase}
+ cd "${pkgdir}"/usr/share/${pkgbase}
rm config.py \
debug.py \
installpackage.py \
@@ -98,8 +98,8 @@ package_system-config-printer-gnome() {
statereason.py \
XmlHelper.py \
pysmb.py
- rm -r ${pkgdir}/etc/dbus-1/
- rm -r ${pkgdir}/etc/cupshelpers/
- rm -r ${pkgdir}/etc/udev/
- rm -r ${pkgdir}/usr/lib/
+ rm -r "${pkgdir}"/etc/dbus-1/
+ rm -r "${pkgdir}"/etc/cupshelpers/
+ rm -r "${pkgdir}"/etc/udev/
+ rm -r "${pkgdir}"/usr/lib/
}
diff --git a/extra/xfprint/PKGBUILD b/extra/xfprint/PKGBUILD
deleted file mode 100644
index 984dec831..000000000
--- a/extra/xfprint/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 122851 2011-05-06 14:01:10Z stephane $
-# Maintainer: Tobias Kieslich <tobias funnychar archlinux.org>
-
-pkgname=xfprint
-pkgver=4.6.1
-pkgrel=5
-pkgdesc="A print dialog and a printer manager for Xfce"
-arch=(i686 x86_64 'mips64el')
-license=('GPL2')
-url="http://www.xfce.org/"
-groups=('xfce4')
-depends=("libxfcegui4>=$pkgver" "xfconf>=$pkgver" 'libcups>=1.3.10' 'a2ps' 'krb5'
- 'gnutls>=2.6.5' 'hicolor-icon-theme')
-makedepends=('pkgconfig' 'intltool')
-options=('!libtool')
-install=${pkgname}.install
-source=(http://archive.xfce.org/xfce/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2
- xfprint-manager-fix.diff)
-md5sums=('d92fca97a42816085080baf07a99a62e'
- '69b3619a285e94d602a1d0ac08f4ca06')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- # fix xfprint-manager not showing cups printers
- # see http://bugs.archlinux.org/task/19965, http://bugs.gentoo.org/278047, http://bugzilla.xfce.org/show_bug.cgi?id=6089
- patch -Np0 -i ${srcdir}/xfprint-manager-fix.diff
- ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
- --localstatedir=/var --disable-static
- make
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
-}
diff --git a/extra/xfprint/xfprint-manager-fix.diff b/extra/xfprint/xfprint-manager-fix.diff
deleted file mode 100644
index 1bf0725f8..000000000
--- a/extra/xfprint/xfprint-manager-fix.diff
+++ /dev/null
@@ -1,29 +0,0 @@
---- xfprint-manager/main.c 2009-02-24 21:34:16.000000000 +0000
-+++ xfprint-manager/main.c.new 2010-07-15 21:30:51.098745852 +0000
-@@ -41,6 +41,7 @@
- #include <libxfprint/printer-list-window.h>
-
- #define CHANNEL "xfprint"
-+#define PROP_PRINTING_SYSTEM "/printing-system"
-
- extern void mainwin_setup (void);
-
-@@ -66,15 +67,15 @@
- channel = xfconf_channel_new (CHANNEL);
- if (channel) {
-
-- if (xfconf_channel_has_property (channel, "/XfPrint/system")) {
-- const gchar *system_name = xfconf_channel_get_string (channel, "/XfPrint/system", "none");
-+ if (xfconf_channel_has_property (channel, PROP_PRINTING_SYSTEM)) {
-+ const gchar *system_name = xfconf_channel_get_string (channel, PROP_PRINTING_SYSTEM, "none");
- if (g_ascii_strcasecmp (system_name, "none") != 0) {
- ps = printing_system_new (system_name);
- if (ps == NULL);
- g_warning ("Unable to load printing system module %s", system_name);
- }
- } else {
-- g_warning ("%s: XfPrint/system is not set", PACKAGE);
-+ g_warning ("%s: XfPrint/printing-system is not set", PACKAGE);
- }
- }
-
diff --git a/extra/xfprint/xfprint.install b/extra/xfprint/xfprint.install
deleted file mode 100644
index 21b79d2d4..000000000
--- a/extra/xfprint/xfprint.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/staging/iproute2/PKGBUILD b/staging/iproute2/PKGBUILD
new file mode 100644
index 000000000..57089f2c0
--- /dev/null
+++ b/staging/iproute2/PKGBUILD
@@ -0,0 +1,50 @@
+# $Id: PKGBUILD 127646 2011-06-17 12:59:11Z stephane $
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Judd Vinet <jvinet@zeroflux.org>
+
+pkgname=iproute2
+pkgver=2.6.38
+pkgrel=4
+pkgdesc="IP Routing Utilities"
+arch=('i686' 'x86_64')
+license=('GPL2')
+url="http://www.linux-foundation.org/en/Net:Iproute2"
+depends=('perl')
+makedepends=('linux-atm')
+optdepends=('linux-atm: ATM support')
+provides=('iproute')
+conflicts=('iproute')
+replaces=('iproute')
+options=('!makeflags')
+backup=('etc/iproute2/ematch_map' 'etc/iproute2/rt_dsfield' 'etc/iproute2/rt_protos' \
+ 'etc/iproute2/rt_realms' 'etc/iproute2/rt_scopes' 'etc/iproute2/rt_tables')
+source=(http://devresources.linux-foundation.org/dev/iproute2/download/iproute2-${pkgver}.tar.bz2
+ 'iproute2-fhs.patch')
+sha1sums=('e9f6d457a06866a2a20a6cba6b3a039b2ec3e14a'
+ '2416b11252364d7a6c742eabb4a6924a75637a46')
+
+build() {
+ cd $srcdir/iproute2-${pkgver}
+
+ # set correct fhs structure
+ patch -Np1 -i ${srcdir}/iproute2-fhs.patch
+
+ ./configure
+
+ make
+}
+
+package() {
+ cd $srcdir/iproute2-${pkgver}
+
+ make DESTDIR=$pkgdir install
+
+ # allow loopback to be started before /usr is mounted, this may not be supported in the future
+ mkdir -p ${pkgdir}/sbin
+ mv ${pkgdir}/usr/sbin/ip ${pkgdir}/sbin/ip
+ ln -s /sbin/ip ${pkgdir}/usr/sbin/ip
+
+ # libnetlink isn't installed, install it FS#19385
+ install -Dm644 include/libnetlink.h ${pkgdir}/usr/include/libnetlink.h
+ install -Dm644 lib/libnetlink.a ${pkgdir}/usr/lib/libnetlink.a
+}
diff --git a/staging/iproute2/iproute2-fhs.patch b/staging/iproute2/iproute2-fhs.patch
new file mode 100644
index 000000000..2608414db
--- /dev/null
+++ b/staging/iproute2/iproute2-fhs.patch
@@ -0,0 +1,84 @@
+diff -Naur iproute2.old/Makefile iproute2-2.6.29/Makefile
+--- iproute2.old/Makefile 2009-11-11 22:05:21.251407668 +0100
++++ iproute2-2.6.29/Makefile 2009-11-11 22:07:09.891833516 +0100
+@@ -1,11 +1,12 @@
+ DESTDIR=/usr/
+ ROOTDIR=$(DESTDIR)
+ LIBDIR=/usr/lib/
+-SBINDIR=/sbin
++SBINDIR=/usr/sbin
+ CONFDIR=/etc/iproute2
+-DOCDIR=/share/doc/iproute2
+-MANDIR=/share/man
++DOCDIR=/usr/share/doc/iproute2
++MANDIR=/usr/share/man
+ ARPDDIR=/var/lib/arpd
++SHAREDIR=/usr/share
+
+ # Path to db_185.h include
+ DBM_INCLUDE:=$(ROOTDIR)/usr/include
+diff -Naur iproute2.old/tc/tc_util.c iproute2-2.6.29/tc/tc_util.c
+--- iproute2.old/tc/tc_util.c 2009-11-11 22:05:21.298076943 +0100
++++ iproute2-2.6.29/tc/tc_util.c 2009-11-11 22:09:32.865152646 +0100
+@@ -24,8 +24,8 @@
+ #include "utils.h"
+ #include "tc_util.h"
+
+-#ifndef LIBDIR
+-#define LIBDIR "/usr/lib/"
++#ifndef SHAREDIR
++#define SHAREDIR "/usr/share"
+ #endif
+
+ const char *get_tc_lib(void)
+@@ -34,7 +34,7 @@
+
+ lib_dir = getenv("TC_LIB_DIR");
+ if (!lib_dir)
+- lib_dir = LIBDIR "/tc/";
++ lib_dir = SHAREDIR "/tc/";
+
+ return lib_dir;
+ }
+diff -Naur iproute2.old/netem/Makefile iproute2-2.6.35/netem/Makefile
+--- iproute2.old/netem/Makefile 2010-08-06 11:30:48.640940183 +0200
++++ iproute2-2.6.35/netem/Makefile 2010-08-06 11:32:34.210908892 +0200
+@@ -20,9 +20,9 @@
+ $(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm
+
+ install: all
+- mkdir -p $(DESTDIR)$(LIBDIR)/tc
++ mkdir -p $(DESTDIR)$(SHAREDIR)/tc
+ for i in $(DISTDATA); \
+- do install -m 644 $$i $(DESTDIR)$(LIBDIR)/tc; \
++ do install -m 644 $$i $(DESTDIR)$(SHAREDIR)/tc; \
+ done
+
+ clean:
+diff -Naur iproute2.old/tc/Makefile iproute2-2.6.35/tc/Makefile
+--- iproute2.old/tc/Makefile 2010-08-06 11:48:35.607472252 +0200
++++ iproute2-2.6.35/tc/Makefile 2010-08-06 11:49:36.977473380 +0200
+@@ -99,18 +99,11 @@
+ $(AR) rcs $@ $(TCLIB)
+
+ install: all
+- mkdir -p $(MODDESTDIR)
+- install -m 0755 tc $(DESTDIR)$(SBINDIR)
+- for i in $(TCSO); \
+- do install -m 755 $$i $(MODDESTDIR); \
+- done
+- if [ ! -f $(MODDESTDIR)/m_ipt.so ]; then \
+- if [ -f $(MODDESTDIR)/m_xt.so ]; \
+- then ln -s m_xt.so $(MODDESTDIR)/m_ipt.so ; \
+- elif [ -f $(MODDESTDIR)/m_xt_old.so ]; \
+- then ln -s m_xt_old.so $(MODDESTDIR)/m_ipt.so ; \
+- fi; \
+- fi
++ mkdir -p $(DESTDIR)$(LIBDIR)/tc
++ install -m 0755 tc $(DESTDIR)$(SBINDIR)
++ for i in $(TCSO); \
++ do install -m 755 $$i $(DESTDIR)$(LIBDIR)/tc; \
++ done
+
+ clean:
+ rm -f $(TCOBJ) $(TCLIB) libtc.a tc *.so emp_ematch.yacc.h; \
diff --git a/staging/kdeaccessibility/PKGBUILD b/staging/kdeaccessibility/PKGBUILD
deleted file mode 100644
index 646a47d71..000000000
--- a/staging/kdeaccessibility/PKGBUILD
+++ /dev/null
@@ -1,98 +0,0 @@
-# $Id: PKGBUILD 126536 2011-06-06 06:09:32Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdeaccessibility
-pkgname=('kdeaccessibility-colorschemes'
- 'kdeaccessibility-iconthemes'
- 'kdeaccessibility-jovie'
- 'kdeaccessibility-kaccessible'
- 'kdeaccessibility-kmag'
- 'kdeaccessibility-kmousetool'
- 'kdeaccessibility-kmouth')
-pkgver=4.6.4
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://accessibility.kde.org'
-license=('GPL' 'FDL')
-groups=('kde' 'kdeaccessibility')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-runtime'
- 'speech-dispatcher')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('5a8ede86e6a483379ff62c1d85445c93c8400857')
-
-build() {
- cd ${srcdir}
- mkdir build
- cd build
- cmake ../${pkgbase}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DWITH_Opentts=OFF
- make
-}
-
-package_kdeaccessibility-colorschemes() {
- pkgdesc='KDE Accessibility color schemes'
- cd $srcdir/build/ColorSchemes
- make DESTDIR=$pkgdir install
-}
-
-package_kdeaccessibility-iconthemes() {
- pkgdesc='KDE Accessibility icon themes'
- cd $srcdir/build/IconThemes
- make DESTDIR=$pkgdir install
-}
-
-package_kdeaccessibility-jovie() {
- pkgdesc='A text to speech application'
- depends=('kdebase-runtime' 'speech-dispatcher')
- replaces=('kdeaccessibility-kttsd')
- install='kdeaccessibility.install'
- cd $srcdir/build/jovie
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/jovie
- make DESTDIR=$pkgdir install
-}
-
-package_kdeaccessibility-kaccessible() {
- pkgdesc='Provides accessibility services like focus tracking and a screenreader'
- depends=('kdebase-runtime' 'speech-dispatcher')
- install='kdeaccessibility.install'
- cd $srcdir/build/kaccessible
- make DESTDIR=$pkgdir install
-}
-
-package_kdeaccessibility-kmag() {
- pkgdesc='Screen Magnifier'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/utilities/kmag/"
- install='kdeaccessibility.install'
- cd $srcdir/build/kmag
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kmag
- make DESTDIR=$pkgdir install
-}
-
-package_kdeaccessibility-kmousetool() {
- pkgdesc='Clicks the mouse for you, reducing the effects of RSI'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/utilities/kmousetool/"
- install='kdeaccessibility.install'
- cd $srcdir/build/kmousetool
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kmousetool
- make DESTDIR=$pkgdir install
-}
-
-package_kdeaccessibility-kmouth() {
- pkgdesc='Speech Synthesizer Frontend'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/utilities/kmouth/"
- install='kdeaccessibility.install'
- cd $srcdir/build/kmouth
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kmouth
- make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdeaccessibility/kdeaccessibility.install b/staging/kdeaccessibility/kdeaccessibility.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdeaccessibility/kdeaccessibility.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdeadmin/PKGBUILD b/staging/kdeadmin/PKGBUILD
deleted file mode 100644
index de420aef1..000000000
--- a/staging/kdeadmin/PKGBUILD
+++ /dev/null
@@ -1,80 +0,0 @@
-# $Id: PKGBUILD 126537 2011-06-06 06:09:35Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdeadmin
-pkgname=('kdeadmin-kcron'
- 'kdeadmin-ksystemlog'
- 'kdeadmin-kuser'
- 'kdeadmin-system-config-printer-kde')
-pkgver=4.6.4
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeadmin')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebindings-python'
- 'system-config-printer-common' 'python2-pyqt')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
- 'syslog-path.patch')
-sha1sums=('5f683dbdeec75b4baa025a987692a63912b7e4af'
- '20095ce6e0f3e5b6800a7c6e52de6fddba62c031')
-
-build() {
- cd ${srcdir}/${pkgbase}-${pkgver}
- patch -p1 -i ${srcdir}/syslog-path.patch
-
- cd ${srcdir}
- mkdir build
- cd build
- cmake ../${pkgbase}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DBUILD_kpackage=OFF \
- -DBUILD_knetworkconf=OFF \
- -DBUILD_lilo-config=OFF \
- -DBUILD_strigi-analyzer=OFF
- make
-}
-
-package_kdeadmin-kcron() {
- pkgdesc='Configure and schedule tasks'
- depends=('kdelibs')
- cd $srcdir/build/kcron
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kcron
- make DESTDIR=$pkgdir install
-}
-
-package_kdeadmin-ksystemlog() {
- pkgdesc='System log viewer tool'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/system/ksystemlog/"
- cd $srcdir/build/ksystemlog
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/ksystemlog
- make DESTDIR=$pkgdir install
-}
-
-package_kdeadmin-kuser() {
- pkgdesc='User Manager'
- depends=('kdepim-runtime')
- url="http://kde.org/applications/system/kuser/"
- install='kdeadmin.install'
- cd $srcdir/build/kuser
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kuser
- make DESTDIR=$pkgdir install
-}
-
-package_kdeadmin-system-config-printer-kde() {
- pkgdesc='Configure local and remote Printers'
- depends=('kdebindings-python' 'system-config-printer-common' 'python2-pyqt')
- url="http://kde.org/applications/system/printerapplet/"
- cd $srcdir/build/system-config-printer-kde
- make DESTDIR=$pkgdir install
-
- # Use the python2 executable
- find ${pkgdir} -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|'
-}
diff --git a/staging/kdeadmin/kdeadmin.install b/staging/kdeadmin/kdeadmin.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdeadmin/kdeadmin.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdeadmin/syslog-path.patch b/staging/kdeadmin/syslog-path.patch
deleted file mode 100644
index 8a9142bf6..000000000
--- a/staging/kdeadmin/syslog-path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdeadmin-4.6.0/ksystemlog/src/modes/system/systemConfiguration.h~ 2011-01-27 14:24:29.840000005 +0100
-+++ kdeadmin-4.6.0/ksystemlog/src/modes/system/systemConfiguration.h 2011-01-27 14:24:53.803333335 +0100
-@@ -39,7 +39,7 @@
- SystemConfiguration() :
- GenericLogModeConfiguration(
- QLatin1String( SYSTEM_LOG_MODE_ID ),
-- QStringList() << QLatin1String( "/var/log/syslog" ),
-+ QStringList() << QLatin1String( "/var/log/messages.log" ),
- QList<int>() << INFORMATION_LOG_LEVEL_ID
- ) {
-
diff --git a/staging/kdeartwork/PKGBUILD b/staging/kdeartwork/PKGBUILD
deleted file mode 100644
index d3e8a4147..000000000
--- a/staging/kdeartwork/PKGBUILD
+++ /dev/null
@@ -1,102 +0,0 @@
-# $Id: PKGBUILD 126538 2011-06-06 06:09:39Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdeartwork
-pkgname=('kdeartwork-aurorae'
- 'kdeartwork-colorschemes'
- 'kdeartwork-desktopthemes'
- 'kdeartwork-emoticons'
- 'kdeartwork-iconthemes'
- 'kdeartwork-kscreensaver'
- 'kdeartwork-sounds'
- 'kdeartwork-styles'
- 'kdeartwork-wallpapers'
- 'kdeartwork-weatherwallpapers')
-pkgver=4.6.4
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeartwork')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'xscreensaver' 'eigen'
- 'kdebase-workspace' 'kdegraphics-libs')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('460b8bff5f6799f0e2553e1b78112e3192ade2b3')
-
-build() {
- cd $srcdir
- mkdir build
- cd build
- cmake ../${pkgbase}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package_kdeartwork-aurorae() {
- pkgdesc='An Aurorae theme based on the Oxygen plasma theme'
- cd $srcdir/build/aurorae
- make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-colorschemes() {
- pkgdesc='KDE color schemes'
- cd $srcdir/build/ColorSchemes
- make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-desktopthemes() {
- pkgdesc='KDE desktop themes'
- cd $srcdir/build/desktopthemes
- make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-emoticons() {
- pkgdesc='KDE emoticons'
- cd $srcdir/build/emoticons
- make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-iconthemes() {
- pkgdesc='KDE icon themes'
- cd $srcdir/build/IconThemes
- make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-kscreensaver() {
- pkgdesc='KDE screensaver'
- depends=('kdebase-workspace' 'kdegraphics-libs')
- cd $srcdir/build/kscreensaver
- make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-sounds() {
- pkgdesc='KDE sounds'
- cd $srcdir/build/sounds
- make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-styles() {
- pkgdesc='KDE styles'
- depends=('kdebase-workspace')
- cd $srcdir/build/styles
- make DESTDIR=$pkgdir install
- cd $srcdir/build/kwin-styles
- make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-wallpapers() {
- pkgdesc='KDE wallpapers'
- cd $srcdir/build/wallpapers
- make DESTDIR=$pkgdir install
- cd $srcdir/build/HighResolutionWallpapers
- make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-weatherwallpapers() {
- pkgdesc='KDE weather wallpapers'
- cd $srcdir/build/WeatherWallpapers
- make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdebase-runtime/PKGBUILD b/staging/kdebase-runtime/PKGBUILD
deleted file mode 100644
index 4479b4d31..000000000
--- a/staging/kdebase-runtime/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 126530 2011-06-06 06:06:00Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=kdebase-runtime
-pkgver=4.6.4
-pkgrel=1
-pkgdesc="KDE Base Runtime Environment"
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL')
-depends=('kdelibs' 'ntrack' 'smbclient' 'libssh' 'libcanberra' 'oxygen-icons'
- 'xorg-xauth' 'hicolor-icon-theme')
-makedepends=('pkg-config' 'cmake' 'automoc4' 'kdepimlibs' 'openslp' 'xine-lib')
-optdepends=('htdig: to build the search index in khelpcenter'
- 'rarian: needed by khelpcenter'
- 'gdb: drkonq crash handler')
-install="${pkgname}.install"
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('63f30be47a4b592a0820ed200004543e7cba956d')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "$srcdir/build"
- make DESTDIR="$pkgdir" install
- rm -f "${pkgdir}/usr/share/icons/hicolor/index.theme"
- ln -sf /usr/lib/kde4/libexec/kdesu "${pkgdir}/usr/bin/"
-}
diff --git a/staging/kdebase-runtime/kdebase-runtime.install b/staging/kdebase-runtime/kdebase-runtime.install
deleted file mode 100644
index 3f06b8deb..000000000
--- a/staging/kdebase-runtime/kdebase-runtime.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdebase-workspace/PKGBUILD b/staging/kdebase-workspace/PKGBUILD
deleted file mode 100644
index f89ea885f..000000000
--- a/staging/kdebase-workspace/PKGBUILD
+++ /dev/null
@@ -1,72 +0,0 @@
-# $Id: PKGBUILD 126875 2011-06-08 14:37:38Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=kdebase-workspace
-pkgver=4.6.4
-pkgrel=2
-pkgdesc="KDE Base Workspace"
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde')
-# note on libxdamage:
-# not detected by namcap because libgl depends on it
-# but nvidia providing libgl does not depend on libxdamage
-depends=('kdepim-runtime' 'lm_sensors' 'libraw1394' 'qimageblitz' 'libqalculate'
- 'polkit-kde' 'consolekit' 'xorg-xprop' 'libxdamage' 'libxklavier' 'libdmtx'
- 'xorg-xsetroot' 'libxcomposite' 'libxinerama')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdebindings-python')
-replaces=('kdmtheme' 'kde-common' 'guidance-power-manager' 'policykit-kde' 'kdebase-kinfocenter')
-conflicts=('kde-common' 'guidance-power-manager' 'policykit-kde' 'kdebase-kinfocenter')
-install="${pkgname}.install"
-backup=('usr/share/config/kdm/kdmrc'
- 'etc/pam.d/kde'
- 'etc/pam.d/kde-np'
- 'etc/pam.d/kscreensaver')
-options=('emptydirs')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
- 'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam'
- 'fixpath.patch' 'terminate-server.patch')
-sha1sums=('44aef9ad37cf291e9e7528b2c915f8fc129d735e'
- '8c2bdefb23a03b753b78d16944d03fa3939d2d99'
- '5db3a245201bd4a50e65aa2ef583cf5490e4f646'
- 'f7b38af38549242a240f1a90ab9964ca8a366129'
- '603cc79c4d2b4eae62bb5f244aeecb3a778b5516'
- '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
- 'd7b5883f7e65c6839b1f65f94d58026673dd0226'
- 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- patch -p0 -i ${srcdir}/kdm-zsh-profile.patch
- patch -p0 -i ${srcdir}/fixpath.patch
- patch -p0 -i ${srcdir}/terminate-server.patch
-
- cd ${srcdir}
- mkdir build
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DWITH_Xmms=OFF \
- -DWITH_Googlegadgets=OFF \
- -DWITH_NetworkManager=OFF
- make
-}
-
-package() {
- cd $srcdir/build
- make DESTDIR=$pkgdir install
-
- install -D -m755 ${srcdir}/kdm ${pkgdir}/etc/rc.d/kdm
- install -D -m644 ${srcdir}/kde.pam ${pkgdir}/etc/pam.d/kde
- install -D -m644 ${srcdir}/kde-np.pam ${pkgdir}/etc/pam.d/kde-np
- install -D -m644 ${srcdir}/kscreensaver.pam ${pkgdir}/etc/pam.d/kscreensaver
- install -d -m755 ${pkgdir}/usr/share/xsessions/
- ln -sf /usr/share/apps/kdm/sessions/kde-plasma{,-safe}.desktop ${pkgdir}/usr/share/xsessions/
- install -d -m755 ${pkgdir}/etc/kde/{env,shutdown}
-
- install -d -g 135 -o 135 ${pkgdir}/var/lib/kdm
-}
diff --git a/staging/kdebase-workspace/fixpath.patch b/staging/kdebase-workspace/fixpath.patch
deleted file mode 100644
index be2b8383e..000000000
--- a/staging/kdebase-workspace/fixpath.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- startkde.cmake.orig 2009-01-15 14:24:44.000000000 +0100
-+++ startkde.cmake 2009-01-15 14:33:08.000000000 +0100
-@@ -34,22 +34,6 @@
- MALLOC_CHECK_=2
- export MALLOC_CHECK_
-
--# in case we have been started with full pathname spec without being in PATH
--bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
--if [ -n "$bindir" ]; then
-- qbindir=`$bindir/kde4-config --qt-binaries`
-- if [ -n "$qbindir" ]; then
-- case $PATH in
-- $qbindir|$qbindir:*|*:$qbindir|*:$qbindir:*) ;;
-- *) PATH=$qbindir:$PATH; export PATH;;
-- esac
-- fi
-- case $PATH in
-- $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
-- *) PATH=$bindir:$PATH; export PATH;;
-- esac
--fi
--
- # Boot sequence:
- #
- # kdeinit is used to fork off processes which improves memory usage
-@@ -206,7 +190,7 @@
- # For anything else (that doesn't set env vars, or that needs a window manager),
- # better use the Autostart folder.
-
--libpath=`kde4-config --path lib | tr : '\n'`
-+libpath=`kde4-config --path lib | tr : '\n'`$(echo -e '\n/etc/kde/lib/')
-
- for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do
- for file in "$prefix"*.sh; do
diff --git a/staging/kdebase-workspace/kde-np.pam b/staging/kdebase-workspace/kde-np.pam
deleted file mode 100644
index 81eeef47b..000000000
--- a/staging/kdebase-workspace/kde-np.pam
+++ /dev/null
@@ -1,7 +0,0 @@
-#%PAM-1.0
-auth required pam_nologin.so
-auth required pam_permit.so
-account required pam_unix.so
-password required pam_unix.so
-session required pam_unix.so
-session required pam_limits.so \ No newline at end of file
diff --git a/staging/kdebase-workspace/kde.pam b/staging/kdebase-workspace/kde.pam
deleted file mode 100644
index 1a259390f..000000000
--- a/staging/kdebase-workspace/kde.pam
+++ /dev/null
@@ -1,7 +0,0 @@
-#%PAM-1.0
-auth required pam_unix.so
-auth required pam_nologin.so
-account required pam_unix.so
-password required pam_unix.so
-session required pam_unix.so
-session required pam_limits.so \ No newline at end of file
diff --git a/staging/kdebase-workspace/kdebase-workspace.install b/staging/kdebase-workspace/kdebase-workspace.install
deleted file mode 100644
index f7d6d305b..000000000
--- a/staging/kdebase-workspace/kdebase-workspace.install
+++ /dev/null
@@ -1,25 +0,0 @@
-post_install() {
- groupadd -g 135 kdm &>/dev/null
- useradd -u 135 -g kdm -d /var/lib/kdm -s /bin/false -r -M kdm &>/dev/null
- chown -R 135:135 var/lib/kdm &>/dev/null
- xdg-icon-resource forceupdate --theme hicolor &>/dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- getent group kdm >/dev/null 2>&1 || groupadd -g 135 kdm &>/dev/null
- getent passwd kdm >/dev/null 2>&1 || useradd -u 135 -g kdm -d /var/lib/kdm -s /bin/false -r -M kdm &>/dev/null
- chown -R 135:135 var/lib/kdm &>/dev/null
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
-
-post_remove() {
- if getent passwd kdm >/dev/null 2>&1; then
- userdel kdm
- fi
- if getent group kdm >/dev/null 2>&1; then
- groupdel kdm
- fi
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
diff --git a/staging/kdebase-workspace/kdm b/staging/kdebase-workspace/kdm
deleted file mode 100644
index 799d58f4b..000000000
--- a/staging/kdebase-workspace/kdm
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=$(pidof -o %PPID /usr/bin/kdm)
-case "$1" in
- start)
- stat_busy "Starting KDE Desktop Manager"
- [ -z "$PID" ] && /usr/bin/kdm &>/dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon kdm
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping KDE Desktop Manager"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon kdm
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 3
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/staging/kdebase-workspace/kdm-zsh-profile.patch b/staging/kdebase-workspace/kdm-zsh-profile.patch
deleted file mode 100644
index 779456b39..000000000
--- a/staging/kdebase-workspace/kdm-zsh-profile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdm/kfrontend/genkdmconf.c 2008-02-13 09:40:49.000000000 +0000
-+++ kdm/kfrontend/genkdmconf.c 2008-05-16 12:47:36.000000000 +0000
-@@ -662,7 +662,7 @@
- " [ -d /etc/zsh ] && zdir=/etc/zsh || zdir=/etc\n"
- " zhome=${ZDOTDIR:-$HOME}\n"
- " # zshenv is always sourced automatically.\n"
--" [ -f $zdir/zprofile ] && . $zdir/zprofile\n"
-+" [ -f /etc/profile ] && . /etc/profile\n"
- " [ -f $zhome/.zprofile ] && . $zhome/.zprofile\n"
- " [ -f $zdir/zlogin ] && . $zdir/zlogin\n"
- " [ -f $zhome/.zlogin ] && . $zhome/.zlogin\n"
diff --git a/staging/kdebase-workspace/kscreensaver.pam b/staging/kdebase-workspace/kscreensaver.pam
deleted file mode 100644
index b4d80c21f..000000000
--- a/staging/kdebase-workspace/kscreensaver.pam
+++ /dev/null
@@ -1 +0,0 @@
-auth required pam_unix_auth.so
diff --git a/staging/kdebase-workspace/terminate-server.patch b/staging/kdebase-workspace/terminate-server.patch
deleted file mode 100644
index 094591317..000000000
--- a/staging/kdebase-workspace/terminate-server.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdm/config.def 2009-08-27 10:17:39.000000000 +0200
-+++ kdm/config.def 2009-10-31 00:40:21.000000000 +0100
-@@ -1448,7 +1448,7 @@
-
- Key: TerminateServer
- Type: bool
--Default: false
-+Default: true
- User: core
- Instance: #:*/!
- Merge: xdm
diff --git a/staging/kdebase/PKGBUILD b/staging/kdebase/PKGBUILD
deleted file mode 100644
index c16031161..000000000
--- a/staging/kdebase/PKGBUILD
+++ /dev/null
@@ -1,129 +0,0 @@
-# $Id: PKGBUILD 126534 2011-06-06 06:09:24Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdebase
-pkgname=('kdebase-dolphin'
- 'kdebase-kdepasswd'
- 'kdebase-kdialog'
- 'kdebase-keditbookmarks'
- 'kdebase-kfind'
- 'kdebase-konqueror'
- 'kdebase-konsole'
- 'kdebase-kwrite'
- 'kdebase-lib'
- 'kdebase-plasma')
-pkgver=4.6.4
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdebase')
-makedepends=('kdebase-workspace' 'pkgconfig' 'cmake' 'automoc4')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('aef0d3f2ed8cc54cbe1ae6025091c9e0a43235c4')
-
-build() {
- cd ${srcdir}
- mkdir build
- cd build
- cmake ../${pkgbase}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package_kdebase-dolphin() {
- pkgdesc='File Manager'
- depends=('kdebase-runtime' 'kdebase-lib')
- optdepends=('ruby: servicemenu installation')
- url="http://kde.org/applications/system/dolphin/"
- cd $srcdir/build/dolphin
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/dolphin
- make DESTDIR=$pkgdir install
-}
-
-package_kdebase-kdepasswd() {
- pkgdesc='Change Password'
- depends=('kdebase-runtime' 'kdebase-lib')
- cd $srcdir/build/kdepasswd
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kdepasswd
- make DESTDIR=$pkgdir install
-}
-
-package_kdebase-kdialog() {
- pkgdesc='A utility for displaying dialog boxes from shell scripts'
- depends=('kdebase-runtime')
- cd $srcdir/build/kdialog
- make DESTDIR=$pkgdir install
-}
-
-package_kdebase-keditbookmarks() {
- pkgdesc='Bookmark Organizer and Editor'
- depends=('kdebase-runtime')
- cd $srcdir/build/keditbookmarks
- make DESTDIR=$pkgdir install
-}
-
-package_kdebase-kfind() {
- pkgdesc='Find Files/Folders'
- depends=('kdebase-runtime' 'kdebase-lib')
- url="http://kde.org/applications/utilities/kfind/"
- install='kdebase.install'
- cd $srcdir/build/kfind
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kfind
- make DESTDIR=$pkgdir install
-}
-
-package_kdebase-konqueror() {
- pkgdesc='KDE File Manager & Web Browser'
- depends=('kdebase-dolphin' 'kdebase-keditbookmarks')
- optdepends=('kwebkitpart: to enable webkit engine')
- url="http://kde.org/applications/internet/konqueror/"
- install='kdebase.install'
- conflicts=('kdebase-nsplugins')
- replaces=('kdebase-nsplugins')
- for i in konqueror doc/konqueror nsplugins; do
- cd $srcdir/build/${i}
- make DESTDIR=$pkgdir install
- done
-}
-
-package_kdebase-konsole() {
- pkgdesc='Terminal'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/system/konsole/"
- cd $srcdir/build/konsole
- make DESTDIR=$pkgdir install
- cd $srcdir/build/konsole/doc/manual
- make DESTDIR=$pkgdir install
-}
-
-package_kdebase-kwrite() {
- pkgdesc='Text Editor'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/utilities/kwrite/"
- cd $srcdir/build/kwrite
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kwrite
- make DESTDIR=$pkgdir install
-}
-
-package_kdebase-lib() {
- pkgdesc='KDE libraries for the basic desktop applications'
- groups=()
- depends=('kdelibs')
- cd $srcdir/build/lib
- make DESTDIR=$pkgdir install
-}
-
-package_kdebase-plasma() {
- pkgdesc='Display the contents of folders (User´s home folder as default)'
- depends=('kdebase-workspace' 'kdebase-lib')
- cd $srcdir/build/plasma
- make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdebase/kdebase.install b/staging/kdebase/kdebase.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdebase/kdebase.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdebindings/PKGBUILD b/staging/kdebindings/PKGBUILD
deleted file mode 100644
index edd902881..000000000
--- a/staging/kdebindings/PKGBUILD
+++ /dev/null
@@ -1,71 +0,0 @@
-# $Id: PKGBUILD 107102 2011-01-21 11:16:03Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdebindings
-pkgname=('kdebindings-csharp'
- 'kdebindings-python'
- 'kdebindings-ruby'
- 'kdebindings-smoke')
-pkgver=4.6.4
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'python2-pyqt' 'kdepim-runtime' 'mono'
- 'kdegraphics-okular' 'qwt' 'boost' 'qscintilla' 'ruby')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('ee5d85598e278bda76f7937c0a832723785ffe49')
-
-build() {
- export MONO_SHARED_DIR="${srcdir}/build/.mono"
- mkdir -p "$MONO_SHARED_DIR"
-
- cd ${srcdir}/build
-
- cmake ../${pkgbase}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DRUBY_SITE_LIB_DIR="/usr/lib/ruby/site_ruby/1.9.1" \
- -DRUBY_SITE_ARCH_DIR="/usr/lib/ruby/site_ruby/1.9.1/${CARCH}-linux" \
- -DBUILD_falcon=OFF \
- -DBUILD_java=OFF \
- -DBUILD_php=OFF \
- -DWITH_PolkitQt=OFF
- make
-}
-
-package_kdebindings-csharp() {
- pkgdesc='KDE bindings for mono'
- depends=('kdebindings-smoke' 'mono')
- export MONO_SHARED_DIR="${srcdir}/build/.mono"
- mkdir -p "$MONO_SHARED_DIR"
- cd $srcdir/build/csharp
- make DESTDIR=$pkgdir install
-}
-
-package_kdebindings-python() {
- pkgdesc='KDE bindings for python'
- depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla')
- cd $srcdir/build/python
- make DESTDIR=$pkgdir install
-
- # Use the python2 executable
- find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|'
-}
-
-package_kdebindings-ruby() {
- pkgdesc='KDE Bindings for ruby'
- depends=('kdebindings-smoke' 'ruby')
- cd $srcdir/build/ruby
- make DESTDIR=$pkgdir install
-}
-
-package_kdebindings-smoke() {
- pkgdesc='Language independent library for Qt and KDE bindings'
- depends=('qscintilla' 'kdegraphics-okular' 'kdepim-runtime')
- cd $srcdir/build/smoke
- make DESTDIR=$pkgdir install
- cd $srcdir/build/generator/smokebase
- make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdeedu/PKGBUILD b/staging/kdeedu/PKGBUILD
deleted file mode 100644
index 0dee4aeef..000000000
--- a/staging/kdeedu/PKGBUILD
+++ /dev/null
@@ -1,270 +0,0 @@
-# $Id: PKGBUILD 126535 2011-06-06 06:09:28Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdeedu
-pkgname=('kdeedu-blinken'
- 'kdeedu-cantor'
- 'kdeedu-kalgebra'
- 'kdeedu-kalzium'
- 'kdeedu-kanagram'
- 'kdeedu-kbruch'
- 'kdeedu-kgeography'
- 'kdeedu-khangman'
- 'kdeedu-kig'
- 'kdeedu-kiten'
- 'kdeedu-klettres'
- 'kdeedu-kmplot'
- 'kdeedu-kstars'
- 'kdeedu-ktouch'
- 'kdeedu-kturtle'
- 'kdeedu-kwordquiz'
- 'kdeedu-libkdeedu'
- 'kdeedu-marble'
- 'kdeedu-parley'
- 'kdeedu-rocs'
- 'kdeedu-step')
-pkgver=4.6.4
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'ocaml' 'facile' 'cfitsio' 'gpsd'
- 'kdebase-runtime' 'libqalculate' 'gsl' 'boost' 'libindi' 'r' 'libspectre'
- 'python2' 'avogadro')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
- 'gpsd-2.96.patch')
-sha1sums=('c58c2afbedccfa12d25e47202da995940cc9acb4'
- 'fd6b6b81945d951bb6ad0bb735df33c11bb2008e')
-
-build() {
- cd ${srcdir}/${pkgbase}-${pkgver}
- patch -Np1 -i ${srcdir}/gpsd-2.96.patch
-
- cd ${srcdir}
- mkdir build
- cd build
- cmake ../${pkgbase}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=OFF \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package_kdeedu-blinken() {
- pkgdesc='A memory enhancement game'
- depends=('kdebase-runtime' 'kdeedu-libkdeedu')
- install='kdeedu.install'
- cd $srcdir/build/blinken
- make DESTDIR=$pkgdir install
- cd $srcdir/build/blinken/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-cantor() {
- pkgdesc='KDE Frontend to Mathematical Software'
- depends=('kdeedu-libkdeedu' 'libspectre')
- optdepends=('kdeedu-kalgebra: backend'
- 'maxima: backend'
- 'r: backend')
- install='kdeedu.install'
- cd $srcdir/build/cantor
- make DESTDIR=$pkgdir install
- cd $srcdir/build/cantor/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-kalgebra() {
- pkgdesc='Math Expression Solver and Plotter'
- depends=('kdebase-runtime')
- install='kdeedu.install'
- cd $srcdir/build/kalgebra
- make DESTDIR=$pkgdir install
- cd $srcdir/build/kalgebra/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-kalzium() {
- pkgdesc='KDE Periodic Table of Elements'
- depends=('kdebase-runtime' 'kdeedu-libkdeedu' 'avogadro')
- install='kdeedu.install'
- cd $srcdir/build/kalzium
- make DESTDIR=$pkgdir install
- cd $srcdir/build/kalzium/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-kanagram() {
- pkgdesc='KDE Letter Order Game'
- depends=('kdebase-runtime' 'kdeedu-libkdeedu')
- install='kdeedu.install'
- cd $srcdir/build/kanagram
- make DESTDIR=$pkgdir install
- cd $srcdir/build/kanagram/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-kbruch() {
- pkgdesc='Practice exercises with fractions'
- depends=('kdelibs' 'kdebase-runtime')
- install='kdeedu.install'
- cd $srcdir/build/kbruch
- make DESTDIR=$pkgdir install
- cd $srcdir/build/kbruch/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-kgeography() {
- pkgdesc='A Geography Learning Program'
- depends=('kdebase-runtime')
- install='kdeedu.install'
- cd $srcdir/build/kgeography
- make DESTDIR=$pkgdir install
- cd $srcdir/build/kgeography/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-khangman() {
- pkgdesc='KDE Hangman Game'
- depends=('kdebase-runtime' 'kdeedu-libkdeedu')
- install='kdeedu.install'
- cd $srcdir/build/khangman
- make DESTDIR=$pkgdir install
- cd $srcdir/build/khangman/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-kig() {
- pkgdesc='Explore Geometric Constructions'
- depends=('kdebase-runtime' 'boost-libs' 'python2')
- install='kdeedu.install'
- cd $srcdir/build/kig
- make DESTDIR=$pkgdir install
- cd $srcdir/build/kig/doc
- make DESTDIR=$pkgdir install
-
- # Use the python2 executable
- sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' ${pkgdir}/usr/bin/pykig.py
-}
-
-package_kdeedu-kiten() {
- pkgdesc='Japanese Reference and Study Tool'
- depends=('kdebase-runtime')
- install='kdeedu.install'
- cd $srcdir/build/kiten
- make DESTDIR=$pkgdir install
- cd $srcdir/build/kiten/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-klettres() {
- pkgdesc='a KDE program to learn the alphabet'
- depends=('kdebase-runtime')
- install='kdeedu.install'
- cd $srcdir/build/klettres
- make DESTDIR=$pkgdir install
- cd $srcdir/build/klettres/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-kmplot() {
- pkgdesc='Function Plotter'
- depends=('kdebase-runtime')
- install='kdeedu.install'
- cd $srcdir/build/kmplot
- make DESTDIR=$pkgdir install
- cd $srcdir/build/kmplot/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-kstars() {
- pkgdesc='Desktop Planetarium'
- depends=('kdebase-runtime' 'libindi')
- install='kdeedu.install'
- cd $srcdir/build/kstars
- make DESTDIR=$pkgdir install
- cd $srcdir/build/kstars/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-ktouch() {
- pkgdesc='Touch Typing Tutor'
- depends=('kdebase-runtime')
- install='kdeedu.install'
- cd $srcdir/build/ktouch
- make DESTDIR=$pkgdir install
- cd $srcdir/build/ktouch/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-kturtle() {
- pkgdesc='Educational Programming Environment'
- depends=('kdebase-runtime')
- install='kdeedu.install'
- cd $srcdir/build/kturtle
- make DESTDIR=$pkgdir install
- cd $srcdir/build/kturtle/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-kwordquiz() {
- pkgdesc='A flashcard and vocabulary learning program'
- depends=('kdebase-runtime' 'kdeedu-libkdeedu')
- install='kdeedu.install'
- cd $srcdir/build/kwordquiz
- make DESTDIR=$pkgdir install
- cd $srcdir/build/kwordquiz/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-libkdeedu() {
- pkgdesc='Support library for KDE Educational Software'
- groups=()
- depends=('kdelibs')
- install='kdeedu.install'
- replaces=('kdeedu-data')
- conflicts=('kdeedu-data')
- cd $srcdir/build/libkdeedu
- make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-marble() {
- pkgdesc='Desktop Globe'
- depends=('kdebase-runtime' 'gpsd')
- install='kdeedu.install'
- cd $srcdir/build/marble
- make DESTDIR=$pkgdir install
- cd $srcdir/build/marble/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-parley() {
- pkgdesc='Vocabulary Trainer'
- depends=('kdebase-runtime' 'kdeedu-libkdeedu' 'kdebindings-python')
- install='kdeedu.install'
- cd $srcdir/build/parley
- make DESTDIR=$pkgdir install
- cd $srcdir/build/parley/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-rocs() {
- pkgdesc='Graph Theory Tool for Professors and Students.'
- depends=('kdebase-runtime' 'kdeedu-libkdeedu')
- install='kdeedu.install'
- cd $srcdir/build/rocs
- make DESTDIR=$pkgdir install
- cd $srcdir/build/rocs/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-step() {
- pkgdesc='Simulate physics experiments'
- depends=('kdebase-runtime' 'gsl' 'libqalculate')
- install='kdeedu.install'
- cd $srcdir/build/step
- make DESTDIR=$pkgdir install
- cd $srcdir/build/step/doc
- make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdeedu/gpsd-2.96.patch b/staging/kdeedu/gpsd-2.96.patch
deleted file mode 100644
index ec515e99d..000000000
--- a/staging/kdeedu/gpsd-2.96.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Index: kdeedu-4.5.5/marble/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
-===================================================================
---- kdeedu-4.5.5.orig/marble/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
-+++ kdeedu-4.5.5/marble/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
-@@ -18,6 +18,9 @@ using namespace Marble;
-
- GpsdConnection::GpsdConnection( QObject* parent )
- : QObject( parent ),
-+#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
-+ m_gpsd("localhost", DEFAULT_GPSD_PORT),
-+#endif
- m_timer( 0 )
- {
- connect( &m_timer, SIGNAL( timeout() ), this, SLOT( update() ) );
-@@ -26,7 +29,11 @@ GpsdConnection::GpsdConnection( QObject*
- void GpsdConnection::initialize()
- {
- m_timer.stop();
-+#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
-+ gps_data_t* data;
-+#else
- gps_data_t* data = m_gpsd.open();
-+#endif
- if ( data ) {
- m_status = PositionProviderStatusAcquiring;
- emit statusChanged( m_status );
-@@ -73,8 +80,16 @@ void GpsdConnection::initialize()
- void GpsdConnection::update()
- {
- #if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 3 ) && defined( PACKET_SET )
-+#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
-+ if ( m_gpsd.waiting(0) ) {
-+#else
- if ( m_gpsd.waiting() ) {
-+#endif
-+#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
-+ gps_data_t* data = m_gpsd.read();
-+#else
- gps_data_t* data = m_gpsd.poll();
-+#endif
- if ( data && data->set & PACKET_SET ) {
- emit gpsdInfo( *data );
- }
diff --git a/staging/kdeedu/kdeedu.install b/staging/kdeedu/kdeedu.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdeedu/kdeedu.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdegames/PKGBUILD b/staging/kdegames/PKGBUILD
deleted file mode 100644
index e57ff75ec..000000000
--- a/staging/kdegames/PKGBUILD
+++ /dev/null
@@ -1,514 +0,0 @@
-# $Id: PKGBUILD 126539 2011-06-06 06:09:42Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdegames
-pkgname=('kdegames-bomber'
- 'kdegames-bovo'
- 'kdegames-granatier'
- 'kdegames-kajongg'
- 'kdegames-kapman'
- 'kdegames-katomic'
- 'kdegames-kbattleship'
- 'kdegames-kblackbox'
- 'kdegames-kblocks'
- 'kdegames-kbounce'
- 'kdegames-kbreakout'
- 'kdegames-kdiamond'
- 'kdegames-kfourinline'
- 'kdegames-kgoldrunner'
- 'kdegames-kigo'
- 'kdegames-killbots'
- 'kdegames-kiriki'
- 'kdegames-kjumpingcube'
- 'kdegames-klines'
- 'kdegames-klickety'
- 'kdegames-kmahjongg'
- 'kdegames-kmines'
- 'kdegames-knetwalk'
- 'kdegames-kolf'
- 'kdegames-kollision'
- 'kdegames-konquest'
- 'kdegames-kpatience'
- 'kdegames-kreversi'
- 'kdegames-kshisen'
- 'kdegames-ksirk'
- 'kdegames-kspaceduel'
- 'kdegames-ksquares'
- 'kdegames-ksudoku'
- 'kdegames-ktron'
- 'kdegames-ktuberling'
- 'kdegames-kubrick'
- 'kdegames-libkdegames'
- 'kdegames-libkmahjongg'
- 'kdegames-lskat'
- 'kdegames-palapeli')
-pkgver=4.6.4
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegames')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'ggz-client-libs' 'twisted'
- 'kdebindings-python' 'openal')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('a5f6d07d8149fe00dbb61ae667eea741887966f3')
-
-build() {
- cd $srcdir
- mkdir build
- cd build
- cmake ../${pkgbase}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package_kdegames-bomber() {
- pkgdesc='Arcade Bombing Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/bomber/"
- install='kdegames.install'
- cd $srcdir/build/bomber
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/bomber
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-bovo() {
- pkgdesc='Five-in-a-row Board Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/bovo/"
- install='kdegames.install'
- cd $srcdir/build/bovo
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/bovo
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-granatier() {
- pkgdesc='Granatier'
- depends=('kdebase-runtime' 'kdegames-libkdegames' 'openal')
- url="http://kde.org/applications/games/granatier/"
- install='kdegames.install'
- cd $srcdir/build/granatier
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/granatier
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kajongg() {
- pkgdesc='The ancient Chinese board game for 4 players'
- depends=('kdegames-libkdegames' 'kdegames-libkmahjongg' 'kdebindings-python' 'twisted')
- install='kdegames.install'
- cd $srcdir/build/kajongg
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kajongg
- make DESTDIR=$pkgdir install
-
- # Use the python2 executable
- find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|'
-}
-
-package_kdegames-kapman() {
- pkgdesc='Eat pills escaping ghosts'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/kapman/"
- install='kdegames.install'
- cd $srcdir/build/kapman
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kapman
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-katomic() {
- pkgdesc='Sokoban-like Logic Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/katomic/"
- install='kdegames.install'
- cd $srcdir/build/katomic
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/katomic
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kbattleship() {
- pkgdesc='Battleship Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames' 'ggz-client-libs')
- url="http://kde.org/applications/games/kbattleship/"
- install='kdegames-kbattleship.install'
- cd $srcdir/build/kbattleship
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kbattleship
- make DESTDIR=$pkgdir install
- install -D -m644 $srcdir/${pkgbase}-${pkgver}/kbattleship/src/module.dsc \
- $pkgdir/usr/share/ggz/kbattleship.dsc
-}
-
-package_kdegames-kblackbox() {
- pkgdesc='Blackbox Logic Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/kblackbox/"
- install='kdegames.install'
- cd $srcdir/build/kblackbox
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kblackbox
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kblocks() {
- pkgdesc='Falling Blocks Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/kblocks/"
- install='kdegames.install'
- cd $srcdir/build/kblocks
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kblocks
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kbounce() {
- pkgdesc='Ball Bouncing Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/kbounce/"
- install='kdegames.install'
- cd $srcdir/build/kbounce
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kbounce
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kbreakout() {
- pkgdesc='Breakout-like Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/kbreakout/"
- install='kdegames.install'
- cd $srcdir/build/kbreakout
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kbreakout
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kdiamond() {
- pkgdesc='Three-in-a-row game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/kdiamond/"
- install='kdegames.install'
- cd $srcdir/build/kdiamond
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kdiamond
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kfourinline() {
- pkgdesc='Four-in-a-row Board Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/kfourinline/"
- install='kdegames-kfourinline.install'
- cd $srcdir/build/kfourinline
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kfourinline
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kgoldrunner() {
- pkgdesc='A game of action and puzzle-solving'
- depends=('kdebase-runtime' 'kdegames-libkdegames' 'openal')
- url="http://kde.org/applications/games/kgoldrunner/"
- install='kdegames.install'
- cd $srcdir/build/kgoldrunner
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kgoldrunner
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kigo() {
- pkgdesc='Go Board Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames' 'gnugo')
- url="http://kde.org/applications/games/kigo/"
- install='kdegames-kigo.install'
- cd $srcdir/build/kigo
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kigo
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-killbots() {
- pkgdesc='Killbots'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/killbots/"
- install='kdegames.install'
- cd $srcdir/build/killbots
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/killbots
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kiriki() {
- pkgdesc='Yahtzee-like Dice Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/kiriki/"
- install='kdegames.install'
- cd $srcdir/build/kiriki
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kiriki
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kjumpingcube() {
- pkgdesc='Territory Capture Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/kjumpingcube/"
- install='kdegames.install'
- cd $srcdir/build/kjumpingcube
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kjumpingcube
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-klickety() {
- pkgdesc='Board Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- replaces=('kdegames-ksame')
- conflicts=('kdegames-ksame')
- url="http://kde.org/applications/games/ksame/"
- install='kdegames.install'
- cd $srcdir/build/klickety
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/klickety
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-klines() {
- pkgdesc='Tactical Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/klines/"
- install='kdegames.install'
- cd $srcdir/build/klines
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/klines
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kmahjongg() {
- pkgdesc='Mahjongg Solitaire'
- depends=('kdebase-runtime' 'kdegames-libkdegames' 'kdegames-libkmahjongg')
- url="http://kde.org/applications/games/kmahjongg/"
- install='kdegames.install'
- cd $srcdir/build/kmahjongg
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kmahjongg
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kmines() {
- pkgdesc='Minesweeper-like Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/kmines/"
- install='kdegames.install'
- cd $srcdir/build/kmines
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kmines
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-knetwalk() {
- pkgdesc='Network Construction Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/knetwalk/"
- install='kdegames.install'
- cd $srcdir/build/knetwalk
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/knetwalk
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kolf() {
- pkgdesc='Miniature Golf'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/kolf/"
- install='kdegames-kolf.install'
- cd $srcdir/build/kolf
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kolf
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kollision() {
- pkgdesc='A simple ball dodging game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/kollision/"
- install='kdegames.install'
- cd $srcdir/build/kollision
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kollision
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-konquest() {
- pkgdesc='Galactic Strategy Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/konquest/"
- install='kdegames.install'
- cd $srcdir/build/konquest
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/konquest
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kpatience() {
- pkgdesc='Patience Card Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/kpatience/"
- install='kdegames.install'
- replaces=('kdegames-kpat')
- cd $srcdir/build/kpat
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kpat
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kreversi() {
- pkgdesc='Reversi Board Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames' 'ggz-client-libs')
- url="http://kde.org/applications/games/kreversi/"
- install='kdegames-kreversi.install'
- cd $srcdir/build/kreversi
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kreversi
- make DESTDIR=$pkgdir install
- install -D -m644 $srcdir/${pkgbase}-${pkgver}/kreversi/module.dsc \
- $pkgdir/usr/share/ggz/kreversi.dsc
-}
-
-package_kdegames-kshisen() {
- pkgdesc='Shisen-Sho Mahjongg-like Tile Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames' 'kdegames-libkmahjongg')
- url="http://kde.org/applications/games/kshisen/"
- install='kdegames.install'
- cd $srcdir/build/kshisen
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kshisen
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-ksirk() {
- pkgdesc='World Domination Strategy Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/ksirk/"
- install='kdegames.install'
- cd $srcdir/build/ksirk
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/ksirk
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kspaceduel() {
- pkgdesc='Space Arcade Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/kspaceduel/"
- install='kdegames-kspaceduel.install'
- cd $srcdir/build/kspaceduel
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kspaceduel
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-ksquares() {
- pkgdesc='Connect the dots to create squares'
- depends=('kdebase-runtime' 'kdegames-libkdegames' 'ggz-client-libs')
- url="http://kde.org/applications/games/ksquares/"
- install='kdegames-ksquares.install'
- cd $srcdir/build/ksquares
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/ksquares
- make DESTDIR=$pkgdir install
- install -D -m644 $srcdir/${pkgbase}-${pkgver}/ksquares/src/module.dsc \
- $pkgdir/usr/share/ggz/ksquares.dsc
-}
-
-package_kdegames-ksudoku() {
- pkgdesc='KSudoku, Sudoku game & more for KDE'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/ksudoku/"
- install='kdegames.install'
- cd $srcdir/build/ksudoku
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/ksudoku
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-ktron() {
- pkgdesc='Tron-like Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/ktron/"
- install='kdegames.install'
- cd $srcdir/build/ktron
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/ktron
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-ktuberling() {
- pkgdesc='Picture Game for Children'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/ktuberling/"
- install='kdegames-ktuberling.install'
- cd $srcdir/build/ktuberling
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/ktuberling
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kubrick() {
- pkgdesc='A 3-D game based on Rubik´s Cube'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/kubrick/"
- install='kdegames.install'
- cd $srcdir/build/kubrick
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kubrick
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-libkdegames() {
- pkgdesc='KDE game library'
- groups=()
- depends=('kdelibs')
- cd $srcdir/build/libkdegames
- make DESTDIR=$pkgdir install
- for i in $srcdir/${pkgbase}-${pkgver}/cmake/modules/*.cmake; do
- install -D -m644 $i $pkgdir/usr/share/apps/cmake/modules/$(basename $i)
- done
-}
-
-package_kdegames-libkmahjongg() {
- pkgdesc='Library used for loading and rendering of Mahjongg tilesets'
- groups=()
- depends=('kdelibs')
- cd $srcdir/build/libkmahjongg
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-lskat() {
- pkgdesc='Card Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/lskat/"
- install='kdegames-lskat.install'
- cd $srcdir/build/lskat
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/lskat
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-palapeli() {
- pkgdesc='Jigsaw puzzle game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/palapeli/"
- install='kdegames-palapeli.install'
- cd $srcdir/build/palapeli
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/palapeli
- make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdegames/kdegames-kbattleship.install b/staging/kdegames/kdegames-kbattleship.install
deleted file mode 100644
index ac4516ed0..000000000
--- a/staging/kdegames/kdegames-kbattleship.install
+++ /dev/null
@@ -1,24 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
- ggz-config -i -f -m usr/share/ggz/kbattleship.dsc >& /dev/null
-}
-
-pre_remove() {
- if [ -f usr/share/ggz/kbattleship.dsc ]; then
- ggz-config -r -m usr/share/ggz/kbattleship.dsc >& /dev/null
- fi
-}
-
-pre_upgrade() {
- pre_remove
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
diff --git a/staging/kdegames/kdegames-kfourinline.install b/staging/kdegames/kdegames-kfourinline.install
deleted file mode 100644
index 9b20edb30..000000000
--- a/staging/kdegames/kdegames-kfourinline.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdegames/kdegames-kigo.install b/staging/kdegames/kdegames-kigo.install
deleted file mode 100644
index 9b20edb30..000000000
--- a/staging/kdegames/kdegames-kigo.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdegames/kdegames-kolf.install b/staging/kdegames/kdegames-kolf.install
deleted file mode 100644
index 9b20edb30..000000000
--- a/staging/kdegames/kdegames-kolf.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdegames/kdegames-kreversi.install b/staging/kdegames/kdegames-kreversi.install
deleted file mode 100644
index 4623e6e49..000000000
--- a/staging/kdegames/kdegames-kreversi.install
+++ /dev/null
@@ -1,22 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- ggz-config -i -f -m usr/share/ggz/kreversi.dsc >& /dev/null
-}
-
-pre_remove() {
- if [ -f usr/share/ggz/kreversi.dsc ]; then
- ggz-config -r -m usr/share/ggz/kreversi.dsc >& /dev/null
- fi
-}
-
-pre_upgrade() {
- pre_remove
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
diff --git a/staging/kdegames/kdegames-kspaceduel.install b/staging/kdegames/kdegames-kspaceduel.install
deleted file mode 100644
index 9b20edb30..000000000
--- a/staging/kdegames/kdegames-kspaceduel.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdegames/kdegames-ksquares.install b/staging/kdegames/kdegames-ksquares.install
deleted file mode 100644
index 5a619897d..000000000
--- a/staging/kdegames/kdegames-ksquares.install
+++ /dev/null
@@ -1,22 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- ggz-config -i -f -m usr/share/ggz/ksquares.dsc >& /dev/null
-}
-
-pre_remove() {
- if [ -f usr/share/ggz/ksquares.dsc ]; then
- ggz-config -r -m usr/share/ggz/ksquares.dsc >& /dev/null
- fi
-}
-
-pre_upgrade() {
- pre_remove
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
diff --git a/staging/kdegames/kdegames-ktuberling.install b/staging/kdegames/kdegames-ktuberling.install
deleted file mode 100644
index 9b20edb30..000000000
--- a/staging/kdegames/kdegames-ktuberling.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdegames/kdegames-lskat.install b/staging/kdegames/kdegames-lskat.install
deleted file mode 100644
index 9b20edb30..000000000
--- a/staging/kdegames/kdegames-lskat.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdegames/kdegames-palapeli.install b/staging/kdegames/kdegames-palapeli.install
deleted file mode 100644
index c77e68041..000000000
--- a/staging/kdegames/kdegames-palapeli.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-mime-database usr/share/mime &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdegames/kdegames.install b/staging/kdegames/kdegames.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdegames/kdegames.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdegraphics/PKGBUILD b/staging/kdegraphics/PKGBUILD
deleted file mode 100644
index 713f57cbd..000000000
--- a/staging/kdegraphics/PKGBUILD
+++ /dev/null
@@ -1,141 +0,0 @@
-# $Id: PKGBUILD 126531 2011-06-06 06:06:03Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdegraphics
-pkgname=('kdegraphics-gwenview'
- 'kdegraphics-kamera'
- 'kdegraphics-kcolorchooser'
- 'kdegraphics-kgamma'
- 'kdegraphics-kolourpaint'
- 'kdegraphics-kruler'
- 'kdegraphics-ksnapshot'
- 'kdegraphics-libs'
- 'kdegraphics-okular')
-pkgver=4.6.4
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegraphics')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'qimageblitz' 'sane' 'lcms'
- 'libxxf86vm' 'poppler-qt' 'libspectre' 'chmlib' 'djvulibre'
- 'ebook-tools' 'kdebase-runtime')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('a208cef52de6345996a7cc68b1c09944da7253aa')
-
-build() {
- cd ${srcdir}
- mkdir build
- cd build
- cmake ../${pkgbase}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package_kdegraphics-gwenview() {
- pkgdesc='A simple image viewer'
- depends=('kdebase-runtime' 'kdegraphics-libs')
- url="http://kde.org/applications/graphics/gwenview/"
- replaces=('gwenview' 'gwenview-i18n')
- install='kdegraphics.install'
- cd $srcdir/build/gwenview
- make DESTDIR=$pkgdir install
- cd $srcdir/build/gwenview/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdegraphics-kamera() {
- pkgdesc='Configure Kamera'
- depends=('kdelibs' 'libgphoto2')
- cd $srcdir/build/kamera
- make DESTDIR=$pkgdir install
- cd $srcdir/build/kamera/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdegraphics-kcolorchooser() {
- pkgdesc='Color Chooser'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/graphics/kcolorchooser/"
- install='kdegraphics.install'
- cd $srcdir/build/kcolorchooser
- make DESTDIR=$pkgdir install
-}
-
-package_kdegraphics-kgamma() {
- pkgdesc='A monitor calibration tool'
- # note on libxxf86vm:
- # not detected by namcap because libgl depends on it
- # but nvidia providing libgl does not depend on libxxf86vm
- depends=('kdebase-runtime' 'libxxf86vm')
- install='kdegraphics.install'
- cd $srcdir/build/kgamma
- make DESTDIR=$pkgdir install
- cd $srcdir/build/kgamma/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdegraphics-kolourpaint() {
- pkgdesc='Paint Program'
- depends=('kdebase-runtime' 'qimageblitz' 'kdegraphics-libs')
- url="http://kde.org/applications/graphics/kolourpaint/"
- install='kdegraphics.install'
- cd $srcdir/build/kolourpaint
- make DESTDIR=$pkgdir install
- cd $srcdir/build/kolourpaint/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdegraphics-kruler() {
- pkgdesc='Screen Ruler'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/graphics/kruler/"
- install='kdegraphics.install'
- cd $srcdir/build/kruler
- make DESTDIR=$pkgdir install
- cd $srcdir/build/kruler/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdegraphics-ksnapshot() {
- pkgdesc='Screen Capture Program'
- depends=('kdebase-runtime' 'kdegraphics-libs')
- url="http://kde.org/applications/graphics/ksnapshot/"
- install='kdegraphics.install'
- cd $srcdir/build/ksnapshot
- make DESTDIR=$pkgdir install
- cd $srcdir/build/ksnapshot/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdegraphics-libs() {
- pkgdesc='Support library for KDE Graphics Software'
- groups=()
- depends=('kdelibs' 'sane' 'lcms')
- conflicts=('kdegraphics-ksaneplugin' 'kdegraphics-strigi-analyzer'
- 'kdegraphics-svgpart' 'kdegraphics-thumbnailers')
- replaces=('libkexiv2' 'libkdcraw' 'kdegraphics-ksaneplugin'
- 'kdegraphics-strigi-analyzer' 'kdegraphics-svgpart' 'kdegraphics-thumbnailers')
- install='kdegraphics.install'
- for i in libs ksaneplugin strigi-analyzer svgpart thumbnailers; do
- cd $srcdir/build/${i}
- make DESTDIR=$pkgdir install
- done
- install -D -m644 $srcdir/${pkgbase}-${pkgver}/cmake/modules/FindKSane.cmake \
- $pkgdir/usr/share/apps/cmake/modules/FindKSane.cmake
-}
-
-package_kdegraphics-okular() {
- pkgdesc='Document Viewer'
- depends=('kdebase-runtime' 'qimageblitz' 'poppler-qt' 'chmlib' 'djvulibre'
- 'ebook-tools' 'libspectre')
- url="http://kde.org/applications/graphics/okular/"
- install='kdegraphics.install'
- cd $srcdir/build/okular
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/okular
- make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdegraphics/kdegraphics.install b/staging/kdegraphics/kdegraphics.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdegraphics/kdegraphics.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdelibs/PKGBUILD b/staging/kdelibs/PKGBUILD
deleted file mode 100644
index 7368231c5..000000000
--- a/staging/kdelibs/PKGBUILD
+++ /dev/null
@@ -1,63 +0,0 @@
-# $Id: PKGBUILD 126527 2011-06-06 06:05:44Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=kdelibs
-pkgver=4.6.4
-pkgrel=1
-pkgdesc="KDE Core Libraries"
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-depends=('strigi' 'attica' 'libxss' 'xz' 'openssl' 'soprano' 'krb5'
- 'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt' 'grantlee'
- 'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'xdg-utils'
- 'phonon' 'hicolor-icon-theme' 'upower' 'udisks' 'libxcursor'
- 'docbook-xsl')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'intltool' 'avahi' 'libgl'
- 'hspell')
-replaces=('arts' 'kdelibs-experimental')
-install='kdelibs.install'
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
- 'kde-applications-menu.patch' 'archlinux-menu.patch'
- 'abs-syntax-highlight.patch')
-sha1sums=('088778bdda8b8c7a7b192abbf0d2a0660a20626d'
- '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
- '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
- 'd994f262356af5b9e4e9619646e471bd98c91efb')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
-
- # avoid file conflict with gnome-menu
- patch -p1 -i $srcdir/kde-applications-menu.patch
- # add Archlinux menu entry
- patch -p1 -i $srcdir/archlinux-menu.patch
- # add syntax highlightning for PKGBUILD and .install files
- patch -p1 -i $srcdir/abs-syntax-highlight.patch
-
- cd ${srcdir}
- mkdir build
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DKDE_DISTRIBUTION_TEXT='Arch Linux' \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DSYSCONF_INSTALL_DIR=/etc \
- -DHTML_INSTALL_DIR=/usr/share/doc/kde/html \
- -DKDE_DEFAULT_HOME='.kde4' \
- -DWITH_FAM=OFF \
- -DKAUTH_BACKEND=PolkitQt-1
- make
-}
-
-package() {
- cd $srcdir/build
- make DESTDIR=$pkgdir install
-
- # cert bundle seems to be hardcoded
- # link it to the one from ca-certificates
- rm -f $pkgdir/usr/share/apps/kssl/ca-bundle.crt
- ln -sf /etc/ssl/certs/ca-certificates.crt $pkgdir/usr/share/apps/kssl/ca-bundle.crt
-}
diff --git a/staging/kdelibs/abs-syntax-highlight.patch b/staging/kdelibs/abs-syntax-highlight.patch
deleted file mode 100644
index 477479a9b..000000000
--- a/staging/kdelibs/abs-syntax-highlight.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nura kdelibs-4.3.0.orig/kate/syntax/data/bash.xml kdelibs-4.3.0/kate/syntax/data/bash.xml
---- kdelibs-4.3.0.orig/kate/syntax/data/bash.xml 2009-04-15 12:26:37.000000000 +0200
-+++ kdelibs-4.3.0/kate/syntax/data/bash.xml 2009-07-30 13:24:01.000000000 +0200
-@@ -8,7 +8,7 @@
- <!ENTITY noword "(?![\w$+-])"> <!-- no word, $, + or - following -->
- <!ENTITY pathpart "([\w_@.&#37;*?+-]|\\ )"> <!-- valid character in a file name -->
- ]>
--<language name="Bash" version="2.12" kateversion="2.4" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;.bashrc;.bash_profile;.bash_login;.profile" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
-+<language name="Bash" version="2.12" kateversion="2.4" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;.bashrc;.bash_profile;.bash_login;.profile;PKGBUILD;*.install" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
-
- <!-- (c) 2004 by Wilbert Berendsen (wilbert@kde.nl)
- Changes by Matthew Woehlke (mw_triad@users.sourceforge.net)
diff --git a/staging/kdelibs/archlinux-menu.patch b/staging/kdelibs/archlinux-menu.patch
deleted file mode 100644
index 546784fa2..000000000
--- a/staging/kdelibs/archlinux-menu.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- kdelibs-4.3.98/kded/applications.menu 2010-01-31 19:28:11.000000000 +0000
-+++ kdelibs-4.3.98/kded/applications.menu 2010-01-31 22:25:53.556043077 +0000
-@@ -16,11 +16,19 @@
- </DefaultLayout>
- <Layout>
- <Merge type="menus"/>
-+ <Menuname>Arch Linux</Menuname>
- <Menuname>Applications</Menuname>
- <Merge type="files"/>
- </Layout>
-
- <Menu>
-+ <Name>Arch Linux</Name>
-+ <Directory>Archlinux.directory</Directory>
-+ <Include>
-+ <Category>Archlinux</Category>
-+ </Include>
-+ </Menu>
-+ <Menu>
- <Name>Applications</Name>
- <Directory>kde-unknown.directory</Directory>
- <OnlyUnallocated/>
diff --git a/staging/kdelibs/kde-applications-menu.patch b/staging/kdelibs/kde-applications-menu.patch
deleted file mode 100644
index 4b513298a..000000000
--- a/staging/kdelibs/kde-applications-menu.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- kdelibs-4.3.98/kded/CMakeLists.txt 2009-10-02 14:55:17.000000000 +0000
-+++ kdelibs-4.3.98/kded/CMakeLists.txt 2010-01-31 22:16:13.946933892 +0000
-@@ -69,7 +69,7 @@
- if (WIN32)
- install( FILES applications.menu DESTINATION ${SHARE_INSTALL_PREFIX}/xdg/menus )
- else (WIN32)
--install( FILES applications.menu DESTINATION ${SYSCONF_INSTALL_DIR}/xdg/menus )
-+install( FILES applications.menu DESTINATION ${SYSCONF_INSTALL_DIR}/xdg/menus RENAME kde-applications.menu )
- endif (WIN32)
- install( FILES kdedmodule.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
- install( FILES kded.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update )
---- kdelibs-4.3.98/kded/kbuildsycoca.cpp 2009-12-04 23:10:18.000000000 +0000
-+++ kdelibs-4.3.98/kded/kbuildsycoca.cpp 2010-01-31 22:16:13.962766572 +0000
-@@ -302,7 +302,7 @@
- if (!m_trackId.isEmpty())
- g_vfolder->setTrackId(m_trackId);
-
-- VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true);
-+ VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("kde-applications.menu", true);
-
- KServiceGroup::Ptr entry = g_bsgf->addNew("/", kdeMenu->directoryFile, KServiceGroup::Ptr(), false);
- entry->setLayoutInfo(kdeMenu->layoutList);
diff --git a/staging/kdelibs/kdelibs.install b/staging/kdelibs/kdelibs.install
deleted file mode 100644
index ce5c32e1b..000000000
--- a/staging/kdelibs/kdelibs.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-} \ No newline at end of file
diff --git a/staging/kdemultimedia/PKGBUILD b/staging/kdemultimedia/PKGBUILD
deleted file mode 100644
index 5a501bab1..000000000
--- a/staging/kdemultimedia/PKGBUILD
+++ /dev/null
@@ -1,109 +0,0 @@
-# $Id: PKGBUILD 126540 2011-06-06 06:09:45Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdemultimedia
-pkgname=('kdemultimedia-dragonplayer'
- 'kdemultimedia-ffmpegthumbs'
- 'kdemultimedia-juk'
- 'kdemultimedia-kioslave'
- 'kdemultimedia-kmix'
- 'kdemultimedia-kscd'
- 'kdemultimedia-mplayerthumbs')
-pkgver=4.6.4
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdemultimedia')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-runtime' 'tunepimp'
- 'ffmpeg' 'mplayer' 'pulseaudio' 'libmusicbrainz3')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
- 'mplayerthumbs.config')
-sha1sums=('22178350b72e142b9f5e65a4bb85027f82b14988'
- 'ba016fa2563c14ffcba852c62506b66bfc6ee683')
-
-build() {
- cd ${srcdir}
- mkdir build
- cd build
- cmake ../${pkgbase}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DWITH_Xine=OFF
- make
-}
-
-package_kdemultimedia-dragonplayer() {
- pkgdesc='Video Player'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/multimedia/dragonplayer/"
- install='kdemultimedia.install'
- cd $srcdir/build/dragonplayer
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/dragonplayer
- make DESTDIR=$pkgdir install
-}
-
-package_kdemultimedia-ffmpegthumbs() {
- pkgdesc='Video Files (ffmpegthumbs)'
- depends=('kdebase-runtime' 'ffmpeg')
- install='kdemultimedia.install'
- cd $srcdir/build/ffmpegthumbs
- make DESTDIR=$pkgdir install
-}
-
-package_kdemultimedia-juk() {
- pkgdesc='Music Player'
- depends=('kdebase-runtime' 'tunepimp')
- url="http://kde.org/applications/multimedia/juk"
- install='kdemultimedia.install'
- cd $srcdir/build/juk
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/juk
- make DESTDIR=$pkgdir install
-}
-
-package_kdemultimedia-kioslave() {
- pkgdesc='Audio CD Browser'
- depends=('kdelibs' 'libmusicbrainz3' 'cdparanoia')
- conflicts=('kdemultimedia-libkcddb' 'kdemultimedia-libkcompactdisc')
- replaces=('kdemultimedia-libkcddb' 'kdemultimedia-libkcompactdisc')
- for i in kioslave doc/kioslave libkcddb libkcompactdisc; do
- cd $srcdir/build/${i}
- make DESTDIR=$pkgdir install
- done
-}
-
-package_kdemultimedia-kmix() {
- pkgdesc='Sound Mixer'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/multimedia/kmix"
- install='kdemultimedia.install'
- cd $srcdir/build/kmix
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kmix
- make DESTDIR=$pkgdir install
-}
-
-package_kdemultimedia-kscd() {
- pkgdesc='CD Player'
- depends=('kdebase-runtime' 'libmusicbrainz3')
- url="http://kde.org/applications/multimedia/kscd"
- install='kdemultimedia.install'
- cd $srcdir/build/kscd
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kcontrol/cddbretrieval
- make DESTDIR=$pkgdir install
-}
-
-package_kdemultimedia-mplayerthumbs() {
- pkgdesc='Video Files (MPlayerThumbs)'
- depends=('kdebase-runtime' 'mplayer')
- replaces=('mplayerthumbs')
- conflicts=('mplayerthumbs')
- cd $srcdir/build/mplayerthumbs
- make DESTDIR=$pkgdir install
- install -D -m644 $srcdir/mplayerthumbs.config $pkgdir/usr/share/config/mplayerthumbs
-}
diff --git a/staging/kdemultimedia/kdemultimedia.install b/staging/kdemultimedia/kdemultimedia.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdemultimedia/kdemultimedia.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdemultimedia/mplayerthumbs.config b/staging/kdemultimedia/mplayerthumbs.config
deleted file mode 100644
index 761a17953..000000000
--- a/staging/kdemultimedia/mplayerthumbs.config
+++ /dev/null
@@ -1,2 +0,0 @@
-[MPlayerThumbsCfg]
-backend=0
diff --git a/staging/kdenetwork/PKGBUILD b/staging/kdenetwork/PKGBUILD
deleted file mode 100644
index a4acbfbfb..000000000
--- a/staging/kdenetwork/PKGBUILD
+++ /dev/null
@@ -1,116 +0,0 @@
-# $Id: PKGBUILD 126547 2011-06-06 06:35:00Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdenetwork
-pkgname=('kdenetwork-filesharing'
- 'kdenetwork-kdnssd'
- 'kdenetwork-kget'
- 'kdenetwork-kopete'
- 'kdenetwork-kppp'
- 'kdenetwork-krdc'
- 'kdenetwork-krfb')
-pkgver=4.6.4
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdenetwork')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr'
- 'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver' 'libmsn'
- 'ppp' 'v4l-utils' 'libidn' 'rdesktop' 'qimageblitz' 'libxdamage' 'libgadu'
- 'telepathy-qt4' 'libktorrent')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('63bb58a457aed790e109a9dbeab73abb8c7ea1b2')
-
-build() {
- cd ${srcdir}
- mkdir build
- cd build
- cmake ../${pkgbase}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DMOZPLUGIN_INSTALL_DIR=/usr/lib/mozilla/plugins/ \
- -DWITH_Xmms=OFF \
- -DWITH_WLM_MEDIASTREAMER=OFF \
- -DWITH_LibMeanwhile=OFF \
- -DWITH_msiLBC=OFF
- make
-}
-
-package_kdenetwork-filesharing() {
- pkgdesc='Konqueror properties dialog plugin to share a directory with the local network'
- depends=('kdelibs' 'smbclient')
- install='kdenetwork.install'
- cd $srcdir/build/filesharing
- make DESTDIR=$pkgdir install
-}
-
-package_kdenetwork-kdnssd() {
- pkgdesc='Monitors the network for DNS-SD services'
- depends=('kdelibs')
- cd $srcdir/build/kdnssd
- make DESTDIR=$pkgdir install
-}
-
-package_kdenetwork-kget() {
- pkgdesc='Download Manager'
- depends=('kdebase-workspace' 'kdebase-lib' 'libktorrent')
- optdepends=('python2: YouTube plugin')
- url="http://kde.org/applications/internet/kget/"
- install='kdenetwork.install'
- cd $srcdir/build/kget
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kget
- make DESTDIR=$pkgdir install
-
- # Use the python2 executable
- find ${pkgdir} -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|'
-}
-
-package_kdenetwork-kopete() {
- pkgdesc='Instant Messenger'
- depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr' 'libmsn'
- 'libidn' 'qimageblitz' 'v4l-utils' 'libgadu')
- url="http://kde.org/applications/internet/kopete/"
- install='kdenetwork.install'
- cd $srcdir/build/kopete
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kopete
- make DESTDIR=$pkgdir install
-}
-
-package_kdenetwork-kppp() {
- pkgdesc='Internet Dial-Up Tool'
- depends=('kdebase-runtime' 'ppp')
- url="http://kde.org/applications/internet/kppp/"
- install='kdenetwork.install'
- cd $srcdir/build/kppp
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kppp
- make DESTDIR=$pkgdir install
-}
-
-package_kdenetwork-krdc() {
- pkgdesc='Remote Desktop Client'
- depends=('kdebase-runtime' 'libvncserver' 'rdesktop' 'telepathy-qt4')
- optdepends=('kdebase-keditbookmarks: to edit bookmarks')
- url="http://kde.org/applications/internet/krdc/"
- cd $srcdir/build/krdc
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/krdc
- make DESTDIR=$pkgdir install
-}
-
-package_kdenetwork-krfb() {
- pkgdesc='Desktop Sharing'
- # note on libxdamage:
- # not detected by namcap because libgl depends on it
- # but nvidia providing libgl does not depend on libxdamage
- depends=('kdebase-runtime' 'libvncserver' 'libxdamage')
- cd $srcdir/build/krfb
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/krfb
- make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdenetwork/kdenetwork.install b/staging/kdenetwork/kdenetwork.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdenetwork/kdenetwork.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdepim-runtime/PKGBUILD b/staging/kdepim-runtime/PKGBUILD
deleted file mode 100644
index 0b0e8fb96..000000000
--- a/staging/kdepim-runtime/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 126741 2011-06-07 06:22:29Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=kdepim-runtime
-pkgver=4.6.0
-pkgrel=1
-pkgdesc='KDE PIM Runtime Environment'
-arch=('i686' 'x86_64')
-url='http://pim.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdepimlibs' 'kdebase-runtime')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/kdepim-${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('2a2e29ba805ae2c94fa4da6371693e59575d3ed8')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdepim-runtime/kdepim-runtime.install b/staging/kdepim-runtime/kdepim-runtime.install
deleted file mode 100644
index ce5c32e1b..000000000
--- a/staging/kdepim-runtime/kdepim-runtime.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-} \ No newline at end of file
diff --git a/staging/kdepim/PKGBUILD b/staging/kdepim/PKGBUILD
deleted file mode 100644
index 1f014e745..000000000
--- a/staging/kdepim/PKGBUILD
+++ /dev/null
@@ -1,253 +0,0 @@
-# $Id: PKGBUILD 126753 2011-06-07 06:46:18Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdepim
-pkgname=('kdepim-akonadiconsole'
- 'kdepim-akregator'
- 'kdepim-blogilo'
- 'kdepim-console'
- 'kdepim-kaddressbook'
- 'kdepim-kalarm'
- 'kdepim-kjots'
- 'kdepim-kleopatra'
- 'kdepim-kmail'
- 'kdepim-knode'
- 'kdepim-knotes'
- 'kdepim-kontact'
- 'kdepim-korganizer'
- 'kdepim-kresources'
- 'kdepim-ktimetracker'
- 'kdepim-libkdepim'
- 'kdepim-wizards')
-pkgver=4.6.0
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://pim.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdepim')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss'
- 'pilot-link' 'kde-agent')
-source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('283ea87b68a4750194d785361f6534af59edacf9')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../${pkgbase}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DKDEPIM_BUILD_MOBILE=OFF
- make
-}
-
-package_kdepim-akonadiconsole() {
- pkgdesc='Akonadi Management and Debugging Console'
- depends=('kdepim-libkdepim')
- url='http://pim.kde.org'
- install='kdepim.install'
- cd "${srcdir}"/build/akonadiconsole
- make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-akregator() {
- pkgdesc='A Feed Reader for KDE'
- depends=('kdepim-libkdepim')
- url="http://kde.org/applications/internet/akregator/"
- install='kdepim.install'
- cd "${srcdir}"/build/akregator
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/akregator
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/kontact/plugins/akregator
- make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-blogilo() {
- pkgdesc='A KDE Blogging Client'
- depends=('kdepim-runtime')
- url="http://kde.org/applications/internet/blogilo/"
- replaces=('blogilo')
- conflicts=('blogilo')
- install='kdepim.install'
- cd "${srcdir}"/build/blogilo
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/blogilo
- make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-console() {
- pkgdesc='Command line tool for accessing calendar files'
- depends=('kdepim-runtime')
- url='http://pim.kde.org'
- install='kdepim.install'
- cd "${srcdir}"/build/console
- make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-kaddressbook() {
- pkgdesc='Contact Manager'
- depends=('kdepim-libkdepim')
- url="http://kde.org/applications/office/kaddressbook/"
- install='kdepim.install'
- cd "${srcdir}"/build/kaddressbook
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/kontact/plugins/kaddressbook
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/plugins/kaddressbook
- make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-kalarm() {
- pkgdesc='Personal Alarm Scheduler'
- depends=('kdepim-libkdepim')
- url="http://kde.org/applications/utilities/kalarm/"
- install='kdepim.install'
- cd "${srcdir}"/build/kalarm
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/kalarm
- make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-kjots() {
- pkgdesc='Note Taker'
- depends=('kdepim-libkdepim')
- url="http://kde.org/applications/utilities/kjots/"
- install='kdepim.install'
- cd "${srcdir}"/build/kjots
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/kjots
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/kontact/plugins/kjots
- make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-kleopatra() {
- pkgdesc='Certificate Manager and Unified Crypto GUI'
- depends=('kdepim-libkdepim')
- url="http://kde.org/applications/utilities/kleopatra/"
- install='kdepim-kleopatra.install'
- cd "${srcdir}"/build/kleopatra
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/kleopatra
- make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-kmail() {
- pkgdesc='Mail Client'
- depends=('kdepim-libkdepim')
- url="http://kde.org/applications/internet/kmail/"
- install='kdepim-kmail.install'
- conflicts=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve'
- 'kdepim-mimelib' 'kdepim-plugins')
- replaces=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve'
- 'kdepim-mimelib' 'kdepim-plugins')
- optdepends=('cyrus-sasl-plugins: CRAM-MD5 authentication')
- for i in kmail doc/kmail kmailcvt ksendemail libksieve mailcommon \
- nepomuk_email_feeder ontologies templateparser kontact/plugins/kmail; do
- cd "${srcdir}"/build/${i}
- make DESTDIR="${pkgdir}" install
- done
-}
-
-package_kdepim-knode() {
- pkgdesc='News Reader'
- depends=('kdepim-libkdepim')
- url="http://kde.org/applications/internet/knode/"
- install='kdepim.install'
- cd "${srcdir}"/build/knode
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/knode
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/kontact/plugins/knode
- make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-knotes() {
- pkgdesc='Popup Notes'
- depends=('kdepim-libkdepim')
- url="http://kde.org/applications/utilities/knotes/"
- install='kdepim.install'
- cd "${srcdir}"/build/knotes
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/knotes
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/kontact/plugins/knotes
- make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-kontact() {
- pkgdesc='Personal Information Manager'
- depends=('kdepim-libkdepim')
- url="http://kde.org/applications/office/kontact/"
- install='kdepim.install'
- conflcits=('kdepim-kontactinterfaces')
- replaces=('kdepim-kontactinterfaces')
- for i in kontact/src doc/kontact \
- kontact/plugins/summary kontact/plugins/specialdates; do
- cd "${srcdir}"/build/${i}
- make DESTDIR="${pkgdir}" install
- done
-}
-
-package_kdepim-korganizer() {
- pkgdesc='Calendar and Scheduling Program'
- depends=('kdepim-libkdepim')
- url="http://kde.org/applications/office/korganizer"
- install='kdepim-korganizer.install'
- cd "${srcdir}"/build/korganizer
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/korganizer
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/kontact/plugins/korganizer
- make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-kresources() {
- pkgdesc='KDE PIM resources'
- depends=('kdepim-libkdepim')
- url='http://pim.kde.org'
- cd "${srcdir}"/build/kresources
- make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-ktimetracker() {
- pkgdesc='Personal Time Tracker'
- depends=('kdepim-kresources')
- url="http://kde.org/applications/utilities/ktimetracker/"
- install='kdepim.install'
- cd "${srcdir}"/build/ktimetracker
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/ktimetracker
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/kontact/plugins/ktimetracker
- make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-libkdepim() {
- pkgdesc='Library for KDE PIM'
- groups=()
- depends=('kde-agent' 'kdepim-runtime')
- url='http://pim.kde.org'
- conflicts=('kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp'
- 'kdepim-strigi-analyzer' 'kdepim-akonadi')
- replaces=('kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp'
- 'kdepim-strigi-analyzer' 'kdepim-akonadi')
- for i in akonadi_next calendarsupport calendarviews incidenceeditor-ng \
- kdgantt2 libkdepim libkdepimdbusinterfaces libkleo libkpgp \
- messagecomposer messagecore messagelist messageviewer icons \
- strigi-analyzer plugins/messageviewer plugins/ktexteditor; do
- cd "${srcdir}"/build/${i}
- make DESTDIR="${pkgdir}" install
- done
-}
-
-package_kdepim-wizards() {
- pkgdesc='KDE Groupware Wizard'
- depends=('kdepim-kresources')
- url='http://pim.kde.org'
- cd "${srcdir}"/build/wizards
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdepim/kdepim-kleopatra.install b/staging/kdepim/kdepim-kleopatra.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/kdepim/kdepim-kleopatra.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdepim/kdepim-kmail.install b/staging/kdepim/kdepim-kmail.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/kdepim/kdepim-kmail.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdepim/kdepim-korganizer.install b/staging/kdepim/kdepim-korganizer.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/kdepim/kdepim-korganizer.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdepim/kdepim.install b/staging/kdepim/kdepim.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdepim/kdepim.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdepimlibs/PKGBUILD b/staging/kdepimlibs/PKGBUILD
deleted file mode 100644
index 84a193b31..000000000
--- a/staging/kdepimlibs/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 126528 2011-06-06 06:05:50Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=kdepimlibs
-pkgver=4.6.4
-pkgrel=1
-pkgdesc="KDE PIM Libraries"
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL')
-depends=('kdelibs' 'gpgme' 'akonadi' 'libical' )
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'cyrus-sasl' 'openldap')
-install='kdepimlibs.install'
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('b7e48da0a3fa9c4d435ed2224909a5441450334f')
-
-build() {
- cd ${srcdir}
- mkdir build
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd $srcdir/build
- make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdepimlibs/kdepimlibs.install b/staging/kdepimlibs/kdepimlibs.install
deleted file mode 100644
index 99262607c..000000000
--- a/staging/kdepimlibs/kdepimlibs.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-} \ No newline at end of file
diff --git a/staging/kdeplasma-addons/PKGBUILD b/staging/kdeplasma-addons/PKGBUILD
deleted file mode 100644
index d8482c9bf..000000000
--- a/staging/kdeplasma-addons/PKGBUILD
+++ /dev/null
@@ -1,603 +0,0 @@
-# $Id: PKGBUILD 126542 2011-06-06 06:09:53Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdeplasma-addons
-pkgname=('kdeplasma-addons-applets-bball'
- 'kdeplasma-addons-applets-binary-clock'
- 'kdeplasma-addons-applets-blackboard'
- 'kdeplasma-addons-applets-bookmarks'
- 'kdeplasma-addons-applets-bubblemon'
- 'kdeplasma-addons-applets-calculator'
- 'kdeplasma-addons-applets-charselect'
- 'kdeplasma-addons-applets-comic'
- 'kdeplasma-addons-applets-community'
- 'kdeplasma-addons-applets-dict'
- 'kdeplasma-addons-applets-eyes'
- 'kdeplasma-addons-applets-fifteenpuzzle'
- 'kdeplasma-addons-applets-filewatcher'
- 'kdeplasma-addons-applets-frame'
- 'kdeplasma-addons-applets-fuzzy-clock'
- 'kdeplasma-addons-applets-incomingmsg'
- 'kdeplasma-addons-applets-kdeobservatory'
- 'kdeplasma-addons-applets-kimpanel'
- 'kdeplasma-addons-applets-knowledgebase'
- 'kdeplasma-addons-applets-kolourpicker'
- 'kdeplasma-addons-applets-konqprofiles'
- 'kdeplasma-addons-applets-konsoleprofiles'
- 'kdeplasma-addons-applets-lancelot'
- 'kdeplasma-addons-applets-leavenote'
- 'kdeplasma-addons-applets-life'
- 'kdeplasma-addons-applets-luna'
- 'kdeplasma-addons-applets-magnifique'
- 'kdeplasma-addons-applets-mediaplayer'
- 'kdeplasma-addons-applets-microblog'
- 'kdeplasma-addons-applets-news'
- 'kdeplasma-addons-applets-notes'
- 'kdeplasma-addons-applets-nowplaying'
- 'kdeplasma-addons-applets-paste'
- 'kdeplasma-addons-applets-pastebin'
- 'kdeplasma-addons-applets-plasmaboard'
- 'kdeplasma-addons-applets-previewer'
- 'kdeplasma-addons-applets-qalculate'
- 'kdeplasma-addons-applets-rememberthemilk'
- 'kdeplasma-addons-applets-rssnow'
- 'kdeplasma-addons-applets-showdashboard'
- 'kdeplasma-addons-applets-showdesktop'
- 'kdeplasma-addons-applets-social-news'
- 'kdeplasma-addons-applets-spellcheck'
- 'kdeplasma-addons-applets-systemloadviewer'
- 'kdeplasma-addons-applets-timer'
- 'kdeplasma-addons-applets-unitconverter'
- 'kdeplasma-addons-applets-weather'
- 'kdeplasma-addons-applets-weatherstation'
- 'kdeplasma-addons-applets-webslice'
- 'kdeplasma-addons-containments'
- 'kdeplasma-addons-libs'
- 'kdeplasma-addons-runners-audioplayercontrol'
- 'kdeplasma-addons-runners-browserhistory'
- 'kdeplasma-addons-runners-characters'
- 'kdeplasma-addons-runners-contacts'
- 'kdeplasma-addons-runners-converter'
- 'kdeplasma-addons-runners-datetime'
- 'kdeplasma-addons-runners-events'
- 'kdeplasma-addons-runners-katesessions'
- 'kdeplasma-addons-runners-konquerorsessions'
- 'kdeplasma-addons-runners-konsolesessions'
- 'kdeplasma-addons-runners-kopete'
- 'kdeplasma-addons-runners-mediawiki'
- 'kdeplasma-addons-runners-spellchecker'
- 'kdeplasma-addons-wallpapers-mandelbrot'
- 'kdeplasma-addons-wallpapers-marble'
- 'kdeplasma-addons-wallpapers-pattern'
- 'kdeplasma-addons-wallpapers-virus'
- 'kdeplasma-addons-wallpapers-weather')
-pkgver=4.6.4
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL')
-groups=('kde' 'kdeplasma-addons')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-workspace' 'kdegraphics-libs'
- 'kdeedu-marble' 'eigen' 'scim' 'qwt' 'boost')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('8d107bf8cc6b6b9d66e9178b5f18bdc1751a957f')
-
-build() {
- cd ${srcdir}
- mkdir build
- cd build
- cmake ../${pkgbase}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package_kdeplasma-addons-applets-bball() {
- pkgdesc='A bouncy ball for plasma'
- depends=('kdebase-workspace')
- install='kdeplasma-addons-applets.install'
- cd $srcdir/build/applets/bball
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-binary-clock() {
- pkgdesc='Time displayed in binary format'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/binary-clock
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-blackboard() {
- pkgdesc='Black Board'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/blackboard
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-bookmarks() {
- pkgdesc='Quick Access to the Bookmarks'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/bookmarks
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-bubblemon() {
- pkgdesc='A pretty bubble that monitors your system.'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/bubblemon
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-calculator() {
- pkgdesc='Calculate simple sums'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/calculator
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-charselect() {
- pkgdesc='View, select, and copy characters from a font collection'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/charselect
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-comic() {
- pkgdesc='View comic strips from the Internet'
- depends=('kdebase-workspace' 'kdeplasma-addons-libs')
- cd $srcdir/build/applets/comic
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-community() {
- pkgdesc='Communicate using the Social Desktop'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/community
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-dict() {
- pkgdesc='Look up the meaning of words and their translation into different languages'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/dict
- make DESTDIR=$pkgdir install
- # FIXME
- # /usr/share/icons/oxygen/scalable/apps/accessories-dictionary.svgz
- rm -rf $pkgdir/usr/share/icons
-}
-
-package_kdeplasma-addons-applets-eyes() {
- pkgdesc='XEyes clone'
- depends=('kdebase-workspace')
- install='kdeplasma-addons-applets.install'
- cd $srcdir/build/applets/eyes
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-fifteenpuzzle() {
- pkgdesc='Put the pieces in order'
- depends=('kdebase-workspace')
- install='kdeplasma-addons-applets.install'
- cd $srcdir/build/applets/fifteenPuzzle
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-filewatcher() {
- pkgdesc='Watch for changes in specified files'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/fileWatcher
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-frame() {
- pkgdesc='Display your favorite pictures'
- depends=('kdebase-workspace' 'kdegraphics-libs')
- cd $srcdir/build/applets/frame
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-fuzzy-clock() {
- pkgdesc='Time displayed in a less precise format'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/fuzzy-clock
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-incomingmsg() {
- pkgdesc='Notification of new messages'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/incomingmsg
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-kdeobservatory() {
- pkgdesc='Visualize the KDE ecosystem'
- depends=('kdebase-workspace' 'qwt')
- install='kdeplasma-addons-applets.install'
- cd $srcdir/build/applets/kdeobservatory
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-kimpanel() {
- pkgdesc='A generic input method panel for Oriental languages'
- depends=('kdebase-workspace')
- optdepends=('scim: SCIM backend'
- 'fcitx: FCITX backend')
- cd $srcdir/build/applets/kimpanel
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-knowledgebase() {
- pkgdesc='Opendesktop Knowledgebase'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/knowledgebase
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-kolourpicker() {
- pkgdesc='Pick a color from the desktop'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/kolourpicker
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-konqprofiles() {
- pkgdesc='List and launch Konqueror profiles'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/konqprofiles
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-konsoleprofiles() {
- pkgdesc='List and launch Konsole profiles'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/konsoleprofiles
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-lancelot() {
- pkgdesc='Launcher to start applications'
- depends=('kdebase-workspace' 'kdeplasma-addons-libs')
- replaces=('lancelot')
- provides=('lancelot')
- conflicts=('lancelot')
- install='kdeplasma-addons-applets-lancelot.install'
- cd $srcdir/build/applets/lancelot
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-leavenote() {
- pkgdesc='Leave notes for users while they are away'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/leavenote
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-life() {
- pkgdesc='Life'
- depends=('kdebase-workspace')
- install='kdeplasma-addons-applets.install'
- cd $srcdir/build/applets/life
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-luna() {
- pkgdesc='Display moon phases for your location'
- depends=('kdebase-workspace')
- install='kdeplasma-addons-applets.install'
- cd $srcdir/build/applets/luna
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-magnifique() {
- pkgdesc='A magnification glass for the Plasma desktop'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/magnifique
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-mediaplayer() {
- pkgdesc='Widget that can play video and sound'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/mediaplayer
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-microblog() {
- pkgdesc='Update and view your microblog status.'
- depends=('kdebase-workspace' 'kdeplasma-addons-libs')
- cd $srcdir/build/applets/microblog
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-news() {
- pkgdesc='Show news from various sources'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/news
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-notes() {
- pkgdesc='Desktop sticky notes'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/notes
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-nowplaying() {
- pkgdesc='Displays currently playing audio'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/nowplaying
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-paste() {
- pkgdesc='Paste text snippets'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/paste
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-pastebin() {
- pkgdesc='Paste text/images to a remote server'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/pastebin
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-plasmaboard() {
- pkgdesc='A virtual, on-screen keyboard'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/plasmaboard
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-previewer() {
- pkgdesc='Preview This File'
- depends=('kdebase-workspace')
- install='kdeplasma-addons-applets.install'
- cd $srcdir/build/applets/previewer
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-qalculate() {
- pkgdesc='A powerful mathematical equation solver'
- depends=('kdebase-workspace')
- install='kdeplasma-addons-applets.install'
- cd $srcdir/build/applets/qalculate
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-rememberthemilk() {
- pkgdesc='Remember The Milk Todo list applet'
- depends=('kdebase-workspace' 'kdeplasma-addons-libs')
- cd $srcdir/build/applets/rememberthemilk
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-rssnow() {
- pkgdesc='Show news from various sources'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/rssnow
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-showdashboard() {
- pkgdesc='Show the Plasma widget dashboard above other windows'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/showdashboard
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-showdesktop() {
- pkgdesc='Show the Plasma desktop'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/showdesktop
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-social-news() {
- pkgdesc='Stay informed with the Social Desktop'
- replaces=('kdeplasma-addons-applets-opendesktop' 'kdeplasma-addons-applets-opendesktop-activities')
- conflicts=('kdeplasma-addons-applets-opendesktop' 'kdeplasma-addons-applets-opendesktop-activities')
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/social-news
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-spellcheck() {
- pkgdesc='Fast spell checking'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/spellcheck
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-systemloadviewer() {
- pkgdesc='Tiny CPU/RAM/Swap monitor'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/systemloadviewer
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-timer() {
- pkgdesc='Countdown over a specified time period'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/timer
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-unitconverter() {
- pkgdesc='Plasmoid for converting units'
- depends=('kdebase-workspace' 'kdeplasma-addons-libs')
- cd $srcdir/build/applets/unitconverter
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-weather() {
- pkgdesc='Displays Weather information'
- depends=('kdebase-workspace' 'kdeplasma-addons-libs')
- cd $srcdir/build/applets/weather
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-weatherstation() {
- pkgdesc='Weather reports with an LCD display style'
- depends=('kdebase-workspace' 'kdeplasma-addons-libs')
- cd $srcdir/build/applets/weatherstation
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-webslice() {
- pkgdesc='Show a part of a webpage'
- depends=('kdebase-workspace' 'kdeplasma-addons-libs')
- cd $srcdir/build/applets/webslice
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-containments() {
- pkgdesc='Activities types for Plasma shells'
- depends=('kdebase-workspace')
- cd $srcdir/build/containments
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-libs() {
- pkgdesc='Plasma Addon Library'
- depends=('kdebase-workspace')
- groups=()
- replaces=('kdeplasma-addons-dataengines')
- provides=('kdeplasma-addons-dataengines')
- conflicts=('kdeplasma-addons-dataengines')
- cd $srcdir/build/libs
- make DESTDIR=$pkgdir install
- cd $srcdir/build/dataengines
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-audioplayercontrol() {
- pkgdesc='Allows to control MPRIS audio players (it is able to search through Amarok´s collection, too)'
- depends=('kdebase-workspace')
- cd $srcdir/build/runners/audioplayercontrol
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-browserhistory() {
- pkgdesc='Searches in Konqueror´s history'
- depends=('kdebase-workspace')
- cd $srcdir/build/runners/browserhistory
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-characters() {
- pkgdesc='special Characters'
- depends=('kdebase-workspace')
- cd $srcdir/build/runners/characters
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-contacts() {
- pkgdesc='Finds entries in your address book'
- depends=('kdebase-workspace')
- cd $srcdir/build/runners/contacts
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-converter() {
- pkgdesc='Convert values to different units'
- depends=('kdebase-workspace' 'kdeplasma-addons-libs')
- cd $srcdir/build/runners/converter
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-datetime() {
- pkgdesc='The current date and time, locally or in any timezone'
- depends=('kdebase-workspace')
- cd $srcdir/build/runners/datetime
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-events() {
- pkgdesc='Calendar Events runner'
- depends=('kdebase-workspace')
- cd $srcdir/build/runners/events
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-katesessions() {
- pkgdesc='Matches Kate Sessions'
- depends=('kdebase-workspace')
- cd $srcdir/build/runners/katesessions
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-konquerorsessions() {
- pkgdesc='Matches Konqueror Sessions'
- depends=('kdebase-workspace')
- cd $srcdir/build/runners/konquerorsessions
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-konsolesessions() {
- pkgdesc='Matches Konsole Sessions'
- depends=('kdebase-workspace')
- cd $srcdir/build/runners/konsolesessions
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-kopete() {
- pkgdesc='Kopete Contact runner'
- depends=('kdebase-workspace')
- cd $srcdir/build/runners/kopete
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-mediawiki() {
- pkgdesc='Search on Wikitravel'
- depends=('kdebase-workspace')
- cd $srcdir/build/runners/mediawiki
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-spellchecker() {
- pkgdesc='Check the spelling of a word'
- depends=('kdebase-workspace')
- cd $srcdir/build/runners/spellchecker
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-wallpapers-mandelbrot() {
- pkgdesc='Mandelbrot'
- depends=('kdebase-workspace')
- cd $srcdir/build/wallpapers/mandelbrot
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-wallpapers-marble() {
- pkgdesc='Globe'
- depends=('kdebase-workspace' 'kdeedu-marble')
- cd $srcdir/build/wallpapers/marble
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-wallpapers-pattern() {
- pkgdesc='Pattern'
- depends=('kdebase-workspace')
- cd $srcdir/build/wallpapers/pattern
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-wallpapers-virus() {
- pkgdesc='Virus'
- depends=('kdebase-workspace')
- cd $srcdir/build/wallpapers/virus
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-wallpapers-weather() {
- pkgdesc='Weather'
- depends=('kdebase-workspace' 'kdeplasma-addons-libs')
- cd $srcdir/build/wallpapers/weather
- make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdeplasma-addons/kdeplasma-addons-applets-lancelot.install b/staging/kdeplasma-addons/kdeplasma-addons-applets-lancelot.install
deleted file mode 100644
index ce5c32e1b..000000000
--- a/staging/kdeplasma-addons/kdeplasma-addons-applets-lancelot.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-} \ No newline at end of file
diff --git a/staging/kdeplasma-addons/kdeplasma-addons-applets.install b/staging/kdeplasma-addons/kdeplasma-addons-applets.install
deleted file mode 100644
index c4ef46ba8..000000000
--- a/staging/kdeplasma-addons/kdeplasma-addons-applets.install
+++ /dev/null
@@ -1,11 +0,0 @@
-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/staging/kdetoys/PKGBUILD b/staging/kdetoys/PKGBUILD
deleted file mode 100644
index b280bf58c..000000000
--- a/staging/kdetoys/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 126544 2011-06-06 06:10:05Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdetoys
-pkgname=('kdetoys-amor'
- 'kdetoys-kteatime'
- 'kdetoys-ktux')
-pkgver=4.6.4
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdetoys')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-workspace')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('12a0228010a1720649807cb8efe71f572bd24af3')
-
-build() {
- cd $srcdir
- mkdir build
- cd build
- cmake ../${pkgbase}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package_kdetoys-amor() {
- pkgdesc='On-Screen Creature'
- depends=('kdebase-runtime')
- install='kdetoys.install'
- cd $srcdir/build/amor
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/amor
- make DESTDIR=$pkgdir install
-}
-
-package_kdetoys-kteatime() {
- pkgdesc='Tea Cooker'
- depends=('kdebase-runtime')
- install='kdetoys.install'
- cd $srcdir/build/kteatime
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kteatime
- make DESTDIR=$pkgdir install
-}
-
-package_kdetoys-ktux() {
- pkgdesc='KTux'
- depends=('kdebase-workspace' )
- install='kdetoys.install'
- cd $srcdir/build/ktux
- make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdetoys/kdetoys.install b/staging/kdetoys/kdetoys.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdetoys/kdetoys.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdeutils/PKGBUILD b/staging/kdeutils/PKGBUILD
deleted file mode 100644
index 3307f045e..000000000
--- a/staging/kdeutils/PKGBUILD
+++ /dev/null
@@ -1,180 +0,0 @@
-# $Id: PKGBUILD 126545 2011-06-06 06:10:08Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdeutils
-pkgname=('kdeutils-ark'
- 'kdeutils-filelight'
- 'kdeutils-kcalc'
- 'kdeutils-kcharselect'
- 'kdeutils-kdf'
- 'kdeutils-kfloppy'
- 'kdeutils-kgpg'
- 'kdeutils-kremotecontrol'
- 'kdeutils-ktimer'
- 'kdeutils-kwallet'
- 'kdeutils-printer-applet'
- 'kdeutils-superkaramba'
- 'kdeutils-sweeper')
-pkgver=4.6.4
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeutils')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-lib' 'kdebase-workspace'
- 'kdebindings-python' 'system-config-printer-common' 'libarchive' 'qimageblitz'
- 'qjson')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('787653b60ce17e0e5900f9ec30f198b8d7bf1edf')
-
-build() {
- cd ${srcdir}
- mkdir build
- cd build
- cmake ../${pkgbase}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package_kdeutils-ark() {
- pkgdesc='Archiving Tool'
- depends=('kdebase-runtime' 'kdebase-lib' 'libarchive')
- optdepends=('p7zip' 'zip' 'unzip' 'unrar')
- url="http://kde.org/applications/utilities/ark/"
- cd $srcdir/build/ark
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/ark
- make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-filelight() {
- pkgdesc='View disk usage information'
- depends=('kdebase-runtime' 'qimageblitz')
- replaces=('filelight')
- conflicts=('filelight')
- install='kdeutils.install'
- url="http://methylblue.com/filelight/"
- cd $srcdir/build/filelight
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/filelight
- make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-kcalc() {
- pkgdesc='Scientific Calculator'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/utilities/kcalc/"
- cd $srcdir/build/kcalc
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kcalc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-kcharselect() {
- pkgdesc='Character Selector'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/utilities/kcharselect/"
- cd $srcdir/build/kcharselect
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kcharselect
- make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-kdf() {
- pkgdesc='View Disk Usage'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/system/kdiskfree/"
- install='kdeutils.install'
- cd $srcdir/build/kdf
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kdf
- make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-kfloppy() {
- pkgdesc='Floppy Formatter'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/utilities/kfloppy/"
- install='kdeutils.install'
- cd $srcdir/build/kfloppy
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kfloppy
- make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-kgpg() {
- pkgdesc='A GnuPG frontend'
- depends=('kdepim-runtime' 'kde-agent')
- url="http://kde.org/applications/utilities/kgpg"
- install='kdeutils.install'
- cd $srcdir/build/kgpg
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kgpg
- make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-kremotecontrol() {
- pkgdesc='Configure your remote controls for use with applications'
- replaces=('kdeutils-kdelirc')
- conflicts=('kdeutils-kdelirc')
- depends=('kdebase-workspace')
- url="http://kde.org/applications/utilities/kremotecontrol"
- install='kdeutils.install'
- cd $srcdir/build/kremotecontrol
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kcontrol/kremotecontrol
- make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-ktimer() {
- pkgdesc='Countdown Launcher'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/utilities/ktimer"
- install='kdeutils.install'
- cd $srcdir/build/ktimer
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/ktimer
- make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-kwallet() {
- pkgdesc='Wallet Management Tool'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/system/kwalletmanager/"
- install='kdeutils.install'
- cd $srcdir/build/kwallet
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kwallet
- make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-printer-applet() {
- pkgdesc='System tray icon for managing print jobs'
- depends=('kdebase-runtime' 'kdebindings-python' 'system-config-printer-common')
- url="http://kde.org/applications/system/printerapplet/"
- cd $srcdir/build/printer-applet
- make DESTDIR=$pkgdir install
-
- # Use the python2 executable
- find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|'
-}
-
-package_kdeutils-superkaramba() {
- pkgdesc='An engine for cool desktop eyecandy'
- depends=('kdebase-runtime' 'kdebindings-python' 'qimageblitz')
- url="http://kde.org/applications/utilities/superkaramba"
- install='kdeutils.install'
- cd $srcdir/build/superkaramba
- make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-sweeper() {
- pkgdesc='System Cleaner'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/utilities/sweeper/"
- cd $srcdir/build/sweeper
- make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdeutils/kdeutils.install b/staging/kdeutils/kdeutils.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdeutils/kdeutils.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdewebdev/PKGBUILD b/staging/kdewebdev/PKGBUILD
deleted file mode 100644
index c56e2c824..000000000
--- a/staging/kdewebdev/PKGBUILD
+++ /dev/null
@@ -1,67 +0,0 @@
-# $Id: PKGBUILD 126546 2011-06-06 06:10:12Z andrea $
-# Maintainer: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdewebdev
-pkgname=('kdewebdev-kfilereplace'
- 'kdewebdev-kimagemapeditor'
- 'kdewebdev-klinkstatus'
- 'kdewebdev-kommander')
-pkgver=4.6.4
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdewebdev')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'ruby' 'tidyhtml' 'kdepim-runtime'
- 'boost')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('ef6b5142afd5b97ad8c1bffe0557e25477371344')
-
-build() {
- cd $srcdir
- mkdir build
- cd build
- cmake ../${pkgbase}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package_kdewebdev-kfilereplace() {
- pkgdesc='Search & Replace Tool'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/utilities/kfilereplace/"
- install='kdewebdev.install'
- cd $srcdir/build/kfilereplace
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kfilereplace
- make DESTDIR=$pkgdir install
-}
-
-package_kdewebdev-kimagemapeditor() {
- pkgdesc='HTML Image Map Editor'
- depends=('kdebase-runtime')
- install='kdewebdev.install'
- cd $srcdir/build/kimagemapeditor
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kimagemapeditor
- make DESTDIR=$pkgdir install
-}
-
-package_kdewebdev-klinkstatus() {
- pkgdesc='Link Checker'
- depends=('kdepim-runtime' 'tidyhtml')
- install='kdewebdev.install'
- cd $srcdir/build/klinkstatus
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/klinkstatus
- make DESTDIR=$pkgdir install
-}
-
-package_kdewebdev-kommander() {
- pkgdesc='Executor for Kommander dialogs'
- depends=('kdebase-runtime')
- cd $srcdir/build/kommander
- make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdewebdev/kdewebdev.install b/staging/kdewebdev/kdewebdev.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdewebdev/kdewebdev.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/libmtp/PKGBUILD b/staging/libmtp/PKGBUILD
deleted file mode 100644
index 9632630d0..000000000
--- a/staging/libmtp/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 127351 2011-06-13 11:09:19Z stephane $
-# Contributor: damir <damir@archlinux.org>
-# Contributor: Kevin Edmonds <edmondskevin@hotmail.com>
-
-pkgname=libmtp
-pkgver=1.1.0
-pkgrel=1
-pkgdesc="library implementation of the Media Transfer Protocol"
-arch=("i686" "x86_64")
-url="http://libmtp.sourceforge.net"
-license=('LGPL')
-depends=('libusb-compat')
-makedepends=('doxygen')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('fd7b293436528f4c780a9da6e5cc5398')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --with-udev-rules=52-libmtp.rules
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/libsasl/PKGBUILD b/staging/libsasl/PKGBUILD
new file mode 100644
index 000000000..0a92c6a7a
--- /dev/null
+++ b/staging/libsasl/PKGBUILD
@@ -0,0 +1,54 @@
+# $Id: PKGBUILD 127649 2011-06-17 13:03:28Z stephane $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=libsasl
+pkgver=2.1.23
+pkgrel=6
+pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library"
+arch=('i686' 'x86_64')
+url="http://cyrusimap.web.cmu.edu/downloads.html#sasl"
+license=('custom')
+depends=('db>=4.8')
+optdepends=('cyrus-sasl: saslauthd'
+ 'cyrus-sasl-plugins: authentication plugins other than sasldb')
+source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${pkgver}.tar.gz
+ cyrus-sasl-2.1.19-checkpw.c.patch
+ cyrus-sasl-db.patch)
+options=('!makeflags')
+md5sums=('2eb0e48106f0e9cd8001e654f267ecbc'
+ 'e27ddff076342e7a3041c4759817d04b'
+ '0658201497aad359c0d66b0ab8032859')
+
+build() {
+ cd "${srcdir}/cyrus-sasl-${pkgver}"
+ patch -Np0 -i ${srcdir}/cyrus-sasl-2.1.19-checkpw.c.patch
+ patch -Np1 -i ${srcdir}/cyrus-sasl-db.patch
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --disable-anon \
+ --disable-cram \
+ --disable-digest \
+ --disable-gssapi \
+ --enable-login \
+ --disable-otp \
+ --enable-plain \
+ --mandir=/usr/share/man
+ for dir in include lib sasldb plugins utils; do
+ pushd ${dir}
+ make
+ popd
+ done
+}
+
+package() {
+ cd "${srcdir}/cyrus-sasl-${pkgver}"
+ for dir in include lib sasldb plugins utils; do
+ pushd ${dir} || return 1
+ make DESTDIR="${pkgdir}" install
+ popd
+ done
+
+ # install license
+ install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
+}
diff --git a/staging/libsasl/cyrus-sasl-2.1.19-checkpw.c.patch b/staging/libsasl/cyrus-sasl-2.1.19-checkpw.c.patch
new file mode 100644
index 000000000..f7bf44b79
--- /dev/null
+++ b/staging/libsasl/cyrus-sasl-2.1.19-checkpw.c.patch
@@ -0,0 +1,170 @@
+diff -ur ../cyrus-sasl-2.1.19.orig/lib/Makefile.in ./lib/Makefile.in
+--- ../cyrus-sasl-2.1.19.orig/lib/Makefile.in 2004-07-02 21:40:15.000000000 +0200
++++ ./lib/Makefile.in 2004-09-07 13:21:22.746680576 +0200
+@@ -120,7 +120,7 @@
+ JAVA_TRUE = @JAVA_TRUE@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+-LIBS = @LIBS@
++LIBS = -lcrypt @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LIB_CRYPT = @LIB_CRYPT@
+ LIB_DES = @LIB_DES@
+diff -ur ../cyrus-sasl-2.1.19.orig/lib/checkpw.c ./lib/checkpw.c
+--- ../cyrus-sasl-2.1.19.orig/lib/checkpw.c 2004-03-17 14:58:13.000000000 +0100
++++ ./lib/checkpw.c 2004-09-07 13:21:12.645916147 +0200
+@@ -94,6 +94,23 @@
+ # endif
+ #endif
+
++/******************************
++ * crypt(3) patch start *
++ ******************************/
++char *crypt(const char *key, const char *salt);
++
++/* cleartext password formats */
++#define PASSWORD_FORMAT_CLEARTEXT 1
++#define PASSWORD_FORMAT_CRYPT 2
++#define PASSWORD_FORMAT_CRYPTTRAD 3
++#define PASSWORD_SALT_BUF_LEN 22
++
++/* weeds out crypt(3) password's salt */
++int _sasl_get_salt (char *dest, char *src, int format);
++
++/******************************
++ * crypt(3) patch stop *
++ ******************************/
+
+ /* we store the following secret to check plaintext passwords:
+ *
+@@ -143,7 +160,51 @@
+ "*cmusaslsecretPLAIN",
+ NULL };
+ struct propval auxprop_values[3];
+-
++
++ /******************************
++ * crypt(3) patch start *
++ * for password format check *
++ ******************************/
++ sasl_getopt_t *getopt;
++ void *context;
++ const char *p = NULL;
++ /**
++ * MD5: 12 char salt
++ * BLOWFISH: 16 char salt
++ */
++ char salt[PASSWORD_SALT_BUF_LEN];
++ int password_format;
++
++ /* get password format from auxprop configuration */
++ if (_sasl_getcallback(conn, SASL_CB_GETOPT, &getopt, &context) == SASL_OK) {
++ getopt(context, NULL, "password_format", &p, NULL);
++ }
++
++ /* set password format */
++ if (p) {
++ /*
++ memset(pass_format_str, '\0', PASSWORD_FORMAT_STR_LEN);
++ strncpy(pass_format_str, p, (PASSWORD_FORMAT_STR_LEN - 1));
++ */
++ /* modern, modular crypt(3) */
++ if (strncmp(p, "crypt", 11) == 0)
++ password_format = PASSWORD_FORMAT_CRYPT;
++ /* traditional crypt(3) */
++ else if (strncmp(p, "crypt_trad", 11) == 0)
++ password_format = PASSWORD_FORMAT_CRYPTTRAD;
++ /* cleartext password */
++ else
++ password_format = PASSWORD_FORMAT_CLEARTEXT;
++ } else {
++ /* cleartext password */
++ password_format = PASSWORD_FORMAT_CLEARTEXT;
++ }
++
++ /******************************
++ * crypt(3) patch stop *
++ * for password format check *
++ ******************************/
++
+ if (!conn || !userstr)
+ return SASL_BADPARAM;
+
+@@ -180,14 +241,31 @@
+ goto done;
+ }
+
+- /* At the point this has been called, the username has been canonified
+- * and we've done the auxprop lookup. This should be easy. */
+- if(auxprop_values[0].name
+- && auxprop_values[0].values
+- && auxprop_values[0].values[0]
+- && !strcmp(auxprop_values[0].values[0], passwd)) {
+- /* We have a plaintext version and it matched! */
+- return SASL_OK;
++
++ /******************************
++ * crypt(3) patch start *
++ ******************************/
++
++ /* get salt */
++ _sasl_get_salt(salt, (char *) auxprop_values[0].values[0], password_format);
++
++ /* crypt(3)-ed password? */
++ if (password_format != PASSWORD_FORMAT_CLEARTEXT) {
++ /* compare password */
++ if (auxprop_values[0].name && auxprop_values[0].values && auxprop_values[0].values[0] && strcmp(crypt(passwd, salt), auxprop_values[0].values[0]) == 0)
++ return SASL_OK;
++ else
++ ret = SASL_BADAUTH;
++ }
++ else if (password_format == PASSWORD_FORMAT_CLEARTEXT) {
++ /* compare passwords */
++ if (auxprop_values[0].name && auxprop_values[0].values && auxprop_values[0].values[0] && strcmp(auxprop_values[0].values[0], passwd) == 0)
++ return SASL_OK;
++ else
++ ret = SASL_BADAUTH;
++ /******************************
++ * crypt(3) patch stop *
++ ******************************/
+ } else if(auxprop_values[1].name
+ && auxprop_values[1].values
+ && auxprop_values[1].values[0]) {
+@@ -975,3 +1053,37 @@
+ #endif
+ { NULL, NULL }
+ };
++
++/* weeds out crypt(3) password's salt */
++int _sasl_get_salt (char *dest, char *src, int format) {
++ int num; /* how many characters is salt long? */
++ switch (format) {
++ case PASSWORD_FORMAT_CRYPT:
++ /* md5 crypt */
++ if (src[1] == '1')
++ num = 12;
++ /* blowfish crypt */
++ else if (src[1] == '2')
++ num = (src[1] == '2' && src[2] == 'a') ? 17 : 16;
++ /* traditional crypt */
++ else
++ num = 2;
++ break;
++
++ case PASSWORD_FORMAT_CRYPTTRAD:
++ num = 2;
++ break;
++
++ default:
++ return 1;
++ }
++
++ /* destroy destination */
++ memset(dest, '\0', (num + 1));
++
++ /* copy salt to destination */
++ strncpy(dest, src, num);
++
++ return 1;
++}
++
diff --git a/staging/libsasl/cyrus-sasl-db.patch b/staging/libsasl/cyrus-sasl-db.patch
new file mode 100644
index 000000000..08758ab85
--- /dev/null
+++ b/staging/libsasl/cyrus-sasl-db.patch
@@ -0,0 +1,34 @@
+diff -urN aaa/cyrus-sasl-2.1.22/cmulocal/berkdb.m4 cyrus-sasl-2.1.22/cmulocal/berkdb.m4
+--- aaa/cyrus-sasl-2.1.22/cmulocal/berkdb.m4 2005-04-26 21:14:07.000000000 +0200
++++ cyrus-sasl-2.1.22/cmulocal/berkdb.m4 2006-10-02 20:36:17.137852392 +0200
+@@ -213,7 +213,7 @@
+ fi
+
+ saved_LIBS=$LIBS
+- for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
++ for dbname in db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
+ do
+ LIBS="$saved_LIBS -l$dbname"
+ AC_TRY_LINK([#include <db.h>],
+--- cyrus-sasl-2.1.23/sasldb/db_berkeley.c.orig 2009-04-28 17:09:18.000000000 +0200
++++ cyrus-sasl-2.1.23/sasldb/db_berkeley.c 2010-05-18 21:02:20.418940098 +0200
+@@ -100,7 +100,7 @@
+ ret = db_create(mbdb, NULL, 0);
+ if (ret == 0 && *mbdb != NULL)
+ {
+-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
++#if (DB_VERSION_MAJOR > 4) || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
+ ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660);
+ #else
+ ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660);
+--- cyrus-sasl-2.1.23/utils/dbconverter-2.c.orig 2003-02-13 20:56:17.000000000 +0100
++++ cyrus-sasl-2.1.23/utils/dbconverter-2.c 2010-05-18 21:11:09.982932556 +0200
+@@ -214,7 +214,7 @@
+ ret = db_create(mbdb, NULL, 0);
+ if (ret == 0 && *mbdb != NULL)
+ {
+-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
++#if (DB_VERSION_MAJOR > 4) || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
+ ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664);
+ #else
+ ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664);
diff --git a/staging/perl/ChangeLog b/staging/perl/ChangeLog
new file mode 100644
index 000000000..fd53c2560
--- /dev/null
+++ b/staging/perl/ChangeLog
@@ -0,0 +1,61 @@
+2011-06-16 Angel Velasquez <angvp@archlinux.org>
+ * Fixed #FS24660
+ * Rebuilt against db 5.2.28
+
+2011-05-16 Angel Velasquez <angvp@archlinux.org>
+ * perl 5.14.0
+ * Removed patch for h2ph warning from 5.12.3
+ * Removed provides array, you can use corelist -v 5.14.0 to know the
+ modules included with the perl core, through Module::CoreList (thx j3nnn1
+ for the tip)
+
+2010-11-07 kevin <kevin@archlinux.org>
+
+ * perl 5.12.2-1
+ - Using /usr/bin/*_perl for script directories
+
+2010-11-06 kevin <kevin@archlinux.org>
+
+ - Removed otherlibdirs directive from Configure
+ - Removed /usr/*/perl5/site_perl/5.10.1 from INC
+ - Finally removed legacy dirs /usr/lib/perl5/current and
+ /usr/lib/perl5/site_perl/current from @INC
+
+2010-05-23 kevin <kevin@archlinux.org>
+
+ * perl 5.12.1-2
+ - Francois updated the provides array.
+
+2010-05-23 kevin <kevin@archlinux.org>
+
+ * perl 5.12.1-1
+
+2010-05-16 kevin <kevin@archlinux.org>
+
+ * perl 5.12.0-2
+
+2010-05-12 kevin <kevin@archlinux.org>
+
+ - FS#19411. Removed the for loop in perlbin.sh which didn't work on zsh.
+ This makes the loop variables unnecessary so the script no longer
+ pollutes the user's environment.
+ - FS#19427. Added /usr/*/perl5/site_perl/5.10.1 to otherlibdirs to support
+ user built modules.
+
+2010-05-09 kevin <kevin@archlinux.org>
+
+ * perl 5.12.0-1
+ - Modified perlbin.sh to only add existing dirs to PATH. Fixes FS#17402,
+ path points to non-existant directories
+
+2010-05-07 kevin <kevin@archlinux.org>
+
+ - Added this changelog.
+ - Added -Dinc_version_list=none to fix FS#19136, double entry in @INC.
+ This removes the duplicates and versioned directory entries.
+ - Change scriptdirs to /usr/lib/perl5/{core,vendor,site}_perl/bin to fix
+ Fix FS#13808, binaries don't follow FHS.
+ - Stopped using versioned directories in sitelib and sitearch.
+
+
+# vim: set ft=changelog ts=4 sw=4 et:
diff --git a/staging/perl/PKGBUILD b/staging/perl/PKGBUILD
new file mode 100644
index 000000000..bb4053b20
--- /dev/null
+++ b/staging/perl/PKGBUILD
@@ -0,0 +1,94 @@
+# $Id: PKGBUILD 127616 2011-06-17 07:01:46Z angvp $
+# Maintainer: Angel Velasquez <angvp@archlinux.org>
+# Contributor: kevin <kevin.archlinux.org>
+# Contributor: judd <jvinet.zeroflux.org>
+# Contributor: francois <francois.archlinux.org>
+pkgname=perl
+pkgver=5.14.0
+pkgrel=3
+pkgdesc="A highly capable, feature-rich programming language"
+arch=(i686 x86_64)
+license=('GPL' 'PerlArtistic')
+url="http://www.perl.org"
+groups=('base')
+depends=('gdbm' 'db' 'coreutils' 'glibc' 'sh')
+changelog=ChangeLog
+source=(http://www.cpan.org/src/5.0/perl-${pkgver}.tar.bz2 perlbin.sh)
+install=perl.install
+options=('!makeflags' '!purge')
+md5sums=('e7457deea78330c5f8eebb2fd2a45479'
+ 'f86eb0dba1638ca6d1c8fff1b06c2a71')
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+
+ if [ "${CARCH}" = "x86_64" ]; then
+ # for x86_64
+ arch_opts="-Dcccdlflags='-fPIC'"
+ else
+ # for i686
+ arch_opts=""
+ fi
+ ./Configure -des -Dusethreads -Duseshrplib -Doptimize="${CFLAGS}" \
+ -Dprefix=/usr -Dinstallprefix=${pkgdir}/usr -Dvendorprefix=/usr \
+ -Dprivlib=/usr/share/perl5/core_perl \
+ -Darchlib=/usr/lib/perl5/core_perl \
+ -Dsitelib=/usr/share/perl5/site_perl \
+ -Dsitearch=/usr/lib/perl5/site_perl \
+ -Dvendorlib=/usr/share/perl5/vendor_perl \
+ -Dvendorarch=/usr/lib/perl5/vendor_perl \
+ -Dscriptdir=/usr/bin/core_perl \
+ -Dsitescript=/usr/bin/site_perl \
+ -Dvendorscript=/usr/bin/vendor_perl \
+ -Dinc_version_list=none \
+ -Dman1ext=1perl -Dman3ext=3perl ${arch_opts}
+ make
+}
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make install
+
+ ### Perl Settings ###
+ # Change man page extensions for site and vendor module builds.
+ # Use archlinux email address instead of my own.
+ sed -e '/^man1ext=/ s/1perl/1p/' -e '/^man3ext=/ s/3perl/3pm/' \
+ -e "/^cf_email=/ s/'.*'/'kevin@archlinux.org'/" \
+ -e "/^perladmin=/ s/'.*'/'kevin@archlinux.org'/" \
+ -i ${pkgdir}/usr/lib/perl5/core_perl/Config_heavy.pl
+
+ ### CPAN Settings ###
+ # Set CPAN default config to use the site directories.
+ sed -e '/(makepl_arg =>/ s/""/"INSTALLDIRS=site"/' \
+ -e '/(mbuildpl_arg =>/ s/""/"installdirs=site"/' \
+ -i ${pkgdir}/usr/share/perl5/core_perl/CPAN/FirstTime.pm
+
+ ### CPANPLUS Settings ###
+ # Set CPANPLUS default config to use the site directories.
+ sed -e "/{'makemakerflags'}/ s/'';/'INSTALLDIRS=site';/" \
+ -e "/{'buildflags'}/ s/'';/'installdirs=site';/" \
+ -i ${pkgdir}/usr/share/perl5/core_perl/CPANPLUS/Config.pm
+
+ # Profile script so set paths to perl scripts.
+ install -D -m755 ${srcdir}/perlbin.sh \
+ ${pkgdir}/etc/profile.d/perlbin.sh
+
+ (cd ${pkgdir}/usr/bin; mv perl${pkgver} perl)
+ (cd ${pkgdir}/usr/bin/core_perl; ln -sf c2ph pstruct; ln -sf s2p psed)
+ grep -Rl "${pkgdir}" ${pkgdir}/usr | \
+ xargs sed -i "s^${pkgdir}^^g"
+
+ # Remove all pod files *except* those under /usr/share/perl5/core_perl/pod/
+ # (FS#16488)
+ rm -f $pkgdir/usr/share/perl5/core_perl/*.pod
+ for d in $pkgdir/usr/share/perl5/core_perl/*; do
+ if [ -d $d -a $(basename $d) != "pod" ]; then
+ find $d -name *.pod -delete
+ fi
+ done
+ find $pkgdir/usr/lib -name *.pod -delete
+ find $pkgdir -name .packlist -delete
+ # Add /usr/lib/perl5/core_perl/CORE/ to standard library path (FS#24660)
+ install -dv ${pkgdir}/etc/ld.so.conf.d
+ echo "/usr/lib/perl5/core_perl/CORE" > ${pkgdir}/etc/ld.so.conf.d/perl.conf
+}
+
diff --git a/staging/perl/fix-h2ph-and-tests.patch b/staging/perl/fix-h2ph-and-tests.patch
new file mode 100644
index 000000000..a2d176ec6
--- /dev/null
+++ b/staging/perl/fix-h2ph-and-tests.patch
@@ -0,0 +1,104 @@
+From 8d66b3f930dc6d88b524d103e304308ae73a46e7 Mon Sep 17 00:00:00 2001
+From: Robin Barker <rmbarker@cpan.org>
+Date: Thu, 22 Apr 2010 11:51:20 +0100
+Subject: [PATCH 1/1] Fix h2ph and test
+
+---
+ lib/h2ph.t | 12 ++++++++++--
+ utils/h2ph.PL | 28 +++++++++++++++++++++++-----
+ 2 files changed, 33 insertions(+), 7 deletions(-)
+
+diff --git a/lib/h2ph.t b/lib/h2ph.t
+index 27dd7b9..8d62d46 100644
+--- a/lib/h2ph.t
++++ b/lib/h2ph.t
+@@ -18,7 +18,7 @@ if (!(-e $extracted_program)) {
+ exit 0;
+ }
+
+-plan(4);
++plan(5);
+
+ # quickly compare two text files
+ sub txt_compare {
+@@ -41,8 +41,16 @@ $result = runperl( progfile => 'lib/h2ph.pht',
+ stderr => 1 );
+ like( $result, qr/syntax OK$/, "output compiles");
+
++$result = runperl( progfile => '_h2ph_pre.ph',
++ switches => ['-c'],
++ stderr => 1 );
++like( $result, qr/syntax OK$/, "preamble compiles");
++
+ $result = runperl( switches => ["-w"],
+- prog => '$SIG{__WARN__} = sub { die $_[0] }; require q(lib/h2ph.pht);');
++ stderr => 1,
++ prog => <<'PROG' );
++$SIG{__WARN__} = sub { die $_[0] }; require q(lib/h2ph.pht);
++PROG
+ is( $result, '', "output free of warnings" );
+
+ # cleanup
+diff --git a/utils/h2ph.PL b/utils/h2ph.PL
+index 8f56db4..1255807 100644
+--- a/utils/h2ph.PL
++++ b/utils/h2ph.PL
+@@ -401,7 +401,10 @@ if ($opt_e && (scalar(keys %bad_file) > 0)) {
+ exit $Exit;
+
+ sub expr {
+- $new = '"(assembly code)"' and return if /\b__asm__\b/; # freak out.
++ if (/\b__asm__\b/) { # freak out
++ $new = '"(assembly code)"';
++ return
++ }
+ my $joined_args;
+ if(keys(%curargs)) {
+ $joined_args = join('|', keys(%curargs));
+@@ -770,7 +773,7 @@ sub inc_dirs
+ sub build_preamble_if_necessary
+ {
+ # Increment $VERSION every time this function is modified:
+- my $VERSION = 2;
++ my $VERSION = 3;
+ my $preamble = "$Dest_dir/_h2ph_pre.ph";
+
+ # Can we skip building the preamble file?
+@@ -798,7 +801,16 @@ sub build_preamble_if_necessary
+ # parenthesized value: d=(v)
+ $define{$_} = $1;
+ }
+- if ($define{$_} =~ /^([+-]?(\d+)?\.\d+([eE][+-]?\d+)?)[FL]?$/) {
++ if (/^(\w+)\((\w)\)$/) {
++ my($macro, $arg) = ($1, $2);
++ my $def = $define{$_};
++ $def =~ s/$arg/\$\{$arg\}/g;
++ print PREAMBLE <<DEFINE;
++unless (defined &$macro) { sub $macro(\$) { my (\$$arg) = \@_; \"$def\" } }
++
++DEFINE
++ } elsif
++ ($define{$_} =~ /^([+-]?(\d+)?\.\d+([eE][+-]?\d+)?)[FL]?$/) {
+ # float:
+ print PREAMBLE
+ "unless (defined &$_) { sub $_() { $1 } }\n\n";
+@@ -807,8 +819,14 @@ sub build_preamble_if_necessary
+ print PREAMBLE
+ "unless (defined &$_) { sub $_() { $1 } }\n\n";
+ } elsif ($define{$_} =~ /^\w+$/) {
+- print PREAMBLE
+- "unless (defined &$_) { sub $_() { &$define{$_} } }\n\n";
++ my $def = $define{$_};
++ if ($isatype{$def}) {
++ print PREAMBLE
++ "unless (defined &$_) { sub $_() { \"$def\" } }\n\n";
++ } else {
++ print PREAMBLE
++ "unless (defined &$_) { sub $_() { &$def } }\n\n";
++ }
+ } else {
+ print PREAMBLE
+ "unless (defined &$_) { sub $_() { \"",
+--
+1.6.5.2.74.g610f9.dirty
+
diff --git a/staging/perl/perl.install b/staging/perl/perl.install
new file mode 100644
index 000000000..3f7d58f23
--- /dev/null
+++ b/staging/perl/perl.install
@@ -0,0 +1,18 @@
+# arg 1: the new package version
+post_install() {
+ for ver in 5.8.{0,1,2,3,4,5,6,7,8}; do
+ [ -h usr/lib/perl5/$ver ] && rm usr/lib/perl5/$ver
+ [ -h usr/lib/perl5/site_perl/$ver ] && rm usr/lib/perl5/site_perl/$ver
+ [ -h usr/bin/perl$ver ] && rm usr/bin/perl$ver
+ done
+ return 0
+}
+
+post_upgrade() {
+ echo '- The directories /usr/lib/perl5/current, /usr/lib/perl5/site_perl/current,'
+ echo ' /usr/lib/perl5/site_perl/5.10.1, and /usr/share/perl5/site_perl/5.10.1'
+ echo ' have been removed from @INC.'
+
+ echo '- The script/binary directories are now /usr/bin/*_perl instead of'
+ echo ' /usr/lib/perl5/*_perl/bin which will be eventually removed.'
+}
diff --git a/staging/perl/perlbin.sh b/staging/perl/perlbin.sh
new file mode 100755
index 000000000..09811a8b4
--- /dev/null
+++ b/staging/perl/perlbin.sh
@@ -0,0 +1,23 @@
+# Set path to perl scriptdirs if they exist
+# https://wiki.archlinux.org/index.php/Perl_Policy#Binaries_and_Scripts
+# Added /usr/bin/*_perl dirs for scripts
+# Remove /usr/lib/perl5/*_perl/bin in next release
+
+[ -d /usr/bin/site_perl ] &&
+ PATH=$PATH:/usr/bin/site_perl
+[ -d /usr/lib/perl5/site_perl/bin ] &&
+ PATH=$PATH:/usr/lib/perl5/site_perl/bin
+
+[ -d /usr/bin/vendor_perl ] &&
+ PATH=$PATH:/usr/bin/vendor_perl
+[ -d /usr/lib/perl5/vendor_perl/bin ] &&
+ PATH=$PATH:/usr/lib/perl5/vendor_perl/bin
+
+[ -d /usr/bin/core_perl ] &&
+ PATH=$PATH:/usr/bin/core_perl
+
+export PATH
+
+# If you have modules in non-standard directories you can add them here.
+#export PERLLIB=dir1:dir2
+
diff --git a/staging/rhythmbox/PKGBUILD b/staging/rhythmbox/PKGBUILD
deleted file mode 100644
index a1644664b..000000000
--- a/staging/rhythmbox/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 127360 2011-06-13 15:53:46Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-
-pkgname=rhythmbox
-pkgver=2.90.1.git20110610
-pkgrel=2
-pkgdesc="An iTunes-like music player/libary"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.rhythmbox.org"
-depends=('libgpod' 'gvfs-afc' 'libgnome-media-profiles' 'totem-plparser' 'libsoup-gnome' 'gtk3' 'libmusicbrainz3' 'libmtp' 'libnotify'
- 'lirc-utils' 'libwebkit3' 'libdmapsharing' 'media-player-info' 'pygobject' 'gstreamer0.10-python' 'python-gnomekeyring' 'gstreamer0.10-base-plugins'
- 'gstreamer0.10-good-plugins' 'json-glib' 'desktop-file-utils' 'libpeas' 'python-mako' 'dconf')
-makedepends=('pkgconfig' 'gnome-doc-utils>=0.20.1' 'intltool' 'brasero' 'gnome-common' 'gtk-doc' 'gobject-introspection')
-optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs'
- 'gstreamer0.10-bad-plugins: Extra media codecs'
- 'gstreamer0.10-ffmpeg: Extra media codecs'
- 'brasero: cd burning')
-options=('!libtool' '!emptydirs' '!strip')
-install=rhythmbox.install
-#source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.13/${pkgname}-${pkgver}.tar.bz2)
-source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('20e9bf31f3fbd2b4e4db86ab12aeee8175a8a49a5c3ec2081a8ca3880d01fba0')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- export CFLAGS="$CFLAGS -g -O1"
- export CXXFLAGS="$CXXFLAGS -g -O1"
- PYTHON=/usr/bin/python2 ./autogen.sh
- PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
- --libexecdir=/usr/lib/rhythmbox \
- --localstatedir=/var --disable-static \
- --enable-daap --enable-python \
- --with-mdns=avahi --disable-scrollkeeper
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/rhythmbox/rhythmbox.install b/staging/rhythmbox/rhythmbox.install
deleted file mode 100644
index cbea0e6b3..000000000
--- a/staging/rhythmbox/rhythmbox.install
+++ /dev/null
@@ -1,22 +0,0 @@
-pkgname=rhythmbox
-
-post_install() {
- glib-compile-schemas usr/share/glib-2.0/schemas
- update-desktop-database -q
- gtk-update-icon-cache -f -q -t usr/share/icons/hicolor
-}
-
-pre_upgrade() {
- if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
- usr/sbin/gconfpkg --uninstall ${pkgname}
- fi
-}
-
-post_upgrade() {
- post_install $1
-}
-
-
-post_remove() {
- post_install $1
-}
diff --git a/testing/libevent/PKGBUILD b/testing/libevent/PKGBUILD
deleted file mode 100644
index 21f3f6722..000000000
--- a/testing/libevent/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 127366 2011-06-13 18:59:12Z eric $
-# Maintainer:
-# Contributor: Judd <jvinet@zeroflux.org>
-
-pkgname=libevent
-pkgver=2.0.12
-pkgrel=1
-pkgdesc="An event notification library"
-arch=('i686' 'x86_64')
-url="http://www.monkey.org/~provos/libevent/"
-license=('GPL2')
-depends=('openssl')
-optdepends=('python2: to use event_rpcgen.py')
-options=('!libtool')
-source=("http://www.monkey.org/~provos/libevent-$pkgver-stable.tar.gz")
-md5sums=('42986228baf95e325778ed328a93e070')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}-stable"
- sed -i 's#python#python2#' event_rpcgen.py
- ./configure --prefix=/usr --sysconfdir=/etc
- make
-}
-
-check() {
- cd "${srcdir}/${pkgname}-${pkgver}-stable"
- make check
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}-stable"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/links/PKGBUILD b/testing/links/PKGBUILD
deleted file mode 100644
index 95a4a05cd..000000000
--- a/testing/links/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 126520 2011-06-06 04:11:26Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=links
-pkgver=2.3pre2
-pkgrel=1
-pkgdesc="A text WWW browser, similar to Lynx"
-arch=('i686' 'x86_64')
-url="http://links.twibright.com/"
-license=('GPL')
-depends=('bzip2' 'zlib' 'openssl' 'gpm')
-makedepends=('libtiff' 'libpng' 'libxt')
-optdepends=('libx11: for using xlinks' 'libtiff: for using xlinks' 'libpng: for using xlinks')
-provides=('links-g')
-conflicts=('links-g')
-replaces=('links-g')
-source=(http://links.twibright.com/download/${pkgname}-${pkgver}.tar.bz2 links.desktop)
-md5sums=('4a6970d54f4a9c64b8cf5d83a5815c45'
- '7c47b15aaef51f1de129ff3a2afb7eac')
-sha1sums=('5bc210f746559725565bec1d4748b5c56b263ee5'
- 'f600e27c2a71184444f7dd07a10230aa44463a02')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- (cd intl; ./gen-intl; ./synclang)
- ./configure --prefix=/usr --mandir=/usr/share/man --enable-javascript \
- --enable-graphics --with-x --with-fb
- make
- mv links xlinks
-
- ./configure --prefix=/usr --mandir=/usr/share/man --enable-javascript \
- --disable-graphics --without-x --without-fb
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-
- install -m755 xlinks "${pkgdir}/usr/bin/xlinks"
- ln -s links.1.gz "${pkgdir}/usr/share/man/man1/xlinks.1.gz"
-
- install -D -m644 "${srcdir}/links.desktop" "${pkgdir}/usr/share/applications/links.desktop"
- install -d "${pkgdir}/usr/share/pixmaps"
- install -m644 links_16x16_1.xpm links_16x16_2.xpm links_32x32.xpm "${pkgdir}/usr/share/pixmaps/"
-
- install -d "${pkgdir}/usr/share/doc/links/calibration"
- install -m644 doc/links_cal/* "${pkgdir}/usr/share/doc/links/calibration/"
-}
diff --git a/testing/links/links.desktop b/testing/links/links.desktop
deleted file mode 100644
index 9d6338a5b..000000000
--- a/testing/links/links.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Name=Links
-Exec=xlinks -g
-Icon=links_32x32.xpm
-Type=Application
-Terminal=false
-Categories=Network;WebBrowser;
diff --git a/testing/lirc/PKGBUILD b/testing/lirc/PKGBUILD
deleted file mode 100644
index e5c346ebb..000000000
--- a/testing/lirc/PKGBUILD
+++ /dev/null
@@ -1,103 +0,0 @@
-# $Id: PKGBUILD 126857 2011-06-08 09:51:14Z jgc $
-# Maintainer: Paul Mattal <paul@archlinux.org>
-
-pkgbase=lirc
-pkgname=('lirc' 'lirc-utils')
-pkgver=0.9.0
-pkgrel=3
-epoch=1
-_kernver=2.6.39-ARCH
-arch=('i686' 'x86_64')
-url="http://www.lirc.org/"
-license=('GPL')
-makedepends=('help2man' 'kernel26-headers>=2.6.39' 'kernel26-headers<2.6.40' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python')
-options=('!makeflags' '!strip')
-source=(http://prdownloads.sourceforge.net/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2
- lirc_wpc8769l.patch
- lircd-handle-large-config.patch
- lirc_atiusb-kfifo.patch
- kernel-2.6.39.patch
- lircd lircmd lirc.logrotate lircd.conf irexec.conf irexecd)
-md5sums=('b232aef26f23fe33ea8305d276637086'
- '1cce37e18e3f6f46044abab29016d18f'
- 'b70cc9640505205446ec47b7d4779f38'
- '1f8b104a2365d9f93404b143f499059b'
- '087a7d102e1c96bf1179f38db2b0b237'
- '8d0e238dc0eda95e340fe570605da492'
- '85f7fdac55e5256967241864049bf5e9'
- '3deb02604b37811d41816e9b4385fcc3'
- '5b1f8c9cd788a39a6283f93302ce5c6e'
- 'f0c0ac930326168035f0c8e24357ae55'
- '69d099e6deedfa3c1ee2b6e82d9b8bfb')
-
-build() {
- cd "${srcdir}/lirc-${pkgver}"
- patch -Np1 -i "${srcdir}/lirc_wpc8769l.patch"
- patch -Np1 -i "${srcdir}/lircd-handle-large-config.patch"
- patch -Np1 -i "${srcdir}/lirc_atiusb-kfifo.patch"
- patch -Np1 -i "${srcdir}/kernel-2.6.39.patch"
-
- sed -i '/AC_PATH_XTRA/d' configure.ac
- sed -e 's/@X_CFLAGS@//g' \
- -e 's/@X_LIBS@//g' \
- -e 's/@X_PRE_LIBS@//g' \
- -e 's/@X_EXTRA_LIBS@//g' -i Makefile.am tools/Makefile.am
- libtoolize
- autoreconf
-
- PYTHON=python2 ./configure --enable-sandboxed --prefix=/usr \
- --with-driver=all --with-kerneldir=/usr/src/linux-${_kernver}/ \
- --with-moduledir=/lib/modules/${_kernver}/kernel/drivers/misc \
- --with-transmitter
-
- # Remove drivers already in kernel
- sed -e "s:lirc_dev::" -e "s:lirc_bt829::" -e "s:lirc_igorplugusb::" \
- -e "s:lirc_imon::" -e "s:lirc_parallel::" -e "s:lirc_sasem::" \
- -e "s:lirc_serial::" -e "s:lirc_sir::" -e "s:lirc_ttusbir::" \
- -i Makefile drivers/Makefile drivers/*/Makefile tools/Makefile
- make
-}
-
-package_lirc() {
- pkgdesc="Linux Infrared Remote Control kernel modules for stock arch kernel"
- depends=('lirc-utils' 'kernel26>=2.6.39' 'kernel26<2.6.40')
- replaces=('lirc+pctv')
- install=lirc.install
-
- cd "${srcdir}/lirc-${pkgver}/drivers"
- make DESTDIR="${pkgdir}" install
-
- # set the kernel we've built for inside the install script
- sed -i -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" "${startdir}/lirc.install"
- # gzip -9 modules
- find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
-}
-
-package_lirc-utils() {
- pkgdesc="Linux Infrared Remote Control utils"
- depends=('alsa-lib' 'libx11' 'libftdi' 'libirman')
- optdepends=('python2: pronto2lirc utility')
- options=('strip' '!libtool')
- backup=('etc/conf.d/lircd.conf' 'etc/conf.d/irexec.conf')
-
- cd "${srcdir}/lirc-${pkgver}"
- make DESTDIR="${pkgdir}" install
- install -d "${pkgdir}/usr/share/lirc" "${pkgdir}/etc/rc.d"
- cp "${srcdir}"/{lircd,lircmd,irexecd} "${pkgdir}/etc/rc.d"
- cp -rp remotes "${pkgdir}/usr/share/lirc"
- chmod -R go-w "${pkgdir}/usr/share/lirc/"
-
- # install the logrotate config
- install -Dm644 "${srcdir}/lirc.logrotate" "${pkgdir}/etc/logrotate.d/lirc"
-
- # install conf.d file
- install -Dm644 "${srcdir}/lircd.conf" "${pkgdir}/etc/conf.d/lircd.conf"
-
- # install conf.d file
- install -Dm644 "${srcdir}/irexec.conf" "${pkgdir}/etc/conf.d/irexec.conf"
-
- install -d "${pkgdir}/etc/lirc"
-
- # remove built modules
- rm -r "${pkgdir}/lib/"
-}
diff --git a/testing/lirc/irexec.conf b/testing/lirc/irexec.conf
deleted file mode 100644
index f911c7515..000000000
--- a/testing/lirc/irexec.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Parameters for irexec daemon (path to lircrc)
-#
-
-IREXEC_OPTS="" \ No newline at end of file
diff --git a/testing/lirc/irexecd b/testing/lirc/irexecd
deleted file mode 100755
index a64b033a5..000000000
--- a/testing/lirc/irexecd
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/irexec.conf
-
-PID=`pidof -o %PPID /usr/bin/irexec`
-case "$1" in
- start)
- stat_busy "Starting IREXEC Daemon"
- [ -z "$PID" ] && /usr/bin/irexec --daemon $IREXEC_OPTS
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon irexecd
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping IREXEC Daemon"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon irexecd
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
-
diff --git a/testing/lirc/kernel-2.6.39.patch b/testing/lirc/kernel-2.6.39.patch
deleted file mode 100644
index 7353d61ca..000000000
--- a/testing/lirc/kernel-2.6.39.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -ru lirc-0.9.0/drivers//lirc_atiusb/lirc_atiusb.c lirc-0.9.0.new/drivers//lirc_atiusb/lirc_atiusb.c
---- lirc-0.9.0/drivers//lirc_atiusb/lirc_atiusb.c 2011-03-25 23:28:18.000000000 +0100
-+++ lirc-0.9.0.new/drivers//lirc_atiusb/lirc_atiusb.c 2011-06-07 17:02:20.356580306 +0200
-@@ -48,7 +48,6 @@
- #include <linux/slab.h>
- #include <linux/module.h>
- #include <linux/kmod.h>
--#include <linux/smp_lock.h>
- #include <linux/completion.h>
- #include <linux/uaccess.h>
- #include <linux/usb.h>
-diff -ru lirc-0.9.0/drivers//lirc_i2c/lirc_i2c.c lirc-0.9.0.new/drivers//lirc_i2c/lirc_i2c.c
---- lirc-0.9.0/drivers//lirc_i2c/lirc_i2c.c 2011-03-25 23:28:18.000000000 +0100
-+++ lirc-0.9.0.new/drivers//lirc_i2c/lirc_i2c.c 2011-06-07 17:04:19.725933627 +0200
-@@ -555,8 +555,8 @@
- kfree(ir);
- return -EINVAL;
- }
-- printk(KERN_INFO "lirc_i2c: chip 0x%x found @ 0x%02x (%s)\n",
-- adap->id, addr, ir->c.name);
-+ printk(KERN_INFO "lirc_i2c: chip found @ 0x%02x (%s)\n",
-+ addr, ir->c.name);
-
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31)
- /* register device */
-diff -ru lirc-0.9.0/drivers//lirc_wpc8769l/lirc_wpc8769l.c lirc-0.9.0.new/drivers//lirc_wpc8769l/lirc_wpc8769l.c
---- lirc-0.9.0/drivers//lirc_wpc8769l/lirc_wpc8769l.c 2011-03-25 23:28:18.000000000 +0100
-+++ lirc-0.9.0.new/drivers//lirc_wpc8769l/lirc_wpc8769l.c 2011-06-07 17:07:23.984935411 +0200
-@@ -361,14 +361,14 @@
- size = count << 3;
-
- ldata = (unsigned long *) data_buf;
-- next_one = generic_find_next_le_bit(ldata, size, 0);
-+ next_one = find_next_zero_bit_le(ldata, size, 0);
-
- if (next_one > 0)
- put_pulse_bit(next_one
- * WPC8769L_USECS_PER_BIT);
-
- while (next_one < size) {
-- next_zero = generic_find_next_zero_le_bit(ldata,
-+ next_zero = find_next_zero_bit_le(ldata,
- size, next_one + 1);
-
- put_space_bit(
-@@ -376,7 +376,7 @@
- * WPC8769L_USECS_PER_BIT);
-
- if (next_zero < size) {
-- next_one = generic_find_next_le_bit(ldata,
-+ next_one = find_next_bit_le(ldata,
- size, next_zero + 1);
-
- put_pulse_bit(
diff --git a/testing/lirc/lirc.install b/testing/lirc/lirc.install
deleted file mode 100644
index 26fb1391e..000000000
--- a/testing/lirc/lirc.install
+++ /dev/null
@@ -1,16 +0,0 @@
-KERNEL_VERSION=2.6.39-ARCH
-
-post_install() {
- # updating module dependencies
- echo ">>> Updating module dependencies. Please wait ..."
- depmod $KERNEL_VERSION > /dev/null 2>&1
-}
-
-post_upgrade() {
- post_install
-}
-
-# arg 1: the old package version
-post_remove() {
- post_install
-}
diff --git a/testing/lirc/lirc.logrotate b/testing/lirc/lirc.logrotate
deleted file mode 100644
index 623c4f328..000000000
--- a/testing/lirc/lirc.logrotate
+++ /dev/null
@@ -1,5 +0,0 @@
-/var/log/lircd {
- missingok
- notifempty
- delaycompress
-}
diff --git a/testing/lirc/lirc_atiusb-kfifo.patch b/testing/lirc/lirc_atiusb-kfifo.patch
deleted file mode 100644
index a64984dce..000000000
--- a/testing/lirc/lirc_atiusb-kfifo.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From ec3c5660e67c122e2d5eb9cfa838c9709fccf8e0 Mon Sep 17 00:00:00 2001
-From: Jason Martin <publicmsu@gmail.com>
-Date: Fri, 3 Jun 2011 00:12:51 -0400
-Subject: [PATCH] lirc_atiusb: fix buffer alloc to work with new kfifo
-
-I came across posts with regards to lirc_atiusb and its compatibility
-with newer kernels, and their use of kfifo.I spent a little bit of time
-this evening, and was able to correct the issues with the driver, and
-now have a functioning lirc_atiusb device under the 2.6.38 kernel.
-
-Signed-off-by: Jarod Wilson <jarod@redhat.com>
----
- drivers/lirc_atiusb/lirc_atiusb.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/lirc_atiusb/lirc_atiusb.c b/drivers/lirc_atiusb/lirc_atiusb.c
-index 52080de..bf2b631 100644
---- a/drivers/lirc_atiusb/lirc_atiusb.c
-+++ b/drivers/lirc_atiusb/lirc_atiusb.c
-@@ -1048,7 +1048,7 @@ static struct atirf_dev *new_irctl(struct usb_interface *intf)
- goto new_irctl_failure_check;
- }
-
-- if (lirc_buffer_init(driver->rbuf, dclen, 1)) {
-+ if (lirc_buffer_init(driver->rbuf, dclen, 2)) {
- mem_failure = 4;
- goto new_irctl_failure_check;
- }
---
-1.7.0.1
-
diff --git a/testing/lirc/lirc_wpc8769l.patch b/testing/lirc/lirc_wpc8769l.patch
deleted file mode 100644
index e4e2a049b..000000000
--- a/testing/lirc/lirc_wpc8769l.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 413e83bf504fe9a9a177f27742220cfcb184b034 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Juan=20Jes=C3=BAs=20Garc=C3=ADa=20de=20Soria=20Lucena?= <skandalfo@gmail.com>
-Date: Wed, 30 Mar 2011 16:46:35 -0400
-Subject: [PATCH] Make lirc_wpc8769l functional again
-
-Signed-off-by: Jarod Wilson <jarod@redhat.com>
----
- drivers/lirc_wpc8769l/lirc_wpc8769l.c | 28 +++++++++++++++++-----------
- 1 files changed, 17 insertions(+), 11 deletions(-)
-
-diff --git a/drivers/lirc_wpc8769l/lirc_wpc8769l.c b/drivers/lirc_wpc8769l/lirc_wpc8769l.c
-index f820d11..4d04063 100644
---- a/drivers/lirc_wpc8769l/lirc_wpc8769l.c
-+++ b/drivers/lirc_wpc8769l/lirc_wpc8769l.c
-@@ -816,10 +816,6 @@ static int set_use_inc(void *data)
- /* Reset last timeout value. */
- lastus = 0;
-
-- /* Init the read buffer. */
-- if (lirc_buffer_init(&rbuf, sizeof(lirc_t), RBUF_LEN) < 0)
-- return -ENOMEM;
--
- /* Acquire the IRQ. */
- result = request_irq(irq, irq_handler,
- IRQF_DISABLED | IRQF_SHARED,
-@@ -863,9 +859,6 @@ static void set_use_dec(void *data)
- /* Free the IRQ. */
- free_irq(irq, THIS_MODULE);
- dprintk("Freed IRQ %d\n", irq);
--
-- /* Free the RX buffer. */
-- lirc_buffer_free(&rbuf);
- }
-
- static struct lirc_driver driver = {
-@@ -1065,19 +1058,29 @@ static int __init lirc_wpc8769l_module_init(void)
- /* Do load-time checks. */
- wpc8769l_power_up_and_check_if_we_woke_us_up();
-
-+ /* Init the read buffer. */
-+ if (lirc_buffer_init(&rbuf, sizeof(lirc_t), RBUF_LEN) < 0) {
-+ rc = -ENOMEM;
-+ goto exit_platform_exit;
-+ }
-+
- /* Configure the driver hooks. */
- driver.features = LIRC_CAN_REC_MODE2;
-+ driver.dev = &lirc_wpc8769l_platform_dev->dev;
- driver.minor = lirc_register_driver(&driver);
- if (driver.minor < 0) {
- eprintk("lirc_register_driver failed!\n");
- rc = -EIO;
-- goto exit_platform_exit;
-+ goto exit_release_buffer;
- }
-
- iprintk("Driver loaded.\n");
-
- return 0; /* Everything OK. */
-
-+exit_release_buffer:
-+ lirc_buffer_free(&rbuf);
-+
- exit_platform_exit:
- lirc_wpc8769l_platform_exit();
-
-@@ -1095,12 +1098,15 @@ module_init(lirc_wpc8769l_module_init);
-
- static void __exit lirc_wpc8769l_module_exit(void)
- {
-- /* Unregister the platform driver and device. */
-- lirc_wpc8769l_platform_exit();
--
- /* Unregister the LIRC driver. */
- lirc_unregister_driver(driver.minor);
-
-+ /* Free the buffer. */
-+ lirc_buffer_free(&rbuf);
-+
-+ /* Unregister the platform driver and device. */
-+ lirc_wpc8769l_platform_exit();
-+
- /* Release the second range. */
- if (baseport2)
- release_region(baseport2, WPC8769L_IO_REGION_2_SIZE);
---
-1.7.0.1
-
diff --git a/testing/lirc/lircd b/testing/lirc/lircd
deleted file mode 100755
index e9739b36e..000000000
--- a/testing/lirc/lircd
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/lircd.conf
-
-PID=$(pidof -o %PPID /usr/sbin/lircd)
-LIRCD_SYMLINKFILE=/dev/lircd
-LIRCD_SOCKET=/var/run/lirc/lircd
-case "$1" in
- start)
- stat_busy "Starting LIRC Daemon"
- [ ! -d /var/run/lirc ] && install -d /var/run/lirc &>/dev/null
- rm -f $LIRCD_SOCKET && ln -s $LIRCD_SOCKET $LIRCD_SYMLINKFILE
- if [ $? -ne 0 ]; then
- stat_fail
- exit 0
- fi
- [ -n "$LIRC_DRIVER" ] && LIRC_EXTRAOPTS="-H $LIRC_DRIVER $LIRC_EXTRAOPTS"
- [ -z "$PID" ] &&
- if [ -n "$LIRC_DEVICE" ] ; then
- eval /usr/sbin/lircd -d "$LIRC_DEVICE" $LIRC_EXTRAOPTS $LIRC_CONFIGFILE
- else
- /usr/sbin/lircd $LIRC_EXTRAOPTS $LIRC_CONFIGFILE
- fi
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon lircd
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping LIRC Daemon"
- rm -f $LIRCD_SYMLINKFILE
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon lircd
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 start|stop|restart"
-esac
-exit 0
diff --git a/testing/lirc/lircd-handle-large-config.patch b/testing/lirc/lircd-handle-large-config.patch
deleted file mode 100644
index 85bc20518..000000000
--- a/testing/lirc/lircd-handle-large-config.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 5efb56bf22a5077db564c766ba7cc37bc269231d Mon Sep 17 00:00:00 2001
-From: Jarod Wilson <jarod@redhat.com>
-Date: Wed, 6 Apr 2011 11:04:12 -0400
-Subject: [PATCH] lircd: handle larger config files in write_socket better
-
-Pointed out by Michael Zanetti on list, irsend LIST has issues with long
-config files, which didn't exist in maintainer mode, as we were using a
-do while loop to make sure we spit out everything. Just use that loop
-all the time.
-
-Signed-off-by: Jarod Wilson <jarod@redhat.com>
----
- daemons/lircd.c | 8 ++------
- 1 files changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/daemons/lircd.c b/daemons/lircd.c
-index 6c21a3a..ddcca05 100644
---- a/daemons/lircd.c
-+++ b/daemons/lircd.c
-@@ -231,14 +231,10 @@ inline int write_socket(int fd, const char *buf, int len)
- int done, todo = len;
-
- while (todo) {
--#ifdef SIM_REC
- do {
- done = write(fd, buf, todo);
-- }
-- while (done < 0 && errno == EAGAIN);
--#else
-- done = write(fd, buf, todo);
--#endif
-+ } while (done < 0 && errno == EAGAIN);
-+
- if (done <= 0)
- return (done);
- buf += done;
---
-1.7.0.1
-
diff --git a/testing/lirc/lircd.conf b/testing/lirc/lircd.conf
deleted file mode 100644
index 760dab065..000000000
--- a/testing/lirc/lircd.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Parameters for lirc daemon
-#
-
-LIRC_DEVICE="/dev/lirc0"
-LIRC_DRIVER=""
-LIRC_EXTRAOPTS=""
-LIRC_CONFIGFILE=""
diff --git a/testing/lirc/lircmd b/testing/lirc/lircmd
deleted file mode 100755
index 220c47c9c..000000000
--- a/testing/lirc/lircmd
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/lircmd`
-case "$1" in
- start)
- stat_busy "Starting lircmd Daemon"
- [ -z "$PID" ] && /usr/sbin/lircmd
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon lircmd
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping lircmd Daemon"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon lircmd
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/testing/mdadm/PKGBUILD b/testing/mdadm/PKGBUILD
new file mode 100644
index 000000000..3da2fec8d
--- /dev/null
+++ b/testing/mdadm/PKGBUILD
@@ -0,0 +1,45 @@
+# $Id: PKGBUILD 127622 2011-06-17 07:48:12Z tpowa $
+# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+# Contributor: Judd Vinet <jvinet@zeroflux.org>
+pkgname=mdadm
+pkgver=3.2.2
+pkgrel=1
+pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as Software RAID"
+arch=(i686 x86_64)
+license=('GPL')
+url="http://www.cse.unsw.edu.au/~neilb/source/mdadm/"
+groups=('base')
+conflicts=('mkinitcpio<0.5.99')
+depends=('glibc')
+backup=('etc/mdadm.conf')
+source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2
+ mdadm
+ mdadm.conf
+ mdadm_install
+ mdadm_hook
+ disable-werror.patch)
+install=mdadm.install
+replaces=('raidtools')
+md5sums=('12ee2fbf3beddb60601fb7a4c4905651'
+ '6df172c8f77b280018cf87eb3d313f29'
+ '00cbed931db4f15b6ce49e3e7d433966'
+ '53f58d4a8f6e23c452d67007186262e3'
+ '36f7cc564ed3267888d90208e0eb7adc'
+ '4ad87b74a4bc9a34621280abe0e0c3e4')
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+ patch -Np0 -i ../disable-werror.patch
+ make CXFLAGS="$CFLAGS"
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+ make INSTALL=/bin/install DESTDIR=$pkgdir install
+ install -D -m644 ../mdadm.conf $pkgdir/etc/mdadm.conf
+ install -D -m755 ../mdadm $pkgdir/etc/rc.d/mdadm
+ install -D -m644 ../mdadm_install $pkgdir/lib/initcpio/install/mdadm
+ install -D -m644 ../mdadm_hook $pkgdir/lib/initcpio/hooks/mdadm
+ # symlink for backward compatibility
+ ln -sf /lib/initcpio/hooks/mdadm $pkgdir/lib/initcpio/hooks/raid
+}
diff --git a/testing/mdadm/disable-werror.patch b/testing/mdadm/disable-werror.patch
new file mode 100644
index 000000000..50a33f19d
--- /dev/null
+++ b/testing/mdadm/disable-werror.patch
@@ -0,0 +1,11 @@
+--- Makefile.old 2011-06-17 09:38:03.269238332 +0200
++++ Makefile 2011-06-17 09:38:14.122398837 +0200
+@@ -42,7 +42,7 @@
+
+ CC = $(CROSS_COMPILE)gcc
+ CXFLAGS = -ggdb
+-CWFLAGS = -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter
++CWFLAGS = -Wall -Wstrict-prototypes -Wextra -Wno-unused-parameter
+ ifdef WARN_UNUSED
+ CWFLAGS += -Wp,-D_FORTIFY_SOURCE=2 -O
+ endif
diff --git a/testing/mdadm/mdadm b/testing/mdadm/mdadm
new file mode 100755
index 000000000..e196f3642
--- /dev/null
+++ b/testing/mdadm/mdadm
@@ -0,0 +1,37 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PID=`pidof -o %PPID /sbin/mdadm`
+case "$1" in
+ start)
+ stat_busy "Starting mdadm RAID Monitor"
+ if [ -z "$PID" ]; then
+ /sbin/mdadm --monitor --scan -i /var/run/mdadm.pid -f
+ fi
+ if [ ! -z "$PID" -o $? -gt 0 ]; then
+ stat_fail
+ else
+ add_daemon mdadm
+ stat_done
+ fi
+ ;;
+ stop)
+ stat_busy "Stopping mdadm RAID Monitor"
+ [ ! -z "$PID" ] && kill $PID &>/dev/null
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ rm_daemon mdadm
+ stat_done
+ fi
+ ;;
+ restart)
+ $0 stop
+ sleep 1
+ $0 start
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart}"
+esac
diff --git a/testing/mdadm/mdadm.conf b/testing/mdadm/mdadm.conf
new file mode 100644
index 000000000..57bd4c683
--- /dev/null
+++ b/testing/mdadm/mdadm.conf
@@ -0,0 +1,67 @@
+# mdadm configuration file
+#
+# mdadm will function properly without the use of a configuration file,
+# but this file is useful for keeping track of arrays and member disks.
+# In general, a mdadm.conf file is created, and updated, after arrays
+# are created. This is the opposite behavior of /etc/raidtab which is
+# created prior to array construction.
+#
+#
+# the config file takes two types of lines:
+#
+# DEVICE lines specify a list of devices of where to look for
+# potential member disks
+#
+# ARRAY lines specify information about how to identify arrays so
+# so that they can be activated
+#
+
+
+# You can have more than one device line and use wild cards. The first
+# example includes SCSI the first partition of SCSI disks /dev/sdb,
+# /dev/sdc, /dev/sdd, /dev/sdj, /dev/sdk, and /dev/sdl. The second
+# line looks for array slices on IDE disks.
+#
+#DEVICE /dev/sd[bcdjkl]1
+#DEVICE /dev/hda1 /dev/hdb1
+#
+# The designation "partitions" will scan all partitions found in
+# /proc/partitions
+DEVICE partitions
+
+
+# ARRAY lines specify an array to assemble and a method of identification.
+# Arrays can currently be identified by using a UUID, superblock minor number,
+# or a listing of devices.
+#
+# super-minor is usually the minor number of the metadevice
+# UUID is the Universally Unique Identifier for the array
+# Each can be obtained using
+#
+# mdadm -D <md>
+#
+# To capture the UUIDs for all your RAID arrays to this file, run these:
+# to get a list of running arrays:
+# # mdadm -D --scan >>/etc/mdadm.conf
+# to get a list from superblocks:
+# # mdadm -E --scan >>/etc/mdadm.conf
+#
+#ARRAY /dev/md0 UUID=3aaa0122:29827cfa:5331ad66:ca767371
+#ARRAY /dev/md1 super-minor=1
+#ARRAY /dev/md2 devices=/dev/hda1,/dev/hdb1
+#
+# ARRAY lines can also specify a "spare-group" for each array. mdadm --monitor
+# will then move a spare between arrays in a spare-group if one array has a
+# failed drive but no spare
+#ARRAY /dev/md4 uuid=b23f3c6d:aec43a9f:fd65db85:369432df spare-group=group1
+#ARRAY /dev/md5 uuid=19464854:03f71b1b:e0df2edd:246cc977 spare-group=group1
+#
+
+
+# When used in --follow (aka --monitor) mode, mdadm needs a
+# mail address and/or a program. To start mdadm's monitor mode, add
+# "mdadm" to your DAEMONS array in /etc/rc.conf
+#
+# If the lines are not found, mdadm will exit quietly
+#MAILADDR root@mydomain.tld
+#PROGRAM /usr/sbin/handle-mdadm-events
diff --git a/testing/mdadm/mdadm.install b/testing/mdadm/mdadm.install
new file mode 100644
index 000000000..e8404c260
--- /dev/null
+++ b/testing/mdadm/mdadm.install
@@ -0,0 +1,10 @@
+# arg 1: the new package version
+# arg 2: the old package version
+
+post_upgrade() {
+ if [ "$(vercmp $2 2.6.8-2)" -lt 0 -a "$(grep raid_partitions /etc/mkinitcpio.conf)" ]; then
+ echo "Attention mdadm update:"
+ echo "raid_partitions hook has been replaced by the more powerfull mdadm hook."
+ echo "Please update your /etc/mkinitcpio.conf accordingly."
+ fi
+}
diff --git a/testing/mdadm/mdadm_hook b/testing/mdadm/mdadm_hook
new file mode 100755
index 000000000..1d217a5a8
--- /dev/null
+++ b/testing/mdadm/mdadm_hook
@@ -0,0 +1,42 @@
+# vim: set ft=sh:
+run_hook ()
+{
+ input="$(cat /proc/cmdline)"
+ mdconfig="/etc/mdadm.conf"
+ # for partitionable raid, we need to load md_mod first!
+ modprobe md_mod 2>/dev/null
+ # If md is specified on commandline, create config file from those parameters.
+ if [ "$(echo $input | grep "md=")" ]; then
+ #Create initial mdadm.conf
+ # scan all devices in /proc/partitions
+ echo DEVICE partitions > $mdconfig
+ for i in $input; do
+ case $i in
+ # raid
+ md=[0-9]*,/*)
+ device="$(echo "$i" | sed -e 's|,/.*||g' -e 's|=||g')"
+ array="$(echo $i | cut -d, -f2-)"
+ echo "ARRAY /dev/$device devices=$array" >> $mdconfig
+ ;;
+ # partitionable raid
+ md=d[0-9]*,/*)
+ device="$(echo "$i" | sed -e 's|,/.*||g' -e 's|=|_|g')"
+ array="$(echo $i | cut -d, -f2-)"
+ echo "ARRAY /dev/$device devices=$array" >> $mdconfig
+ ;;
+ # raid UUID
+ md=[0-9]*,[0-9,a-z]*)
+ device="$(echo "$i" | sed -e 's|,.*||g' -e 's|=||g')"
+ array="$(echo $i | cut -d, -f2-)"
+ echo "ARRAY /dev/$device UUID=$array" >> $mdconfig
+ ;;
+ # partitionable raid UUID
+ md=d[0-9]*,[0-9,a-z]*)
+ device="$(echo "$i" | sed -e 's|,.*||g' -e 's|=|_|g')"
+ array="$(echo $i | cut -d, -f2-)"
+ echo "ARRAY /dev/$device UUID=$array" >> $mdconfig
+ ;;
+ esac
+ done
+ fi
+}
diff --git a/testing/mdadm/mdadm_install b/testing/mdadm/mdadm_install
new file mode 100644
index 000000000..59f4bc67b
--- /dev/null
+++ b/testing/mdadm/mdadm_install
@@ -0,0 +1,46 @@
+# vim: set ft=sh:
+
+install ()
+{
+ MODULES=" $(checked_modules "drivers/md/*" | grep -v "dm-") "
+ BINARIES=""
+ FILES=""
+ SCRIPT="mdadm"
+ # check if a custom mdadm.conf exists
+ if grep -q ^ARRAY /etc/mdadm.conf; then
+ echo "Custom /etc/mdadm.conf file will be used in initramfs for assembling arrays."
+ add_file "/etc/mdadm.conf"
+ fi
+ add_binary "/sbin/mdadm"
+ add_file "/lib/udev/rules.d/64-md-raid.rules"
+}
+
+help ()
+{
+cat<<HELPEOF
+ This hook loads the necessary modules for any raid root device,
+ and assembles the raid device when run.
+
+ If arrays are defined in /etc/mdadm.conf, the file will be used instead
+ of command line assembling.
+
+ Command Line Setup:
+ - for raid arrays with persistent superblocks:
+ md=<md device no.>,dev0,dev1,...,devn
+ md=<md device no.>,uuid
+ - for partitionable raid arrays with persistent superblocks:
+ md=d<md device no.>,dev0,dev1,...,devn
+ md=d<md device no.>,uuid
+
+ Parameters:
+ - <md device no.> = the number of the md device:
+ 0 means md0, 1 means md1, ...
+ - <dev0-devn>: e.g. /dev/hda1,/dev/hdc1,/dev/sda1,/dev/sdb1
+ or 0900878d:f95f6057:c39a36e9:55efa60a
+ Examples:
+ - md=d0,/dev/sda3,/dev/sda4 md=d1,/dev/hda1,/dev/hdb1
+ This will setup 2 md partitionable arrays.
+ - md=0,/dev/sda3,/dev/sda4 md=1,/dev/hda1,/dev/hdb1
+ This will setup 2 md arrays with persistent superblocks.
+HELPEOF
+}
diff --git a/testing/mpd/PKGBUILD b/testing/mpd/PKGBUILD
deleted file mode 100644
index acdf209ef..000000000
--- a/testing/mpd/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 127604 2011-06-16 17:50:00Z angvp $
-# Maintainer: Angel Velasquez <angvp@archlinux.org>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
-# Contributor: Ben <ben@benmazer.net>
-
-pkgname=mpd
-pkgver=0.16.3
-pkgrel=1
-pkgdesc="Music daemon that plays MP3, FLAC, and Ogg Vorbis files"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://mpd.wikia.com/wiki/Server"
-depends=('libao' 'ffmpeg' 'libmodplug' 'audiofile' 'libshout' 'libmad' 'curl' 'faad2'
- 'sqlite3' 'jack' 'libmms' 'wavpack' 'libmpcdec' 'avahi' 'libid3tag'
- 'libpulse')
-makedepends=('pkgconfig' 'doxygen')
-install=${pkgname}.install
-source=("http://downloads.sourceforge.net/musicpd/${pkgname}-${pkgver}.tar.bz2"
- 'mpd')
-md5sums=('6e708c02b0e8c288aec855eecf441a5a'
- 'e5669c2bff4031928531e52475addeb1')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --enable-lastfm \
- --enable-jack \
- --enable-pulse \
- --enable-documentation \
- --disable-libwrap \
- --disable-cue \
- --disable-sidplay
- make
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
-
- # set ours dirs in mpd.conf file
- sed -i 's|^music_directory.*$|#music_directory "path_to_your_music_collection"|1' doc/mpdconf.example
- sed -i 's|playlist_directory.*$|playlist_directory "/var/lib/mpd/playlists"|1' doc/mpdconf.example
- sed -i 's|db_file.*$|db_file "/var/lib/mpd/mpd.db"|1' doc/mpdconf.example
- sed -i 's|log_file.*$|log_file "/var/log/mpd/mpd.log"|1' doc/mpdconf.example
- sed -i 's|error_file.*$|error_file "/var/log/mpd/mpd.error"|1' doc/mpdconf.example
- sed -i 's|#pid_file.*$|pid_file "/var/run/mpd/mpd.pid"|1' doc/mpdconf.example
- sed -i 's|#state_file.*$|state_file "/var/lib/mpd/mpdstate"|1' doc/mpdconf.example
- sed -i 's|#user.*$|user "mpd"|1' doc/mpdconf.example
-
- install -Dm644 doc/mpdconf.example ${pkgdir}/usr/share/mpd/mpd.conf.example
-
- install -Dm755 ${srcdir}/mpd ${pkgdir}/etc/rc.d/mpd
- install -d ${pkgdir}/var/{lib/mpd/playlists,log/mpd}
-}
diff --git a/testing/mpd/mpd b/testing/mpd/mpd
deleted file mode 100755
index 6134e2ed4..000000000
--- a/testing/mpd/mpd
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
- start)
- stat_busy "Starting Music Player Daemon"
- [ ! -d /var/run/mpd ] && install -d -g 45 -o 45 /var/run/mpd
- /usr/bin/mpd /etc/mpd.conf &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon mpd
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping Music Player Daemon"
- /usr/bin/mpd --kill /etc/mpd.conf &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon mpd
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/testing/mpd/mpd.install b/testing/mpd/mpd.install
deleted file mode 100644
index 885505a07..000000000
--- a/testing/mpd/mpd.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
- post_upgrade
- echo "==> Create a configuration file /etc/mpd.conf before using MPD (example: /usr/share/mpd/mpd.conf.example)"
-}
-
-post_upgrade() {
- getent group "mpd" &>/dev/null || groupadd -r -g 45 mpd 1>/dev/null
- getent passwd "mpd" &>/dev/null || useradd -r -u 45 -g mpd -d "/var/lib/mpd" -s "/bin/true" -G "audio" mpd 1>/dev/null
- for dir in /var/{lib,log}/mpd; do
- chown -R mpd:mpd "$dir" 1>/dev/null
- done
-}
-
-post_remove() {
- getent passwd "mpd" &>/dev/null && userdel mpd 1>/dev/null
- getent group "mpd" &>/dev/null && groupdel mpd 1>/dev/null
- [ -f etc/mpd.conf ] && mv etc/mpd.conf etc/mpd.conf.pacsave 1>/dev/null
-}
diff --git a/testing/net-tools/net-tools.install b/testing/net-tools/net-tools.install
deleted file mode 100644
index 9eee9e51b..000000000
--- a/testing/net-tools/net-tools.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_upgrade() {
- if [ "$(vercmp $2 1.60-16)" -lt 0 ]; then
- echo "hostname and {,yp,nis}domainname has moved:"
- echo "----------"
- echo "hostname is now in coreutils"
- echo "domainname is now in yp-tools"
- echo "their functionality might have changed slightly"
- echo ""
- echo "dnsdomainname remains in net-tools"
- echo "----------"
- fi
-}
diff --git a/testing/nouveau-drm-lts/COPYING b/testing/nouveau-drm-lts/COPYING
deleted file mode 100644
index 6e74c337c..000000000
--- a/testing/nouveau-drm-lts/COPYING
+++ /dev/null
@@ -1,48 +0,0 @@
- Copyright 2005 Adam Jackson.
-
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation on the rights to use, copy, modify, merge,
- publish, distribute, sub license, and/or sell copies of the Software,
- and to permit persons to whom the Software is furnished to do so,
- subject to the following conditions:
-
- The above copyright notice and this permission notice (including the
- next paragraph) shall be included in all copies or substantial
- portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NON-INFRINGEMENT. IN NO EVENT SHALL ADAM JACKSON BE LIABLE FOR ANY
- CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-------------------------------------------------------------------------
-
- Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
- Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
- All Rights Reserved.
-
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish,
- distribute, sublicense, and/or sell copies of the Software, and to
- permit persons to whom the Software is furnished to do so, subject to
- the following conditions:
-
- The above copyright notice and this permission notice (including the
- next paragraph) shall be included in all copies or substantial
- portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS
- SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- DEALINGS IN THE SOFTWARE.
diff --git a/testing/nouveau-drm-lts/Makefile b/testing/nouveau-drm-lts/Makefile
deleted file mode 100644
index 123bc5339..000000000
--- a/testing/nouveau-drm-lts/Makefile
+++ /dev/null
@@ -1,102 +0,0 @@
-# This Makefile is loosely based on the drm.git/linux-core/Makefile and
-# the preliminary work by Christopher James Halse Rogers.
-# Edited by Pekka Paalanen <pq@iki.fi>
-
-# By default, the build is done against the running linux kernel source.
-# To build against a different kernel source tree, set LINUXDIR:
-#
-# make LINUXDIR=/path/to/kernel/source
-
-# By default, it is assumed the Nouveau kernel tree is found in $PWD/../.
-# To use a different path to the Nouveau kernel tree, set NOUVEAUROOTDIR:
-#
-# make NOUVEAUROOTDIR=/path/to/nouveau/linux-2.6
-
-
-ifndef LINUXDIR
-RUNNING_REL := $(shell uname -r)
-
-LINUXDIR := $(shell if [ -e /lib/modules/$(RUNNING_REL)/source ]; then \
- echo /lib/modules/$(RUNNING_REL)/source; \
- else echo /lib/modules/$(RUNNING_REL)/build; fi)
-endif
-
-NOUVEAUGITREMOTE ?= origin
-NOUVEAUROOTDIR ?= $(CURDIR)/..
-override NOUVEAUROOTDIR := $(abspath $(NOUVEAUROOTDIR))
-
-TESTFILE := include/drm/nouveau_drm.h
-ifeq ($(wildcard $(NOUVEAUROOTDIR)/$(TESTFILE)),)
-$(error $(NOUVEAUROOTDIR) does not look like the right kernel tree, \
- please set NOUVEAUROOTDIR)
-endif
-
-GIT_REVISION := $(shell GIT_DIR=$(NOUVEAUROOTDIR)/.git \
- git describe --always --abbrev=17 2> /dev/null)
-
-DRMINC := -I$(NOUVEAUROOTDIR)/include/drm
-DRMDIR := $(NOUVEAUROOTDIR)/drivers/gpu/drm
-DRMCFG := \
- CONFIG_DRM=m \
- CONFIG_DRM_KMS_HELPER=m \
- CONFIG_DRM_TTM=m \
- CONFIG_DRM_NOUVEAU=m \
- CONFIG_DRM_NOUVEAU_KMS=n \
- CONFIG_DRM_NOUVEAU_BACKLIGHT=y \
- CONFIG_DRM_NOUVEAU_DEBUG=y \
- CONFIG_DRM_I2C_CH7006=m \
- CONFIG_DRM_TDFX=n \
- CONFIG_DRM_R128=n \
- CONFIG_DRM_RADEON=n \
- CONFIG_DRM_MGA=n \
- CONFIG_DRM_I810=n \
- CONFIG_DRM_I830=n \
- CONFIG_DRM_I915=n \
- CONFIG_DRM_SIS=n \
- CONFIG_DRM_SAVAGE=n \
- CONFIG_DRM_VIA=n
-
-EXTRA_CFLAGS :=
-MYEXTRA_CFLAGS :=
-MYEXTRA_CFLAGS += -DCONFIG_DRM_NOUVEAU_BACKLIGHT
-MYEXTRA_CFLAGS += -DCONFIG_DRM_NOUVEAU_DEBUG
-
-ifneq ($(GIT_REVISION),)
-MYEXTRA_CFLAGS += '-DGIT_REVISION=\"$(GIT_REVISION)\"'
-endif
-
-MYPARMS := -C $(LINUXDIR) KCPPFLAGS="$(DRMINC)" SUBDIRS="$(DRMDIR)" $(DRMCFG)
-
-MYEXTRA_CFLAGS += $(EXTRA_CFLAGS)
-ifneq ($(MYEXTRA_CFLAGS),)
-MYPARMS += EXTRA_CFLAGS="$(MYEXTRA_CFLAGS)"
-endif
-
-.PHONY: all modules install clean archive FORCE
-
-all: modules
-FORCE:
-
-modules:
- $(MAKE) $(MYPARMS) modules
-
-install:
- $(MAKE) $(MYPARMS) modules_install
-
-clean:
- $(MAKE) $(MYPARMS) clean
-
-archive: newttm-devel-compat.tar.gz newttm-devel.tar.gz master.tar.gz
-
-newttm-devel-compat.tar.gz: EXTRAS=nouveau README-nouveau
-
-%.tar: FORCE
- GIT_DIR=$(NOUVEAUROOTDIR)/.git \
- git archive --format=tar --prefix=$*/ $(NOUVEAUGITREMOTE)/$* \
- drivers/gpu/drm include/drm $(EXTRAS) > $@
-
-%.tar.gz: %.tar
- gzip -9 -c $< > $@
-
-# The commit id of the archive can be read with
-# $ zcat foo.tar.gz | git get-tar-commit-id
diff --git a/testing/nouveau-drm-lts/PKGBUILD b/testing/nouveau-drm-lts/PKGBUILD
deleted file mode 100644
index 1284563f4..000000000
--- a/testing/nouveau-drm-lts/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 126820 2011-06-07 13:57:50Z tpowa $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: buddabrod <buddabrod@gmail.com>
-
-pkgname=nouveau-drm-lts
-_snapdate=20100313
-pkgver=0.0.16_${_snapdate} # see master/drivers/gpu/drm/nouveau/nouveau_drv.h for version
-_kernver='2.6.32-lts'
-pkgrel=6
-pkgdesc="nvidia opensource X driver"
-arch=('i686' 'x86_64')
-url="http://nouveau.freedesktop.org/"
-depends=("kernel26-lts>=2.6.32" "kernel26-lts<2.6.33")
-makedepends=("kernel26-lts-headers>=2.6.32" "kernel26-lts-headers<2.6.33")
-# http://nouveau.freedesktop.org/wiki/InstallDRM#head-771a47a133fba6a5a70253656e76c61e9bff93bd
-optdepends=('nouveau-firmware: needed for very new card (NV50 family and above) to work properly where the OSS replacement does not work well')
-#makedepends=('git' 'autoconf' 'pkgconfig')
-install=nouveau-drm.install
-license=('GPL')
-options=('!strip')
-source=(ftp://ftp.archlinux.org/other/${pkgname/-lts//}/master-${_snapdate}.tar.gz
- # http://people.freedesktop.org/~pq/nouveau-drm/master.tar.gz
- # get the Makefile from http://cgit.freedesktop.org/nouveau/linux-2.6/plain/nouveau/Makefile?h=master-compat
- Makefile)
-md5sums=('ad7ad0fb73d56bcff3d2b54a70c3d511'
- 'e7d5df80186d5c736e82b0a7d46216bc')
-
-build() {
- cd ${srcdir}/master
- mkdir nouveau
- cp $srcdir/Makefile ${srcdir}/master/nouveau/
- cd nouveau
- make LINUXDIR=/lib/modules/${_kernver}/build DRM_MODULES="nouveau"
-}
-
-package() {
- install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/drm.ko ${pkgdir}/lib/modules/${_kernver}/updates/drm.ko
- install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/drm_kms_helper.ko ${pkgdir}/lib/modules/${_kernver}/updates/drm_kms_helper.ko
- install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/nouveau/nouveau.ko ${pkgdir}/lib/modules/${_kernver}/kernel/drivers/video/nouveau.ko
- install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/ttm/ttm.ko ${pkgdir}/lib/modules/${_kernver}/updates/ttm.ko
- install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/i2c/ch7006.ko ${pkgdir}/lib/modules/${_kernver}/updates/ch7006.ko
-
- # install script
- sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" ${startdir}/nouveau-drm.install
- # gzip -9 modules
- find "$pkgdir" -name '*.ko' -exec gzip -9 {} \;
-}
diff --git a/testing/nouveau-drm-lts/dont_check_for_pthread.patch b/testing/nouveau-drm-lts/dont_check_for_pthread.patch
deleted file mode 100644
index 050f55767..000000000
--- a/testing/nouveau-drm-lts/dont_check_for_pthread.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -ru libdrm-2.4.0/configure.ac libdrm-2.4.0-nostubs/configure.ac
---- libdrm-2.4.0/configure.ac 2008-10-09 21:57:09.000000000 +0200
-+++ libdrm-2.4.0-nostubs/configure.ac 2008-10-21 10:48:24.000000000 +0200
-@@ -32,10 +32,6 @@
- AC_HEADER_STDC
- AC_SYS_LARGEFILE
-
--PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs)
--AC_SUBST(PTHREADSTUBS_CFLAGS)
--AC_SUBST(PTHREADSTUBS_LIBS)
--
- pkgconfigdir=${libdir}/pkgconfig
- AC_SUBST(pkgconfigdir)
- AC_ARG_ENABLE(udev, AS_HELP_STRING([--enable-udev],
-diff -ru libdrm-2.4.0/libdrm/intel/Makefile.am libdrm-2.4.0-nostubs/libdrm/intel/Makefile.am
---- libdrm-2.4.0/libdrm/intel/Makefile.am 2008-10-14 01:39:32.000000000 +0200
-+++ libdrm-2.4.0-nostubs/libdrm/intel/Makefile.am 2008-10-21 10:49:00.000000000 +0200
-@@ -26,13 +26,12 @@
- $(WARN_CFLAGS) \
- -I$(top_srcdir)/libdrm \
- -I$(top_srcdir)/libdrm/intel \
-- $(PTHREADSTUBS_CFLAGS) \
- -I$(top_srcdir)/shared-core
-
- libdrm_intel_la_LTLIBRARIES = libdrm_intel.la
- libdrm_intel_ladir = $(libdir)
- libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined
--libdrm_intel_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
-+libdrm_intel_la_LIBADD = ../libdrm.la
-
- libdrm_intel_la_SOURCES = \
- intel_bufmgr.c \
---- libdrm-2.4.5/libdrm/nouveau/Makefile.am.orig 2009-02-28 19:06:24.000000000 +0000
-+++ libdrm-2.4.5/libdrm/nouveau/Makefile.am 2009-02-28 19:06:33.000000000 +0000
-@@ -2,13 +2,12 @@
- $(WARN_CFLAGS) \
- -I$(top_srcdir)/libdrm \
- -I$(top_srcdir)/libdrm/nouveau \
-- $(PTHREADSTUBS_CFLAGS) \
- -I$(top_srcdir)/shared-core
-
- libdrm_nouveau_la_LTLIBRARIES = libdrm_nouveau.la
- libdrm_nouveau_ladir = $(libdir)
- libdrm_nouveau_la_LDFLAGS = -version-number 1:0:0 -no-undefined
--libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
-+libdrm_nouveau_la_LIBADD = ../libdrm.la
-
- libdrm_nouveau_la_SOURCES = \
- nouveau_device.c \
diff --git a/testing/nouveau-drm-lts/nouveau-drm.install b/testing/nouveau-drm-lts/nouveau-drm.install
deleted file mode 100644
index beadaa563..000000000
--- a/testing/nouveau-drm-lts/nouveau-drm.install
+++ /dev/null
@@ -1,16 +0,0 @@
-post_install() {
- KERNEL_VERSION='2.6.32-lts'
- depmod -v $KERNEL_VERSION > /dev/null 2>&1
- echo "if you are running kms in early mode please rebuild your initrd"
-}
-
-post_upgrade() {
- post_install $1
- rmmod nouveau || echo 'In order to use the new nouveau module, exit Xserver and unload it manually.'
-}
-
-post_remove() {
- KERNEL_VERSION='2.6.32-lts'
- depmod -v $KERNEL_VERSION > /dev/null 2>&1
-}
-
diff --git a/testing/openssh/PKGBUILD b/testing/openssh/PKGBUILD
deleted file mode 100644
index 76f144bcc..000000000
--- a/testing/openssh/PKGBUILD
+++ /dev/null
@@ -1,71 +0,0 @@
-# $Id: PKGBUILD 127399 2011-06-14 16:51:03Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: Aaron Griffin <aaron@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=openssh
-pkgver=5.8p2
-pkgrel=8
-pkgdesc='Free version of the SSH connectivity tools'
-arch=('i686' 'x86_64')
-license=('custom:BSD')
-url='http://www.openssh.org/portable.html'
-backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 'etc/conf.d/sshd')
-depends=('tcp_wrappers' 'krb5' 'openssl' 'libedit')
-source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz"
- 'authfile.c.patch'
- 'sshd.confd'
- 'sshd.pam'
- 'sshd')
-sha1sums=('64798328d310e4f06c9f01228107520adbc8b3e5'
- '3669cb5ca6149f69015df5ce8e60b82c540eb0a4'
- 'ec102deb69cad7d14f406289d2fc11fee6eddbdd'
- '07fecd5880b1c4fdd8c94ddb2e89ddce88effdc1'
- '6b7f8ebf0c1cc37137a7d9a53447ac8a0ee6a2b5')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- patch -p1 -i ../authfile.c.patch # fix FS#24693 using http://anoncvs.mindrot.org/index.cgi/openssh/authfile.c?revision=1.95
-
- ./configure \
- --prefix=/usr \
- --libexecdir=/usr/lib/ssh \
- --sysconfdir=/etc/ssh \
- --with-tcp-wrappers \
- --with-privsep-user=nobody \
- --with-md5-passwords \
- --with-pam \
- --with-mantype=man \
- --mandir=/usr/share/man \
- --with-xauth=/usr/bin/xauth \
- --with-kerberos5=/usr \
- --with-ssl-engine \
- --with-libedit=/usr/lib \
- --disable-strip # stripping is done by makepkg
-
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-
- install -Dm755 ../sshd "${pkgdir}"/etc/rc.d/sshd
- install -Dm644 ../sshd.pam "${pkgdir}"/etc/pam.d/sshd
- install -Dm644 ../sshd.confd "${pkgdir}"/etc/conf.d/sshd
- install -Dm644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENCE"
-
- rm "${pkgdir}"/usr/share/man/man1/slogin.1
- ln -sf ssh.1.gz "${pkgdir}"/usr/share/man/man1/slogin.1.gz
-
- # additional contrib scripts that we like
- install -Dm755 contrib/findssl.sh "${pkgdir}"/usr/bin/findssl.sh
- install -Dm755 contrib/ssh-copy-id "${pkgdir}"/usr/bin/ssh-copy-id
- install -Dm644 contrib/ssh-copy-id.1 "${pkgdir}"/usr/share/man/man1/ssh-copy-id.1
-
- # PAM is a common, standard feature to have
- sed -i -e '/^#ChallengeResponseAuthentication yes$/c ChallengeResponseAuthentication no' \
- -e '/^#UsePAM no$/c UsePAM yes' \
- "${pkgdir}"/etc/ssh/sshd_config
-}
diff --git a/testing/openssh/authfile.c.patch b/testing/openssh/authfile.c.patch
deleted file mode 100644
index 6c18fe807..000000000
--- a/testing/openssh/authfile.c.patch
+++ /dev/null
@@ -1,198 +0,0 @@
-diff -aur old/authfile.c new/authfile.c
---- old/authfile.c 2011-06-12 02:21:52.262338254 +0200
-+++ new/authfile.c 2011-06-12 02:13:43.051467269 +0200
-@@ -1,4 +1,4 @@
--/* $OpenBSD: authfile.c,v 1.87 2010/11/29 18:57:04 markus Exp $ */
-+/* $OpenBSD: authfile.c,v 1.95 2011/05/29 11:42:08 djm Exp $ */
- /*
- * Author: Tatu Ylonen <ylo@cs.hut.fi>
- * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
-@@ -69,6 +69,8 @@
- #include "misc.h"
- #include "atomicio.h"
-
-+#define MAX_KEY_FILE_SIZE (1024 * 1024)
-+
- /* Version identification string for SSH v1 identity files. */
- static const char authfile_id_string[] =
- "SSH PRIVATE KEY FILE FORMAT 1.1\n";
-@@ -312,12 +314,12 @@
- return pub;
- }
-
--/* Load the contents of a key file into a buffer */
--static int
-+/* Load a key from a fd into a buffer */
-+int
- key_load_file(int fd, const char *filename, Buffer *blob)
- {
-+ u_char buf[1024];
- size_t len;
-- u_char *cp;
- struct stat st;
-
- if (fstat(fd, &st) < 0) {
-@@ -325,30 +327,45 @@
- filename == NULL ? "" : filename,
- filename == NULL ? "" : " ",
- strerror(errno));
-- close(fd);
- return 0;
- }
-- if (st.st_size > 1*1024*1024) {
-+ if ((st.st_mode & (S_IFSOCK|S_IFCHR|S_IFIFO)) == 0 &&
-+ st.st_size > MAX_KEY_FILE_SIZE) {
-+ toobig:
- error("%s: key file %.200s%stoo large", __func__,
- filename == NULL ? "" : filename,
- filename == NULL ? "" : " ");
-- close(fd);
- return 0;
- }
-- len = (size_t)st.st_size; /* truncated */
--
- buffer_init(blob);
-- cp = buffer_append_space(blob, len);
--
-- if (atomicio(read, fd, cp, len) != len) {
-- debug("%s: read from key file %.200s%sfailed: %.100s", __func__,
-- filename == NULL ? "" : filename,
-- filename == NULL ? "" : " ",
-- strerror(errno));
-+ for (;;) {
-+ if ((len = atomicio(read, fd, buf, sizeof(buf))) == 0) {
-+ if (errno == EPIPE)
-+ break;
-+ debug("%s: read from key file %.200s%sfailed: %.100s",
-+ __func__, filename == NULL ? "" : filename,
-+ filename == NULL ? "" : " ", strerror(errno));
-+ buffer_clear(blob);
-+ bzero(buf, sizeof(buf));
-+ return 0;
-+ }
-+ buffer_append(blob, buf, len);
-+ if (buffer_len(blob) > MAX_KEY_FILE_SIZE) {
-+ buffer_clear(blob);
-+ bzero(buf, sizeof(buf));
-+ goto toobig;
-+ }
-+ }
-+ bzero(buf, sizeof(buf));
-+ if ((st.st_mode & (S_IFSOCK|S_IFCHR|S_IFIFO)) == 0 &&
-+ st.st_size != buffer_len(blob)) {
-+ debug("%s: key file %.200s%schanged size while reading",
-+ __func__, filename == NULL ? "" : filename,
-+ filename == NULL ? "" : " ");
- buffer_clear(blob);
-- close(fd);
- return 0;
- }
-+
- return 1;
- }
-
-@@ -606,7 +623,7 @@
- error("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@");
- error("Permissions 0%3.3o for '%s' are too open.",
- (u_int)st.st_mode & 0777, filename);
-- error("It is recommended that your private key files are NOT accessible by others.");
-+ error("It is required that your private key files are NOT accessible by others.");
- error("This private key will be ignored.");
- return 0;
- }
-@@ -626,6 +643,7 @@
- case KEY_UNSPEC:
- return key_parse_private_pem(blob, type, passphrase, commentp);
- default:
-+ error("%s: cannot parse key type %d", __func__, type);
- break;
- }
- return NULL;
-@@ -670,11 +688,38 @@
- }
-
- Key *
-+key_parse_private(Buffer *buffer, const char *filename,
-+ const char *passphrase, char **commentp)
-+{
-+ Key *pub, *prv;
-+ Buffer pubcopy;
-+
-+ buffer_init(&pubcopy);
-+ buffer_append(&pubcopy, buffer_ptr(buffer), buffer_len(buffer));
-+ /* it's a SSH v1 key if the public key part is readable */
-+ pub = key_parse_public_rsa1(&pubcopy, commentp);
-+ buffer_free(&pubcopy);
-+ if (pub == NULL) {
-+ prv = key_parse_private_type(buffer, KEY_UNSPEC,
-+ passphrase, NULL);
-+ /* use the filename as a comment for PEM */
-+ if (commentp && prv)
-+ *commentp = xstrdup(filename);
-+ } else {
-+ key_free(pub);
-+ /* key_parse_public_rsa1() has already loaded the comment */
-+ prv = key_parse_private_type(buffer, KEY_RSA1, passphrase,
-+ NULL);
-+ }
-+ return prv;
-+}
-+
-+Key *
- key_load_private(const char *filename, const char *passphrase,
- char **commentp)
- {
-- Key *pub, *prv;
-- Buffer buffer, pubcopy;
-+ Key *prv;
-+ Buffer buffer;
- int fd;
-
- fd = open(filename, O_RDONLY);
-@@ -697,23 +742,7 @@
- }
- close(fd);
-
-- buffer_init(&pubcopy);
-- buffer_append(&pubcopy, buffer_ptr(&buffer), buffer_len(&buffer));
-- /* it's a SSH v1 key if the public key part is readable */
-- pub = key_parse_public_rsa1(&pubcopy, commentp);
-- buffer_free(&pubcopy);
-- if (pub == NULL) {
-- prv = key_parse_private_type(&buffer, KEY_UNSPEC,
-- passphrase, NULL);
-- /* use the filename as a comment for PEM */
-- if (commentp && prv)
-- *commentp = xstrdup(filename);
-- } else {
-- key_free(pub);
-- /* key_parse_public_rsa1() has already loaded the comment */
-- prv = key_parse_private_type(&buffer, KEY_RSA1, passphrase,
-- NULL);
-- }
-+ prv = key_parse_private(&buffer, filename, passphrase, commentp);
- buffer_free(&buffer);
- return prv;
- }
-@@ -737,13 +766,19 @@
- case '\0':
- continue;
- }
-+ /* Abort loading if this looks like a private key */
-+ if (strncmp(cp, "-----BEGIN", 10) == 0)
-+ break;
- /* Skip leading whitespace. */
- for (; *cp && (*cp == ' ' || *cp == '\t'); cp++)
- ;
- if (*cp) {
- if (key_read(k, &cp) == 1) {
-- if (commentp)
-- *commentp=xstrdup(filename);
-+ cp[strcspn(cp, "\r\n")] = '\0';
-+ if (commentp) {
-+ *commentp = xstrdup(*cp ?
-+ cp : filename);
-+ }
- fclose(f);
- return 1;
- }
diff --git a/testing/openssh/sshd b/testing/openssh/sshd
deleted file mode 100755
index 2ee1091f0..000000000
--- a/testing/openssh/sshd
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/sshd
-
-PIDFILE=/var/run/sshd.pid
-PID=$(cat $PIDFILE 2>/dev/null)
-if ! readlink -q /proc/$PID/exe | grep -q '^/usr/sbin/sshd'; then
- PID=
- rm $PIDFILE 2>/dev/null
-fi
-
-case "$1" in
- start)
- stat_busy "Starting Secure Shell Daemon"
- [ -f /etc/ssh/ssh_host_key ] || { /usr/bin/ssh-keygen -t rsa1 -N "" -f /etc/ssh/ssh_host_key >/dev/null; }
- [ -f /etc/ssh/ssh_host_rsa_key ] || { /usr/bin/ssh-keygen -t rsa -N "" -f /etc/ssh/ssh_host_rsa_key >/dev/null; }
- [ -f /etc/ssh/ssh_host_dsa_key ] || { /usr/bin/ssh-keygen -t dsa -N "" -f /etc/ssh/ssh_host_dsa_key >/dev/null; }
- [ -f /etc/ssh/ssh_host_ecdsa_key ] || { /usr/bin/ssh-keygen -t ecdsa -N "" -f /etc/ssh/ssh_host_ecdsa_key >/dev/null; }
- [ -d /var/empty ] || mkdir -p /var/empty
- [ -z "$PID" ] && /usr/sbin/sshd $SSHD_ARGS
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon sshd
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping Secure Shell Daemon"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon sshd
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/testing/openssh/sshd.confd b/testing/openssh/sshd.confd
deleted file mode 100644
index 5ce7c0079..000000000
--- a/testing/openssh/sshd.confd
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to sshd
-#
-SSHD_ARGS=""
diff --git a/testing/openssh/sshd.pam b/testing/openssh/sshd.pam
deleted file mode 100644
index ff8829fe9..000000000
--- a/testing/openssh/sshd.pam
+++ /dev/null
@@ -1,11 +0,0 @@
-#%PAM-1.0
-#auth required pam_securetty.so #Disable remote root
-auth required pam_unix.so
-auth required pam_env.so
-account required pam_nologin.so
-account required pam_unix.so
-account required pam_time.so
-password required pam_unix.so
-session required pam_unix_session.so
-session required pam_limits.so
--session optional pam_ck_connector.so nox11
diff --git a/testing/python2/PKGBUILD b/testing/python2/PKGBUILD
deleted file mode 100644
index f1c56f85d..000000000
--- a/testing/python2/PKGBUILD
+++ /dev/null
@@ -1,87 +0,0 @@
-# $Id: PKGBUILD 127261 2011-06-12 03:23:25Z stephane $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-# Contributer: Allan McRae <allan@archlinux.org>
-# Contributer: Jason Chu <jason@archlinux.org>
-
-pkgname=python2
-pkgver=2.7.2
-pkgrel=1
-_pybasever=2.7
-pkgdesc="A high-level scripting language"
-arch=('i686' 'x86_64')
-license=('PSF')
-url="http://www.python.org/"
-depends=('db' 'bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite3' 'libffi')
-makedepends=('tk')
-optdepends=('tk: for IDLE')
-conflicts=('python<3')
-options=('!makeflags')
-source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz
- python-2.7-db51.patch)
-sha1sums=('56700044141402dc35e7a0a24aa7ffda1a8c1a53'
- '9667a2a2f8594902b352793e649f78696a77bd13')
-
-build() {
- cd "${srcdir}/Python-${pkgver}"
-
- patch -Np1 -i ../python-2.7-db51.patch
-
- # Temporary workaround for FS#22322
- # See http://bugs.python.org/issue10835 for upstream report
- sed -i "/progname =/s/python/python${_pybasever}/" Python/pythonrun.c
-
- # Enable built-in SQLite3 module to load extensions (fix FS#22122)
- sed -i "/SQLITE_OMIT_LOAD_EXTENSION/d" setup.py
-
- # FS#2399
- sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python2|" Lib/cgi.py
-
- # Ensure that we are using the system copy of various libraries (expat, zlib and libffi),
- # rather than copies shipped in the tarball
- rm -r Modules/expat
- rm -r Modules/zlib
- rm -r Modules/_ctypes/{darwin,libffi}*
-
- export OPT="${CFLAGS}"
- ./configure --prefix=/usr --enable-shared --with-threads --enable-ipv6 \
- --enable-unicode=ucs4 --with-system-expat --with-system-ffi
-
- make
-}
-
-package() {
- cd "${srcdir}/Python-${pkgver}"
- make DESTDIR="${pkgdir}" altinstall maninstall
-
- ln -sf python${_pybasever} "${pkgdir}/usr/bin/python2"
- ln -sf python${_pybasever}-config "${pkgdir}/usr/bin/python2-config"
- ln -sf python${_pybasever}.1 "${pkgdir}/usr/share/man/man1/python2.1"
-
- ln -sf ../../libpython${_pybasever}.so \
- "${pkgdir}/usr/lib/python${_pybasever}/config/libpython${_pybasever}.so"
-
- mv "${pkgdir}/usr/bin/smtpd.py" "${pkgdir}/usr/lib/python${_pybasever}/"
-
- # some useful "stuff"
- install -dm755 "${pkgdir}"/usr/lib/python${_pybasever}/Tools/{i18n,scripts}
- install -m755 Tools/i18n/{msgfmt,pygettext}.py \
- "${pkgdir}/usr/lib/python${_pybasever}/Tools/i18n/"
- install -m755 Tools/scripts/{README,*py} \
- "${pkgdir}/usr/lib/python${_pybasever}/Tools/scripts/"
-
- # fix conflicts with python
- mv "${pkgdir}"/usr/bin/idle{,2}
- mv "${pkgdir}"/usr/bin/pydoc{,2}
- mv "${pkgdir}"/usr/bin/2to3{,-2.7}
-
- # clean up #!s
- find "${pkgdir}/usr/lib/python${_pybasever}/" -name '*.py' | \
- xargs sed -i "s|#[ ]*![ ]*/usr/bin/env python$|#!/usr/bin/env python2|"
-
- # clean-up reference to build directory
- sed -i "s#${srcdir}/Python-${pkgver}:##" \
- "${pkgdir}/usr/lib/python${_pybasever}/config/Makefile"
-
- # license
- install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/testing/python2/python-2.7-db51.patch b/testing/python2/python-2.7-db51.patch
deleted file mode 100644
index 2da95c375..000000000
--- a/testing/python2/python-2.7-db51.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -Naur Python-2.7-orig//Modules/_bsddb.c Python-2.7/Modules/_bsddb.c
---- Python-2.7-orig//Modules/_bsddb.c 2010-05-10 00:46:46.000000000 +1000
-+++ Python-2.7/Modules/_bsddb.c 2010-10-20 13:19:26.436669911 +1000
-@@ -9765,8 +9765,11 @@
-
- ADD_INT(d, DB_REP_PERMANENT);
-
--#if (DBVER >= 44)
-+#if (DBVER >= 44) && (DBVER <= 48)
- ADD_INT(d, DB_REP_CONF_NOAUTOINIT);
-+#endif
-+
-+#if (DBVER >= 44)
- ADD_INT(d, DB_REP_CONF_DELAYCLIENT);
- ADD_INT(d, DB_REP_CONF_BULK);
- ADD_INT(d, DB_REP_CONF_NOWAIT);
-diff -Naur Python-2.7-orig//setup.py Python-2.7/setup.py
---- Python-2.7-orig//setup.py 2010-06-27 22:36:16.000000000 +1000
-+++ Python-2.7/setup.py 2010-10-20 13:10:48.256670026 +1000
-@@ -765,7 +765,7 @@
- # a release. Most open source OSes come with one or more
- # versions of BerkeleyDB already installed.
-
-- max_db_ver = (4, 8)
-+ max_db_ver = (5, 1)
- min_db_ver = (4, 1)
- db_setup_debug = False # verbose debug prints from this script?
-
-@@ -787,8 +787,12 @@
- return True
-
- def gen_db_minor_ver_nums(major):
-- if major == 4:
-+ if major == 5:
- for x in range(max_db_ver[1]+1):
-+ if allow_db_ver((5, x)):
-+ yield x
-+ if major == 4:
-+ for x in range(9):
- if allow_db_ver((4, x)):
- yield x
- elif major == 3: