summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--community/chntpw/PKGBUILD49
-rw-r--r--community/hardinfo/ChangeLog20
-rw-r--r--community/hardinfo/PKGBUILD36
-rw-r--r--community/hardinfo/fixsensors.patch13
-rw-r--r--community/hardinfo/hardinfo.distro1
-rw-r--r--community/john/PKGBUILD6
-rw-r--r--community/libfm/0001-filename-with-spaces-not-supported.patch (renamed from extra/libfm/0001-filename-with-spaces-not-supported.patch)0
-rw-r--r--community/libfm/PKGBUILD (renamed from extra/libfm/PKGBUILD)12
-rw-r--r--community/libfm/libfm.install (renamed from extra/libfm/libfm.install)0
-rw-r--r--community/luxrays/PKGBUILD22
-rw-r--r--community/luxrender/PKGBUILD26
-rw-r--r--community/luxrender/libpng.patch21
-rw-r--r--community/lxde-common/PKGBUILD (renamed from extra/lxde-common/PKGBUILD)17
-rw-r--r--community/lxde-common/lxde-common-arch.patch (renamed from extra/lxde-common/lxde-common-arch.patch)0
-rw-r--r--community/lxde-common/lxde-common-invalid-distfile.patch (renamed from extra/lxde-common/lxde-common-invalid-distfile.patch)0
-rw-r--r--community/lxde-common/lxde-common.install (renamed from extra/lxde-common/lxde-common.install)5
-rw-r--r--community/lxdm/PKGBUILD (renamed from extra/lxdm/PKGBUILD)18
-rw-r--r--community/lxdm/Xsession.patch (renamed from extra/lxdm/Xsession.patch)0
-rw-r--r--community/lxdm/lxdm-daemon (renamed from extra/lxdm/lxdm-daemon)0
-rw-r--r--community/lxdm/lxdm-pam.patch (renamed from extra/lxdm/lxdm-pam.patch)0
-rw-r--r--community/lxdm/lxdm.install (renamed from extra/lxdm/lxdm.install)0
-rw-r--r--community/lxdm/lxdm.patch (renamed from extra/lxdm/lxdm.patch)0
-rw-r--r--community/lxmenu-data/PKGBUILD25
-rw-r--r--community/lxpanel/Fix-build-issue-with-symbol-alarm-showing-up-on-F14-.patch (renamed from extra/lxpanel/Fix-build-issue-with-symbol-alarm-showing-up-on-F14-.patch)0
-rw-r--r--community/lxpanel/PKGBUILD (renamed from extra/lxpanel/PKGBUILD)9
-rw-r--r--community/lxsession-lite/PKGBUILD (renamed from extra/lxsession-lite/PKGBUILD)11
-rw-r--r--community/menu-cache/PKGBUILD (renamed from extra/menu-cache/PKGBUILD)10
-rw-r--r--community/obconf/PKGBUILD (renamed from extra/obconf/PKGBUILD)18
-rw-r--r--community/openbox/PKGBUILD47
-rw-r--r--community/openbox/openbox.install (renamed from extra/openbox/openbox.install)5
-rw-r--r--community/openbox/which-2.20.patch (renamed from extra/openbox/which-2.20.patch)0
-rw-r--r--community/pcmanfm/PKGBUILD (renamed from extra/pcmanfm/PKGBUILD)12
-rw-r--r--community/pcmanfm/pcmanfm.install (renamed from extra/pcmanfm/pcmanfm.install)0
-rw-r--r--community/pcmanfm/revert-new-IPC.patch (renamed from extra/pcmanfm/revert-new-IPC.patch)0
-rw-r--r--community/qtcreator/PKGBUILD12
-rw-r--r--community/quvi/PKGBUILD6
-rw-r--r--community/skrooge/PKGBUILD8
-rw-r--r--community/sword/curl_7.20.patch12
-rw-r--r--community/wvdial/PKGBUILD (renamed from extra/wvdial/PKGBUILD)4
-rw-r--r--community/wvstreams/PKGBUILD (renamed from extra/wvstreams/PKGBUILD)8
-rw-r--r--community/xbindkeys/PKGBUILD (renamed from extra/xbindkeys/PKGBUILD)11
-rw-r--r--community/xplc/PKGBUILD (renamed from extra/xplc/PKGBUILD)18
-rw-r--r--community/zziplib/PKGBUILD36
-rw-r--r--community/zziplib/zziplib-0.13.60-ldflags.patch14
-rw-r--r--core/jfsutils/PKGBUILD7
-rw-r--r--core/net-tools/nisdomainname.conf.d3
-rw-r--r--core/rp-pppoe/PKGBUILD39
-rwxr-xr-xcore/rp-pppoe/adsl35
-rw-r--r--core/rp-pppoe/rp-pppoe.install12
-rw-r--r--core/udev/80-drivers.rules14
-rwxr-xr-xcore/udev/load-modules.sh80
-rw-r--r--core/udev/static-audio-nodes-permissions.patch27
-rw-r--r--extra/amule/PKGBUILD6
-rw-r--r--extra/avahi/ChangeLog17
-rw-r--r--extra/avidemux/2.5.4_audioDevice.patch12
-rw-r--r--extra/avidemux/x264.patch21
-rw-r--r--extra/clamav/PKGBUILD35
-rw-r--r--extra/clamav/conf.d (renamed from extra/clamav/clamav.confd)0
-rw-r--r--extra/clamav/install (renamed from extra/clamav/clamav.install)0
-rw-r--r--extra/clamav/logrotate (renamed from extra/clamav/clamav.logrotate)0
-rw-r--r--extra/clamav/rc.d (renamed from extra/clamav/clamav)0
-rw-r--r--extra/gtk3/only_draw_resize_grip_if_its_window_exists.patch28
-rw-r--r--extra/hugin/hugin-gcc46.patch16
-rw-r--r--extra/icedtea-web/PKGBUILD48
-rw-r--r--extra/icedtea-web/fix-man-location.patch13
-rw-r--r--extra/icon-naming-utils/PKGBUILD24
-rw-r--r--extra/libwebkit/gcc46.patch11
-rw-r--r--extra/lxmenu-data/PKGBUILD19
-rw-r--r--extra/lxpanel/Fix-failure-to-react-to-keyboard-map-changes-initiat.patch555
-rw-r--r--extra/nx-common/nx-gcc44.patch12
-rw-r--r--extra/nxserver/nx-gcc44.patch12
-rw-r--r--extra/nxserver/nxcompshad-gcc43.patch19
-rw-r--r--extra/obconf/obconf.install15
-rw-r--r--extra/openbox/PKGBUILD47
-rw-r--r--extra/phonon-xine/PKGBUILD30
-rw-r--r--extra/pidgin/nm09-pidgin.patch38
-rw-r--r--extra/qt/PKGBUILD110
-rw-r--r--extra/vlc/PKGBUILD15
-rw-r--r--extra/zope-interface/PKGBUILD21
-rw-r--r--libre/initscripts/PKGBUILD6
-rw-r--r--libre/pacman/PKGBUILD28
-rw-r--r--libre/pacman/makepkg.conf6
-rw-r--r--libre/pacman/rePKGBUILD32
-rw-r--r--social/bitcoin-daemon/makefile.archlinux72
-rw-r--r--testing/avahi/PKGBUILD75
-rw-r--r--testing/avahi/avahi-daemon-dbus.patch11
-rw-r--r--testing/avahi/avahi.install21
-rw-r--r--testing/avahi/gnome-nettool.pngbin4509 -> 0 bytes
-rw-r--r--testing/glib2/PKGBUILD48
-rw-r--r--testing/glib2/glib2.csh1
-rw-r--r--testing/glib2/glib2.sh1
-rw-r--r--testing/gtk3/PKGBUILD36
-rw-r--r--testing/gtk3/gtk3.install15
-rw-r--r--testing/gtk3/settings.ini2
-rw-r--r--testing/jfsutils/PKGBUILD24
-rw-r--r--testing/net-tools/net-tools.install12
-rw-r--r--testing/nx-common/NXproto.h.64bit.diff66
-rw-r--r--testing/nx-common/PKGBUILD54
-rw-r--r--testing/nx-common/nxcompsh-gcc43.patch19
-rw-r--r--testing/nxserver/NXproto.h.64bit.diff66
-rw-r--r--testing/nxserver/PKGBUILD92
-rw-r--r--testing/nxserver/nxcompsh-gcc43.patch19
102 files changed, 355 insertions, 2204 deletions
diff --git a/community/chntpw/PKGBUILD b/community/chntpw/PKGBUILD
index 6899fbefc..bbbc62e13 100644
--- a/community/chntpw/PKGBUILD
+++ b/community/chntpw/PKGBUILD
@@ -1,29 +1,34 @@
-# $Id: PKGBUILD 91796 2010-09-28 06:24:38Z tpowa $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+# $Id: PKGBUILD 48999 2011-06-09 15:13:27Z lfleischer $
+# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
+# Contributor: Tobias Powalowski <tpowa@archlinux.org>
+
pkgname=chntpw
-pkgver=100627
+pkgver=110511
pkgrel=1
-pkgdesc="The Offline NT Password Editor - enables you to view some information and change user passwords in a Windows NT SAM userdatabase file"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://pogostick.net/~pnh/ntpasswd/"
+pkgdesc='Offline NT Password Editor - reset passwords in a Windows NT SAM userdatabase file'
+arch=('i686' 'x86_64')
+url='http://pogostick.net/~pnh/ntpasswd/'
license=('GPL' 'LGPL')
makedepends=('openssl')
-source=(http://pogostick.net/~pnh/ntpasswd/${pkgname}-source-${pkgver}.zip)
-md5sums=('8b046c2073f27eed728e18635ba72dd4')
-sha1sums=('4b2a7e7a406ca9ecb68c9ab4fb6012864828806d')
+source=("http://pogostick.net/~pnh/ntpasswd/${pkgname}-source-${pkgver}.zip")
+md5sums=('a3fb358d1adec589cd6bc8dedf68896c')
build() {
- if [ "$CARCH" = "x86_64" ]; then
- cd ${srcdir}/${pkgname}-${pkgver}
- sed -i "s|CFLAGS= -DUSEOPENSSL -g -I. -I\$(OSSLINC) -Wall -m32|CFLAGS= -DUSEOPENSSL -g -I. -I\$(OSSLINC) -Wall|" Makefile
- fi
- cd ${srcdir}/${pkgname}-${pkgver}
- make
- # install binaries, don't install static binaries!
- install -Dm755 ${srcdir}/${pkgname}-${pkgver}/${pkgname} ${pkgdir}/usr/bin/${pkgname}
- install -Dm755 ${srcdir}/${pkgname}-${pkgver}/reged ${pkgdir}/usr/bin/reged
- install -Dm755 ${srcdir}/${pkgname}-${pkgver}/cpnt ${pkgdir}/usr/bin/cpnt
- for doc in *.txt; do
- install -Dm644 ${doc} ${pkgdir}/usr/share/doc/${pkgname}/${doc}
- done
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ [ "$CARCH" = "x86_64" ] && sed -i "s|CFLAGS= -DUSEOPENSSL -g -I. -I\$(OSSLINC) -Wall -m32|CFLAGS= -DUSEOPENSSL -g -I. -I\$(OSSLINC) -Wall|" Makefile
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ # install binaries, don't install static binaries!
+ install -Dm0755 "${srcdir}/${pkgname}-${pkgver}/${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
+ install -Dm0755 "${srcdir}/${pkgname}-${pkgver}/reged" "${pkgdir}/usr/bin/reged"
+ install -Dm0755 "${srcdir}/${pkgname}-${pkgver}/cpnt" "${pkgdir}/usr/bin/cpnt"
+
+ for _f in *.txt; do
+ install -Dm0644 "${_f}" "${pkgdir}/usr/share/doc/${pkgname}/${_f}"
+ done
}
diff --git a/community/hardinfo/ChangeLog b/community/hardinfo/ChangeLog
deleted file mode 100644
index faf242a7b..000000000
--- a/community/hardinfo/ChangeLog
+++ /dev/null
@@ -1,20 +0,0 @@
-2009-04-06 Eric Belanger <eric@archlinux.org>
-
- * hardinfo 0.5.1-1
- * Upstream update
-
-2009-03-29 Eric Belanger <eric@archlinux.org>
-
- * hardinfo 0.5c-1
- * Upstream update
-
-2008-08-13 Eric Belanger <eric@archlinux.org>
-
- * hardinfo 0.4.2.3-3
- * Rebuilt against gnutls 2.4.1
-
-2008-04-06 Eric Belanger <eric@archlinux.org>
-
- * hardinfo 0.4.2.3-2
- * Rebuilt against libsoup 2.4
- * Added ChangeLog
diff --git a/community/hardinfo/PKGBUILD b/community/hardinfo/PKGBUILD
deleted file mode 100644
index e97e66584..000000000
--- a/community/hardinfo/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 17993 2010-05-29 04:49:43Z ebelanger $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-
-pkgname=hardinfo
-pkgver=0.5.1
-pkgrel=2
-pkgdesc="A system information and benchmark tool."
-arch=('i686' 'x86_64' 'mips64el')
-url="http://hardinfo.berlios.de/wiki/index.php/Main_Page"
-license=('GPL2')
-depends=('gtk2' 'libsoup' 'gnutls')
-options=('!emptydirs')
-source=(http://download.berlios.de/hardinfo/${pkgname}-${pkgver}.tar.bz2 \
- fixsensors.patch hardinfo.distro)
-md5sums=('6fb38992e140f2fab16518ae1f38e188' '05c212db07b9f152cdea052ff7bb28fa'\
- 'ab8a557d10f74bec5c94ed6cae34729c')
-sha1sums=('983f0445aa60e02156bc5a5eaedeffb30b8e4d64' 'd2151dce76dca238102937d0e15541f172bca530'\
- '4c31cbbfbdeb48593641ff600c8d4fb7bda2b01c')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -p1 < ../fixsensors.patch || return 1
- sed -i 's|/usr/lib64|/usr/lib|' configure || return 1
- ./configure --prefix=/usr || return 1
- sed -i 's|lib64|lib|' binreloc.c || return 1
- sed -i 's|/sbin/lsmod|/bin/lsmod|g' arch/linux/{parisc,ppc,m68k,x86,common,mips,sparc,x86_64}/modules.h || return 1
- sed -i 's|/sbin/lsmod|/bin/lsmod|g' arch/this/modules.h || return 1
- sed -i 's|{ DB_PREFIX "debian_version", "deb" },|{ DB_PREFIX "hardinfo.distro", "arch" },{ DB_PREFIX "debian_version", "deb" },|' computer.h || return 1
- make || return 1
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install || return 1
- install -D -m644 ../hardinfo.distro "${pkgdir}/etc/hardinfo.distro" || return 1
-}
diff --git a/community/hardinfo/fixsensors.patch b/community/hardinfo/fixsensors.patch
deleted file mode 100644
index 812c29458..000000000
--- a/community/hardinfo/fixsensors.patch
+++ /dev/null
@@ -1,13 +0,0 @@
- diff -upNr hardinfo-0.4.2.2.orign/util.c hardinfo-0.4.2.2/util.c
---- hardinfo-0.4.2.2.orign/util.c 2007-07-20 16:45:08.000000000 +0200
-+++ hardinfo-0.4.2.2/util.c 2007-07-26 10:15:32.000000000 +0200
-@@ -996,7 +996,8 @@ gchar *h_strdup_cprintf(const gchar * fo
- if (source) {
- retn = g_strconcat(source, buffer, NULL);
- g_free(buffer);
-- g_free(source);
-+ if(strlen(source))
-+ g_free(source);
- } else {
- retn = buffer;
- }
diff --git a/community/hardinfo/hardinfo.distro b/community/hardinfo/hardinfo.distro
deleted file mode 100644
index 850183eeb..000000000
--- a/community/hardinfo/hardinfo.distro
+++ /dev/null
@@ -1 +0,0 @@
-Arch Linux
diff --git a/community/john/PKGBUILD b/community/john/PKGBUILD
index c4f02caa8..8830aa59b 100644
--- a/community/john/PKGBUILD
+++ b/community/john/PKGBUILD
@@ -6,8 +6,8 @@
pkgname=john
pkgver=1.7.7
-pkgrel=2
-_jumbover=5
+pkgrel=3
+_jumbover=6
pkgdesc="John The Ripper - A fast password cracker (jumbo-$_jumbover included)"
arch=('i686' 'x86_64')
url="http://www.openwall.com/$pkgname/"
@@ -19,7 +19,7 @@ source=(http://www.openwall.com/$pkgname/g/$pkgname-$pkgver.tar.bz2
ftp://ftp.kfki.hu/pub/packages/security/ssh/ossh/libdes-4.04b.tar.gz
params.h.patch)
md5sums=('be316618de834a58573a21225d4a2674'
- '40efadf002fb68d8287e60654593a531'
+ 'a9b0ca4d9d48480fc44b1986610d471a'
'c8d5c69f86c2eedb485583b0305284a1'
'f69ed632eba8fb9e45847a4b4a323787')
diff --git a/extra/libfm/0001-filename-with-spaces-not-supported.patch b/community/libfm/0001-filename-with-spaces-not-supported.patch
index 568f6dc38..568f6dc38 100644
--- a/extra/libfm/0001-filename-with-spaces-not-supported.patch
+++ b/community/libfm/0001-filename-with-spaces-not-supported.patch
diff --git a/extra/libfm/PKGBUILD b/community/libfm/PKGBUILD
index a51cf6935..3a1d121fd 100644
--- a/extra/libfm/PKGBUILD
+++ b/community/libfm/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 119892 2011-04-16 12:10:54Z angvp $
+# $Id: PKGBUILD 49034 2011-06-09 21:26:14Z andrea $
# Maintainer: Angel Velasquez <angvp@archlinux.org>
# Maintainer: Juergen Hoetzel <juergen@archlinux.org>
-pkgname=libfm
+
+pkgname=libfm
pkgver=0.1.14
-pkgrel=5
+pkgrel=5
pkgdesc="the core of next generation file manager PCManFM"
url="http://pcmanfm.sourceforge.net/"
arch=('i686' 'x86_64' 'mips64el')
@@ -20,7 +21,10 @@ md5sums=('d55e51dced6bb9ef46665243b079761f'
build() {
cd $srcdir/$pkgname-$pkgver
patch -p1 -i $srcdir/0001-filename-with-spaces-not-supported.patch
- ./configure --prefix=/usr --sysconfdir=/etc --enable-udisks --with-gnu-ld
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --enable-udisks \
+ --with-gnu-ld
make
}
diff --git a/extra/libfm/libfm.install b/community/libfm/libfm.install
index 076da308e..076da308e 100644
--- a/extra/libfm/libfm.install
+++ b/community/libfm/libfm.install
diff --git a/community/luxrays/PKGBUILD b/community/luxrays/PKGBUILD
index 47f1abe5d..6c9f0e18a 100644
--- a/community/luxrays/PKGBUILD
+++ b/community/luxrays/PKGBUILD
@@ -1,28 +1,32 @@
-# $Id: PKGBUILD 48847 2011-06-06 14:44:47Z stativ $
+# $Id: PKGBUILD 49009 2011-06-09 16:49:54Z stativ $
# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
pkgname=luxrays
pkgver=0.8
_pkgver=ed424ec77571
-pkgrel=1
+pkgrel=2
epoch=0
pkgdesc="Accelerate the ray intersection process by using GPUs"
arch=('i686' 'x86_64')
url="http://www.luxrender.net/"
license=('GPL')
-depends=('freeimage' 'freeglut' 'glew' 'libgl' 'libcl')
-makedepends=('cmake' 'boost' 'opencl-headers')
-source=(http://src.luxrender.net/luxrays/archive/$_pkgver.tar.bz2)
-md5sums=('32ac9ebd0a4de217fb3362494ce16a8e')
+depends=('freeimage' 'freeglut' 'glew')
+makedepends=('cmake' 'boost')
+source=(https://bitbucket.org/luxrender/luxrays/get/$_pkgver.tar.bz2)
+md5sums=('386a3549376ac8240065232ae3294da4')
build() {
- cd "$srcdir/$pkgname-$_pkgver"
+ cd "$srcdir/luxrender-$pkgname-$_pkgver"
- cmake -DCMAKE_INSTALL_PREFIX=/usr .
+ export CXXFLAGS="$CXXFLAGS -lpthread"
+ cmake -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DLUXRAYS_DISABLE_OPENCL=ON \
+ .
make
}
package() {
- cd "$srcdir/$pkgname-$_pkgver"
+ cd "$srcdir/luxrender-$pkgname-$_pkgver"
install -d -m755 "$pkgdir"/usr/{bin,include,lib}
install -m755 bin/* "$pkgdir"/usr/bin
diff --git a/community/luxrender/PKGBUILD b/community/luxrender/PKGBUILD
index c7c7ee4a9..8b3ab0e1a 100644
--- a/community/luxrender/PKGBUILD
+++ b/community/luxrender/PKGBUILD
@@ -1,3 +1,4 @@
+# $Id: PKGBUILD 49014 2011-06-09 17:05:59Z stativ $
# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
# Initial contributor: flixie <69one@gmx.net>
# Contributor: Imanol Celaya <ornitorrincos@archlinux-es.org>
@@ -6,28 +7,31 @@ pkgver=0.8
_pkgver=45d3e13eb94c
_luxblend=9cb3fcee0be8
_blender=2.57
-pkgrel=1
+pkgrel=2
pkgdesc="Rendering system for physically correct, unbiased image synthesis"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.luxrender.net/"
license=('GPL')
-depends=('boost-libs' 'luxrays' 'openexr')
+depends=('boost-libs' 'freeimage' 'openexr')
optdepends=('blender: Blender exporter' 'qt: Qt GUI')
-makedepends=('cmake' 'boost' 'qt' 'opencl-headers')
-source=(http://src.luxrender.net/lux/archive/$_pkgver.tar.bz2
- http://src.luxrender.net/luxblend25/archive/$_luxblend.tar.bz2)
-md5sums=('ad8d2ede00aa244cad884d9696ff5fbb'
- '29c34f97791db3af1b827d9e9a1b3d79')
+makedepends=('cmake' 'boost' 'qt' 'luxrays')
+source=(https://bitbucket.org/luxrender/lux/get/$_pkgver.tar.bz2 \
+ https://bitbucket.org/luxrender/luxblend25/get/$_luxblend.tar.bz2)
+md5sums=('0f2d856385db72131f51e44a7ee527fa'
+ '0c3c8d9efba76133f8c687b5dd2bca8a')
build() {
- cd "$srcdir"/lux-$_pkgver
+ cd "$srcdir"/luxrender-lux-$_pkgver
- cmake -DCMAKE_INSTALL_PREFIX=/usr .
+ export CXXFLAGS="$CXXFLAGS -lpthread"
+ cmake -DCMAKE_INSTALL_PREFIX=/usr \
+ -DLUXRAYS_DISABLE_OPENCL=ON \
+ .
make
}
package() {
- cd "$srcdir"/lux-$_pkgver
+ cd "$srcdir"/luxrender-lux-$_pkgver
make DESTDIR="$pkgdir" install
# fix library path on x86_64
@@ -35,7 +39,7 @@ package() {
# install blender exporter
install -d -m755 "$pkgdir"/usr/share/blender/$_blender/scripts/addons
- cp -a "$srcdir"/luxblend25-$_luxblend/src/luxrender \
+ cp -a "$srcdir"/luxrender-luxblend25-$_luxblend/src/luxrender \
"$pkgdir"/usr/share/blender/$_blender/scripts/addons
}
diff --git a/community/luxrender/libpng.patch b/community/luxrender/libpng.patch
deleted file mode 100644
index 71700a7d2..000000000
--- a/community/luxrender/libpng.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -rupN lux-36533b0843bd/core/cimg.h lux-fixed/core/cimg.h
---- lux-36533b0843bd/core/external/cimg.h 2009-12-19 10:39:59.000000000 +0100
-+++ lux-fixed/core/external/cimg.h 2010-01-22 11:38:06.651814854 +0100
-@@ -25679,7 +25679,7 @@ namespace cimg_library {
- png_read_info(png_ptr,info_ptr);
- png_uint_32 W, H;
- int bit_depth, color_type, interlace_type;
-- png_get_IHDR(png_ptr,info_ptr,&W,&H,&bit_depth,&color_type,&interlace_type,int_p_NULL,int_p_NULL);
-+ png_get_IHDR(png_ptr,info_ptr,&W,&H,&bit_depth,&color_type,&interlace_type,(int *) NULL,(int *) NULL);
- int new_bit_depth = bit_depth;
- int new_color_type = color_type;
-
-@@ -25690,7 +25690,7 @@ namespace cimg_library {
- new_bit_depth = 8;
- }
- if (new_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);
- new_bit_depth = 8;
- }
- if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))
diff --git a/extra/lxde-common/PKGBUILD b/community/lxde-common/PKGBUILD
index 21a75f462..dea1d7caf 100644
--- a/extra/lxde-common/PKGBUILD
+++ b/community/lxde-common/PKGBUILD
@@ -1,4 +1,7 @@
+# $Id: PKGBUILD 49034 2011-06-09 21:26:14Z andrea $
+# Maintainer: Angel Velasquez <angvp@archlinux.org>
# Maintainer: Juergen Hoetzel <juergen@archlinux.org>
+
pkgname=lxde-common
pkgver=0.5.0
pkgrel=3
@@ -12,8 +15,10 @@ url="http://lxde.org/"
makedepends=(automake)
optdepends=(lxsession-lite)
backup=(etc/xdg/lxsession/LXDE/{desktop.conf,autostart})
-source=("http://downloads.sourceforge.net/project/lxde/${pkgname}%20%28default%20config%29/${pkgname}%200.5.0/${pkgname}-0.5.0.tar.gz" "${pkgname}-arch.patch" ${pkgname}-invalid-distfile.patch)
-md5sums=('23606ab3d6e1039386d62a4b68b4ffc6' '21657157d9ab377de55deb19a42d68e8'\
+source=("http://downloads.sourceforge.net/lxde/${pkgname}-${pkgver}.tar.gz"
+ "${pkgname}-arch.patch" "${pkgname}-invalid-distfile.patch")
+md5sums=('23606ab3d6e1039386d62a4b68b4ffc6'
+ '21657157d9ab377de55deb19a42d68e8'
'24938631783683fd98dfd533023e6d4e')
@@ -22,7 +27,11 @@ build() {
patch -p1 -i ${srcdir}/${pkgname}-arch.patch
autoreconf
./configure --sysconfdir=/etc --prefix=/usr
- make DESTDIR="$pkgdir" install
- install -Dm644 lxde-logout.desktop ${pkgdir}/usr/share/applications/lxde-logout.desktop
}
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+ install -Dm644 lxde-logout.desktop \
+ ${pkgdir}/usr/share/applications/lxde-logout.desktop
+}
diff --git a/extra/lxde-common/lxde-common-arch.patch b/community/lxde-common/lxde-common-arch.patch
index 3aa1a8992..3aa1a8992 100644
--- a/extra/lxde-common/lxde-common-arch.patch
+++ b/community/lxde-common/lxde-common-arch.patch
diff --git a/extra/lxde-common/lxde-common-invalid-distfile.patch b/community/lxde-common/lxde-common-invalid-distfile.patch
index df5d68084..df5d68084 100644
--- a/extra/lxde-common/lxde-common-invalid-distfile.patch
+++ b/community/lxde-common/lxde-common-invalid-distfile.patch
diff --git a/extra/lxde-common/lxde-common.install b/community/lxde-common/lxde-common.install
index 86a366848..d2226670d 100644
--- a/extra/lxde-common/lxde-common.install
+++ b/community/lxde-common/lxde-common.install
@@ -11,8 +11,3 @@ post_upgrade() {
post_remove() {
gtk-update-icon-cache -q -t -f ${ICON_PATH}
}
-
-op=$1
-shift
-
-$op $*
diff --git a/extra/lxdm/PKGBUILD b/community/lxdm/PKGBUILD
index b5d711387..1663cf998 100644
--- a/extra/lxdm/PKGBUILD
+++ b/community/lxdm/PKGBUILD
@@ -1,6 +1,6 @@
+# $Id: PKGBUILD 49034 2011-06-09 21:26:14Z andrea $
# Maintainer: AndyRTR <andyrtr@archlinux.org>
-#Contributor: kiefer <jorgelmadrid@gmail.com>
-#Based on lxdm-git by phillipe
+# Contributor: kiefer <jorgelmadrid@gmail.com>
pkgname=lxdm
pkgver=0.3.0
@@ -10,13 +10,12 @@ arch=('i686' 'x86_64' 'mips64el')
url="http://sourceforge.net/projects/lxdm/"
license=('GPL')
groups=('lxde')
-conflicts=('lxdm-git')
depends=('gtk2' 'xorg-server' 'consolekit')
makedepends=('intltool')
install=${pkgname}.install
backup=('etc/lxdm/lxdm.conf') # 'etc/lxdm/xinitrc')
-source=(http://downloads.sourceforge.net/project/lxdm/lxdm%20${pkgver}/$pkgname-$pkgver.tar.gz
- Xsession.patch lxdm.patch lxdm-pam.patch lxdm-daemon)
+source=("http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz"
+ Xsession.patch lxdm.patch lxdm-pam.patch lxdm-daemon)
md5sums=('1d0688e088edab7c3c563263eb2f9654'
'9bdf95adb74d81d4b6b6176fb1142090'
'baed9055e8825a5511712bc095197519'
@@ -35,15 +34,14 @@ build() {
package() {
cd $srcdir/$pkgname-$pkgver
- make DESTDIR="${pkgdir}" install || return 1
+ make DESTDIR="${pkgdir}" install
- install -m644 ${srcdir}/lxdm-pam.patch ${pkgdir}/etc/pam.d/lxdm || return 1
- install -Dm755 ${srcdir}/lxdm-daemon ${pkgdir}/etc/rc.d/lxdm || return 1
+ install -m644 ${srcdir}/lxdm-pam.patch ${pkgdir}/etc/pam.d/lxdm
+ install -Dm755 ${srcdir}/lxdm-daemon ${pkgdir}/etc/rc.d/lxdm
# these files are not in the package, but should be owned by lxdm - taken from Fedora pkg
# touch ${pkgdir}/etc/lxdm/xinitrc
- mkdir -p ${pkgdir}/var/run/lxdm
- mkdir -p ${pkgdir}/var/lib/lxdm
+ install -d ${pkgdir}/var/{lib,run}/lxdm
# touch ${pkgdir}/var/lib/lxdm/lxdm.conf
# fix the greeter location
diff --git a/extra/lxdm/Xsession.patch b/community/lxdm/Xsession.patch
index a9ba63233..a9ba63233 100644
--- a/extra/lxdm/Xsession.patch
+++ b/community/lxdm/Xsession.patch
diff --git a/extra/lxdm/lxdm-daemon b/community/lxdm/lxdm-daemon
index 68eb6225d..68eb6225d 100644
--- a/extra/lxdm/lxdm-daemon
+++ b/community/lxdm/lxdm-daemon
diff --git a/extra/lxdm/lxdm-pam.patch b/community/lxdm/lxdm-pam.patch
index 3f5df04a7..3f5df04a7 100644
--- a/extra/lxdm/lxdm-pam.patch
+++ b/community/lxdm/lxdm-pam.patch
diff --git a/extra/lxdm/lxdm.install b/community/lxdm/lxdm.install
index 8d42de90f..8d42de90f 100644
--- a/extra/lxdm/lxdm.install
+++ b/community/lxdm/lxdm.install
diff --git a/extra/lxdm/lxdm.patch b/community/lxdm/lxdm.patch
index a703a386d..a703a386d 100644
--- a/extra/lxdm/lxdm.patch
+++ b/community/lxdm/lxdm.patch
diff --git a/community/lxmenu-data/PKGBUILD b/community/lxmenu-data/PKGBUILD
new file mode 100644
index 000000000..3efe37218
--- /dev/null
+++ b/community/lxmenu-data/PKGBUILD
@@ -0,0 +1,25 @@
+# $Id: PKGBUILD 49034 2011-06-09 21:26:14Z andrea $
+# Maintainer: Angel Velasquez <angvp@archlinux.org>
+# Maintainer: Juergen Hoetzel <juergen@archlinux.org>
+
+pkgname=lxmenu-data
+pkgver=0.1.1
+pkgrel=1
+pkgdesc="freedesktop.org desktop menus for LXDE"
+arch=('i686' 'x86_64')
+license=('GPL2')
+url="http://lxde.org/"
+groups=('lxde')
+source=("http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz")
+md5sums=('cee3181dd22088f3db0e99ffbedc986d')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+ ./configure --prefix=/usr --sysconfdir=/etc
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+}
diff --git a/extra/lxpanel/Fix-build-issue-with-symbol-alarm-showing-up-on-F14-.patch b/community/lxpanel/Fix-build-issue-with-symbol-alarm-showing-up-on-F14-.patch
index e3da3d897..e3da3d897 100644
--- a/extra/lxpanel/Fix-build-issue-with-symbol-alarm-showing-up-on-F14-.patch
+++ b/community/lxpanel/Fix-build-issue-with-symbol-alarm-showing-up-on-F14-.patch
diff --git a/extra/lxpanel/PKGBUILD b/community/lxpanel/PKGBUILD
index eb189f7ac..21fbb05ab 100644
--- a/extra/lxpanel/PKGBUILD
+++ b/community/lxpanel/PKGBUILD
@@ -1,6 +1,7 @@
-$Id: PKGBUILD 94639 2010-10-08 22:08:39Z angvp $
+# $Id: PKGBUILD 49034 2011-06-09 21:26:14Z andrea $
# Maintainer: Angel Velasquez <angvp@archlinux.org>
# Maintainer: Juergen Hoetzel <juergen@archlinux.org>
+
pkgname=lxpanel
pkgver=0.5.6
pkgrel=1
@@ -10,7 +11,7 @@ license=('GPL2')
url="http://lxde.org/"
groups=('lxde')
depends=('gtk2' 'alsa-lib' 'menu-cache' 'lxmenu-data')
-source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz
+source=(http://downloads.sourceforge.net/lxde/${pkgname}-${pkgver}.tar.gz
Fix-build-issue-with-symbol-alarm-showing-up-on-F14-.patch)
optdepends=(pcmanfm)
md5sums=('3c6b5498b5f4109c3913b10a66809fe6'
@@ -21,5 +22,9 @@ build() {
patch -p1 -i $srcdir/Fix-build-issue-with-symbol-alarm-showing-up-on-F14-.patch
./configure --sysconfdir=/etc --prefix=/usr
make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
}
diff --git a/extra/lxsession-lite/PKGBUILD b/community/lxsession-lite/PKGBUILD
index bf4af3aa5..f27e3fd26 100644
--- a/extra/lxsession-lite/PKGBUILD
+++ b/community/lxsession-lite/PKGBUILD
@@ -1,4 +1,7 @@
+# $Id: PKGBUILD 49034 2011-06-09 21:26:14Z andrea $
+# Maintainer: Angel Velasquez <angvp@archlinux.org>
# Maintainer: Juergen Hoetzel <juergen@archlinux.org>
+
pkgname=lxsession-lite
pkgver=0.4.5
pkgrel=1
@@ -11,12 +14,16 @@ depends=('gtk2' 'dbus')
makedepends=('pkgconfig' 'intltool')
replaces=("lxde-settings-daemon")
conflicts=('lxsession' 'lxde-settings-daemon')
-source=(http://downloads.sourceforge.net/sourceforge/lxde/lxsession-${pkgver}.tar.gz)
+source=(http://downloads.sourceforge.net/lxde/lxsession-${pkgver}.tar.gz)
md5sums=('d5cd0cb733748191b2c7371c9efda155')
build() {
cd "$srcdir/lxsession-$pkgver"
./configure --sysconfdir=/etc --prefix=/usr
- make
+ make
+}
+
+package() {
+ cd "$srcdir/lxsession-$pkgver"
make DESTDIR="$pkgdir" install
}
diff --git a/extra/menu-cache/PKGBUILD b/community/menu-cache/PKGBUILD
index 0304fc573..74749321c 100644
--- a/extra/menu-cache/PKGBUILD
+++ b/community/menu-cache/PKGBUILD
@@ -1,3 +1,5 @@
+# $Id: PKGBUILD 49034 2011-06-09 21:26:14Z andrea $
+# Maintainer: Angel Velasquez <angvp@archlinux.org>
# Maintainer: Juergen Hoetzel <juergen@archlinux.org>
pkgname=menu-cache
@@ -11,17 +13,17 @@ groups=('lxde')
depends=('intltool' 'glib2')
options=('!libtool')
makedepends=('pkgconfig')
-source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz)
+source=(http://downloads.sourceforge.net/lxde/${pkgname}-${pkgver}.tar.gz)
md5sums=('ac4a9ea77db68d3db3f9f53cc75af66a')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
./configure --prefix=/usr --sysconfdir=/etc \
- --libexecdir=/usr/lib/menu-cache --disable-static || return 1
- make || return 1
+ --libexecdir=/usr/lib/menu-cache --disable-static
+ make
}
package() {
cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR="${pkgdir}" install || return 1
+ make DESTDIR="${pkgdir}" install
}
diff --git a/extra/obconf/PKGBUILD b/community/obconf/PKGBUILD
index 0fa8c420e..63755ce33 100644
--- a/extra/obconf/PKGBUILD
+++ b/community/obconf/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 123764 2011-05-12 21:09:06Z andrea $
+# $Id: PKGBUILD 49029 2011-06-09 21:05:36Z andrea $
# Maintainer:
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Tobias Kieslich <tobias@archlinux.org>
@@ -19,17 +19,17 @@ md5sums=('b22e273721851dedad72acbc77eefb68'
'340ae4732e76731d2838473541eb8d4e')
build() {
- cd "${srcdir}"/${pkgname}-${pkgver}
+ cd "${srcdir}"/${pkgname}-${pkgver}
- ./configure --prefix=/usr
- make
- sed -i 's/=openbox/=obconf/' obconf.desktop
+ ./configure --prefix=/usr
+ make
+ sed -i 's/=openbox/=obconf/' obconf.desktop
}
package() {
- cd "${srcdir}"/${pkgname}-${pkgver}
+ cd "${srcdir}"/${pkgname}-${pkgver}
- make DESTDIR="${pkgdir}" install
- install -Dm644 ../Obconf-72.png \
- "${pkgdir}"/usr/share/pixmaps/obconf.png
+ make DESTDIR="${pkgdir}" install
+ install -Dm644 ../Obconf-72.png \
+ "${pkgdir}"/usr/share/pixmaps/obconf.png
}
diff --git a/community/openbox/PKGBUILD b/community/openbox/PKGBUILD
new file mode 100644
index 000000000..d980675be
--- /dev/null
+++ b/community/openbox/PKGBUILD
@@ -0,0 +1,47 @@
+# $Id: PKGBUILD 49029 2011-06-09 21:05:36Z andrea $
+# Maintainer:
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: tobias <tobias@archlinux.org>
+
+pkgname=openbox
+pkgver=3.4.11.2
+pkgrel=2
+pkgdesc="A window manager for the X11 windowing system"
+arch=('i686' 'x86_64')
+url="http://openbox.org"
+license=('GPL')
+depends=('startup-notification' 'libxml2' 'libxinerama' 'libxrandr'
+ 'libxcursor' 'pango')
+optdepends=('pyxdg: for the xdg-autostart script')
+groups=('lxde')
+install=${pkgname}.install
+options=('!libtool')
+backup=('etc/xdg/openbox/menu.xml' 'etc/xdg/openbox/rc.xml')
+source=(http://www.icculus.org/openbox/releases/${pkgname}-${pkgver}.tar.gz
+ 'which-2.20.patch')
+md5sums=('30e669134fa81df810fe7d1dc59cd931'
+ 'ec5e3d4d74779b0ca576a053ae54124d')
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+
+ # FS#11455
+ patch -Np1 -i ${srcdir}/which-2.20.patch
+ sed -i 's#python#python2#' tools/xdg-autostart/xdg-autostart
+ ./configure --prefix=/usr \
+ --with-x \
+ --enable-startup-notification \
+ --sysconfdir=/etc
+ make
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+
+ make DESTDIR=${pkgdir} install
+
+ sed -i "s:startkde:/usr/bin/\0:" \
+ ${pkgdir}/usr/share/xsessions/openbox-kde.desktop
+ sed -i "s:=gnome-session:=/usr/bin/gnome-session:" \
+ ${pkgdir}/usr/share/xsessions/openbox-gnome.desktop
+}
diff --git a/extra/openbox/openbox.install b/community/openbox/openbox.install
index 301c22127..a8088b4db 100644
--- a/extra/openbox/openbox.install
+++ b/community/openbox/openbox.install
@@ -2,8 +2,3 @@ post_install() {
echo "Place menu.xml, rc.xml and autostart.sh in ~/.config/openbox"
echo "They can be found in /etc/xdg/openbox"
}
-
-post_upgrade() {
- post_install
-}
-
diff --git a/extra/openbox/which-2.20.patch b/community/openbox/which-2.20.patch
index 7f663ae49..7f663ae49 100644
--- a/extra/openbox/which-2.20.patch
+++ b/community/openbox/which-2.20.patch
diff --git a/extra/pcmanfm/PKGBUILD b/community/pcmanfm/PKGBUILD
index 2d095ec77..09a833e6d 100644
--- a/extra/pcmanfm/PKGBUILD
+++ b/community/pcmanfm/PKGBUILD
@@ -1,19 +1,21 @@
-# $Id: PKGBUILD 110558 2011-02-19 22:38:04Z angvp $
+# $Id: PKGBUILD 49034 2011-06-09 21:26:14Z andrea $
# Maintainer: Angel Velasquez <angvp@archlinux.org>
# Maintainer: Juergen Hoetzel <juergen@archlinux.org>
+
pkgname=pcmanfm
pkgver=0.9.8
-pkgrel=5
+pkgrel=6
pkgdesc="File manager of the LXDE Desktop"
arch=('i686' 'x86_64' 'mips64el')
url="http://pcmanfm.sourceforge.net/"
license=('GPL')
groups=('lxde')
-depends=('gtk2' 'desktop-file-utils' 'libfm')
+depends=('gtk2' 'desktop-file-utils' 'libfm' 'lxmenu-data')
makedepends=('intltool' 'pkgconfig')
-source=(http://downloads.sourceforge.net/pcmanfm/pcmanfm-$pkgver.tar.gz
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-$pkgver.tar.gz
revert-new-IPC.patch)
-md5sums=('4a7fdc0526ed14e3293d784c0ce27dea' '4bedb071a83ba5a7af1aa43b71a262a9')
+md5sums=('4a7fdc0526ed14e3293d784c0ce27dea'
+ '4bedb071a83ba5a7af1aa43b71a262a9')
build() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/pcmanfm/pcmanfm.install b/community/pcmanfm/pcmanfm.install
index 98965c989..98965c989 100644
--- a/extra/pcmanfm/pcmanfm.install
+++ b/community/pcmanfm/pcmanfm.install
diff --git a/extra/pcmanfm/revert-new-IPC.patch b/community/pcmanfm/revert-new-IPC.patch
index fa64fde42..fa64fde42 100644
--- a/extra/pcmanfm/revert-new-IPC.patch
+++ b/community/pcmanfm/revert-new-IPC.patch
diff --git a/community/qtcreator/PKGBUILD b/community/qtcreator/PKGBUILD
index 2637aebbf..20a74f4cf 100644
--- a/community/qtcreator/PKGBUILD
+++ b/community/qtcreator/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 48974 2011-06-09 02:24:35Z svenstaro $
+# $Id: PKGBUILD 48989 2011-06-09 09:28:42Z svenstaro $
# Maintainer: Imanol Celaya <ornitorrincos@archlinux-es.org>
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
@@ -11,7 +11,7 @@ pkgbase=qtcreator
#pkgname=('qtcreator' 'qtcreator-todo-plugin' 'qtcreator-artisticstyle-plugin')
pkgname=('qtcreator' 'qtcreator-todo-plugin')
pkgver=2.2.0
-pkgrel=2
+pkgrel=3
pkgdesc='Lightweight, cross-platform integrated development environment'
arch=('i686' 'x86_64' 'mips64el')
url='http://qt.nokia.com/products/developer-tools'
@@ -64,6 +64,14 @@ package_qtcreator() {
make INSTALL_ROOT="${pkgdir}/usr/" install
+ # qt already fixed this
+ if [[ -f "$pkgdir/usr/bin/qmlpuppet" ]]; then
+ echo "Remove this manual install as it is now unnecessary (probably qtcreator 2.2.1)"
+ return 1
+ fi
+ install -Dm755 bin/qmlpuppet "$pkgdir/usr/bin/qmlpuppet"
+ # remove it soon
+
install -Dm644 ${srcdir}/qtcreator.desktop \
${pkgdir}/usr/share/applications/qtcreator.desktop
install -Dm644 ${srcdir}/qt-creator-${pkgver}-src/LGPL_EXCEPTION.TXT \
diff --git a/community/quvi/PKGBUILD b/community/quvi/PKGBUILD
index 997ae290b..a9c7735d8 100644
--- a/community/quvi/PKGBUILD
+++ b/community/quvi/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 45360 2011-04-20 15:12:08Z lfleischer $
+# $Id: PKGBUILD 48994 2011-06-09 14:59:59Z lfleischer $
# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
# Contributor: joyfulgirl@archlinux.us
pkgname=quvi
-pkgver=0.2.15
+pkgver=0.2.16
pkgrel=1
pkgdesc='Command-line tool for parsing video download links.'
arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('LGPL')
depends=('curl' 'pcre' 'lua')
options=('!libtool')
source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('7cda6c6593c1281e89d91de3b0bed284')
+md5sums=('43ac4c1ecaace175e2e8b38f4566a710')
build() {
cd "${pkgname}-${pkgver}"
diff --git a/community/skrooge/PKGBUILD b/community/skrooge/PKGBUILD
index 397aa53be..07ed0e452 100644
--- a/community/skrooge/PKGBUILD
+++ b/community/skrooge/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 42177 2011-03-15 08:11:50Z schiv $
+# $Id: PKGBUILD 48984 2011-06-09 06:50:51Z schiv $
# Maintainer: Ray Rashif <schiv@archlinux.org>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: neuromante <lorenzo.nizzi.grifi@gmail.com>
pkgname=skrooge
-pkgver=0.8.1
+pkgver=0.9.0
pkgrel=1
pkgdesc="A personal finances manager for KDE"
arch=('i686' 'x86_64' 'mips64el')
@@ -14,13 +14,13 @@ depends=('kdebase-runtime' 'libofx' 'qca-ossl')
makedepends=('cmake' 'automoc4' 'docbook-xsl')
install=$pkgname.install
source=("http://skrooge.org/files/$pkgname-$pkgver.tar.bz2")
-md5sums=('417f5668d9ec07b715c8fc7023460c27')
+md5sums=('340cbec2ddc2a258bd9b5091dbdb5e92')
build() {
cd "$srcdir/$pkgname-$pkgver"
cmake . -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
+ -DCMAKE_INSTALL_PREFIX=/usr
make
}
diff --git a/community/sword/curl_7.20.patch b/community/sword/curl_7.20.patch
deleted file mode 100644
index 88763188d..000000000
--- a/community/sword/curl_7.20.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/mgr/curlftpt.cpp (revision 2505)
-+++ src/mgr/curlftpt.cpp (revision 2506)
-@@ -177,6 +177,9 @@
- res = curl_easy_perform(session);
- SWLog::getSystemLog()->logDebug("***** Finished performing curl easy action. \n");
-
-+ // it seems CURL tries to use this option data later for some reason, so we unset here
-+ curl_easy_setopt(session, CURLOPT_PROGRESSDATA, (void*)NULL);
-+
- if(CURLE_OK != res) {
- retVal = -1;
- }
diff --git a/extra/wvdial/PKGBUILD b/community/wvdial/PKGBUILD
index 2c756d99c..a6428f314 100644
--- a/extra/wvdial/PKGBUILD
+++ b/community/wvdial/PKGBUILD
@@ -1,8 +1,7 @@
-# $Id: PKGBUILD 123798 2011-05-13 06:53:04Z andrea $
+# $Id: PKGBUILD 49019 2011-06-09 20:53:15Z andrea $
# Maintainer:
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: dorphell <dorphell@archlinux.org>
-# Contributor: Judd Vinet <jvinet@zeroflux.org>
pkgname=wvdial
pkgver=1.61
@@ -26,5 +25,6 @@ build() {
package() {
cd "${srcdir}"/${pkgname}-${pkgver}
make prefix="${pkgdir}"/usr PPPDIR="${pkgdir}"/etc/ppp/peers install
+
install -Dm644 COPYING.LIB "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
}
diff --git a/extra/wvstreams/PKGBUILD b/community/wvstreams/PKGBUILD
index 1030f75f9..81bd87127 100644
--- a/extra/wvstreams/PKGBUILD
+++ b/community/wvstreams/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 75519 2010-04-01 18:49:52Z andrea $
+# $Id: PKGBUILD 49019 2011-06-09 20:53:15Z andrea $
# Maintainer:
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: dorphell <dorphell@archlinux.org>
@@ -10,7 +10,7 @@ pkgdesc="A network programming library written in C++"
arch=('i686' 'x86_64' 'mips64el')
url="http://alumnit.ca/wiki/?page=WvStreams"
license=('LGPL')
-depends=('zlib' 'pam' 'xplc' "openssl" 'readline')
+depends=('zlib' 'pam' 'xplc' 'openssl' 'readline')
source=(http://wvstreams.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
md5sums=('2760dac31a43d452a19a3147bfde571c')
options=('!makeflags')
@@ -25,12 +25,12 @@ build() {
--with-openssl \
--without-tcl \
--without-qt || return 1
- make COPTS="$CFLAGS -fPIC" CXXOPTS="$CXXFLAGS -fPIC -fpermissive" VERBOSE=1 || return 1
+ make COPTS="$CFLAGS -fPIC" CXXOPTS="$CXXFLAGS -fPIC -fpermissive" VERBOSE=1
}
package() {
cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install || return 1
+ make DESTDIR=${pkgdir} install
# FS#15974
# --without-dbus still installs the pkg-config file
diff --git a/extra/xbindkeys/PKGBUILD b/community/xbindkeys/PKGBUILD
index 3336c8a09..913e7cd09 100644
--- a/extra/xbindkeys/PKGBUILD
+++ b/community/xbindkeys/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 114461 2011-03-14 01:44:22Z eric $
+# $Id: PKGBUILD 49026 2011-06-09 20:58:03Z andrea $
+# Maintainer:
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
# Contributor: Thayer Williams <thayer@archlinux.org>
-# Contributor: damir <damir@archlinux.org>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
pkgname=xbindkeys
pkgver=1.8.5
@@ -10,10 +10,9 @@ pkgdesc="Launch shell commands with your keyboard or your mouse under X"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.nongnu.org/xbindkeys/xbindkeys.html"
license=('GPL')
-depends=('libx11' 'guile>=1.8.1' 'tk')
-source=(http://www.nongnu.org/xbindkeys/${pkgname}-${pkgver}.tar.gz)
+depends=('libx11' 'guile' 'tk')
+source=(http://www.nongnu.org/${pkgname}/${pkgname}-${pkgver}.tar.gz)
md5sums=('4b66a05594dbc6888c0a6439351aa66d')
-sha1sums=('a597cfecce65dd47595510edb8f7eaa094c4b34b')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/xplc/PKGBUILD b/community/xplc/PKGBUILD
index fc92827be..bc029a87c 100644
--- a/extra/xplc/PKGBUILD
+++ b/community/xplc/PKGBUILD
@@ -1,28 +1,32 @@
-# $Id: PKGBUILD 97257 2010-10-28 04:11:13Z allan $
-# Maintainer: dorphell <dorphell@archlinux.org>
+# $Id: PKGBUILD 49019 2011-06-09 20:53:15Z andrea $
+# Maintainer:
+# Contributor: dorphell <dorphell@archlinux.org>
+
pkgname=xplc
pkgver=0.3.13
pkgrel=3
pkgdesc="Cross-Platform Lightweight Components"
-arch=(i686 x86_64 'mips64el')
+arch=('i686' 'x86_64')
url="http://xplc.sourceforge.net"
license=('LGPL')
depends=('gcc-libs')
-source=(http://downloads.sourceforge.net/sourceforge/xplc/$pkgname-$pkgver.tar.gz)
+source=("http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz")
md5sums=('39da3270527c8712b8e8fcf03768d29f')
+options=('!buildflags')
build() {
cd $srcdir/$pkgname-$pkgver
- export LDFLAGS="${LDFLAGS//-Wl,--as-needed}"
-
- ./configure --prefix=/usr --mandir=/usr/share/man --without-libuuid
+ ./configure --prefix=/usr \
+ --mandir=/usr/share/man \
+ --without-libuuid
make
}
package() {
cd $srcdir/$pkgname-$pkgver
make DESTDIR=$pkgdir install
+
mv $pkgdir/usr/share/man/man1/{uuidgen.1,uuidcdef.1}
rm -f $pkgdir/usr/bin/uuidgen
}
diff --git a/community/zziplib/PKGBUILD b/community/zziplib/PKGBUILD
deleted file mode 100644
index caaad5bf2..000000000
--- a/community/zziplib/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 46490 2011-05-07 21:04:10Z ebelanger $
-# Maintainer:
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
-
-pkgname=zziplib
-pkgver=0.13.60
-pkgrel=1
-pkgdesc="A lightweight library that offers the ability to easily extract data from files archived in a single zip file"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://zziplib.sourceforge.net"
-license=('LGPL' 'MPL')
-depends=('zlib')
-makedepends=('python2')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 zziplib-0.13.60-ldflags.patch)
-md5sums=('54a6aa53262483a4d54f7c59f0a7258b'
- 'e585052f884525a338ca341b5d2957dc')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- export PYTHON=/usr/bin/python2
- patch -p1 -i ../zziplib-0.13.60-ldflags.patch
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-
-#fix permission
- chmod -s "${pkgdir}/usr/share/man/man3"
- chmod 644 "${pkgdir}"/usr/share/man/man3/*
- chown -R root:root "${pkgdir}/usr/share/man/man3"
-}
diff --git a/community/zziplib/zziplib-0.13.60-ldflags.patch b/community/zziplib/zziplib-0.13.60-ldflags.patch
deleted file mode 100644
index 3c95ff465..000000000
--- a/community/zziplib/zziplib-0.13.60-ldflags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://sourceforge.net/tracker/?func=detail&aid=3175466&group_id=6389&atid=306389
-https://bugs.gentoo.org/354051
-
---- a/configure
-+++ b/configure
-@@ -292,7 +292,7 @@
- # ---------------------------------------------------------------
- AC_MSG_CHECKING([link options])
- ZZIPLIB_LDFLAGS=""
--test ".$can_build_shared" != ".no" && ZZIPLIB_LDFLAGS="--export-dynamic"
-+test ".$can_build_shared" != ".no" && ZZIPLIB_LDFLAGS="-export-dynamic"
- RESOLVES=" # "
- case "$host_os" in mingw*)
- ZZIPLIB_LDFLAGS="-no-undefined -export-all-symbols -mconsole"
diff --git a/core/jfsutils/PKGBUILD b/core/jfsutils/PKGBUILD
index e8aef3bc6..a96f6b8c5 100644
--- a/core/jfsutils/PKGBUILD
+++ b/core/jfsutils/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 100375 2010-11-23 01:27:06Z stephane $
+# $Id: PKGBUILD 126948 2011-06-08 20:07:37Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
pkgname=jfsutils
-pkgver=1.1.14
+pkgver=1.1.15
pkgrel=2
pkgdesc="JFS filesystem utilities"
arch=(i686 x86_64 'mips64el')
@@ -10,7 +10,7 @@ license=('GPL')
groups=('base')
depends=('util-linux-ng')
source=(http://jfs.sourceforge.net/project/pub/${pkgname}-${pkgver}.tar.gz)
-md5sums=('05150840987176d5e8438066b80add1a')
+md5sums=('8809465cd48a202895bc2a12e1923b5d')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
@@ -22,4 +22,3 @@ package() {
cd "${srcdir}/${pkgname}-${pkgver}"
make DESTDIR=${pkgdir} install
}
-
diff --git a/core/net-tools/nisdomainname.conf.d b/core/net-tools/nisdomainname.conf.d
deleted file mode 100644
index 6033ecf1c..000000000
--- a/core/net-tools/nisdomainname.conf.d
+++ /dev/null
@@ -1,3 +0,0 @@
-# Set your NIS domain name here
-NISDOMAINNAME=""
-
diff --git a/core/rp-pppoe/PKGBUILD b/core/rp-pppoe/PKGBUILD
deleted file mode 100644
index 7e2e268ca..000000000
--- a/core/rp-pppoe/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 119995 2011-04-18 07:09:47Z daniel $
-# Maintainer: Daniel Isenmann <daniel@archlinux.org>
-# Contributor: orelien <aurelien.foret@wanadoo.fr>
-
-pkgname=rp-pppoe
-pkgver=3.10
-pkgrel=6
-pkgdesc="Roaring Penguin's Point-to-Point Protocol over Ethernet client"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.roaringpenguin.com/pppoe/"
-license=('GPL')
-depends=('ppp>=2.4.5' 'sh')
-options=('!makeflags')
-backup=(etc/ppp/pppoe.conf etc/ppp/firewall-standalone etc/ppp/firewall-masq etc/ppp/pppoe-server-options)
-source=(http://www.roaringpenguin.com/files/download/rp-pppoe-$pkgver.tar.gz adsl)
-install=rp-pppoe.install
-md5sums=('d58a13cc4185bca6121a606ff456dec0'
- 'adace1ad441aa88dcb3db52fb7f9c97f')
-
-build() {
- cd $srcdir/$pkgname-$pkgver/src
- ./configure --prefix=/usr --enable-plugin
- make PLUGIN_DIR="/usr/lib/rp-pppoe" || return 1
-}
-
-package() {
- cd $srcdir/$pkgname-$pkgver/src
- make DESTDIR=$pkgdir install
-
- #moving .so files to /usr/lib according to FS#13876
- mkdir -p ${pkgdir}/usr/lib/rp-pppoe
- mv ${pkgdir}/etc/ppp/plugins/rp-pppoe.so ${pkgdir}/usr/lib/rp-pppoe/
- #not necessary after moving the plugin
- rm -rf ${pkgdir}/etc/ppp/plugins
- #changing config to the new path
- #sed -i 's/LINUX_PLUGIN=/LINUX_PLUGIN=\/usr\/lib\/rp-pppoe\/rp-pppoe.so/g' ${pkgdir}/etc/ppp/pppoe.conf
-
- install -Dm755 $srcdir/adsl $pkgdir/etc/rc.d/adsl
-}
diff --git a/core/rp-pppoe/adsl b/core/rp-pppoe/adsl
deleted file mode 100755
index 33bd91839..000000000
--- a/core/rp-pppoe/adsl
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
- start)
- stat_busy "Starting ADSL Connection"
- /usr/sbin/pppoe-start &>/dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon adsl
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping ADSL Connection"
- /usr/sbin/pppoe-stop &>/dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon adsl
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/core/rp-pppoe/rp-pppoe.install b/core/rp-pppoe/rp-pppoe.install
deleted file mode 100644
index 1d4bccce2..000000000
--- a/core/rp-pppoe/rp-pppoe.install
+++ /dev/null
@@ -1,12 +0,0 @@
-#arg 1: the new package version
-post_install() {
-echo ">>> The kernel-mode plugin has a new place."
-echo ">>> It's now located under /usr/lib/rp-pppoe/rp-pppoe.so"
-echo ">>> Change LINUX_PLUGIN to the new path in your /etc/ppp/pppoe.conf"
-}
-
-# arg 1: the new package version
-# arg 2: the old package version
-post_upgrade() {
- post_install $1
-}
diff --git a/core/udev/80-drivers.rules b/core/udev/80-drivers.rules
deleted file mode 100644
index 56ac06cb4..000000000
--- a/core/udev/80-drivers.rules
+++ /dev/null
@@ -1,14 +0,0 @@
-# do not edit this file, it will be overwritten on update
-
-ACTION=="remove", GOTO="drivers_end"
-
-DRIVER!="?*", ENV{MODALIAS}=="?*", RUN+="/lib/udev/load-modules.sh $env{MODALIAS}"
-SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="SD", RUN+="/lib/udev/load-modules.sh tifm_sd"
-SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="MS", RUN+="/lib/udev/load-modules.sh tifm_ms"
-SUBSYSTEM=="memstick", RUN+="/lib/udev/load-modules.sh ms_block"
-SUBSYSTEM=="memstick", RUN+="/lib/udev/load-modules.sh mspro_block"
-SUBSYSTEM=="i2o", RUN+="/lib/udev/load-modules.sh i2o_block"
-SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST!="[module/sg]", RUN+="/lib/udev/load-modules.sh sg"
-SUBSYSTEM=="module", KERNEL=="parport_pc", RUN+="/lib/udev/load-modules.sh ppdev"
-
-LABEL="drivers_end"
diff --git a/core/udev/load-modules.sh b/core/udev/load-modules.sh
deleted file mode 100755
index 1e2af913e..000000000
--- a/core/udev/load-modules.sh
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/bash
-# Implement blacklisting for udev-loaded modules
-
-[ $# -ne 1 ] && exit 1
-
-. /etc/rc.conf
-
-# grab modules from rc.conf
-BLACKLIST="${MOD_BLACKLIST[@]}"
-MODPROBE="/sbin/modprobe"
-LOGGER="/usr/bin/logger"
-RESOLVEALIAS="${MODPROBE} --resolve-alias"
-USEBLACKLIST="--use-blacklist"
-
-if [ -f /proc/cmdline ]; then
- for cmd in $(cat /proc/cmdline); do
- case $cmd in
- disablemodules=*) eval $cmd ;;
- load_modules=off) exit ;;
- esac
- done
- #parse cmdline entries of the form "disablemodules=x,y,z"
- if [ -n "$disablemodules" ]; then
- BLACKLIST="$BLACKLIST $(echo $disablemodules | sed 's|,| |g')"
- fi
-fi
-
-#MODULES entries in rc.conf that begin with ! are blacklisted
-for mod in ${MODULES[@]}; do
- if [ "${mod}" != "${mod#!}" ]; then
- BLACKLIST="$BLACKLIST ${mod#!}"
- fi
-done
-
-if [ "$MOD_AUTOLOAD" = "yes" -o "$MOD_AUTOLOAD" = "YES" ]; then
- if [ -n "${BLACKLIST}" ]; then
- # If an alias name is on the blacklist, load no modules for this device
- if echo "${BLACKLIST}" | /bin/grep -q -e " $1 " -e "^$1 " -e " $1\$"; then
- $LOGGER -p info -t "$(basename $0)" "Not loading module alias '$1' because it is blacklisted"
- exit
- fi
- #sanitize the blacklist
- BLACKLIST="$(echo "$BLACKLIST" | sed -e 's|-|_|g')"
- # Try to find all modules for the alias
- mods=$($RESOLVEALIAS $1)
- # If no modules could be found, try if the alias name is a module name
- # In that case, omit the --use-blacklist parameter to imitate normal modprobe behaviour
- [ -z "${mods}" ] && $MODPROBE -qni $1 && mods="$1" && USEBLACKLIST=""
- [ -z "${mods}" ] && $LOGGER -p local0.debug -t "$(basename $0)" "'$1' is not a valid module or alias name"
- for mod in ${mods}; do
- # Find the module and all its dependencies
- deps="$($MODPROBE -i --show-depends ${mod})"
- [ $? -ne 0 ] && continue
-
- #sanitize the module names
- deps="$(echo "$deps" | sed \
- -e "s#^insmod /lib.*/\(.*\)\.ko.*#\1#g" \
- -e 's|-|_|g')"
-
- # If the module or any of its dependencies is blacklisted, don't load it
- for dep in $deps; do
- if echo "${BLACKLIST}" | /bin/grep -q -e " ${dep} " -e "^${dep} " -e " ${dep}\$"; then
- if [ "${dep}" = "${mod}" ]; then
- $LOGGER -p local0.info -t "$(basename $0)" "Not loading module '${mod}' for alias '$1' because it is blacklisted"
- else
- $LOGGER -p local0.info -t "$(basename $0)" "Not loading module '${mod}' for alias '$1' because its dependency '${dep}' is blacklisted"
- fi
- continue 2
- fi
- done
- # modprobe usually uses the "blacklist" statements from modprobe.conf only to blacklist all aliases
- # of a module, but not the module itself. We use --use-blacklist here so that modprobe also blacklists
- # module names if we resolved alias names manually above
- $MODPROBE $USEBLACKLIST ${mod}
- done
- else
- $MODPROBE $USEBLACKLIST $1
- fi
-fi
-# vim: set et ts=4:
diff --git a/core/udev/static-audio-nodes-permissions.patch b/core/udev/static-audio-nodes-permissions.patch
deleted file mode 100644
index b1fc4f935..000000000
--- a/core/udev/static-audio-nodes-permissions.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 3e227830ad6494700e18ae03297e8fb833ff26bf Mon Sep 17 00:00:00 2001
-From: Kay Sievers <kay.sievers@vrfy.org>
-Date: Fri, 27 May 2011 02:50:29 +0200
-Subject: [PATCH] rules: apply 'audio' group of the static snd/{seq,timer}
- nodes
-
----
- rules/rules.d/50-udev-default.rules | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/rules/rules.d/50-udev-default.rules b/rules/rules.d/50-udev-default.rules
-index cd745ef..cacb533 100644
---- a/rules/rules.d/50-udev-default.rules
-+++ b/rules/rules.d/50-udev-default.rules
-@@ -38,7 +38,8 @@ SUBSYSTEM=="graphics", GROUP="video"
- SUBSYSTEM=="drm", GROUP="video"
-
- # sound
--SUBSYSTEM=="sound", GROUP="audio"
-+SUBSYSTEM=="sound", GROUP="audio", \
-+ OPTIONS+="static_node=snd/seq", OPTIONS+="static_node=snd/timer"
-
- # DVB (video)
- SUBSYSTEM=="dvb", GROUP="video"
---
-1.7.5.3
-
diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD
index 7a8cf3780..11539d3bd 100644
--- a/extra/amule/PKGBUILD
+++ b/extra/amule/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 124068 2011-05-16 14:49:29Z giovanni $
+# $Id: PKGBUILD 127014 2011-06-09 16:03:48Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Henrik Ronellenfitsch <searinox@web.de>
# Contributor: Alessio Sergi <sergi.alessio {at} gmail.com>
# Contributor: Dario 'Dax' Vilardi <dax [at] deelab [dot] org>
pkgname=amule
-pkgver=10561
+pkgver=10576
pkgrel=1
pkgdesc="An eMule-like client for ed2k p2p network"
arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ url="http://www.amule.org"
license=('GPL')
depends=('wxgtk' 'gd' 'geoip' 'libupnp' 'crypto++' 'libsm')
source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2")
-md5sums=('1f8957c35e8bd2496aa83b5ba318f9bd')
+md5sums=('1a1f01d356b3d2d5c01004018ffa79c6')
build() {
cd "${srcdir}/aMule-SVN-r${pkgver}"
diff --git a/extra/avahi/ChangeLog b/extra/avahi/ChangeLog
deleted file mode 100644
index 57984a3b2..000000000
--- a/extra/avahi/ChangeLog
+++ /dev/null
@@ -1,17 +0,0 @@
-
-2009-04-23 Douglas Soares de Andrade <douglas@archlinux.org>
-
- * Updated for i686: 0.6.25
-
-2009-03-21 Eric Belanger <eric@archlinux.org>
-
- * Added optdepends for avahi-discover (close FS#11250)
-
-2009-01-04 Douglas Soares de Andrade <douglas@archlinux.org>
-
- * Updated for i686: 0.6.24
-
-2008-07-22 Douglas Soares de Andrade <douglas@archlinux.org>
-
- * Updated for i686: 0.6.23
-
diff --git a/extra/avidemux/2.5.4_audioDevice.patch b/extra/avidemux/2.5.4_audioDevice.patch
deleted file mode 100644
index 9f1dd1e84..000000000
--- a/extra/avidemux/2.5.4_audioDevice.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- cmake/config.h.cmake.orig 2010-10-29 12:51:05.000000000 -0400
-+++ cmake/config.h.cmake 2010-10-29 12:51:48.000000000 -0400
-@@ -76,9 +76,7 @@
- /* use Nvwa memory leak detector */
- #cmakedefine FIND_LEAKS
-
--#if defined(OSS_SUPPORT) || defined (USE_ARTS) || defined(USE_SDL) || defined(__APPLE__) || defined(__WIN32) || defined(ALSA_SUPPORT)
- #define HAVE_AUDIO
--#endif
-
- #define HAVE_ENCODER
-
diff --git a/extra/avidemux/x264.patch b/extra/avidemux/x264.patch
deleted file mode 100644
index 7200153d1..000000000
--- a/extra/avidemux/x264.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Nur avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp
---- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp 2010-10-10 06:45:42.000000000 -0700
-+++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp 2011-01-16 07:16:48.283341102 -0800
-@@ -1386,7 +1386,7 @@
- case X264_WEIGHTP_NONE:
- strcpy((char*)xmlBuffer, "none");
- break;
-- case X264_WEIGHTP_BLIND:
-+ case X264_WEIGHTP_SIMPLE:
- strcpy((char*)xmlBuffer, "blind");
- break;
- case X264_WEIGHTP_SMART:
-@@ -1896,7 +1896,7 @@
- int weightedPredPFrames = X264_WEIGHTP_NONE;
-
- if (strcmp(content, "blind") == 0)
-- weightedPredPFrames = X264_WEIGHTP_BLIND;
-+ weightedPredPFrames = X264_WEIGHTP_SIMPLE;
- else if (strcmp(content, "smart") == 0)
- weightedPredPFrames = X264_WEIGHTP_SMART;
-
diff --git a/extra/clamav/PKGBUILD b/extra/clamav/PKGBUILD
index c5f14f278..8bff9c211 100644
--- a/extra/clamav/PKGBUILD
+++ b/extra/clamav/PKGBUILD
@@ -1,35 +1,40 @@
-# $Id: PKGBUILD 109346 2011-02-08 18:56:38Z bisson $
-# Maintainer: Dale Blount <dale@archlinux.org>
+# $Id: PKGBUILD 127029 2011-06-09 21:38:42Z bisson $
+# Contributor: Dale Blount <dale@archlinux.org>
# Contributor: Gregor Ibic <gregor.ibic@intelicom.si>
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
pkgname=clamav
-pkgver=0.97
+pkgver=0.97.1
pkgrel=1
pkgdesc='Anti-virus toolkit for Unix'
arch=('i686' 'x86_64' 'mips64el')
depends=('bzip2' 'zlib' 'libtool')
options=('!libtool')
-install="$pkgname.install"
license=('GPL')
backup=('etc/clamav/clamd.conf' 'etc/clamav/freshclam.conf' 'etc/conf.d/clamav')
url='http://www.clamav.net/'
source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz"
- 'clamav'
- 'clamav.confd'
- 'clamav.logrotate'
+ 'rc.d'
+ 'conf.d'
+ 'logrotate'
'config.patch')
-
-sha1sums=('68f5a6736b3f67d608c4064ef839777877f09115'
+sha1sums=('1b3a4667dcc278bc7eab38acbc0f35269aa05387'
'7f15f0b13a1c11235bc99ef0add01efd8a442f07'
'cb116cdab49a810381a515cbcfb6a6c148547f07'
'be3310d2b41a68ce06e33c84ab68ffe59fdce104'
'701a61571788d10ff7af01597785835c6bfea918')
+install=install
+
build() {
cd "$srcdir/$pkgname-$pkgver"
patch -p1 < ../config.patch
- ./configure --prefix=/usr --sysconfdir=/etc/clamav \
- --with-dbdir=/var/lib/clamav --disable-clamav
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc/clamav \
+ --with-dbdir=/var/lib/clamav \
+ --disable-clamav \
+
make
}
@@ -37,14 +42,14 @@ package() {
cd "$srcdir/$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
- # make sure conf files get installed, cause make install
+ # make sure conf files get installed, because make install
# doesn't do that if clamav is already installed upon building.
install -D -m644 etc/clamd.conf "$pkgdir/etc/clamav/clamd.conf"
install -D -m644 etc/freshclam.conf "$pkgdir/etc/clamav/freshclam.conf"
- install -D -m644 ../clamav.logrotate "$pkgdir/etc/logrotate.d/clamav"
- install -D -m644 ../clamav.confd "$pkgdir/etc/conf.d/clamav"
- install -D -m755 ../clamav "$pkgdir/etc/rc.d/clamav"
+ install -D -m644 ../logrotate "$pkgdir/etc/logrotate.d/clamav"
+ install -D -m644 ../conf.d "$pkgdir/etc/conf.d/clamav"
+ install -D -m755 ../rc.d "$pkgdir/etc/rc.d/clamav"
# un-distribute databases to require freshclam
rm "$pkgdir"/var/lib/clamav/*.cvd
diff --git a/extra/clamav/clamav.confd b/extra/clamav/conf.d
index 9cd44d9f8..9cd44d9f8 100644
--- a/extra/clamav/clamav.confd
+++ b/extra/clamav/conf.d
diff --git a/extra/clamav/clamav.install b/extra/clamav/install
index 9116dc394..9116dc394 100644
--- a/extra/clamav/clamav.install
+++ b/extra/clamav/install
diff --git a/extra/clamav/clamav.logrotate b/extra/clamav/logrotate
index d1dc94dce..d1dc94dce 100644
--- a/extra/clamav/clamav.logrotate
+++ b/extra/clamav/logrotate
diff --git a/extra/clamav/clamav b/extra/clamav/rc.d
index 8e9c6afa9..8e9c6afa9 100644
--- a/extra/clamav/clamav
+++ b/extra/clamav/rc.d
diff --git a/extra/gtk3/only_draw_resize_grip_if_its_window_exists.patch b/extra/gtk3/only_draw_resize_grip_if_its_window_exists.patch
deleted file mode 100644
index a6514b550..000000000
--- a/extra/gtk3/only_draw_resize_grip_if_its_window_exists.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 847df205ede7f624c2bc4c4498495352cc865423 Mon Sep 17 00:00:00 2001
-From: Benjamin Otte <otte@redhat.com>
-Date: Mon, 23 May 2011 13:46:59 +0000
-Subject: window: Only draw resize grip if its window exists
-
-Don't rely on priv->resize_grip_visible as the code comment in the
-variable declaration indicates.
-This fixes warnings with GtkPlug, which can cause resize_grip_visible to
-be TRUE but grid_window to be NULL - running tests/teststatusicon
-reproduces this.
-
-This broke with 0cf31b35eb10cb5bc08048ecdc141c949efec4cc
----
-diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
-index b97418a..b1caa9b 100644
---- a/gtk/gtkwindow.c
-+++ b/gtk/gtkwindow.c
-@@ -7304,7 +7304,7 @@ gtk_window_draw (GtkWidget *widget,
- if (GTK_WIDGET_CLASS (gtk_window_parent_class)->draw)
- ret = GTK_WIDGET_CLASS (gtk_window_parent_class)->draw (widget, cr);
-
-- if (priv->resize_grip_visible &&
-+ if (priv->grip_window &&
- gtk_cairo_should_draw_window (cr, priv->grip_window))
- {
- GdkRectangle rect;
---
-cgit v0.9
diff --git a/extra/hugin/hugin-gcc46.patch b/extra/hugin/hugin-gcc46.patch
deleted file mode 100644
index 98a70ad50..000000000
--- a/extra/hugin/hugin-gcc46.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-
-diff -r 0377a1af6110 -r 1fc6ad6e7c7a src/foreign/vigra/vigra/multi_iterator.hxx
---- a/src/foreign/vigra/vigra/multi_iterator.hxx Mon Jun 25 16:36:21 2007 +0000
-+++ b/src/foreign/vigra/vigra/multi_iterator.hxx Tue Jan 25 21:14:13 2011 +0000
-@@ -41,6 +41,7 @@
- #define VIGRA_MULTI_ITERATOR_HXX
-
- #include <sys/types.h>
-+#include <stddef.h>
- #include "tinyvector.hxx"
- #include "iteratortags.hxx"
-
-
-
-
-
diff --git a/extra/icedtea-web/PKGBUILD b/extra/icedtea-web/PKGBUILD
index 0261f01c1..e581efeaf 100644
--- a/extra/icedtea-web/PKGBUILD
+++ b/extra/icedtea-web/PKGBUILD
@@ -1,57 +1,56 @@
-# $Id: PKGBUILD 117733 2011-04-04 17:37:15Z andyrtr $
+# $Id: PKGBUILD 127010 2011-06-09 16:03:05Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
pkgbase=icedtea-web
pkgname=('icedtea-web' 'icedtea-web-doc')
-pkgver=1.0.2
-pkgrel=1
-arch=('i686' 'x86_64' 'mips64el')
+pkgver=1.1
+pkgrel=2
+arch=('i686' 'x86_64')
url="http://icedtea.classpath.org/wiki/IcedTea-Web"
license=('GPL2')
makedepends=('openjdk6' 'zip' 'xulrunner')
-install=$pkgname.install
-source=(http://icedtea.classpath.org/download/source/$pkgname-$pkgver.tar.gz
- fix-man-location.patch)
-md5sums=('4b5d80f4b82e53f4947e6782a0472d54'
- '58e305aa0d27d59f543d9cfddc6e175a')
+source=(http://icedtea.classpath.org/download/source/$pkgname-$pkgver.tar.gz)
+md5sums=('a7d70cb446c38213e554d4bdfb926f63')
build() {
_javaver=6
_jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
cd "$srcdir/$pkgname-$pkgver"
- patch -Np0 -i $srcdir/fix-man-location.patch
- autoreconf -v
./configure --prefix=/usr/lib/jvm/java-6-openjdk \
--datarootdir=/usr/share
make
}
+check() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make -k check
+}
+
+
package_icedtea-web() {
pkgdesc="provides a Free Software web browser plugin running applets written in the Java programming language and an implementation of Java Web Start, originally based on the NetX project"
depends=('openjdk6' 'gtk2' 'desktop-file-utils')
-
- if [ "${CARCH}" = "x86_64" ]; then
- _arch=amd64
- else
- _arch=i586
- fi
+ install=$pkgname.install
_javaver=6
_jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
+ # possible make target (see bottom of Makefile.am: install-exec-local install-data-local
+ make DESTDIR="$pkgdir" install-exec-local install-data-local
+
# Install desktop files.
install -m755 -d ${pkgdir}/usr/share/{applications,pixmaps}
install -m644 javaws.png ${pkgdir}/usr/share/pixmaps
install -m644 {javaws,itweb-settings}.desktop ${pkgdir}/usr/share/applications
# remove splitted doc files
- rm -vrf ${pkgdir}/usr/share/doc
+ rm -rf ${pkgdir}/usr/share/doc
# link binaries into /usr/bin + jre/bin
install -m755 -d ${pkgdir}/usr/bin
+ install -m755 -d ${pkgdir}/${_jvmdir}/jre/bin
pushd ${pkgdir}/${_jvmdir}/bin
for file in *; do
ln -sf ${_jvmdir}/bin/${file} ${pkgdir}/usr/bin
@@ -61,7 +60,7 @@ package_icedtea-web() {
# link the mozilla-plugin - test it here http://www.java.com/en/download/help/testvm.xml
install -m755 -d ${pkgdir}/usr/lib/mozilla/plugins/
- ln -sf ${_jvmdir}/jre/lib/${_arch/i586/i386}/IcedTeaPlugin.so ${pkgdir}/usr/lib/mozilla/plugins/
+ ln -sf ${_jvmdir}/lib/IcedTeaPlugin.so ${pkgdir}/usr/lib/mozilla/plugins/
}
package_icedtea-web-doc() {
@@ -72,11 +71,12 @@ package_icedtea-web-doc() {
_jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
cd "$srcdir/$pkgbase-$pkgver"
- install -m755 -d $pkgdir/${_jvmdir}/jre/lib
+# install -m755 -d $pkgdir/${_jvmdir}/jre/lib
make DESTDIR="$pkgdir" install-data-local
# remove javaws about and man page
- rm -vrf ${pkgdir}/usr/lib
- rm -vrf ${pkgdir}/usr/share/man
+ rm -rf ${pkgdir}/usr/lib
+ rm -rf ${pkgdir}/usr/share/man
+ rm -rf ${pkgdir}/usr/share/icedtea-web # conflicting and unneeded file it seems
}
-# plugin test here http://www.java.com/en/download/help/testvm.xml \ No newline at end of file
+# plugin test here http://www.java.com/en/download/help/testvm.xml
diff --git a/extra/icedtea-web/fix-man-location.patch b/extra/icedtea-web/fix-man-location.patch
deleted file mode 100644
index 8108c7182..000000000
--- a/extra/icedtea-web/fix-man-location.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile.am 2011-02-02 03:43:25.000000000 +0100
-+++ Makefile.am.new 2011-02-03 14:37:55.556053388 +0100
-@@ -130,8 +130,8 @@
- endif
-
- install-data-local:
-- ${mkinstalldirs} -d $(DESTDIR)$(prefix)/man/man1
-- ${INSTALL_DATA} $(NETX_SRCDIR)/javaws.1 $(DESTDIR)$(prefix)/man/man1
-+ ${mkinstalldirs} -d $(DESTDIR)$(mandir)/man1
-+ ${INSTALL_DATA} $(NETX_SRCDIR)/javaws.1 $(DESTDIR)$(mandir)/man1
- ${INSTALL_DATA} $(NETX_RESOURCE_DIR)/about.jnlp $(DESTDIR)$(prefix)$(JRE_DIR_PREFIX)/lib
- if ENABLE_DOCS
- ${mkinstalldirs} $(DESTDIR)$(htmldir)
diff --git a/extra/icon-naming-utils/PKGBUILD b/extra/icon-naming-utils/PKGBUILD
deleted file mode 100644
index 644f1705f..000000000
--- a/extra/icon-naming-utils/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# $Id: PKGBUILD 33029 2009-04-03 21:35:27Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=icon-naming-utils
-pkgver=0.8.90
-pkgrel=1
-pkgdesc="Maps the new names of icons for Tango to the legacy names used by the GNOME and KDE desktops."
-arch=(i686 x86_64 'mips64el')
-license=('GPL')
-url="http://tango.freedesktop.org/"
-depends=('perl-xml-simple')
-source=(http://tango.freedesktop.org/releases/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('dd8108b56130b9eedc4042df634efa66')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --sysconfdir=/etc \
- --libexecdir=/usr/lib/icon-naming-utils \
- --localstatedir=/var || return 1
- make || return 1
- make DESTDIR="${pkgdir}" install || return 1
- mv "${pkgdir}/usr/share/pkgconfig" "${pkgdir}/usr/lib/pkgconfig" || return 1
-}
diff --git a/extra/libwebkit/gcc46.patch b/extra/libwebkit/gcc46.patch
deleted file mode 100644
index befd892d4..000000000
--- a/extra/libwebkit/gcc46.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-Index: trunk/Source/WebCore/dom/make_names.pl
-===================================================================
---- trunk/Source/WebCore/dom/make_names.pl (revision 73989)
-+++ trunk/Source/WebCore/dom/make_names.pl (revision 84123)
-@@ -66,5 +66,5 @@
- $gccLocation = "/usr/bin/gcc";
- }
--my $preprocessor = $gccLocation . " -E -P -x c++";
-+my $preprocessor = $gccLocation . " -E -x c++";
-
- GetOptions(
diff --git a/extra/lxmenu-data/PKGBUILD b/extra/lxmenu-data/PKGBUILD
deleted file mode 100644
index 9b6e6a6f9..000000000
--- a/extra/lxmenu-data/PKGBUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-# Maintainer: Juergen Hoetzel <juergen@archlinux.org>
-pkgname=lxmenu-data
-pkgver=0.1.1
-pkgrel=1
-pkgdesc="freedesktop.org desktop menus for LXDE"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL2')
-url="http://lxde.org/"
-groups=('lxde')
-source=(http://downloads.sourceforge.net/sourceforge/lxde/$pkgname-$pkgver.tar.gz)
-md5sums=('cee3181dd22088f3db0e99ffbedc986d')
-
-build() {
-cd "$srcdir/$pkgname-$pkgver"
- ./configure --prefix=/usr --sysconfdir=/etc || return 1
- make || return 1
- make DESTDIR="$pkgdir" install || return 1
-}
-
diff --git a/extra/lxpanel/Fix-failure-to-react-to-keyboard-map-changes-initiat.patch b/extra/lxpanel/Fix-failure-to-react-to-keyboard-map-changes-initiat.patch
deleted file mode 100644
index b5483e7b0..000000000
--- a/extra/lxpanel/Fix-failure-to-react-to-keyboard-map-changes-initiat.patch
+++ /dev/null
@@ -1,555 +0,0 @@
-From 438d9fdbd3e0be04de933705917d508a02b7c04b Mon Sep 17 00:00:00 2001
-From: Marty Jack <martyj@linux.local>
-Date: Sat, 20 Feb 2010 16:23:57 -0500
-Subject: [PATCH 4/5] Fix failure to react to keyboard map changes initiated outside the plugin
- - Occurred when setxkbmap was run, or when HAL configured the keyboard at X startup
- - Caused by failure to process the NewKeyboard event
- - Caused by dropping events due to faulty code to read them
- - Cosmetic change, the tooltip now the Xkb Group name rather than Xkb Symbol name
-
----
- src/plugins/xkb/xkb-plugin.c | 92 +++++++++--------
- src/plugins/xkb/xkb.c | 236 +++++++++++++++++++++--------------------
- src/plugins/xkb/xkb.h | 7 +-
- 3 files changed, 173 insertions(+), 162 deletions(-)
-
-diff --git a/src/plugins/xkb/xkb-plugin.c b/src/plugins/xkb/xkb-plugin.c
-index f49a77d..80a14ba 100644
---- a/src/plugins/xkb/xkb-plugin.c
-+++ b/src/plugins/xkb/xkb-plugin.c
-@@ -1,18 +1,23 @@
--/*
--//====================================================================
--// xfce4-xkb-plugin - XFCE4 Xkb Layout Indicator panel plugin
--// -------------------------------------------------------------------
--// Alexander Iliev <sasoiliev@mamul.org>
--// 20-Feb-04
--// -------------------------------------------------------------------
--// Parts of this code belong to Michael Glickman <wmalms@yahooo.com>
--// and his program wmxkb.
--// WARNING: DO NOT BOTHER Michael Glickman WITH QUESTIONS ABOUT THIS
--// PROGRAM!!! SEND INSTEAD EMAILS TO <sasoiliev@mamul.org>
--//====================================================================
--*/
--
--/* Modified by Hong Jen Yee (PCMan) <pcman.tw@gmail.com> on 2008-04-06 for lxpanel */
-+/**
-+ * Copyright (c) 2010 LxDE Developers, see the file AUTHORS for details.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-+ */
-+
-+/* Originally derived from xfce4-xkb-plugin, Copyright 2004 Alexander Iliev,
-+ * which credits Michael Glickman. */
-
- #ifdef HAVE_CONFIG_H
- #include <config.h>
-@@ -49,38 +54,45 @@ void xkb_redraw(XkbPlugin * xkb)
- if (xkb->display_type == IMAGE)
- {
- int size = xkb->plugin->panel->icon_size;
-- char * group_name = (char *) xkb_get_current_group_name_lowercase(xkb);
-- char * filename = g_strdup_printf("%s/%s.png", FLAGSDIR, group_name);
-- GdkPixbuf * unscaled_pixbuf = gdk_pixbuf_new_from_file(filename, NULL);
-- g_free(filename);
-- g_free(group_name);
--
-- if (unscaled_pixbuf != NULL)
-+ char * group_name = (char *) xkb_get_current_symbol_name_lowercase(xkb);
-+ if (group_name != NULL)
- {
-- /* Loaded successfully. */
-- int width = gdk_pixbuf_get_width(unscaled_pixbuf);
-- int height = gdk_pixbuf_get_height(unscaled_pixbuf);
-- GdkPixbuf * pixbuf = gdk_pixbuf_scale_simple(unscaled_pixbuf, size * width / height, size, GDK_INTERP_BILINEAR);
-- if (pixbuf != NULL)
-+ char * filename = g_strdup_printf("%s/%s.png", FLAGSDIR, group_name);
-+ GdkPixbuf * unscaled_pixbuf = gdk_pixbuf_new_from_file(filename, NULL);
-+ g_free(filename);
-+ g_free(group_name);
-+
-+ if (unscaled_pixbuf != NULL)
- {
-- gtk_image_set_from_pixbuf(GTK_IMAGE(xkb->image), pixbuf);
-- g_object_unref(G_OBJECT(pixbuf));
-- gtk_widget_hide(xkb->label);
-- gtk_widget_show(xkb->image);
-- gtk_widget_set_tooltip_text(xkb->btn, xkb_get_current_group_name(xkb));
-- valid_image = TRUE;
-+ /* Loaded successfully. */
-+ int width = gdk_pixbuf_get_width(unscaled_pixbuf);
-+ int height = gdk_pixbuf_get_height(unscaled_pixbuf);
-+ GdkPixbuf * pixbuf = gdk_pixbuf_scale_simple(unscaled_pixbuf, size * width / height, size, GDK_INTERP_BILINEAR);
-+ if (pixbuf != NULL)
-+ {
-+ gtk_image_set_from_pixbuf(GTK_IMAGE(xkb->image), pixbuf);
-+ g_object_unref(G_OBJECT(pixbuf));
-+ gtk_widget_hide(xkb->label);
-+ gtk_widget_show(xkb->image);
-+ gtk_widget_set_tooltip_text(xkb->btn, xkb_get_current_group_name(xkb));
-+ valid_image = TRUE;
-+ }
-+ g_object_unref(unscaled_pixbuf);
- }
-- g_object_unref(unscaled_pixbuf);
- }
- }
-
- /* Set the label. */
- if ((xkb->display_type == TEXT) || ( ! valid_image))
- {
-- panel_draw_label_text(xkb->plugin->panel, xkb->label, (char *) xkb_get_current_group_name(xkb), TRUE, TRUE);
-- gtk_widget_hide(xkb->image);
-- gtk_widget_show(xkb->label);
-- gtk_widget_set_tooltip_text(xkb->btn, NULL);
-+ char * group_name = (char *) xkb_get_current_symbol_name(xkb);
-+ if (group_name != NULL)
-+ {
-+ panel_draw_label_text(xkb->plugin->panel, xkb->label, (char *) group_name, TRUE, TRUE);
-+ gtk_widget_hide(xkb->image);
-+ gtk_widget_show(xkb->label);
-+ gtk_widget_set_tooltip_text(xkb->btn, xkb_get_current_group_name(xkb));
-+ }
- }
- }
-
-@@ -196,10 +208,6 @@ static int xkb_constructor(Plugin * plugin, char ** fp)
- /* Initialize the XKB interface. */
- xkb_mechanism_constructor(xkb);
-
-- /* Initialize a channel to listen for XKB events. */
-- GIOChannel * channel = g_io_channel_unix_new(xkb_get_connection_number(xkb));
-- xkb->source_id = g_io_add_watch(channel, G_IO_IN | G_IO_PRI, (GIOFunc) xkb_gio_callback, (gpointer) xkb);
--
- /* Connect signals. */
- g_signal_connect(xkb->btn, "button-press-event", G_CALLBACK(xkb_button_press_event), xkb);
- g_signal_connect(xkb->btn, "scroll-event", G_CALLBACK(xkb_scroll_event), xkb);
-diff --git a/src/plugins/xkb/xkb.c b/src/plugins/xkb/xkb.c
-index 5bb0c39..898a931 100644
---- a/src/plugins/xkb/xkb.c
-+++ b/src/plugins/xkb/xkb.c
-@@ -1,18 +1,23 @@
--/*
--// ====================================================================
--// xfce4-xkb-plugin - XFCE4 Xkb Layout Indicator panel plugin
--// -------------------------------------------------------------------
--// Alexander Iliev <sasoiliev@mamul.org>
--// 20-Feb-04
--// -------------------------------------------------------------------
--// Parts of this code belong to Michael Glickman <wmalms@yahooo.com>
--// and his program wmxkb.
--// WARNING: DO NOT BOTHER Michael Glickman WITH QUESTIONS ABOUT THIS
--// PROGRAM!!! SEND INSTEAD EMAILS TO <sasoiliev@mamul.org>
--//====================================================================
--*/
--
--/* Modified by Hong Jen Yee (PCMan) <pcman.tw@gmail.com> on 2008-04-06 for lxpanel */
-+/**
-+ * Copyright (c) 2010 LxDE Developers, see the file AUTHORS for details.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-+ */
-+
-+/* Originally derived from xfce4-xkb-plugin, Copyright 2004 Alexander Iliev,
-+ * which credits Michael Glickman. */
-
- #include "xkb.h"
-
-@@ -26,9 +31,13 @@
- #include <gdk-pixbuf/gdk-pixbuf.h>
- #include <glib.h>
-
-+/* The X Keyboard Extension: Library Specification
-+ * http://www.xfree86.org/current/XKBlib.pdf */
-+
- static void xkb_enter_locale_by_process(XkbPlugin * xkb);
- static void refresh_group_xkb(XkbPlugin * xkb);
--static int do_init_xkb(XkbPlugin * xkb);
-+static int initialize_keyboard_description(XkbPlugin * xkb);
-+static GdkFilterReturn xkb_event_filter(GdkXEvent * xevent, GdkEvent * event, XkbPlugin * xkb);
-
- /* Insert a process and its layout into the hash table. */
- static void xkb_enter_locale_by_process(XkbPlugin * xkb)
-@@ -56,60 +65,65 @@ int xkb_get_group_count(XkbPlugin * xkb)
- return xkb->group_count;
- }
-
-+/* Get the current group name. */
-+const char * xkb_get_current_group_name(XkbPlugin * xkb)
-+{
-+ return xkb->group_names[xkb->current_group_xkb_no];
-+}
-+
- /* Convert a group number to a symbol name. */
- const char * xkb_get_symbol_name_by_res_no(XkbPlugin * xkb, int n)
- {
- return xkb->symbol_names[n];
- }
-
--/* Get the current group name. */
--const char * xkb_get_current_group_name(XkbPlugin * xkb)
-+/* Get the current symbol name. */
-+const char * xkb_get_current_symbol_name(XkbPlugin * xkb)
- {
- return xkb_get_symbol_name_by_res_no(xkb, xkb->current_group_xkb_no);
- }
-
--/* Get the current group name converted to lowercase. */
--const char * xkb_get_current_group_name_lowercase(XkbPlugin * xkb)
-+/* Get the current symbol name converted to lowercase. */
-+const char * xkb_get_current_symbol_name_lowercase(XkbPlugin * xkb)
- {
-- const char * tmp = xkb_get_current_group_name(xkb);
-- return g_utf8_strdown(tmp, -1);
-+ const char * tmp = xkb_get_current_symbol_name(xkb);
-+ return ((tmp != NULL) ? g_utf8_strdown(tmp, -1) : NULL);
- }
-
- /* Refresh current group number from Xkb state. */
- static void refresh_group_xkb(XkbPlugin * xkb)
- {
- XkbStateRec xkb_state;
-- XkbGetState(xkb->dsp, xkb->device_id, &xkb_state);
-+ XkbGetState(GDK_DISPLAY(), XkbUseCoreKbd, &xkb_state);
- xkb->current_group_xkb_no = xkb_state.group;
- }
-
--/* Initialize the Xkb structures. */
--static int do_init_xkb(XkbPlugin * xkb)
-+/* Initialize the keyboard description initially or after a NewKeyboard event. */
-+static int initialize_keyboard_description(XkbPlugin * xkb)
- {
-- /* Create hash table. */
-- xkb->group_hash_table = g_hash_table_new(g_direct_hash, NULL);
--
-- /* Initialize the Xkb extension. */
-- int major, minor, opcode;
-- Bool status = XkbQueryExtension(xkb->dsp, &opcode,
-- &xkb->base_event_code, &xkb->base_error_code, &major, &minor);
--
-- /* Use the core keyboard. */
-- xkb->device_id = XkbUseCoreKbd;
-+ /* Free the strings. */
-+ int i;
-+ for (i = 0; i < XkbNumKbdGroups; i += 1)
-+ {
-+ g_free(xkb->group_names[i]);
-+ g_free(xkb->symbol_names[i]);
-+ xkb->group_names[i] = NULL;
-+ xkb->symbol_names[i] = NULL;
-+ }
-
- /* Allocate a keyboard description structure. */
-+ int status = False;
- XkbDescRec * kbd_desc_ptr = XkbAllocKeyboard();
- if (kbd_desc_ptr == NULL)
- {
- ERR("Failed to get keyboard description\n");
- goto HastaLaVista;
- }
-- kbd_desc_ptr->dpy = xkb->dsp;
-
- /* Fetch information into the keyboard description. */
-- XkbGetControls(xkb->dsp, XkbAllControlsMask, kbd_desc_ptr);
-- XkbGetNames(xkb->dsp, XkbSymbolsNameMask, kbd_desc_ptr);
-- XkbGetNames(xkb->dsp, XkbGroupNamesMask, kbd_desc_ptr);
-+ XkbGetControls(GDK_DISPLAY(), XkbAllControlsMask, kbd_desc_ptr);
-+ XkbGetNames(GDK_DISPLAY(), XkbSymbolsNameMask, kbd_desc_ptr);
-+ XkbGetNames(GDK_DISPLAY(), XkbGroupNamesMask, kbd_desc_ptr);
-
- if (kbd_desc_ptr->names == NULL)
- {
-@@ -137,12 +151,11 @@ static int do_init_xkb(XkbPlugin * xkb)
-
- /* Determine the group names. Trim off text beginning at a '('. */
- const Atom * tmp_group_source = kbd_desc_ptr->names->groups;
-- int i;
- for (i = 0; i < xkb->group_count; i++)
- {
- if (tmp_group_source[i] != None)
- {
-- char * ptr = XGetAtomName(xkb->dsp, tmp_group_source[i]);
-+ char * ptr = XGetAtomName(GDK_DISPLAY(), tmp_group_source[i]);
- xkb->group_names[i] = ptr;
- if ((ptr != NULL) && ((ptr = strchr(ptr, '('))) != NULL)
- *ptr = '\0';
-@@ -153,7 +166,7 @@ static int do_init_xkb(XkbPlugin * xkb)
- Atom sym_name_atom = kbd_desc_ptr->names->symbols;
- char * sym_name;
- if ((sym_name_atom == None)
-- || ((sym_name = XGetAtomName(xkb->dsp, sym_name_atom)) == NULL))
-+ || ((sym_name = XGetAtomName(GDK_DISPLAY(), sym_name_atom)) == NULL))
- goto HastaLaVista;
-
- /* Parse and store symbol names. */
-@@ -190,83 +203,106 @@ static int do_init_xkb(XkbPlugin * xkb)
- {
- xkb->group_count = 2;
- xkb->symbol_names[1] = xkb->symbol_names[0];
-- xkb->symbol_names[0] = strdup("us");
-- xkb->group_names[0] = strdup("US/ASCII");
-- xkb->group_names[1] = strdup("Japanese");
-+ xkb->symbol_names[0] = g_strdup("us");
-+ xkb->group_names[0] = g_strdup("US/ASCII");
-+ xkb->group_names[1] = g_strdup("Japanese");
- }
- else if (count < xkb->group_count)
- {
- /* Ensure that the names are fully initialized. */
- int j = count, k = xkb->group_count;
- while(--j >= 0) xkb->symbol_names[--k] = xkb->symbol_names[j];
-- while(--k >= 0) xkb->symbol_names[k] = strdup("en_US");
-+ while(--k >= 0) xkb->symbol_names[k] = g_strdup("en_US");
- }
-
-- /* Enxure that the names are fully initialized. */
-+ /* Ensure that the names are fully initialized. */
- for (i = 0; i < xkb->group_count; i++)
- {
- if (xkb->symbol_names[i] == NULL)
- {
- ERR("\nGroup Symbol %i is undefined, set to 'U/A' !\n", i+1);
-- xkb->symbol_names[i] = strdup("U/A");
-+ xkb->symbol_names[i] = g_strdup("U/A");
- }
- }
-
-+ /* Create or recreate hash table.
-+ * The layout that was associated to the windows may or may not be at the same group number,
-+ * and worse, may no longer exist, which there is no meaningful way to deal with. */
-+ if (xkb->group_hash_table != NULL)
-+ g_hash_table_destroy(xkb->group_hash_table);
-+ xkb->group_hash_table = g_hash_table_new(g_direct_hash, NULL);
-+
- status = True;
-
- HastaLaVista:
- if (kbd_desc_ptr != NULL)
- XkbFreeKeyboard(kbd_desc_ptr, 0, True);
-+
- return status;
- }
-
-+/* GDK event filter that receives events from all windows and the Xkb extension. */
-+static GdkFilterReturn xkb_event_filter(GdkXEvent * xevent, GdkEvent * event, XkbPlugin * xkb)
-+{
-+ XEvent * ev = (XEvent *) xevent;
-+
-+ if (ev->xany.type == xkb->base_event_code + XkbEventCode)
-+ {
-+ /* Xkb event. */
-+ XkbEvent * xkbev = (XkbEvent *) ev;
-+ if (xkbev->any.xkb_type == XkbNewKeyboardNotify)
-+ {
-+ initialize_keyboard_description(xkb);
-+ refresh_group_xkb(xkb);
-+ xkb_redraw(xkb);
-+ xkb_enter_locale_by_process(xkb);
-+ }
-+ else if (xkbev->any.xkb_type == XkbStateNotify)
-+ {
-+ if (xkbev->state.group != xkb->current_group_xkb_no)
-+ {
-+ /* Switch to the new group and redraw the display. */
-+ xkb->current_group_xkb_no = xkbev->state.group;
-+ refresh_group_xkb(xkb);
-+ xkb_redraw(xkb);
-+ xkb_enter_locale_by_process(xkb);
-+ }
-+ }
-+ }
-+ return GDK_FILTER_CONTINUE;
-+}
-+
- /* Initialize the Xkb interface. */
- void xkb_mechanism_constructor(XkbPlugin * xkb)
- {
-- /* Enable the Xkb extension on all clients. */
-- XkbIgnoreExtension(False);
--
-- /* Open the display. */
-- int major = XkbMajorVersion;
-- int minor = XkbMinorVersion;
-- char * display_name = "";
-- int event_code;
-- int error_rtrn;
-- int reason_rtrn;
-- xkb->dsp = XkbOpenDisplay(display_name, &event_code, &error_rtrn, &major, &minor, &reason_rtrn);
--
-- switch (reason_rtrn)
-+ /* Initialize Xkb extension. */
-+ int opcode;
-+ int maj = XkbMajorVersion;
-+ int min = XkbMinorVersion;
-+ if ((XkbLibraryVersion(&maj, &min))
-+ && (XkbQueryExtension(GDK_DISPLAY(), &opcode, &xkb->base_event_code, &xkb->base_error_code, &maj, &min)))
- {
-- case XkbOD_BadLibraryVersion:
-- ERR("Bad XKB library version.\n");
-- return;
-- case XkbOD_ConnectionRefused:
-- ERR("Connection to X server refused.\n");
-- return;
-- case XkbOD_BadServerVersion:
-- ERR("Bad X server version.\n");
-- return;
-- case XkbOD_NonXkbServer:
-- ERR("XKB not present.\n");
-- return;
-- case XkbOD_Success:
-- break;
-- }
-+ /* Read the keyboard description. */
-+ initialize_keyboard_description(xkb);
-
-- /* Initialize our mechanism. */
-- if (do_init_xkb(xkb) != True)
-- return;
-+ /* Establish GDK event filter. */
-+ gdk_window_add_filter(NULL, (GdkFilterFunc) xkb_event_filter, (gpointer) xkb);
-
-- /* Specify events we will receive. */
-- XkbSelectEventDetails(xkb->dsp, xkb->device_id, XkbStateNotify, XkbAllStateComponentsMask, XkbGroupStateMask);
-+ /* Specify events we will receive. */
-+ XkbSelectEvents(GDK_DISPLAY(), XkbUseCoreKbd, XkbNewKeyboardNotifyMask, XkbNewKeyboardNotifyMask);
-+ XkbSelectEventDetails(GDK_DISPLAY(), XkbUseCoreKbd, XkbStateNotify, XkbAllStateComponentsMask, XkbGroupStateMask);
-
-- /* Get current state. */
-- refresh_group_xkb(xkb);
-+ /* Get current state. */
-+ refresh_group_xkb(xkb);
-+ }
- }
-
- /* Deallocate resources associated with Xkb interface. */
- void xkb_mechanism_destructor(XkbPlugin * xkb)
- {
-+ /* Remove event filter. */
-+ gdk_window_remove_filter(NULL, (GdkFilterFunc) xkb_event_filter, xkb);
-+
- /* Free group and symbol name memory. */
- int i;
- for (i = 0; i < xkb->group_count; i++)
-@@ -283,21 +319,11 @@ void xkb_mechanism_destructor(XkbPlugin * xkb)
- }
- }
-
-- /* Close the display. */
-- XCloseDisplay(xkb->dsp);
-- xkb->dsp = NULL;
--
- /* Destroy the hash table. */
- g_hash_table_destroy(xkb->group_hash_table);
- xkb->group_hash_table = NULL;
- }
-
--/* Return the connection number for the display. */
--int xkb_get_connection_number(XkbPlugin * xkb)
--{
-- return ConnectionNumber(xkb->dsp);
--}
--
- /* Set the layout to the next layout. */
- int xkb_change_group(XkbPlugin * xkb, int increment)
- {
-@@ -307,33 +333,13 @@ int xkb_change_group(XkbPlugin * xkb, int increment)
- if (next_group >= xkb->group_count) next_group = 0;
-
- /* Execute the change. */
-- XkbLockGroup(xkb->dsp, xkb->device_id, next_group);
-+ XkbLockGroup(GDK_DISPLAY(), XkbUseCoreKbd, next_group);
- refresh_group_xkb(xkb);
- xkb_redraw(xkb);
- xkb_enter_locale_by_process(xkb);
- return 1;
- }
-
--/* Callback when activity detected on the Xkb channel. */
--gboolean xkb_gio_callback(GIOChannel * source, GIOCondition condition, gpointer data)
--{
-- XkbPlugin * xkb = (XkbPlugin *) data;
--
-- XkbEvent evnt;
-- XNextEvent(xkb->dsp, &evnt.core);
-- if ((evnt.type == xkb->base_event_code)
-- && (evnt.any.xkb_type == XkbStateNotify)
-- && (evnt.state.group != xkb->current_group_xkb_no))
-- {
-- /* Switch to the new group and redraw the display. */
-- xkb->current_group_xkb_no = evnt.state.group;
-- refresh_group_xkb(xkb);
-- xkb_redraw(xkb);
-- xkb_enter_locale_by_process(xkb);
-- }
-- return TRUE;
--}
--
- /* React to change of focus by switching to the application's layout or the default layout. */
- void xkb_active_window_changed(XkbPlugin * xkb, gint pid)
- {
-@@ -345,7 +351,7 @@ void xkb_active_window_changed(XkbPlugin * xkb, gint pid)
-
- if (new_group_xkb_no < xkb->group_count)
- {
-- XkbLockGroup(xkb->dsp, xkb->device_id, new_group_xkb_no);
-+ XkbLockGroup(GDK_DISPLAY(), XkbUseCoreKbd, new_group_xkb_no);
- refresh_group_xkb(xkb);
- }
- }
-diff --git a/src/plugins/xkb/xkb.h b/src/plugins/xkb/xkb.h
-index 9265198..20c7ed3 100644
---- a/src/plugins/xkb/xkb.h
-+++ b/src/plugins/xkb/xkb.h
-@@ -49,10 +49,8 @@ typedef struct {
- GtkWidget * per_app_default_layout_menu; /* Combo box of all available layouts */
-
- /* Mechanism. */
-- Display * dsp; /* Handle to X display */
- int base_event_code; /* Result of initializing Xkb extension */
- int base_error_code;
-- int device_id; /* Keyboard device ID (always "core keyboard") */
- int current_group_xkb_no; /* Current layout */
- int group_count; /* Count of groups as returned by Xkb */
- char * group_names[XkbNumKbdGroups]; /* Group names as returned by Xkb */
-@@ -67,12 +65,11 @@ extern int xkb_get_current_group_xkb_no(XkbPlugin * xkb);
- extern int xkb_get_group_count(XkbPlugin * xkb);
- extern const char * xkb_get_symbol_name_by_res_no(XkbPlugin * xkb, int group_res_no);
- extern const char * xkb_get_current_group_name(XkbPlugin * xkb);
--extern const char * xkb_get_current_group_name_lowercase(XkbPlugin * xkb);
-+extern const char * xkb_get_current_symbol_name(XkbPlugin * xkb);
-+extern const char * xkb_get_current_symbol_name_lowercase(XkbPlugin * xkb);
- extern void xkb_mechanism_constructor(XkbPlugin * xkb);
- extern void xkb_mechanism_destructor(XkbPlugin * xkb);
--extern int xkb_get_connection_number(XkbPlugin * xkb);
- extern int xkb_change_group(XkbPlugin * xkb, int increment);
--extern gboolean xkb_gio_callback(GIOChannel * source, GIOCondition condition, gpointer data);
- extern void xkb_active_window_changed(XkbPlugin * xkb, GPid pid);
-
- #endif
---
-1.7.0
-
diff --git a/extra/nx-common/nx-gcc44.patch b/extra/nx-common/nx-gcc44.patch
deleted file mode 100644
index 5b7b7e1f6..000000000
--- a/extra/nx-common/nx-gcc44.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- nx-3.3.0/nxcomp/Loop.cpp.orig 2009-05-17 12:22:19.000000000 +0200
-+++ nx-3.3.0/nxcomp/Loop.cpp 2009-05-17 12:22:43.000000000 +0200
-@@ -10979,7 +10979,7 @@
- packMethod == PACK_LOSSLESS ||
- packMethod == PACK_ADAPTIVE)
- {
-- char *dash = rindex(opt, '-');
-+ const char *dash = rindex(opt, '-');
-
- if (dash != NULL && strlen(dash) == 2 &&
- *(dash + 1) >= '0' && *(dash + 1) <= '9')
-
diff --git a/extra/nxserver/nx-gcc44.patch b/extra/nxserver/nx-gcc44.patch
deleted file mode 100644
index 5b7b7e1f6..000000000
--- a/extra/nxserver/nx-gcc44.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- nx-3.3.0/nxcomp/Loop.cpp.orig 2009-05-17 12:22:19.000000000 +0200
-+++ nx-3.3.0/nxcomp/Loop.cpp 2009-05-17 12:22:43.000000000 +0200
-@@ -10979,7 +10979,7 @@
- packMethod == PACK_LOSSLESS ||
- packMethod == PACK_ADAPTIVE)
- {
-- char *dash = rindex(opt, '-');
-+ const char *dash = rindex(opt, '-');
-
- if (dash != NULL && strlen(dash) == 2 &&
- *(dash + 1) >= '0' && *(dash + 1) <= '9')
-
diff --git a/extra/nxserver/nxcompshad-gcc43.patch b/extra/nxserver/nxcompshad-gcc43.patch
deleted file mode 100644
index 274c36635..000000000
--- a/extra/nxserver/nxcompshad-gcc43.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- nxcompshad/Misc.h~ 2007-06-04 13:39:49.000000000 +0200
-+++ nxcompshad/Misc.h 2008-04-12 12:46:24.000000000 +0200
-@@ -18,10 +18,12 @@
- #ifndef Misc_H
- #define Misc_H
-
--#include <iostream>
-+#include <iostream>
-
--#include <errno.h>
--#include <string.h>
-+#include <cerrno>
-+#include <cstring>
-+
-+using namespace std;
-
- //
- // Error handling macros.
-
diff --git a/extra/obconf/obconf.install b/extra/obconf/obconf.install
deleted file mode 100644
index 5264d8979..000000000
--- a/extra/obconf/obconf.install
+++ /dev/null
@@ -1,15 +0,0 @@
-# arg 1: the new package version
-post_install() {
- update-desktop-database -q /usr/share/applications
- update-mime-database /usr/share/mime 1> /dev/null
-}
-
-post_upgrade() {
- post_install $1
-}
-
-# arg 1: the old package version
-post_remove() {
- update-desktop-database -q
- update-mime-database /usr/share/mime 1> /dev/null
-}
diff --git a/extra/openbox/PKGBUILD b/extra/openbox/PKGBUILD
deleted file mode 100644
index 2283a1a2f..000000000
--- a/extra/openbox/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 89725 2010-09-03 12:51:52Z remy $
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: tobias <tobias@archlinux.org>
-# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
-
-pkgname=openbox
-pkgver=3.4.11.2
-pkgrel=2
-pkgdesc="A window manager for the X11 windowing system"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://openbox.org"
-license=('GPL')
-depends=('startup-notification' 'libxml2' 'libxinerama' 'libxrandr'
- 'libxcursor' 'pango')
-optdepends=('pyxdg: for the xdg-autostart script')
-groups=('lxde')
-install=${pkgname}.install
-options=('!libtool' 'force')
-backup=('etc/xdg/openbox/menu.xml' 'etc/xdg/openbox/rc.xml')
-source=(http://www.icculus.org/openbox/releases/${pkgname}-${pkgver}.tar.gz
- 'which-2.20.patch')
-md5sums=('30e669134fa81df810fe7d1dc59cd931'
- 'ec5e3d4d74779b0ca576a053ae54124d')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
-
- # FS#11455
- patch -Np1 -i ${srcdir}/which-2.20.patch || return 1
- sed -i 's#python#python2#' tools/xdg-autostart/xdg-autostart
- ./configure --prefix=/usr \
- --with-x \
- --enable-startup-notification \
- --sysconfdir=/etc
- make || return 1
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
-
- make DESTDIR=${pkgdir} install
-
- sed -i "s:startkde:/usr/bin/\0:" \
- ${pkgdir}/usr/share/xsessions/openbox-kde.desktop
- sed -i "s:=gnome-session:=/usr/bin/gnome-session:" \
- ${pkgdir}/usr/share/xsessions/openbox-gnome.desktop
-}
diff --git a/extra/phonon-xine/PKGBUILD b/extra/phonon-xine/PKGBUILD
deleted file mode 100644
index 6cd12592a..000000000
--- a/extra/phonon-xine/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=phonon-xine
-pkgver=4.4.4
-pkgrel=1
-arch=('i686' 'x86_64' 'mips64el')
-url="http://phonon.kde.org"
-pkgdesc="Phonon Xine backend"
-license=('LGPL')
-depends=('xine-lib')
-makedepends=('cmake' 'automoc4' 'phonon')
-provides=('phonon-backend')
-source=("http://download.kde.org/stable/phonon/phonon-backend-xine/${pkgver}/src/phonon-backend-xine-${pkgver}.tar.bz2")
-md5sums=('b127104e67538e573adeed3b2fb3bf55')
-
-build() {
- cd ${srcdir}
- mkdir build
- cd build
- cmake ../phonon-backend-xine-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd ${srcdir}/build
- make DESTDIR=${pkgdir} install
-}
diff --git a/extra/pidgin/nm09-pidgin.patch b/extra/pidgin/nm09-pidgin.patch
deleted file mode 100644
index 1c2471d1f..000000000
--- a/extra/pidgin/nm09-pidgin.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -up pidgin-2.7.10/libpurple/network.c.foo pidgin-2.7.10/libpurple/network.c
---- pidgin-2.7.10/libpurple/network.c.foo 2011-03-10 02:21:43.920933267 -0600
-+++ pidgin-2.7.10/libpurple/network.c 2011-03-10 02:23:11.466838793 -0600
-@@ -71,6 +71,10 @@
- #include <dbus/dbus-glib.h>
- #include <NetworkManager.h>
-
-+#if !defined(NM_CHECK_VERSION)
-+#define NM_CHECK_VERSION(x,y,z) 0
-+#endif
-+
- static DBusGConnection *nm_conn = NULL;
- static DBusGProxy *nm_proxy = NULL;
- static DBusGProxy *dbus_proxy = NULL;
-@@ -863,7 +867,13 @@ nm_update_state(NMState state)
-
- switch(state)
- {
-+#if NM_CHECK_VERSION(0,8,992)
-+ case NM_STATE_CONNECTED_LOCAL:
-+ case NM_STATE_CONNECTED_SITE:
-+ case NM_STATE_CONNECTED_GLOBAL:
-+#else
- case NM_STATE_CONNECTED:
-+#endif
- /* Call res_init in case DNS servers have changed */
- res_init();
- /* update STUN IP in case we it changed (theoretically we could
-@@ -880,6 +890,9 @@ nm_update_state(NMState state)
- case NM_STATE_ASLEEP:
- case NM_STATE_CONNECTING:
- case NM_STATE_DISCONNECTED:
-+#if NM_CHECK_VERSION(0,8,992)
-+ case NM_STATE_DISCONNECTING:
-+#endif
- if (prev != NM_STATE_CONNECTED && prev != NM_STATE_UNKNOWN)
- break;
- if (ui_ops != NULL && ui_ops->network_disconnected != NULL)
diff --git a/extra/qt/PKGBUILD b/extra/qt/PKGBUILD
index 5667acde8..1c77f0076 100644
--- a/extra/qt/PKGBUILD
+++ b/extra/qt/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 125344 2011-05-26 00:12:04Z andrea $
+# $Id: PKGBUILD 126981 2011-06-09 07:23:06Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
pkgbase=qt
pkgname=('qt' 'qt-private-headers')
pkgver=4.7.3
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64' 'mips64el')
url='http://qt.nokia.com/'
license=('GPL3' 'LGPL')
@@ -37,6 +37,9 @@ build() {
export CXXFLAGS="$CXXFLAGS -fpermissive"
fi
+ # FS#24601
+ export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"
+
cd $srcdir/$_pkgfqn
# Already fixed upstream
@@ -130,98 +133,15 @@ package_qt-private-headers(){
pkgdesc="Qt private headers for development"
depends=("qt=${pkgver}")
- install -d ${pkgdir}/usr/include/phonon/private
- cd ${srcdir}/$_pkgfqn/src/3rdparty/phonon/phonon/
- find . -name "*_p.h" -exec install -m644 {} \
- ${pkgdir}/usr/include/phonon/private/ \; &> /dev/null
-
- install -d ${pkgdir}/usr/include/Qt3Support/private
- cd ${srcdir}/$_pkgfqn/src/qt3support/
- find . -name "*_p.h" -exec install -m644 {} \
- ${pkgdir}/usr/include/Qt3Support/private/ \; &> /dev/null
-
- install -d ${pkgdir}/usr/include/QtCore/private
- cd ${srcdir}/$_pkgfqn/src/corelib/
- find . -name "*_p.h" -exec install -m644 {} \
- ${pkgdir}/usr/include/QtCore/private/ \; &> /dev/null
+ install -d ${pkgdir}/usr/include/{QtCore,QtDeclarative,QtGui,QtScript}
+ install -d ${pkgdir}/usr/src/{corelib,declarative,gui,script}
- install -d ${pkgdir}/usr/include/QtDBus/private
- cd ${srcdir}/$_pkgfqn/src/dbus/
- find . -name "*_p.h" -exec install -m644 {} \
- ${pkgdir}/usr/include/QtDBus/private/ \; &> /dev/null
-
- install -d ${pkgdir}/usr/include/QtDeclarative/private
- cd ${srcdir}/$_pkgfqn/src/declarative/
- find . -name "*_p.h" -exec install -m644 {} \
- ${pkgdir}/usr/include/QtDeclarative/private/ \; &> /dev/null
-
- install -d ${pkgdir}/usr/include/QtDesigner/private
- cd ${srcdir}/$_pkgfqn/tools/designer/
- find . -name "*_p.h" -exec install -m644 {} \
- ${pkgdir}/usr/include/QtDesigner/private/ \; &> /dev/null
-
- install -d ${pkgdir}/usr/include/QtGui/private
- cd ${srcdir}/$_pkgfqn/src/gui/
- find . -name "*_p.h" -exec install -m644 {} \
- ${pkgdir}/usr/include/QtGui/private/ \; &> /dev/null
-
- install -d ${pkgdir}/usr/include/QtHelp/private
- cd ${srcdir}/$_pkgfqn/tools/assistant/
- find . -name "*_p.h" -exec install -m644 {} \
- ${pkgdir}/usr/include/QtHelp/private/ \; &> /dev/null
-
- install -d ${pkgdir}/usr/include/QtMultimedia/private
- cd ${srcdir}/$_pkgfqn/src/multimedia/
- find . -name "*_p.h" -exec install -m644 {} \
- ${pkgdir}/usr/include/QtMultimedia/private/ \; &> /dev/null
-
- install -d ${pkgdir}/usr/include/QtNetwork/private
- cd ${srcdir}/$_pkgfqn/src/network/
- find . -name "*_p.h" -exec install -m644 {} \
- ${pkgdir}/usr/include/QtNetwork/private/ \; &> /dev/null
-
- install -d ${pkgdir}/usr/include/QtOpenGL/private
- cd ${srcdir}/$_pkgfqn/src/opengl/
- find . -name "*_p.h" -exec install -m644 {} \
- ${pkgdir}/usr/include/QtOpenGL/private/ \; &> /dev/null
-
- install -d ${pkgdir}/usr/include/QtScript/private
- cd ${srcdir}/$_pkgfqn/src/script/
- find . -name "*_p.h" -exec install -m644 {} \
- ${pkgdir}/usr/include/QtScript/private/ \; &> /dev/null
-
- install -d ${pkgdir}/usr/include/QtScriptTools/private
- cd ${srcdir}/$_pkgfqn/src/scripttools/
- find . -name "*_p.h" -exec install -m644 {} \
- ${pkgdir}/usr/include/QtScriptTools/private/ \; &> /dev/null
-
- install -d ${pkgdir}/usr/include/QtSql/private
- cd ${srcdir}/$_pkgfqn/src/sql/
- find . -name "*_p.h" -exec install -m644 {} \
- ${pkgdir}/usr/include/QtSql/private/ \; &> /dev/null
-
- install -d ${pkgdir}/usr/include/QtSvg/private
- cd ${srcdir}/$_pkgfqn/src/svg/
- find . -name "*_p.h" -exec install -m644 {} \
- ${pkgdir}/usr/include/QtSvg/private/ \; &> /dev/null
-
- install -d ${pkgdir}/usr/include/QtTest/private
- cd ${srcdir}/$_pkgfqn/src/testlib/
- find . -name "*_p.h" -exec install -m644 {} \
- ${pkgdir}/usr/include/QtTest/private/ \; &> /dev/null
-
- install -d ${pkgdir}/usr/include/QtUiTools/private
- cd ${srcdir}/$_pkgfqn/tools/designer/src/uitools
- find . -name "*_p.h" -exec install -m644 {} \
- ${pkgdir}/usr/include/QtUiTools/private/ \; &> /dev/null
-
- install -d ${pkgdir}/usr/include/QtWebKit/private
- cd ${srcdir}/$_pkgfqn/src/3rdparty/webkit
- find . -name "*_p.h" -exec install -m644 {} \
- ${pkgdir}/usr/include/QtWebKit/private/ \; &> /dev/null
-
- install -d ${pkgdir}/usr/include/QtXmlPatterns/private
- cd ${srcdir}/$_pkgfqn/src/xmlpatterns/
- find . -name "*_p.h" -exec install -m644 {} \
- ${pkgdir}/usr/include/QtXmlPatterns/private/ \; &> /dev/null
+ for i in QtCore QtDeclarative QtGui QtScript; do
+ cp -r ${srcdir}/$_pkgfqn/include/${i}/private/ \
+ ${pkgdir}/usr/include/${i}/
+ done
+
+ for i in corelib declarative gui script; do
+ cp -r ${srcdir}/$_pkgfqn/src/${i} ${pkgdir}/usr/src/
+ done
}
diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD
index f3b47e7ca..ecdad6626 100644
--- a/extra/vlc/PKGBUILD
+++ b/extra/vlc/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 126600 2011-06-06 13:01:06Z giovanni $
+# $Id: PKGBUILD 126993 2011-06-09 15:41:16Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
# Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
pkgname=vlc
pkgver=1.1.10
-pkgrel=1
+pkgrel=2
pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
arch=('i686' 'x86_64')
url="http://www.videolan.org/vlc/"
license=('GPL')
depends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'libcdio'
- 'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav' 'mesa'
- 'lua' 'v4l-utils' 'libcddb' 'smbclient' 'libmatroska' 'zvbi'
- 'taglib' 'sysfsutils' 'libmpcdec' 'ffmpeg' 'faad2'
- 'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug'
- 'ttf-freefont' 'libxv' 'libass' 'xdg-utils' 'desktop-file-utils')
+ 'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav' 'mesa'
+ 'lua' 'v4l-utils' 'libcddb' 'smbclient' 'libmatroska' 'zvbi'
+ 'taglib' 'sysfsutils' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp'
+ 'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug'
+ 'ttf-freefont' 'libxv' 'libass' 'xdg-utils' 'desktop-file-utils')
makedepends=('avahi' 'pkgconfig' 'libxpm' 'live-media' 'libnotify'
'flac' 'libtheora' 'alsa-lib' 'jack' 'kdelibs' 'udev'
'libraw1394' 'libdc1394' 'libavc1394' 'libva' 'libpulse'
@@ -52,6 +52,7 @@ build() {
--enable-pvr \
--enable-ncurses \
--with-live555-tree=/usr/lib/live \
+ --enable-upnp \
--enable-realrtsp
make
}
diff --git a/extra/zope-interface/PKGBUILD b/extra/zope-interface/PKGBUILD
deleted file mode 100644
index 4bad97dd0..000000000
--- a/extra/zope-interface/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# $Id: PKGBUILD 113445 2011-03-08 17:33:50Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-
-pkgname=zope-interface
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="Separate distribution of the zope.interface package used in Zope 3."
-license=('ZPL')
-arch=('i686' 'x86_64' 'mips64el')
-url="http://pypi.python.org/pypi/zope.interface"
-depends=('python2')
-source=(http://pypi.python.org/packages/source/z/zope.interface/zope.interface-${pkgver}.tar.gz)
-md5sums=('7a895181b8d10be4a7e9a3afa13cd3be')
-
-build() {
- cd ${srcdir}/zope.interface-${pkgver}
- python2 setup.py install --prefix=/usr --root=${pkgdir} --optimize=1
- # Blabla.
- rm $pkgdir/usr/lib/python2.7/site-packages/zope/interface/README*.txt
-}
diff --git a/libre/initscripts/PKGBUILD b/libre/initscripts/PKGBUILD
index dd0d5b045..bb255b4aa 100644
--- a/libre/initscripts/PKGBUILD
+++ b/libre/initscripts/PKGBUILD
@@ -5,7 +5,7 @@
# Maintainer (Parabola): Nicolas Reynolds <fauno@kiwwwi.com.ar>
pkgname=initscripts
-pkgver=2011.06.3
+pkgver=2011.06.4
pkgrel=1.1
pkgdesc="System initialization/bootup scripts (Parabola branding)"
arch=('i686' 'x86_64')
@@ -22,11 +22,11 @@ optdepends=('bridge-utils: Network bridging support'
install=initscripts.install
source=("https://projects.parabolagnulinux.org/initscripts.git/snapshot/initscripts-${pkgver}.tar.bz2"
'wireless.conf.d')
+md5sums=('de758f8da0552555135f53bd7184966a'
+ '027576534885b8d5dded9be546057b12')
package() {
cd ${srcdir}/${pkgname}-${pkgver}
make DESTDIR=${pkgdir} install
install -D -m644 ${srcdir}/wireless.conf.d ${pkgdir}/etc/conf.d/wireless
}
-md5sums=('cbd4320b6b1790f8c1fd80917650a566'
- '027576534885b8d5dded9be546057b12')
diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD
index bccfb3d82..2b1a423b2 100644
--- a/libre/pacman/PKGBUILD
+++ b/libre/pacman/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 120035 2011-04-18 16:49:22Z dan $
+# $Id: PKGBUILD 126847 2011-06-07 19:50:19Z dan $
# Maintainer: Dan McGee <dan@archlinux.org>
pkgname=pacman
-pkgver=3.5.2
-pkgrel=1.1
+pkgver=3.5.3
+pkgrel=1
pkgdesc="A library-based package manager with dependency support"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.archlinux.org/pacman/"
@@ -19,15 +19,7 @@ source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz
pacman.conf
pacman.conf.x86_64
pacman.conf.mips64el
- makepkg.conf
- makepkg.conf.mips64el)
-
-md5sums=('b4f1fdbc17100923071ebe8fe9377be5'
- 'c7e6dbee04b7c492febea4366519b91d'
- '8809642ed398d2b9b98c5974b8b5e348'
- '3b2e740853e3d1463885675809d4c6ff'
- 'a8684989d3dfad5a6e1bcf95af3e571b'
- 'c1ddddc5cbd1273eafcf1d858c100de0')
+ makepkg.conf)
# keep an upgrade path for older installations
PKGEXT='.pkg.tar.gz'
@@ -50,13 +42,15 @@ package() {
install -m644 $srcdir/pacman.conf $pkgdir/etc/pacman.conf
mycarch="i686"
mychost="i686-pc-linux-gnu"
- myflags="-march=i686 "
+ myflags="-march=i686 -mtune=generic -O2 -pipe"
+ myldflags="-Wl,--hash-style=gnu -Wl,--as-needed"
;;
x86_64)
install -m644 $srcdir/pacman.conf.x86_64 $pkgdir/etc/pacman.conf
mycarch="x86_64"
mychost="x86_64-unknown-linux-gnu"
- myflags="-march=x86-64 "
+ myflags="-march=x86-64 -mtune=generic -O2 -pipe"
+ myldflags="-Wl,--hash-style=gnu -Wl,--as-needed"
;;
mips64el)
install -m644 $srcdir/pacman.conf.mips64el $pkgdir/etc/pacman.conf
@@ -65,15 +59,11 @@ package() {
myflags="-O2 -march=loongson2f -mabi=n32 -pipe -mplt -Wa,-mfix-loongson2f-nop "
;;
esac
- if [ $CARCH = mips64el ]; then
- install -m644 $srcdir/makepkg.conf.mips64el $pkgdir/etc/makepkg.conf
- else
- install -m644 $srcdir/makepkg.conf $pkgdir/etc/
- fi
# set things correctly in the default conf file
sed -i $pkgdir/etc/makepkg.conf \
-e "s|@CARCH[@]|$mycarch|g" \
-e "s|@CHOST[@]|$mychost|g" \
+ -e "s|@LDFLAGS[@]|$myldflags|g" \
-e "s|@CARCHFLAGS[@]|$myflags|g"
# install completion files
diff --git a/libre/pacman/makepkg.conf b/libre/pacman/makepkg.conf
index a655e935f..bfa971b7b 100644
--- a/libre/pacman/makepkg.conf
+++ b/libre/pacman/makepkg.conf
@@ -29,9 +29,9 @@ CHOST="@CHOST@"
#-- Exclusive: will only run on @CARCH@
# -march (or -mcpu) builds exclusively for an architecture
# -mtune optimizes for an architecture, but builds for whole processor family
-CFLAGS="@CARCHFLAGS@-mtune=generic -O2 -pipe"
-CXXFLAGS="@CARCHFLAGS@-mtune=generic -O2 -pipe"
-LDFLAGS="-Wl,--hash-style=gnu -Wl,--as-needed"
+CFLAGS="@CARCHFLAGS@"
+CXXFLAGS="@CARCHFLAGS@"
+LDFLAGS="@LDFLAGS@"
#-- Make Flags: change this for DistCC/SMP systems
#MAKEFLAGS="-j2"
diff --git a/libre/pacman/rePKGBUILD b/libre/pacman/rePKGBUILD
index d7378a9f9..af613dc74 100644
--- a/libre/pacman/rePKGBUILD
+++ b/libre/pacman/rePKGBUILD
@@ -1,25 +1,30 @@
-# $Id: PKGBUILD 120035 2011-04-18 16:49:22Z dan $
-# Maintainer: Dan McGee <dan@archlinux.org>
+# Maintainer: Nicolas Reynolds <fauno@kiwwwi.com.ar>
source PKGBUILD
-unset source
-source=(http://repo.parabolagnulinux.org/core/os/$CARCH/$pkgname-$pkgver-$_pkgrel-$CARCH.pkg.tar.gz
- pacman.conf
- pacman.conf.x86_64
- makepkg.conf)
-
-# keep an upgrade path for older installations
-PKGEXT='.pkg.tar.gz'
+CARCH=x86_64
+unset build package md5sums source
+_repo=core
+source=(PKGBUILD
+ http://mirrors.kernel.org/archlinux/${_repo}/os/${CARCH}/${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT
+ # files for pkg modifications
+ pacman.conf
+ pacman.conf.x86_64
+ )
+options=(!strip)
build() {
cd "${srcdir}/"
- rm .{INSTALL,PKGINFO} $pkgname-$pkgver-$_pkgrel-$CARCH.pkg.tar.gz
+ rm .{INSTALL,PKGINFO} ${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT
+ # put actions for package modifications below this line
}
package() {
+ cd ${srcdir}
cp -a ./* ${pkgdir}
- rm $pkgdir/etc/pacman.conf $pkgdir/{pacman.conf{,.x86_64},makepkg.conf}
+ rm ${pkgdir}/{PKGBUILD,pacman.conf{,.x86_64}}
+
+# No need to repackage for mips64el
case "$CARCH" in
i686)
install -m644 $srcdir/pacman.conf $pkgdir/etc/pacman.conf
@@ -30,4 +35,5 @@ package() {
esac
}
-# vim: set ts=2 sw=2 et:
+
+# vim:set ts=2 sw=2 et:
diff --git a/social/bitcoin-daemon/makefile.archlinux b/social/bitcoin-daemon/makefile.archlinux
deleted file mode 100644
index 062a29d82..000000000
--- a/social/bitcoin-daemon/makefile.archlinux
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright (c) 2009-2010 Satoshi Nakamoto
-# Rewritten for Archlinux by shahid
-# Distributed under the MIT/X11 software license, see the accompanying
-# file license.txt or http://www.opensource.org/licenses/mit-license.php.
-
-
-INCLUDEPATHS= \
- -I"/usr/include" \
-
-LIBPATHS= \
- -L"/usr/lib" \
- -L"/usr/local/lib"
-
-LIBS= \
- -Wl,-Bstatic \
- -l boost_system \
- -l boost_filesystem \
- -l boost_program_options \
- -l boost_thread \
- -l db_cxx \
- -l crypto \
- -Wl,-Bdynamic \
- -l gthread-2.0 \
- ${LDFLAGS}
-
-DEBUGFLAGS=-g -D__WXDEBUG__
-CCFLAGS=${CXXFLAGS} -Wno-invalid-offsetof -Wformat $(WXDEFS) $(INCLUDEPATHS)
-HEADERS=headers.h strlcpy.h serialize.h uint256.h util.h key.h bignum.h base58.h \
- script.h db.h net.h irc.h main.h rpc.h uibase.h ui.h noui.h init.h
-
-OBJS= \
- obj/util.o \
- obj/script.o \
- obj/db.o \
- obj/net.o \
- obj/irc.o \
- obj/main.o \
- obj/rpc.o \
- obj/init.o \
- cryptopp/obj/sha.o \
- cryptopp/obj/cpu.o
-
-
-all: bitcoin
-
-
-headers.h.gch: headers.h $(HEADERS)
- g++ -c $(CCFLAGS) -DGUI -o $@ $<
-
-obj/%.o: %.cpp $(HEADERS) headers.h.gch
- g++ -c $(CCFLAGS) -DGUI -o $@ $<
-
-# -DCRYPTOPP_DISABLE_SSE2
-cryptopp/obj/%.o: cryptopp/%.cpp
- g++ -c $(CCFLAGS) -O3 -o $@ $<
-
-bitcoin: $(OBJS) obj/ui.o obj/uibase.o
- g++ $(CCFLAGS) -o $@ $(LIBPATHS) $^ $(WXLIBS) $(LIBS)
-
-
-obj/nogui/%.o: %.cpp $(HEADERS)
- g++ -c $(CCFLAGS) -o $@ $<
-
-bitcoind: $(OBJS:obj/%=obj/nogui/%)
- g++ $(CCFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS) -ldl -lz
-
-
-clean:
- -rm -f obj/*.o
- -rm -f obj/nogui/*.o
- -rm -f cryptopp/obj/*.o
- -rm -f headers.h.gch
diff --git a/testing/avahi/PKGBUILD b/testing/avahi/PKGBUILD
deleted file mode 100644
index 63f079778..000000000
--- a/testing/avahi/PKGBUILD
+++ /dev/null
@@ -1,75 +0,0 @@
-# $Id: PKGBUILD 126809 2011-06-07 12:12:31Z bisson $
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-
-pkgname=avahi
-pkgver=0.6.30
-pkgrel=3
-pkgdesc='A multicast/unicast DNS-SD framework'
-arch=('i686' 'x86_64')
-url='http://www.avahi.org/'
-license=('LGPL')
-depends=('expat' 'libdaemon' 'glib2' 'dbus' 'libcap' 'gdbm')
-optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc'
- 'gtk2: gtk2 bindings'
- 'qt3: qt3 bindings'
- 'qt: qt bindings'
- 'pygtk: avahi-bookmarks, avahi-discover'
- 'twisted: avahi-bookmarks'
- 'mono: mono bindings'
- 'dbus-python: avahi-discover'
- 'nss-mdns: NSS support for mDNS')
-makedepends=('qt' 'qt3' 'pygtk' 'mono' 'intltool' 'dbus-python'
- 'gtk-sharp-2' 'gobject-introspection' 'gtk3')
-backup=(etc/avahi/avahi-daemon.conf etc/avahi/services/{sftp-,}ssh.service)
-install=avahi.install
-conflicts=('howl' 'mdnsresponder')
-provides=('howl' 'mdnsresponder')
-replaces=('howl' 'mdnsresponder')
-options=('!libtool')
-source=("http://www.avahi.org/download/avahi-${pkgver}.tar.gz"
- 'avahi-daemon-dbus.patch'
- 'gnome-nettool.png')
-sha1sums=('5b77443537600a00770e4c77e3c443eeb5861d06'
- '36735096a6eeb3a4012fe14f875259ee8558e220'
- 'cf56387c88aed246b9f435efc182ef44de4d52f3')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- sed -i 's/netdev/network/g' avahi-daemon/avahi-dbus.conf
- patch -p1 -i "../avahi-daemon-dbus.patch"
-
- # pygtk requires python2; make it explicit in case other python are installed: FS#21865
- PYTHON=python2 \
- PKG_CONFIG_PATH=/opt/qt/lib/pkgconfig \
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --disable-static \
- --disable-monodoc \
- --disable-doxygen-doc \
- --disable-xmltoman \
- --enable-compat-libdns_sd \
- --enable-compat-howl \
- --with-distro=archlinux \
- --with-avahi-priv-access-group=network \
- --with-autoipd-user=avahi \
- --with-autoipd-group=avahi \
- --with-systemdsystemunitdir=/lib/systemd/system # See FS#20999
-
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
- install -D -m 644 ../gnome-nettool.png "${pkgdir}"/usr/share/pixmaps/gnome-nettool.png
-
- cd "${pkgdir}"
- sed -i '1c #!/usr/bin/python2' usr/bin/avahi-{bookmarks,discover}
- # howl and mdnsresponder compatability
- (cd usr/include; ln -s avahi-compat-libdns_sd/dns_sd.h dns_sd.h; ln -s avahi-compat-howl howl)
- (cd usr/lib/pkgconfig; ln -s avahi-compat-howl.pc howl.pc)
-}
diff --git a/testing/avahi/avahi-daemon-dbus.patch b/testing/avahi/avahi-daemon-dbus.patch
deleted file mode 100644
index ef7272082..000000000
--- a/testing/avahi/avahi-daemon-dbus.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -aur old/initscript/archlinux/avahi-daemon.in new/initscript/archlinux/avahi-daemon.in
---- old/initscript/archlinux/avahi-daemon.in 2010-06-29 05:30:35.000000000 +0200
-+++ new/initscript/archlinux/avahi-daemon.in 2011-06-07 12:20:03.237701492 +0200
-@@ -33,6 +33,7 @@
-
- case "$1" in
- start)
-+ ck_daemon dbus && /etc/rc.d/dbus start
- stat_busy "Starting $DESC"
- $DAEMON -D > /dev/null 2>&1
- if [ $? -gt 0 ]; then
diff --git a/testing/avahi/avahi.install b/testing/avahi/avahi.install
deleted file mode 100644
index 7c75c3dd4..000000000
--- a/testing/avahi/avahi.install
+++ /dev/null
@@ -1,21 +0,0 @@
-post_install() {
- getent group avahi &>/dev/null || groupadd -r -g 84 avahi >/dev/null
- getent passwd avahi &>/dev/null || useradd -r -u 84 -g avahi -d / -s /bin/false -c avahi avahi >/dev/null
-
- cat <<EOF
-==> The following daemons may be added to DAEMONS in /etc/rc.conf:
-==> avahi-daemon: the mdns responder, you probably want this.
-==> dbus needs to be running when you start it.
-==> avahi-dnsconfd: daemon used for peer-to-peer automatic dns
-==> configuration on dhcp-less networks.
-
-==> To use some of the client applications you will have to install python.
-==> In addition, pygtk is required for the graphical ones and
-==> twisted for avahi-bookmarks.
-EOF
-}
-
-post_remove() {
- getent passwd avahi &>/dev/null && userdel avahi >/dev/null
- getent group avahi &>/dev/null && groupdel avahi >/dev/null
-}
diff --git a/testing/avahi/gnome-nettool.png b/testing/avahi/gnome-nettool.png
deleted file mode 100644
index 227d0678a..000000000
--- a/testing/avahi/gnome-nettool.png
+++ /dev/null
Binary files differ
diff --git a/testing/glib2/PKGBUILD b/testing/glib2/PKGBUILD
deleted file mode 100644
index 93729d3a3..000000000
--- a/testing/glib2/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 126555 2011-06-06 09:24:36Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=glib2
-pkgver=2.28.8
-pkgrel=1
-pkgdesc="Common C routines used by GTK+ and other libs"
-url="http://www.gtk.org/"
-arch=(i686 x86_64)
-license=('LGPL')
-depends=('pcre>=8.12')
-makedepends=('pkgconfig' 'python2')
-checkdepends=('pygobject' 'dbus-python')
-options=('!libtool' '!docs')
-source=(http://ftp.gnome.org/pub/GNOME/sources/glib/2.28/glib-${pkgver}.tar.xz
- glib2.sh
- glib2.csh)
-sha256sums=('4d7ca95dbde8e8f60ab428c765b0dbb8a44be9eb9316491803ce5ee7b4748353'
- '9456872cdedcc639fb679448d74b85b0facf81033e27157d2861b991823b5a2a'
- '8d5626ffa361304ad3696493c0ef041d0ab10c857f6ef32116b3e2878ecf89e3')
-
-build() {
- cd "${srcdir}/glib-${pkgver}"
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --with-pcre=system \
- --disable-fam
- make
-}
-
-package() {
- cd "${srcdir}/glib-${pkgver}"
- make DESTDIR="${pkgdir}" install
-
- install -d "${pkgdir}/etc/profile.d"
- install -m755 "${srcdir}/glib2.sh" "${pkgdir}/etc/profile.d/"
- install -m755 "${srcdir}/glib2.csh" "${pkgdir}/etc/profile.d/"
-
- for _i in "${pkgdir}/etc/bash_completion.d/"*; do
- chmod -x "${_i}"
- done
-}
-
-check() {
- cd "${srcdir}/glib-${pkgver}"
- sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' gio/tests/gdbus-testserver.py
- make -k check || true
-}
diff --git a/testing/glib2/glib2.csh b/testing/glib2/glib2.csh
deleted file mode 100644
index 7aa3a2ffa..000000000
--- a/testing/glib2/glib2.csh
+++ /dev/null
@@ -1 +0,0 @@
-setenv G_BROKEN_FILENAMES 1
diff --git a/testing/glib2/glib2.sh b/testing/glib2/glib2.sh
deleted file mode 100644
index 96a056e1e..000000000
--- a/testing/glib2/glib2.sh
+++ /dev/null
@@ -1 +0,0 @@
-export G_BROKEN_FILENAMES=1
diff --git a/testing/gtk3/PKGBUILD b/testing/gtk3/PKGBUILD
deleted file mode 100644
index bd05b7cdd..000000000
--- a/testing/gtk3/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 126728 2011-06-06 21:19:26Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=gtk3
-pkgver=3.0.11
-pkgrel=1
-pkgdesc="The GTK+ Toolkit (v3)"
-arch=('i686' 'x86_64')
-url="http://www.gtk.org/"
-install=gtk3.install
-depends=('atk' 'cairo' 'gtk-update-icon-cache' 'gnutls' 'krb5' 'libcups' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'pango' 'shared-mime-info')
-makedepends=('gobject-introspection')
-options=('!libtool' '!docs')
-backup=(etc/gtk-3.0/settings.ini)
-license=('LGPL')
-source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/3.0/gtk+-${pkgver}.tar.xz
- settings.ini)
-sha256sums=('e2e38b316c4657df0cf376c3b6aad63158a9068c557ad41033a677f29967001b'
- 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621')
-
-build() {
- cd "${srcdir}/gtk+-${pkgver}"
- CXX=/bin/false ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --enable-gtk2-dependency \
- --disable-schemas-compile
- make
-}
-
-package() {
- cd "${srcdir}/gtk+-${pkgver}"
- make DESTDIR="${pkgdir}" install
-
- install -Dm644 "${srcdir}/settings.ini" "${pkgdir}/etc/gtk-3.0/settings.ini"
-}
diff --git a/testing/gtk3/gtk3.install b/testing/gtk3/gtk3.install
deleted file mode 100644
index cd8965d1f..000000000
--- a/testing/gtk3/gtk3.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
- usr/bin/gtk-query-immodules-3.0 --update-cache
- usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
- post_install
-}
-
-pre_remove() {
- rm -f usr/lib/gtk-3.0/3.0.0/immodules.cache
-}
-post_remove() {
- usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
diff --git a/testing/gtk3/settings.ini b/testing/gtk3/settings.ini
deleted file mode 100644
index 039000d38..000000000
--- a/testing/gtk3/settings.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[Settings]
-gtk-fallback-icon-theme = gnome
diff --git a/testing/jfsutils/PKGBUILD b/testing/jfsutils/PKGBUILD
deleted file mode 100644
index f0342bad0..000000000
--- a/testing/jfsutils/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# $Id: PKGBUILD 126948 2011-06-08 20:07:37Z tpowa $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-pkgname=jfsutils
-pkgver=1.1.15
-pkgrel=2
-pkgdesc="JFS filesystem utilities"
-arch=(i686 x86_64)
-url="http://jfs.sourceforge.net"
-license=('GPL')
-groups=('base')
-depends=('util-linux-ng')
-source=(http://jfs.sourceforge.net/project/pub/${pkgname}-${pkgver}.tar.gz)
-md5sums=('8809465cd48a202895bc2a12e1923b5d')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --sbindir=/sbin
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR=${pkgdir} install
-}
diff --git a/testing/net-tools/net-tools.install b/testing/net-tools/net-tools.install
new file mode 100644
index 000000000..9eee9e51b
--- /dev/null
+++ b/testing/net-tools/net-tools.install
@@ -0,0 +1,12 @@
+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/nx-common/NXproto.h.64bit.diff b/testing/nx-common/NXproto.h.64bit.diff
deleted file mode 100644
index ac326ebcd..000000000
--- a/testing/nx-common/NXproto.h.64bit.diff
+++ /dev/null
@@ -1,66 +0,0 @@
---- nxcomp.old/NXproto.h 2006-06-19 19:55:56.000000000 +0200
-+++ nxcomp/NXproto.h 2007-02-12 18:17:41.000000000 +0100
-@@ -26,6 +26,30 @@
- #include <X11/Xmd.h>
- #include <X11/Xproto.h>
-
-+/*
-+ Copied from Xproto.h
-+ */
-+
-+/* For the purpose of the structure definitions in this file,
-+we must redefine the following types in terms of Xmd.h's types, which may
-+include bit fields. All of these are #undef'd at the end of this file,
-+restoring the definitions in X.h. */
-+
-+#define Window CARD32
-+#define Drawable CARD32
-+#define Font CARD32
-+#define Pixmap CARD32
-+#define Cursor CARD32
-+#define Colormap CARD32
-+#define GContext CARD32
-+#define Atom CARD32
-+#define VisualID CARD32
-+#define Time CARD32
-+#define KeyCode CARD8
-+#define KeySym CARD32
-+
-+/* End copied from Xproto.h */
-+
- #define sz_xNXGetControlParametersReq 4
- #define sz_xNXGetCleanupParametersReq 4
- #define sz_xNXGetImageParametersReq 4
-@@ -343,9 +367,9 @@
- CARD8 dstDepth;
- CARD32 srcLength B32;
- CARD32 dstLength B32;
-- INT16 srcX B16, srcY B16;
-+ CARD16 srcX B16, srcY B16;
- CARD16 srcWidth B16, srcHeight B16;
-- INT16 dstX B16, dstY B16;
-+ CARD16 dstX B16, dstY B16;
- CARD16 dstWidth B16, dstHeight B16;
- } xNXPutPackedImageReq;
-
-@@ -463,4 +487,20 @@
- }
- #endif
-
-+/* Copied from Xproto.h */
-+
-+/* restore these definitions back to the typedefs in X.h */
-+#undef Window
-+#undef Drawable
-+#undef Font
-+#undef Pixmap
-+#undef Cursor
-+#undef Colormap
-+#undef GContext
-+#undef Atom
-+#undef VisualID
-+#undef Time
-+#undef KeyCode
-+#undef KeySym
-+
- #endif /* NXproto_H */
diff --git a/testing/nx-common/PKGBUILD b/testing/nx-common/PKGBUILD
deleted file mode 100644
index 85fc78ce6..000000000
--- a/testing/nx-common/PKGBUILD
+++ /dev/null
@@ -1,54 +0,0 @@
-# $Id: PKGBUILD 126698 2011-06-06 18:56:52Z andyrtr $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Contributed: eliott <eliott@solarblue.net>, Andre Naumann <anaumann@SPARCed.org>
-
-pkgname=nx-common
-pkgver=3.5.0
-pkgrel=1
-pkgdesc="NoMachine NX common package for client and server"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://nomachine.com/"
-depends=('libjpeg-turbo>=1.1.1' 'libpng>=1.4.5' 'openssl>=1.0.0' 'gcc-libs' 'bash')
-makedepends=('xorg-server-devel')
-source=( #Compression libs and proxy sources
- http://64.34.161.181/download/$pkgver/sources/nxcomp-$pkgver-1.tar.gz
- http://64.34.161.181/download/$pkgver/sources/nxcompsh-$pkgver-1.tar.gz
- http://64.34.161.181/download/$pkgver/sources/nxssh-$pkgver-1.tar.gz
- nxcompsh-gcc43.patch)
-options=(!libtool)
-md5sums=('30a182146479004ec63b8a1b9adccfcf'
- '84ade443b79ea079380b754aba9d392e'
- '9f13262bc0bf5187fcc7e22924955bc7'
- 'b6c279654dac421fc3dd1a27d66ff53c')
-
-build() {
- # nxcomp
- cd ${srcdir}/nxcomp
- ./configure --prefix=/opt/NX
- make
- # nxcompsh
- cd ${srcdir}/nxcompsh
- patch -Np1 -i ${srcdir}/nxcompsh-gcc43.patch
- ./configure --prefix=/opt/NX
- make
- # nxssh
- cd ${srcdir}/nxssh
- ./configure --prefix=/opt/NX
- make
-}
-
-package() {
- mkdir -p ${pkgdir}/opt/NX/bin
- mkdir -p ${pkgdir}/opt/NX/lib
-
- # nxcomp
- cd ${srcdir}/nxcomp
- cp -a libXcomp.so* ${pkgdir}/opt/NX/lib
- # nxcompsh
- cd ${srcdir}/nxcompsh
- cp -a libXcompsh.so* ${pkgdir}/opt/NX/lib
- # nxssh
- cd ${srcdir}/nxssh
- install -D -m755 nxssh ${pkgdir}/opt/NX/bin/nxssh
-}
diff --git a/testing/nx-common/nxcompsh-gcc43.patch b/testing/nx-common/nxcompsh-gcc43.patch
deleted file mode 100644
index 681a0dab5..000000000
--- a/testing/nx-common/nxcompsh-gcc43.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- nxcompsh/Misc.h~ 2007-06-04 13:39:49.000000000 +0200
-+++ nxcompsh/Misc.h 2008-04-12 12:46:24.000000000 +0200
-@@ -18,10 +18,12 @@
- #ifndef Misc_H
- #define Misc_H
-
--#include <iostream.h>
-+#include <iostream>
-
--#include <errno.h>
--#include <string.h>
-+#include <cerrno>
-+#include <cstring>
-+
-+using namespace std;
-
- //
- // Error handling macros.
-
diff --git a/testing/nxserver/NXproto.h.64bit.diff b/testing/nxserver/NXproto.h.64bit.diff
deleted file mode 100644
index ac326ebcd..000000000
--- a/testing/nxserver/NXproto.h.64bit.diff
+++ /dev/null
@@ -1,66 +0,0 @@
---- nxcomp.old/NXproto.h 2006-06-19 19:55:56.000000000 +0200
-+++ nxcomp/NXproto.h 2007-02-12 18:17:41.000000000 +0100
-@@ -26,6 +26,30 @@
- #include <X11/Xmd.h>
- #include <X11/Xproto.h>
-
-+/*
-+ Copied from Xproto.h
-+ */
-+
-+/* For the purpose of the structure definitions in this file,
-+we must redefine the following types in terms of Xmd.h's types, which may
-+include bit fields. All of these are #undef'd at the end of this file,
-+restoring the definitions in X.h. */
-+
-+#define Window CARD32
-+#define Drawable CARD32
-+#define Font CARD32
-+#define Pixmap CARD32
-+#define Cursor CARD32
-+#define Colormap CARD32
-+#define GContext CARD32
-+#define Atom CARD32
-+#define VisualID CARD32
-+#define Time CARD32
-+#define KeyCode CARD8
-+#define KeySym CARD32
-+
-+/* End copied from Xproto.h */
-+
- #define sz_xNXGetControlParametersReq 4
- #define sz_xNXGetCleanupParametersReq 4
- #define sz_xNXGetImageParametersReq 4
-@@ -343,9 +367,9 @@
- CARD8 dstDepth;
- CARD32 srcLength B32;
- CARD32 dstLength B32;
-- INT16 srcX B16, srcY B16;
-+ CARD16 srcX B16, srcY B16;
- CARD16 srcWidth B16, srcHeight B16;
-- INT16 dstX B16, dstY B16;
-+ CARD16 dstX B16, dstY B16;
- CARD16 dstWidth B16, dstHeight B16;
- } xNXPutPackedImageReq;
-
-@@ -463,4 +487,20 @@
- }
- #endif
-
-+/* Copied from Xproto.h */
-+
-+/* restore these definitions back to the typedefs in X.h */
-+#undef Window
-+#undef Drawable
-+#undef Font
-+#undef Pixmap
-+#undef Cursor
-+#undef Colormap
-+#undef GContext
-+#undef Atom
-+#undef VisualID
-+#undef Time
-+#undef KeyCode
-+#undef KeySym
-+
- #endif /* NXproto_H */
diff --git a/testing/nxserver/PKGBUILD b/testing/nxserver/PKGBUILD
deleted file mode 100644
index 99b5bc2aa..000000000
--- a/testing/nxserver/PKGBUILD
+++ /dev/null
@@ -1,92 +0,0 @@
-# $Id: PKGBUILD 126704 2011-06-06 19:21:37Z andyrtr $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Contributed: eliott <eliott@solarblue.net>, Andre Naumann <anaumann@SPARCed.org>
-
-pkgname=nxserver
-pkgver=3.5.0
-pkgrel=1
-pkgdesc="NoMachine NX is the next-generation X compression and roundtrip suppression scheme."
-arch=(i686 x86_64)
-url="http://nomachine.com/"
-license=('GPL')
-depends=("nx-common" 'libxaw' 'libxrender' 'libxp' 'gcc-libs' 'libjpeg>=8' #>=$pkgver
- 'libxpm' 'libpng>=1.4.0' 'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'freetype2'
- 'xorg-sessreg')
-makedepends=('imake')
-source=(
-#X11 support programs and libraries
-http://64.34.161.181/download/$pkgver/sources/nx-X11-$pkgver-1.tar.gz
-http://64.34.161.181/download/$pkgver/sources/nxwin-$pkgver-1.tar.gz
-http://64.34.161.181/download/$pkgver/sources/nxauth-$pkgver-1.tar.gz
-http://64.34.161.181/download/$pkgver/sources/nxcomp-$pkgver-1.tar.gz # needed to provide NX.h and -LXcomp - part of nx-common
-#X11 Agent sources
-http://64.34.161.181/download/$pkgver/sources/nxagent-$pkgver-2.tar.gz
-http://64.34.161.181/download/$pkgver/sources/nxcompsh-$pkgver-1.tar.gz # needed to get X11 built - part of nx-common
-#Compression libs and proxy sources
-http://64.34.161.181/download/$pkgver/sources/nxproxy-$pkgver-1.tar.gz
-http://64.34.161.181/download/$pkgver/sources/nxcompext-$pkgver-1.tar.gz
-http://64.34.161.181/download/$pkgver/sources/nxcompshad-$pkgver-2.tar.gz
-# gcc 43 fix
-nxcompsh-gcc43.patch)
-options=(!libtool)
-md5sums=('54ac7dd8806928b991b0819cf76b37dd'
- '271cef5b5345b8de77b0f6a0ce1a3b0d'
- 'cf38ec1e5a5f6453946cd387c14f2684'
- '30a182146479004ec63b8a1b9adccfcf'
- '7b0f60d5a3c54f22da7d81aac055836e'
- '84ade443b79ea079380b754aba9d392e'
- '488bb4d9b8e9f82dc272b4e6e9c57d30'
- 'abde2ccc33e31fc695031c2cfb60f3dd'
- '90a762dd9eb19c8c97876ad837923857'
- 'b6c279654dac421fc3dd1a27d66ff53c')
-
-build() {
- cd ${srcdir}
-
- # nxcomp
- cd ${srcdir}/nxcomp
- ./configure --prefix=/opt/NX
- make
- # nxcompshad
- cd ${srcdir}/nxcompshad
- ./configure --prefix=/opt/NX
- make
- # nxcompsh
- cd ${srcdir}/nxcompsh
- patch -Np1 -i ${srcdir}/nxcompsh-gcc43.patch
- ./configure --prefix=/opt/NX
- make
- # nxproxy
- cd ${srcdir}/nxproxy
- ./configure --prefix=/opt/NX
- make
- # nx-X11
- cd ${srcdir}/nx-X11
- make World
- # nxcompext
- cd ${srcdir}/nxcompext
- ./configure --prefix=/opt/NX
- make
-}
-
-package() {
- mkdir -p ${pkgdir}/opt/NX/bin
- mkdir -p ${pkgdir}/opt/NX/lib
-
- # nxcompshad
- cd ${srcdir}/nxcompshad
- cp -a libXcompshad.so* ${pkgdir}/opt/NX/lib
- # nxproxy
- cd ${srcdir}/nxproxy
- make prefix=${pkgdir}/opt/NX install
- # nx-X11
- cd ${srcdir}/nx-X11
- cp -a lib/X11/libX11.so* ${pkgdir}/opt/NX/lib
- cp -a lib/Xext/libXext.so* ${pkgdir}/opt/NX/lib
- cp -a lib/Xrender/libXrender.so* ${pkgdir}/opt/NX/lib
- install -D -m755 programs/Xserver/nxagent ${pkgdir}/opt/NX/bin/nxagent
- install -D -m755 programs/nxauth/nxauth ${pkgdir}/opt/NX/bin/nxauth
- # nxcompext
- cd ${srcdir}/nxcompext
- cp -a libXcompext.so* ${pkgdir}/opt/NX/lib
-} \ No newline at end of file
diff --git a/testing/nxserver/nxcompsh-gcc43.patch b/testing/nxserver/nxcompsh-gcc43.patch
deleted file mode 100644
index 681a0dab5..000000000
--- a/testing/nxserver/nxcompsh-gcc43.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- nxcompsh/Misc.h~ 2007-06-04 13:39:49.000000000 +0200
-+++ nxcompsh/Misc.h 2008-04-12 12:46:24.000000000 +0200
-@@ -18,10 +18,12 @@
- #ifndef Misc_H
- #define Misc_H
-
--#include <iostream.h>
-+#include <iostream>
-
--#include <errno.h>
--#include <string.h>
-+#include <cerrno>
-+#include <cstring>
-+
-+using namespace std;
-
- //
- // Error handling macros.
-