summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--community-staging/cclive/PKGBUILD30
-rw-r--r--community-staging/encfs/PKGBUILD33
-rw-r--r--community-staging/fatrat/PKGBUILD34
-rw-r--r--community-staging/glob2/PKGBUILD34
-rw-r--r--community-staging/glob2/glob2-0.9.4.1-gcc44.patch87
-rw-r--r--community-staging/glob2/glob2.install12
-rw-r--r--community-staging/glom/PKGBUILD42
-rw-r--r--community-staging/glom/glom.install15
-rw-r--r--community-staging/gnash/PKGBUILD76
-rw-r--r--community-staging/gnash/gnash-gtk.install12
-rw-r--r--community-staging/gpsdrive/PKGBUILD69
-rw-r--r--community-staging/gpsdrive/gpsd-2.96.patch44
-rw-r--r--community-staging/gpsdrive/gpsdrive.install4
-rw-r--r--community-staging/mapnik/PKGBUILD52
-rw-r--r--community-staging/mapnik/mapnik.install11
-rw-r--r--community-staging/mongodb/PKGBUILD61
-rw-r--r--community-staging/mongodb/gcc46fixes.diff132
-rw-r--r--community-staging/mongodb/gcc46fixes2.diff26
-rw-r--r--community-staging/mongodb/mongodb.conf6
-rwxr-xr-xcommunity-staging/mongodb/mongodb.install31
-rwxr-xr-xcommunity-staging/mongodb/mongodb.rc39
-rw-r--r--community-staging/ogre/PKGBUILD90
-rw-r--r--community-staging/ogre/ogre.install4
-rw-r--r--community-staging/pingus/ChangeLog21
-rw-r--r--community-staging/pingus/PKGBUILD31
-rw-r--r--community-staging/pingus/pingus.desktop9
-rw-r--r--community-staging/pokerth/PKGBUILD44
-rw-r--r--community-staging/qbittorrent/PKGBUILD42
-rw-r--r--community-staging/qbittorrent/python2.patch33
-rw-r--r--community-staging/qbittorrent/qbittorrent.install11
-rw-r--r--community-staging/schroot/PKGBUILD71
-rw-r--r--community-staging/schroot/copyfiles-arch328
-rw-r--r--community-staging/schroot/mount-arch3212
-rw-r--r--community-staging/schroot/script-arch3215
-rw-r--r--community-staging/smc/PKGBUILD45
-rw-r--r--community-staging/smc/smc-for-cegui-v0-7.diff437
-rw-r--r--community-staging/smc/smc.desktop9
-rw-r--r--community-staging/smc/smc.pngbin2961 -> 0 bytes
-rw-r--r--community-staging/springlobby/PKGBUILD48
-rw-r--r--community-staging/springlobby/springlobby.desktop10
-rw-r--r--community-staging/springlobby/springlobby.pngbin5819 -> 0 bytes
-rw-r--r--community-staging/tagpy/PKGBUILD36
-rw-r--r--community-staging/twinkle/PKGBUILD33
-rw-r--r--community-staging/twinkle/twinkle.desktop9
-rw-r--r--community-testing/gambas3/PKGBUILD1080
-rw-r--r--community-testing/gambas3/gambas3-runtime.install12
-rw-r--r--community-testing/gambas3/gambas3-script.install15
-rw-r--r--community-testing/gambas3/gambas3.install12
-rw-r--r--community/csfml/PKGBUILD30
-rw-r--r--community/elinks/elinks.desktop19
-rw-r--r--community/evolution-rss/PKGBUILD39
-rw-r--r--community/evolution-rss/add-dbus-glib.patch12
-rw-r--r--community/evolution-rss/evolution-rss.install25
-rw-r--r--community/gambas3/gambas3.desktop12
-rw-r--r--community/gambas3/gambas3.pngbin2350 -> 0 bytes
-rw-r--r--community/inn/PKGBUILD121
-rw-r--r--community/inn/inn.install22
-rw-r--r--community/inn/innd.conf2
-rw-r--r--community/inn/innd.rc41
-rw-r--r--community/inn/nnrpd.conf3
-rw-r--r--community/inn/nnrpd.rc49
-rw-r--r--community/inn/site.make.patch32
-rw-r--r--community/libssh2/PKGBUILD29
-rw-r--r--community/mednafen/fix_build.diff12
-rw-r--r--community/nginx/ChangeLog7
-rw-r--r--community/perl-xml-dom/PKGBUILD23
-rw-r--r--community/php52/PKGBUILD192
-rw-r--r--community/php52/apache.conf9
-rw-r--r--community/php52/db-5.patch51
-rw-r--r--community/php52/db-configure.patch59
-rw-r--r--community/php52/libpng14.patch11
-rw-r--r--community/php52/php.ini1309
-rw-r--r--community/python-pysfml/PKGBUILD39
-rw-r--r--community/qlandkartegt/gpsd-2.96.patch49
-rw-r--r--community/skype-call-recorder/PKGBUILD26
-rw-r--r--community/skype-call-recorder/skype-call-recorder.install13
-rw-r--r--community/systemd/mqueue-signed-int.patch38
-rw-r--r--community/wbar/ChangeLog3
-rw-r--r--extra/bind/ChangeLog15
-rw-r--r--extra/gdm/fix_crasher_with_gtk307.patch104
-rw-r--r--extra/gnome-desktop/randr-fix.patch26
-rw-r--r--extra/gnome-panel/fix-crasher-launchers.patch42
-rw-r--r--extra/gnome-shell/0001-Don-t-crash-when-removing-nameless-user.patch31
-rw-r--r--extra/gnome-shell/network_fixes_up_to_5090a4ccce.patch814
-rw-r--r--extra/gnome-shell/shell-xfixes-cursor_missing_free.patch22
-rw-r--r--extra/gnome-shell/st-private_correct_fix_memory_leak.patch52
-rw-r--r--extra/gnome-shell/st-private_fix_memory_leak.patch40
-rw-r--r--extra/inkscape/inkscape.install13
-rw-r--r--extra/ipod-sharp/PKGBUILD26
-rw-r--r--extra/kdebase-workspace/nm-09.patch34
-rw-r--r--extra/kdeplasma-applets-networkmanagement/nm-09.patch44
-rw-r--r--extra/libgnome-keyring/fix_crash.patch35
-rw-r--r--extra/madwifi-utils/PKGBUILD35
-rw-r--r--extra/madwifi/PKGBUILD46
-rw-r--r--extra/madwifi/kernel-2.6.30.patch14
-rw-r--r--extra/madwifi/madwifi-ng.install14
-rw-r--r--extra/moc/ChangeLog32
-rw-r--r--extra/mutter/squash_some_leaks.patch70
-rw-r--r--extra/neverball/ChangeLog50
-rw-r--r--extra/rxvt-unicode/popup-menu-hang.diff24
-rw-r--r--extra/scim/gcc45.patch12
-rw-r--r--extra/scim/scim.install13
-rw-r--r--extra/vigra/libpng-1.4.patch14
-rw-r--r--extra/xaw3d/ChangeLog15
-rw-r--r--kde-unstable/kdepim-runtime/disable-l10n.patch10
-rw-r--r--kde-unstable/kdepim/disable-l10n.patch10
-rw-r--r--kde-unstable/libqzeitgeist/PKGBUILD29
-rw-r--r--multilib/nspluginwrapper/nspluginwrapper-native-windows.patch14
-rw-r--r--staging/akonadi/PKGBUILD32
-rw-r--r--staging/akonadi/akonadi.install11
-rw-r--r--staging/avogadro/PKGBUILD30
-rw-r--r--staging/boost/4994-compile-fix-for-Python32-v2.patch16
-rw-r--r--staging/boost/PKGBUILD112
-rw-r--r--staging/boost/boost-1.46.0-spirit.patch59
-rw-r--r--staging/ekiga/PKGBUILD38
-rw-r--r--staging/ekiga/ekiga.install22
-rw-r--r--staging/kdeedu/PKGBUILD280
-rw-r--r--staging/kdeedu/gpsd-2.96.patch43
-rw-r--r--staging/kdeedu/kdeedu.install11
-rw-r--r--staging/libtorrent-rasterbar/PKGBUILD27
-rw-r--r--testing/accountsservice/PKGBUILD32
-rw-r--r--testing/acpid/PKGBUILD43
-rw-r--r--testing/acpid/acpid37
-rw-r--r--testing/acpid/acpid.conf.d5
-rw-r--r--testing/acpid/anything3
-rw-r--r--testing/acpid/handler.sh65
-rw-r--r--testing/anjuta/PKGBUILD35
-rw-r--r--testing/anjuta/anjuta.install21
-rw-r--r--testing/bind/127.0.0.zone11
-rw-r--r--testing/bind/PKGBUILD86
-rw-r--r--testing/bind/install21
-rw-r--r--testing/bind/localhost.zone10
-rwxr-xr-xtesting/bind/named52
-rw-r--r--testing/bind/named.conf64
-rw-r--r--testing/bind/named.conf.d4
-rw-r--r--testing/bind/named.logrotate6
-rw-r--r--testing/bind/notools.patch11
-rw-r--r--testing/bind/so_bsdcompat.patch13
-rw-r--r--testing/curl/PKGBUILD53
-rw-r--r--testing/curl/curlbuild.h9
-rw-r--r--testing/empathy/PKGBUILD39
-rw-r--r--testing/empathy/empathy.install16
-rw-r--r--testing/eog/PKGBUILD33
-rw-r--r--testing/eog/eog.install19
-rw-r--r--testing/evince/PKGBUILD43
-rw-r--r--testing/evince/evince.install19
-rw-r--r--testing/evince/introspection-fix.patch11
-rw-r--r--testing/evolution-data-server/PKGBUILD29
-rw-r--r--testing/evolution-exchange/PKGBUILD33
-rw-r--r--testing/evolution-exchange/evolution-exchange.install17
-rw-r--r--testing/evolution/PKGBUILD45
-rw-r--r--testing/evolution/evolution.install24
-rw-r--r--testing/file-roller/PKGBUILD38
-rw-r--r--testing/file-roller/file-roller.install22
-rw-r--r--testing/file/PKGBUILD41
-rw-r--r--testing/file/file-5.05-zip64.patch11
-rw-r--r--testing/file/file-5.07-zip-detect.patch13
-rw-r--r--testing/gdl/PKGBUILD27
-rw-r--r--testing/gdm/2.91_fix_external_program_directories.patch48
-rw-r--r--testing/gdm/PKGBUILD59
-rwxr-xr-xtesting/gdm/gdm36
-rw-r--r--testing/gdm/gdm-autologin.pam8
-rw-r--r--testing/gdm/gdm-vt-allocation-hack.patch118
-rw-r--r--testing/gdm/gdm.install27
-rw-r--r--testing/gdm/gdm.pam10
-rw-r--r--testing/gedit/PKGBUILD33
-rw-r--r--testing/gedit/gedit.install18
-rw-r--r--testing/glib-networking/PKGBUILD30
-rw-r--r--testing/glib-networking/glib-networking.install11
-rw-r--r--testing/glib2/PKGBUILD41
-rw-r--r--testing/glib2/glib2.csh1
-rw-r--r--testing/glib2/glib2.sh1
-rw-r--r--testing/gnome-control-center/PKGBUILD34
-rw-r--r--testing/gnome-control-center/gnome-control-center.install19
-rw-r--r--testing/gnome-desktop/PKGBUILD31
-rw-r--r--testing/gnome-games/PKGBUILD43
-rw-r--r--testing/gnome-games/gnome-games.install153
-rw-r--r--testing/gnome-panel/PKGBUILD38
-rw-r--r--testing/gnome-panel/gnome-panel.install24
-rw-r--r--testing/gnome-power-manager/PKGBUILD34
-rw-r--r--testing/gnome-power-manager/gnome-power-manager.install19
-rw-r--r--testing/gnome-session/PKGBUILD31
-rw-r--r--testing/gnome-session/gnome-session.install18
-rw-r--r--testing/gnome-settings-daemon/PKGBUILD33
-rw-r--r--testing/gnome-settings-daemon/gnome-settings-daemon.install18
-rw-r--r--testing/gnome-shell/PKGBUILD50
-rw-r--r--testing/gnome-shell/arch.patch12
-rw-r--r--testing/gnome-shell/bluetoothstatus-always-update-devices.patch132
-rw-r--r--testing/gnome-shell/gnome-shell.install22
-rw-r--r--testing/gnome-shell/shell-recorder-missing-XFree.patch22
-rw-r--r--testing/gnome-system-monitor/PKGBUILD29
-rw-r--r--testing/gnome-system-monitor/gnome-system-monitor.install19
-rw-r--r--testing/gnome-themes-standard/PKGBUILD29
-rw-r--r--testing/grep/PKGBUILD33
-rw-r--r--testing/grep/grep.install21
-rw-r--r--testing/gtk3/PKGBUILD36
-rw-r--r--testing/gtk3/gtk3.install15
-rw-r--r--testing/gtk3/settings.ini2
-rw-r--r--testing/gtksourceview3/PKGBUILD28
-rw-r--r--testing/gvfs/PKGBUILD101
-rw-r--r--testing/gvfs/gvfs-module.install7
-rw-r--r--testing/gvfs/gvfs-smb.install12
-rw-r--r--testing/gvfs/gvfs.install14
-rw-r--r--testing/libgweather/01_gettext_not_xml.patch527
-rw-r--r--testing/libgweather/PKGBUILD40
-rw-r--r--testing/libgweather/gettext-not-xml.patch533
-rw-r--r--testing/libgweather/libgweather.install22
-rw-r--r--testing/libsoup/PKGBUILD48
-rw-r--r--testing/libwnck3/PKGBUILD27
-rw-r--r--testing/mutter/PKGBUILD36
-rw-r--r--testing/mutter/mutter.install17
-rw-r--r--testing/nautilus/PKGBUILD35
-rw-r--r--testing/nautilus/nautilus.install20
-rw-r--r--testing/sqlite3/PKGBUILD75
-rw-r--r--testing/sqlite3/license.txt33
-rw-r--r--testing/upower/PKGBUILD28
-rw-r--r--testing/xz/PKGBUILD43
217 files changed, 0 insertions, 11710 deletions
diff --git a/community-staging/cclive/PKGBUILD b/community-staging/cclive/PKGBUILD
deleted file mode 100644
index 8b57f4af2..000000000
--- a/community-staging/cclive/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 47638 2011-05-24 14:28:23Z tdziedzic $
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: joyfulgirl@archlinux.us
-# Contributor: nathan owe ndowens04 at gmail dot com
-
-pkgname=cclive
-pkgver=0.7.3.1
-pkgrel=3
-pkgdesc='Commandline downloader for popular video websites.'
-arch=('i686' 'x86_64')
-url='http://cclive.sourceforge.net/'
-license=('GPL3')
-depends=('boost-libs' 'quvi')
-makedepends=('cmake' 'boost')
-source=("http://downloads.sourceforge.net/project/${pkgname}/0.7/${pkgname}-${pkgver}.tar.gz")
-md5sums=('de25297e9f34677d4d1920078d9cf254')
-
-build() {
- cd ${pkgname}-${pkgver}
-
- cmake \
- -DCMAKE_BUILD_TYPE=debug \
- -DCMAKE_INSTALL_PREFIX=/usr
-}
-
-package() {
- cd ${pkgname}-${pkgver}
-
- make DESTDIR="${pkgdir}" install
-}
diff --git a/community-staging/encfs/PKGBUILD b/community-staging/encfs/PKGBUILD
deleted file mode 100644
index 9bc1ae9d9..000000000
--- a/community-staging/encfs/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 47658 2011-05-24 17:28:48Z jelle $
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
-# Contributor: Sven Kauber, <celeon@gmail.com>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=encfs
-pkgver=1.7.4
-pkgrel=4
-pkgdesc='Encrypted filesystem in user-space'
-arch=('i686' 'x86_64')
-url='http://www.arg0.net/encfs'
-license=('GPL')
-depends=('rlog' 'openssl' 'fuse' 'boost-libs')
-makedepends=('boost')
-options=('!libtool')
-source=("http://encfs.googlecode.com/files/${pkgname}-${pkgver}.tgz")
-md5sums=('ac90cc10b2e9fc7e72765de88321d617')
-
-build(){
- cd ${pkgname}-${pkgver}
-
- ./configure \
- --prefix=/usr
-
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}
-
- make DESTDIR=${pkgdir} install
-}
diff --git a/community-staging/fatrat/PKGBUILD b/community-staging/fatrat/PKGBUILD
deleted file mode 100644
index 7411fcd43..000000000
--- a/community-staging/fatrat/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 47629 2011-05-24 14:03:19Z tdziedzic $
-# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
-pkgname=fatrat
-pkgver=1.1.3
-pkgrel=4
-pkgdesc="QT4 based download manager with support for HTTP, FTP, SFTP, BitTorrent, rapidshare and more"
-arch=('i686' 'x86_64')
-url="http://fatrat.dolezel.info/"
-license=('GPL')
-depends=('gloox' 'curl' 'qt' 'libtorrent-rasterbar')
-optdepends=('geoip: GeoIP support')
-makedepends=('asio' 'cmake')
-source=(http://www.dolezel.info/download/data/fatrat/fatrat-$pkgver.tar.gz)
-md5sums=('6d4a00cdd0b59a05b1521184508d4637')
-
-build() {
- cd $pkgname-$pkgver
-
- export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2"
-
- cmake \
- -DWITH_EVERYTHING=ON \
- -DCMAKE_INSTALL_PREFIX=/usr \
- .
-
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-staging/glob2/PKGBUILD b/community-staging/glob2/PKGBUILD
deleted file mode 100644
index 94754172b..000000000
--- a/community-staging/glob2/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 47655 2011-05-24 16:52:31Z schuay $
-# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
-# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
-
-pkgname=glob2
-pkgver=0.9.4.4
-pkgrel=8
-pkgdesc="RTS game which minimizes micro-management by automatically assigning tasks to units"
-arch=('i686' 'x86_64')
-url="http://www.globulation2.org/"
-license=('GPL3')
-depends=('boost-libs' 'sdl_net' 'sdl_image' 'sdl_ttf' 'libvorbis' 'speex' 'mesa' \
- 'fribidi' 'desktop-file-utils')
-makedepends=('scons' 'boost')
-install=glob2.install
-source=(http://dl.sv.nongnu.org/releases/${pkgname}/0.9.4/${pkgname}-${pkgver}.tar.gz \
- glob2-0.9.4.1-gcc44.patch)
-md5sums=('94c527325f355a29a2807f8f18a6e6a8' 'b13cb1f73ece23bfc6413773678d583e')
-sha1sums=('14aa8d840ef5f95a9af591789082fe2322fa8cad' '3e5ae81d85a727387a7049c3a0dfb3db930391b3')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- patch -Np0 -i "$srcdir/glob2-0.9.4.1-gcc44.patch"
- scons BINDIR="${pkgdir}/usr/bin" INSTALLDIR="${pkgdir}/usr/share"
-}
-
-package () {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- scons install
- find "${pkgdir}/usr/share" -type f -exec chmod 644 '{}' \;
- install -Dm644 data/icons/glob2-icon-48x48.png "${pkgdir}/usr/share/pixmaps/glob2-icon-48x48.png"
-}
diff --git a/community-staging/glob2/glob2-0.9.4.1-gcc44.patch b/community-staging/glob2/glob2-0.9.4.1-gcc44.patch
deleted file mode 100644
index b425b25ec..000000000
--- a/community-staging/glob2/glob2-0.9.4.1-gcc44.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-diff -up libgag/include/StreamBackend.h.orig libgag/include/StreamBackend.h
---- libgag/include/StreamBackend.h.orig 2009-03-18 03:46:47.000000000 +0100
-+++ libgag/include/StreamBackend.h 2009-06-20 14:21:10.000000000 +0200
-@@ -43,7 +43,7 @@ namespace GAGCore
- virtual void flush(void) = 0;
- virtual void read(void *data, size_t size) = 0;
- virtual void putc(int c) = 0;
-- virtual int getc(void) = 0;
-+ virtual int get_c(void) = 0;
- virtual void seekFromStart(int displacement) = 0;
- virtual void seekFromEnd(int displacement) = 0;
- virtual void seekRelative(int displacement) = 0;
-@@ -67,7 +67,7 @@ namespace GAGCore
- virtual void flush(void) { assert(fp); fflush(fp); }
- virtual void read(void *data, size_t size) { assert(fp); fread(data, size, 1, fp); }
- virtual void putc(int c) { assert(fp); fputc(c, fp); }
-- virtual int getc(void) { assert(fp); return fgetc(fp); }
-+ virtual int get_c(void) { assert(fp); return fgetc(fp); }
- virtual void seekFromStart(int displacement) { assert(fp); fseek(fp, displacement, SEEK_SET); }
- virtual void seekFromEnd(int displacement) { assert(fp); fseek(fp, displacement, SEEK_END); }
- virtual void seekRelative(int displacement) { assert(fp); fseek(fp, displacement, SEEK_CUR); }
-@@ -92,7 +92,7 @@ namespace GAGCore
- virtual void flush(void);
- virtual void read(void *data, size_t size);
- virtual void putc(int c);
-- virtual int getc(void);
-+ virtual int get_c(void);
- virtual void seekFromStart(int displacement);
- virtual void seekFromEnd(int displacement);
- virtual void seekRelative(int displacement);
-@@ -117,7 +117,7 @@ namespace GAGCore
- virtual void flush(void) { }
- virtual void read(void *data, size_t size);
- virtual void putc(int c);
-- virtual int getc(void);
-+ virtual int get_c(void);
- virtual void seekFromStart(int displacement);
- virtual void seekFromEnd(int displacement);
- virtual void seekRelative(int displacement);
-diff -up libgag/src/StreamBackend.cpp.orig libgag/src/StreamBackend.cpp
---- libgag/src/StreamBackend.cpp.orig 2009-03-18 03:46:47.000000000 +0100
-+++ libgag/src/StreamBackend.cpp 2009-06-20 14:21:53.000000000 +0200
-@@ -75,9 +75,9 @@ namespace GAGCore
- buffer->putc(c);
- }
-
-- int ZLibStreamBackend::getc(void)
-+ int ZLibStreamBackend::get_c(void)
- {
-- return buffer->getc();
-+ return buffer->get_c();
- }
-
- void ZLibStreamBackend::seekFromStart(int displacement)
-@@ -147,7 +147,7 @@ namespace GAGCore
- write(&ch, 1);
- }
-
-- int MemoryStreamBackend::getc(void)
-+ int MemoryStreamBackend::get_c(void)
- {
- Uint8 ch;
- read(&ch, 1);
-diff -up libgag/src/Stream.cpp.orig libgag/src/Stream.cpp
---- libgag/src/Stream.cpp.orig 2009-03-18 03:46:47.000000000 +0100
-+++ libgag/src/Stream.cpp 2009-06-20 14:21:35.000000000 +0200
-@@ -60,7 +60,7 @@ namespace GAGCore
- std::string s;
- while (1)
- {
-- int c = backend->getc();
-+ int c = backend->get_c();
- if(c=='\r')
- continue;
- if ((c >= 0) && (c != '\n'))
-diff -up libgag/src/TextStream.cpp.orig libgag/src/TextStream.cpp
---- libgag/src/TextStream.cpp.orig 2009-03-18 03:46:47.000000000 +0100
-+++ libgag/src/TextStream.cpp 2009-06-20 14:21:22.000000000 +0200
-@@ -150,7 +150,7 @@ namespace GAGCore
-
- int nextChar(void)
- {
-- next = stream->getc();
-+ next = stream->get_c();
- if (next == '\n')
- {
- column = 0;
diff --git a/community-staging/glob2/glob2.install b/community-staging/glob2/glob2.install
deleted file mode 100644
index 7463b6e76..000000000
--- a/community-staging/glob2/glob2.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- update-desktop-database -q
-}
-
diff --git a/community-staging/glom/PKGBUILD b/community-staging/glom/PKGBUILD
deleted file mode 100644
index e5251b1f4..000000000
--- a/community-staging/glom/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 47669 2011-05-24 17:51:15Z schuay $
-# Maintainer: Roman Kyrylych <Roman.Kyrylych@gmail.com>
-# Contributor: William Rea <sillywilly@gmail.com>
-# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-
-pkgname=glom
-pkgver=1.16.1
-pkgrel=6
-pkgdesc="An easy-to-use database designer and user interface"
-arch=('i686' 'x86_64')
-url="http://www.glom.org/"
-license=('GPL')
-depends=('libgdamm' 'libxml++' 'gconfmm' 'pygtk'
- 'python2-gda' 'libgtksourceviewmm2' 'goocanvasmm' 'libepc'
- 'iso-codes' 'postgresql' 'hicolor-icon-theme' 'shared-mime-info'
- 'gtkmm' 'boost-libs' 'gettext')
-makedepends=('intltool' 'gnome-doc-utils' 'boost' 'python-sphinx' 'mm-common')
-options=('!libtool')
-install=$pkgname.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/glom/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
-md5sums=('9ae56e0886f14a48cedaef9beb9c3cc9')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- # doctooldir is now owned by mm-common-util instead of glibmm
- # the following sed line can be removed once (if) upstream provides a fixed
- # configure script
- sed -i 's%\(MMDOCTOOLDIR=`$PKG_CONFIG --variable=doctooldir \)glibmm-2.4%\1mm-common-util%' configure
-
- ./configure --prefix=/usr \
- --with-postgres-utils=/usr/bin \
- --disable-scrollkeeper \
- --disable-update-mime-database \
- --disable-static
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
-}
diff --git a/community-staging/glom/glom.install b/community-staging/glom/glom.install
deleted file mode 100644
index 1ad77f9aa..000000000
--- a/community-staging/glom/glom.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
- update-desktop-database -q
- update-mime-database usr/share/mime > /dev/null
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
- update-desktop-database -q
- update-mime-database usr/share/mime > /dev/null
-}
diff --git a/community-staging/gnash/PKGBUILD b/community-staging/gnash/PKGBUILD
deleted file mode 100644
index f962211b1..000000000
--- a/community-staging/gnash/PKGBUILD
+++ /dev/null
@@ -1,76 +0,0 @@
-# $Id: PKGBUILD 82896 2010-06-18 18:30:20Z ibiru $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-
-pkgbase=gnash
-pkgname=(gnash-common gnash-gtk)
-pkgver=0.8.9
-pkgrel=3
-arch=(i686 x86_64)
-url="http://www.gnu.org/software/gnash/"
-license=(GPL3)
-makedepends=(curl giflib libldap sdl agg libjpeg libpng libtool
- speex fontconfig libva ffmpeg libxinerama
- gstreamer0.10-base gstreamer0.10-ffmpeg
- gtk2 libldap xulrunner hicolor-icon-theme desktop-file-utils
- pkgconfig boost)
-options=(!libtool !emptydirs)
-source=(http://ftp.gnu.org/gnu/gnash/${pkgver}/gnash-${pkgver}.tar.bz2)
-md5sums=('5b2be6b04a1bcc5fb404cc377034499e')
-
-build() {
- cd "$srcdir/gnash-$pkgver"
-
- # Version is now in version.h
- sed -i 's/avcodec\.h/version.h/' macros/ffmpeg.m4
- ./autogen.sh
-
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --with-plugins-install=system \
- --with-npapi-plugindir=/usr/lib/mozilla/plugins \
- --enable-gui=sdl,gtk \
- --enable-renderer=agg \
- --enable-media=gst,ffmpeg \
- --enable-hwaccel=vaapi
-
- make
-}
-
-package_gnash-common() {
- pkgdesc="A GNU Flash movie player"
- depends=(curl giflib libldap sdl agg libjpeg libpng libtool
- speex fontconfig libva ffmpeg libxinerama
- gstreamer0.10-base gstreamer0.10-ffmpeg
- boost-libs)
- backup=(etc/gnashrc)
-
- cd "$srcdir/gnash-$pkgver"
-
- make DESTDIR="$pkgdir" install
-
- # Split gnash-gtk
- mkdir -p "$srcdir"/gtk/{bin,man1,share}
- mv "$pkgdir"/usr/bin/{gtk-gnash,gnash-gtk-launcher} "$srcdir/gtk/bin/"
- mv "$pkgdir"/usr/share/man/man1/{gtk-gnash,gnash-gtk-launcher}.1 "$srcdir/gtk/man1/"
- mv "$pkgdir"/usr/share/{applications,icons} "$srcdir/gtk/share/"
- mv "$pkgdir/etc/gnashpluginrc" "$srcdir/gtk/"
-}
-
-package_gnash-gtk() {
- pkgdesc="A GNU Flash movie player"
- depends=("gnash-common=$pkgver"
- gtk2 libldap hicolor-icon-theme desktop-file-utils)
- install=gnash-gtk.install
- backup=(etc/gnashpluginrc)
-
- cd "$srcdir/gnash-$pkgver"
-
- make DESTDIR="$pkgdir" install-plugin
-
- install -d "$pkgdir"/{etc,usr/{bin,share/man/man1}}
- mv "$srcdir"/gtk/bin/* "$pkgdir/usr/bin/"
- mv "$srcdir"/gtk/man1/* "$pkgdir/usr/share/man/man1/"
- mv "$srcdir"/gtk/share/* "$pkgdir/usr/share/"
- mv "$srcdir/gtk/gnashpluginrc" "$pkgdir/etc/"
-}
diff --git a/community-staging/gnash/gnash-gtk.install b/community-staging/gnash/gnash-gtk.install
deleted file mode 100644
index c317fbaca..000000000
--- a/community-staging/gnash/gnash-gtk.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- update-desktop-database -q
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/community-staging/gpsdrive/PKGBUILD b/community-staging/gpsdrive/PKGBUILD
deleted file mode 100644
index d7fafb285..000000000
--- a/community-staging/gpsdrive/PKGBUILD
+++ /dev/null
@@ -1,69 +0,0 @@
-# $Id: PKGBUILD 47650 2011-05-24 16:23:35Z jelle $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Maintainer: damir <damir@archlinux.org>
-
-pkgname=gpsdrive
-pkgver=2.11
-pkgrel=8
-pkgdesc="A car (bike, ship, plane) navigation system"
-arch=("i686" "x86_64")
-url="http://www.gpsdrive.de/"
-license=('GPL2')
-depends=('gtk2' 'gpsd' 'libxml2' 'curl' 'python2' 'boost-libs' 'gdal' 'mapnik' 'postgresql-libs' 'openstreetmap-map-icons-svn'
- 'perl-date-manip' 'perl-timedate' 'perl-dbi' 'perl-file-slurp' 'perl-www-mechanize' 'perl-libwww' 'perl-uri'
- 'perl-text-query' 'perl-www-curl' 'perl-xml-parser' 'perl-xml-simple' 'perl-xml-twig' 'perl-xml-writer'
- ) # already in core ('sqlite3')
-makedepends=('cmake>=2.4.4' 'boost' 'cfitsio')
-install="gpsdrive.install"
-source=("http://www.gpsdrive.de/packages/${pkgname}-${pkgver}.tar.gz"
- "gpsd-2.96.patch")
-md5sums=('6eeeca8e5c647115bea836d1f8fb6e0c'
- '5769e12c6d8932fb721212434c64f505')
-
-build() {
- cd "$srcdir"
-
- # python2 fix
- for file in $(find . -name '*.py' -print); do
- sed -i 's_#!/usr/bin/python_#!/usr/bin/python2_' $file
- sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file
- done
-
- rm -rf build
- mkdir build
- cd build
-
- # fix the mapnik default values
- sed -i 's|"/usr/lib/mapnik/0.7/input/"|"/usr/lib/mapnik/input/"|' "${srcdir}/gpsdrive-${pkgver}/src/gpsdrive_config.c"
- sed -i 's|"/usr/share/fonts/truetype/ttf-dejavu/"|"/usr/share/fonts/TTF/"|' "${srcdir}/gpsdrive-${pkgver}/src/gpsdrive_config.c"
-
- export CFLAGS=-I/usr/include/gdk-pixbuf-2.0/
- export CPPFLAGS=-I/usr/include/gdk-pixbuf-2.0/
- export CXXFLAGS=-I/usr/include/gdk-pixbuf-2.0/
-
- export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2"
-
- # see DefineOptions.cmake for a list of common options and defaults
- # cmake -L for a more in-depth listing
- cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX="/usr" \
- -DWITH_SCRIPTS=ON \
- -DWITH_MAPNIK=ON \
- -DWITH_POSTGIS=ON \
- -DWITH_GDAL=ON \
- -DWITH_BASEMAPS=ON \
- -DWITH_FRIENDSD=ON \
- -DWITH_KISMET=ON \
- -DWITH_NAVIGATION=ON \
- -DWITH_SPEECH=OFF \
- -DWITH_DBUS=OFF \
- -DLIBGPS_OLD=OFF \
- "$srcdir/gpsdrive-$pkgver"
- (cd "$srcdir/gpsdrive-$pkgver" && patch -p1 <$srcdir/gpsd-2.96.patch)
- make
-}
-
-package() {
- cd "$srcdir/build"
- make DESTDIR="$pkgdir" install
-}
diff --git a/community-staging/gpsdrive/gpsd-2.96.patch b/community-staging/gpsdrive/gpsd-2.96.patch
deleted file mode 100644
index bc6c7475f..000000000
--- a/community-staging/gpsdrive/gpsd-2.96.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -wbBur gpsdrive-2.11/src/gps_handler.c gpsdrive-2.11.my/src/gps_handler.c
---- gpsdrive-2.11/src/gps_handler.c 2010-06-24 19:53:32.000000000 +0000
-+++ gpsdrive-2.11.my/src/gps_handler.c 2011-04-18 13:21:33.000000000 +0000
-@@ -264,7 +264,8 @@
- #define GPS_TIMER 500
-
- static gint gps_timeout_source = 0;
--static struct gps_data_t *gpsdata;
-+static struct gps_data_t __gd;
-+static struct gps_data_t *gpsdata = &__gd;
-
- /* SYMBOLS USED IN LIBGPS:
- *
-@@ -410,9 +411,10 @@
- */
- gps_query (gpsdata, "oys\n");
- #else
-- if (gps_waiting(gpsdata))
-+ if (gps_waiting(gpsdata, 1000000))
- {
-- gps_poll (gpsdata);
-+ gps_read (gpsdata);
-+ gps_hook_cb(gpsdata, NULL);
- }
- #endif
-
-@@ -447,7 +449,7 @@
- }
-
- /* try to open connection */
-- gpsdata = gps_open (local_config.gpsd_server, local_config.gpsd_port);
-+ gpsdata = gps_open (local_config.gpsd_server, local_config.gpsd_port, gpsdata) ? NULL : &__gd;
- if (!gpsdata)
- {
- g_print ("Can't connect to gps daemon on %s:%s, disabling GPS support!\n",
-@@ -466,7 +468,7 @@
- gps_sats = g_new (gps_satellite_struct, MAXCHANNELS);
-
- /* set hook function to handle gps data */
-- gps_set_raw_hook (gpsdata, (gpointer) gps_hook_cb);
-+// gps_set_raw_hook (gpsdata, (gpointer) gps_hook_cb);
-
- #ifndef LIBGPS_OLD
- /* enable watch mode to get data stream from gpsd */
diff --git a/community-staging/gpsdrive/gpsdrive.install b/community-staging/gpsdrive/gpsdrive.install
deleted file mode 100644
index 8ea63912e..000000000
--- a/community-staging/gpsdrive/gpsdrive.install
+++ /dev/null
@@ -1,4 +0,0 @@
-post_install() {
- echo "Don't forget to generate geoinfo.db with geoinfo.pl script"
- echo "Also you can check http://wiki.archlinux.org/index.php/GpsDrive"
-}
diff --git a/community-staging/mapnik/PKGBUILD b/community-staging/mapnik/PKGBUILD
deleted file mode 100644
index bcfc24c68..000000000
--- a/community-staging/mapnik/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 47631 2011-05-24 14:03:50Z jelle $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: David Dent <thewinch@gmail.com>
-# Contributor: orbisvicis <orbisvicis@gmail.com>
-
-pkgname=mapnik
-pkgver=0.7.1
-pkgrel=9
-pkgdesc="Free Toolkit for developing mapping applications. Above all Mapnik is about rendering beautiful maps."
-arch=('i686' 'x86_64')
-url="http://mapnik.org/"
-license=('LGPL')
-depends=('boost-libs' 'icu' 'libpng' 'libjpeg' 'libtiff' 'freetype2'
- 'libxml2' 'python2' 'proj' 'cairo' 'cairomm' 'pycairo'
- 'postgresql-libs' 'postgis' 'gdal' 'curl' 'libtool')
- # already in core ('zlib' 'sqlite3')
-optdepends=('libxslt: Web Map Service'
- 'python-lxml: Web Map Service'
- 'python-imaging: Web Map Service'
- 'python-nose: Web Map Service'
- 'apache: Web Map Service'
- 'mod_fastcgi: Web Map Service - or:'
- 'mod_fcgid: Web Map Service - or:'
- 'mod_wsgi: Web Map Service'
- )
-makedepends=('scons' 'boost') # already in core ('pkg-config')
-conflicts=('mapnik-svn')
-install="mapnik.install"
-source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('8f65fda2a792518d6f6be8a85f62fc73')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- #patch SConstruct so libs end up in /usr/lib not /usr/lib64 on X86_64
- sed -i -e "/LIBDIR_SCHEMA=/s/lib64/lib/" SConstruct
-
- sed -i 's/-ansi -Wall/-ansi -DBOOST_FILESYSTEM_VERSION=2 -Wall/' SConstruct
-
- scons configure \
- PREFIX="/usr" \
- INPUT_PLUGINS=all \
- DESTDIR="$pkgdir"
- scons
-}
-package(){
- cd "$srcdir/$pkgname-$pkgver"
- scons install
-
- # fix permissions on SCons-autogenerated files
- chmod 644 "${pkgdir}/usr/lib/python2.7/site-packages/mapnik/paths.py"
-}
diff --git a/community-staging/mapnik/mapnik.install b/community-staging/mapnik/mapnik.install
deleted file mode 100644
index 46f265d5b..000000000
--- a/community-staging/mapnik/mapnik.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- /sbin/ldconfig
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/community-staging/mongodb/PKGBUILD b/community-staging/mongodb/PKGBUILD
deleted file mode 100644
index c3e44c8fa..000000000
--- a/community-staging/mongodb/PKGBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Mathias Stearn <mathias@10gen.com>
-# Contributor: Alec Thomas
-
-pkgname=mongodb
-pkgver=1.8.1
-pkgrel=2
-pkgdesc='A high-performance, open source, schema-free document-oriented database.'
-arch=('i686' 'x86_64')
-url='http://www.mongodb.org'
-license=('AGPL3')
-depends=('boost-libs' 'spidermonkey' 'pcre')
-makedepends=('scons' 'boost')
-optdepends=('libpcap: needed for mongosniff')
-backup=('etc/mongodb.conf')
-install="mongodb.install"
-source=("http://downloads.mongodb.org/src/mongodb-src-r${pkgver}.tar.gz"
- 'mongodb.rc'
- 'mongodb.conf'
- 'gcc46fixes.diff'
- 'gcc46fixes2.diff')
-md5sums=('e75a5cae641a53760df8cb866ad5d929'
- '859f8f9bb32ef2bd21fec55ae9a87d0a'
- '9e0ea3f96732bb7811f0b64dace56440'
- 'e90c78350e25df2d24f98e4767677d4b'
- '5097de6ce2c347c3703ab8cf5a611052')
-
-build() {
- export SCONSFLAGS="$MAKEFLAGS"
-
- cd ${pkgname}-src-r${pkgver}
-
- patch -Np1 -i ${srcdir}/gcc46fixes.diff
- patch -Np1 -i ${srcdir}/gcc46fixes2.diff
-
- # scons is "special"
- sed -i 's/-Wall -Wsign-compare/& -DBOOST_FILESYSTEM_VERSION=2/' SConstruct
-
- scons \
- all \
- --full
-}
-
-package() {
- cd ${pkgname}-src-r${pkgver}
-
- scons \
- install \
- --full \
- --prefix=${pkgdir}/usr
-
- install -D -m755 ${srcdir}/mongodb.rc \
- ${pkgdir}/etc/rc.d/mongodb
- install -D -m644 ${srcdir}/mongodb.conf \
- ${pkgdir}/etc/mongodb.conf
- install -d -m700 ${pkgdir}/var/state/mongodb
-
- if [ -d ${pkgdir}/usr/lib64 ]; then
- mv ${pkgdir}/usr/lib64 ${pkgdir}/usr/lib
- fi
-}
diff --git a/community-staging/mongodb/gcc46fixes.diff b/community-staging/mongodb/gcc46fixes.diff
deleted file mode 100644
index 487c88f16..000000000
--- a/community-staging/mongodb/gcc46fixes.diff
+++ /dev/null
@@ -1,132 +0,0 @@
-commit fa7cd65e480d80ba1cd196bdcec8f4714e361e8e
-Author: Mathias Stearn <redbeard0531@gmail.com>
-Date: Sun Apr 3 19:10:36 2011 -0400
-
- g++ 4.6 compile (new -Wunused-but-set-variable warning)
-
-diff --git a/db/btree.cpp b/db/btree.cpp
-index 2758f72..4162d6a 100644
---- a/db/btree.cpp
-+++ b/db/btree.cpp
-@@ -1226,8 +1226,6 @@ namespace mongo {
- out() << " " << thisLoc.toString() << ".insertHere " << key.toString() << '/' << recordLoc.toString() << ' '
- << lchild.toString() << ' ' << rchild.toString() << " keypos:" << keypos << endl;
-
-- DiskLoc oldLoc = thisLoc;
--
- if ( !basicInsert(thisLoc, keypos, recordLoc, key, order) ) {
- // If basicInsert() fails, the bucket will be packed as required by split().
- thisLoc.btreemod()->split(thisLoc, keypos, recordLoc, key, order, lchild, rchild, idx);
-diff --git a/db/dbcommands.cpp b/db/dbcommands.cpp
-index 2580f86..56c0fce 100644
---- a/db/dbcommands.cpp
-+++ b/db/dbcommands.cpp
-@@ -1460,7 +1460,7 @@ namespace mongo {
- uassert( 13049, "godinsert must specify a collection", !coll.empty() );
- string ns = dbname + "." + coll;
- BSONObj obj = cmdObj[ "obj" ].embeddedObjectUserCheck();
-- DiskLoc loc = theDataFileMgr.insertWithObjMod( ns.c_str(), obj, true );
-+ theDataFileMgr.insertWithObjMod( ns.c_str(), obj, true );
- return true;
- }
- } cmdGodInsert;
-diff --git a/db/index.cpp b/db/index.cpp
-index c696e27..218ecb3 100644
---- a/db/index.cpp
-+++ b/db/index.cpp
-@@ -127,7 +127,6 @@ namespace mongo {
- void getIndexChanges(vector<IndexChanges>& v, NamespaceDetails& d, BSONObj newObj, BSONObj oldObj, bool &changedId) {
- int z = d.nIndexesBeingBuilt();
- v.resize(z);
-- NamespaceDetails::IndexIterator i = d.ii();
- for( int i = 0; i < z; i++ ) {
- IndexDetails& idx = d.idx(i);
- BSONObj idxKey = idx.info.obj().getObjectField("key"); // eg { ts : 1 }
-diff --git a/db/update.cpp b/db/update.cpp
-index e173902..85c3f9c 100644
---- a/db/update.cpp
-+++ b/db/update.cpp
-@@ -992,7 +992,7 @@ namespace mongo {
- BSONObj newObj = mss->createNewFromMods();
- checkTooLarge(newObj);
- assert(nsdt);
-- DiskLoc newLoc = theDataFileMgr.updateRecord(ns, d, nsdt, r, loc , newObj.objdata(), newObj.objsize(), debug);
-+ theDataFileMgr.updateRecord(ns, d, nsdt, r, loc , newObj.objdata(), newObj.objsize(), debug);
- }
-
- if ( logop ) {
-diff --git a/dbtests/queryoptimizertests.cpp b/dbtests/queryoptimizertests.cpp
-index acf9217..2d6f752 100644
---- a/dbtests/queryoptimizertests.cpp
-+++ b/dbtests/queryoptimizertests.cpp
-@@ -1558,7 +1558,6 @@ namespace QueryOptimizerTests {
- theDataFileMgr.insertWithObjMod( ns(), temp );
- }
- BSONObj hint = fromjson( "{$hint:{a:1,b:1}}" );
-- BSONElement hintElt = hint.firstElement();
- auto_ptr< FieldRangeSet > frs( new FieldRangeSet( ns(), fromjson( "{a:5,b:{$in:[2,3,6,9,11]}}" ) ) );
- QueryPlan qp( nsd(), 1, *frs, *frs, fromjson( "{a:5,b:{$in:[2,3,6,9,11]}}" ), BSONObj() );
- boost::shared_ptr<Cursor> c = qp.newCursor();
-@@ -1581,7 +1580,6 @@ namespace QueryOptimizerTests {
- theDataFileMgr.insertWithObjMod( ns(), temp );
- }
- BSONObj hint = fromjson( "{$hint:{a:1,b:1}}" );
-- BSONElement hintElt = hint.firstElement();
- auto_ptr< FieldRangeSet > frs( new FieldRangeSet( ns(), fromjson( "{a:{$gte:5},b:{$in:[2,3,6,9,11]}}" ) ) );
- QueryPlan qp( nsd(), 1, *frs, *frs, fromjson( "{a:{$gte:5},b:{$in:[2,3,6,9,11]}}" ), BSONObj() );
- boost::shared_ptr<Cursor> c = qp.newCursor();
-diff --git a/shell/shell_utils.cpp b/shell/shell_utils.cpp
-index 6c398ef..53484fd 100644
---- a/shell/shell_utils.cpp
-+++ b/shell/shell_utils.cpp
-@@ -260,7 +260,7 @@ namespace mongo {
- BSONElement e = oneArg(args);
- bool found = false;
-
-- path root( args.firstElement().valuestrsafe() );
-+ path root( e.valuestrsafe() );
- if ( boost::filesystem::exists( root ) ) {
- found = true;
- boost::filesystem::remove_all( root );
-diff --git a/tools/tool.cpp b/tools/tool.cpp
-index 92a4bd4..150481b 100644
---- a/tools/tool.cpp
-+++ b/tools/tool.cpp
-@@ -413,14 +413,14 @@ namespace mongo {
- ProgressMeter m( fileLength );
-
- while ( read < fileLength ) {
-- int readlen = fread(buf, 4, 1, file);
-+ fread(buf, 4, 1, file);
- int size = ((int*)buf)[0];
- if ( size >= BUF_SIZE ) {
- cerr << "got an object of size: " << size << " terminating..." << endl;
- }
- uassert( 10264 , "invalid object size" , size < BUF_SIZE );
-
-- readlen = fread(buf+4, size-4, 1, file);
-+ fread(buf+4, size-4, 1, file);
-
- BSONObj o( buf );
- if ( _objcheck && ! o.valid() ) {
-diff --git a/util/ramlog.h b/util/ramlog.h
-index fc588e6..b2f3aa0 100644
---- a/util/ramlog.h
-+++ b/util/ramlog.h
-@@ -108,7 +108,6 @@ namespace mongo {
- vector<const char*> v;
- get( v );
-
-- bool first = true;
- s << "<pre>\n";
- for( int i = 0; i < (int)v.size(); i++ ) {
- assert( strlen(v[i]) > 20 );
-@@ -126,7 +125,7 @@ namespace mongo {
- stringstream r;
- if( nr == 1 ) r << "repeat last line";
- else r << "repeats last " << nr << " lines; ends " << string(v[last]+4,0,15);
-- first = false; s << html::a("", r.str(), clean(v,i,x.str()));
-+ s << html::a("", r.str(), clean(v,i,x.str()));
- }
- else s << x.str();
- s << '\n';
diff --git a/community-staging/mongodb/gcc46fixes2.diff b/community-staging/mongodb/gcc46fixes2.diff
deleted file mode 100644
index 17257b136..000000000
--- a/community-staging/mongodb/gcc46fixes2.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-commit 5931bc0231c91ecdfc5dd313d8cce578eae426bb
-Author: Eliot Horowitz <eliot@10gen.com>
-Date: Wed Mar 30 01:01:18 2011 -0400
-
- remove unused variable
-
-diff --git a/db/commands.cpp b/db/commands.cpp
-index c301fb3..0bbd765 100644
---- a/db/commands.cpp
-+++ b/db/commands.cpp
-@@ -127,7 +127,6 @@ namespace mongo {
- if ( strcmp(p, ".$cmd") != 0 ) return false;
-
- bool ok = false;
-- bool valid = false;
-
- BSONElement e = jsobj.firstElement();
- map<string,Command*>::iterator i;
-@@ -138,7 +137,6 @@ namespace mongo {
- migrated over to the command object format.
- */
- else if ( (i = _commands->find(e.fieldName())) != _commands->end() ) {
-- valid = true;
- string errmsg;
- Command *c = i->second;
- if ( c->adminOnly() && !startsWith(ns, "admin.") ) {
diff --git a/community-staging/mongodb/mongodb.conf b/community-staging/mongodb/mongodb.conf
deleted file mode 100644
index 60d73eae8..000000000
--- a/community-staging/mongodb/mongodb.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# See http://www.mongodb.org/display/DOCS/File+Based+Configuration for format details
-# Run mongod --help to see a list of options
-
-bind_ip = 127.0.0.1
-quiet = true
-dbpath = /var/state/mongodb
diff --git a/community-staging/mongodb/mongodb.install b/community-staging/mongodb/mongodb.install
deleted file mode 100755
index 152f36515..000000000
--- a/community-staging/mongodb/mongodb.install
+++ /dev/null
@@ -1,31 +0,0 @@
-# vim: syntax=sh
-
-show_msg(){
- if [ "$(arch)" != "x86_64" ]
- then
- cat <<END
-###########################################################################
-# Warning: the 32 bit version of MongoDB is limited to about 2GB of data. #
-# See http://blog.mongodb.org/post/137788967/32-bit-limitations #
-###########################################################################
-END
- fi
-}
-
-post_install() {
- useradd -r -g daemon -d /var/state/mongodb -s /bin/false mongodb
- chown -R mongodb:daemon /var/state/mongodb
-
- show_msg
-}
-
-post_upgrade() {
- chown -R mongodb:daemon /var/state/mongodb
-
- show_msg
-}
-
-pre_remove() {
- /etc/rc.d/mongodb stop
- userdel mongodb
-}
diff --git a/community-staging/mongodb/mongodb.rc b/community-staging/mongodb/mongodb.rc
deleted file mode 100755
index b808a2fb0..000000000
--- a/community-staging/mongodb/mongodb.rc
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-# vim: syntax=sh
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof /usr/bin/mongod`
-case "$1" in
- start)
- stat_busy "Starting mongodb"
- [ -z "$PID" ] && /bin/su mongodb -s /bin/bash -c "/usr/bin/mongod --config /etc/mongodb.conf &" > /var/log/mongod 2>&1
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon mongodb
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping mongodb"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon mongodb
- while [ ! -z "$(pidof /usr/bin/mongod)" ]; do
- sleep 1;
- done
- stat_done
- fi
- ;;
- restart)
- $0 stop
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community-staging/ogre/PKGBUILD b/community-staging/ogre/PKGBUILD
deleted file mode 100644
index 28e1c7066..000000000
--- a/community-staging/ogre/PKGBUILD
+++ /dev/null
@@ -1,90 +0,0 @@
-# $Id: PKGBUILD 47685 2011-05-24 19:41:50Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-pkgbase=ogre
-pkgname=('ogre' 'ogre-docs')
-pkgver=1.7.3
-pkgrel=2
-pkgdesc="A scene-oriented, flexible 3D engine written in C++"
-arch=('i686' 'x86_64')
-url='http://www.ogre3d.org'
-license=('custom:MIT')
-depends=('boost-libs' 'freeimage' 'freetype2' 'libxaw' 'libxrandr'
- 'nvidia-cg-toolkit' 'mesa' 'zziplib' 'ois')
-makedepends=('boost' 'cmake' 'doxygen' 'graphviz' 'ttf-dejavu')
-optdepends=('cppunit: unit testing'
- 'intel-tbb: better threading support'
- 'poco: portability'
- 'boost: for developing using ogre')
-install=ogre.install
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}_src_v${pkgver//./-}.tar.bz2")
-md5sums=('7a85d3b8f0d64debd186e48ebe9556aa')
-
-build() {
- cd ${srcdir}/${pkgname}_src_v${pkgver//./-}
-
- # get a clean build dir
- [[ -d build ]] && rm -rf build
- mkdir build
- cd build
-
- # generate CMake Makefile
- cmake .. \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DOGRE_INSTALL_PLUGINS_HEADERS=TRUE \
- -DOGRE_INSTALL_SAMPLES=TRUE \
- -DOGRE_INSTALL_DOCS=TRUE \
- -DOGRE_INSTALL_MEDIA=TRUE \
- -DOGRE_INSTALL_SAMPLES_SOURCE=TRUE \
- -DCMAKE_BUILD_TYPE=Release # set =Debug for debugging version
-
- # compile
- make
-
- # generate docs
- if [[ $(which dot) && $(which doxygen) ]]; then
- make doc
- fi
-}
-
-package_ogre() {
- optdepends=('ogre-docs: documentation')
-
- cd ${srcdir}/${pkgname}_src_v${pkgver//./-}/build
-
- # install the bugger
- make DESTDIR=${pkgdir} install
-
- # fix up samples
- install -dm775 -o root -g users ${pkgdir}/opt/OGRE/samples/
- mv ${pkgdir}/usr/share/OGRE/*.cfg ${pkgdir}/opt/OGRE/samples/
- mv ${pkgdir}/usr/bin/SampleBrowser ${pkgdir}/opt/OGRE/samples/
-
- # make sample launcher
- echo "#!/bin/bash" > ${pkgdir}/usr/bin/OgreSampleBrowser
- echo "cd /opt/OGRE/samples && ./SampleBrowser" >> ${pkgdir}/usr/bin/OgreSampleBrowser
- chmod +x ${pkgdir}/usr/bin/OgreSampleBrowser
-
- # install license
- install -Dm644 ../Docs/License.html ${pkgdir}/usr/share/licenses/${pkgname}/license.html
-
- # move docs out of this package
- mv ${pkgdir}/usr/share/OGRE/docs ${srcdir}/docs
-}
-
-package_ogre-docs() {
- pkgdesc="Documentation for ogre"
- depends=()
-
- cd ${srcdir}/${pkgbase}_src_v${pkgver//./-}/build
-
- # move docs into this package
- install -dm755 ${pkgdir}/usr/share/doc
- mv ${srcdir}/docs ${pkgdir}/usr/share/doc/OGRE/
-
- # symlink for docs
- install -dm755 ${pkgdir}/usr/share/OGRE/
- cd ${pkgdir}/usr/share
- ln -s doc/OGRE/ OGRE/docs
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-staging/ogre/ogre.install b/community-staging/ogre/ogre.install
deleted file mode 100644
index 5db668d9e..000000000
--- a/community-staging/ogre/ogre.install
+++ /dev/null
@@ -1,4 +0,0 @@
-post_install() {
- echo "To view the OGRE samples just run OgreSampleBrowser or launch"
- echo "it directly in /opt/OGRE/samples/"
-}
diff --git a/community-staging/pingus/ChangeLog b/community-staging/pingus/ChangeLog
deleted file mode 100644
index c182f92eb..000000000
--- a/community-staging/pingus/ChangeLog
+++ /dev/null
@@ -1,21 +0,0 @@
-2010-03-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-
- * pingus 0.7.2-8
- * Rebuilt against boost 1.41.0
-
-2010-02-23 Eric Belanger <eric@archlinux.org>
-
- * pingus 0.7.2-7
- * Rebuilt against boost 1.42.0
-
-2010-01-20 Eric Belanger <eric@archlinux.org>
-
- * pingus 0.7.2-6
- * Rebuilt against libpng 1.4/libjpeg 8
-
-2009-07-13 Eric Belanger <eric@archlinux.org>
-
- * pingus 0.7.2-2
- * Rebuilt against boost 1.39
- * Added gcc 4.4 patch
- * Added ChangeLog
diff --git a/community-staging/pingus/PKGBUILD b/community-staging/pingus/PKGBUILD
deleted file mode 100644
index bba3aea9e..000000000
--- a/community-staging/pingus/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 47672 2011-05-24 18:43:41Z tdziedzic $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-
-pkgname=pingus
-pkgver=0.7.3
-pkgrel=4
-pkgdesc="A Lemmings clone, i.e. a level-based puzzle game."
-arch=('i686' 'x86_64')
-url="http://pingus.seul.org"
-license=('GPL')
-depends=('gcc-libs' 'sdl_image' 'sdl_mixer' 'boost-libs>=1.46')
-makedepends=('scons' 'boost>=1.46')
-source=(http://pingus.seul.org/files/${pkgname}-${pkgver}.tar.bz2 pingus.desktop)
-md5sums=('7d1a0b0d658cc46dd09d6274f39acc7d'
- 'b94efaa6e2de959de7fdb50cfc7dbdea')
-sha1sums=('ca7fe5cea65fb3392d1e81056a879831925502f2'
- 'f35649f3b0b2bfcb01ce75085cf719dcaa609a54')
-
-build() {
- cd ${pkgname}-${pkgver}
-
- scons prefix=/usr
-}
-
-package() {
- cd ${pkgname}-${pkgver}
-
- ./install.sh "${pkgdir}/usr"
-
- install -D -m644 "${srcdir}/pingus.desktop" "${pkgdir}/usr/share/applications/pingus.desktop"
-}
diff --git a/community-staging/pingus/pingus.desktop b/community-staging/pingus/pingus.desktop
deleted file mode 100644
index 158eaa820..000000000
--- a/community-staging/pingus/pingus.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Pingus
-Comment=A free Lemmings[tm] clone
-Exec=pingus
-Terminal=false
-Type=Application
-Categories=Application;Game;LogicGame
-Icon=/usr/share/pingus/data/images/core/editor/actions.png
diff --git a/community-staging/pokerth/PKGBUILD b/community-staging/pokerth/PKGBUILD
deleted file mode 100644
index 040111905..000000000
--- a/community-staging/pokerth/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 47635 2011-05-24 14:23:55Z tdziedzic $
-# Maintainer: Mateusz Herych <heniekk@gmail.com>
-# Contributor: Vasco Costa <vasco.costa@meiodigital.com>
-
-pkgname=pokerth
-_realname=PokerTH
-pkgver=0.8.3
-pkgrel=4
-pkgdesc="Poker game written in C++/QT4"
-arch=('i686' 'x86_64')
-url="http://www.pokerth.net/"
-license=('GPL' 'custom')
-depends=('curl' 'boost-libs>=1.43.0' 'gsasl' 'gnutls' 'qt' 'sdl_mixer')
-makedepends=('boost')
-source=(http://downloads.sourceforge.net/sourceforge/pokerth/$_realname-$pkgver-src.tar.bz2)
-md5sums=('adbe56ad5f547eb255dad91de564bf1c')
-
-build() {
- cd $_realname-$pkgver-src
-
- sed -i 's/QMAKE_CXXFLAGS += -std=gnu++0x/QMAKE_CXXFLAGS += -std=gnu++0x -DBOOST_FILESYSTEM_VERSION=2/' *.pro
-
-
- # fix g++: error: unrecognized option '-no_dead_strip_inits_and_terms'
- sed \
- -e 's/QMAKE_LFLAGS += -no_dead_strip_inits_and_terms//' \
- -i zlib_compress.pro pokerth_game.pro pokerth_server.pro
-
- qmake $pkgname.pro
-
- make
-}
-
-package() {
- cd $_realname-$pkgver-src
-
- make INSTALL_ROOT="$pkgdir" install
-
- install -D $pkgname "$pkgdir/usr/bin/$pkgname"
- install -D -m644 docs/pokerth.1 "$pkgdir/usr/share/man/man1/pokerth.1"
-
- install -D -m644 data/data-copyright.txt "$pkgdir/usr/share/licenses/pokerth/data-copyright.txt"
- rm -f "$pkgdir/usr/share/pokerth/data/data-copyright.txt"
-}
diff --git a/community-staging/qbittorrent/PKGBUILD b/community-staging/qbittorrent/PKGBUILD
deleted file mode 100644
index ae549bae2..000000000
--- a/community-staging/qbittorrent/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
-
-pkgname=qbittorrent
-pkgver=2.7.3
-pkgrel=2
-pkgdesc="A bittorrent client written in C++ / Qt4 using the good libtorrent library"
-arch=('i686' 'x86_64')
-url="http://www.qbittorrent.org/"
-license=('GPL')
-depends=('qt' 'libtorrent-rasterbar' 'xdg-utils')
-makedepends=('boost' 'geoip')
-optdepends=('python2: needed for search'
- 'geoip: improves peer country resolution')
-install='qbittorrent.install'
-source=("http://downloads.sourceforge.net/sourceforge/qbittorrent/${pkgname}-${pkgver}.tar.gz"
- 'python2.patch')
-md5sums=('ff1b294133f8dadc781c8f0df50d248d'
- 'db0d79fee8ce3470ad3741d36b02a94c')
-
-build() {
- cd ${pkgname}-${pkgver}
-
- sed -i \
- -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
- -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
- $(find ./ -name '*.py')
-
- patch -Np1 -i ${srcdir}/python2.patch
-
- ./configure \
- --prefix=/usr
-
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}
-
- make INSTALL_ROOT=${pkgdir} install
-}
diff --git a/community-staging/qbittorrent/python2.patch b/community-staging/qbittorrent/python2.patch
deleted file mode 100644
index 24ab742db..000000000
--- a/community-staging/qbittorrent/python2.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Nur qbittorrent-2.4.8.orig/src/searchengine/searchengine.cpp qbittorrent-2.4.8/src/searchengine.cpp
---- qbittorrent-2.4.8.orig/src/searchengine/searchengine.cpp 2010-10-01 13:52:53.000000000 -0700
-+++ qbittorrent-2.4.8/src/searchengine/searchengine.cpp 2010-10-25 01:20:20.046700620 -0700
-@@ -354,7 +354,7 @@
- //on change le texte du label courrant
- currentSearchTab->getCurrentLabel()->setText(tr("Results")+" <i>(0)</i>:");
- // Launch search
-- searchProcess->start("python", params, QIODevice::ReadOnly);
-+ searchProcess->start("python2", params, QIODevice::ReadOnly);
- searchTimeout->start(180000); // 3min
- }
-
-@@ -421,7 +421,7 @@
- params << engine_url;
- params << torrent_url;
- // Launch search
-- downloadProcess->start("python", params, QIODevice::ReadOnly);
-+ downloadProcess->start("python2", params, QIODevice::ReadOnly);
- }
- }
-
-diff -Nur qbittorrent-2.4.8.orig/src/searchengine/supportedengines.h qbittorrent-2.4.8/src/supportedengines.h
---- qbittorrent-2.4.8.orig/src/searchengine/supportedengines.h 2010-10-24 01:32:39.000000000 -0700
-+++ qbittorrent-2.4.8/src/searchengine/supportedengines.h 2010-10-25 01:18:42.230032834 -0700
-@@ -144,7 +144,7 @@
- QStringList params;
- params << misc::searchEngineLocation()+QDir::separator()+"nova2.py";
- params << "--capabilities";
-- nova.start("python", params, QIODevice::ReadOnly);
-+ nova.start("python2", params, QIODevice::ReadOnly);
- nova.waitForStarted();
- nova.waitForFinished();
- QString capabilities = QString(nova.readAll());
diff --git a/community-staging/qbittorrent/qbittorrent.install b/community-staging/qbittorrent/qbittorrent.install
deleted file mode 100644
index e70c054ec..000000000
--- a/community-staging/qbittorrent/qbittorrent.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/community-staging/schroot/PKGBUILD b/community-staging/schroot/PKGBUILD
deleted file mode 100644
index 949227809..000000000
--- a/community-staging/schroot/PKGBUILD
+++ /dev/null
@@ -1,71 +0,0 @@
-# $Id: PKGBUILD 47626 2011-05-24 13:55:50Z tdziedzic $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de>
-
-pkgname=schroot
-pkgver=1.4.22
-pkgrel=1
-pkgdesc="Allows users to execute shell commands under different root filesystems. \
- (Successor to dchroot)."
-url="http://packages.qa.debian.org/s/schroot.html"
-license=('GPL3')
-depends=('pam' 'lockdev' 'boost' 'e2fsprogs')
-optdepends=('btrfs-progs-unstable' 'lvm2')
-arch=('i686' 'x86_64')
-conflicts=('dchroot')
-replaces=('dchroot')
-provides=('schroot' 'sbuild' 'dchroot')
-backup=('etc/schroot/schroot.conf'
- 'etc/schroot/script-arch32'
- 'etc/schroot/mount-arch32'
- 'etc/schroot/copyfiles-arch32')
-options=(!libtool)
-source=("http://ftp.debian.org/debian/pool/main/s/$pkgname/${pkgname}_${pkgver}.orig.tar.bz2"
- 'script-arch32'
- 'copyfiles-arch32'
- 'mount-arch32')
-md5sums=('0dde4c76b1623cc277d92f8dc06109d1'
- '8e86445e188129232e1782d978dfc967'
- 'd4558d5691fbdaa46ce669e8f327133b'
- 'f0d5d5b5e34a860f6f90b5628c680f46')
-
-build() {
- cd ${pkgname}-${pkgver}
-
- export LDFLAGS="${LDFLAGS//-Wl,--as-needed}"
-
- ./configure --prefix=/usr --libexecdir=/usr/lib --sysconfdir=/etc --localstatedir=/var \
- --enable-dchroot --enable-lvm-snapshot --enable-btrfs-snapshot \
- BTRFS=/sbin/btrfs \
- BTRFSCTL=/sbin/btrfsctl \
- LVCREATE=/sbin/lvcreate \
- LVREMOVE=/sbin/lvremove
-# --enable-csbuild
-
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}
-
- make DESTDIR=$pkgdir install
-
- install -m 644 ${srcdir}/script-arch32 ${pkgdir}/etc/schroot
- install -m 644 ${srcdir}/mount-arch32 ${pkgdir}/etc/schroot
- install -m 644 ${srcdir}/copyfiles-arch32 ${pkgdir}/etc/schroot
- cat >> $pkgdir/etc/schroot/schroot.conf << EOF
-
-[Arch32]
-description=Arch32
-type=directory
-directory=/opt/arch32
-priority=1
-#users=username
-groups=users
-root-groups=root
-script-config=script-arch32
-personality=linux32
-aliases=32,default
-
-EOF
-}
diff --git a/community-staging/schroot/copyfiles-arch32 b/community-staging/schroot/copyfiles-arch32
deleted file mode 100644
index 7dd32b7d9..000000000
--- a/community-staging/schroot/copyfiles-arch32
+++ /dev/null
@@ -1,8 +0,0 @@
-/etc/group
-/etc/hosts
-/etc/passwd
-/etc/resolv.conf
-/etc/rc.conf
-/etc/localtime
-/etc/locale.gen
-/etc/profile.d/locale.sh \ No newline at end of file
diff --git a/community-staging/schroot/mount-arch32 b/community-staging/schroot/mount-arch32
deleted file mode 100644
index 075d6e451..000000000
--- a/community-staging/schroot/mount-arch32
+++ /dev/null
@@ -1,12 +0,0 @@
-# mount.defaults: static file system information for chroots.
-# Note that the mount point will be prefixed by the chroot path
-# (CHROOT_PATH)
-#
-# <file system> <mount point> <type> <options> <dump> <pass>
-proc /proc proc defaults 0 0
-/dev /dev none rw,bind 0 0
-#/dev/pts /dev/pts none rw,bind 0 0
-tmpfs /dev/shm tmpfs defaults 0 0
-/sys /sys none rw,bind 0 0
-/tmp /tmp none rw,bind 0 0
-/home /home none rw,bind 0 0
diff --git a/community-staging/schroot/script-arch32 b/community-staging/schroot/script-arch32
deleted file mode 100644
index fb87b4822..000000000
--- a/community-staging/schroot/script-arch32
+++ /dev/null
@@ -1,15 +0,0 @@
-# Default settings for chroot setup and exec scripts.
-# See schroot-script-config(5) for further details.
-
-# Filesystems to mount inside the chroot.
-FSTAB="/etc/schroot/mount-arch32"
-
-# Files to copy from the host system into the chroot.
-COPYFILES="/etc/schroot/copyfiles-arch32"
-
-# Is sbuild installed?
-if [ -x /usr/bin/sbuild ]; then
- SBUILD="true"
-else
- SBUILD="false"
-fi
diff --git a/community-staging/smc/PKGBUILD b/community-staging/smc/PKGBUILD
deleted file mode 100644
index a3fe89406..000000000
--- a/community-staging/smc/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 47652 2011-05-24 16:35:46Z schuay $
-# Maintainer:
-# Contributor: Juergen Hoetzel <juergen@archlinux.org>
-# Contributor: Kritoke <typeolinux@yahoo.com>
-
-pkgname=smc
-pkgver=1.9
-pkgrel=11
-pkgdesc="Secret Maryo Chronicles"
-arch=('i686' 'x86_64')
-url="http://www.secretmaryo.org/"
-license=('GPL3')
-depends=('sdl_image' 'sdl_ttf' 'sdl_mixer' 'cegui' 'boost-libs' 'smc-data')
-makedepends=('autoconf' 'automake' 'boost')
-source=(http://downloads.sourceforge.net/smclone/$pkgname-$pkgver.tar.bz2
- smc-for-cegui-v0-7.diff
- smc.desktop
- smc.png)
-md5sums=('75ab7826303c49aec25b052a8b90287f'
- '51dfea21b741ad19df14e738df52f1cf'
- '80fe208132ff41dd7677a53ee429ecdb'
- 'efca7580e28748625eb676c9d24ee122')
-
-build() {
- cd $srcdir/$pkgname-$pkgver
-
- # to remove when smc will be compatible with cegui-0.7.x
- patch -Np1 -i ${srcdir}/smc-for-cegui-v0-7.diff
- # fix for boost-1.46
- export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2"
-
- ./autogen.sh
- ./configure --prefix=/usr
-}
-
-package() {
- cd $srcdir/$pkgname-$pkgver
-
- make install DESTDIR=$pkgdir
- # install some freedesktop.org compatibility
- install -Dm644 $srcdir/$pkgname.desktop $pkgdir/usr/share/applications/$pkgname.desktop
- install -Dm644 $srcdir/$pkgname.png $pkgdir/usr/share/pixmaps/$pkgname.png
-
- rm -rf $pkgdir/usr/share/smc/
-}
diff --git a/community-staging/smc/smc-for-cegui-v0-7.diff b/community-staging/smc/smc-for-cegui-v0-7.diff
deleted file mode 100644
index a99cbce6c..000000000
--- a/community-staging/smc/smc-for-cegui-v0-7.diff
+++ /dev/null
@@ -1,437 +0,0 @@
-diff -ur smc-1.9/configure.ac smc-1.9-b/configure.ac
---- smc-1.9/configure.ac 2009-08-17 15:59:00.000000000 +0200
-+++ smc-1.9-b/configure.ac 2011-01-19 00:43:37.809884881 +0100
-@@ -53,7 +53,7 @@
- AC_MSG_ERROR([SDL_ttf library not found]))
-
- # Check for the CEGUI library
--PKG_CHECK_MODULES(CEGUI, CEGUI-OPENGL >= 0.5.0)
-+PKG_CHECK_MODULES(CEGUI, CEGUI-OPENGL >= 0.7.0)
- CPPFLAGS="$CPPFLAGS $CEGUI_CFLAGS"
- LIBS="$LIBS $CEGUI_LIBS"
-
-diff -ur smc-1.9/src/core/editor.cpp smc-1.9-b/src/core/editor.cpp
---- smc-1.9/src/core/editor.cpp 2009-08-13 17:11:42.000000000 +0200
-+++ smc-1.9-b/src/core/editor.cpp 2011-01-19 00:44:46.734328121 +0100
-@@ -118,16 +118,10 @@
- return tmp;
- }
-
--void cEditor_Item_Object :: draw( const CEGUI::Vector3 &position, float alpha, const CEGUI::Rect &clipper ) const
-+void cEditor_Item_Object :: draw( CEGUI::GeometryBuffer &buffer, const CEGUI::Rect &targetRect, float alpha, const CEGUI::Rect *clipper ) const
- {
- // draw text
-- list_text->draw( position, alpha, clipper );
--}
--
--void cEditor_Item_Object :: draw( CEGUI::RenderCache &cache, const CEGUI::Rect &targetRect, float zBase, float alpha, const CEGUI::Rect *clipper ) const
--{
-- // draw text
-- list_text->draw( cache, targetRect, zBase, alpha, clipper );
-+ list_text->draw( buffer, targetRect, alpha, clipper );
- }
-
- void cEditor_Item_Object :: Draw_Image( void )
-@@ -533,12 +527,12 @@
- if( editor_window->getXPosition().asRelative( 1 ) >= 0 )
- {
- // Listbox dimension
-- float list_posy = listbox_items->getUnclippedPixelRect().d_top * global_downscaley;
-- float list_height = listbox_items->getUnclippedPixelRect().getHeight() * global_downscaley;
-+ float list_posy = listbox_items->getUnclippedOuterRect().d_top * global_downscaley;
-+ float list_height = listbox_items->getUnclippedOuterRect().getHeight() * global_downscaley;
- // Vertical ScrollBar Position
- float scroll_pos = listbox_items->getVertScrollbar()->getScrollPosition() * global_downscaley;
- // font height
-- float font_height = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" )->getFontHeight() * global_downscaley;
-+ float font_height = CEGUI::FontManager::getSingleton().get( "bluebold_medium" ).getFontHeight() * global_downscaley;
-
- // draw items
- for( unsigned int i = 0; i < listbox_items->getItemCount(); i++ )
-diff -ur smc-1.9/src/core/editor.h smc-1.9-b/src/core/editor.h
---- smc-1.9/src/core/editor.h 2009-02-18 05:21:30.000000000 +0100
-+++ smc-1.9-b/src/core/editor.h 2011-01-19 00:43:37.809884881 +0100
-@@ -62,8 +62,7 @@
- */
- virtual CEGUI::Size getPixelSize( void ) const;
- // draw
-- void draw( const CEGUI::Vector3 &position, float alpha, const CEGUI::Rect &clipper ) const;
-- void draw( CEGUI::RenderCache &cache, const CEGUI::Rect &targetRect, float zBase, float alpha, const CEGUI::Rect *clipper) const;
-+ void draw(CEGUI::GeometryBuffer& buffer, const CEGUI::Rect& targetRect, float alpha, const CEGUI::Rect* clipper) const;
- // draw image
- void Draw_Image( void );
-
-diff -ur smc-1.9/src/core/game_core.cpp smc-1.9-b/src/core/game_core.cpp
---- smc-1.9/src/core/game_core.cpp 2009-08-16 18:44:42.000000000 +0200
-+++ smc-1.9-b/src/core/game_core.cpp 2011-01-19 00:59:02.668958883 +0100
-@@ -265,7 +265,7 @@
-
-
- // align text
-- CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" );
-+ CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" );
- // fixme : Can't handle multiple lines of text
- float text_width = font->getTextExtent( text ) * global_downscalex;
-
-@@ -1182,7 +1182,7 @@
- text_default->setText( gui_text );
-
- // align text
-- CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" );
-+ CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" );
- float text_width = font->getTextExtent( gui_text ) * global_downscalex;
-
- text_default->setWidth( CEGUI::UDim( 0, ( text_width + 15 ) * global_upscalex ) );
-@@ -1190,7 +1190,7 @@
- text_default->moveToFront();
-
- // set window height
-- text_default->setHeight( CEGUI::UDim( 0, font->getFontHeight() * font->getFormattedLineCount( gui_text, text_default->getUnclippedInnerRect(), CEGUI::LeftAligned ) + ( 12 * global_upscaley ) ) );
-+ text_default->setHeight( CEGUI::UDim( 0, font->getFontHeight() + ( 12 * global_upscaley ) ) );
-
- while( draw )
- {
-diff -ur smc-1.9/src/core/main.cpp smc-1.9-b/src/core/main.cpp
---- smc-1.9/src/core/main.cpp 2009-05-12 10:36:04.000000000 +0200
-+++ smc-1.9-b/src/core/main.cpp 2011-01-19 00:43:37.809884881 +0100
-@@ -444,13 +444,15 @@
-
- if( pGuiSystem )
- {
-- delete pGuiSystem;
-+ CEGUI::ResourceProvider* rp = pGuiSystem->getResourceProvider();
-+ pGuiSystem->destroy();
- pGuiSystem = NULL;
-+ delete rp;
- }
-
- if( pGuiRenderer )
- {
-- delete pGuiRenderer;
-+ pGuiRenderer->destroy( *pGuiRenderer );
- pGuiRenderer = NULL;
- }
-
-@@ -507,7 +509,7 @@
- }
- case SDL_VIDEORESIZE:
- {
-- pGuiRenderer->setDisplaySize( CEGUI::Size( static_cast<float>(ev->resize.w), static_cast<float>(ev->resize.h) ) );
-+ pGuiSystem->notifyDisplaySizeChanged( CEGUI::Size( static_cast<float>(ev->resize.w), static_cast<float>(ev->resize.h) ) );
- break;
- }
- case SDL_KEYDOWN:
-diff -ur smc-1.9/src/gui/hud.cpp smc-1.9-b/src/gui/hud.cpp
---- smc-1.9/src/gui/hud.cpp 2009-05-01 15:00:16.000000000 +0200
-+++ smc-1.9-b/src/gui/hud.cpp 2011-01-19 00:43:37.816550365 +0100
-@@ -946,7 +946,7 @@
- m_text_debug_text->setVisible( 1 );
-
- // update position
-- CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" );
-+ CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" );
- float text_width = font->getTextExtent( gui_text ) * global_downscalex;
-
- if( text_width > 800.0f )
-diff -ur smc-1.9/src/input/mouse.cpp smc-1.9-b/src/input/mouse.cpp
---- smc-1.9/src/input/mouse.cpp 2009-04-24 21:16:58.000000000 +0200
-+++ smc-1.9-b/src/input/mouse.cpp 2011-01-19 00:43:37.813217623 +0100
-@@ -432,17 +432,12 @@
-
- void cMouseCursor :: Render( void ) const
- {
-- if( !m_active )
-- {
-+ CEGUI::MouseCursor *mouse = CEGUI::MouseCursor::getSingletonPtr();
-+
-+ if ( m_active == mouse->isVisible() )
- return;
-- }
-
-- // Render CEGUI Mouse
-- pGuiRenderer->setQueueingEnabled( 0 );
-- CEGUI::MouseCursor *mouse = CEGUI::MouseCursor::getSingletonPtr();
-- mouse->setVisible( 1 );
-- mouse->draw();
-- mouse->setVisible( 0 );
-+ mouse->setVisible( m_active );
- }
-
- void cMouseCursor :: Update_Position( void )
-diff -ur smc-1.9/src/level/level_settings.cpp smc-1.9-b/src/level/level_settings.cpp
---- smc-1.9/src/level/level_settings.cpp 2009-08-07 03:04:28.000000000 +0200
-+++ smc-1.9-b/src/level/level_settings.cpp 2011-01-19 01:06:59.064259070 +0100
-@@ -163,8 +163,8 @@
- editbox->setText( int_to_string( bg_color_2.blue ).c_str() );
- // preview window
- CEGUI::Window *window_background_preview = CEGUI::WindowManager::getSingleton().getWindow( "window_background_preview" );
-- background_preview->Set_Pos_X( window_background_preview->getUnclippedPixelRect().d_left * global_downscalex, 1 );
-- background_preview->Set_Pos_Y( window_background_preview->getUnclippedPixelRect().d_top * global_downscaley, 1 );
-+ background_preview->Set_Pos_X( window_background_preview->getUnclippedOuterRect().d_left * global_downscalex, 1 );
-+ background_preview->Set_Pos_Y( window_background_preview->getUnclippedOuterRect().d_top * global_downscaley, 1 );
-
- Update_BG_Colors( CEGUI::EventArgs() );
-
-@@ -555,8 +555,8 @@
-
- // set default rect
- CEGUI::Window *window_background_preview = CEGUI::WindowManager::getSingleton().getWindow( "window_background_preview" );
-- background_preview->m_rect.m_w = window_background_preview->getUnclippedPixelRect().getWidth() * global_downscalex;
-- background_preview->m_rect.m_h = window_background_preview->getUnclippedPixelRect().getHeight() * global_downscaley;
-+ background_preview->m_rect.m_w = window_background_preview->getUnclippedOuterRect().getWidth() * global_downscalex;
-+ background_preview->m_rect.m_h = window_background_preview->getUnclippedOuterRect().getHeight() * global_downscaley;
-
- if( !File_Exists( filename ) )
- {
-diff -ur smc-1.9/src/objects/sprite.cpp smc-1.9-b/src/objects/sprite.cpp
---- smc-1.9/src/objects/sprite.cpp 2009-04-18 09:55:06.000000000 +0200
-+++ smc-1.9-b/src/objects/sprite.cpp 2011-01-19 00:43:37.813217623 +0100
-@@ -1663,7 +1663,7 @@
- window_name->setText( name );
- window_name->setTooltipText( tooltip );
- // get text width
-- CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" );
-+ CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" );
- float text_width = 12 + font->getTextExtent( name ) * global_downscalex;
- // all names should have the same width
- if( text_width > m_editor_window_name_width )
-diff -ur smc-1.9/src/video/video.cpp smc-1.9-b/src/video/video.cpp
---- smc-1.9/src/video/video.cpp 2009-07-04 11:46:56.000000000 +0200
-+++ smc-1.9-b/src/video/video.cpp 2011-01-19 01:22:45.338524592 +0100
-@@ -103,15 +103,15 @@
-
- /* *** *** *** *** *** *** *** CEGUI renderer fake class *** *** *** *** *** *** *** *** *** *** */
-
--cFake_Renderer :: cFake_Renderer( void )
--{
-- d_identifierString = "Fake Renderer";
--}
-+//cFake_Renderer :: cFake_Renderer( void )
-+//{
-+// d_identifierString = "Fake Renderer";
-+//}
-
--cFake_Renderer :: ~cFake_Renderer( void )
--{
-+//cFake_Renderer :: ~cFake_Renderer( void )
-+//{
-
--}
-+//}
-
- /* *** *** *** *** *** *** *** Video class *** *** *** *** *** *** *** *** *** *** */
-
-@@ -158,7 +158,7 @@
- std::string log_dump_dir = "/dev/null";
- #endif
- // create fake system and renderer
-- pGuiSystem = new CEGUI::System( new cFake_Renderer(), rp, NULL, NULL, "", log_dump_dir );
-+ pGuiSystem = &CEGUI::System::create( *new cFake_Renderer(), rp, NULL, NULL, NULL, "", log_dump_dir );
- }
-
- void cVideo :: Delete_CEGUI_Fake( void ) const
-@@ -166,7 +166,7 @@
- CEGUI::ResourceProvider *rp = pGuiSystem->getResourceProvider();
- CEGUI::Renderer *renderer = pGuiSystem->getRenderer();
-
-- delete pGuiSystem;
-+ pGuiSystem->destroy();
- pGuiSystem = NULL;
- delete renderer;
- delete rp;
-@@ -177,7 +177,7 @@
- // create renderer
- try
- {
-- pGuiRenderer = new CEGUI::OpenGLRenderer( 0, screen->w, screen->h );
-+ pGuiRenderer = &CEGUI::OpenGLRenderer::create( CEGUI::Size( screen->w, screen->h ) );
- }
- // catch CEGUI Exceptions
- catch( CEGUI::Exception &ex )
-@@ -186,10 +186,10 @@
- exit( EXIT_FAILURE );
- }
-
-- /* create Resource Provider
-- * no need to destroy it later since it is handled by the CEGUI renderer
-- */
-- CEGUI::DefaultResourceProvider *rp = static_cast<CEGUI::DefaultResourceProvider *>(pGuiRenderer->createResourceProvider());
-+ pGuiRenderer->enableExtraStateSettings(true);
-+
-+ // create Resource Provider
-+ CEGUI::DefaultResourceProvider *rp = new CEGUI::DefaultResourceProvider;
-
- // set Resource Provider directories
- rp->setResourceGroupDirectory( "schemes", DATA_DIR "/" GUI_SCHEME_DIR "/" );
-@@ -215,7 +215,7 @@
- // create system
- try
- {
-- pGuiSystem = new CEGUI::System( pGuiRenderer, rp, NULL, NULL, "", pResource_Manager->user_data_dir + "cegui.log" );
-+ pGuiSystem = &CEGUI::System::create( *pGuiRenderer, rp, NULL, NULL, NULL, "", pResource_Manager->user_data_dir + "cegui.log" );
- }
- // catch CEGUI Exceptions
- catch( CEGUI::Exception &ex )
-@@ -242,7 +242,7 @@
- // load the scheme file, which auto-loads the imageset
- try
- {
-- CEGUI::SchemeManager::getSingleton().loadScheme( "TaharezLook.scheme" );
-+ CEGUI::SchemeManager::getSingleton().create( "TaharezLook.scheme" );
- }
- // catch CEGUI Exceptions
- catch( CEGUI::Exception &ex )
-@@ -254,9 +254,7 @@
- // default mouse cursor
- pGuiSystem->setDefaultMouseCursor( "TaharezLook", "MouseArrow" );
- // force new mouse image
-- CEGUI::MouseCursor::getSingleton().setImage( &CEGUI::ImagesetManager::getSingleton().getImageset( "TaharezLook" )->getImage( "MouseArrow" ) );
-- // hide CEGUI mouse always because we render it manually
-- CEGUI::MouseCursor::getSingleton().hide();
-+ CEGUI::MouseCursor::getSingleton().setImage( &CEGUI::ImagesetManager::getSingleton().get( "TaharezLook" ).getImage( "MouseArrow" ) );
- // default tooltip
- pGuiSystem->setDefaultTooltip( "TaharezLook/Tooltip" );
- // create default root window
-@@ -553,7 +551,7 @@
- pFont->Restore_Textures();
-
- // send new size to CEGUI
-- pGuiRenderer->setDisplaySize( CEGUI::Size( static_cast<float>(screen_w), static_cast<float>(screen_h) ) );
-+ pGuiSystem->notifyDisplaySizeChanged( CEGUI::Size( static_cast<float>(screen_w), static_cast<float>(screen_h) ) );
-
- // check if CEGUI is initialized
- bool cegui_initialized = pGuiSystem->getGUISheet() != NULL;
-diff -ur smc-1.9/src/video/video.h smc-1.9-b/src/video/video.h
---- smc-1.9/src/video/video.h 2009-07-04 10:49:50.000000000 +0200
-+++ smc-1.9-b/src/video/video.h 2011-01-19 01:16:42.791283379 +0100
-@@ -23,7 +23,7 @@
- #include "SDL_opengl.h"
- // CEGUI
- #include "CEGUI.h"
--#include "RendererModules/OpenGLGUIRenderer/openglrenderer.h"
-+#include <RendererModules/OpenGL/CEGUIOpenGLRenderer.h>
-
- namespace SMC
- {
-@@ -129,31 +129,100 @@
- EFFECT_IN_AMOUNT
- };
-
--/* *** *** *** *** *** *** *** CEGUI renderer fake class *** *** *** *** *** *** *** *** *** *** */
-+/* *** *** *** *** *** *** *** CEGUI renderer fake classes *** *** *** *** *** *** *** *** *** *** */
-+// CEGUI 0.7.x requires more 'fake' classes than the 0.6.x version did...
-+class cFake_GeometryBuffer : public CEGUI::GeometryBuffer
-+{
-+ void draw() const {}
-+ void setTranslation(const CEGUI::Vector3&) {}
-+ void setRotation(const CEGUI::Vector3&) {}
-+ void setPivot(const CEGUI::Vector3&) {}
-+ void setClippingRegion(const CEGUI::Rect&) {}
-+ void appendVertex(const CEGUI::Vertex&) {}
-+ void appendGeometry(const CEGUI::Vertex* const, CEGUI::uint) {}
-+ void setActiveTexture(CEGUI::Texture*) {}
-+ void reset() {}
-+ CEGUI::Texture* getActiveTexture() const { return 0; }
-+ CEGUI::uint getVertexCount() const { return 0; }
-+ CEGUI::uint getBatchCount() const { return 0; }
-+ void setRenderEffect(CEGUI::RenderEffect*) {}
-+ CEGUI::RenderEffect* getRenderEffect() { return 0; }
-+};
-
--class cFake_Renderer : public CEGUI::Renderer
-+class cFake_Texture : public CEGUI::Texture
-+{
-+public:
-+ cFake_Texture() :
-+ m_size(1, 1),
-+ m_scaling(1, 1) {}
-+
-+ const CEGUI::Size& getSize() const { return m_size; }
-+ const CEGUI::Size& getOriginalDataSize() const { return m_size; }
-+ const CEGUI::Vector2& getTexelScaling() const { return m_scaling; }
-+ void loadFromFile(const CEGUI::String&, const CEGUI::String&) {}
-+ void loadFromMemory(const void*, const CEGUI::Size&, CEGUI::Texture::PixelFormat) {}
-+ void saveToMemory(void*) {}
-+
-+private:
-+ CEGUI::Size m_size;
-+ CEGUI::Vector2 m_scaling;
-+};
-+
-+class cFake_RenderTarget : public CEGUI::RenderTarget
- {
- public:
-- cFake_Renderer( void );
-- virtual ~cFake_Renderer( void );
-+ cFake_RenderTarget() : m_area(0, 0, 0, 0) {}
-+ void draw(const CEGUI::GeometryBuffer&) {}
-+ void draw(const CEGUI::RenderQueue&) {}
-+ void setArea(const CEGUI::Rect&) {}
-+ const CEGUI::Rect& getArea() const { return m_area; }
-+ bool isImageryCache() const { return false; }
-+ void activate() {}
-+ void deactivate() {}
-+ void unprojectPoint(const CEGUI::GeometryBuffer&, const CEGUI::Vector2&, CEGUI::Vector2&) const {}
-+
-+private:
-+ CEGUI::Rect m_area;
-+};
-
-- virtual void addQuad(const CEGUI::Rect& dest_rect, float z, const CEGUI::Texture* tex, const CEGUI::Rect& texture_rect, const CEGUI::ColourRect& colours, CEGUI::QuadSplitMode quad_split_mode) {};
-- virtual void doRender(void) {};
-- virtual void clearRenderList(void) {};
-- virtual void setQueueingEnabled(bool setting) {};
-- virtual CEGUI::Texture *createTexture(void) { return NULL; };
-- virtual CEGUI::Texture *createTexture(const CEGUI::String& filename, const CEGUI::String& resourceGroup) { return NULL; };
-- virtual CEGUI::Texture *createTexture(float size) { return NULL; };
-- virtual void destroyTexture(CEGUI::Texture* texture) {};
-- virtual void destroyAllTextures(void) {};
-- virtual bool isQueueingEnabled(void) const { return 0; };
-- virtual float getWidth(void) const { return 0; };
-- virtual float getHeight(void) const { return 0; };
-- virtual CEGUI::Size getSize(void) const { return CEGUI::Size();};
-- virtual CEGUI::Rect getRect(void) const { return CEGUI::Rect();};
-- virtual unsigned int getMaxTextureSize(void) const { return 0; };
-- virtual unsigned int getHorzScreenDPI(void) const { return 0; };
-- virtual unsigned int getVertScreenDPI(void) const { return 0; };
-+class cFake_Renderer : public CEGUI::Renderer
-+{
-+public:
-+ cFake_Renderer( void ) :
-+ m_size(0, 0),
-+ m_dpi(0, 0),
-+ m_identifierString("Fake Renderer"),
-+ m_root(m_target) {}
-+ ~cFake_Renderer( void ) {}
-+
-+ CEGUI::RenderingRoot& getDefaultRenderingRoot() { return m_root; }
-+ CEGUI::GeometryBuffer& createGeometryBuffer() { return m_geometry; }
-+ void destroyGeometryBuffer(const CEGUI::GeometryBuffer&) {}
-+ void destroyAllGeometryBuffers() {}
-+ CEGUI::TextureTarget* createTextureTarget() { return 0; }
-+ void destroyTextureTarget(CEGUI::TextureTarget*) {}
-+ void destroyAllTextureTargets() {}
-+ CEGUI::Texture& createTexture() { return m_texture; }
-+ CEGUI::Texture& createTexture(const CEGUI::String&, const CEGUI::String&) { return m_texture; }
-+ CEGUI::Texture& createTexture(const CEGUI::Size&) { return m_texture; }
-+ void destroyTexture(CEGUI::Texture&) {}
-+ void destroyAllTextures() {}
-+ void beginRendering() {}
-+ void endRendering() {}
-+ void setDisplaySize(const CEGUI::Size&) {}
-+ const CEGUI::Size& getDisplaySize() const { return m_size; }
-+ const CEGUI::Vector2& getDisplayDPI() const {return m_dpi; }
-+ CEGUI::uint getMaxTextureSize() const { return 0; }
-+ const CEGUI::String& getIdentifierString() const { return m_identifierString; }
-+
-+private:
-+ CEGUI::Size m_size;
-+ CEGUI::Vector2 m_dpi;
-+ CEGUI::String m_identifierString;
-+ cFake_GeometryBuffer m_geometry;
-+ cFake_Texture m_texture;
-+ cFake_RenderTarget m_target;
-+ CEGUI::RenderingRoot m_root;
- };
-
- /* *** *** *** *** *** *** *** Video class *** *** *** *** *** *** *** *** *** *** */
diff --git a/community-staging/smc/smc.desktop b/community-staging/smc/smc.desktop
deleted file mode 100644
index 6cfe5b018..000000000
--- a/community-staging/smc/smc.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Secret Maryo Chronicles
-GenericName=Arcade Game
-Exec=smc
-Icon=smc.png
-Terminal=false
-Type=Application
-Categories=Game;ArcadeGame;KidsGame;
-StartupNotify=false \ No newline at end of file
diff --git a/community-staging/smc/smc.png b/community-staging/smc/smc.png
deleted file mode 100644
index f02af1bfc..000000000
--- a/community-staging/smc/smc.png
+++ /dev/null
Binary files differ
diff --git a/community-staging/springlobby/PKGBUILD b/community-staging/springlobby/PKGBUILD
deleted file mode 100644
index 2ccb51e50..000000000
--- a/community-staging/springlobby/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 47682 2011-05-24 19:40:45Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: DuGi <dugi@irc.pl>
-
-pkgname=springlobby
-pkgver=0.131
-pkgrel=2
-pkgdesc="A free cross-platform lobby client for the Spring RTS project."
-arch=('i686' 'x86_64')
-url="http://springlobby.info/"
-license=('GPL2')
-depends=('wxgtk' 'curl' 'libtorrent-rasterbar' 'boost-libs')
-optdepends=('sdl' 'sdl_sound' 'sdl_mixer')
-makedepends=('boost' 'asio' 'cmake')
-source=(http://www.springlobby.info/tarballs/${pkgname}-${pkgver}.tar.bz2
- springlobby.desktop
- springlobby.png)
-md5sums=('ea25f376a3fc48e3f3ff4de6d6637b5d'
- '45f8b59d033931d02e734fe3bd7777dd'
- '1f388187539aeb0358b51995e26ed890')
-
-build() {
- cd $srcdir/${pkgname}-$pkgver
-
- export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2"
- cp $srcdir/${pkgname}-$pkgver/tools/test-susynclib.awk $srcdir/${pkgname}-$pkgver/tools/test-susynclib.awk.bak
- sed -e 's|/usr/bin/awk|/bin/awk|g' $srcdir/${pkgname}-$pkgver/tools/test-susynclib.awk.bak>$srcdir/${pkgname}-$pkgver/tools/test-susynclib.awk
-
- sed -i 's/boost_system-mt/boost_system/g' $srcdir/$pkgname-$pkgver/CMakeLists.txt
- cmake . \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DOPTION_SOUND=false
- make
-}
-
-package() {
- cd $srcdir/${pkgname}-$pkgver
-
- make DESTDIR=$pkgdir install
-
- install -m755 -d $pkgdir/usr/share/applications
- install -m644 $srcdir/springlobby.desktop $pkgdir/usr/share/applications
-
- install -m755 -d -p $pkgdir/usr/share/pixmaps
- install -m644 $srcdir/springlobby.png $pkgdir/usr/share/pixmaps
-}
-
-# vim: sw=2:ts=2 et:
diff --git a/community-staging/springlobby/springlobby.desktop b/community-staging/springlobby/springlobby.desktop
deleted file mode 100644
index 1dce96b90..000000000
--- a/community-staging/springlobby/springlobby.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-Name=SpringLobby
-Comment=Lobby for Spring. An open source RTS with similar gameplay to TA
-Exec=springlobby
-Icon=springlobby.png
-Terminal=false
-Type=Application
-Categories=Application;Game;StrategyGame;
diff --git a/community-staging/springlobby/springlobby.png b/community-staging/springlobby/springlobby.png
deleted file mode 100644
index 89c7ab0ac..000000000
--- a/community-staging/springlobby/springlobby.png
+++ /dev/null
Binary files differ
diff --git a/community-staging/tagpy/PKGBUILD b/community-staging/tagpy/PKGBUILD
deleted file mode 100644
index 246a92e12..000000000
--- a/community-staging/tagpy/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 47614 2011-05-24 13:24:59Z jelle $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Callan Barrett <wizzomafizzo@gmail.com>
-# Contributor: Scott Horowitz <stonecrest@gmail.com>
-
-pkgname=tagpy
-pkgver=0.94.8
-pkgrel=4
-pkgdesc="Python bindings for TagLib"
-arch=('i686' 'x86_64')
-url="http://pypi.python.org/pypi/tagpy"
-license=('MIT')
-depends=('python2' 'taglib' 'boost-libs')
-makedepends=('python2-distribute' 'boost')
-source=("http://pypi.python.org/packages/source/t/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('6baff63318cf90b9bc5a2497a0597802')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
-
- sed -i -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
- $(find . -name '*.py')
-
- ./configure.py --taglib-lib-dir=/usr/lib/ \
- --taglib-inc-dir=/usr/include/taglib/ \
- --boost-inc-dir=/usr/include/boost/ \
- --boost-lib-dir=/usr/lib/ \
- --boost-python-libname=boost_python
- python2 setup.py build
-}
-
-package(){
- cd ${srcdir}/${pkgname}-${pkgver}
- python2 setup.py install --root="${pkgdir}" --optimize=1
- install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/$pkgname/LICENSE"
-}
diff --git a/community-staging/twinkle/PKGBUILD b/community-staging/twinkle/PKGBUILD
deleted file mode 100644
index 02e37d080..000000000
--- a/community-staging/twinkle/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 47620 2011-05-24 13:41:29Z jelle $
-# Maintainer:
-# Contributor: Jeff Mickey <jeff@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-# Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com>
-
-pkgname=twinkle
-pkgver=1.4.2
-pkgrel=10
-pkgdesc="A softphone for voice over IP and instant messaging communications using the SIP protocol"
-arch=('i686' 'x86_64')
-url="http://www.twinklephone.com/"
-license=('GPL')
-depends=('file' 'speex' 'boost-libs' 'libsndfile' 'commoncpp2' 'libxml2' 'libx11'
- 'qt3' 'libzrtpcpp')
-makedepends=('pkg-config' 'boost')
-source=(http://www.xs4all.nl/~mfnboer/${pkgname}/download/${pkgname}-${pkgver}.tar.gz)
-md5sums=('d70c8972f296ffd998c7fb698774705b')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- . /etc/profile.d/qt3.sh
- ./configure --prefix=/usr \
- --without-kde \
- --with-speex
- make
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
- install -D -m644 twinkle.desktop ${pkgdir}/usr/share/applications/twinkle.desktop
-}
diff --git a/community-staging/twinkle/twinkle.desktop b/community-staging/twinkle/twinkle.desktop
deleted file mode 100644
index e85a32e51..000000000
--- a/community-staging/twinkle/twinkle.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Twinkle
-Comment=A SIP softphone for Qt
-Icon=/usr/share/twinkle/twinkle48.png
-Exec=twinkle
-Terminal=false
-Type=Application
-Categories=Network;
-StartupNotify=false
diff --git a/community-testing/gambas3/PKGBUILD b/community-testing/gambas3/PKGBUILD
deleted file mode 100644
index 5a4b5206d..000000000
--- a/community-testing/gambas3/PKGBUILD
+++ /dev/null
@@ -1,1080 +0,0 @@
-# Maintainer: Laurent Carlier <lordheavym@gmail.com>
-
-pkgbase=gambas3
-pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gambas3-examples' 'gambas3-gb-cairo' 'gambas3-gb-chart'
- 'gambas3-gb-dbus' 'gambas3-gb-compress' 'gambas3-gb-crypt' 'gambas3-gb-db' 'gambas3-gb-db-form' 'gambas3-gb-db-mysql'
- 'gambas3-gb-db-odbc' 'gambas3-gb-db-postgresql' 'gambas3-gb-db-sqlite2' 'gambas3-gb-db-sqlite3'
- 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' 'gambas3-gb-form'
- 'gambas3-gb-form-dialog' 'gambas3-gb-form-mdi' 'gambas3-gb-form-stock' 'gambas3-gb-gtk' 'gambas3-gb-gui' 'gambas3-gb-image'
- 'gambas3-gb-image-effect' 'gambas3-gb-image-imlib' 'gambas3-gb-image-io' 'gambas3-gb-net' 'gambas3-gb-net-curl'
- 'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glu' 'gambas3-gb-opengl-glsl' 'gambas3-gb-option' 'gambas3-gb-pcre'
- 'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit'
- 'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal'
- 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web')
-pkgver=2.99.1
-pkgrel=2
-pkgdesc="A free development environment based on a Basic interpreter."
-arch=('i686' 'x86_64')
-url="http://gambas.sourceforge.net/"
-license=('GPL')
-groups=('gambas3')
-makedepends=('intltool' 'mysql' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils'
- 'zlib' 'mesa' 'libgl' 'glew' 'xdg-utils' 'qt' 'gtk2' 'imlib2' 'gdk-pixbuf2'
- 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite2' 'sqlite3' 'librsvg'
- 'curl' 'poppler' 'sdl_mixer' 'sdl_ttf' 'libxtst' 'pcre'
- 'libxcursor' 'libsm' 'dbus-core' 'libxml2' 'libxslt' 'libgnome-keyring')
-options=('!emptydirs' '!makeflags')
-source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2"
- 'gambas3-script.install' 'gambas3-runtime.install')
-md5sums=('ab4c182b9d7dfec06b3a42bb002a779a'
- 'b284be39d147ec799f1116a6abc068b4'
- 'a8ec8e5a6aba7a7e453ce7a35c1800a9')
-
-build() {
- cd ${srcdir}/${pkgbase}-${pkgver}
-
- ./reconf-all
- ./configure --prefix=/usr -C
-
- make bindir=${pkgdir}/usr/bin
-}
-
-package_gambas3-runtime() {
- depends=('libffi' 'xdg-utils')
- pkgdesc="Gambas3 runtime environment"
- install=gambas3-runtime.install
-
- cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc
- make DESTDIR="${pkgdir}" install
-
- cd ../gbx
- make DESTDIR="${pkgdir}" install
- cd ../lib/debug
- make DESTDIR="${pkgdir}" install
- cd ../eval
- make DESTDIR="${pkgdir}" install
- cd ../draw
- make DESTDIR="${pkgdir}" install
- install -D -m644 ../gb.component \
- ${pkgdir}/usr/lib/gambas3
-
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- ln -s gbx3 ${pkgdir}/usr/bin/gbr3
- gbc/gbi3 -r ${pkgdir}/usr gb
- rm -f ${pkgdir}/usr/lib/gambas3/gb.{so*,la}
-
- ## needed for postinst with xdg-utils
- install -d -m755 ${pkgdir}/usr/share/gambas3/mime
- install -D -m644 mime/* \
- ${pkgdir}/usr/share/gambas3/mime/
- install -d -m755 ${pkgdir}/usr/share/gambas3/icons
- install -D -m644 mime/application-x-gambas.png \
- ${pkgdir}/usr/share/gambas3/icons/application-x-gambas.png
-
- cd gbc
- make DESTDIR="${pkgdir}" uninstall
-}
-
-package_gambas3-devel() {
- depends=('gambas3-runtime')
- pkgdesc="Gambas3 development environment"
-
- cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc
- make DESTDIR="${pkgdir}" install
-}
-
-package_gambas3-ide() {
- depends=('gambas3-devel' 'gambas3-gb-db-form' 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight'
- 'gambas3-gb-form-dialog' 'gambas3-gb-settings' 'gambas3-gb-form-mdi' 'gambas3-gb-image-effect'
- 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-webkit')
- pkgdesc="Gambas3 Integrated Development Environment"
-
- cd ${srcdir}/${pkgbase}-${pkgver}
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-#!! with the ide !!
- install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas3.desktop \
- ${pkgdir}/usr/share/applications/gambas3.desktop
- install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas3.png \
- ${pkgdir}/usr/share/pixmaps/gambas3.png
-
- rm -r ${pkgdir}/usr/bin/gb*
- rm -r ${pkgdir}/usr/lib
- rm -r ${pkgdir}/usr/share/gambas3
-}
-
-package_gambas3-script() {
- depends=('gambas3-devel')
- pkgdesc="Gambas3 scripter and server programs support"
- install=gambas3-script.install
-
- cd ${srcdir}/${pkgbase}-${pkgver}
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## needed for postinst with xdg-utils
- cd ${srcdir}/${pkgbase}-${pkgver}/app/mime
- install -d -m755 ${pkgdir}/usr/share/gambas3/mime
- install -D -m644 *.xml ${pkgdir}/usr/share/gambas3/mime/
- install -D -m644 *.png ${pkgdir}/usr/share/gambas3/mime/
- ##
-
- rm -r ${pkgdir}/usr/bin/{gambas*,gb{[a-r]*,x*}}
- rm -r ${pkgdir}/usr/lib
- rm -r ${pkgdir}/usr/share/gambas3/[c-i]*
-}
-
-package_gambas3-examples() {
- depends=('gambas3-gb-cairo' 'gambas3-gb-chart' 'gambas3-gb-dbus' 'gambas3-gb-compress' 'gambas3-gb-crypt' 'gambas3-gb-db'
- 'gambas3-gb-db-form' 'gambas3-gb-db-mysql' 'gambas3-gb-db-odbc' 'gambas3-gb-db-postgresql' 'gambas3-gb-db-sqlite2'
- 'gambas3-gb-db-sqlite3' 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' 'gambas3-gb-form' 'gambas3-gb-form-dialog'
- 'gambas3-gb-form-mdi' 'gambas3-gb-gtk' 'gambas3-gb-gui' 'gambas3-gb-image' 'gambas3-gb-image-effect' 'gambas3-gb-image-imlib'
- 'gambas3-gb-image-io' 'gambas3-gb-net' 'gambas3-gb-net-curl' 'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glsl'
- 'gambas3-gb-option' 'gambas3-gb-pcre' 'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl'
- 'gambas3-gb-qt4-webkit' 'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal'
- 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web')
- pkgdesc="Gambas3 examples"
-
- cd ${srcdir}/${pkgbase}-${pkgver}
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- rm -r ${pkgdir}/usr/{bin,lib}
- rm -r ${pkgdir}/usr/share/gambas3/{info,control,gb.sdl}
-}
-
-package_gambas3-gb-cairo() {
- depends=('gambas3-runtime' 'cairo')
- pkgdesc="Gambas3 cairo component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.cairo
- make DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-chart() {
- depends=('gambas3-gb-form')
- pkgdesc="Gambas3 chart component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/comp
- make DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- rm -r ${pkgdir}/usr/share/gambas3/control
- rm -r ${pkgdir}/usr/lib/gambas3/gb.[d-w]*
- rm -r ${pkgdir}/usr/share/gambas3/info/gb.[d-w]*
- ##
-}
-
-package_gambas3-gb-compress() {
- depends=('gambas3-runtime' 'bzip2' 'zlib')
- pkgdesc="Gambas3 compression support component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.bzlib2
- make DESTDIR="${pkgdir}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.zlib
- make DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- rm -r ${pkgdir}/usr/bin
- rm -r ${pkgdir}/usr/lib/gambas3/{gb.component,gb.[d-v]*}
- rm -r ${pkgdir}/usr/share/gambas3/info/gb.[d-v]*
- ##
-}
-
-package_gambas3-gb-crypt() {
- depends=('gambas3-runtime')
- pkgdesc="Gambas3 MD5/DES crypting component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.crypt
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-db() {
- depends=('gambas3-runtime')
- pkgdesc="Gambas3 database access component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- ## Workaround for splitting
- rm -r ${pkgdir}/usr/bin
- rm -r ${pkgdir}/usr/lib/gambas3/{gb.comp*,gb.d{e,r}*,gb.[e-z]*}
- rm -r ${pkgdir}/usr/share/gambas3/info/{gb.comp*,gb.de*,gb.[e-z]*}
- ##
-}
-
-package_gambas3-gb-db-form() {
- depends=('gambas3-gb-db' 'gambas3-gb-form')
- pkgdesc="Gambas3 database form component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/comp
- make DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- rm -r ${pkgdir}/usr/share/gambas3/control
- rm -r ${pkgdir}/usr/lib/gambas3/gb.{chart*,[e-z]*}
- rm -r ${pkgdir}/usr/share/gambas3/info/gb.{chart*,[e-z]*}
- ##
-}
-
-package_gambas3-gb-db-mysql() {
- depends=('gambas3-gb-db' 'libmysqlclient')
- pkgdesc="Gambas3 MySQL database access component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.mysql
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-db-odbc() {
- depends=('gambas3-gb-db' 'unixodbc')
- pkgdesc="Gambas3 ODBC database access component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.odbc
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-db-postgresql() {
- depends=('gambas3-gb-db' 'postgresql-libs')
- pkgdesc="Gambas3 PostgreSQL database access component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.postgresql
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-db-sqlite2() {
- depends=('gambas3-gb-db' 'sqlite2')
- pkgdesc="Gambas3 Sqlite2 database access component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite2
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-db-sqlite3() {
- depends=('gambas3-gb-db' 'sqlite3')
- pkgdesc="Gambas3 Sqlite3 database access component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite3
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-desktop() {
- depends=('gambas3-gb-image' 'libsm' 'libxtst' 'libgnome-keyring')
- pkgdesc="Gambas3 desktop component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.desktop
- make DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-dbus() {
- depends=('gambas3-runtime' 'dbus-core')
- pkgdesc="Gambas3 DBUS component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.dbus
- make DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-eval-highlight() {
- depends=('gambas3-runtime')
- pkgdesc="Gambas3 expression evaluator highlight component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/comp
- make DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- rm -r ${pkgdir}/usr/lib/gambas3/gb.[f-z]*
- rm -r ${pkgdir}/usr/share/gambas3/info/gb.[f-z]*
- ##
-}
-
-package_gambas3-gb-form() {
- depends=('gambas3-gb-gui')
- pkgdesc="Gambas3 form component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/comp
- make DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- rm -r ${pkgdir}/usr/share/gambas3/control/{gb.db*,gb.form.*,gb.report}
- rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{d*,m*,s*}}
- rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{d*,m*,s*}}
- ##
-}
-
-package_gambas3-gb-form-dialog() {
- depends=('gambas3-gb-form')
- pkgdesc="Gambas3 form dialog component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/comp
- make DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- rm -r ${pkgdir}/usr/share/gambas3/control
- rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{c*,g*,m*,s*}}
- rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{i*,l*,m*,s*}}
- ##
-}
-
-package_gambas3-gb-form-mdi() {
- depends=('gambas3-gb-form')
- pkgdesc="Gambas3 form MDI component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/comp
- make DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- rm -r ${pkgdir}/usr/share/gambas3/control/{gb.db*,gb.form,gb.report}
- rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{c*,d*,g*,s*}}
- rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{i*,l*,d*,s*}}
- ##
-}
-
-package_gambas3-gb-form-stock() {
- depends=('gambas3-runtime')
- pkgdesc="Gambas3 default stock icons component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/comp
- make DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- rm -r ${pkgdir}/usr/lib/gambas3/gb.{eval*,[m-w]*}
- rm -r ${pkgdir}/usr/share/gambas3/info/gb.{eval*,[m-w]*}
- ##
-}
-
-package_gambas3-gb-gtk() {
- depends=('gambas3-gb-image' 'gtk2' 'librsvg')
- pkgdesc="Gambas3 graphical GTK+ toolkit component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-gui() {
- depends=('gambas3-gb-qt4' 'gambas3-gb-gtk')
- pkgdesc="Gambas3 automatic gui toolkit chooser"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- rm -r ${pkgdir}/usr/bin
- rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-e]*,gb.[i-z]*}
- rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-e]*,gb.[i-z]*}
- ##
-}
-
-package_gambas3-gb-image() {
- depends=('gambas3-runtime')
- pkgdesc="Gambas3 image component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- ## cleanup the workaround
- rm -r ${pkgdir}/usr/bin
- rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-g]*,gb.image.e*,gb.[j-z]*}
- rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-g]*,gb.info,gb.image.e*,gb.[j-z]*}
- ##
-}
-
-package_gambas3-gb-image-effect() {
- depends=('gambas3-gb-image')
- pkgdesc="Gambas3 image effect component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- ## cleanup the workaround
- rm -r ${pkgdir}/usr/bin
- rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-g]*,gb.image.{c*,l*,s*},gb.[j-z]*}
- rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-g]*,gb.info,gb.image.{i*,l*},gb.[j-z]*}
- ##
-}
-
-package_gambas3-gb-image-imlib() {
- depends=('gambas3-gb-image' 'imlib2')
- pkgdesc="Gambas3 imlib component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.image.imlib
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-image-io() {
- depends=('gambas3-gb-image' 'gdk-pixbuf2')
- pkgdesc="Gambas3 input/output component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.image.io
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-net() {
- depends=('gambas3-runtime')
- pkgdesc="Gambas3 network component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-net-curl() {
- depends=('gambas3-gb-net' 'curl')
- pkgdesc="Gambas3 curl component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-net-smtp() {
- depends=('gambas3-runtime' 'glib2')
- pkgdesc="Gambas3 SMTP component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.smtp
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-opengl() {
- depends=('gambas3-runtime' 'libgl' 'glew')
- pkgdesc="Gambas3 OpenGL component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glsl
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-opengl-glu() {
- depends=('gambas3-gb-opengl')
- pkgdesc="Gambas3 GL Utility component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glu
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-opengl-glsl() {
- depends=('gambas3-gb-opengl')
- pkgdesc="Gambas3 GLSL component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glsl
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-option() {
- depends=('gambas3-runtime')
- pkgdesc="Gambas3 getopt component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- ## cleanup the workaround
- rm -r ${pkgdir}/usr/bin
- rm -r ${pkgdir}/usr/lib/gambas3/{gb.[a-n]*,gb.[p-z]*}
- rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[a-n]*,gb.[p-z]*}
- ##
-}
-
-package_gambas3-gb-pcre() {
- depends=('gambas3-runtime' 'pcre')
- pkgdesc="Gambas3 PCRE component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.pcre
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-pdf() {
- depends=('gambas3-runtime' 'poppler')
- pkgdesc="Gambas3 PDF component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.pdf
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-qt4() {
- depends=('gambas3-gb-image' 'qt')
- pkgdesc="Gambas3 Qt4 toolkit component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/ext
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/opengl
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/webkit
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-qt4-ext() {
- depends=('gambas3-gb-qt4')
- pkgdesc="Gambas3 Qt4 toolkit extended component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/ext
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-qt4-opengl() {
- depends=('gambas3-gb-qt4' 'libgl')
- pkgdesc="Gambas3 Qt4 toolkit OpenGL component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/opengl
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-qt4-webkit() {
- depends=('gambas3-gb-qt4')
- pkgdesc="Gambas3 Qt4 toolkit webkit component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/webkit
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-report() {
- depends=('gambas3-gb-form' 'gambas3-gb-image-io')
- pkgdesc="Gambas3 report component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/comp
- make DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- rm -r ${pkgdir}/usr/share/gambas3/control/gb.[d-f]*
- rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-m]*,[s-w]*}
- rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-m]*,[s-w]*}
- ##
-}
-
-package_gambas3-gb-sdl() {
- depends=('gambas3-gb-image-io' 'sdl_ttf' 'libxcursor' 'glew' 'libgl')
- pkgdesc="Gambas3 SDL component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-sdl-sound() {
- depends=('gambas3-runtime' 'sdl_mixer')
- pkgdesc="Gambas3 SDL sound component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl.sound
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-settings() {
- depends=('gambas3-runtime')
- pkgdesc="Gambas3 setting component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/comp
- make DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-r]*,[t-w]*}
- rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-r]*,[t-w]*}
- ##
-}
-
-package_gambas3-gb-signal() {
- depends=('gambas3-runtime')
- pkgdesc="Gambas3 signal component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- ## cleanup the workaround
- rm -r ${pkgdir}/usr/bin
- rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-r]*,gb.[t-z]*,gb.so*}
- rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-r]*,gb.[t-z]*}
- ##
-}
-
-package_gambas3-gb-v4l() {
- depends=('gambas3-runtime' 'v4l-utils' 'libjpeg' 'libpng')
- pkgdesc="Gambas3 video4linux component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.v4l
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-vb() {
- depends=('gambas3-runtime')
- pkgdesc="Gambas3 VB transitional component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- ## Workaround for splitting
- rm -r ${pkgdir}/usr/bin
- rm -r ${pkgdir}/usr/lib/gambas3/gb.[a-u]*
- rm -r ${pkgdir}/usr/share/gambas3/info/gb.[a-u]*
- ##
-}
-
-package_gambas3-gb-xml() {
- depends=('gambas3-runtime' 'libxml2')
- pkgdesc="Gambas3 XML component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/xslt
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/rpc
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-xml-rpc() {
- depends=('gambas3-gb-xml' 'gambas3-gb-net' 'gambas3-gb-net-curl')
- pkgdesc="Gambas3 XML-RPC component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- rm -r ${pkgdir}/usr/lib/gambas3/gb.xml.{[c-l]*,xslt*,so*}
- rm -r ${pkgdir}/usr/share/gambas3/info/gb.xml.{[i-l]*,x*}
- ##
-}
-
-package_gambas3-gb-xml-xslt() {
- depends=('gambas3-gb-xml' 'libxslt')
- pkgdesc="Gambas3 XML-XSLT component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/xslt
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-web() {
- depends=('gambas3-runtime')
- pkgdesc="Gambas3 CGI component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/comp
- make DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- rm -r ${pkgdir}/usr/lib/gambas3/gb.[c-v]*
- rm -r ${pkgdir}/usr/share/gambas3/info/gb.[c-v]*
- ##
-}
diff --git a/community-testing/gambas3/gambas3-runtime.install b/community-testing/gambas3/gambas3-runtime.install
deleted file mode 100644
index c6aad0d55..000000000
--- a/community-testing/gambas3/gambas3-runtime.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource install --context mimetypes --size 64 \
- /usr/share/gambas3/mime/application-x-gambas.png application-x-gambas
- xdg-mime install /usr/share/gambas3/mime/application-x-gambas.xml
-}
-
-pre_remove() {
- xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambas
- xdg-mime uninstall /usr/share/gambas3/mime/application-x-gambas.xml
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/gambas3/gambas3-script.install b/community-testing/gambas3/gambas3-script.install
deleted file mode 100644
index 77c1aa52f..000000000
--- a/community-testing/gambas3/gambas3-script.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
- xdg-icon-resource install --context mimetypes --size 64 \
- /usr/share/gambas3/mime/application-x-gambasscript.png application-x-gambasscript
- xdg-icon-resource install --context mimetypes --size 64 \
- /usr/share/gambas3/mime/application-x-gambasserverpage.png application-x-gambasserverpage
- xdg-mime install /usr/share/gambas3/mime/application-x-gambasscript.xml
- xdg-mime install /usr/share/gambas3/mime/application-x-gambasserverpage.xml
-}
-
-pre_remove() {
- xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambasscript
- xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambasserverpage
- xdg-mime uninstall /usr/share/gambas3/mime/application-x-gambasscript.xml
- xdg-mime uninstall /usr/share/gambas3/mime/application-x-gambasserverpage.xml
-}
diff --git a/community-testing/gambas3/gambas3.install b/community-testing/gambas3/gambas3.install
deleted file mode 100644
index c6aad0d55..000000000
--- a/community-testing/gambas3/gambas3.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource install --context mimetypes --size 64 \
- /usr/share/gambas3/mime/application-x-gambas.png application-x-gambas
- xdg-mime install /usr/share/gambas3/mime/application-x-gambas.xml
-}
-
-pre_remove() {
- xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambas
- xdg-mime uninstall /usr/share/gambas3/mime/application-x-gambas.xml
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/csfml/PKGBUILD b/community/csfml/PKGBUILD
deleted file mode 100644
index e2c72a1a1..000000000
--- a/community/csfml/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 21275 2010-07-15 20:18:37Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Arvil <arvil at k3v1n5 dot eu>
-
-pkgname=csfml
-pkgver=1.6
-pkgrel=1
-pkgdesc="C binding for SFML."
-arch=('i686' 'x86_64')
-url=http://www.sfml-dev.org
-license=('zlib')
-depends=('sfml')
-source=(http://downloads.sourceforge.net/sfml/SFML-$pkgver-c-sdk-linux-32.tar.gz)
-md5sums=('47612e9dc3c9be35e32c188dd937e0d6')
-
-build() {
- cd "$srcdir/SFML-$pkgver/CSFML"
-
- msg "Building libraries."
- make || return 1
- make DESTDIR=${pkgdir}/usr install || return 1
-
- # Fix the library softlinks
- cd "$pkgdir/usr/lib"
- rm *.so
- for lib in *; do
- ln -s $lib ${lib/.$pkgver/}
- done
-}
-# vim:set ts=2 sw=2 et:
diff --git a/community/elinks/elinks.desktop b/community/elinks/elinks.desktop
deleted file mode 100644
index e27adf912..000000000
--- a/community/elinks/elinks.desktop
+++ /dev/null
@@ -1,19 +0,0 @@
-[Desktop Entry]
-Categories=Application;Network;
-Comment=advanced and well-established feature-rich text mode web (HTTP/FTP/..) browser
-Comment[en_GB]=advanced and well-established feature-rich text mode web (HTTP/FTP/..) browser
-Exec=elinks %u
-GenericName=Full-Featured Text WWW Browser
-GenericName[en_GB]=Full-Featured Text WWW Browser
-Icon=
-MimeType=text/html
-Name=Elinks
-Name[en_GB]=Elinks
-Path=
-StartupNotify=true
-Terminal=true
-TerminalOptions=
-Type=Application
-X-DCOP-ServiceType=
-X-KDE-SubstituteUID=false
-X-KDE-Username=
diff --git a/community/evolution-rss/PKGBUILD b/community/evolution-rss/PKGBUILD
deleted file mode 100644
index 71b3da93c..000000000
--- a/community/evolution-rss/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Creator: Borromini <gotleenucks at g-male dot com>
-# Maintainter: Jelle van der Waa <jelle at vdwaa dot nl>
-
-pkgname='evolution-rss'
-pkgver=0.2.3
-pkgrel=5
-pkgdesc="This plugin implements RSS reading capability within Evolution"
-arch=(i686 x86_64)
-license=('GPL')
-install=evolution-rss.install
-url="http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin"
-depends=('evolution' 'libsoup' 'libgnomecanvas')
-makedepends=('intltool' 'gnome-common')
-options=('!libtool' '!emptydirs')
-source=(http://gnome.eu.org/$pkgname-$pkgver.tar.gz
- add-dbus-glib.patch)
-md5sums=('bbf825c3655eaebadc429141a8f408d0'
- 'ef16147db282739cd5218ef590b79c81')
-build() {
- cd $srcdir/$pkgname-${pkgver}
- patch -Np1 -i $srcdir/add-dbus-glib.patch
- ./autogen.sh
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --with-primary-render=gtkhtml \
- --disable-schemas-install
- make
-}
-
-package() {
- cd $srcdir/$pkgname-${pkgver}
- make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=$pkgdir install
-
- mkdir -p $pkgdir/usr/share/gconf/schemas
- gconf-merge-schema $pkgdir/usr/share/gconf/schemas/${pkgname}.schemas $pkgdir/etc/gconf/schemas/*.schemas
- rm -rf $pkgdir/etc/gconf/
-}
diff --git a/community/evolution-rss/add-dbus-glib.patch b/community/evolution-rss/add-dbus-glib.patch
deleted file mode 100644
index fa5cd5ada..000000000
--- a/community/evolution-rss/add-dbus-glib.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur evolution-rss-0.2.3.orig/src/Makefile.am evolution-rss-0.2.3/src/Makefile.am
---- evolution-rss-0.2.3.orig/src/Makefile.am 2011-01-28 09:29:44.000000000 -0800
-+++ evolution-rss-0.2.3/src/Makefile.am 2011-03-14 09:51:19.510031938 -0700
-@@ -94,7 +94,7 @@
- endif
-
- liborg_gnome_evolution_rss_la_SOURCES = $(SOURCES)
--liborg_gnome_evolution_rss_la_LIBADD = $(WEBKIT_LIBS) $(GECKO_LIBS) $(LIBSOUP_LIBS) $(GTKHTML_EDITOR_LIBS) $(NO_UNDEFINED_LIBS)
-+liborg_gnome_evolution_rss_la_LIBADD = $(WEBKIT_LIBS) $(GECKO_LIBS) $(LIBSOUP_LIBS) $(GTKHTML_EDITOR_LIBS) $(NO_UNDEFINED_LIBS) $(DBUS_LIBS)
- liborg_gnome_evolution_rss_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
- #$(GECKO_RPATH)
-
diff --git a/community/evolution-rss/evolution-rss.install b/community/evolution-rss/evolution-rss.install
deleted file mode 100644
index da4969355..000000000
--- a/community/evolution-rss/evolution-rss.install
+++ /dev/null
@@ -1,25 +0,0 @@
-pkgname=evolution-rss
-
-post_install() {
- usr/sbin/gconfpkg --install $pkgname
- update-desktop-database -q
-}
-
-pre_upgrade() {
- pre_remove $1
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
- update-desktop-database -q
-}
-
-op=$1
-shift
diff --git a/community/gambas3/gambas3.desktop b/community/gambas3/gambas3.desktop
deleted file mode 100644
index d35d829f3..000000000
--- a/community/gambas3/gambas3.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Name=Gambas3
-Exec=gambas3
-Icon=/usr/share/pixmaps/gambas3.png
-Terminal=false
-X-MultipleArgs=false
-Type=Application
-Categories=Application;Development;
-Encoding=UTF-8
-StartupNotify=true
-
-GenericName=
diff --git a/community/gambas3/gambas3.png b/community/gambas3/gambas3.png
deleted file mode 100644
index 302ab3058..000000000
--- a/community/gambas3/gambas3.png
+++ /dev/null
Binary files differ
diff --git a/community/inn/PKGBUILD b/community/inn/PKGBUILD
deleted file mode 100644
index 98d913f43..000000000
--- a/community/inn/PKGBUILD
+++ /dev/null
@@ -1,121 +0,0 @@
-# $Id: PKGBUILD 44059 2011-04-01 20:32:01Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Edward Tjörnhammar <xhemi@cube2.se>
-# Contributor: Edward Tjörnhammar <xhemi@cube2.se>
-
-pkgname=inn
-pkgver=2.5.2
-pkgrel=5
-pkgdesc="Complete open source Usenet system. De facto standard for handling news routing, news spool and serving the spool to customers."
-url="http://www.isc.org/software/inn/"
-arch=('i686' 'x86_64')
-license=("custom:INN")
-depends=('openssl' 'dovecot')
-makedepends=('make' 'bison' 'python2' 'gcc' 'smtp-forwarder' 'libsasl')
-optdepends=('perl' 'python2' 'libsasl')
-options=(emptydirs docs zipman)
-install=inn.install
-backup=(etc/inn/newsfeeds
- etc/inn/incoming.conf
- etc/inn/nnrpd.track
- etc/inn/passwd.nntp
- etc/inn/inn.conf
- etc/inn/moderators
- etc/inn/control.ctl
- etc/inn/expire.ctl
- etc/inn/nntpsend.ctl
- etc/inn/innreport.conf
- etc/inn/innwatch.ctl
- etc/inn/distrib.pats
- etc/inn/actsync.cfg
- etc/inn/actsync.ign
- etc/inn/motd.news
- etc/inn/storage.conf
- etc/inn/cycbuff.conf
- etc/inn/buffindexed.conf
- etc/inn/innfeed.conf
- etc/inn/news2mail.cf
- etc/inn/readers.conf
- etc/inn/radius.conf
- etc/inn/ovdb.conf
- etc/inn/subscriptions
- var/db/inn/active
- var/db/inn/active.times
- var/db/inn/history
- var/db/inn/history.dir
- var/db/inn/history.hash
- var/db/inn/history.index
- var/db/inn/newsgroups)
-source=(http://ftp.isc.org/isc/inn/inn-$pkgver.tar.gz
- innd.rc
- nnrpd.rc
- innd.conf
- nnrpd.conf
- site.make.patch)
-md5sums=('a6e577dceb90d07501b96149508b974b'
- '2ad5138dac7c7535278f73f30020d656'
- 'a0b1ff8501ac8a31ce81a2f9c9b4bac9'
- 'fbf1d2c5b3c5a08ae3e515c71c2e2e4a'
- 'bb4bbe86ae52fbbf08b0f6f370dea052'
- '960c800026ed6e03901cf0bafdfd53d8')
-
-build() {
- cd $srcdir/inn-$pkgver
-
- [ $NOEXTRACT -eq 1 ] || PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
- --includedir=/usr/include/inn \
- --sbindir=/usr/sbin \
- --with-libtool \
- --with-gnu-id \
- --with-db-dir=/var/db/inn \
- --sysconfdir=/etc/inn \
- --with-spool-dir=/var/spool/news \
- --with-log-dir=/var/log/inn \
- --with-run-dir=/var/run/inn \
- --with-tmp-dir=/var/spool/inn/tmp \
- --enable-largefiles \
- --with-openssl=/usr \
- --with-perl \
- --with-python \
- --with-sendmail=/usr/bin/msmtp \
- --with-sasl=/usr
- # build in chroot fails with default news:news since they don't exist.
- # uncomment following lines for working build. not sure if this is the correct solution though.
- # --with-news-user=root \
- # --with-news-group=root \
-
- sed -i 's|-export-dynamic gnu|-export-dynamic|' Makefile.global
-
- [ $NOEXTRACT -eq 1 ] || patch -p3 < $srcdir/site.make.patch
- export LD_LIBRARY_PATH=.:$pkgdir/usr/lib:$LD_LIBRARY_PATH
-
- make
- make DESTDIR=$pkgdir install
-
- mkdir -p $pkgdir/etc/{conf,rc}.d && \
- install -m0755 $srcdir/innd.rc $pkgdir/etc/rc.d/innd
- install -m0644 $srcdir/innd.conf $pkgdir/etc/conf.d/innd
-
- install -m0755 $srcdir/nnrpd.rc $pkgdir/etc/rc.d/nnrpd
- install -m0644 $srcdir/nnrpd.conf $pkgdir/etc/conf.d/nnrpd
-
- cd $pkgdir/usr/lib
- for i in lib*.a; do
- gcc -shared -o ${i%%.a}.so.2.0.0 $i
- for j in 2.0 2; do
- ln -s ${i%%a}so.2.0.0 ${i%%a}so.$j
- done
- done
-
- touch $pkgdir/var/db/inn/history{.dir,.hash,.index,}
-
- mkdir -p $pkgdir/usr/share/doc/inn $pkgdir/usr/share/inn/
- mv $pkgdir/usr/share/man/man3/list.3 $pkgdir/usr/share/man/man3/list-inn.3
- mv $pkgdir/usr/doc/* $pkgdir/usr/share/doc/inn/
- mv $pkgdir/usr/http/* $pkgdir/usr/share/inn/
- mv $pkgdir/usr/bin/archive $pkgdir/usr/bin/archive.inn
- rm -rf $pkgdir/usr/doc $pkgdir/usr/http $pkgdir/var/run
- install -D -m0644 $srcdir/inn-$pkgver/LICENSE $pkgdir/usr/share/licenses/inn/LICENSE
- chown root:root $pkgdir/usr/bin/innbind
- chmod 05555 $pkgdir/usr/bin/innbind
-}
diff --git a/community/inn/inn.install b/community/inn/inn.install
deleted file mode 100644
index 37b6394b1..000000000
--- a/community/inn/inn.install
+++ /dev/null
@@ -1,22 +0,0 @@
-post_install() {
- grep -e "^news:" /etc/group 2>&- >&- || groupadd -r news 2>&- >&-
- grep -e "^news:" /etc/passwd 2>&- >&- || useradd -r -m -g news news 2>&- >&-
-
- /usr/bin/makedbz -i -o 2>&- >&-
- mkdir /var/log/news 2>&- >&-
-
- chown news:news -R var/spool/news 2>&- >&-
- chown news:news var/log/news 2>&- >&-
- chown news:news -R var/db/inn 2>&- >&-
-
- echo ""
- echo "->"
- echo "-> If this is a first-time installation, a minimal active file and"
- echo "-> history database have been installed. Do not forget to update"
- echo "-> your cron entries and configure INN. See INSTALL for more"
- echo "-> information."
- echo "->"
- echo "-> The default user:group for inn is news:news"
- echo "->"
- echo ""
-}
diff --git a/community/inn/innd.conf b/community/inn/innd.conf
deleted file mode 100644
index 48f96ba5e..000000000
--- a/community/inn/innd.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-NEWS_USER=news
-NEWS_GROUP=news
diff --git a/community/inn/innd.rc b/community/inn/innd.rc
deleted file mode 100644
index e88bd0c39..000000000
--- a/community/inn/innd.rc
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-[ -f /etc/conf.d/innd ] && . /etc/conf.d/innd
-[ -z "$NEWS_USER" ] && print "Please set news username" && exit 1;
-
-case "$1" in
- start)
- stat_busy "Starting InterNetNews"
- [ -d /var/run/inn ] || mkdir -p /var/run/inn
- su $NEWS_USER -c /usr/bin/rc.news 2>&- >&-
- if [ $? -gt 0 ]; then
- stat_fail
- else
- echo $! > /var/run/innd.pid
- add_daemon innd
- stat_done
- fi
-
- ;;
- stop)
- stat_busy "Stopping InterNetNews"
- su $NEWS_USER -c /usr/bin/rc.news stop 2>&- >&-
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm /var/run/innd.pid
- rm_daemon innd
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community/inn/nnrpd.conf b/community/inn/nnrpd.conf
deleted file mode 100644
index 689a289ce..000000000
--- a/community/inn/nnrpd.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-USE_SSL=1
-LISTEN_PORT=563
-NNRPD_OPTS="-D -S -p $LISTEN_PORT -c /etc/inn/readers.conf"
diff --git a/community/inn/nnrpd.rc b/community/inn/nnrpd.rc
deleted file mode 100644
index d7c902832..000000000
--- a/community/inn/nnrpd.rc
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-[ -f /etc/conf.d/nnrpd ] && . /etc/conf.d/nnrpd
-[ -z "$NNRPD_OPTS" ] && print "FATAL: No arguments where passed" && exit 1;
-
-PID=`pidof -o %PPID nnrpd`
-case "$1" in
- start)
- stat_busy "Starting InterNetNews Readers Daemon"
- if [ ! -f /var/run/nnrpd.pid ]; then
- stat_append ":: InterNetNews (innd) is not running"
- stat_fail
- exit 1
- fi
-
- [ -d /var/run/inn ] || mkdir -p /var/run/inn
- [ -z "$PID" ] && nnrpd $NNRPD_OPTS 2>&- >&-
- if [ $? -gt 0 ]; then
- stat_fail
- else
- PID=`pidof -o %PPID nnrpd`
- echo $PID > /var/run/nnrpd.pid
- add_daemon nnrpd
- stat_done
- fi
-
- ;;
- stop)
- stat_busy "Stopping InterNetNews Readers Daemon"
- [ ! -z "$PID" ] && kill $PID >&-
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm /var/run/nnrpd.pid
- rm_daemon nnrpd
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community/inn/site.make.patch b/community/inn/site.make.patch
deleted file mode 100644
index 5af6e1162..000000000
--- a/community/inn/site.make.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- old/src/inn-2.4.5/site/Makefile 2008-06-29 19:56:57.000000000 +0200
-+++ new/src/inn-2.4.5/site/Makefile 2008-10-09 19:27:59.613208825 +0200
-@@ -52,7 +52,6 @@
-
- PATH_ACTIVE = ${PATHDB}/active
- PATH_ACTIVE_TIMES = ${PATHDB}/active.times
--PATH_HISTORY = ${PATHDB}/history
- PATH_NEWSGROUPS = ${PATHDB}/newsgroups
-
- ## Scripts from above, plus site-specific config files.
-@@ -98,7 +97,7 @@
- ALL_INSTALLED = $(MOST_INSTALLED) $(REST_INSTALLED)
-
- SPECIAL = $D$(PATH_ACTIVE) $D$(PATH_ACTIVE_TIMES) \
-- $D$(PATH_NEWSGROUPS) $D$(PATH_HISTORY)
-+ $D$(PATH_NEWSGROUPS)
-
- ## Get new versions of everything from samples directory.
- all: $(ALL) config
-@@ -143,12 +142,6 @@
- chown $(RUNASUSER) $@
- chgrp $(RUNASGROUP) $@
- chmod $(FILEMODE) $@
--$D$(PATH_HISTORY):
-- touch $@
-- chown $(RUNASUSER) $@
-- chgrp $(RUNASGROUP) $@
-- chmod $(FILEMODE) $@
-- test -z "$D" && $(PATHBIN)/makedbz -i -o
-
- bootstrap:
-
diff --git a/community/libssh2/PKGBUILD b/community/libssh2/PKGBUILD
deleted file mode 100644
index 636822fad..000000000
--- a/community/libssh2/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 34134 2010-12-03 13:35:55Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: ice-man <icemanf@gmail.com>
-
-pkgname=libssh2
-pkgver=1.2.7
-pkgrel=1
-pkgdesc="A library implementing the SSH2 protocol as defined by Internet Drafts"
-url="http://www.libssh2.org/"
-arch=('i686' 'x86_64')
-license=('BSD')
-depends=('openssl')
-makedepends=('zlib')
-options=('!libtool')
-source=("http://www.libssh2.org/download/${pkgname}-${pkgver}.tar.gz")
-md5sums=('a5d78344886f1282e4008c09bf568076')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
- install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/community/mednafen/fix_build.diff b/community/mednafen/fix_build.diff
deleted file mode 100644
index d91a6faf4..000000000
--- a/community/mednafen/fix_build.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN mednafen.orig//src/pcfx/soundbox.cpp mednafen/src/pcfx/soundbox.cpp
---- mednafen.orig//src/pcfx/soundbox.cpp 2010-06-05 09:35:40.000000000 -0400
-+++ mednafen/src/pcfx/soundbox.cpp 2010-06-05 09:35:55.000000000 -0400
-@@ -416,7 +416,7 @@
- int rolloff = (int)((double)0.90 * 21477272 * 2 / 1365 / (1 << SampleFreq) ) / 2;
- for(int ch = 0; ch < 2; ch++)
- for(int lr = 0; lr < 2; lr++)
-- ADPCMSynth[ch][lr].treble_eq(blip_eq_t::blip_eq_t(-1000, rolloff, FSettings.SndRate));
-+ ADPCMSynth[ch][lr].treble_eq(blip_eq_t(-1000, rolloff, FSettings.SndRate));
- LSampleFreq = SampleFreq;
- }
- }
diff --git a/community/nginx/ChangeLog b/community/nginx/ChangeLog
deleted file mode 100644
index fb28b1717..000000000
--- a/community/nginx/ChangeLog
+++ /dev/null
@@ -1,7 +0,0 @@
-2009-05-26 sergej <pupykin.s+arch@gmail.com>
-* etc/conf.d params added
-
-2007-06-29 tardo <tardo@nagi-fanboi.net>
-* Built for x86_64
-* Clearly the ugliest pkgbuild I've seen but the author deserves
- kudos
diff --git a/community/perl-xml-dom/PKGBUILD b/community/perl-xml-dom/PKGBUILD
deleted file mode 100644
index 364031b28..000000000
--- a/community/perl-xml-dom/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# This PKGBUILD was generated by cpan4pacman via CPANPLUS::Dist::Pacman
-# Contributor: François Charette <firmicus ατ gmx δοτ net>
-
-pkgname=perl-xml-dom
-pkgver=1.44
-pkgrel=7
-pkgdesc="Implements Level 1 of W3's DOM"
-arch=('i686' 'x86_64')
-url="http://search.cpan.org/dist/XML-DOM"
-license=('GPL' 'PerlArtistic')
-depends=('perl>=5.10.0' 'perlxml>=2.30' 'perl-xml-regexp' 'libxml-perl>=0.07' 'perl-libwww')
-options=('!emptydirs')
-source=(http://www.cpan.org/authors/id/T/TJ/TJMATHER/XML-DOM-$pkgver.tar.gz)
-md5sums=('1ec2032a06e5762984f7a332c199c205')
-
-build() {
- cd $startdir/src/XML-DOM-$pkgver
- PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
- make
- make install DESTDIR=$startdir/pkg
- find $startdir/pkg -name '.packlist' -delete
- find $startdir/pkg -name '*.pod' -delete
-}
diff --git a/community/php52/PKGBUILD b/community/php52/PKGBUILD
deleted file mode 100644
index eee88a905..000000000
--- a/community/php52/PKGBUILD
+++ /dev/null
@@ -1,192 +0,0 @@
-# Maintainer: Evangelos Foutras <foutrelis@gmail.com>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=php52
-pkgver=5.2.17
-pkgrel=5
-_suhosinver=5.2.16-0.9.7
-pkgdesc='A high-level scripting language'
-arch=('i686' 'x86_64')
-license=('PHP')
-url='http://www.php.net'
-backup=('etc/php/php.ini')
-depends=('glibc' 'readline' 'ncurses' 'libxml2' 'pcre')
-makedepends=('apache' 'imap' 'postgresql-libs' 'libmysqlclient'
- 'libldap' 'postfix' 'libpng' 'libjpeg' 'sqlite3' 'unixodbc'
- 'net-snmp' 'mhash' 'gmp' 'libmcrypt' 'tidyhtml' 'aspell' 'libtool'
- 'freetype2' 'curl' 'libxslt' 'pam' 'openssl' 'bzip2' 'gdbm' 'db')
-optdepends=('bzip2: bz2'
- 'curl: curl'
- 'gdbm: dba'
- 'libpng: gd'
- 'libjpeg: gd'
- 'freetype2: gd'
- 'pam: imap'
- 'libldap: ldap'
- 'libmcrypt: mcrypt'
- 'libtool: mcrypt'
- 'libmysqlclient: mysql/mysqli/pdo_mysql'
- 'unixodbc: odbc/pdo_odbc'
- 'openssl: openssl'
- 'postgresql-libs: pgsql/pdo_pgsql'
- 'aspell: pspell'
- 'net-snmp: snmp'
- 'sqlite3: pdo_sqlite'
- 'tidyhtml: tidy'
- 'libxslt: xsl'
- 'mhash: mhash'
- 'gmp: gmp')
-provides=("php=$pkgver")
-conflicts=('php')
-source=("http://php.net/distributions/php-${pkgver}.tar.bz2"
- "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz"
- 'php.ini'
- 'apache.conf'
- 'db-configure.patch'
- 'db-5.patch'
- 'libpng14.patch')
-md5sums=('b27947f3045220faf16e4d9158cbfe13'
- 'd815fc99a0c25c21f5df28551fcbb001'
- '55c09c89e34eb5c555d842a4d01590e6'
- '96ca078be6729b665be8a865535a97bf'
- 'f3da248d934bc99354fdfa98cdac23ad'
- '40f3d5f546087dac33bfa21a85b79203'
- '77ea0756996df0932fce472ff3ec2693')
-
-build() {
- phpconfig="--prefix=/usr \
- --sysconfdir=/etc/php \
- --with-layout=GNU \
- --with-config-file-path=/etc/php \
- --with-config-file-scan-dir=/etc/php/conf.d \
- --enable-inline-optimization \
- --disable-debug \
- --disable-rpath \
- --disable-static \
- --enable-shared \
- --mandir=/usr/share/man \
- "
-
- phpextensions="--with-openssl=shared \
- --with-zlib=shared \
- --enable-bcmath=shared \
- --with-bz2=shared \
- --enable-calendar=shared \
- --with-curl=shared \
- --enable-dba=shared \
- --without-db2 \
- --without-db3 \
- --with-db4=shared \
- --with-gdbm=shared \
- --enable-dbase=shared \
- --enable-exif=shared \
- --enable-ftp=shared \
- --with-gd=shared \
- --enable-gd-native-ttf \
- --with-jpeg-dir=shared,/usr \
- --with-png-dir=shared,/usr \
- --with-gettext=shared \
- --with-imap=shared \
- --with-imap-ssl=shared \
- --with-ldap=shared \
- --enable-mbstring=shared \
- --with-mcrypt=shared \
- --with-mysql=shared \
- --with-mysql-sock=/var/run/mysqld/mysqld.sock \
- --with-mysql=shared \
- --with-mysqli=shared \
- --with-ncurses=shared \
- --with-unixODBC=shared,/usr \
- --enable-pdo=shared \
- --with-pdo-mysql=shared \
- --with-pdo-sqlite=shared,/usr \
- --with-pdo-odbc=shared,unixODBC,/usr \
- --with-pdo-pgsql=shared \
- --with-sqlite=shared \
- --enable-sqlite-utf8 \
- --with-pgsql=shared \
- --enable-shmop=shared \
- --with-snmp=shared \
- --enable-soap=shared \
- --enable-sysvmsg=shared \
- --enable-sysvsem=shared \
- --enable-sysvshm=shared \
- --with-tidy=shared \
- --with-xsl=shared \
- --enable-zip=shared \
- --enable-posix=shared \
- --enable-sockets=shared \
- --enable-xml \
- --with-ttf=shared \
- --enable-session=shared \
- --with-regex=php \
- --with-pcre-regex=/usr \
- --enable-mbstring=all \
- --enable-mbregex \
- --enable-json=shared \
- --with-iconv=shared \
- --with-xmlrpc=shared \
- --with-pspell=shared \
- --with-freetype-dir=shared,/usr \
- --with-mime-magic=shared \
- --with-gmp=shared \
- --with-mhash=shared \
- "
-
- PEAR_INSTALLDIR=/usr/share/pear
- export PEAR_INSTALLDIR
-
- cd ${srcdir}/php-${pkgver}
-
- # db 5.1 fix
- patch -p4 -i ${srcdir}/db-5.patch
-
- # avoid linking against old db version
- patch -p0 -i ${srcdir}/db-configure.patch
-
- # libpng 1.4 fix
- patch -p3 -i ${srcdir}/libpng14.patch
-
- # gmp 5.0 fix
- sed -i 's/__GMP_BITS_PER_MP_LIMB/GMP_LIMB_BITS/g' ext/gmp/gmp.c
-
- # apply suhosin patch
- patch -p1 -i ${srcdir}/suhosin-patch-${_suhosinver}.patch
-
- # cli
- ./configure ${phpconfig} \
- --disable-cgi \
- --with-readline \
- --enable-pcntl \
- --with-pear=/usr/share/pear \
- ${phpextensions}
- make
- # make test
- make -j1 INSTALL_ROOT=${pkgdir} install
-
- # cleanup
- rm -f ${pkgdir}`${pkgdir}/usr/bin/php-config --extension-dir`/*.a
- # install php.ini
- install -D -m644 ${srcdir}/php.ini ${pkgdir}/etc/php/php.ini
- install -d -m755 ${pkgdir}/etc/php/conf.d/
-
- # cgi and fcgi
- ./configure ${phpconfig} \
- --enable-fastcgi \
- --enable-cgi \
- --enable-discard-path \
- --enable-force-cgi-redirect \
- --disable-cli \
- ${phpextensions}
- make
- install -D -m755 sapi/cgi/php-cgi ${pkgdir}/usr/bin/php-cgi
-
- # mod_php
- ./configure ${phpconfig} \
- --with-apxs2 \
- --disable-cli \
- ${phpextensions}
- make
- install -D -m644 libs/libphp5.so ${pkgdir}/usr/lib/httpd/modules/libphp5.so
- install -D -m644 ${srcdir}/apache.conf ${pkgdir}/etc/httpd/conf/extra/php5_module.conf
-}
diff --git a/community/php52/apache.conf b/community/php52/apache.conf
deleted file mode 100644
index 86344c803..000000000
--- a/community/php52/apache.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-# Required modules: dir_module, php5_module
-
-<IfModule dir_module>
- <IfModule php5_module>
- DirectoryIndex index.php index.html
- AddHandler application/x-httpd-php .php
- AddHandler application/x-httpd-php-source .phps
- </IfModule>
-</IfModule> \ No newline at end of file
diff --git a/community/php52/db-5.patch b/community/php52/db-5.patch
deleted file mode 100644
index 46c64c8b0..000000000
--- a/community/php52/db-5.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- omg/kittens/everywhere/lol/configure.orig 2010-07-21 17:31:30.000000000 +0300
-+++ omg/kittens/everywhere/lol/configure 2010-10-21 00:05:41.000000000 +0300
-@@ -28605,7 +28610,7 @@ if { (eval echo configure:28601: \"$ac_l
- #include "confdefs.h"
-
- #include "$THIS_INCLUDE"
--#if DB_VERSION_MAJOR == 4
-+#if DB_VERSION_MAJOR == 4 || DB_VERSION_MAJOR == 5
- yes
- #endif
-
-@@ -28649,7 +28654,7 @@ echo "configure:28647: checking for DB4
- #include "confdefs.h"
-
- #include "$THIS_INCLUDE"
--#if DB_VERSION_MINOR != 1 || DB_VERSION_PATCH >= 25
-+#if DB_VERSION_MINOR != 1 || (DB_VERSION_MINOR == 1 && DB_VERSION_PATCH >= 25) || DB_VERSION_MAJOR == 5
- yes
- #endif
-
-
-Modified: php/php-src/branches/PHP_5_3/ext/dba/dba_db4.c
-===================================================================
---- php/php-src/branches/PHP_5_3/ext/dba/dba_db4.c 2010-06-03 06:57:47 UTC (rev 300150)
-+++ php/php-src/branches/PHP_5_3/ext/dba/dba_db4.c 2010-06-03 07:03:05 UTC (rev 300151)
-@@ -37,14 +37,14 @@
- #endif
-
- static void php_dba_db4_errcall_fcn(
--#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3)
-+#if (DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3))
- const DB_ENV *dbenv,
- #endif
- const char *errpfx, const char *msg)
- {
- TSRMLS_FETCH();
-
--#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 8 && DB_VERSION_PATCH <= 26)
-+#if (DB_VERSION_MAJOR == 5 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 8))
- /* Bug 51086, Berkeley DB 4.8.26 */
- /* This code suppresses a BDB 4.8 error message that BDB incorrectly emits */
- {
-@@ -124,7 +124,7 @@
- if ((err=db_create(&dbp, NULL, 0)) == 0) {
- dbp->set_errcall(dbp, php_dba_db4_errcall_fcn);
- if (
--#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
-+#if (DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1))
- (err=dbp->open(dbp, 0, info->path, NULL, type, gmode, filemode)) == 0) {
- #else
- (err=dbp->open(dbp, info->path, NULL, type, gmode, filemode)) == 0) {
diff --git a/community/php52/db-configure.patch b/community/php52/db-configure.patch
deleted file mode 100644
index 404febeaa..000000000
--- a/community/php52/db-configure.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- configure.orig 2008-07-03 10:27:06.000000000 +0000
-+++ configure 2008-07-03 10:30:56.000000000 +0000
-@@ -28399,51 +28399,15 @@
-
- unset THIS_INCLUDE THIS_LIBS THIS_LFLAGS THIS_PREFIX THIS_RESULT
-
-- dbdp="/usr/local/BerkeleyDB.4."
-- for i in $PHP_DB4 ${dbdp}8 ${dbdp}7 ${dbdp}6 ${dbdp}5 ${dbdp}4 ${dbdp}3 ${dbdp}2 ${dbdp}1 ${dbdp}0 /usr/local /usr; do
-- if test -f "$i/db4/db.h"; then
-- THIS_PREFIX=$i
-- THIS_INCLUDE=$i/db4/db.h
-- break
-- elif test -f "$i/include/db4.8/db.h"; then
-- THIS_PREFIX=$i
-- THIS_INCLUDE=$i/include/db4.8/db.h
-- break
-- elif test -f "$i/include/db4.7/db.h"; then
-- THIS_PREFIX=$i
-- THIS_INCLUDE=$i/include/db4.7/db.h
-- break
-- elif test -f "$i/include/db4.6/db.h"; then
-- THIS_PREFIX=$i
-- THIS_INCLUDE=$i/include/db4.6/db.h
-- break
-- elif test -f "$i/include/db4.5/db.h"; then
-- THIS_PREFIX=$i
-- THIS_INCLUDE=$i/include/db4.5/db.h
-- break
-- elif test -f "$i/include/db4/db.h"; then
-- THIS_PREFIX=$i
-- THIS_INCLUDE=$i/include/db4/db.h
-- break
-- elif test -f "$i/include/db/db4.h"; then
-- THIS_PREFIX=$i
-- THIS_INCLUDE=$i/include/db/db4.h
-- break
-- elif test -f "$i/include/db4.h"; then
-- THIS_PREFIX=$i
-- THIS_INCLUDE=$i/include/db4.h
-- break
-- elif test -f "$i/include/db.h"; then
-- THIS_PREFIX=$i
-- THIS_INCLUDE=$i/include/db.h
-- break
-- fi
-- done
-+ if test -f "/usr/include/db.h"; then
-+ THIS_PREFIX=/usr
-+ THIS_INCLUDE=/usr/include/db.h
-+ fi
-
- if test -z "$THIS_INCLUDE"; then
- { echo "configure: error: DBA: Could not find necessary header file(s)." 1>&2; exit 1; }
- fi
-- for LIB in db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db; do
-+ for LIB in db; do
- if test -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.a || test -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.$SHLIB_SUFFIX_NAME; then
- lib_found="";
-
diff --git a/community/php52/libpng14.patch b/community/php52/libpng14.patch
deleted file mode 100644
index 08bb4e1dd..000000000
--- a/community/php52/libpng14.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- php/php-src/trunk/ext/gd/libgd/gd_png.c 2009/04/01 16:05:17 278124
-+++ php/php-src/trunk/ext/gd/libgd/gd_png.c 2010/01/10 02:13:45 293341
-@@ -145,7 +145,7 @@
- return NULL;
- }
-
-- if (!png_check_sig (sig, 8)) { /* bad signature */
-+ if (png_sig_cmp(sig, 0, 8) != 0) { /* bad signature */
- return NULL;
- }
-
diff --git a/community/php52/php.ini b/community/php52/php.ini
deleted file mode 100644
index 26f632bd4..000000000
--- a/community/php52/php.ini
+++ /dev/null
@@ -1,1309 +0,0 @@
-[PHP]
-
-;;;;;;;;;;;;;;;;;;;
-; About php.ini ;
-;;;;;;;;;;;;;;;;;;;
-; This file controls many aspects of PHP's behavior. In order for PHP to
-; read it, it must be named 'php.ini'. PHP looks for it in the current
-; working directory, in the path designated by the environment variable
-; PHPRC, and in the path that was defined in compile time (in that order).
-; The path in which the php.ini file is looked for can be overridden using
-; the -c argument in command line mode.
-;
-; The syntax of the file is extremely simple. Whitespace and Lines
-; beginning with a semicolon are silently ignored (as you probably guessed).
-; Section headers (e.g. [Foo]) are also silently ignored, even though
-; they might mean something in the future.
-;
-; Directives are specified using the following syntax:
-; directive = value
-; Directive names are *case sensitive* - foo=bar is different from FOO=bar.
-;
-; The value can be a string, a number, a PHP constant (e.g. E_ALL or M_PI), one
-; of the INI constants (On, Off, True, False, Yes, No and None) or an expression
-; (e.g. E_ALL & ~E_NOTICE), or a quoted string ("foo").
-;
-; Expressions in the INI file are limited to bitwise operators and parentheses:
-; | bitwise OR
-; & bitwise AND
-; ~ bitwise NOT
-; ! boolean NOT
-;
-; Boolean flags can be turned on using the values 1, On, True or Yes.
-; They can be turned off using the values 0, Off, False or No.
-;
-; An empty string can be denoted by simply not writing anything after the equal
-; sign, or by using the None keyword:
-;
-; foo = ; sets foo to an empty string
-; foo = none ; sets foo to an empty string
-; foo = "none" ; sets foo to the string 'none'
-;
-; If you use constants in your value, and these constants belong to a
-; dynamically loaded extension (either a PHP extension or a Zend extension),
-; you may only use these constants *after* the line that loads the extension.
-;
-;
-;;;;;;;;;;;;;;;;;;;
-; About this file ;
-;;;;;;;;;;;;;;;;;;;
-; This is the recommended, PHP 5-style version of the php.ini-dist file. It
-; sets some non standard settings, that make PHP more efficient, more secure,
-; and encourage cleaner coding.
-;
-; The price is that with these settings, PHP may be incompatible with some
-; applications, and sometimes, more difficult to develop with. Using this
-; file is warmly recommended for production sites. As all of the changes from
-; the standard settings are thoroughly documented, you can go over each one,
-; and decide whether you want to use it or not.
-;
-; For general information about the php.ini file, please consult the php.ini-dist
-; file, included in your PHP distribution.
-;
-; This file is different from the php.ini-dist file in the fact that it features
-; different values for several directives, in order to improve performance, while
-; possibly breaking compatibility with the standard out-of-the-box behavior of
-; PHP. Please make sure you read what's different, and modify your scripts
-; accordingly, if you decide to use this file instead.
-;
-; - register_long_arrays = Off [Performance]
-; Disables registration of the older (and deprecated) long predefined array
-; variables ($HTTP_*_VARS). Instead, use the superglobals that were
-; introduced in PHP 4.1.0
-; - display_errors = Off [Security]
-; With this directive set to off, errors that occur during the execution of
-; scripts will no longer be displayed as a part of the script output, and thus,
-; will no longer be exposed to remote users. With some errors, the error message
-; content may expose information about your script, web server, or database
-; server that may be exploitable for hacking. Production sites should have this
-; directive set to off.
-; - log_errors = On [Security]
-; This directive complements the above one. Any errors that occur during the
-; execution of your script will be logged (typically, to your server's error log,
-; but can be configured in several ways). Along with setting display_errors to off,
-; this setup gives you the ability to fully understand what may have gone wrong,
-; without exposing any sensitive information to remote users.
-; - output_buffering = 4096 [Performance]
-; Set a 4KB output buffer. Enabling output buffering typically results in less
-; writes, and sometimes less packets sent on the wire, which can often lead to
-; better performance. The gain this directive actually yields greatly depends
-; on which Web server you're working with, and what kind of scripts you're using.
-; - register_argc_argv = Off [Performance]
-; Disables registration of the somewhat redundant $argv and $argc global
-; variables.
-; - magic_quotes_gpc = Off [Performance]
-; Input data is no longer escaped with slashes so that it can be sent into
-; SQL databases without further manipulation. Instead, you should use the
-; database vendor specific escape string function on each input element you
-; wish to send to a database.
-; - variables_order = "GPCS" [Performance]
-; The environment variables are not hashed into the $_ENV. To access
-; environment variables, you can use getenv() instead.
-; - error_reporting = E_ALL [Code Cleanliness, Security(?)]
-; By default, PHP suppresses errors of type E_NOTICE. These error messages
-; are emitted for non-critical errors, but that could be a symptom of a bigger
-; problem. Most notably, this will cause error messages about the use
-; of uninitialized variables to be displayed.
-; - allow_call_time_pass_reference = Off [Code cleanliness]
-; It's not possible to decide to force a variable to be passed by reference
-; when calling a function. The PHP 4 style to do this is by making the
-; function require the relevant argument by reference.
-; - short_open_tag = Off [Portability]
-; Using short tags is discouraged when developing code meant for redistribution
-; since short tags may not be supported on the target server.
-
-;;;;;;;;;;;;;;;;;;;;
-; Language Options ;
-;;;;;;;;;;;;;;;;;;;;
-
-; Enable the PHP scripting language engine under Apache.
-engine = On
-
-; Enable compatibility mode with Zend Engine 1 (PHP 4.x)
-zend.ze1_compatibility_mode = Off
-
-; Allow the <? tag. Otherwise, only <?php and <script> tags are recognized.
-; NOTE: Using short tags should be avoided when developing applications or
-; libraries that are meant for redistribution, or deployment on PHP
-; servers which are not under your control, because short tags may not
-; be supported on the target server. For portable, redistributable code,
-; be sure not to use short tags.
-short_open_tag = Off
-
-; Allow ASP-style <% %> tags.
-asp_tags = Off
-
-; The number of significant digits displayed in floating point numbers.
-precision = 14
-
-; Enforce year 2000 compliance (will cause problems with non-compliant browsers)
-y2k_compliance = On
-
-; Output buffering allows you to send header lines (including cookies) even
-; after you send body content, at the price of slowing PHP's output layer a
-; bit. You can enable output buffering during runtime by calling the output
-; buffering functions. You can also enable output buffering for all files by
-; setting this directive to On. If you wish to limit the size of the buffer
-; to a certain size - you can use a maximum number of bytes instead of 'On', as
-; a value for this directive (e.g., output_buffering=4096).
-output_buffering = 4096
-
-; You can redirect all of the output of your scripts to a function. For
-; example, if you set output_handler to "mb_output_handler", character
-; encoding will be transparently converted to the specified encoding.
-; Setting any output handler automatically turns on output buffering.
-; Note: People who wrote portable scripts should not depend on this ini
-; directive. Instead, explicitly set the output handler using ob_start().
-; Using this ini directive may cause problems unless you know what script
-; is doing.
-; Note: You cannot use both "mb_output_handler" with "ob_iconv_handler"
-; and you cannot use both "ob_gzhandler" and "zlib.output_compression".
-; Note: output_handler must be empty if this is set 'On' !!!!
-; Instead you must use zlib.output_handler.
-;output_handler =
-
-; Transparent output compression using the zlib library
-; Valid values for this option are 'off', 'on', or a specific buffer size
-; to be used for compression (default is 4KB)
-; Note: Resulting chunk size may vary due to nature of compression. PHP
-; outputs chunks that are few hundreds bytes each as a result of
-; compression. If you prefer a larger chunk size for better
-; performance, enable output_buffering in addition.
-; Note: You need to use zlib.output_handler instead of the standard
-; output_handler, or otherwise the output will be corrupted.
-zlib.output_compression = Off
-;zlib.output_compression_level = -1
-
-; You cannot specify additional output handlers if zlib.output_compression
-; is activated here. This setting does the same as output_handler but in
-; a different order.
-;zlib.output_handler =
-
-; Implicit flush tells PHP to tell the output layer to flush itself
-; automatically after every output block. This is equivalent to calling the
-; PHP function flush() after each and every call to print() or echo() and each
-; and every HTML block. Turning this option on has serious performance
-; implications and is generally recommended for debugging purposes only.
-implicit_flush = Off
-
-; The unserialize callback function will be called (with the undefined class'
-; name as parameter), if the unserializer finds an undefined class
-; which should be instantiated.
-; A warning appears if the specified function is not defined, or if the
-; function doesn't include/implement the missing class.
-; So only set this entry, if you really want to implement such a
-; callback-function.
-unserialize_callback_func=
-
-; When floats & doubles are serialized store serialize_precision significant
-; digits after the floating point. The default value ensures that when floats
-; are decoded with unserialize, the data will remain the same.
-serialize_precision = 100
-
-; Whether to enable the ability to force arguments to be passed by reference
-; at function call time. This method is deprecated and is likely to be
-; unsupported in future versions of PHP/Zend. The encouraged method of
-; specifying which arguments should be passed by reference is in the function
-; declaration. You're encouraged to try and turn this option Off and make
-; sure your scripts work properly with it in order to ensure they will work
-; with future versions of the language (you will receive a warning each time
-; you use this feature, and the argument will be passed by value instead of by
-; reference).
-allow_call_time_pass_reference = Off
-
-;
-; Safe Mode
-;
-safe_mode = Off
-
-; By default, Safe Mode does a UID compare check when
-; opening files. If you want to relax this to a GID compare,
-; then turn on safe_mode_gid.
-safe_mode_gid = Off
-
-; When safe_mode is on, UID/GID checks are bypassed when
-; including files from this directory and its subdirectories.
-; (directory must also be in include_path or full path must
-; be used when including)
-safe_mode_include_dir =
-
-; When safe_mode is on, only executables located in the safe_mode_exec_dir
-; will be allowed to be executed via the exec family of functions.
-safe_mode_exec_dir =
-
-; Setting certain environment variables may be a potential security breach.
-; This directive contains a comma-delimited list of prefixes. In Safe Mode,
-; the user may only alter environment variables whose names begin with the
-; prefixes supplied here. By default, users will only be able to set
-; environment variables that begin with PHP_ (e.g. PHP_FOO=BAR).
-;
-; Note: If this directive is empty, PHP will let the user modify ANY
-; environment variable!
-safe_mode_allowed_env_vars = PHP_
-
-; This directive contains a comma-delimited list of environment variables that
-; the end user won't be able to change using putenv(). These variables will be
-; protected even if safe_mode_allowed_env_vars is set to allow to change them.
-safe_mode_protected_env_vars = LD_LIBRARY_PATH
-
-; open_basedir, if set, limits all file operations to the defined directory
-; and below. This directive makes most sense if used in a per-directory
-; or per-virtualhost web server configuration file. This directive is
-; *NOT* affected by whether Safe Mode is turned On or Off.
-open_basedir = /srv/http/:/home/:/tmp/:/usr/share/pear/
-
-; This directive allows you to disable certain functions for security reasons.
-; It receives a comma-delimited list of function names. This directive is
-; *NOT* affected by whether Safe Mode is turned On or Off.
-disable_functions =
-
-; This directive allows you to disable certain classes for security reasons.
-; It receives a comma-delimited list of class names. This directive is
-; *NOT* affected by whether Safe Mode is turned On or Off.
-disable_classes =
-
-; Colors for Syntax Highlighting mode. Anything that's acceptable in
-; <span style="color: ???????"> would work.
-;highlight.string = #DD0000
-;highlight.comment = #FF9900
-;highlight.keyword = #007700
-;highlight.bg = #FFFFFF
-;highlight.default = #0000BB
-;highlight.html = #000000
-
-; If enabled, the request will be allowed to complete even if the user aborts
-; the request. Consider enabling it if executing long request, which may end up
-; being interrupted by the user or a browser timing out.
-; ignore_user_abort = On
-
-; Determines the size of the realpath cache to be used by PHP. This value should
-; be increased on systems where PHP opens many files to reflect the quantity of
-; the file operations performed.
-; realpath_cache_size=16k
-
-; Duration of time, in seconds for which to cache realpath information for a given
-; file or directory. For systems with rarely changing files, consider increasing this
-; value.
-; realpath_cache_ttl=120
-
-;
-; Misc
-;
-; Decides whether PHP may expose the fact that it is installed on the server
-; (e.g. by adding its signature to the Web server header). It is no security
-; threat in any way, but it makes it possible to determine whether you use PHP
-; on your server or not.
-expose_php = On
-
-
-;;;;;;;;;;;;;;;;;;;
-; Resource Limits ;
-;;;;;;;;;;;;;;;;;;;
-
-max_execution_time = 30 ; Maximum execution time of each script, in seconds
-max_input_time = 60 ; Maximum amount of time each script may spend parsing request data
-;max_input_nesting_level = 64 ; Maximum input variable nesting level
-memory_limit = 128M ; Maximum amount of memory a script may consume (128MB)
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Error handling and logging ;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-; error_reporting is a bit-field. Or each number up to get desired error
-; reporting level
-; E_ALL - All errors and warnings (doesn't include E_STRICT)
-; E_ERROR - fatal run-time errors
-; E_RECOVERABLE_ERROR - almost fatal run-time errors
-; E_WARNING - run-time warnings (non-fatal errors)
-; E_PARSE - compile-time parse errors
-; E_NOTICE - run-time notices (these are warnings which often result
-; from a bug in your code, but it's possible that it was
-; intentional (e.g., using an uninitialized variable and
-; relying on the fact it's automatically initialized to an
-; empty string)
-; E_STRICT - run-time notices, enable to have PHP suggest changes
-; to your code which will ensure the best interoperability
-; and forward compatibility of your code
-; E_CORE_ERROR - fatal errors that occur during PHP's initial startup
-; E_CORE_WARNING - warnings (non-fatal errors) that occur during PHP's
-; initial startup
-; E_COMPILE_ERROR - fatal compile-time errors
-; E_COMPILE_WARNING - compile-time warnings (non-fatal errors)
-; E_USER_ERROR - user-generated error message
-; E_USER_WARNING - user-generated warning message
-; E_USER_NOTICE - user-generated notice message
-;
-; Examples:
-;
-; - Show all errors, except for notices and coding standards warnings
-;
-;error_reporting = E_ALL & ~E_NOTICE
-;
-; - Show all errors, except for notices
-;
-;error_reporting = E_ALL & ~E_NOTICE | E_STRICT
-;
-; - Show only errors
-;
-;error_reporting = E_COMPILE_ERROR|E_RECOVERABLE_ERROR|E_ERROR|E_CORE_ERROR
-;
-; - Show all errors, except coding standards warnings
-;
-error_reporting = E_ALL
-
-; Print out errors (as a part of the output). For production web sites,
-; you're strongly encouraged to turn this feature off, and use error logging
-; instead (see below). Keeping display_errors enabled on a production web site
-; may reveal security information to end users, such as file paths on your Web
-; server, your database schema or other information.
-;
-; possible values for display_errors:
-;
-; Off - Do not display any errors
-; stderr - Display errors to STDERR (affects only CGI/CLI binaries!)
-; On or stdout - Display errors to STDOUT (default)
-;
-; To output errors to STDERR with CGI/CLI:
-;display_errors = "stderr"
-;
-; Default
-;
-display_errors = Off
-
-; Even when display_errors is on, errors that occur during PHP's startup
-; sequence are not displayed. It's strongly recommended to keep
-; display_startup_errors off, except for when debugging.
-display_startup_errors = Off
-
-; Log errors into a log file (server-specific log, stderr, or error_log (below))
-; As stated above, you're strongly advised to use error logging in place of
-; error displaying on production web sites.
-log_errors = On
-
-; Set maximum length of log_errors. In error_log information about the source is
-; added. The default is 1024 and 0 allows to not apply any maximum length at all.
-log_errors_max_len = 1024
-
-; Do not log repeated messages. Repeated errors must occur in same file on same
-; line unless ignore_repeated_source is set true.
-ignore_repeated_errors = Off
-
-; Ignore source of message when ignoring repeated messages. When this setting
-; is On you will not log errors with repeated messages from different files or
-; source lines.
-ignore_repeated_source = Off
-
-; If this parameter is set to Off, then memory leaks will not be shown (on
-; stdout or in the log). This has only effect in a debug compile, and if
-; error reporting includes E_WARNING in the allowed list
-report_memleaks = Off
-
-;report_zend_debug = 0
-
-; Store the last error/warning message in $php_errormsg (boolean).
-track_errors = Off
-
-; Turn off normal error reporting and emit XML-RPC error XML
-;xmlrpc_errors = 0
-; An XML-RPC faultCode
-;xmlrpc_error_number = 0
-
-; Disable the inclusion of HTML tags in error messages.
-; Note: Never use this feature for production boxes.
-;html_errors = Off
-
-; If html_errors is set On PHP produces clickable error messages that direct
-; to a page describing the error or function causing the error in detail.
-; You can download a copy of the PHP manual from http://www.php.net/docs.php
-; and change docref_root to the base URL of your local copy including the
-; leading '/'. You must also specify the file extension being used including
-; the dot.
-; Note: Never use this feature for production boxes.
-;docref_root = "/phpmanual/"
-;docref_ext = .html
-
-; String to output before an error message.
-;error_prepend_string = "<font color=#ff0000>"
-
-; String to output after an error message.
-;error_append_string = "</font>"
-
-; Log errors to specified file.
-;error_log = filename
-
-; Log errors to syslog.
-;error_log = syslog
-
-
-;;;;;;;;;;;;;;;;;
-; Data Handling ;
-;;;;;;;;;;;;;;;;;
-;
-; Note - track_vars is ALWAYS enabled as of PHP 4.0.3
-
-; The separator used in PHP generated URLs to separate arguments.
-; Default is "&".
-;arg_separator.output = "&amp;"
-
-; List of separator(s) used by PHP to parse input URLs into variables.
-; Default is "&".
-; NOTE: Every character in this directive is considered as separator!
-;arg_separator.input = ";&"
-
-; This directive describes the order in which PHP registers GET, POST, Cookie,
-; Environment and Built-in variables (G, P, C, E & S respectively, often
-; referred to as EGPCS or GPC). Registration is done from left to right, newer
-; values override older values.
-variables_order = "GPCS"
-
-; Whether or not to register the EGPCS variables as global variables. You may
-; want to turn this off if you don't want to clutter your scripts' global scope
-; with user data. This makes most sense when coupled with track_vars - in which
-; case you can access all of the GPC variables through the $HTTP_*_VARS[],
-; variables.
-;
-; You should do your best to write your scripts so that they do not require
-; register_globals to be on; Using form variables as globals can easily lead
-; to possible security problems, if the code is not very well thought of.
-register_globals = Off
-
-; Whether or not to register the old-style input arrays, HTTP_GET_VARS
-; and friends. If you're not using them, it's recommended to turn them off,
-; for performance reasons.
-register_long_arrays = Off
-
-; This directive tells PHP whether to declare the argv&argc variables (that
-; would contain the GET information). If you don't use these variables, you
-; should turn it off for increased performance.
-register_argc_argv = Off
-
-; When enabled, the SERVER and ENV variables are created when they're first
-; used (Just In Time) instead of when the script starts. If these variables
-; are not used within a script, having this directive on will result in a
-; performance gain. The PHP directives register_globals, register_long_arrays,
-; and register_argc_argv must be disabled for this directive to have any affect.
-auto_globals_jit = On
-
-; Maximum size of POST data that PHP will accept.
-post_max_size = 8M
-
-; Magic quotes
-;
-
-; Magic quotes for incoming GET/POST/Cookie data.
-magic_quotes_gpc = Off
-
-; Magic quotes for runtime-generated data, e.g. data from SQL, from exec(), etc.
-magic_quotes_runtime = Off
-
-; Use Sybase-style magic quotes (escape ' with '' instead of \').
-magic_quotes_sybase = Off
-
-; Automatically add files before or after any PHP document.
-auto_prepend_file =
-auto_append_file =
-
-; As of 4.0b4, PHP always outputs a character encoding by default in
-; the Content-type: header. To disable sending of the charset, simply
-; set it to be empty.
-;
-; PHP's built-in default is text/html
-default_mimetype = "text/html"
-;default_charset = "iso-8859-1"
-
-; Always populate the $HTTP_RAW_POST_DATA variable.
-;always_populate_raw_post_data = On
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;
-; Paths and Directories ;
-;;;;;;;;;;;;;;;;;;;;;;;;;
-
-; UNIX: "/path1:/path2"
-include_path = ".:/usr/share/pear"
-
-; The root of the PHP pages, used only if nonempty.
-; if PHP was not compiled with FORCE_REDIRECT, you SHOULD set doc_root
-; if you are running php as a CGI under any web server (other than IIS)
-; see documentation for security issues. The alternate is to use the
-; cgi.force_redirect configuration below
-doc_root =
-
-; The directory under which PHP opens the script using /~username used only
-; if nonempty.
-user_dir =
-
-; Directory in which the loadable extensions (modules) reside.
-extension_dir = "/usr/lib/php/20060613/"
-
-; Whether or not to enable the dl() function. The dl() function does NOT work
-; properly in multithreaded servers, such as IIS or Zeus, and is automatically
-; disabled on them.
-enable_dl = Off
-
-; cgi.force_redirect is necessary to provide security running PHP as a CGI under
-; most web servers. Left undefined, PHP turns this on by default. You can
-; turn it off here AT YOUR OWN RISK
-; **You CAN safely turn this off for IIS, in fact, you MUST.**
-; cgi.force_redirect = 1
-
-; if cgi.nph is enabled it will force cgi to always sent Status: 200 with
-; every request.
-; cgi.nph = 1
-
-; if cgi.force_redirect is turned on, and you are not running under Apache or Netscape
-; (iPlanet) web servers, you MAY need to set an environment variable name that PHP
-; will look for to know it is OK to continue execution. Setting this variable MAY
-; cause security issues, KNOW WHAT YOU ARE DOING FIRST.
-; cgi.redirect_status_env = ;
-
-; cgi.fix_pathinfo provides *real* PATH_INFO/PATH_TRANSLATED support for CGI. PHP's
-; previous behaviour was to set PATH_TRANSLATED to SCRIPT_FILENAME, and to not grok
-; what PATH_INFO is. For more information on PATH_INFO, see the cgi specs. Setting
-; this to 1 will cause PHP CGI to fix it's paths to conform to the spec. A setting
-; of zero causes PHP to behave as before. Default is 1. You should fix your scripts
-; to use SCRIPT_FILENAME rather than PATH_TRANSLATED.
-; cgi.fix_pathinfo=1
-
-; FastCGI under IIS (on WINNT based OS) supports the ability to impersonate
-; security tokens of the calling client. This allows IIS to define the
-; security context that the request runs under. mod_fastcgi under Apache
-; does not currently support this feature (03/17/2002)
-; Set to 1 if running under IIS. Default is zero.
-; fastcgi.impersonate = 1;
-
-; Disable logging through FastCGI connection
-; fastcgi.logging = 0
-
-; cgi.rfc2616_headers configuration option tells PHP what type of headers to
-; use when sending HTTP response code. If it's set 0 PHP sends Status: header that
-; is supported by Apache. When this option is set to 1 PHP will send
-; RFC2616 compliant header.
-; Default is zero.
-;cgi.rfc2616_headers = 0
-
-
-;;;;;;;;;;;;;;;;
-; File Uploads ;
-;;;;;;;;;;;;;;;;
-
-; Whether to allow HTTP file uploads.
-file_uploads = On
-
-; Temporary directory for HTTP uploaded files (will use system default if not
-; specified).
-;upload_tmp_dir =
-
-; Maximum allowed size for uploaded files.
-upload_max_filesize = 2M
-
-; Maximum number of files that can be uploaded via a single request
-max_file_uploads = 20
-
-
-;;;;;;;;;;;;;;;;;;
-; Fopen wrappers ;
-;;;;;;;;;;;;;;;;;;
-
-; Whether to allow the treatment of URLs (like http:// or ftp://) as files.
-allow_url_fopen = On
-
-; Whether to allow include/require to open URLs (like http:// or ftp://) as files.
-allow_url_include = Off
-
-; Define the anonymous ftp password (your email address)
-;from="john@doe.com"
-
-; Define the User-Agent string
-; user_agent="PHP"
-
-; Default timeout for socket based streams (seconds)
-default_socket_timeout = 60
-
-
-;;;;;;;;;;;;;;;;;;;;;;
-; Dynamic Extensions ;
-;;;;;;;;;;;;;;;;;;;;;;
-;
-; If you wish to have an extension loaded automatically, use the following
-; syntax:
-;
-; extension=modulename.extension
-;
-; For example, under UNIX:
-;
-; extension=msql.so
-;
-; Note that it should be the name of the module only; no directory information
-; needs to go here. Specify the location of the extension with the
-; extension_dir directive above.
-
-;extension=bcmath.so
-;extension=bz2.so
-;extension=calendar.so
-;extension=curl.so
-;extension=dba.so
-;extension=dbase.so
-;extension=exif.so
-;extension=ftp.so
-;extension=gd.so
-extension=gettext.so
-;extension=gmp.so
-;extension=iconv.so
-;extension=imap.so
-;extension=json.so
-;extension=ldap.so
-;extension=mcrypt.so
-;extension=mhash.so
-;extension=mime_magic.so
-;extension=mysql.so
-;extension=mysqli.so
-;extension=ncurses.so
-;extension=odbc.so
-;extension=openssl.so
-;extension=pdo.so
-;extension=pdo_mysql.so
-;extension=pdo_odbc.so
-;extension=pdo_pgsql.so
-;extension=pdo_sqlite.so
-;extension=pgsql.so
-;extension=posix.so
-;extension=pspell.so
-extension=session.so
-;extension=shmop.so
-;extension=snmp.so
-;extension=soap.so
-;extension=sockets.so
-;extension=sqlite.so
-;extension=sysvmsg.so
-;extension=sysvsem.so
-;extension=sysvshm.so
-;extension=tidy.so
-;extension=xmlrpc.so
-;extension=xsl.so
-;extension=zip.so
-extension=zlib.so
-
-
-;;;;;;;;;;;;;;;;;;;
-; Module Settings ;
-;;;;;;;;;;;;;;;;;;;
-
-[Date]
-; Defines the default timezone used by the date functions
-;date.timezone =
-
-;date.default_latitude = 31.7667
-;date.default_longitude = 35.2333
-
-;date.sunrise_zenith = 90.583333
-;date.sunset_zenith = 90.583333
-
-[filter]
-;filter.default = unsafe_raw
-;filter.default_flags =
-
-[iconv]
-;iconv.input_encoding = ISO-8859-1
-;iconv.internal_encoding = ISO-8859-1
-;iconv.output_encoding = ISO-8859-1
-
-[sqlite]
-;sqlite.assoc_case = 0
-
-[Pcre]
-;PCRE library backtracking limit.
-;pcre.backtrack_limit=100000
-
-;PCRE library recursion limit.
-;Please note that if you set this value to a high number you may consume all
-;the available process stack and eventually crash PHP (due to reaching the
-;stack size limit imposed by the Operating System).
-;pcre.recursion_limit=100000
-
-[Syslog]
-; Whether or not to define the various syslog variables (e.g. $LOG_PID,
-; $LOG_CRON, etc.). Turning it off is a good idea performance-wise. In
-; runtime, you can define these variables by calling define_syslog_variables().
-define_syslog_variables = Off
-
-[mail function]
-; For Unix only. You may supply arguments as well (default: "sendmail -t -i").
-;sendmail_path =
-
-; Force the addition of the specified parameters to be passed as extra parameters
-; to the sendmail binary. These parameters will always replace the value of
-; the 5th parameter to mail(), even in safe mode.
-;mail.force_extra_parameters =
-
-[SQL]
-sql.safe_mode = Off
-
-[ODBC]
-;odbc.default_db = Not yet implemented
-;odbc.default_user = Not yet implemented
-;odbc.default_pw = Not yet implemented
-
-; Allow or prevent persistent links.
-odbc.allow_persistent = On
-
-; Check that a connection is still valid before reuse.
-odbc.check_persistent = On
-
-; Maximum number of persistent links. -1 means no limit.
-odbc.max_persistent = -1
-
-; Maximum number of links (persistent + non-persistent). -1 means no limit.
-odbc.max_links = -1
-
-; Handling of LONG fields. Returns number of bytes to variables. 0 means
-; passthru.
-odbc.defaultlrl = 4096
-
-; Handling of binary data. 0 means passthru, 1 return as is, 2 convert to char.
-; See the documentation on odbc_binmode and odbc_longreadlen for an explanation
-; of uodbc.defaultlrl and uodbc.defaultbinmode
-odbc.defaultbinmode = 1
-
-[MySQL]
-; Allow or prevent persistent links.
-mysql.allow_persistent = On
-
-; Maximum number of persistent links. -1 means no limit.
-mysql.max_persistent = -1
-
-; Maximum number of links (persistent + non-persistent). -1 means no limit.
-mysql.max_links = -1
-
-; Default port number for mysql_connect(). If unset, mysql_connect() will use
-; the $MYSQL_TCP_PORT or the mysql-tcp entry in /etc/services or the
-; compile-time value defined MYSQL_PORT (in that order).
-mysql.default_port =
-
-; Default socket name for local MySQL connects. If empty, uses the built-in
-; MySQL defaults.
-mysql.default_socket =
-
-; Default host for mysql_connect() (doesn't apply in safe mode).
-mysql.default_host =
-
-; Default user for mysql_connect() (doesn't apply in safe mode).
-mysql.default_user =
-
-; Default password for mysql_connect() (doesn't apply in safe mode).
-; Note that this is generally a *bad* idea to store passwords in this file.
-; *Any* user with PHP access can run 'echo get_cfg_var("mysql.default_password")
-; and reveal this password! And of course, any users with read access to this
-; file will be able to reveal the password as well.
-mysql.default_password =
-
-; Maximum time (in seconds) for connect timeout. -1 means no limit
-mysql.connect_timeout = 60
-
-; Trace mode. When trace_mode is active (=On), warnings for table/index scans and
-; SQL-Errors will be displayed.
-mysql.trace_mode = Off
-
-[MySQLi]
-
-; Maximum number of links. -1 means no limit.
-mysqli.max_links = -1
-
-; Default port number for mysqli_connect(). If unset, mysqli_connect() will use
-; the $MYSQL_TCP_PORT or the mysql-tcp entry in /etc/services or the
-; compile-time value defined MYSQL_PORT (in that order).
-mysqli.default_port = 3306
-
-; Default socket name for local MySQL connects. If empty, uses the built-in
-; MySQL defaults.
-mysqli.default_socket =
-
-; Default host for mysql_connect() (doesn't apply in safe mode).
-mysqli.default_host =
-
-; Default user for mysql_connect() (doesn't apply in safe mode).
-mysqli.default_user =
-
-; Default password for mysqli_connect() (doesn't apply in safe mode).
-; Note that this is generally a *bad* idea to store passwords in this file.
-; *Any* user with PHP access can run 'echo get_cfg_var("mysqli.default_pw")
-; and reveal this password! And of course, any users with read access to this
-; file will be able to reveal the password as well.
-mysqli.default_pw =
-
-; Allow or prevent reconnect
-mysqli.reconnect = Off
-
-[mSQL]
-; Allow or prevent persistent links.
-msql.allow_persistent = On
-
-; Maximum number of persistent links. -1 means no limit.
-msql.max_persistent = -1
-
-; Maximum number of links (persistent+non persistent). -1 means no limit.
-msql.max_links = -1
-
-[OCI8]
-; enables privileged connections using external credentials (OCI_SYSOPER, OCI_SYSDBA)
-;oci8.privileged_connect = Off
-
-; Connection: The maximum number of persistent OCI8 connections per
-; process. Using -1 means no limit.
-;oci8.max_persistent = -1
-
-; Connection: The maximum number of seconds a process is allowed to
-; maintain an idle persistent connection. Using -1 means idle
-; persistent connections will be maintained forever.
-;oci8.persistent_timeout = -1
-
-; Connection: The number of seconds that must pass before issuing a
-; ping during oci_pconnect() to check the connection validity. When
-; set to 0, each oci_pconnect() will cause a ping. Using -1 disables
-; pings completely.
-;oci8.ping_interval = 60
-
-; Tuning: This option enables statement caching, and specifies how
-; many statements to cache. Using 0 disables statement caching.
-;oci8.statement_cache_size = 20
-
-; Tuning: Enables statement prefetching and sets the default number of
-; rows that will be fetched automatically after statement execution.
-;oci8.default_prefetch = 10
-
-; Compatibility. Using On means oci_close() will not close
-; oci_connect() and oci_new_connect() connections.
-;oci8.old_oci_close_semantics = Off
-
-[PostgresSQL]
-; Allow or prevent persistent links.
-pgsql.allow_persistent = On
-
-; Detect broken persistent links always with pg_pconnect().
-; Auto reset feature requires a little overheads.
-pgsql.auto_reset_persistent = Off
-
-; Maximum number of persistent links. -1 means no limit.
-pgsql.max_persistent = -1
-
-; Maximum number of links (persistent+non persistent). -1 means no limit.
-pgsql.max_links = -1
-
-; Ignore PostgreSQL backends Notice message or not.
-; Notice message logging require a little overheads.
-pgsql.ignore_notice = 0
-
-; Log PostgreSQL backends Notice message or not.
-; Unless pgsql.ignore_notice=0, module cannot log notice message.
-pgsql.log_notice = 0
-
-[Sybase]
-; Allow or prevent persistent links.
-sybase.allow_persistent = On
-
-; Maximum number of persistent links. -1 means no limit.
-sybase.max_persistent = -1
-
-; Maximum number of links (persistent + non-persistent). -1 means no limit.
-sybase.max_links = -1
-
-;sybase.interface_file = "/usr/sybase/interfaces"
-
-; Minimum error severity to display.
-sybase.min_error_severity = 10
-
-; Minimum message severity to display.
-sybase.min_message_severity = 10
-
-; Compatibility mode with old versions of PHP 3.0.
-; If on, this will cause PHP to automatically assign types to results according
-; to their Sybase type, instead of treating them all as strings. This
-; compatibility mode will probably not stay around forever, so try applying
-; whatever necessary changes to your code, and turn it off.
-sybase.compatability_mode = Off
-
-[Sybase-CT]
-; Allow or prevent persistent links.
-sybct.allow_persistent = On
-
-; Maximum number of persistent links. -1 means no limit.
-sybct.max_persistent = -1
-
-; Maximum number of links (persistent + non-persistent). -1 means no limit.
-sybct.max_links = -1
-
-; Minimum server message severity to display.
-sybct.min_server_severity = 10
-
-; Minimum client message severity to display.
-sybct.min_client_severity = 10
-
-[bcmath]
-; Number of decimal digits for all bcmath functions.
-bcmath.scale = 0
-
-[browscap]
-;browscap = extra/browscap.ini
-
-[Informix]
-; Default host for ifx_connect() (doesn't apply in safe mode).
-ifx.default_host =
-
-; Default user for ifx_connect() (doesn't apply in safe mode).
-ifx.default_user =
-
-; Default password for ifx_connect() (doesn't apply in safe mode).
-ifx.default_password =
-
-; Allow or prevent persistent links.
-ifx.allow_persistent = On
-
-; Maximum number of persistent links. -1 means no limit.
-ifx.max_persistent = -1
-
-; Maximum number of links (persistent + non-persistent). -1 means no limit.
-ifx.max_links = -1
-
-; If on, select statements return the contents of a text blob instead of its id.
-ifx.textasvarchar = 0
-
-; If on, select statements return the contents of a byte blob instead of its id.
-ifx.byteasvarchar = 0
-
-; Trailing blanks are stripped from fixed-length char columns. May help the
-; life of Informix SE users.
-ifx.charasvarchar = 0
-
-; If on, the contents of text and byte blobs are dumped to a file instead of
-; keeping them in memory.
-ifx.blobinfile = 0
-
-; NULL's are returned as empty strings, unless this is set to 1. In that case,
-; NULL's are returned as string 'NULL'.
-ifx.nullformat = 0
-
-[Session]
-; Handler used to store/retrieve data.
-session.save_handler = files
-
-; Argument passed to save_handler. In the case of files, this is the path
-; where data files are stored.
-;
-; As of PHP 4.0.1, you can define the path as:
-;
-; session.save_path = "N;/path"
-;
-; where N is an integer. Instead of storing all the session files in
-; /path, what this will do is use subdirectories N-levels deep, and
-; store the session data in those directories. This is useful if you
-; or your OS have problems with lots of files in one directory, and is
-; a more efficient layout for servers that handle lots of sessions.
-;
-; NOTE 1: PHP will not create this directory structure automatically.
-; You can use the script in the ext/session dir for that purpose.
-; NOTE 2: See the section on garbage collection below if you choose to
-; use subdirectories for session storage
-;
-; The file storage module creates files using mode 600 by default.
-; You can change that by using
-;
-; session.save_path = "N;MODE;/path"
-;
-; where MODE is the octal representation of the mode. Note that this
-; does not overwrite the process's umask.
-;session.save_path = "/tmp"
-
-; Whether to use cookies.
-session.use_cookies = 1
-
-;session.cookie_secure =
-
-; This option enables administrators to make their users invulnerable to
-; attacks which involve passing session ids in URLs; defaults to 0.
-; session.use_only_cookies = 1
-
-; Name of the session (used as cookie name).
-session.name = PHPSESSID
-
-; Initialize session on request startup.
-session.auto_start = 0
-
-; Lifetime in seconds of cookie or, if 0, until browser is restarted.
-session.cookie_lifetime = 0
-
-; The path for which the cookie is valid.
-session.cookie_path = /
-
-; The domain for which the cookie is valid.
-session.cookie_domain =
-
-; Whether or not to add the httpOnly flag to the cookie, which makes it inaccessible to browser scripting languages such as JavaScript.
-session.cookie_httponly =
-
-; Handler used to serialize data. php is the standard serializer of PHP.
-session.serialize_handler = php
-
-; Define the probability that the 'garbage collection' process is started
-; on every session initialization.
-; The probability is calculated by using gc_probability/gc_divisor,
-; e.g. 1/100 means there is a 1% chance that the GC process starts
-; on each request.
-
-session.gc_probability = 1
-session.gc_divisor = 1000
-
-; After this number of seconds, stored data will be seen as 'garbage' and
-; cleaned up by the garbage collection process.
-session.gc_maxlifetime = 1440
-
-; NOTE: If you are using the subdirectory option for storing session files
-; (see session.save_path above), then garbage collection does *not*
-; happen automatically. You will need to do your own garbage
-; collection through a shell script, cron entry, or some other method.
-; For example, the following script would is the equivalent of
-; setting session.gc_maxlifetime to 1440 (1440 seconds = 24 minutes):
-; cd /path/to/sessions; find -cmin +24 | xargs rm
-
-; PHP 4.2 and less have an undocumented feature/bug that allows you to
-; to initialize a session variable in the global scope, albeit register_globals
-; is disabled. PHP 4.3 and later will warn you, if this feature is used.
-; You can disable the feature and the warning separately. At this time,
-; the warning is only displayed, if bug_compat_42 is enabled.
-
-session.bug_compat_42 = 0
-session.bug_compat_warn = 1
-
-; Check HTTP Referer to invalidate externally stored URLs containing ids.
-; HTTP_REFERER has to contain this substring for the session to be
-; considered as valid.
-session.referer_check =
-
-; How many bytes to read from the file.
-session.entropy_length = 0
-
-; Specified here to create the session id.
-session.entropy_file =
-
-;session.entropy_length = 16
-
-;session.entropy_file = /dev/urandom
-
-; Set to {nocache,private,public,} to determine HTTP caching aspects
-; or leave this empty to avoid sending anti-caching headers.
-session.cache_limiter = nocache
-
-; Document expires after n minutes.
-session.cache_expire = 180
-
-; trans sid support is disabled by default.
-; Use of trans sid may risk your users security.
-; Use this option with caution.
-; - User may send URL contains active session ID
-; to other person via. email/irc/etc.
-; - URL that contains active session ID may be stored
-; in publically accessible computer.
-; - User may access your site with the same session ID
-; always using URL stored in browser's history or bookmarks.
-session.use_trans_sid = 0
-
-; Select a hash function
-; 0: MD5 (128 bits)
-; 1: SHA-1 (160 bits)
-session.hash_function = 0
-
-; Define how many bits are stored in each character when converting
-; the binary hash data to something readable.
-;
-; 4 bits: 0-9, a-f
-; 5 bits: 0-9, a-v
-; 6 bits: 0-9, a-z, A-Z, "-", ","
-session.hash_bits_per_character = 5
-
-; The URL rewriter will look for URLs in a defined set of HTML tags.
-; form/fieldset are special; if you include them here, the rewriter will
-; add a hidden <input> field with the info which is otherwise appended
-; to URLs. If you want XHTML conformity, remove the form entry.
-; Note that all valid entries require a "=", even if no value follows.
-url_rewriter.tags = "a=href,area=href,frame=src,input=src,form=fakeentry"
-
-[MSSQL]
-; Allow or prevent persistent links.
-mssql.allow_persistent = On
-
-; Maximum number of persistent links. -1 means no limit.
-mssql.max_persistent = -1
-
-; Maximum number of links (persistent+non persistent). -1 means no limit.
-mssql.max_links = -1
-
-; Minimum error severity to display.
-mssql.min_error_severity = 10
-
-; Minimum message severity to display.
-mssql.min_message_severity = 10
-
-; Compatibility mode with old versions of PHP 3.0.
-mssql.compatability_mode = Off
-
-; Connect timeout
-;mssql.connect_timeout = 5
-
-; Query timeout
-;mssql.timeout = 60
-
-; Valid range 0 - 2147483647. Default = 4096.
-;mssql.textlimit = 4096
-
-; Valid range 0 - 2147483647. Default = 4096.
-;mssql.textsize = 4096
-
-; Limits the number of records in each batch. 0 = all records in one batch.
-;mssql.batchsize = 0
-
-; Specify how datetime and datetim4 columns are returned
-; On => Returns data converted to SQL server settings
-; Off => Returns values as YYYY-MM-DD hh:mm:ss
-;mssql.datetimeconvert = On
-
-; Use NT authentication when connecting to the server
-mssql.secure_connection = Off
-
-; Specify max number of processes. -1 = library default
-; msdlib defaults to 25
-; FreeTDS defaults to 4096
-;mssql.max_procs = -1
-
-; Specify client character set.
-; If empty or not set the client charset from freetds.comf is used
-; This is only used when compiled with FreeTDS
-;mssql.charset = "ISO-8859-1"
-
-[Assertion]
-; Assert(expr); active by default.
-;assert.active = On
-
-; Issue a PHP warning for each failed assertion.
-;assert.warning = On
-
-; Don't bail out by default.
-;assert.bail = Off
-
-; User-function to be called if an assertion fails.
-;assert.callback = 0
-
-; Eval the expression with current error_reporting(). Set to true if you want
-; error_reporting(0) around the eval().
-;assert.quiet_eval = 0
-
-[COM]
-; path to a file containing GUIDs, IIDs or filenames of files with TypeLibs
-;com.typelib_file =
-; allow Distributed-COM calls
-;com.allow_dcom = true
-; autoregister constants of a components typlib on com_load()
-;com.autoregister_typelib = true
-; register constants casesensitive
-;com.autoregister_casesensitive = false
-; show warnings on duplicate constant registrations
-;com.autoregister_verbose = true
-
-[mbstring]
-; language for internal character representation.
-;mbstring.language = Japanese
-
-; internal/script encoding.
-; Some encoding cannot work as internal encoding.
-; (e.g. SJIS, BIG5, ISO-2022-*)
-;mbstring.internal_encoding = EUC-JP
-
-; http input encoding.
-;mbstring.http_input = auto
-
-; http output encoding. mb_output_handler must be
-; registered as output buffer to function
-;mbstring.http_output = SJIS
-
-; enable automatic encoding translation according to
-; mbstring.internal_encoding setting. Input chars are
-; converted to internal encoding by setting this to On.
-; Note: Do _not_ use automatic encoding translation for
-; portable libs/applications.
-;mbstring.encoding_translation = Off
-
-; automatic encoding detection order.
-; auto means
-;mbstring.detect_order = auto
-
-; substitute_character used when character cannot be converted
-; one from another
-;mbstring.substitute_character = none;
-
-; overload(replace) single byte functions by mbstring functions.
-; mail(), ereg(), etc are overloaded by mb_send_mail(), mb_ereg(),
-; etc. Possible values are 0,1,2,4 or combination of them.
-; For example, 7 for overload everything.
-; 0: No overload
-; 1: Overload mail() function
-; 2: Overload str*() functions
-; 4: Overload ereg*() functions
-;mbstring.func_overload = 0
-
-; enable strict encoding detection.
-;mbstring.strict_detection = Off
-
-[FrontBase]
-;fbsql.allow_persistent = On
-;fbsql.autocommit = On
-;fbsql.show_timestamp_decimals = Off
-;fbsql.default_database =
-;fbsql.default_database_password =
-;fbsql.default_host =
-;fbsql.default_password =
-;fbsql.default_user = "_SYSTEM"
-;fbsql.generate_warnings = Off
-;fbsql.max_connections = 128
-;fbsql.max_links = 128
-;fbsql.max_persistent = -1
-;fbsql.max_results = 128
-
-[gd]
-; Tell the jpeg decode to libjpeg warnings and try to create
-; a gd image. The warning will then be displayed as notices
-; disabled by default
-;gd.jpeg_ignore_warning = 0
-
-[exif]
-; Exif UNICODE user comments are handled as UCS-2BE/UCS-2LE and JIS as JIS.
-; With mbstring support this will automatically be converted into the encoding
-; given by corresponding encode setting. When empty mbstring.internal_encoding
-; is used. For the decode settings you can distinguish between motorola and
-; intel byte order. A decode setting cannot be empty.
-;exif.encode_unicode = ISO-8859-15
-;exif.decode_unicode_motorola = UCS-2BE
-;exif.decode_unicode_intel = UCS-2LE
-;exif.encode_jis =
-;exif.decode_jis_motorola = JIS
-;exif.decode_jis_intel = JIS
-
-[Tidy]
-; The path to a default tidy configuration file to use when using tidy
-;tidy.default_config = /usr/local/lib/php/default.tcfg
-
-; Should tidy clean and repair output automatically?
-; WARNING: Do not use this option if you are generating non-html content
-; such as dynamic images
-tidy.clean_output = Off
-
-[soap]
-; Enables or disables WSDL caching feature.
-soap.wsdl_cache_enabled=1
-; Sets the directory name where SOAP extension will put cache files.
-soap.wsdl_cache_dir="/tmp"
-; (time to live) Sets the number of second while cached file will be used
-; instead of original one.
-soap.wsdl_cache_ttl=86400
-
-; Local Variables:
-; tab-width: 4
-; End:
diff --git a/community/python-pysfml/PKGBUILD b/community/python-pysfml/PKGBUILD
deleted file mode 100644
index 870960acf..000000000
--- a/community/python-pysfml/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 40196 2011-02-21 18:40:57Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: scj <scj(at)archlinux(dot)us>
-
-pkgname=('python-pysfml' 'python2-pysfml')
-pkgbase=python-pysfml
-pkgver=1.6
-pkgrel=3
-pkgdesc="Python bindings for the SFML library"
-arch=('i686' 'x86_64')
-url="http://www.sfml-dev.org"
-makedepends=('sfml' 'python' 'python2')
-license=('zlib')
-depends=()
-replaces=('pysfml')
-source=(http://downloads.sourceforge.net/sfml/SFML-${pkgver}-python-sdk.zip)
-md5sums=('9acaf793ae9a498a51f7f6fc74307b32')
-
-build() {
- cd "${srcdir}/SFML-${pkgver}/python"
-}
-
-package_python-pysfml() {
- depends=('sfml' 'python')
-
- cd "${srcdir}/SFML-${pkgver}/python"
-
- python3 setup.py install --root=${pkgdir}
-}
-
-package_python2-pysfml() {
- depends=('sfml' 'python2')
-
- cd "${srcdir}/SFML-${pkgver}/python"
-
- python2 setup.py install --root=${pkgdir}
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/qlandkartegt/gpsd-2.96.patch b/community/qlandkartegt/gpsd-2.96.patch
deleted file mode 100644
index 634e9ad7e..000000000
--- a/community/qlandkartegt/gpsd-2.96.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2011/03/31 20:21:34 drochner Exp $
-
-for gpsd-2.96
-
---- src/CDeviceGPSD.h.orig 2011-03-15 20:13:04.000000000 +0000
-+++ src/CDeviceGPSD.h
-@@ -56,7 +56,7 @@ class CGPSDThread : public QThread
- protected:
- virtual void run();
-
-- gps_data_t* gpsdata;
-+ gps_data_t* gpsdata, gpsdata_store;
-
- bool decodeData();
-
-$NetBSD: patch-ac,v 1.1 2011/03/31 20:21:34 drochner Exp $
-
-for gpsd-2.96
-
---- src/CDeviceGPSD.cpp.orig 2011-03-15 20:13:04.000000000 +0000
-+++ src/CDeviceGPSD.cpp
-@@ -138,6 +138,7 @@ CGPSDThread::CGPSDThread( int _pipe_fd )
- log_mutex( new QMutex() ),
- pipe_fd( _pipe_fd )
- {
-+ gpsdata = &gpsdata_store;
- }
-
-
-@@ -149,8 +150,8 @@ CGPSDThread::~CGPSDThread()
-
- void CGPSDThread::run()
- {
-- gpsdata = gps_open( "localhost", DEFAULT_GPSD_PORT );
-- if( !gpsdata )
-+ int res = gps_open( "localhost", DEFAULT_GPSD_PORT, gpsdata );
-+ if( res )
- {
- // TODO: message box (from other thread)
- qDebug() << "gps_open failed.";
-@@ -187,7 +188,7 @@ void CGPSDThread::run()
- } // if
- else if( FD_ISSET( gpsdata->gps_fd, &fds ) )
- {
-- gps_poll( gpsdata );
-+ gps_read( gpsdata );
- if( !decodeData() ) break;
- } // else if
- } // else if
diff --git a/community/skype-call-recorder/PKGBUILD b/community/skype-call-recorder/PKGBUILD
deleted file mode 100644
index 83f944c97..000000000
--- a/community/skype-call-recorder/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 6063 2009-11-28 12:03:50Z foutrelis $
-# Maintainer: Evangelos Foutras <foutrelis@gmail.com>
-# Contributor: Tarinaky <tarinaky@hunity.co.uk>
-
-pkgname=skype-call-recorder
-pkgver=0.8
-pkgrel=1
-pkgdesc="Open source tool that allows you to record your Skype calls on Linux"
-arch=('i686' 'x86_64')
-url="http://atdot.ch/scr/"
-license=('GPL')
-depends=('qt' 'libvorbis' 'lame' 'id3lib' 'hicolor-icon-theme')
-makedepends=('cmake')
-install=skype-call-recorder.install
-source=(http://atdot.ch/scr/files/$pkgver/$pkgname-$pkgver.tar.gz)
-md5sums=('937544a5245fdcfa50878d083dab706a')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- cmake -DCMAKE_INSTALL_PREFIX=/usr .
- make || return 1
- make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/skype-call-recorder/skype-call-recorder.install b/community/skype-call-recorder/skype-call-recorder.install
deleted file mode 100644
index e4f8fd06c..000000000
--- a/community/skype-call-recorder/skype-call-recorder.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/systemd/mqueue-signed-int.patch b/community/systemd/mqueue-signed-int.patch
deleted file mode 100644
index dc9ac3524..000000000
--- a/community/systemd/mqueue-signed-int.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/src/dbus-common.c b/src/dbus-common.c
-index fe7f84b..9bf0dab 100644
---- a/src/dbus-common.c
-+++ b/src/dbus-common.c
-@@ -569,15 +569,15 @@ int bus_property_append_ul(DBusMessageIter *i, const char *property, void *data)
- }
-
- int bus_property_append_long(DBusMessageIter *i, const char *property, void *data) {
-- uint64_t u;
-+ int64_t l;
-
- assert(i);
- assert(property);
- assert(data);
-
-- u = (int64_t) *(long*) data;
-+ l = (int64_t) *(long*) data;
-
-- if (!dbus_message_iter_append_basic(i, DBUS_TYPE_INT64, &u))
-+ if (!dbus_message_iter_append_basic(i, DBUS_TYPE_INT64, &l))
- return -ENOMEM;
-
- return 0;
-diff --git a/src/dbus-socket.c b/src/dbus-socket.c
-index b81569d..7194611 100644
---- a/src/dbus-socket.c
-+++ b/src/dbus-socket.c
-@@ -115,8 +115,8 @@ DBusHandlerResult bus_socket_message_handler(Unit *u, DBusConnection *c, DBusMes
- { "org.freedesktop.systemd1.Socket", "MaxConnections", bus_property_append_unsigned, "u", &u->socket.max_connections },
- { "org.freedesktop.systemd1.Socket", "NConnections", bus_property_append_unsigned, "u", &u->socket.n_connections },
- { "org.freedesktop.systemd1.Socket", "NAccepted", bus_property_append_unsigned, "u", &u->socket.n_accepted },
-- { "org.freedesktop.systemd1.Socket", "MessageQueueMaxMessages", bus_property_append_long,"t", &u->socket.mq_maxmsg },
-- { "org.freedesktop.systemd1.Socket", "MessageQueueMessageSize", bus_property_append_long,"t", &u->socket.mq_msgsize },
-+ { "org.freedesktop.systemd1.Socket", "MessageQueueMaxMessages", bus_property_append_long,"x", &u->socket.mq_maxmsg },
-+ { "org.freedesktop.systemd1.Socket", "MessageQueueMessageSize", bus_property_append_long,"x", &u->socket.mq_msgsize },
- { NULL, NULL, NULL, NULL, NULL }
- };
-
diff --git a/community/wbar/ChangeLog b/community/wbar/ChangeLog
deleted file mode 100644
index 710f62f34..000000000
--- a/community/wbar/ChangeLog
+++ /dev/null
@@ -1,3 +0,0 @@
-2008-10-13 Allan McRae <allan@archlinux.org>
- * wbar 1.3.3-2
- * Moved to [community] repo
diff --git a/extra/bind/ChangeLog b/extra/bind/ChangeLog
deleted file mode 100644
index fac736994..000000000
--- a/extra/bind/ChangeLog
+++ /dev/null
@@ -1,15 +0,0 @@
-
-2010-03-27 kevin <kevin@archlinux.org>
-
- * bind 9.7.0.P1-1
- - Patch addresses excessive query traffic generated when there is a break
- in the DNSSEC trust chain as a result of a configuration error
-
-2010-01-22 kevin <kevin@archlinux.org>
-
- * bind 9.6.1.P3-1
- - Fix for CVE-2010-0097, VU#360341, BIND 9 DNSSEC validation code could
- cause bogus NXDOMAIN responses
- - Updated fix for CVE-2009-4022, VU#418861, BIND 9 Cache Update from
- Additional Section
-
diff --git a/extra/gdm/fix_crasher_with_gtk307.patch b/extra/gdm/fix_crasher_with_gtk307.patch
deleted file mode 100644
index 3b8379ea3..000000000
--- a/extra/gdm/fix_crasher_with_gtk307.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From 045c319f2655fc45c24951479eb9cd1e59792cef Mon Sep 17 00:00:00 2001
-From: Benjamin Otte <otte@redhat.com>
-Date: Sat, 2 Apr 2011 04:10:09 +0200
-Subject: [PATCH] simple-greeter: Don't request an invalid size
-
-GTK widgets must at all times report a size they can handle. So it is
-not allowed to return 0 when not realized, because then size allocations
-break when GTK uses this size for its widget.
-In this case, GTK uses the pre-realize size to determine the size it
-should request when creating the greeter window - chicken and egg so to
-say.
-
-This patch just uses the default monitor (I guess the root window's
-monitor is the default monitor?) for determining the login window size.
-
-One thing this patch doesn't do is add a call to gtk_widget_queue_resize()
-from the realize callback or from monitor-changing signals, though
-that's probably technically necessary.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=646498
----
- gui/simple-greeter/gdm-greeter-login-window.c | 28 +++++++++----------------
- 1 files changed, 10 insertions(+), 18 deletions(-)
-
-diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index abd6707..3ec9a09 100644
---- a/gui/simple-greeter/gdm-greeter-login-window.c
-+++ b/gui/simple-greeter/gdm-greeter-login-window.c
-@@ -1413,25 +1413,22 @@ gdm_greeter_login_window_get_preferred_width (GtkWidget *widget,
- {
- int monitor;
- GdkScreen *screen;
-+ GdkWindow *window;
- GdkRectangle area;
- GtkAllocation widget_allocation;
- int min_size;
- int nat_size;
-
-- min_size = 0;
-- nat_size = 0;
--
-- if (!gtk_widget_get_realized (widget)) {
-- goto out;
-- }
--
- gtk_widget_get_preferred_width (gtk_bin_get_child (GTK_BIN (widget)),
- &min_size,
- &nat_size);
-
- /* Make width be at least 33% screen width */
- screen = gtk_widget_get_screen (widget);
-- monitor = gdk_screen_get_monitor_at_window (screen, gtk_widget_get_window (widget));
-+ window = gtk_widget_get_window (widget);
-+ if (window == NULL)
-+ window = gdk_screen_get_root_window (screen);
-+ monitor = gdk_screen_get_monitor_at_window (screen, window);
- gdk_screen_get_monitor_geometry (screen, monitor, &area);
- min_size = MAX (min_size, .33 * area.width);
- nat_size = MAX (nat_size, .33 * area.width);
-@@ -1442,7 +1439,6 @@ gdm_greeter_login_window_get_preferred_width (GtkWidget *widget,
- min_size = MAX (min_size, widget_allocation.width);
- nat_size = MAX (nat_size, widget_allocation.width);
-
-- out:
- if (minimum_size)
- *minimum_size = min_size;
- if (natural_size)
-@@ -1456,29 +1452,25 @@ gdm_greeter_login_window_get_preferred_height (GtkWidget *widget,
- {
- int monitor;
- GdkScreen *screen;
-+ GdkWindow *window;
- GdkRectangle area;
- int min_size;
- int nat_size;
-
-- min_size = 0;
-- nat_size = 0;
--
-- if (!gtk_widget_get_realized (widget)) {
-- goto out;
-- }
--
- gtk_widget_get_preferred_height (gtk_bin_get_child (GTK_BIN (widget)),
- &min_size,
- &nat_size);
-
- /* Make height be at most 80% of screen height */
- screen = gtk_widget_get_screen (widget);
-- monitor = gdk_screen_get_monitor_at_window (screen, gtk_widget_get_window (widget));
-+ window = gtk_widget_get_window (widget);
-+ if (window == NULL)
-+ window = gdk_screen_get_root_window (screen);
-+ monitor = gdk_screen_get_monitor_at_window (screen, window);
- gdk_screen_get_monitor_geometry (screen, monitor, &area);
- min_size = MIN (min_size, .8 * area.height);
- nat_size = MIN (nat_size, .8 * area.height);
-
-- out:
- if (minimum_size)
- *minimum_size = min_size;
- if (natural_size)
---
-1.7.4 \ No newline at end of file
diff --git a/extra/gnome-desktop/randr-fix.patch b/extra/gnome-desktop/randr-fix.patch
deleted file mode 100644
index c5d83ef2c..000000000
--- a/extra/gnome-desktop/randr-fix.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From aa93854f2ba6b0f72f1bdff9699b5724a72c89c9 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Sun, 01 May 2011 00:48:03 +0000
-Subject: Don't fall over if RANDR is missing
-
-When RANDR is not present, the screen object never gets an info,
-and since screen_info_free asserts, we must not call it unconditionally
-in finalize.
-This fixes https://bugzilla.gnome.org/show_bug.cgi?id=649053
----
-diff --git a/libgnome-desktop/gnome-rr.c b/libgnome-desktop/gnome-rr.c
-index 4a9d98e..eb3d735 100644
---- a/libgnome-desktop/gnome-rr.c
-+++ b/libgnome-desktop/gnome-rr.c
-@@ -748,7 +748,8 @@ gnome_rr_screen_finalize (GObject *gobject)
-
- gdk_window_remove_filter (screen->priv->gdk_root, screen_on_event, screen);
-
-- screen_info_free (screen->priv->info);
-+ if (screen->priv->info)
-+ screen_info_free (screen->priv->info);
-
- G_OBJECT_CLASS (gnome_rr_screen_parent_class)->finalize (gobject);
- }
---
-cgit v0.9
diff --git a/extra/gnome-panel/fix-crasher-launchers.patch b/extra/gnome-panel/fix-crasher-launchers.patch
deleted file mode 100644
index b15fdf29c..000000000
--- a/extra/gnome-panel/fix-crasher-launchers.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 8c275a2adf4ad99297a17cabf251344837620831 Mon Sep 17 00:00:00 2001
-From: Josselin Mouette <joss@malsain.org>
-Date: Mon, 11 Apr 2011 13:05:32 +0000
-Subject: panel: Fix crash when starting launcher
-
-Do not destroy a widget in its draw signal. This is bad. Really.
-
-This was happening in the animation that is being drawn after clicking a
-launcher.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=641325
----
-diff --git a/gnome-panel/xstuff.c b/gnome-panel/xstuff.c
-index 8465341..5acbf66 100644
---- a/gnome-panel/xstuff.c
-+++ b/gnome-panel/xstuff.c
-@@ -305,6 +305,14 @@ zoom_timeout (GtkWidget *window)
- }
-
- static gboolean
-+idle_destroy (gpointer data)
-+{
-+ gtk_widget_destroy (GTK_WIDGET (data));
-+
-+ return FALSE;
-+}
-+
-+static gboolean
- zoom_draw (GtkWidget *widget,
- cairo_t *cr,
- gpointer user_data)
-@@ -323,7 +331,7 @@ zoom_draw (GtkWidget *widget,
-
- g_slice_free (CompositedZoomData, zoom);
-
-- gtk_widget_destroy (widget);
-+ g_idle_add (idle_destroy, widget);
- } else {
- GdkPixbuf *scaled;
- int width, height;
---
-cgit v0.9
diff --git a/extra/gnome-shell/0001-Don-t-crash-when-removing-nameless-user.patch b/extra/gnome-shell/0001-Don-t-crash-when-removing-nameless-user.patch
deleted file mode 100644
index c07627338..000000000
--- a/extra/gnome-shell/0001-Don-t-crash-when-removing-nameless-user.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 8977ba4f23aef8754c0a912e7e1ec46f8da4776e Mon Sep 17 00:00:00 2001
-From: Ionut Biru <ibiru@archlinux.org>
-Date: Mon, 9 May 2011 13:03:17 -0700
-Subject: [PATCH] Don't crash when removing nameless user
-
-Fixes https://bugzilla.gnome.org/show_bug.cgi?id=647893
-
-Signed-off-by: Ionut Biru <ibiru@archlinux.org>
----
- src/gdmuser/gdm-user-manager.c | 5 ++++-
- 1 files changed, 4 insertions(+), 1 deletions(-)
-
-diff --git a/src/gdmuser/gdm-user-manager.c b/src/gdmuser/gdm-user-manager.c
-index eba9da1..543fcc3 100644
---- a/src/gdmuser/gdm-user-manager.c
-+++ b/src/gdmuser/gdm-user-manager.c
-@@ -777,7 +777,10 @@ remove_user (GdmUserManager *manager,
- if (gdm_user_get_object_path (user) != NULL) {
- g_hash_table_remove (manager->priv->users_by_object_path, gdm_user_get_object_path (user));
- }
-- g_hash_table_remove (manager->priv->users_by_name, gdm_user_get_user_name (user));
-+
-+ if (gdm_user_get_user_name (user) != NULL) {
-+ g_hash_table_remove (manager->priv->users_by_name, gdm_user_get_user_name (user));
-+ }
-
- if (manager->priv->is_loaded) {
- g_signal_emit (manager, signals[USER_REMOVED], 0, user);
---
-1.7.5.1
-
diff --git a/extra/gnome-shell/network_fixes_up_to_5090a4ccce.patch b/extra/gnome-shell/network_fixes_up_to_5090a4ccce.patch
deleted file mode 100644
index 16453b0b9..000000000
--- a/extra/gnome-shell/network_fixes_up_to_5090a4ccce.patch
+++ /dev/null
@@ -1,814 +0,0 @@
-From d0780d16224d7bb2ad183542337c48324fdd2185 Mon Sep 17 00:00:00 2001
-From: Giovanni Campagna <gcampagna@src.gnome.org>
-Date: Wed, 06 Apr 2011 16:11:23 +0000
-Subject: NetworkMenu: keep wirelesss networks in predictable order
-
-Adds a function that compares wireless networks and keeps them sorted
-at all times. Order is: first already configured connections, then
-first secure networks, then alphabtic. Also, the appearance of a new access
-point no longer causes the whole menu to be rebuilt (but it still linear
-searches for the position, I guess that could be skipped), which caused
-the addition of more code for tracking the active access point.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=646580
----
-(limited to 'js/ui/status/network.js')
-
-diff --git a/js/ui/status/network.js b/js/ui/status/network.js
-index 6fa5642..49cb3f0 100644
---- a/js/ui/status/network.js
-+++ b/js/ui/status/network.js
-@@ -42,6 +42,10 @@ const NM80211Mode = NetworkManager['80211Mode'];
- const NM80211ApFlags = NetworkManager['80211ApFlags'];
- const NM80211ApSecurityFlags = NetworkManager['80211ApSecurityFlags'];
-
-+// number of wireless networks that should be visible
-+// (the remaining are placed into More...)
-+const NUM_VISIBLE_NETWORKS = 5;
-+
- function macToArray(string) {
- return string.split(':').map(function(el) {
- return parseInt(el, 16);
-@@ -1036,6 +1040,7 @@ NMDeviceWireless.prototype = {
- item: null,
- accessPoints: [ ap ]
- };
-+ obj.ssidText = NetworkManager.utils_ssid_to_utf8(obj.ssid);
- this._networks.push(obj);
- }
-
-@@ -1048,6 +1053,14 @@ NMDeviceWireless.prototype = {
- }
- }
- }
-+ if (this.device.active_access_point) {
-+ this._activeNetwork = this._networks[this._findNetwork(this.device.active_access_point)];
-+ } else {
-+ this._activeNetwork = null;
-+ }
-+ this._networks.sort(this._networkSortFunction);
-+
-+ this._apChangedId = device.connect('notify::active-access-point', Lang.bind(this, this._activeApChanged));
- this._apAddedId = device.connect('access-point-added', Lang.bind(this, this._accessPointAdded));
- this._apRemovedId = device.connect('access-point-removed', Lang.bind(this, this._accessPointRemoved));
-
-@@ -1055,8 +1068,13 @@ NMDeviceWireless.prototype = {
- },
-
- destroy: function() {
-- if (this._apAddedId) {
-+ if (this._apChangedId) {
- // see above for this HACK
-+ GObject.Object.prototype.disconnect.call(this.device, this._apChangedId);
-+ this._apChangedId = 0;
-+ }
-+
-+ if (this._apAddedId) {
- GObject.Object.prototype.disconnect.call(this.device, this._apAddedId);
- this._apAddedId = 0;
- }
-@@ -1122,6 +1140,19 @@ NMDeviceWireless.prototype = {
- }
- },
-
-+ _activeApChanged: function() {
-+ this._activeNetwork = null;
-+
-+ let activeAp = this.device.active_access_point;
-+
-+ if (activeAp) {
-+ let pos = this._findNetwork(activeAp);
-+ this._activeNetwork = this._networks[pos];
-+ }
-+
-+ // we don't refresh the view here, setActiveConnection will
-+ },
-+
- _getApSecurityType: function(accessPoint) {
- if (accessPoint._secType)
- return accessPoint._secType;
-@@ -1151,6 +1182,32 @@ NMDeviceWireless.prototype = {
- return type;
- },
-
-+ _networkSortFunction: function(one, two) {
-+ let oneHasConnection = one.connections.length != 0;
-+ let twoHasConnection = two.connections.length != 0;
-+
-+ // place known connections first
-+ // (-1 = good order, 1 = wrong order)
-+ if (oneHasConnection && !twoHasConnection)
-+ return -1;
-+ else if (!oneHasConnection && twoHasConnection)
-+ return 1;
-+
-+ let oneHasSecurity = one.security != NMAccessPointSecurity.NONE;
-+ let twoHasSecurity = two.security != NMAccessPointSecurity.NONE;
-+
-+ // place secure connections first
-+ // (we treat WEP/WPA/WPA2 the same as there is no way to
-+ // take them apart from the UI)
-+ if (oneHasSecurity && !twoHasSecurity)
-+ return -1;
-+ else if (!oneHasSecurity && twoHasSecurity)
-+ return 1;
-+
-+ // sort alphabetically
-+ return GLib.utf8_collate(one.ssidText, two.ssidText);
-+ },
-+
- _networkCompare: function(network, accessPoint) {
- if (!ssidCompare(network.ssid, accessPoint.get_ssid()))
- return false;
-@@ -1173,6 +1230,8 @@ NMDeviceWireless.prototype = {
- _accessPointAdded: function(device, accessPoint) {
- let pos = this._findNetwork(accessPoint);
- let apObj;
-+ let needsupdate = false;
-+
- if (pos != -1) {
- apObj = this._networks[pos];
- if (apObj.accessPoints.indexOf(accessPoint) != -1) {
-@@ -1181,6 +1240,8 @@ NMDeviceWireless.prototype = {
- }
-
- apObj.accessPoints.push(accessPoint);
-+ if (apObj.item)
-+ apObj.item.updateAccessPoints(apObj.accessPoints);
- } else {
- apObj = { ssid: accessPoint.get_ssid(),
- mode: accessPoint.mode,
-@@ -1189,7 +1250,8 @@ NMDeviceWireless.prototype = {
- item: null,
- accessPoints: [ accessPoint ]
- };
-- this._networks.push(apObj);
-+ apObj.ssidText = NetworkManager.utils_ssid_to_utf8(apObj.ssid);
-+ needsupdate = true;
- }
-
- // check if this enables new connections for this group
-@@ -1198,12 +1260,44 @@ NMDeviceWireless.prototype = {
- if (this._connectionValidForAP(connection, accessPoint) &&
- apObj.connections.indexOf(connection) == -1) {
- apObj.connections.push(connection);
-+
-+ // this potentially changes the order
-+ needsupdate = true;
- }
- }
-
-- // update everything
-- this._clearSection();
-- this._createSection();
-+ if (needsupdate) {
-+ if (apObj.item)
-+ apObj.item.destroy();
-+
-+ if (pos != -1)
-+ this._networks.splice(pos, 1);
-+
-+ if (this._networks.length == 0) {
-+ // only network in the list
-+ this._networks.push(apObj);
-+ this._clearSection();
-+ this._createSection();
-+ return;
-+ }
-+
-+ // skip networks that should appear earlier
-+ let menuPos = 0;
-+ for (pos = 0;
-+ pos < this._networks.length &&
-+ this._networkSortFunction(this._networks[i], apObj) < 0; ++pos) {
-+ if (this._networks[pos] != this._activeNetwork)
-+ menuPos++;
-+ }
-+
-+ // (re-)add the network
-+ this._networks.splice(pos, 0, apObj);
-+
-+ if (this._shouldShowConnectionList()) {
-+ menuPos += (this._activeConnectionItem ? 1 : 0);
-+ this._createNetworkItem(apObj, menuPos);
-+ }
-+ }
- },
-
- _accessPointRemoved: function(device, accessPoint) {
-@@ -1315,6 +1409,12 @@ NMDeviceWireless.prototype = {
- // remove the connection from the access point group
- connections.splice(k);
- anyauto = connections.length == 0;
-+
-+ if (anyauto) {
-+ // this potentially changes the sorting order
-+ forceupdate = true;
-+ break;
-+ }
- if (apObj.item) {
- if (apObj.item instanceof PopupMenu.PopupSubMenuMenuItem) {
- let items = apObj.item.menu.getMenuItems();
-@@ -1340,6 +1440,7 @@ NMDeviceWireless.prototype = {
- }
-
- if (forceupdate || anyauto) {
-+ this._networks.sort(this._networkSortFunction);
- this._clearSection();
- this._createSection();
- }
-@@ -1355,42 +1456,24 @@ NMDeviceWireless.prototype = {
- this._connections.push(obj);
-
- // find an appropriate access point
-- let any = false, forceupdate = false;
-+ let forceupdate = false;
- for (let i = 0; i < this._networks.length; i++) {
- let apObj = this._networks[i];
-
- // Check if connection is valid for any of these access points
-- let any = false;
- for (let k = 0; k < apObj.accessPoints.length; k++) {
- let ap = apObj.accessPoints[k];
- if (this._connectionValidForAP(connection, ap)) {
- apObj.connections.push(connection);
-- any = true;
-+ // this potentially changes the sorting order
-+ forceupdate = true;
- break;
- }
- }
--
-- if (any && this._shouldShowConnectionList()) {
-- // we need to show this connection
-- if (apObj.item && apObj.item.menu) {
-- // We're already showing the submenu for this access point
-- apObj.item.menu.addMenuItem(this._createAPItem(connection, apObj, true));
-- } else {
-- if (apObj.item)
-- apObj.item.destroy();
-- if (apObj.connections.length == 1) {
-- apObj.item = this._createAPItem(connection, apObj, false);
-- this.section.addMenuItem(apObj.item);
-- } else {
-- apObj.item = null;
-- // we need to force an update to create the submenu
-- forceupdate = true;
-- }
-- }
-- }
- }
-
- if (forceupdate) {
-+ this._networks.sort(this._networkSortFunction);
- this._clearSection();
- this._createSection();
- }
-@@ -1473,6 +1556,37 @@ NMDeviceWireless.prototype = {
- return connection;
- },
-
-+ _createNetworkItem: function(apObj, position) {
-+ if(apObj.connections.length > 0) {
-+ if (apObj.connections.length == 1)
-+ apObj.item = this._createAPItem(apObj.connections[0], apObj, false);
-+ else {
-+ let title = apObj.ssidText;
-+ apObj.item = new PopupMenu.PopupSubMenuMenuItem(title);
-+ apObj.item._apObj = apObj;
-+ for (let i = 0; i < apObj.connections.length; i++)
-+ apObj.item.menu.addMenuItem(this._createAPItem(apObj.connections[i], apObj, true));
-+ }
-+ } else {
-+ apObj.item = new NMNetworkMenuItem(apObj.accessPoints);
-+ apObj.item._apObj = apObj;
-+ apObj.item.connect('activate', Lang.bind(this, function() {
-+ let connection = this._createAutomaticConnection(apObj);
-+ let accessPoints = sortAccessPoints(apObj.accessPoints);
-+ this._client.add_and_activate_connection(connection, this.device, accessPoints[0].dbus_path, null)
-+ }));
-+ }
-+ if (position < NUM_VISIBLE_NETWORKS)
-+ this.section.addMenuItem(apObj.item);
-+ else {
-+ if (!this._overflowItem) {
-+ this._overflowItem = new PopupMenu.PopupSubMenuMenuItem(_("More..."));
-+ this.section.addMenuItem(this._overflowItem);
-+ }
-+ this._overflowItem.menu.addMenuItem(apObj.item, position - NUM_VISIBLE_NETWORKS);
-+ }
-+ },
-+
- _createSection: function() {
- if (!this._shouldShowConnectionList())
- return;
-@@ -1482,47 +1596,14 @@ NMDeviceWireless.prototype = {
- this.section.addMenuItem(this._activeConnectionItem);
- }
-
-- let activeAp = this.device.active_access_point;
-- let activeApSsid = activeAp ? activeAp.get_ssid() : null;
--
-- // we want five access points in the menu, including the active one
-- let numItems = this._activeConnection ? 4 : 5;
-+ let activeOffset = this._activeConnectionItem ? 1 : 0;
-
- for(let j = 0; j < this._networks.length; j++) {
- let apObj = this._networks[j];
-- if(activeAp && ssidCompare(apObj.ssid, activeApSsid))
-+ if (apObj == this._activeNetwork)
- continue;
-
-- let menuItem;
-- if(apObj.connections.length > 0) {
-- if (apObj.connections.length == 1)
-- apObj.item = this._createAPItem(apObj.connections[0], apObj, false);
-- else {
-- let title = NetworkManager.utils_ssid_to_utf8(apObj.ssid) || _("<unknown>");
-- apObj.item = new PopupMenu.PopupSubMenuMenuItem(title);
-- apObj.item._apObj = apObj;
-- for (let i = 0; i < apObj.connections.length; i++)
-- apObj.item.menu.addMenuItem(this._createAPItem(apObj.connections[i], apObj, true));
-- }
-- } else {
-- apObj.item = new NMNetworkMenuItem(apObj.accessPoints);
-- apObj.item._apObj = apObj;
-- apObj.item.connect('activate', Lang.bind(this, function() {
-- let connection = this._createAutomaticConnection(apObj);
-- let accessPoints = sortAccessPoints(apObj.accessPoints);
-- this._client.add_and_activate_connection(connection, this.device, accessPoints[0].dbus_path, null)
-- }));
-- }
--
-- if (j < numItems)
-- this.section.addMenuItem(apObj.item);
-- else {
-- if (!this._overflowItem) {
-- this._overflowItem = new PopupMenu.PopupSubMenuMenuItem(_("More..."));
-- this.section.addMenuItem(this._overflowItem);
-- }
-- this._overflowItem.menu.addMenuItem(apObj.item);
-- }
-+ this._createNetworkItem(apObj, j + activeOffset);
- }
- },
- };
---
-cgit v0.9
-From 42a5531f1588ae3063e7d8ff7642e9f81c13afbd Mon Sep 17 00:00:00 2001
-From: Dan Winship <danw@gnome.org>
-Date: Wed, 27 Apr 2011 13:05:39 +0000
-Subject: network: fix a variable name
-
----
-(limited to 'js/ui/status/network.js')
-
-diff --git a/js/ui/status/network.js b/js/ui/status/network.js
-index 49cb3f0..d56c0b1 100644
---- a/js/ui/status/network.js
-+++ b/js/ui/status/network.js
-@@ -1285,7 +1285,7 @@ NMDeviceWireless.prototype = {
- let menuPos = 0;
- for (pos = 0;
- pos < this._networks.length &&
-- this._networkSortFunction(this._networks[i], apObj) < 0; ++pos) {
-+ this._networkSortFunction(this._networks[pos], apObj) < 0; ++pos) {
- if (this._networks[pos] != this._activeNetwork)
- menuPos++;
- }
---
-cgit v0.9
-From c31109800b3267df433841bff08c9383a5d669cb Mon Sep 17 00:00:00 2001
-From: Dan Williams <dcbw@redhat.com>
-Date: Mon, 25 Apr 2011 22:13:12 +0000
-Subject: network: simplify connection sorting by using libnm-glib functions
-
-Instead of rolling our own code, use new libnm-glib functions to do
-the same thing. Requires libnm-glib as of
-779215c742bbe29a2c66202ec7e2e6d43edeb8ff (which will be part of 0.9).
-
-Fixes https://bugzilla.gnome.org/show_bug.cgi?id=648648
----
-(limited to 'js/ui/status/network.js')
-
-diff --git a/js/ui/status/network.js b/js/ui/status/network.js
-index d56c0b1..bf8e272 100644
---- a/js/ui/status/network.js
-+++ b/js/ui/status/network.js
-@@ -505,7 +505,7 @@ NMDevice.prototype = {
- },
-
- connectionValid: function(connection) {
-- throw new TypeError('Invoking pure virtual function NMDevice.connectionValid');
-+ return this.device.connection_valid(connection);
- },
-
- setEnabled: function(enabled) {
-@@ -723,17 +723,6 @@ NMDeviceWired.prototype = {
- NMDevice.prototype._init.call(this, client, device, connections);
- },
-
-- connectionValid: function(connection) {
-- if (connection._type != NetworkManager.SETTING_WIRED_SETTING_NAME)
-- return false;
--
-- let ethernetSettings = connection.get_setting_by_name(NetworkManager.SETTING_WIRED_SETTING_NAME);
-- let fixedMac = ethernetSettings.get_mac_address();
-- if (fixedMac)
-- return macCompare(fixedMac, macToArray(this.device.perm_hw_address));
-- return true;
-- },
--
- _createSection: function() {
- NMDevice.prototype._createSection.call(this);
-
-@@ -876,10 +865,6 @@ NMDeviceModem.prototype = {
- NMDevice.prototype._clearSection.call(this);
- },
-
-- connectionValid: function(connection) {
-- return connection._type == this._connectionType;
-- },
--
- _createAutomaticConnection: function() {
- // FIXME: we need to summon the mobile wizard here
- // or NM will not have the necessary parameters to complete the connection
-@@ -913,18 +898,6 @@ NMDeviceBluetooth.prototype = {
- NMDevice.prototype._init.call(this, client, device, connections);
- },
-
-- connectionValid: function(connection) {
-- if (connection._type != NetworkManager.SETTING_BLUETOOTH_SETTING_NAME)
-- return false;
--
-- let bluetoothSettings = connection.get_setting_by_name(NetworkManager.SETTING_BLUETOOTH_SETTING_NAME);
-- let fixedBdaddr = bluetoothSettings.get_bdaddr();
-- if (fixedBdaddr)
-- return macCompare(fixedBdaddr, macToArray(this.device.hw_address));
--
-- return true;
-- },
--
- _createAutomaticConnection: function() {
- let connection = new NetworkManager.Connection;
- connection._uuid = NetworkManager.utils_uuid_generate();
-@@ -1047,7 +1020,7 @@ NMDeviceWireless.prototype = {
- // Check if some connection is valid for this AP
- for (let j = 0; j < validConnections.length; j++) {
- let connection = validConnections[j];
-- if (this._connectionValidForAP(connection, ap) &&
-+ if (ap.connection_valid(connection) &&
- obj.connections.indexOf(connection) == -1) {
- obj.connections.push(connection);
- }
-@@ -1121,7 +1094,7 @@ NMDeviceWireless.prototype = {
- if (best) {
- for (let i = 0; i < bestApObj.accessPoints.length; i++) {
- let ap = bestApObj.accessPoints[i];
-- if (this._connectionValidForAP(best, ap)) {
-+ if (ap.connection_valid(best)) {
- this._client.activate_connection(best, this.device, ap.dbus_path, null);
- break;
- }
-@@ -1257,7 +1230,7 @@ NMDeviceWireless.prototype = {
- // check if this enables new connections for this group
- for (let i = 0; i < this._connections.length; i++) {
- let connection = this._connections[i].connection;
-- if (this._connectionValidForAP(connection, accessPoint) &&
-+ if (accessPoint.connection_valid(connection) &&
- apObj.connections.indexOf(connection) == -1) {
- apObj.connections.push(connection);
-
-@@ -1337,7 +1310,7 @@ NMDeviceWireless.prototype = {
- item.connect('activate', Lang.bind(this, function() {
- let accessPoints = sortAccessPoints(accessPointObj.accessPoints);
- for (let i = 0; i < accessPoints.length; i++) {
-- if (this._connectionValidForAP(connection, accessPoints[i])) {
-+ if (accessPoints[i].connection_valid(connection)) {
- this._client.activate_connection(connection, this.device, accessPoints[i].dbus_path, null);
- break;
- }
-@@ -1346,40 +1319,6 @@ NMDeviceWireless.prototype = {
- return item;
- },
-
-- connectionValid: function(connection) {
-- if (connection._type != NetworkManager.SETTING_WIRELESS_SETTING_NAME)
-- return false;
--
-- let wirelessSettings = connection.get_setting_by_name(NetworkManager.SETTING_WIRELESS_SETTING_NAME);
-- let wirelessSecuritySettings = connection.get_setting_by_name(NetworkManager.SETTING_WIRELESS_SECURITY_SETTING_NAME);
--
-- let fixedMac = wirelessSettings.get_mac_address();
-- if (fixedMac && !macCompare(fixedMac, macToArray(this.device.perm_hw_address)))
-- return false;
--
-- if (wirelessSecuritySettings &&
-- wirelessSecuritySettings.key_mgmt != 'none' &&
-- wirelessSecuritySettings.key_mgmt != 'ieee8021x') {
-- let capabilities = this.device.wireless_capabilities;
-- if (!(capabilities & NetworkManager.DeviceWifiCapabilities.WPA) ||
-- !(capabilities & NetworkManager.DeviceWifiCapabilities.CIPHER_TKIP))
-- return false;
-- if (wirelessSecuritySettings.get_num_protos() == 1 &&
-- wirelessSecuritySettings.get_proto(0) == 'rsn' &&
-- !(capabilities & NetworkManager.DeviceWifiCapabilities.RSN))
-- return false;
-- if (wirelessSecuritySettings.get_num_pairwise() == 1 &&
-- wirelessSecuritySettings.get_pairwise(0) == 'ccmp' &&
-- !(capabilities & NetworkManager.DeviceWifiCapabilities.CIPHER_CCMP))
-- return false;
-- if (wirelessSecuritySettings.get_num_groups() == 1 &&
-- wirelessSecuritySettings.get_group(0) == 'ccmp' &&
-- !(capabilities & NetworkManager.DeviceWifiCapabilities.CIPHER_CCMP))
-- return false;
-- }
-- return true;
-- },
--
- _clearSection: function() {
- NMDevice.prototype._clearSection.call(this);
-
-@@ -1463,7 +1402,7 @@ NMDeviceWireless.prototype = {
- // Check if connection is valid for any of these access points
- for (let k = 0; k < apObj.accessPoints.length; k++) {
- let ap = apObj.accessPoints[k];
-- if (this._connectionValidForAP(connection, ap)) {
-+ if (ap.connection_valid(connection)) {
- apObj.connections.push(connection);
- // this potentially changes the sorting order
- forceupdate = true;
-@@ -1479,37 +1418,6 @@ NMDeviceWireless.prototype = {
- }
- },
-
-- _connectionValidForAP: function(connection, ap) {
-- // copied and adapted from nm-applet
-- let wirelessSettings = connection.get_setting_by_name(NetworkManager.SETTING_WIRELESS_SETTING_NAME);
-- if (!ssidCompare(wirelessSettings.get_ssid(), ap.get_ssid()))
-- return false;
--
-- let wirelessSecuritySettings = connection.get_setting_by_name(NetworkManager.SETTING_WIRELESS_SECURITY_SETTING_NAME);
--
-- let fixedBssid = wirelessSettings.get_bssid();
-- if (fixedBssid && !macCompare(fixedBssid, macToArray(ap.hw_address)))
-- return false;
--
-- let fixedBand = wirelessSettings.band;
-- if (fixedBand) {
-- let freq = ap.frequency;
-- if (fixedBand == 'a' && (freq < 4915 || freq > 5825))
-- return false;
-- if (fixedBand == 'bg' && (freq < 2412 || freq > 2484))
-- return false;
-- }
--
-- let fixedChannel = wirelessSettings.channel;
-- if (fixedChannel && fixedChannel != NetworkManager.utils_wifi_freq_to_channel(ap.frequency))
-- return false;
--
-- if (!wirelessSecuritySettings)
-- return true;
--
-- return wirelessSettings.ap_security_compatible(wirelessSecuritySettings, ap.flags, ap.wpa_flags, ap.rsn_flags, ap.mode);
-- },
--
- _createActiveConnectionItem: function() {
- let activeAp = this.device.active_access_point;
- let icon, title;
---
-cgit v0.9
-From 101a07a3d79223cc153a6c65f22acd76cbae4818 Mon Sep 17 00:00:00 2001
-From: Dan Williams <dcbw@redhat.com>
-Date: Tue, 03 May 2011 17:21:45 +0000
-Subject: network: fix handling of AP flags and enhance for 802.1x
-
-All WPA APs were getting set as WPA2 due to the check for privacy;
-WPA/WPA2 APs *must* set the Privacy bit according to the standard,
-so we'd never end up in the case for NMAccessPointSecurity.WPA.
-
-Fix that, and also add flags for WPA[2] Enterprise which we'll
-use a bit later for the first-time connect case for 802.1x enabled
-access points.
----
-(limited to 'js/ui/status/network.js')
-
-diff --git a/js/ui/status/network.js b/js/ui/status/network.js
-index bf8e272..6f0cdac 100644
---- a/js/ui/status/network.js
-+++ b/js/ui/status/network.js
-@@ -33,8 +33,10 @@ const NMAccessPointSecurity = {
- UNKNOWN: 0,
- NONE: 1,
- WEP: 2,
-- WPA: 3,
-- WPA2: 4
-+ WPA_PSK: 3,
-+ WPA2_PSK: 4,
-+ WPA_ENT: 5,
-+ WPA2_ENT: 6
- };
-
- // small optimization, to avoid using [] all the time
-@@ -1129,26 +1131,28 @@ NMDeviceWireless.prototype = {
- _getApSecurityType: function(accessPoint) {
- if (accessPoint._secType)
- return accessPoint._secType;
-- // XXX: have this checked by someone familiar with IEEE 802.1x
-
- let flags = accessPoint.flags;
- let wpa_flags = accessPoint.wpa_flags;
- let rsn_flags = accessPoint.rsn_flags;
- let type;
-- if ( !(flags & NM80211ApFlags.PRIVACY)
-- && (wpa_flags == NM80211ApSecurityFlags.NONE)
-- && (rsn_flags == NM80211ApSecurityFlags.NONE))
-- type = NMAccessPointSecurity.NONE;
-- else if ( (flags & NM80211ApFlags.PRIVACY)
-- && (wpa_flags == NM80211ApSecurityFlags.NONE)
-- && (rsn_flags == NM80211ApSecurityFlags.NONE))
-- type = NMAccessPointSecurity.WEP;
-- else if ( !(flags & NM80211ApFlags.PRIVACY)
-- && (wpa_flags != NM80211ApSecurity.NONE)
-- && (rsn_flags != NM80211ApSecurity.NONE))
-- type = NMAccessPointSecurity.WPA;
-- else
-- type = NMAccessPointSecurity.WPA2;
-+ if (rsn_flags != NM80211ApSecurityFlags.NONE) {
-+ /* RSN check first so that WPA+WPA2 APs are treated as RSN/WPA2 */
-+ if (rsn_flags & NM80211ApSecurityFlags.KEY_MGMT_802_1X)
-+ type = NMAccessPointSecurity.WPA2_ENT;
-+ else if (rsn_flags & NM80211ApSecurityFlags.KEY_MGMT_PSK)
-+ type = NMAccessPointSecurity.WPA2_PSK;
-+ } else if (wpa_flags != NM80211ApSecurityFlags.NONE) {
-+ if (wpa_flags & NM80211ApSecurityFlags.KEY_MGMT_802_1X)
-+ type = NMAccessPointSecurity.WPA_ENT;
-+ else if (wpa_flags & NM80211ApSecurityFlags.KEY_MGMT_PSK)
-+ type = NMAccessPointSecurity.WPA_PSK;
-+ } else {
-+ if (flags & NM80211ApFlags.PRIVACY)
-+ type = NMAccessPointSecurity.WEP;
-+ else
-+ type = NMAccessPointSecurity.NONE;
-+ }
-
- // cache the found value to avoid checking flags all the time
- accessPoint._secType = type;
---
-cgit v0.9
-From ae0652d13fc2d7caa3d64f2b87d174253cae5901 Mon Sep 17 00:00:00 2001
-From: Dan Williams <dcbw@redhat.com>
-Date: Tue, 03 May 2011 18:31:45 +0000
-Subject: network: fix initial connections to WPA[2] Enterprise APs
-
-Call out to nm-applet to do the dirty work since the dialog of
-doom is pretty complicated and we don't have a JS equivalent
-of it for now.
-
-Fixes https://bugzilla.gnome.org/show_bug.cgi?id=648171
----
-(limited to 'js/ui/status/network.js')
-
-diff --git a/js/ui/status/network.js b/js/ui/status/network.js
-index 6f0cdac..ca4facf 100644
---- a/js/ui/status/network.js
-+++ b/js/ui/status/network.js
-@@ -48,6 +48,16 @@ const NM80211ApSecurityFlags = NetworkManager['80211ApSecurityFlags'];
- // (the remaining are placed into More...)
- const NUM_VISIBLE_NETWORKS = 5;
-
-+const NMAppletHelperInterface = {
-+ name: 'org.gnome.network_manager_applet',
-+ methods: [
-+ { name: 'ConnectToHiddenNetwork', inSignature: '', outSignature: '' },
-+ { name: 'CreateWifiNetwork', inSignature: '', outSignature: '' },
-+ { name: 'ConnectTo8021xNetwork', inSignature: 'oo', outSignature: '' }
-+ ],
-+};
-+const NMAppletProxy = DBus.makeProxyClass(NMAppletHelperInterface);
-+
- function macToArray(string) {
- return string.split(':').map(function(el) {
- return parseInt(el, 16);
-@@ -991,6 +1001,10 @@ NMDeviceWireless.prototype = {
- this._overflowItem = null;
- this._networks = [ ];
-
-+ this._applet_proxy = new NMAppletProxy(DBus.session,
-+ 'org.gnome.network_manager_applet',
-+ '/org/gnome/network_manager_applet');
-+
- // breaking the layers with this, but cannot call
- // this.connectionValid until I have a device
- this.device = device;
-@@ -1483,9 +1497,20 @@ NMDeviceWireless.prototype = {
- apObj.item = new NMNetworkMenuItem(apObj.accessPoints);
- apObj.item._apObj = apObj;
- apObj.item.connect('activate', Lang.bind(this, function() {
-- let connection = this._createAutomaticConnection(apObj);
- let accessPoints = sortAccessPoints(apObj.accessPoints);
-- this._client.add_and_activate_connection(connection, this.device, accessPoints[0].dbus_path, null)
-+ if ( (accessPoints[0]._secType == NMAccessPointSecurity.WPA2_ENT)
-+ || (accessPoints[0]._secType == NMAccessPointSecurity.WPA_ENT)) {
-+ // 802.1x-enabled APs get handled by nm-applet for now...
-+ this._applet_proxy.ConnectTo8021xNetworkRemote(this.device.get_path(),
-+ accessPoints[0].dbus_path,
-+ Lang.bind(this, function(results, err) {
-+ if (err)
-+ log(err);
-+ }));
-+ } else {
-+ let connection = this._createAutomaticConnection(apObj);
-+ this._client.add_and_activate_connection(connection, this.device, accessPoints[0].dbus_path, null)
-+ }
- }));
- }
- if (position < NUM_VISIBLE_NETWORKS)
---
-cgit v0.9
-From 5090a4ccce87643081138272fb8a2fe687f1ed0a Mon Sep 17 00:00:00 2001
-From: Dan Williams <dcbw@redhat.com>
-Date: Tue, 03 May 2011 19:48:10 +0000
-Subject: network: request that nm-applet show the mobile broadband wizard
-
-Use nm-applet 0.8.999 API to call the mobile broadband wizard and
-activate the new connection.
-
-Fixes https://bugzilla.gnome.org/show_bug.cgi?id=649318
----
-(limited to 'js/ui/status/network.js')
-
-diff --git a/js/ui/status/network.js b/js/ui/status/network.js
-index ca4facf..756b27f 100644
---- a/js/ui/status/network.js
-+++ b/js/ui/status/network.js
-@@ -53,7 +53,8 @@ const NMAppletHelperInterface = {
- methods: [
- { name: 'ConnectToHiddenNetwork', inSignature: '', outSignature: '' },
- { name: 'CreateWifiNetwork', inSignature: '', outSignature: '' },
-- { name: 'ConnectTo8021xNetwork', inSignature: 'oo', outSignature: '' }
-+ { name: 'ConnectTo8021xNetwork', inSignature: 'oo', outSignature: '' },
-+ { name: 'ConnectTo3gNetwork', inSignature: 'o', outSignature: '' }
- ],
- };
- const NMAppletProxy = DBus.makeProxyClass(NMAppletHelperInterface);
-@@ -440,7 +441,8 @@ NMDevice.prototype = {
- this._client.activate_connection(this._connections[0].connection, this.device, null, null);
- } else if (this._autoConnectionName) {
- let connection = this._createAutomaticConnection();
-- this._client.add_and_activate_connection(connection, this.device, null, null);
-+ if (connection)
-+ this._client.add_and_activate_connection(connection, this.device, null, null);
- }
- },
-
-@@ -620,7 +622,8 @@ NMDevice.prototype = {
- this._autoConnectionItem = new PopupMenu.PopupMenuItem(this._autoConnectionName);
- this._autoConnectionItem.connect('activate', Lang.bind(this, function() {
- let connection = this._createAutomaticConnection();
-- this._client.add_and_activate_connection(connection, this.device, null, null);
-+ if (connection)
-+ this._client.add_and_activate_connection(connection, this.device, null, null);
- }));
- this.section.addMenuItem(this._autoConnectionItem);
- }
-@@ -777,6 +780,10 @@ NMDeviceModem.prototype = {
- this.mobileDevice = null;
- this._connectionType = 'ppp';
-
-+ this._applet_proxy = new NMAppletProxy(DBus.session,
-+ 'org.gnome.network_manager_applet',
-+ '/org/gnome/network_manager_applet');
-+
- this._capabilities = device.current_capabilities;
- if (this._capabilities & NetworkManager.DeviceModemCapabilities.GSM_UMTS) {
- is_wwan = true;
-@@ -878,19 +885,13 @@ NMDeviceModem.prototype = {
- },
-
- _createAutomaticConnection: function() {
-- // FIXME: we need to summon the mobile wizard here
-- // or NM will not have the necessary parameters to complete the connection
-- // pending a DBus method on nm-applet
--
-- let connection = new NetworkManager.Connection;
-- connection._uuid = NetworkManager.utils_uuid_generate();
-- connection.add_setting(new NetworkManager.SettingConnection({
-- uuid: connection._uuid,
-- id: this._autoConnectionName,
-- type: this._connectionType,
-- autoconnect: false
-- }));
-- return connection;
-+ // Mobile wizard is handled by nm-applet for now...
-+ this._applet_proxy.ConnectTo3gNetworkRemote(this.device.get_path(),
-+ Lang.bind(this, function(results, err) {
-+ if (err)
-+ log(err);
-+ }));
-+ return null;
- }
- };
-
---
-cgit v0.9
diff --git a/extra/gnome-shell/shell-xfixes-cursor_missing_free.patch b/extra/gnome-shell/shell-xfixes-cursor_missing_free.patch
deleted file mode 100644
index 6a66c9384..000000000
--- a/extra/gnome-shell/shell-xfixes-cursor_missing_free.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 88de26138a8b79d89884ff2eb6471c5a8e3b39ca Mon Sep 17 00:00:00 2001
-From: Maxim Ermilov <zaspire@rambler.ru>
-Date: Thu, 05 May 2011 10:06:05 +0000
-Subject: shell-xfixes-cursor: missing XFree
-
-memory returned by XFixesGetCursorImage should be freed after usage.
-https://bugzilla.gnome.org/show_bug.cgi?id=642652
----
-diff --git a/src/shell-xfixes-cursor.c b/src/shell-xfixes-cursor.c
-index 14d2b59..334503d 100644
---- a/src/shell-xfixes-cursor.c
-+++ b/src/shell-xfixes-cursor.c
-@@ -254,6 +254,7 @@ xfixes_cursor_reset_image (ShellXFixesCursor *xfixes_cursor)
- xfixes_cursor->cursor_hot_y = cursor_image->yhot;
- g_signal_emit (xfixes_cursor, signals[CURSOR_CHANGED], 0);
- }
-+ XFree (cursor_image);
- }
-
- static void
---
-cgit v0.9
diff --git a/extra/gnome-shell/st-private_correct_fix_memory_leak.patch b/extra/gnome-shell/st-private_correct_fix_memory_leak.patch
deleted file mode 100644
index d3f887c29..000000000
--- a/extra/gnome-shell/st-private_correct_fix_memory_leak.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From c975740f9228b2c53d79ac08ad704fca5f1c5b6e Mon Sep 17 00:00:00 2001
-From: Colin Walters <walters@verbum.org>
-Date: Wed, 11 May 2011 15:21:18 +0000
-Subject: st-private: Correct fix for memory leak
-
-The previous fix in 72f9f482d was wrong; we need to keep around
-the buffer until cairo is done with the pattern.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=649497
----
-diff --git a/src/st/st-private.c b/src/st/st-private.c
-index 51798a1..21ca09a 100644
---- a/src/st/st-private.c
-+++ b/src/st/st-private.c
-@@ -667,6 +667,7 @@ cairo_pattern_t *
- _st_create_shadow_cairo_pattern (StShadow *shadow_spec,
- cairo_pattern_t *src_pattern)
- {
-+ static cairo_user_data_key_t shadow_pattern_user_data;
- cairo_t *cr;
- cairo_surface_t *src_surface;
- cairo_surface_t *surface_in;
-@@ -728,6 +729,8 @@ _st_create_shadow_cairo_pattern (StShadow *shadow_spec,
- width_out,
- height_out,
- rowstride_out);
-+ cairo_surface_set_user_data (surface_out, &shadow_pattern_user_data,
-+ pixels_out, (cairo_destroy_func_t) g_free);
-
- dst_pattern = cairo_pattern_create_for_surface (surface_out);
- cairo_surface_destroy (surface_out);
-@@ -745,8 +748,7 @@ _st_create_shadow_cairo_pattern (StShadow *shadow_spec,
- (width_out - width_in) / 2.0,
- (height_out - height_in) / 2.0);
- cairo_pattern_set_matrix (dst_pattern, &shadow_matrix);
--
-- goto out;
-+ return dst_pattern;
- }
-
- /* Read all the code from the cairo_pattern_set_matrix call
-@@ -784,8 +786,6 @@ _st_create_shadow_cairo_pattern (StShadow *shadow_spec,
-
- cairo_pattern_set_matrix (dst_pattern, &shadow_matrix);
-
-- out:
-- g_free (pixels_out);
- return dst_pattern;
- }
-
---
-cgit v0.9
diff --git a/extra/gnome-shell/st-private_fix_memory_leak.patch b/extra/gnome-shell/st-private_fix_memory_leak.patch
deleted file mode 100644
index 677a26531..000000000
--- a/extra/gnome-shell/st-private_fix_memory_leak.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 72f9f482d6f1bcb53ea2bd1606818af1f33a5a8c Mon Sep 17 00:00:00 2001
-From: Colin Walters <walters@verbum.org>
-Date: Thu, 05 May 2011 19:21:58 +0000
-Subject: st-private: Fix memory leak
-
-==13810== 11,360 bytes in 1 blocks are definitely lost in loss record 18,574 of 18,765
-==13810== at 0x4005447: calloc (vg_replace_malloc.c:467)
-==13810== by 0x5191882: standard_calloc (gmem.c:107)
-==13810== by 0x51920A7: g_malloc0 (gmem.c:196)
-==13810== by 0x4056201: blur_pixels (st-private.c:466)
-==13810== by 0x40573B4: _st_create_shadow_cairo_pattern (st-private.c:710)
-==13810== by 0x4070746: st_theme_node_paint (st-theme-node-drawing.c:856)
-==13810== by 0x3FEFFFFF: ???
-
-https://bugzilla.gnome.org/show_bug.cgi?id=649497
----
-diff --git a/src/st/st-private.c b/src/st/st-private.c
-index d0aa89b..51798a1 100644
---- a/src/st/st-private.c
-+++ b/src/st/st-private.c
-@@ -746,7 +746,7 @@ _st_create_shadow_cairo_pattern (StShadow *shadow_spec,
- (height_out - height_in) / 2.0);
- cairo_pattern_set_matrix (dst_pattern, &shadow_matrix);
-
-- return dst_pattern;
-+ goto out;
- }
-
- /* Read all the code from the cairo_pattern_set_matrix call
-@@ -784,6 +784,8 @@ _st_create_shadow_cairo_pattern (StShadow *shadow_spec,
-
- cairo_pattern_set_matrix (dst_pattern, &shadow_matrix);
-
-+ out:
-+ g_free (pixels_out);
- return dst_pattern;
- }
-
---
-cgit v0.9
diff --git a/extra/inkscape/inkscape.install b/extra/inkscape/inkscape.install
deleted file mode 100644
index c4b2efa09..000000000
--- a/extra/inkscape/inkscape.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
- update-desktop-database -q
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install
-}
-
-
-post_remove() {
- post_install
-}
diff --git a/extra/ipod-sharp/PKGBUILD b/extra/ipod-sharp/PKGBUILD
deleted file mode 100644
index a5dd0f755..000000000
--- a/extra/ipod-sharp/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 59294 2009-11-21 20:34:51Z jgc $
-# Maintainer: Hugo Doria <hugo@archlinux.org>
-
-pkgname=ipod-sharp
-pkgver=0.8.5
-pkgrel=1
-pkgdesc="C# bindings for libipoddevice"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://download.banshee-project.org/ipod-sharp/"
-depends=('podsleuth' 'ndesk-dbus-glib' 'gtk-sharp-2')
-options=(!makeflags)
-source=(http://download.banshee-project.org/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('7c5b02872c75a7d61662e266e6f7a2a1aae14f71d9820a59faef2813dcd825fd')
-
-build() {
- export MONO_SHARED_DIR="${srcdir}/.wabi"
- mkdir -p "${MONO_SHARED_DIR}"
-
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --disable-docs || return 1
- make || return 1
- make DESTDIR="${pkgdir}" install || return 1
-
- rm -fr "${MONO_SHARED_DIR}"
-}
diff --git a/extra/kdebase-workspace/nm-09.patch b/extra/kdebase-workspace/nm-09.patch
deleted file mode 100644
index 20ccd4d7d..000000000
--- a/extra/kdebase-workspace/nm-09.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- kdebase-workspace-4.6.3/solid/CMakeLists.txt~ 2011-04-29 03:43:20.321994578 -0700
-+++ kdebase-workspace-4.6.3/solid/CMakeLists.txt 2011-04-29 03:43:33.271995023 -0700
-@@ -17,7 +17,7 @@
- add_subdirectory(networkmanager-0.6)
- endif (NM_0_6)
-
-- macro_ensure_version_range("0.7.0" ${NETWORKMANAGER_VERSION} "0.9.0" NM_0_7)
-+ macro_ensure_version("0.7.0" ${NETWORKMANAGER_VERSION} NM_0_7)
- if (NM_0_7)
- message(STATUS "Will build networkmanager-0.7")
- set(HAVE_NETWORKMANAGER TRUE)
---- kdebase-workspace-4.6.3/solid/networkmanager-0.7/manager.cpp~ 2011-04-29 03:32:33.838644845 -0700
-+++ kdebase-workspace-4.6.3/solid/networkmanager-0.7/manager.cpp 2011-04-29 03:40:52.308657544 -0700
-@@ -118,16 +118,16 @@
- uint deviceType = devIface.deviceType();
- NMNetworkInterface * createdInterface = 0;
- switch ( deviceType ) {
-- case DEVICE_TYPE_802_3_ETHERNET:
-+ case NM_DEVICE_TYPE_ETHERNET:
- createdInterface = new NMWiredNetworkInterface(uni, this, 0); // these are deleted by the frontend manager
- break;
-- case DEVICE_TYPE_802_11_WIRELESS:
-+ case NM_DEVICE_TYPE_WIFI:
- createdInterface = new NMWirelessNetworkInterface(uni, this, 0);
- break;
-- case DEVICE_TYPE_GSM:
-+ case 3:
- createdInterface = new NMGsmNetworkInterface(uni, this, 0);
- break;
-- case DEVICE_TYPE_CDMA:
-+ case 4:
- createdInterface = new NMCdmaNetworkInterface(uni, this, 0);
- break;
- /*
diff --git a/extra/kdeplasma-applets-networkmanagement/nm-09.patch b/extra/kdeplasma-applets-networkmanagement/nm-09.patch
deleted file mode 100644
index 52b875513..000000000
--- a/extra/kdeplasma-applets-networkmanagement/nm-09.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From: Lamarque V. Souza <lamarque@gmail.com>
-Date: Sun, 17 Apr 2011 00:09:43 +0000
-Subject: Fix compilation against NetworkManager-0.8.98.
-X-Git-Url: http://quickgit.kde.org/?p=networkmanagement.git&amp;a=commitdiff&amp;h=e87ceccadc833e220f73d86352968655cedc0485
----
-Fix compilation against NetworkManager-0.8.98.
-
-BUG: 271101
----
-
-
---- a/backends/NetworkManager/nmdbussettingsservice.cpp
-+++ b/backends/NetworkManager/nmdbussettingsservice.cpp
-@@ -59,7 +59,7 @@ public:
- QHash<QUuid, QDBusObjectPath> uuidToPath;
- };
-
--const QString NMDBusSettingsService::SERVICE_USER_SETTINGS = QLatin1String(NM_DBUS_SERVICE_USER_SETTINGS);
-+const QString NMDBusSettingsService::SERVICE_USER_SETTINGS = QLatin1String("org.freedesktop.NetworkManagerUserSettings");
- const QString NMDBusSettingsService::SERVICE_SYSTEM_SETTINGS = QLatin1String("org.freedesktop.NetworkManager");
-
- NMDBusSettingsService::NMDBusSettingsService(QObject * parent)
-
---- a/backends/NetworkManager/settings/gsmdbus.cpp
-+++ b/backends/NetworkManager/settings/gsmdbus.cpp
-@@ -35,7 +35,7 @@ void GsmDbus::fromMap(const QVariantMap
- if (map.contains(QLatin1String(NM_SETTING_GSM_NETWORK_TYPE))) {
- setting->setNetworktype(map.value(QLatin1String(NM_SETTING_GSM_NETWORK_TYPE)).value<int>());
- } else {
-- setting->setNetworktype(NM_GSM_NETWORK_ANY);
-+ setting->setNetworktype(NM_SETTING_GSM_NETWORK_TYPE_ANY);
- }
- if (map.contains("band")) {
- setting->setBand(map.value("band").value<int>());
-@@ -62,7 +62,7 @@ QVariantMap GsmDbus::toMap()
- map.insert("apn", setting->apn());
- if (!setting->networkid().isEmpty())
- map.insert(QLatin1String(NM_SETTING_GSM_NETWORK_ID), setting->networkid());
-- if (setting->networktype() != NM_GSM_NETWORK_ANY) {
-+ if (setting->networktype() != NM_SETTING_GSM_NETWORK_TYPE_ANY) {
- map.insert(QLatin1String(NM_SETTING_GSM_NETWORK_TYPE), setting->networktype());
- }
-
-
diff --git a/extra/libgnome-keyring/fix_crash.patch b/extra/libgnome-keyring/fix_crash.patch
deleted file mode 100644
index 1e28cdb73..000000000
--- a/extra/libgnome-keyring/fix_crash.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 9bcac748b54e00836715b0f70be26b7cbdc8c888 Mon Sep 17 00:00:00 2001
-From: Martin Pitt <martin.pitt@ubuntu.com>
-Date: Mon, 23 May 2011 08:58:49 +0000
-Subject: Fix crash from recent memleak fix (b49e32b)
-
-make_attribute_list_va() statically copies the caller's method arguments into
-the GnomeKeyringAttributeList, so we must only free the array itself, not the
-GnomeKeyringAttribute strings.
-
-Bug: https://bugzilla.gnome.org/show_bug.cgi?id=650840
----
-diff --git a/library/gnome-keyring.c b/library/gnome-keyring.c
-index dc271dd..4febf47 100644
---- a/library/gnome-keyring.c
-+++ b/library/gnome-keyring.c
-@@ -2443,7 +2443,7 @@ gnome_keyring_find_itemsv (GnomeKeyringItemType type,
- va_end (args);
-
- ret = gnome_keyring_find_items (type, attributes, callback, data, destroy_data);
-- gnome_keyring_attribute_list_free (attributes);
-+ g_array_free (attributes, TRUE);
- return ret;
- }
-
-@@ -2520,7 +2520,7 @@ gnome_keyring_find_itemsv_sync (GnomeKeyringItemType type,
- va_end (args);
-
- ret = gnome_keyring_find_items_sync (type, attributes, found);
-- gnome_keyring_attribute_list_free (attributes);
-+ g_array_free (attributes, TRUE);
- return ret;
- }
-
---
-cgit v0.9
diff --git a/extra/madwifi-utils/PKGBUILD b/extra/madwifi-utils/PKGBUILD
deleted file mode 100644
index 35feeea07..000000000
--- a/extra/madwifi-utils/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 70649 2010-02-27 18:41:30Z tpowa $
-# Originally by kleptophobiac <kleptophobiac@gmail.com>
-# Modified by James Rayner for the repositories <iphitus@gmail.com>
-
-pkgname=madwifi-utils
-pkgver=0.9.4.4119
-_kernver=2.6.33-ARCH
-pkgrel=1
-pkgdesc="Userspace tools of madwifi drivers for Atheros wireless chipsets."
-arch=(i686 x86_64)
-license=('GPL')
-url="http://madwifi-project.org"
-depends=('wireless_tools')
-makedepends=('sharutils')
-provides=("madwifi-ng-utils")
-conflicts=("madwifi-ng-utils")
-replaces=("madwifi-ng-utils")
-# subversion source: svn checkout http://madwifi-project.org/svn/madwifi/trunk madwifi
-source=(ftp://ftp.archlinux.org/other/madwifi/madwifi-${pkgver}.tar.bz2
- #http://downloads.sourceforge.net/sourceforge/madwifi/madwifi-$pkgver.tar.gz
- )
-
-build() {
- [ "${CARCH}" == "i686" ] && export ARCH=i386
-
- export KERNELPATH=/lib/modules/${_kernver}/build
- #cd $startdir/src/madwifi-$pkgver
- cd $startdir/src/madwifi
- make tools|| return 1
- make DESTDIR=$startdir/pkg \
- BINDIR=/usr/bin \
- MANDIR=/usr/share/man \
- install-tools
-}
-md5sums=('a720a20264b312c0ff906b9888bb49ae')
diff --git a/extra/madwifi/PKGBUILD b/extra/madwifi/PKGBUILD
deleted file mode 100644
index 1c1d9e484..000000000
--- a/extra/madwifi/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 115939 2011-03-22 14:09:32Z tpowa $
-# Originally by kleptophobiac <kleptophobiac@gmail.com>
-# Modified by James Rayner for the repositories <iphitus@gmail.com>
-
-_kernver=2.6.38-ARCH
-
-pkgname=madwifi
-pkgver=0.9.4.4136
-pkgrel=2
-pkgdesc="Madwifi drivers for Atheros wireless chipsets. For stock arch 2.6 kernel"
-arch=(i686 x86_64)
-license=('GPL')
-url="http://madwifi-project.org"
-depends=('madwifi-utils' 'kernel26>=2.6.38' 'kernel26<2.6.39')
-makedepends=('kernel26-headers>=2.6.38' 'kernel26-headers<2.6.39')
-makedepends=('sharutils')
-install=madwifi-ng.install
-# subversion source: svn checkout http:/madwifi-project.org/svn/madwifi/trunk madwifi
-source=(ftp://ftp.archlinux.org/other/madwifi/madwifi-${pkgver}.tar.bz2
- #http://downloads.sourceforge.net/madwifi/madwifi-${pkgver}.tar.gz
- )
-options=(!strip)
-
-build() {
- [ "${CARCH}" = "i686" ] && export ARCH=i386
-
- #cd $startdir/src/$pkgname-$pkgver
- cd $startdir/src/$pkgname
- sed -i -e 's/-Werror//g' Makefile.inc
- make KERNELPATH=/lib/modules/$_kernver/build KERNELRELEASE=$_kernver modules
-}
-
-package() {
- cd $startdir/src/$pkgname
- make KERNELPATH=/lib/modules/$_kernver/build KERNELRELEASE=$_kernver modules \
- DESTDIR=$startdir/pkg KERNELRELEASE=$_kernver install-modules
- sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" $startdir/*.install
-
- # install to wireless kernel directory
- mkdir -p $startdir/pkg/lib/modules/$_kernver/kernel/drivers/net/wireless/madwifi
- mv $startdir/pkg/lib/modules/$_kernver/net/* $startdir/pkg/lib/modules/$_kernver/kernel/drivers/net/wireless/madwifi
- rm -r $startdir/pkg/lib/modules/$_kernver/net/
- # gzip -9 modules
- find "$pkgdir" -name '*.ko' -exec gzip -9 {} \;
-}
-md5sums=('f705acf5597ebe070efeaeb6c330748f')
diff --git a/extra/madwifi/kernel-2.6.30.patch b/extra/madwifi/kernel-2.6.30.patch
deleted file mode 100644
index f844668de..000000000
--- a/extra/madwifi/kernel-2.6.30.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- ath/if_athvar.h~ 2009-06-13 09:38:53.000000000 +0200
-+++ ath/if_athvar.h 2009-06-13 09:38:53.000000000 +0200
-@@ -103,11 +103,6 @@
- /*
- * Guess how the interrupt handler should work.
- */
--#if !defined(IRQ_NONE)
--typedef void irqreturn_t;
--#define IRQ_NONE
--#define IRQ_HANDLED
--#endif /* !defined(IRQ_NONE) */
-
- #ifndef SET_MODULE_OWNER
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
diff --git a/extra/madwifi/madwifi-ng.install b/extra/madwifi/madwifi-ng.install
deleted file mode 100644
index 8681b53ed..000000000
--- a/extra/madwifi/madwifi-ng.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
- KERNEL_VERSION='2.6.38-ARCH'
- depmod -ae $KERNEL_VERSION > /dev/null 2>&1
-}
-
-post_upgrade() {
- KERNEL_VERSION='2.6.38-ARCH'
- depmod -ae $KERNEL_VERSION > /dev/null 2>&1
-}
-
-post_remove() {
- KERNEL_VERSION='2.6.38-ARCH'
- depmod -ae $KERNEL_VERSION > /dev/null 2>&1
-}
diff --git a/extra/moc/ChangeLog b/extra/moc/ChangeLog
deleted file mode 100644
index d494c5280..000000000
--- a/extra/moc/ChangeLog
+++ /dev/null
@@ -1,32 +0,0 @@
-2010-02-25 Eric Belanger <eric@archlinux.org>
-
- * moc 2.5.0_alpha4-2
- * Added wavpack and modplug support (close FS#18449)
-
-2010-01-24 Eric Belanger <eric@archlinux.org>
-
- * moc 2.5.0_alpha4-1
- * Upstream update to unstable series
- * Fixed aac support (close FS#13164)
-
-2009-11-07 Eric Belanger <eric@archlinux.org>
-
- * Fixed optdepends array syntax (close FS#16053)
-
-2009-03-21 Eric Belanger <eric@archlinux.org>
-
- * moc 2.4.4-3
- * Added missing libid3tag depends (close FS#13819)
-
-2009-03-07 Eric Belanger <eric@archlinux.org>
-
- * moc 2.4.4-2
- * Added patch to fix playback of WMA files
-
-2009-01-11 Eric Belanger <eric@archlinux.org>
-
- * moc 2.4.4-1
- * Upstream update
- * Added libtool depends
- * Replaced install scriptlet by optdepends
- * Added ChangeLog
diff --git a/extra/mutter/squash_some_leaks.patch b/extra/mutter/squash_some_leaks.patch
deleted file mode 100644
index 0e6b506bc..000000000
--- a/extra/mutter/squash_some_leaks.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 65963748860aec8e3d7ee939b3b16876f4117904 Mon Sep 17 00:00:00 2001
-From: Colin Walters <walters@verbum.org>
-Date: Thu, 05 May 2011 20:11:02 +0000
-Subject: region-utils.c: Squash a memory leak
-
-"chunk" was an allocated but unused variable.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=649504
----
-diff --git a/src/compositor/region-utils.c b/src/compositor/region-utils.c
-index b4071ca..cf3c64e 100644
---- a/src/compositor/region-utils.c
-+++ b/src/compositor/region-utils.c
-@@ -248,7 +248,6 @@ expand_region_inverse (cairo_region_t *region,
- MetaRegionBuilder builder;
- MetaRegionIterator iter;
- cairo_rectangle_int_t extents;
-- cairo_region_t *chunk;
-
- int last_x;
-
-@@ -268,16 +267,11 @@ expand_region_inverse (cairo_region_t *region,
- extents.x, extents.y + extents.height, extents.width, 1,
- x_amount, y_amount, flip);
-
-- chunk = NULL;
--
- last_x = extents.x;
- for (meta_region_iterator_init (&iter, region);
- !meta_region_iterator_at_end (&iter);
- meta_region_iterator_next (&iter))
- {
-- if (chunk == NULL)
-- chunk = cairo_region_create ();
--
- if (iter.rectangle.x > last_x)
- add_expanded_rect (&builder,
- last_x, iter.rectangle.y,
---
-cgit v0.9
-From d0414a3ea697738dcdf2641b6a8000df35215862 Mon Sep 17 00:00:00 2001
-From: Colin Walters <walters@verbum.org>
-Date: Thu, 05 May 2011 20:46:00 +0000
-Subject: theme.c: Squash memory leak
-
-When converting a token to a different type, we need to free its
-string.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=649500
----
-diff --git a/src/ui/theme.c b/src/ui/theme.c
-index 0077388..9305645 100644
---- a/src/ui/theme.c
-+++ b/src/ui/theme.c
-@@ -2639,11 +2639,13 @@ meta_theme_replace_constants (MetaTheme *theme,
- {
- if (meta_theme_lookup_int_constant (theme, t->d.v.name, &ival))
- {
-+ g_free (t->d.v.name);
- t->type = POS_TOKEN_INT;
- t->d.i.val = ival;
- }
- else if (meta_theme_lookup_float_constant (theme, t->d.v.name, &dval))
- {
-+ g_free (t->d.v.name);
- t->type = POS_TOKEN_DOUBLE;
- t->d.d.val = dval;
- }
---
-cgit v0.9
diff --git a/extra/neverball/ChangeLog b/extra/neverball/ChangeLog
deleted file mode 100644
index d4c6561ca..000000000
--- a/extra/neverball/ChangeLog
+++ /dev/null
@@ -1,50 +0,0 @@
-2010-01-18 Eric Belanger <eric@archlinux.org>
-
- * neverball 1.5.4-2
- * Rebuilt for libpng 1.4 and libjpeg 8
-
-2009-09-20 Eric Belanger <eric@archlinux.org>
-
- * neverball 1.5.4-1
- * Upstream update
-
-2009-09-08 Eric Belanger <eric@archlinux.org>
-
- * neverball 1.5.3-1
- * Upstream update
-
-2009-08-16 Eric Belanger <eric@archlinux.org>
-
- * neverball 1.5.2-1
- * Upstream update
- * Added physfs depends
- * Fixed file permissions
-
-2009-08-08 Eric Belanger <eric@archlinux.org>
-
- * neverball 1.5.1-2.1
- * Built i686 package without sse (close FS#15849)
-
-2009-07-01 Eric Belanger <eric@archlinux.org>
-
- * neverball 1.5.1-2
- * Rebuilt against libjpeg 7
-
-2009-04-08 Eric Belanger <eric@archlinux.org>
-
- * neverball 1.5.1-1
- * Upstream update
- * Removed sdl_image and sdl_mixer depends: not needed anymore
- * Added libpng, libjpeg and libvorbis depends
-
-2009-02-03 Eric Belanger <eric@archlinux.org>
-
- * neverball 1.5.0-1
- * Upstream update
- * Updated url
- * Added mesa makedepends
- * Switched to upstream desktop file and icons
- * Removed wrapper scripts
- * Added mapc binary
- * Added locales, man pages and docs
- * Added ChangeLog
diff --git a/extra/rxvt-unicode/popup-menu-hang.diff b/extra/rxvt-unicode/popup-menu-hang.diff
deleted file mode 100644
index 09bb3c64b..000000000
--- a/extra/rxvt-unicode/popup-menu-hang.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: src/perl/urxvt-popup
-===================================================================
-RCS file: /schmorpforge/rxvt-unicode/src/perl/urxvt-popup,v
-retrieving revision 1.15
-diff -u -r1.15 urxvt-popup
---- src/perl/urxvt-popup 24 Dec 2007 08:21:40 -0000 1.15
-+++ src/perl/urxvt-popup 2 Aug 2009 08:22:52 -0000
-@@ -120,7 +120,7 @@
- $self->refresh;
-
- # might fail, but try anyways
-- $self->grab ($self->{data}{event}{time}, 1)
-+ $self->grab ($self->{data}{event}{time})
- and $self->allow_events_async;
-
- on_button_press $self, $self->{data}{event} if $self->{data}{event}{button};
-@@ -132,7 +132,7 @@
- my ($self, $event) = @_;
-
- # should definitely not fail
-- $self->grab ($self->{data}{event}{time}, 1)
-+ $self->grab ($self->{data}{event}{time})
- and $self->allow_events_async;
- }
diff --git a/extra/scim/gcc45.patch b/extra/scim/gcc45.patch
deleted file mode 100644
index 267a2bbf6..000000000
--- a/extra/scim/gcc45.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur scim-1.4.9.orig//src/ltdl.cpp scim-1.4.9/src/ltdl.cpp
---- scim-1.4.9.orig//src/ltdl.cpp 2008-11-02 01:42:40.000000000 -0500
-+++ scim-1.4.9/src/ltdl.cpp 2010-07-04 00:19:58.924925581 -0500
-@@ -3361,7 +3361,7 @@
- {
- lt_dlhandle handle = 0;
- char * tmp = 0;
-- char * ext = 0;
-+ const char * ext = 0;
- size_t len;
- int errors = 0;
-
diff --git a/extra/scim/scim.install b/extra/scim/scim.install
deleted file mode 100644
index 1097ea400..000000000
--- a/extra/scim/scim.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
- echo -n "updating gtk.immodules... "
- /usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
- echo "done."
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/extra/vigra/libpng-1.4.patch b/extra/vigra/libpng-1.4.patch
deleted file mode 100644
index 3c69e8eb8..000000000
--- a/extra/vigra/libpng-1.4.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur vigra1.6.0-orig/src/impex/png.cxx vigra1.6.0/src/impex/png.cxx
---- vigra1.6.0-orig/src/impex/png.cxx 2010-01-20 19:46:57.000000000 -0500
-+++ vigra1.6.0/src/impex/png.cxx 2010-01-20 19:47:55.000000000 -0500
-@@ -270,8 +270,8 @@
- // expand gray values to at least one byte size
- if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) {
- if (setjmp(png->jmpbuf))
-- vigra_postcondition( false,png_error_message.insert(0, "error in png_set_gray_1_2_4_to_8(): ").c_str());
-- png_set_gray_1_2_4_to_8(png);
-+ vigra_postcondition( false,png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str());
-+ png_set_expand_gray_1_2_4_to_8(png);
- bit_depth = 8;
- }
-
diff --git a/extra/xaw3d/ChangeLog b/extra/xaw3d/ChangeLog
deleted file mode 100644
index 077b24d3d..000000000
--- a/extra/xaw3d/ChangeLog
+++ /dev/null
@@ -1,15 +0,0 @@
-2009-05-10 Jan de Groot <jgc@archlinux.org>
-
- * xaw3d 1.5E-2
- * Build without libxp (requires latest imake)
- * Simplify PKGBUILD a bit
- * Add extra patches from Fedora
- * Fix URL
-
-2008-12-14 Eric Belanger <eric@archlinux.org>
-
- * xaw3d 1.5E-1
- * Upstream update
- * Updated url
- * Added misc. patches
- * Added ChangeLog
diff --git a/kde-unstable/kdepim-runtime/disable-l10n.patch b/kde-unstable/kdepim-runtime/disable-l10n.patch
deleted file mode 100644
index 3ac9bc0e5..000000000
--- a/kde-unstable/kdepim-runtime/disable-l10n.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- CMakeLists.txt~ 2011-01-30 06:27:14.403350537 -0800
-+++ CMakeLists.txt 2011-01-30 06:27:58.130017204 -0800
-@@ -192,7 +192,3 @@
- update_xdg_mimetypes(${XDG_MIME_INSTALL_DIR})
-
- macro_display_feature_log()
--
--find_package(Msgfmt REQUIRED)
--find_package(Gettext REQUIRED)
--add_subdirectory(po)
diff --git a/kde-unstable/kdepim/disable-l10n.patch b/kde-unstable/kdepim/disable-l10n.patch
deleted file mode 100644
index 3f218d532..000000000
--- a/kde-unstable/kdepim/disable-l10n.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- CMakeLists.txt~ 2011-01-30 06:31:02.180017202 -0800
-+++ CMakeLists.txt 2011-01-30 06:31:26.093350537 -0800
-@@ -423,7 +423,3 @@
- endif(NOT QGPGME_FOUND)
- # All done, let's display what we found...
- macro_display_feature_log()
--find_package(Msgfmt REQUIRED)
--find_package(Gettext REQUIRED)
--add_subdirectory(po)
--add_subdirectory(doc-translations)
diff --git a/kde-unstable/libqzeitgeist/PKGBUILD b/kde-unstable/libqzeitgeist/PKGBUILD
deleted file mode 100644
index 057ee2628..000000000
--- a/kde-unstable/libqzeitgeist/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 124473 2011-05-22 13:09:39Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=libqzeitgeist
-pkgver=0.1git20110522
-pkgrel=1
-pkgdesc="A Qt interface to the Zeitgeist event tracking system"
-url="https://projects.kde.org/projects/kdesupport/libqzeitgeist"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('qt')
-makedepends=('cmake')
-source=("${pkgname}-${pkgver}.tar.bz2"::'http://quickgit.kde.org/?p=libqzeitgeist.git&a=snapshot&h=289c66f430dfb842afd36191a0ef82a26111c403&fmt=tbz2')
-md5sums=('ba7d2c347e82b0aa6ab55f3136fb9468')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../${pkgname} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/multilib/nspluginwrapper/nspluginwrapper-native-windows.patch b/multilib/nspluginwrapper/nspluginwrapper-native-windows.patch
deleted file mode 100644
index 0f6eba68e..000000000
--- a/multilib/nspluginwrapper/nspluginwrapper-native-windows.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/npw-viewer.sh
-+++ src/npw-viewer.sh
-@@ -5,6 +5,11 @@
- OS="`uname -s | tr '[A-Z]' '[a-z]'`"
- ARCH="`uname -m`"
-
-+# Adobe Flash can be confised by by a recent GTK+ that may use custom
-+# window structure instead of native X Window. Revert to the old dumb
-+# behavior and use native X window for all objects. (bnc#537788)
-+export GDK_NATIVE_WINDOWS=1
-+
- if test -z "$TARGET_OS"; then
- echo "*** NSPlugin Viewer *** error, TARGET_OS not initialized"
- exit 1
diff --git a/staging/akonadi/PKGBUILD b/staging/akonadi/PKGBUILD
deleted file mode 100644
index 3e181dafa..000000000
--- a/staging/akonadi/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 124793 2011-05-24 13:10:03Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=akonadi
-pkgver=1.5.3
-pkgrel=2
-pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data"
-arch=('i686' 'x86_64')
-url='http://pim.kde.org/akonadi'
-license=('LGPL')
-depends=('shared-mime-info' 'boost-libs' 'mysql' 'soprano')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost')
-install="${pkgname}.install"
-source=("http://download.akonadi-project.org/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('ad342acca61c2af27be4cce61b2d925a')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE
- make
-}
-
-package() {
- cd "${srcdir}/build"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/akonadi/akonadi.install b/staging/akonadi/akonadi.install
deleted file mode 100644
index 7c8a8bd2b..000000000
--- a/staging/akonadi/akonadi.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/avogadro/PKGBUILD b/staging/avogadro/PKGBUILD
deleted file mode 100644
index 6f1a6baf5..000000000
--- a/staging/avogadro/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 124796 2011-05-24 13:18:50Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Nick B <Shirakawasuna at gmail _dot_com>
-
-pkgname=avogadro
-pkgver=1.0.3
-pkgrel=2
-pkgdesc="An advanced molecular editor based on Qt"
-arch=('i686' 'x86_64')
-url="http://avogadro.openmolecules.net/wiki/Main_Page"
-license=('GPL2')
-depends=('eigen' 'openbabel' 'python2-pyqt' 'boost-libs' 'glew' 'python2-numpy')
-makedepends=('cmake' 'boost')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('92c2702c1980f70fb6d87a1a58147911')
-
-build() {
- cd ${srcdir}
- mkdir build
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd ${srcdir}/build
- make DESTDIR=${pkgdir} install
-}
diff --git a/staging/boost/4994-compile-fix-for-Python32-v2.patch b/staging/boost/4994-compile-fix-for-Python32-v2.patch
deleted file mode 100644
index 22613b3f2..000000000
--- a/staging/boost/4994-compile-fix-for-Python32-v2.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: libs/python/src/converter/builtin_converters.cpp
-===================================================================
---- libs/python/src/converter/builtin_converters.cpp (revision 67279)
-+++ libs/python/src/converter/builtin_converters.cpp (working copy)
-@@ -431,7 +431,11 @@
- if (!result.empty())
- {
- int err = PyUnicode_AsWideChar(
-+#if PY_VERSION_HEX >= 0x03020000
-+ intermediate
-+#else
- (PyUnicodeObject *)intermediate
-+#endif
- , &result[0]
- , result.size());
-
diff --git a/staging/boost/PKGBUILD b/staging/boost/PKGBUILD
deleted file mode 100644
index d95541e63..000000000
--- a/staging/boost/PKGBUILD
+++ /dev/null
@@ -1,112 +0,0 @@
-# $Id: PKGBUILD 124783 2011-05-24 12:31:42Z ibiru $
-# Maintainer: kevin <kevin@archlinux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Kritoke <kritoke@gamebox.net>
-# Contributor: Luca Roccia <little_rock@users.sourceforge.net>
-
-pkgbase=boost
-pkgname=('boost-libs' 'boost')
-pkgver=1.46.1
-_boostver=${pkgver//./_}
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://www.boost.org/"
-makedepends=('icu' 'python' 'python2' 'bzip2' 'zlib' 'openmpi')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgbase}/${pkgbase}_${_boostver}.tar.gz
- 4994-compile-fix-for-Python32-v2.patch
- boost-1.46.0-spirit.patch)
-license=('custom')
-md5sums=('341e5d993b19d099bf1a548495ea91ec'
- 'cb59e8adbf2a45ef9264a2f4ab92b849'
- '9d6e2f13fef23bf27d7bdddc104e182a')
-
-_stagedir="${srcdir}/stagedir"
-
-build() {
- # set python path for bjam
- cd "${srcdir}/${pkgbase}_${_boostver}/tools"
- echo "using python : 2.7 : /usr/bin/python2 ;" >> build/v2/user-config.jam
- echo "using python : 3.2 : /usr/bin/python : /usr/include/python3.2mu : /usr/lib ;" >> build/v2/user-config.jam
- echo "using mpi ;" >> build/v2/user-config.jam
-
- # build bjam
- cd "${srcdir}/${pkgbase}_${_boostver}/tools/build/v2/engine/src"
- ./build.sh cc
-
- _bindir="bin.linuxx86"
- [ "${CARCH}" = "x86_64" ] && _bindir="bin.linuxx86_64"
-
- install -d "${_stagedir}"/usr/bin
- install ${_bindir}/bjam "${_stagedir}"/usr/bin/bjam
-
- # build bcp
- cd "${srcdir}/${pkgbase}_${_boostver}/tools/bcp"
- ../build/v2/engine/src/${_bindir}/bjam --toolset=gcc
- install -m755 "${srcdir}/${pkgbase}_${_boostver}/dist/bin/bcp" \
- ${_stagedir}/usr/bin/bcp
-
- # build libs
- cd "${srcdir}/${pkgbase}_${_boostver}"
- #python 3.2 support
- #https://svn.boost.org/trac/boost/ticket/4994
- patch -Np0 -i "${srcdir}/4994-compile-fix-for-Python32-v2.patch"
- patch -Np0 -i "${srcdir}/boost-1.46.0-spirit.patch"
-
- # default "minimal" install: "release link=shared,static
- # runtime-link=shared threading=single,multi"
- # --layout=tagged will add the "-mt" suffix for multithreaded libraries
- # and installs includes in /usr/include/boost.
- # --layout=system no longer adds the -mt suffix for multi-threaded libs.
- # install to ${_stagedir} in preparation for split packaging
-
- ./tools/build/v2/engine/src/${_bindir}/bjam \
- release debug-symbols=off threading=multi \
- runtime-link=shared link=shared,static \
- cflags=-fno-strict-aliasing \
- toolset=gcc \
- --prefix="${_stagedir}" \
- -sTOOLS=gcc \
- --layout=system \
- ${MAKEFLAGS} \
- install
-
- # pyste is unmaintained: http://www.boost.org/doc/libs/1_46_0/libs/python/doc/index.html
- # build pyste
- #cd "${srcdir}/${pkgbase}_${_boostver}/libs/python/pyste/install"
- #python2 setup.py install --root=${_stagedir} --optimize=1
-}
-
-package_boost() {
- pkgdesc="Free peer-reviewed portable C++ source libraries - Development"
- depends=("boost-libs=${pkgver}")
- optdepends=('python: for python bindings'
- 'python2: for python2 bindings')
-
- install -d "${pkgdir}"/usr/{include,lib}
- # headers/source files
- cp -r "${_stagedir}"/include/ "${pkgdir}"/usr/
-
- # static libs
- cp -r "${_stagedir}"/lib/*.a "${pkgdir}"/usr/lib/
-
- # utilities (bjam, bcp, pyste)
- cp -r "${_stagedir}"/usr/* "${pkgdir}"/usr/
-
- # license
- install -D -m644 "${srcdir}/${pkgbase}_${_boostver}/LICENSE_1_0.txt" \
- "${pkgdir}"/usr/share/licenses/boost/LICENSE_1_0.txt
-}
-
-package_boost-libs() {
- pkgdesc="Free peer-reviewed portable C++ source libraries - Runtime"
- depends=('gcc-libs' 'bzip2' 'zlib' 'icu')
- optdepends=('openmpi: for mpi support')
-
- install -d "${pkgdir}/usr/lib"
- #shared libs
- cp -r "${_stagedir}"/lib/*.so{,.*} "${pkgdir}/usr/lib/"
-
- # license
- install -D -m644 "${srcdir}/${pkgbase}_${_boostver}/LICENSE_1_0.txt" \
- "${pkgdir}"/usr/share/licenses/boost-libs/LICENSE_1_0.txt
-}
diff --git a/staging/boost/boost-1.46.0-spirit.patch b/staging/boost/boost-1.46.0-spirit.patch
deleted file mode 100644
index 6fae331ee..000000000
--- a/staging/boost/boost-1.46.0-spirit.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Index: boost/spirit/home/qi/nonterminal/detail/parameterized.hpp
-===================================================================
---- boost/spirit/home/qi/nonterminal/detail/parameterized.hpp (revision 68724)
-+++ boost/spirit/home/qi/nonterminal/detail/parameterized.hpp (revision 68725)
-@@ -14,6 +14,7 @@
-
- #include <boost/ref.hpp>
-
-+#include <boost/spirit/home/support/handles_container.hpp>
- #include <boost/spirit/home/qi/parser.hpp>
-
- namespace boost { namespace spirit { namespace qi
-@@ -59,4 +60,16 @@ namespace boost { namespace spirit { nam
- };
- }}}
-
-+namespace boost { namespace spirit { namespace traits
-+{
-+ ///////////////////////////////////////////////////////////////////////////
-+ template <typename Subject, typename Params, typename Attribute
-+ , typename Context, typename Iterator>
-+ struct handles_container<qi::parameterized_nonterminal<Subject, Params>
-+ , Attribute, Context, Iterator>
-+ : handles_container<typename remove_const<Subject>::type
-+ , Attribute, Context, Iterator>
-+ {};
-+}}}
-+
- #endif
-Index: boost/spirit/home/karma/nonterminal/detail/parameterized.hpp
-===================================================================
---- boost/spirit/home/karma/nonterminal/detail/parameterized.hpp (revision 68724)
-+++ boost/spirit/home/karma/nonterminal/detail/parameterized.hpp (revision 68725)
-@@ -14,6 +14,7 @@
-
- #include <boost/ref.hpp>
-
-+#include <boost/spirit/home/support/handles_container.hpp>
- #include <boost/spirit/home/karma/generator.hpp>
-
- namespace boost { namespace spirit { namespace karma
-@@ -60,4 +61,17 @@ namespace boost { namespace spirit { nam
- };
- }}}
-
-+
-+namespace boost { namespace spirit { namespace traits
-+{
-+ ///////////////////////////////////////////////////////////////////////////
-+ template <typename Subject, typename Params, typename Attribute
-+ , typename Context, typename Iterator>
-+ struct handles_container<karma::parameterized_nonterminal<Subject, Params>
-+ , Attribute, Context, Iterator>
-+ : handles_container<typename remove_const<Subject>::type
-+ , Attribute, Context, Iterator>
-+ {};
-+}}}
-+
- #endif
diff --git a/staging/ekiga/PKGBUILD b/staging/ekiga/PKGBUILD
deleted file mode 100644
index 7d4d83910..000000000
--- a/staging/ekiga/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 124817 2011-05-24 15:39:18Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Tom K <tomk@runbox.com>
-
-pkgname=ekiga
-pkgver=3.3.0
-pkgrel=4
-pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)"
-url="http://www.ekiga.org"
-license=(GPL)
-arch=(i686 x86_64)
-depends=('opal' 'boost-libs' 'libxv' 'libnotify' 'hicolor-icon-theme' 'avahi' 'gtk2' 'gconf')
-makedepends=('intltool' 'gnome-doc-utils' 'evolution-data-server' 'boost')
-optdepends=('evolution-data-server: Evolution integration')
-provides=('gnomemeeting')
-replaces=('gnomemeeting')
-options=(!emptydirs)
-groups=('gnome-extra')
-install=ekiga.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('3fb22704e44afebf4294632505fb7a13f3eccb152fcb5878e97aa556d9486d2c')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-schemas-install \
- --disable-scrollkeeper --enable-dbus
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install
-
- install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
- gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain ekiga ${pkgdir}/etc/gconf/schemas/*.schemas
- rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/staging/ekiga/ekiga.install b/staging/ekiga/ekiga.install
deleted file mode 100644
index b1d76a4a3..000000000
--- a/staging/ekiga/ekiga.install
+++ /dev/null
@@ -1,22 +0,0 @@
-pkgname=ekiga
-
-post_install() {
- usr/sbin/gconfpkg --install ${pkgname}
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
- pre_remove $1
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/staging/kdeedu/PKGBUILD b/staging/kdeedu/PKGBUILD
deleted file mode 100644
index a5a24fb20..000000000
--- a/staging/kdeedu/PKGBUILD
+++ /dev/null
@@ -1,280 +0,0 @@
-# $Id: PKGBUILD 124802 2011-05-24 13:56:35Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdeedu
-pkgname=('kdeedu-blinken'
- 'kdeedu-cantor'
- 'kdeedu-data'
- 'kdeedu-kalgebra'
- 'kdeedu-kalzium'
- 'kdeedu-kanagram'
- 'kdeedu-kbruch'
- 'kdeedu-kgeography'
- 'kdeedu-khangman'
- 'kdeedu-kig'
- 'kdeedu-kiten'
- 'kdeedu-klettres'
- 'kdeedu-kmplot'
- 'kdeedu-kstars'
- 'kdeedu-ktouch'
- 'kdeedu-kturtle'
- 'kdeedu-kwordquiz'
- 'kdeedu-libkdeedu'
- 'kdeedu-marble'
- 'kdeedu-parley'
- 'kdeedu-rocs'
- 'kdeedu-step')
-pkgver=4.6.3
-pkgrel=2
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'ocaml' 'facile' 'cfitsio' 'gpsd'
- 'kdebase-runtime' 'libqalculate' 'gsl' 'boost' 'libindi' 'r' 'libspectre'
- 'python2' 'avogadro')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
- 'gpsd-2.96.patch')
-sha1sums=('4b27e6e1670760982dae13dc8c51c814c6853396'
- 'fd6b6b81945d951bb6ad0bb735df33c11bb2008e')
-
-build() {
- cd ${srcdir}/${pkgbase}-${pkgver}
- patch -Np1 -i ${srcdir}/gpsd-2.96.patch
-
- cd ${srcdir}
- mkdir build
- cd build
- cmake ../${pkgbase}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=OFF \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package_kdeedu-blinken() {
- pkgdesc='A memory enhancement game'
- depends=('kdebase-runtime' 'kdeedu-libkdeedu')
- install='kdeedu.install'
- cd $srcdir/build/blinken
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/blinken
- make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-cantor() {
- pkgdesc='KDE Frontend to Mathematical Software'
- depends=('kdeedu-libkdeedu' 'libspectre')
- optdepends=('kdeedu-kalgebra: backend'
- 'maxima: backend'
- 'r: backend')
- install='kdeedu.install'
- cd $srcdir/build/cantor
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/cantor
- make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-data() {
- pkgdesc='Data for KDE Educational Software'
- groups=()
- cd $srcdir/build/data
- make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-kalgebra() {
- pkgdesc='Math Expression Solver and Plotter'
- depends=('kdebase-runtime')
- install='kdeedu.install'
- cd $srcdir/build/kalgebra
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kalgebra
- make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-kalzium() {
- pkgdesc='KDE Periodic Table of Elements'
- depends=('kdebase-runtime' 'kdeedu-libkdeedu' 'avogadro')
- install='kdeedu.install'
- cd $srcdir/build/kalzium
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kalzium
- make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-kanagram() {
- pkgdesc='KDE Letter Order Game'
- depends=('kdebase-runtime' 'kdeedu-libkdeedu' 'kdeedu-data')
- install='kdeedu.install'
- cd $srcdir/build/kanagram
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kanagram
- make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-kbruch() {
- pkgdesc='Practice exercises with fractions'
- depends=('kdelibs' 'kdebase-runtime')
- install='kdeedu.install'
- cd $srcdir/build/kbruch
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kbruch
- make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-kgeography() {
- pkgdesc='A Geography Learning Program'
- depends=('kdebase-runtime')
- install='kdeedu.install'
- cd $srcdir/build/kgeography
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kgeography
- make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-khangman() {
- pkgdesc='KDE Hangman Game'
- depends=('kdebase-runtime' 'kdeedu-libkdeedu' 'kdeedu-data')
- install='kdeedu.install'
- cd $srcdir/build/khangman
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/khangman
- make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-kig() {
- pkgdesc='Explore Geometric Constructions'
- depends=('kdebase-runtime' 'boost-libs' 'python2')
- install='kdeedu.install'
- cd $srcdir/build/kig
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kig
- make DESTDIR=$pkgdir install
-
- # Use the python2 executable
- sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' ${pkgdir}/usr/bin/pykig.py
-}
-
-package_kdeedu-kiten() {
- pkgdesc='Japanese Reference and Study Tool'
- depends=('kdebase-runtime')
- install='kdeedu.install'
- cd $srcdir/build/kiten
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kiten
- make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-klettres() {
- pkgdesc='a KDE program to learn the alphabet'
- depends=('kdebase-runtime')
- install='kdeedu.install'
- cd $srcdir/build/klettres
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/klettres
- make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-kmplot() {
- pkgdesc='Function Plotter'
- depends=('kdebase-runtime')
- install='kdeedu.install'
- cd $srcdir/build/kmplot
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kmplot
- make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-kstars() {
- pkgdesc='Desktop Planetarium'
- depends=('kdebase-runtime' 'libindi')
- install='kdeedu.install'
- cd $srcdir/build/kstars
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kstars
- make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-ktouch() {
- pkgdesc='Touch Typing Tutor'
- depends=('kdebase-runtime')
- install='kdeedu.install'
- cd $srcdir/build/ktouch
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/ktouch
- make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-kturtle() {
- pkgdesc='Educational Programming Environment'
- depends=('kdebase-runtime')
- install='kdeedu.install'
- cd $srcdir/build/kturtle
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kturtle
- make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-kwordquiz() {
- pkgdesc='A flashcard and vocabulary learning program'
- depends=('kdebase-runtime' 'kdeedu-libkdeedu' 'kdeedu-data')
- install='kdeedu.install'
- cd $srcdir/build/kwordquiz
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kwordquiz
- make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-libkdeedu() {
- pkgdesc='Support library for KDE Educational Software'
- groups=()
- depends=('kdelibs')
- install='kdeedu.install'
- cd $srcdir/build/libkdeedu
- make DESTDIR=$pkgdir install
- install -D -m644 $srcdir/${pkgbase}-${pkgver}/cmake/modules/FindKDEEdu.cmake \
- $pkgdir/usr/share/apps/cmake/modules/FindKDEEdu.cmake
-}
-
-package_kdeedu-marble() {
- pkgdesc='Desktop Globe'
- depends=('kdebase-runtime' 'gpsd')
- install='kdeedu.install'
- cd $srcdir/build/marble
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/marble
- make DESTDIR=$pkgdir install
- install -D -m644 $srcdir/${pkgbase}-${pkgver}/cmake/modules/FindMarbleWidget.cmake \
- $pkgdir/usr/share/apps/cmake/modules/FindMarbleWidget.cmake
-}
-
-package_kdeedu-parley() {
- pkgdesc='Vocabulary Trainer'
- depends=('kdebase-runtime' 'kdeedu-libkdeedu' 'kdeedu-data' 'kdebindings-python')
- install='kdeedu.install'
- cd $srcdir/build/parley
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/parley
- make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-rocs() {
- pkgdesc='Graph Theory Tool for Professors and Students.'
- depends=('kdebase-runtime' 'kdeedu-libkdeedu')
- install='kdeedu.install'
- cd $srcdir/build/rocs
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/rocs
- make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-step() {
- pkgdesc='Simulate physics experiments'
- depends=('kdebase-runtime' 'gsl' 'libqalculate')
- install='kdeedu.install'
- cd $srcdir/build/step
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/step
- make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdeedu/gpsd-2.96.patch b/staging/kdeedu/gpsd-2.96.patch
deleted file mode 100644
index ec515e99d..000000000
--- a/staging/kdeedu/gpsd-2.96.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Index: kdeedu-4.5.5/marble/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
-===================================================================
---- kdeedu-4.5.5.orig/marble/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
-+++ kdeedu-4.5.5/marble/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
-@@ -18,6 +18,9 @@ using namespace Marble;
-
- GpsdConnection::GpsdConnection( QObject* parent )
- : QObject( parent ),
-+#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
-+ m_gpsd("localhost", DEFAULT_GPSD_PORT),
-+#endif
- m_timer( 0 )
- {
- connect( &m_timer, SIGNAL( timeout() ), this, SLOT( update() ) );
-@@ -26,7 +29,11 @@ GpsdConnection::GpsdConnection( QObject*
- void GpsdConnection::initialize()
- {
- m_timer.stop();
-+#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
-+ gps_data_t* data;
-+#else
- gps_data_t* data = m_gpsd.open();
-+#endif
- if ( data ) {
- m_status = PositionProviderStatusAcquiring;
- emit statusChanged( m_status );
-@@ -73,8 +80,16 @@ void GpsdConnection::initialize()
- void GpsdConnection::update()
- {
- #if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 3 ) && defined( PACKET_SET )
-+#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
-+ if ( m_gpsd.waiting(0) ) {
-+#else
- if ( m_gpsd.waiting() ) {
-+#endif
-+#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
-+ gps_data_t* data = m_gpsd.read();
-+#else
- gps_data_t* data = m_gpsd.poll();
-+#endif
- if ( data && data->set & PACKET_SET ) {
- emit gpsdInfo( *data );
- }
diff --git a/staging/kdeedu/kdeedu.install b/staging/kdeedu/kdeedu.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdeedu/kdeedu.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/libtorrent-rasterbar/PKGBUILD b/staging/libtorrent-rasterbar/PKGBUILD
deleted file mode 100644
index 275c56431..000000000
--- a/staging/libtorrent-rasterbar/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 124787 2011-05-24 12:59:08Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Hugo Doria <hugo@archlinux.org>
-
-pkgname=libtorrent-rasterbar
-pkgver=0.15.6
-pkgrel=2
-pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around"
-url="http://www.rasterbar.com/products/libtorrent/"
-arch=('i686' 'x86_64')
-license=('custom')
-depends=('boost-libs' 'python2')
-makedepends=('boost')
-source=(http://libtorrent.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('e6f33b139933ec245e8850558efe52e88081fc6d')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --enable-python-binding
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
- install -D COPYING "${pkgdir}/usr/share/licenses/$pkgname/LICENSE"
-}
diff --git a/testing/accountsservice/PKGBUILD b/testing/accountsservice/PKGBUILD
deleted file mode 100644
index 5f0c6e93a..000000000
--- a/testing/accountsservice/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 124664 2011-05-23 20:15:43Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-pkgname=accountsservice
-pkgver=0.6.12
-pkgrel=1
-pkgdesc="D-Bus interface for user account query and manipulation"
-arch=(i686 x86_64)
-url="http://cgit.freedesktop.org/accountsservice/"
-license=('GPL3')
-depends=('dbus-glib' 'polkit')
-makedepends=('intltool' 'gobject-introspection')
-options=('!libtool')
-source=(http://cgit.freedesktop.org/accountsservice/snapshot/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('2fcf38a65d574dd2fe6ba182ff4de053')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- ./autogen.sh
- ./configure --prefix=/usr --sysconfdir=/etc \
- --libexecdir=/usr/lib/accountsservice \
- --with-systemdsystemunitdir=/lib/systemd/system \
- --localstatedir=/var --disable-static
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
-
- make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/acpid/PKGBUILD b/testing/acpid/PKGBUILD
deleted file mode 100644
index 28d94a296..000000000
--- a/testing/acpid/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 124204 2011-05-17 17:28:41Z andrea $
-# Maintainer:
-# Contributor: xduugu
-# Contributor: Manolis Tzanidakis
-# Contributor: Jonathan Schmidt <j.schmidt@archlinux.us
-
-pkgname=acpid
-pkgver=2.0.9
-pkgrel=3
-pkgdesc="A daemon for delivering ACPI power management events with netlink support"
-arch=('i686' 'x86_64')
-url="http://tedfelix.com/linux/acpid-netlink.html"
-license=('GPL')
-depends=('bash')
-source=("http://www.tedfelix.com/linux/$pkgname-$pkgver.tar.gz"
- 'acpid'
- 'anything'
- 'handler.sh'
- 'acpid.conf.d')
-replaces=('acpid2')
-backup=('etc/acpi/handler.sh' 'etc/acpi/events/anything' 'etc/conf.d/acpid')
-
-build() {
- cd "${srcdir}"/$pkgname-$pkgver
- make
-}
-
-package() {
- cd "${srcdir}"/$pkgname-$pkgver
- make DESTDIR="${pkgdir}" install
-
- install -Dm755 "$srcdir/acpid" "$pkgdir/etc/rc.d/acpid"
- install -Dm644 "$srcdir/anything" "$pkgdir/etc/acpi/events/anything"
- install -Dm755 "$srcdir/handler.sh" "$pkgdir/etc/acpi/handler.sh"
- install -Dm644 "$srcdir/acpid.conf.d" "$pkgdir/etc/conf.d/acpid"
-
- chmod 755 "${pkgdir}"/usr/sbin/acpid
-}
-md5sums=('8b30aa1b31f607161745a4ac7a19699b'
- '955490c4db5233ec44461db694b873a4'
- '2d37b98d6e74bab815604b8b48c6cfd4'
- '7b2e4c299af5eb87e1a81c07b6916c97'
- '929c6d2e91295c22ed9ec6212d7eabef')
diff --git a/testing/acpid/acpid b/testing/acpid/acpid
deleted file mode 100644
index 9177c8207..000000000
--- a/testing/acpid/acpid
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-[ -f /etc/conf.d/acpid ] && . /etc/conf.d/acpid
-
-PID=`pidof -o %PPID /usr/sbin/acpid`
-case "$1" in
- start)
- stat_busy "Starting acpid"
- [ -z "$PID" ] && /usr/sbin/acpid $ACPID_ARGS
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon acpid
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping acpid"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon acpid
- stat_done
- fi
- ;;
- restart)
- $0 stop
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/testing/acpid/acpid.conf.d b/testing/acpid/acpid.conf.d
deleted file mode 100644
index b60103a2d..000000000
--- a/testing/acpid/acpid.conf.d
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Arguments to be passed to the acpid daemon
-#
-
-ACPID_ARGS=""
diff --git a/testing/acpid/anything b/testing/acpid/anything
deleted file mode 100644
index d1828989b..000000000
--- a/testing/acpid/anything
+++ /dev/null
@@ -1,3 +0,0 @@
-# Pass all events to our one handler script
-event=.*
-action=/etc/acpi/handler.sh %e
diff --git a/testing/acpid/handler.sh b/testing/acpid/handler.sh
deleted file mode 100644
index 518a62dea..000000000
--- a/testing/acpid/handler.sh
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/sh
-# Default acpi script that takes an entry for all actions
-
-# NOTE: This is a 2.6-centric script. If you use 2.4.x, you'll have to
-# modify it to not use /sys
-
-minspeed=`cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_min_freq`
-maxspeed=`cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq`
-setspeed="/sys/devices/system/cpu/cpu0/cpufreq/scaling_setspeed"
-
-set $*
-
-case "$1" in
- button/power)
- #echo "PowerButton pressed!">/dev/tty5
- case "$2" in
- PWRF) logger "PowerButton pressed: $2" ;;
- *) logger "ACPI action undefined: $2" ;;
- esac
- ;;
- button/sleep)
- case "$2" in
- SLPB) echo -n mem >/sys/power/state ;;
- *) logger "ACPI action undefined: $2" ;;
- esac
- ;;
- ac_adapter)
- case "$2" in
- AC|ACAD|ADP0)
- case "$4" in
- 00000000)
- echo -n $minspeed >$setspeed
- #/etc/laptop-mode/laptop-mode start
- ;;
- 00000001)
- echo -n $maxspeed >$setspeed
- #/etc/laptop-mode/laptop-mode stop
- ;;
- esac
- ;;
- *) logger "ACPI action undefined: $2" ;;
- esac
- ;;
- battery)
- case "$2" in
- BAT0)
- case "$4" in
- 00000000) #echo "offline" >/dev/tty5
- ;;
- 00000001) #echo "online" >/dev/tty5
- ;;
- esac
- ;;
- CPU0)
- ;;
- *) logger "ACPI action undefined: $2" ;;
- esac
- ;;
- button/lid)
- #echo "LID switched!">/dev/tty5
- ;;
- *)
- logger "ACPI group/action undefined: $1 / $2"
- ;;
-esac
diff --git a/testing/anjuta/PKGBUILD b/testing/anjuta/PKGBUILD
deleted file mode 100644
index eea7f3e07..000000000
--- a/testing/anjuta/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 124683 2011-05-23 21:00:48Z ibiru $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: Harley Laue <losinggeneration@yahoo.com>
-
-pkgname=anjuta
-pkgver=3.0.2.0
-pkgrel=1
-pkgdesc="GNOME Integrated Development Environment (IDE)"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('vte3' 'gdl' 'autogen' 'devhelp' 'gtksourceview3' 'glade' 'libgda'
- 'subversion' 'gnome-icon-theme' 'hicolor-icon-theme' 'vala' 'graphviz'
- 'python2' 'shared-mime-info' 'desktop-file-utils')
-makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection')
-url="http://anjuta.sourceforge.net/"
-install=anjuta.install
-source=(ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*.*}/${pkgname}-${pkgver}.tar.bz2)
-options=('!libtool' '!emptydirs')
-sha256sums=('5dce2cf455f9feeea31aea6bce5bae1dbd35793ba8c8009675608dae4d67bac0')
-
-build() {
- cd "${srcdir}/anjuta-${pkgver}"
- PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-scrollkeeper
- make
-}
-
-package(){
- cd "${srcdir}/anjuta-${pkgver}"
-
- make DESTDIR="${pkgdir}" install
-
- sed -i "1s|#!/usr/bin/python$|&2|" \
- $pkgdir/usr/share/anjuta/project/{pygtk,python}/src/main.py
-}
diff --git a/testing/anjuta/anjuta.install b/testing/anjuta/anjuta.install
deleted file mode 100644
index c6fcfec11..000000000
--- a/testing/anjuta/anjuta.install
+++ /dev/null
@@ -1,21 +0,0 @@
-post_install() {
- usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
- update-desktop-database -q
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
- gtk-update-icon-cache -q -t -f usr/share/icons/gnome
- update-mime-database usr/share/mime > /dev/null
-}
-
-pre_upgrade() {
- if (( $(vercmp $2 2.90.0) < 0 )); then
- usr/sbin/gconfpkg --uninstall anjuta
- fi
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/testing/bind/127.0.0.zone b/testing/bind/127.0.0.zone
deleted file mode 100644
index 509c311f6..000000000
--- a/testing/bind/127.0.0.zone
+++ /dev/null
@@ -1,11 +0,0 @@
-$ORIGIN 0.0.127.in-addr.arpa.
-
-@ 1D IN SOA localhost. root.localhost. (
- 42 ; serial (yyyymmdd##)
- 3H ; refresh
- 15M ; retry
- 1W ; expiry
- 1D ) ; minimum ttl
-
- 1D IN NS localhost.
-1 1D IN PTR localhost.
diff --git a/testing/bind/PKGBUILD b/testing/bind/PKGBUILD
deleted file mode 100644
index 5af689c41..000000000
--- a/testing/bind/PKGBUILD
+++ /dev/null
@@ -1,86 +0,0 @@
-# $Id: PKGBUILD 124551 2011-05-22 22:52:52Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-# Contributor: Mario Vazquez <mario_vazq@hotmail.com>
-
-pkgname=bind
-
-# Use a period and not a hyphen before the patch level for proper versioning.
-pkgver=9.8.0.P1
-_pkgver=9.8.0-P1
-pkgrel=3
-
-pkgdesc='Berkeley Internet Name Daemon (BIND) is the reference implementation of the Domain Name System (DNS) protocols'
-arch=('i686' 'x86_64')
-url='http://www.isc.org/software/bind/'
-license=('custom:ISC')
-provides=('dns-server')
-backup=('etc/logrotate.d/named'
- 'etc/conf.d/named'
- 'etc/named.conf')
-depends=('openssl' 'krb5' 'libxml2')
-options=('!makeflags' '!libtool')
-source=("http://ftp.isc.org/isc/bind9/${_pkgver}/${pkgname}-${_pkgver}.tar.gz"
- 'root.hint::ftp://ftp.rs.internic.net/domain/db.cache'
- 'so_bsdcompat.patch'
- 'notools.patch'
- 'named'
- 'named.conf'
- 'named.conf.d'
- 'named.logrotate'
- 'localhost.zone'
- '127.0.0.zone')
-sha1sums=('aa8f308f218e437ac4bad616e0ae83a9b9c40c29'
- 'ee52947062c1582858187716b776afa3613608fb'
- '2f737f4e81186447ac2ef370fa8dcea0b3abec31'
- '5277cf4d6fbc5728c55b51c77c9347d28393fb7c'
- '46232e9db243c6c05e170a1781d7a7f413be5d03'
- '5ca7a5f2a132548a090a045a2df3acea6b35d9eb'
- '7848edbfb9a848843f57c11c02b0289eefd42d00'
- '9ffb5c3f72390a517aeae557e32349d5d278cb63'
- '76a0d4cd1b913db177a5a375bebc47e5956866ec'
- '53be0f1437ebe595240d8dbdd819939582b97fb9')
-
-install=install
-
-build() {
- cd "${srcdir}/${pkgname}-${_pkgver}"
-
- patch -p1 -i "${srcdir}"/so_bsdcompat.patch
- patch -p1 -i "${srcdir}"/notools.patch
-
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --disable-static \
- --disable-linux-caps \
- --with-openssl \
- --with-gssapi \
- --with-libxml2 \
- --with-libtool \
- --with-dlz-dlopen \
-
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${_pkgver}"
-
- make DESTDIR="${pkgdir}" install
-
- rmdir "${pkgdir}/var/run"
- install -d "${pkgdir}"/usr/share/doc/bind
- install doc/arm/*.html "${pkgdir}"/usr/share/doc/bind/
- install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-
- install -D -m755 ../named "${pkgdir}"/etc/rc.d/named
- install -D -m644 ../named.conf.d "${pkgdir}"/etc/conf.d/named
- install -D -m600 ../named.logrotate "${pkgdir}"/etc/logrotate.d/named
- install -D -m640 -o 0 -g 40 ../named.conf "${pkgdir}"/etc/named.conf
-
- install -d -m750 -o 0 -g 40 "${pkgdir}"/var/named
- install -m640 -o 0 -g 40 ../root.hint "${pkgdir}"/var/named/
- install -m640 -o 0 -g 40 ../127.0.0.zone "${pkgdir}"/var/named/
- install -m640 -o 0 -g 40 ../localhost.zone "${pkgdir}"/var/named/
-}
diff --git a/testing/bind/install b/testing/bind/install
deleted file mode 100644
index e3a1397cb..000000000
--- a/testing/bind/install
+++ /dev/null
@@ -1,21 +0,0 @@
-post_install() {
- getent group named >/dev/null || groupadd -g 40 named
- getent passwd named >/dev/null || useradd -u 40 -c "BIND DNS Server" -g named -d /var/named -s /bin/false named
- passwd -l named &>/dev/null
-
- touch var/log/named.log
- chown named:named var/log/named.log
-
- # create an rndc.key if it doesn't already exist
- if [ ! -s etc/rndc.key ]; then
- usr/sbin/rndc-confgen -r /dev/urandom -b 256 | head -n 5 >>etc/rndc.key
- chown root:named etc/rndc.key
- chmod 640 etc/rndc.key
- fi
-}
-
-pre_remove() {
- getent passwd named &>/dev/null && userdel named >/dev/null
- getent group named &>/dev/null && groupdel named >/dev/null
- return 0
-}
diff --git a/testing/bind/localhost.zone b/testing/bind/localhost.zone
deleted file mode 100644
index e3ff9641c..000000000
--- a/testing/bind/localhost.zone
+++ /dev/null
@@ -1,10 +0,0 @@
-$ORIGIN localhost.
-@ 1D IN SOA @ root (
- 42 ; serial (yyyymmdd##)
- 3H ; refresh
- 15M ; retry
- 1W ; expiry
- 1D ) ; minimum ttl
-
- 1D IN NS @
- 1D IN A 127.0.0.1
diff --git a/testing/bind/named b/testing/bind/named
deleted file mode 100755
index 7907f9983..000000000
--- a/testing/bind/named
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/named
-
-[[ -d /var/run/named ]] || mkdir -p /var/run/named
-chown named:named /var/run/named
-
-PIDFILE=/var/run/named/named.pid
-PID=$(cat $PIDFILE 2>/dev/null)
-readlink -q /proc/$PID/exe | grep -q '^/usr/sbin/named' || { PID=; rm $PIDFILE 2>/dev/null; }
-
-case "$1" in
- start)
- stat_busy "Starting BIND"
- [ -z "$PID" ] && /usr/sbin/named ${NAMED_ARGS}
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon named
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping BIND"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon named
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- reload)
- stat_busy "Reloading BIND"
- [ ! -z "$PID" ] && rndc reload &>/dev/null || kill -HUP $PID &>/dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- stat_done
- fi
- ;;
- *)
- echo "usage: $0 {start|stop|reload|restart}"
-esac
-exit 0
diff --git a/testing/bind/named.conf b/testing/bind/named.conf
deleted file mode 100644
index 38fb12cbe..000000000
--- a/testing/bind/named.conf
+++ /dev/null
@@ -1,64 +0,0 @@
-//
-// /etc/named.conf
-//
-
-options {
- directory "/var/named";
- pid-file "/var/run/named/named.pid";
- auth-nxdomain yes;
- datasize default;
-// Uncomment these to enable IPv6 connections support
-// IPv4 will still work:
-// listen-on-v6 { any; };
-// Add this for no IPv4:
-// listen-on { none; };
-
- // Default security settings.
- allow-recursion { 127.0.0.1; };
- allow-transfer { none; };
- allow-update { none; };
- version none;
- hostname none;
- server-id none;
-};
-
-zone "localhost" IN {
- type master;
- file "localhost.zone";
- allow-transfer { any; };
-};
-
-zone "0.0.127.in-addr.arpa" IN {
- type master;
- file "127.0.0.zone";
- allow-transfer { any; };
-};
-
-zone "." IN {
- type hint;
- file "root.hint";
-};
-
-//zone "example.org" IN {
-// type slave;
-// file "example.zone";
-// masters {
-// 192.168.1.100;
-// };
-// allow-query { any; };
-// allow-transfer { any; };
-//};
-
-logging {
- channel xfer-log {
- file "/var/log/named.log";
- print-category yes;
- print-severity yes;
- print-time yes;
- severity info;
- };
- category xfer-in { xfer-log; };
- category xfer-out { xfer-log; };
- category notify { xfer-log; };
-};
-
diff --git a/testing/bind/named.conf.d b/testing/bind/named.conf.d
deleted file mode 100644
index aecbd2307..000000000
--- a/testing/bind/named.conf.d
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to BIND
-#
-NAMED_ARGS="-u named"
diff --git a/testing/bind/named.logrotate b/testing/bind/named.logrotate
deleted file mode 100644
index ef1a2d032..000000000
--- a/testing/bind/named.logrotate
+++ /dev/null
@@ -1,6 +0,0 @@
-/var/log/named.log {
- missingok
- postrotate
- /bin/kill -HUP `cat /var/run/named/named.pid 2>/dev/null` 2>/dev/null || true
- endscript
-}
diff --git a/testing/bind/notools.patch b/testing/bind/notools.patch
deleted file mode 100644
index 2d16fdcd5..000000000
--- a/testing/bind/notools.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- bind-9.7.0/bin/Makefile.in.orig 2010-03-14 21:19:23.000000000 -0400
-+++ bind-9.7.0/bin/Makefile.in 2010-03-14 21:19:37.000000000 -0400
-@@ -19,7 +19,7 @@
- VPATH = @srcdir@
- top_srcdir = @top_srcdir@
-
--SUBDIRS = named rndc dig dnssec tests tools nsupdate \
-+SUBDIRS = named rndc dnssec tests tools \
- check confgen @PKCS11_TOOLS@
- TARGETS =
-
diff --git a/testing/bind/so_bsdcompat.patch b/testing/bind/so_bsdcompat.patch
deleted file mode 100644
index cae2b835c..000000000
--- a/testing/bind/so_bsdcompat.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -aur old/lib/isc/unix/socket.c new/lib/isc/unix/socket.c
---- old/lib/isc/unix/socket.c 2010-03-12 04:25:20.000000000 +0100
-+++ new/lib/isc/unix/socket.c 2011-01-22 21:07:52.410000038 +0100
-@@ -681,6 +681,8 @@
- isc_sockstatscounter_fdwatchrecvfail
- };
-
-+#undef SO_BSDCOMPAT
-+
- static void
- manager_log(isc__socketmgr_t *sockmgr,
- isc_logcategory_t *category, isc_logmodule_t *module, int level,
-Only in new/lib/isc/unix: socket.c.orig
diff --git a/testing/curl/PKGBUILD b/testing/curl/PKGBUILD
deleted file mode 100644
index 13048e9d9..000000000
--- a/testing/curl/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# $Id: PKGBUILD 123955 2011-05-14 18:55:23Z angvp $
-# Maintainer: Angel Velasquez <angvp@archlinux.org>
-# Contributor: Eric Belanger <eric@archlinux.org>
-# Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=curl
-pkgver=7.21.6
-pkgrel=2
-pkgdesc="An URL retrival utility and library"
-arch=('i686' 'x86_64')
-url="http://curl.haxx.se"
-license=('MIT')
-depends=('zlib' 'openssl' 'bash' 'ca-certificates' 'libssh2')
-options=('!libtool')
-source=(http://curl.haxx.se/download/${pkgname}-${pkgver}.tar.bz2
- curlbuild.h)
-
-[[ $CARCH == "x86_64" ]] && _curlbuild=curlbuild-64.h
-[[ $CARCH == "i686" ]] && _curlbuild=curlbuild-32.h
-md5sums=('6611989a81ebd7b03a35adc3001ddee0'
- '751bd433ede935c8fae727377625a8ae')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
-
- ./configure \
- --with-random=/dev/urandom \
- --prefix=/usr \
- --mandir=/usr/share/man \
- --disable-dependency-tracking \
- --enable-ipv6 \
- --disable-ldaps \
- --disable-ldap \
- --enable-manual \
- --enable-versioned-symbols \
- --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt \
- --without-libidn \
- --enable-threaded-resolver
- make
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
-
- make DESTDIR=${pkgdir} install
- install -Dm644 COPYING \
- ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
- install -Dm644 docs/libcurl/libcurl.m4 \
- ${pkgdir}/usr/share/aclocal/libcurl.m4
- mv "${pkgdir}/usr/include/curl/curlbuild.h" "${pkgdir}/usr/include/curl/${_curlbuild}"
- install -m 644 ${srcdir}/curlbuild.h "${pkgdir}/usr/include/curl/curlbuild.h"
-}
diff --git a/testing/curl/curlbuild.h b/testing/curl/curlbuild.h
deleted file mode 100644
index b48862696..000000000
--- a/testing/curl/curlbuild.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <bits/wordsize.h>
-
-#if __WORDSIZE == 32
-#include "curlbuild-32.h"
-#elif __WORDSIZE == 64
-#include "curlbuild-64.h"
-#else
-#error "Unknown word size"
-#endif
diff --git a/testing/empathy/PKGBUILD b/testing/empathy/PKGBUILD
deleted file mode 100644
index 8b758fd16..000000000
--- a/testing/empathy/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 124631 2011-05-23 15:09:42Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-pkgname=empathy
-pkgver=3.0.2
-pkgrel=1
-pkgdesc="A GNOME instant messaging client using the Telepathy framework."
-arch=('i686' 'x86_64')
-url="http://live.gnome.org/Empathy"
-license=('GPL2')
-depends=('telepathy-glib' 'telepathy-mission-control' 'folks' 'telepathy-logger' 'telepathy-farsight' 'gnome-keyring' 'gnutls' 'evolution-data-server'
- 'libcanberra' 'libnotify' 'enchant' 'iso-codes' 'libwebkit3' 'dconf' 'ca-certificates')
-makedepends=('intltool' 'gnome-doc-utils' 'nautilus-sendto' 'gnome-control-center')
-optdepends=('telepathy-gabble: XMPP/Jabber support'
- 'telepathy-butterfly: MSN support'
- 'telepathy-idle: IRC support'
- 'telepathy-salut: Link-local XMPP support'
- 'telepathy-sofiasip: SIP support'
- 'telepathy-haze: libpurple support')
-options=('!libtool')
-groups=('gnome-extra')
-install=empathy.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('8074f6ce951fb95b1e13c546497e22d487bca9a87d88f1ebb903cdd2fd48bdc2')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --libexecdir=/usr/lib/empathy \
- --disable-static \
- --disable-scrollkeeper \
- --disable-schemas-compile
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/empathy/empathy.install b/testing/empathy/empathy.install
deleted file mode 100644
index 63dd6b907..000000000
--- a/testing/empathy/empathy.install
+++ /dev/null
@@ -1,16 +0,0 @@
-post_install() {
- usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
- update-desktop-database -q
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
- echo "To use Empathy you need to install at least one Telepathy connection manager."
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
- update-desktop-database -q
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/testing/eog/PKGBUILD b/testing/eog/PKGBUILD
deleted file mode 100644
index 872b9228a..000000000
--- a/testing/eog/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 124886 2011-05-24 21:41:31Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=eog
-pkgver=3.0.2
-pkgrel=1
-pkgdesc="Eye of Gnome: An image viewing and cataloging program"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gnome-desktop' 'libexif' 'lcms' 'desktop-file-utils' 'exempi'
- 'dbus-glib' 'libpeas' 'librsvg' 'gnome-icon-theme' 'dconf')
-makedepends=('gtk-doc' 'intltool')
-install=eog.install
-groups=('gnome-extra')
-options=('!emptydirs' '!libtool')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('96fa5af97baba0bce8dec376d7cd49512768505f473b11b2cf61881f6be8cb60')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-scrollkeeper
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-
- # remove it from Xfce menu that ships its own thingy
- echo "NotShowIn=XFCE" >> ${pkgdir}/usr/share/applications/eog.desktop
-}
diff --git a/testing/eog/eog.install b/testing/eog/eog.install
deleted file mode 100644
index 284b24b18..000000000
--- a/testing/eog/eog.install
+++ /dev/null
@@ -1,19 +0,0 @@
-post_install() {
- usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
- update-desktop-database -q
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
- if (( $(vercmp $2 2.90.0) < 0 )); then
- usr/sbin/gconfpkg --uninstall eog
- fi
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/testing/evince/PKGBUILD b/testing/evince/PKGBUILD
deleted file mode 100644
index ae1141789..000000000
--- a/testing/evince/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 124739 2011-05-24 07:25:52Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=evince
-pkgver=3.0.2
-pkgrel=1
-pkgdesc="Simply a document viewer"
-url="http://projects.gnome.org/evince/"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gtk3' 'libspectre' 'gsfonts' 'poppler-glib' 'djvulibre' 'gnome-icon-theme'
- 't1lib' 'libgnome-keyring' 'desktop-file-utils' 'dconf' 'gsettings-desktop-schemas')
-makedepends=('gnome-doc-utils' 'nautilus' 'texlive-bin' 'intltool' 'gobject-introspection')
-optdepends=('texlive-bin: DVI support')
-groups=('gnome-extra')
-install=evince.install
-options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
- introspection-fix.patch)
-sha256sums=('03abb74620caaa255f2d1369b684bbf8f62e15a4bf2d9f2a45f58e1789295a97'
- '897b8c77c5cda31f4f8d860cd6a7ad8ad986dbf3cf26b56acf054cc650e94be1')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- patch -Np1 -i "${srcdir}/introspection-fix.patch"
- autoreconf -fi
-
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --libexecdir=/usr/lib/evince \
- --disable-static --enable-nautilus \
- --enable-pdf --enable-tiff \
- --enable-djvu --enable-dvi \
- --enable-t1lib --enable-comics \
- --disable-scrollkeeper --disable-schemas-compile \
- --enable-introspection
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/evince/evince.install b/testing/evince/evince.install
deleted file mode 100644
index 9643a9ba0..000000000
--- a/testing/evince/evince.install
+++ /dev/null
@@ -1,19 +0,0 @@
-post_install() {
- usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
- update-desktop-database -q
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
- if (( $(vercmp $2 2.90.0) < 0 )); then
- usr/sbin/gconfpkg --uninstall evince
- fi
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/testing/evince/introspection-fix.patch b/testing/evince/introspection-fix.patch
deleted file mode 100644
index 6a64517bd..000000000
--- a/testing/evince/introspection-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff a/libview/Makefile.am b/libview/Makefile.am
---- a/libview/Makefile.am
-+++ b/libview/Makefile.am
-@@ -136,6 +136,7 @@ EvinceView-$(EV_API_VERSION).gir: libevview3.la Makefile $(INST_H_FILES) $(filte
- --output $@ \
- --pkg evince-document-$(EV_API_VERSION) \
- --pkg evince-view-$(EV_API_VERSION) \
-+ -L$(top_builddir)/libdocument/ \
- -I$(top_srcdir) \
- -I$(top_builddir) \
- -DEVINCE_COMPILATION \
diff --git a/testing/evolution-data-server/PKGBUILD b/testing/evolution-data-server/PKGBUILD
deleted file mode 100644
index 040385490..000000000
--- a/testing/evolution-data-server/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 124640 2011-05-23 17:24:46Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=evolution-data-server
-pkgver=3.0.2.1
-pkgrel=1
-pkgdesc="Central location for addressbook and calendar storage in the GNOME Desktop"
-arch=('i686' 'x86_64')
-depends=('libsoup' 'nss' 'libgnome-keyring' 'krb5' 'libgweather' 'libical' 'db' 'libgdata')
-makedepends=('intltool' 'gperf' 'gobject-introspection')
-options=('!libtool')
-url="http://www.gnome.org"
-license=('GPL')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('1b14c57a835745ee2c0141a76a07d44688dfb2d758bf3b818fe1860b59451f9b')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --with-openldap=yes \
- --libexecdir=/usr/lib/evolution-data-server \
- --with-krb5=/usr --with-libdb=/usr
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/evolution-exchange/PKGBUILD b/testing/evolution-exchange/PKGBUILD
deleted file mode 100644
index c494c1fba..000000000
--- a/testing/evolution-exchange/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 124646 2011-05-23 18:11:32Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=evolution-exchange
-pkgver=3.0.2
-pkgrel=1
-pkgdesc="Ximian Connector Exchange plugin for Evolution"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.ximian.com"
-depends=('evolution-data-server' 'gtkhtml4' 'gnome-desktop' 'libunique3')
-makedepends=('intltool' 'evolution')
-options=('!libtool' '!emptydirs')
-install=evolution-exchange.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('84f5c638aee1f6ed49de0d0f331d3b29907f7b211bd6c70f37698dedcd3e5f5a')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
- --libexecdir=/usr/lib/evolution --disable-static \
- --with-libdb=/usr --with-krb5=/usr
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-
- install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
- gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain evolution-exchange-3.0 ${pkgdir}/etc/gconf/schemas/*.schemas
- rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/evolution-exchange/evolution-exchange.install b/testing/evolution-exchange/evolution-exchange.install
deleted file mode 100644
index 1179887f9..000000000
--- a/testing/evolution-exchange/evolution-exchange.install
+++ /dev/null
@@ -1,17 +0,0 @@
-pkgname=evolution-exchange
-
-post_install() {
- usr/sbin/gconfpkg --install ${pkgname}
-}
-
-pre_upgrade() {
- pre_remove $1
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- usr/sbin/gconfpkg --uninstall ${pkgname}
-}
diff --git a/testing/evolution/PKGBUILD b/testing/evolution/PKGBUILD
deleted file mode 100644
index 0c91802b7..000000000
--- a/testing/evolution/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 124643 2011-05-23 17:54:16Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=evolution
-pkgver=3.0.2
-pkgrel=1
-pkgdesc="Integrated Workgroup and Personal Information Management for Gnome"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gnome-desktop' 'evolution-data-server' 'gtkhtml4' 'libcanberra' 'libsm' 'gstreamer0.10' 'libunique3' 'libnotify' 'libpst' 'libytnef'
- 'desktop-file-utils' 'hicolor-icon-theme')
-makedepends=('intltool' 'gnome-doc-utils' 'networkmanager')
-optdepends=('bogofilter: possible junk filter plugin'
- 'spamassassin: possible junk filter plugin')
-groups=('gnome-extra')
-options=('!libtool' '!emptydirs')
-install=evolution.install
-url=http://www.gnome.org/projects/evolution/
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('6fdf6a39a89bb04c406225984e5b730e86a370024f30ef9cf019840be9fbe59a')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var \
- --libexecdir=/usr/lib \
- --disable-scrollkeeper \
- --enable-nss=yes \
- --with-openldap=yes \
- --enable-smime=yes \
- --with-krb5=/usr \
- --disable-image-inline
- make
- make -C plugins/tnef-attachments
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
- make -C plugins/tnef-attachments DESTDIR="${pkgdir}" install
-
- install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
- gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain evolution-3.0 ${pkgdir}/etc/gconf/schemas/*.schemas
- rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/evolution/evolution.install b/testing/evolution/evolution.install
deleted file mode 100644
index a2c3aaa54..000000000
--- a/testing/evolution/evolution.install
+++ /dev/null
@@ -1,24 +0,0 @@
-pkgname=evolution
-
-post_install() {
- usr/sbin/gconfpkg --install ${pkgname}
- update-desktop-database -q
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
- pre_remove $1
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
- update-desktop-database -q
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/testing/file-roller/PKGBUILD b/testing/file-roller/PKGBUILD
deleted file mode 100644
index 5d7d1c2ec..000000000
--- a/testing/file-roller/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 124730 2011-05-24 07:10:29Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=file-roller
-pkgver=3.0.2
-pkgrel=1
-pkgdesc="Archive manipulator for GNOME"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'dconf' 'nautilus')
-makedepends=('intltool' 'gnome-doc-utils' 'pkg-config' 'nautilus' 'libsm')
-optdepends=('unrar: the RAR uncompression program'
- 'zip: creates PKZIP-compatible .zip files'
- 'unzip: unpacks .zip archives'
- 'p7zip: 7zip compression utility'
- 'xz: managing LZMA and XZ compressed files'
- 'arj: ARJ archiver'
- 'unace: extraction tool for the proprietary ace archive format')
-groups=('gnome-extra')
-options=('!libtool' '!emptydirs')
-install=file-roller.install
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('a612f05c44f82328175ddca1b4a1da214d9c305797370b78435f490b250af3d1')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --sysconfdir=/etc \
- --libexecdir=/usr/lib/file-roller \
- --localstatedir=/var --disable-static \
- --disable-scrollkeeper --disable-schemas-compile
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/file-roller/file-roller.install b/testing/file-roller/file-roller.install
deleted file mode 100644
index 10a148241..000000000
--- a/testing/file-roller/file-roller.install
+++ /dev/null
@@ -1,22 +0,0 @@
-pkgname=file-roller
-
-post_install() {
- glib-compile-schemas usr/share/glib-2.0/schemas
- update-desktop-database -q
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
- if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
- usr/sbin/gconfpkg --uninstall ${pkgname}
- fi
-}
-
-post_upgrade() {
- post_install $1
-}
-
-
-post_remove() {
- post_install $1
-}
diff --git a/testing/file/PKGBUILD b/testing/file/PKGBUILD
deleted file mode 100644
index 9869a976c..000000000
--- a/testing/file/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 123963 2011-05-15 08:19:29Z tpowa $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: Andreas Radke <andyrtr@archlinux.org>
-
-pkgname=file
-pkgver=5.07
-pkgrel=3
-pkgdesc="File type identification utility"
-arch=('i686' 'x86_64')
-license=('custom')
-groups=('base')
-url="http://www.darwinsys.com/file/"
-depends=('glibc' 'zlib')
-options=('!libtool')
-source=(ftp://ftp.astron.com/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz
- file-5.05-zip64.patch
- file-5.07-zip-detect.patch)
-md5sums=('b8d1f9a8a644067bd0a703cebf3f4858'
- '385f020467debd98bd2d8df6143f93d0'
- 'bcbf2e152f38003a2736298bbd0f37f8')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- sed -i 's#\$(datadir)/misc#\$(datadir)#' configure
-
- # identify zip64 files
- patch -Np1 -i ${srcdir}/file-5.05-zip64.patch
- patch -Np1 -i ${srcdir}/file-5.07-zip-detect.patch
- ./configure --prefix=/usr --datadir=/usr/share/file
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- make DESTDIR=${pkgdir} install
- install -dm755 ${pkgdir}/usr/share/misc
- ln -s ../file/magic.mgc ${pkgdir}/usr/share/misc
-
- install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
-}
diff --git a/testing/file/file-5.05-zip64.patch b/testing/file/file-5.05-zip64.patch
deleted file mode 100644
index 2c9aede5f..000000000
--- a/testing/file/file-5.05-zip64.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur file-5.05-old//magic/Magdir/archive file-5.05/magic/Magdir/archive
---- file-5.05-old//magic/Magdir/archive 2011-01-08 06:24:25.000000000 +1000
-+++ file-5.05/magic/Magdir/archive 2011-01-19 14:37:47.766673895 +1000
-@@ -688,6 +688,7 @@
- >>4 byte 0x0b \b, at least v1.1 to extract
- >>0x161 string WINZIP \b, WinZIP self-extracting
- >>4 byte 0x14 \b, at least v2.0 to extract
-+>>4 byte 0x2d \b, at least v3.0 to extract
-
- # Zoo archiver
- 20 lelong 0xfdc4a7dc Zoo archive data
diff --git a/testing/file/file-5.07-zip-detect.patch b/testing/file/file-5.07-zip-detect.patch
deleted file mode 100644
index 3e8f128d8..000000000
--- a/testing/file/file-5.07-zip-detect.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- file-5.07/magic/Magdir/archive.old 2011-04-23 17:02:48.000000000 +0200
-+++ file-5.07/magic/Magdir/archive 2011-05-15 10:14:44.509271579 +0200
-@@ -654,6 +654,10 @@
- >>>>78 string -template Template
- !:mime application/vnd.oasis.opendocument.image-template
-
-+>26 byte x Zip archive data
-+
-+
-+
- # StarView Metafile
- # From Pierre Ducroquet <pinaraf@pinaraf.info>
- 0 string VCLMTF StarView MetaFile
diff --git a/testing/gdl/PKGBUILD b/testing/gdl/PKGBUILD
deleted file mode 100644
index a20a92c9b..000000000
--- a/testing/gdl/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 124671 2011-05-23 20:42:08Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gdl
-pkgver=3.0.2
-pkgrel=1
-pkgdesc="GNOME Docking Library"
-arch=(i686 x86_64)
-license=('GPL')
-url="http://www.gnome.org/"
-depends=('gtk3')
-makedepends=('pkgconfig' 'intltool' 'gobject-introspection')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('b4a0e7539a1133afca1b370818373fb8dcf29b50f12edbfaf6c1d5560977a308')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-static
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gdm/2.91_fix_external_program_directories.patch b/testing/gdm/2.91_fix_external_program_directories.patch
deleted file mode 100644
index 912b5cdae..000000000
--- a/testing/gdm/2.91_fix_external_program_directories.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -Nur gdm-2.91.91.orig/daemon/gdm-server.c gdm-2.91.91/daemon/gdm-server.c
---- gdm-2.91.91.orig/daemon/gdm-server.c 2011-02-17 19:27:53.000000000 -0800
-+++ gdm-2.91.91/daemon/gdm-server.c 2011-02-27 16:56:51.283347074 -0800
-@@ -131,7 +131,7 @@
- g_return_val_if_fail (GDM_IS_SERVER (server), NULL);
-
- error = NULL;
-- command = g_strdup_printf (LIBEXECDIR "/ck-get-x11-display-device --display %s",
-+ command = g_strdup_printf ("/usr/lib/ConsoleKit/ck-get-x11-display-device --display %s",
- server->priv->display_name);
-
- g_debug ("GdmServer: Running helper %s", command);
-diff -Nur gdm-2.91.91.orig/data/greeter-autostart/gnome-settings-daemon.desktop.in.in gdm-2.91.91/data/greeter-autostart/gnome-settings-daemon.desktop.in.in
---- gdm-2.91.91.orig/data/greeter-autostart/gnome-settings-daemon.desktop.in.in 2011-02-17 19:27:53.000000000 -0800
-+++ gdm-2.91.91/data/greeter-autostart/gnome-settings-daemon.desktop.in.in 2011-02-26 08:43:28.700009251 -0800
-@@ -1,8 +1,8 @@
- [Desktop Entry]
- Type=Application
- _Name=GNOME Settings Daemon
--TryExec=@LIBEXECDIR@/gnome-settings-daemon
--Exec=@LIBEXECDIR@/gnome-settings-daemon
-+TryExec=/usr/bin/gnome-settings-daemon
-+Exec=/usr/bin/gnome-settings-daemon
- OnlyShowIn=GNOME;
- X-GNOME-Autostart-Phase=Initialization
- X-GNOME-Autostart-Notify=true
-diff -Nur gdm-2.91.91.orig/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in gdm-2.91.91/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in
---- gdm-2.91.91.orig/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in 2011-02-17 19:27:53.000000000 -0800
-+++ gdm-2.91.91/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in 2011-02-26 08:44:06.810009153 -0800
-@@ -1,5 +1,5 @@
- [Desktop Entry]
- Type=Application
- _Name=PolicyKit Authentication Agent
--Exec=@LIBEXECDIR@/polkit-gnome-authentication-agent-1
-+Exec=/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
- OnlyShowIn=GNOME;
-diff -Nur gdm-2.91.91.orig/gui/simple-chooser/gdm-chooser-session.c gdm-2.91.91/gui/simple-chooser/gdm-chooser-session.c
---- gdm-2.91.91.orig/gui/simple-chooser/gdm-chooser-session.c 2011-02-17 19:27:53.000000000 -0800
-+++ gdm-2.91.91/gui/simple-chooser/gdm-chooser-session.c 2011-02-26 08:45:01.946675918 -0800
-@@ -131,7 +131,7 @@
- ret = FALSE;
-
- error = NULL;
-- g_spawn_command_line_async (LIBEXECDIR "/gnome-settings-daemon", &error);
-+ g_spawn_command_line_async ("/usr/bin/gnome-settings-daemon", &error);
- if (error != NULL) {
- g_warning ("Error starting settings daemon: %s", error->message);
- g_error_free (error);
diff --git a/testing/gdm/PKGBUILD b/testing/gdm/PKGBUILD
deleted file mode 100644
index a5768c9ec..000000000
--- a/testing/gdm/PKGBUILD
+++ /dev/null
@@ -1,59 +0,0 @@
-# $Id: PKGBUILD 124668 2011-05-23 20:39:21Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-pkgname=gdm
-pkgver=3.0.2
-pkgrel=1
-pkgdesc="Gnome Display Manager (a reimplementation of xdm)"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnome.org"
-backup=('etc/pam.d/gdm' 'etc/pam.d/gdm-autologin' 'etc/gdm/custom.conf')
-groups=('gnome-extra')
-options=('!libtool')
-depends=('libcanberra' 'libxklavier' 'tcp_wrappers' 'gnome-session' 'upower' 'accountsservice' 'consolekit' 'xorg-xrdb')
-makedepends=('intltool' 'gnome-doc-utils' 'xorg-server')
-conflicts=('fast-user-switch-applet')
-replaces=('fast-user-switch-applet')
-install=gdm.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
- 2.91_fix_external_program_directories.patch
- gdm-vt-allocation-hack.patch
- gdm.pam
- gdm-autologin.pam
- gdm)
-sha256sums=('3e0d44d551230c02a00ce27e4d98a5ebd54aac81520949076ad3111658eb2a05'
- '92c5eb913b9556cffe9b5bb89e5c3435703e929addfb98145442f58af5d532c1'
- '3c8b588d4af08d94dc93bcd5e4c2a983c3f4fbbbe40833bceac2a1df4f1e8215'
- 'f1dfa4d88288d4b0a631a68a51b46c2da537bee8fe5a99f9f288c8ff75a50b19'
- '3daff680ff6b7ea56f84f40843e46e72477c81e9e405028203c942af04d07ae5'
- '272c08d8e8b50bf424d0705ac864d4c18c47ec4f6893b1af732c2efbc86c9550')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -Np1 -i "${srcdir}/2.91_fix_external_program_directories.patch"
- patch -Np1 -i "${srcdir}/gdm-vt-allocation-hack.patch"
-
- ./configure --prefix=/usr --sysconfdir=/etc \
- --libexecdir=/usr/lib/gdm --localstatedir=/var --disable-static \
- --with-at-spi-registryd-directory=/usr/lib/at-spi \
- --disable-scrollkeeper
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
- install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
- gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gdm ${pkgdir}/etc/gconf/schemas/*.schemas
- rm -r "${pkgdir}/etc/gconf/schemas/"
-
- install -m644 "${srcdir}/gdm.pam" "${pkgdir}/etc/pam.d/gdm"
- install -m644 "${srcdir}/gdm-autologin.pam" "${pkgdir}/etc/pam.d/gdm-autologin"
-
- install -m755 -d "${pkgdir}/etc/rc.d"
- install -m755 "${srcdir}/gdm" "${pkgdir}/etc/rc.d/"
-
- rmdir "${pkgdir}/var/gdm"
- chmod 1770 "${pkgdir}/var/log/gdm"
- rm -rf "${pkgdir}/var/run"
-}
diff --git a/testing/gdm/gdm b/testing/gdm/gdm
deleted file mode 100755
index c3e635a6d..000000000
--- a/testing/gdm/gdm
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
- start)
- stat_busy "Starting GDM"
- /usr/sbin/gdm &
- if [ $? -gt 0 ]; then
- stat_fail
- else
-
- add_daemon gdm
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping GDM"
- [ -f /var/run/gdm.pid ] && kill `cat /var/run/gdm.pid` &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon gdm
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 2
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/testing/gdm/gdm-autologin.pam b/testing/gdm/gdm-autologin.pam
deleted file mode 100644
index 7c2f9a985..000000000
--- a/testing/gdm/gdm-autologin.pam
+++ /dev/null
@@ -1,8 +0,0 @@
-#%PAM-1.0
-auth requisite pam_nologin.so
-auth required pam_env.so
-auth required pam_permit.so
-account required pam_unix.so
-password required pam_unix.so
-session required pam_limits.so
-session required pam_unix.so
diff --git a/testing/gdm/gdm-vt-allocation-hack.patch b/testing/gdm/gdm-vt-allocation-hack.patch
deleted file mode 100644
index 56fa5a151..000000000
--- a/testing/gdm/gdm-vt-allocation-hack.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-diff --git a/daemon/gdm-server.c b/daemon/gdm-server.c
-index 39def47..03488fd 100644
---- a/daemon/gdm-server.c
-+++ b/daemon/gdm-server.c
-@@ -33,6 +33,8 @@
- #include <grp.h>
- #include <signal.h>
- #include <sys/resource.h>
-+#include <sys/ioctl.h>
-+#include <sys/vt.h>
-
- #include <glib.h>
- #include <glib/gi18n.h>
-@@ -150,6 +152,92 @@ _gdm_server_query_ck_for_display_device (GdmServer *server)
- return out;
- }
-
-+#ifndef O_NOCTTY
-+# define O_NOCTTY 0
-+#endif
-+
-+static int
-+open_vt (int vtno)
-+{
-+ char *vtname;
-+ int fd;
-+
-+ vtname = g_strdup_printf ("/dev/tty%d", vtno);
-+
-+ do {
-+ errno = 0;
-+ fd = open (vtname, O_RDWR | O_NOCTTY, 0);
-+ } while (errno == EINTR);
-+
-+ g_free (vtname);
-+ return fd;
-+}
-+
-+static gint
-+find_first_probably_free_vt (void)
-+{
-+ int fd, fdv;
-+ int vtno;
-+ unsigned short vtmask;
-+ struct vt_stat vtstat;
-+ guint v_state;
-+
-+ fdv = -1;
-+
-+ do {
-+ errno = 0;
-+ fd = open ("/dev/console", O_WRONLY | O_NOCTTY, 0);
-+ } while (errno == EINTR);
-+
-+ if (fd >= 0) {
-+ if (ioctl (fd, VT_GETSTATE, &vtstat) >= 0) {
-+ v_state = vtstat.v_state;
-+ } else {
-+ close (fd);
-+ v_state = 0;
-+ fd = -1;
-+ }
-+ } else {
-+ v_state = 0;
-+ }
-+
-+ if (fd < 0) {
-+ do {
-+ errno = 0;
-+ fd = open ("/dev/console", O_RDONLY | O_NOCTTY, 0);
-+ } while (errno == EINTR);
-+
-+ if (fd >= 0) {
-+ if (ioctl (fd, VT_GETSTATE, &vtstat) >= 0)
-+ v_state = vtstat.v_state;
-+ }
-+ }
-+
-+ for (vtno = 7, vtmask = 1 << vtno; vtmask; vtno++, vtmask <<= 1) {
-+ /* Is this console in use? */
-+ if (v_state & vtmask)
-+ continue;
-+
-+ /* No, try to open it */
-+ fdv = open_vt (vtno);
-+ if (fdv >= 0)
-+ break;
-+
-+ /* If we're here, kernel indicated that the console was free,
-+ * but we failed to open it. Just go on to higher VTs. */
-+ }
-+
-+ if (fdv >= 0)
-+ close (fdv);
-+ else
-+ vtno = -1;
-+
-+ if (fd >= 0)
-+ close (fd);
-+
-+ return vtno;
-+}
-+
- char *
- gdm_server_get_display_device (GdmServer *server)
- {
-@@ -310,6 +398,11 @@ gdm_server_resolve_command_line (GdmServer *server,
-
- if (vtarg != NULL && ! gotvtarg) {
- argv[len++] = g_strdup (vtarg);
-+ } else if (!query_in_arglist && !gotvtarg) {
-+ gint vtnum = find_first_probably_free_vt ();
-+
-+ if (vtnum > 0)
-+ argv [len++] = g_strdup_printf ("vt%d", vtnum);
- }
-
- argv[len++] = NULL;
diff --git a/testing/gdm/gdm.install b/testing/gdm/gdm.install
deleted file mode 100644
index 6cd981d77..000000000
--- a/testing/gdm/gdm.install
+++ /dev/null
@@ -1,27 +0,0 @@
-pkgname=gdm
-
-post_install() {
- getent group gdm >/dev/null 2>&1 || groupadd -g 120 gdm
- getent passwd gdm > /dev/null 2>&1 || usr/sbin/useradd -c 'Gnome Display Manager' -u 120 -g gdm -d /var/lib/gdm -s /sbin/nologin gdm
- passwd -l gdm > /dev/null
- chown -R gdm:gdm /var/lib/gdm > /dev/null
-
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
- gconfpkg --install ${pkgname}
-}
-
-pre_remove() {
- if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
- gconfpkg --uninstall ${pkgname}
- fi
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
- getent passwd gdm >/dev/null 2>&1 && userdel gdm
- getent group gdm >/dev/null 2>&1 && groupdel gdm
-}
diff --git a/testing/gdm/gdm.pam b/testing/gdm/gdm.pam
deleted file mode 100644
index 655299cb7..000000000
--- a/testing/gdm/gdm.pam
+++ /dev/null
@@ -1,10 +0,0 @@
-#%PAM-1.0
-auth requisite pam_nologin.so
-auth required pam_env.so
-auth required pam_unix.so
-auth optional pam_gnome_keyring.so
-account required pam_unix.so
-session required pam_limits.so
-session required pam_unix.so
-session optional pam_gnome_keyring.so auto_start
-password required pam_unix.so
diff --git a/testing/gedit/PKGBUILD b/testing/gedit/PKGBUILD
deleted file mode 100644
index 445dfff8c..000000000
--- a/testing/gedit/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 124957 2011-05-25 12:36:33Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gedit
-pkgver=3.0.3
-pkgrel=1
-pkgdesc="A text editor for GNOME"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gtksourceview3' 'gsettings-desktop-schemas' 'libpeas' 'enchant'
- 'iso-codes' 'libsm' 'desktop-file-utils' 'pygobject')
-makedepends=('gnome-doc-utils' 'intltool')
-groups=('gnome-extra')
-options=('!libtool' '!emptydirs')
-url="http://www.gnome.org"
-install=gedit.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('16764f0cf17fcd85f9c3f031bb151aa87ef1e727e8d19814a4746d376adca578')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
- --sysconfdir=/etc --localstatedir=/var \
- --libexecdir=/usr/lib --disable-scrollkeeper \
- --disable-updater --disable-schemas-compile \
- --enable-python
- make
-}
-
-package(){
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gedit/gedit.install b/testing/gedit/gedit.install
deleted file mode 100644
index 9d88a1341..000000000
--- a/testing/gedit/gedit.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
- glib-compile-schemas usr/share/glib-2.0/schemas
- update-desktop-database -q
-}
-
-pre_upgrade() {
- if [ -f usr/share/gconf/schemas/gedit.schemas ]; then
- usr/sbin/gconfpkg --uninstall gedit
- fi
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- post_install $1
-}
diff --git a/testing/glib-networking/PKGBUILD b/testing/glib-networking/PKGBUILD
deleted file mode 100644
index ca799b5ba..000000000
--- a/testing/glib-networking/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 124675 2011-05-23 20:43:54Z ibiru $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-pkgname=glib-networking
-pkgver=2.28.7
-pkgrel=1
-pkgdesc="Network-related giomodules for glib"
-arch=('i686' 'x86_64')
-url="http://www.gtk.org/"
-license=('GPL2')
-depends=('glib2' 'libproxy' 'gnutls' 'ca-certificates' 'gsettings-desktop-schemas')
-makedepends=('intltool')
-options=('!libtool')
-install=glib-networking.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.bz2)
-sha256sums=('98bedfbd530c4b1b53c91025fe82290bafd289d249e4eb549c3b90d23a76021c')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- ./configure \
- --prefix=/usr --sysconfdir=/etc \
- --libexecdir=/usr/lib/glib-networking --disable-static
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="${pkgdir}" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/glib-networking/glib-networking.install b/testing/glib-networking/glib-networking.install
deleted file mode 100644
index 595f1c75b..000000000
--- a/testing/glib-networking/glib-networking.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- usr/bin/gio-querymodules usr/lib/gio/modules
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/testing/glib2/PKGBUILD b/testing/glib2/PKGBUILD
deleted file mode 100644
index 24bd5dfe2..000000000
--- a/testing/glib2/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 124444 2011-05-21 07:53:58Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=glib2
-pkgver=2.28.7
-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.02')
-makedepends=('pkgconfig' 'python2')
-options=('!libtool' '!docs')
-source=(http://ftp.gnome.org/pub/GNOME/sources/glib/2.28/glib-${pkgver}.tar.bz2
- glib2.sh
- glib2.csh)
-sha256sums=('0e1b3816a8934371d4ea2313dfbe25d10d16c950f8d02e0a7879ae10d91b1631'
- '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
-}
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/gnome-control-center/PKGBUILD b/testing/gnome-control-center/PKGBUILD
deleted file mode 100644
index c75fc2c4a..000000000
--- a/testing/gnome-control-center/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 124765 2011-05-24 09:14:06Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-control-center
-pkgver=3.0.2
-pkgrel=1
-pkgdesc="The Control Center for GNOME"
-arch=('i686' 'x86_64')
-depends=('gtk3' 'gsettings-desktop-schemas' 'gnome-menus' 'gnome-desktop' 'gnome-settings-daemon' 'upower' 'libgtop' 'cups-pk-helper' 'accountsservice' 'sound-theme-freedesktop' 'krb5')
-optdepends=('mesa-demos: provides glxinfo for graphics information'
- 'apg: adds password generation for user accounts')
-makedepends=('gnome-doc-utils' 'intltool' 'networkmanager')
-url="http://www.gnome.org"
-groups=('gnome')
-install=gnome-control-center.install
-license=('GPL')
-options=('!libtool' '!emptydirs')
-source=(http://download.gnome.org/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('477b09a060a75e3664bd9cc9aac6b780067e50198217e3e11dc64980e3414896')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-static \
- --disable-scrollkeeper --disable-update-mimedb
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- make DESTDIR="${pkgdir}" install
-}
-
diff --git a/testing/gnome-control-center/gnome-control-center.install b/testing/gnome-control-center/gnome-control-center.install
deleted file mode 100644
index eb703319f..000000000
--- a/testing/gnome-control-center/gnome-control-center.install
+++ /dev/null
@@ -1,19 +0,0 @@
-pkgname=gnome-control-center
-
-post_install() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
- if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
- usr/sbin/gconfpkg --uninstall ${pkgname}
- fi
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- post_install $1
-}
diff --git a/testing/gnome-desktop/PKGBUILD b/testing/gnome-desktop/PKGBUILD
deleted file mode 100644
index 65002fb58..000000000
--- a/testing/gnome-desktop/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 124748 2011-05-24 07:38:40Z ibiru $
-# Maintainer: Jan de Groot <jan@archlinux.org>
-
-pkgname=gnome-desktop
-pkgver=3.0.2
-pkgrel=1
-pkgdesc="Library with common API for various GNOME modules"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL')
-depends=('gsettings-desktop-schemas' 'startup-notification' 'gtk3')
-makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection')
-url="http://www.gnome.org"
-groups=('gnome')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('0ac9b4a358c6d92d20283cf56a9817262ff3ce038013cbb5d98e4ab97aa2c9a3')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-static \
- --with-gnome-distributor="Arch Linux" \
- --disable-scrollkeeper
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gnome-games/PKGBUILD b/testing/gnome-games/PKGBUILD
deleted file mode 100644
index 853bcfe8a..000000000
--- a/testing/gnome-games/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 124637 2011-05-23 17:10:50Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-games
-pkgver=3.0.2
-pkgrel=1
-pkgdesc="Some Games for GNOME"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('libsm' 'gconf' 'guile' 'desktop-file-utils' 'libcanberra' 'clutter-gtk' 'hicolor-icon-theme' 'librsvg' 'seed' 'pygobject')
-makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection')
-provides=('glchess')
-conflicts=('glchess')
-options=('!emptydirs' '!libtool')
-install=gnome-games.install
-url="http://www.gnome.org"
-groups=('gnome-extra')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('1b731d691806d89d411a6bfaaca05a441555adee2760b97bb80fb5ded8326cb1')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-scrollkeeper \
- --disable-static \
- --with-scores-user=root --with-scores-group=games \
- --enable-introspection=yes
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
- # Remove all scores, we generate them from postinstall
- rm -rf "${pkgdir}/var"
-
- install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
- gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-games ${pkgdir}/etc/gconf/schemas/*.schemas
- rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-
- sed -i 's_#! /usr/bin/env python_#!/usr/bin/env python2_' ${pkgdir}/usr/bin/gnome-sudoku
-}
diff --git a/testing/gnome-games/gnome-games.install b/testing/gnome-games/gnome-games.install
deleted file mode 100644
index 1f67c2e01..000000000
--- a/testing/gnome-games/gnome-games.install
+++ /dev/null
@@ -1,153 +0,0 @@
-pkgname=gnome-games
-scores=(glines.Large.scores
- glines.Medium.scores
- glines.Small.scores
- gnibbles.1.0.scores
- gnibbles.1.1.scores
- gnibbles.2.0.scores
- gnibbles.2.1.scores
- gnibbles.3.0.scores
- gnibbles.3.1.scores
- gnibbles.4.0.scores
- gnibbles.4.1.scores
- gnobots2.classic_robots-safe.scores
- gnobots2.classic_robots-super-safe.scores
- gnobots2.classic_robots.scores
- gnobots2.nightmare-safe.scores
- gnobots2.nightmare-super-safe.scores
- gnobots2.nightmare.scores
- gnobots2.robots2-safe.scores
- gnobots2.robots2-super-safe.scores
- gnobots2.robots2.scores
- gnobots2.robots2_easy-safe.scores
- gnobots2.robots2_easy-super-safe.scores
- gnobots2.robots2_easy.scores
- gnobots2.robots_with_safe_teleport-safe.scores
- gnobots2.robots_with_safe_teleport-super-safe.scores
- gnobots2.robots_with_safe_teleport.scores
- gnomine.Custom.scores
- gnomine.Large.scores
- gnomine.Medium.scores
- gnomine.Small.scores
- gnotravex.2x2.scores
- gnotravex.3x3.scores
- gnotravex.4x4.scores
- gnotravex.5x5.scores
- gnotravex.6x6.scores
- gnotski.1.scores
- gnotski.10.scores
- gnotski.11.scores
- gnotski.12.scores
- gnotski.13.scores
- gnotski.14.scores
- gnotski.15.scores
- gnotski.16.scores
- gnotski.17.scores
- gnotski.18.scores
- gnotski.19.scores
- gnotski.2.scores
- gnotski.20.scores
- gnotski.21.scores
- gnotski.22.scores
- gnotski.23.scores
- gnotski.24.scores
- gnotski.25.scores
- gnotski.26.scores
- gnotski.27.scores
- gnotski.28.scores
- gnotski.29.scores
- gnotski.3.scores
- gnotski.30.scores
- gnotski.31.scores
- gnotski.32.scores
- gnotski.33.scores
- gnotski.34.scores
- gnotski.35.scores
- gnotski.36.scores
- gnotski.37.scores
- gnotski.4.scores
- gnotski.5.scores
- gnotski.6.scores
- gnotski.7.scores
- gnotski.8.scores
- gnotski.9.scores
- gtali.Colors.scores
- gtali.Regular.scores
- mahjongg.bridges.scores
- mahjongg.cloud.scores
- mahjongg.confounding.scores
- mahjongg.difficult.scores
- mahjongg.dragon.scores
- mahjongg.easy.scores
- mahjongg.pyramid.scores
- mahjongg.tictactoe.scores
- mahjongg.ziggurat.scores
- swell-foop.Large.scores
- swell-foop.Medium.scores
- swell-foop.Small.scores
- quadrapassel.scores)
-
-post_install() {
- usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
- usr/sbin/gconfpkg --install ${pkgname}
- update-desktop-database -q
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-
- for sz in Large Medium Small; do
- if [ -e "opt/gnome/var/games/same-gnome.${sz}.scores" ]; then
- mv "opt/gnome/var/games/same-gnome.${sz}.scores" \
- "var/games/swell-foop.${sz}.scores"
- elif [ -e "var/games/same-gnome.${sz}.scores" ]; then
- mv "var/games/same-gnome.${sz}.scores" \
- "var/games/swell-foop.${sz}.scores"
- fi
- done
- if [ -e "opt/gnome/var/games/gnometris.scores" ]; then
- mv "opt/gnome/var/games/gnometris.scores" \
- "var/games/quadrapassel.scores"
- elif [ -e "var/games/gnometris.scores" ]; then
- mv "var/games/gnometris.scores" \
- "var/games/quadrapassel.scores"
- fi
-
- for score in "${scores[@]}" ; do
- if [ -e "var/games/${score}" ]; then
- continue
- fi
- if [ -e "opt/gnome/var/games/${score}" ]; then
- mv "opt/gnome/var/games/${score}" var/games/
- else
- touch "var/games/${score}"
- fi
- chown root:games "var/games/${score}"
- chmod 664 "var/games/${score}"
- done
-}
-
-pre_upgrade() {
- pre_remove $1
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- usr/sbin/gconfpkg --uninstall ${pkgname}
-
- if [ -f usr/share/ggz/gnect-client.dsc ]; then
- ggz-config -r -m usr/share/ggz/gnect-client.dsc >& /dev/null
- ggz-config -r -m usr/share/ggz/gnibbles-client.dsc >& /dev/null
- ggz-config -r -m usr/share/ggz/iagno-client.dsc >& /dev/null
- fi
-}
-
-post_remove() {
- usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
- update-desktop-database -q
- gtk-update-icon-cache -q -f -t usr/share/icons/hicolor
-
- for score in "${scores[@]}" ; do
- rm -f "var/games/${score}"
- done
-}
diff --git a/testing/gnome-panel/PKGBUILD b/testing/gnome-panel/PKGBUILD
deleted file mode 100644
index 2ecec8404..000000000
--- a/testing/gnome-panel/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 124734 2011-05-24 07:14:49Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-panel
-pkgver=3.0.2
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('GPL')
-pkgdesc="The GNOME Panel"
-url="http://www.gnome.org"
-depends=('gnome-menus' 'gnome-desktop' 'evolution-data-server' 'librsvg' 'libwnck3' 'libsm' 'dconf' 'telepathy-glib')
-makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection' 'networkmanager' 'libcanberra')
-install=gnome-panel.install
-groups=('gnome')
-replaces=('gnome-panel-bonobo')
-provides=("gnome-panel-bonobo=${pkgver}")
-options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('25db8ec026c4bf47f0ef5cc7e2712f2aad175bd7fb8e4952ef5f8b200f17f196')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-static \
- --libexecdir=/usr/lib/gnome-panel \
- --disable-scrollkeeper \
- --disable-schemas-compile
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
- install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
- gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-panel-3.0 ${pkgdir}/etc/gconf/schemas/*.schemas
- rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/gnome-panel/gnome-panel.install b/testing/gnome-panel/gnome-panel.install
deleted file mode 100644
index e3175df5e..000000000
--- a/testing/gnome-panel/gnome-panel.install
+++ /dev/null
@@ -1,24 +0,0 @@
-pkgname=gnome-panel
-
-post_install() {
- usr/sbin/gconfpkg --install ${pkgname}
- usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
- pre_remove
-}
-
-post_upgrade() {
- post_install
-}
-
-pre_remove() {
- usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
- usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/testing/gnome-power-manager/PKGBUILD b/testing/gnome-power-manager/PKGBUILD
deleted file mode 100644
index e731c944b..000000000
--- a/testing/gnome-power-manager/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 124602 2011-05-23 10:33:56Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-power-manager
-pkgver=3.0.2
-pkgrel=1
-pkgdesc="Session daemon that makes it easy to manage your laptop or desktop system."
-arch=(i686 x86_64)
-url="http://www.gnome.org/projects/gnome-power-manager/"
-license=('GPL')
-depends=('libnotify' 'gconf' 'libcanberra' 'gnome-icon-theme' 'upower'
- 'libgnome-keyring' 'dconf')
-makedepends=('intltool' 'gnome-doc-utils' 'gnome-control-center')
-options=(!emptydirs)
-install=gnome-power-manager.install
-groups=(gnome)
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('d0e00fdcfbc3bfb709f9ed82a14de325c51cf0bb86eeacefcda2dd7fcf6cbc2b')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var \
- --libexecdir=/usr/lib/gnome-power-manager \
- --disable-scrollkeeper \
- --with-dbus-services=/usr/share/dbus-1/services \
- --disable-schemas-compile
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gnome-power-manager/gnome-power-manager.install b/testing/gnome-power-manager/gnome-power-manager.install
deleted file mode 100644
index 4666938db..000000000
--- a/testing/gnome-power-manager/gnome-power-manager.install
+++ /dev/null
@@ -1,19 +0,0 @@
-post_install() {
- usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
- gtk-update-icon-cache -q -t -f usr/share/icons/gnome
-}
-
-pre_upgrade() {
- if (( $(vercmp $2 2.91.92) < 0 )); then
- usr/sbin/gconfpkg --uninstall gnome-power-manager
- fi
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/testing/gnome-session/PKGBUILD b/testing/gnome-session/PKGBUILD
deleted file mode 100644
index aefd90ecd..000000000
--- a/testing/gnome-session/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 124745 2011-05-24 07:33:54Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-session
-pkgver=3.0.2
-pkgrel=1
-pkgdesc="The GNOME Session Handler"
-arch=(i686 x86_64)
-license=('GPL' 'LGPL')
-depends=('upower' 'gtk3' 'gconf' 'startup-notification' 'hicolor-icon-theme' 'libxtst' 'polkit-gnome' 'libgl' 'librsvg'
- 'gsettings-desktop-schemas' 'consolekit' 'libsm' 'dconf')
-makedepends=('intltool' 'mesa' 'xtrans')
-options=('!emptydirs')
-install=gnome-session.install
-url="http://www.gnome.org"
-groups=('gnome')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('4801a0cfdf351a1184780cc1c2bdd5cea6cd1ad31505d5fa8de4e56aa766ab96')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --libexecdir=/usr/lib/gnome-session \
- --disable-schemas-compile
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gnome-session/gnome-session.install b/testing/gnome-session/gnome-session.install
deleted file mode 100644
index 74cf4ed22..000000000
--- a/testing/gnome-session/gnome-session.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
- usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
- if (( $(vercmp $2 2.91.91.3-3) < 0 )); then
- usr/sbin/gconfpkg --uninstall gnome-session
- fi
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/testing/gnome-settings-daemon/PKGBUILD b/testing/gnome-settings-daemon/PKGBUILD
deleted file mode 100644
index 25433294c..000000000
--- a/testing/gnome-settings-daemon/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 124605 2011-05-23 10:48:57Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-settings-daemon
-pkgver=3.0.2
-pkgrel=1
-pkgdesc="The GNOME Settings daemon"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('libgnomekbd' 'gnome-desktop' 'libnotify' 'hicolor-icon-theme'
- 'libcanberra-pulse' 'gsettings-desktop-schemas' 'nss' 'gconf'
- 'dconf' 'pulseaudio' 'pulseaudio-alsa')
-makedepends=('intltool' 'gtk-doc')
-options=('!emptydirs' '!libtool')
-install=gnome-settings-daemon.install
-url="http://www.gnome.org"
-groups=('gnome')
-replaces=(gnome-settings-daemon-pulse)
-conflicts=(gnome-settings-daemon-pulse)
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('f304aa54c59ab23f7ef55bfeefeecfd6f7a95cabbeed2ea802c94463d4234eec')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
- --libexecdir=/usr/bin --disable-static --enable-pulse
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gnome-settings-daemon/gnome-settings-daemon.install b/testing/gnome-settings-daemon/gnome-settings-daemon.install
deleted file mode 100644
index 483fb9450..000000000
--- a/testing/gnome-settings-daemon/gnome-settings-daemon.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
- usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
- if (( $(vercmp $2 2.90.0) < 0 )); then
- usr/sbin/gconfpkg --uninstall gnome-settings-daemon
- fi
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/testing/gnome-shell/PKGBUILD b/testing/gnome-shell/PKGBUILD
deleted file mode 100644
index 0c005f56e..000000000
--- a/testing/gnome-shell/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 125332 2011-05-25 22:41:23Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-# Contributor: Flamelab <panosfilip@gmail.com
-
-pkgname=gnome-shell
-pkgver=3.0.2
-pkgrel=1
-pkgdesc="The next generation GNOME Shell"
-arch=('i686' 'x86_64')
-url="http://live.gnome.org/GnomeShell"
-license=('GPL2')
-depends=('mutter' 'gconf' 'dconf' 'gjs' 'gnome-menus' 'gnome-desktop' 'libcroco' 'libcanberra' 'libpulse' 'telepathy-glib' 'polkit-gnome'
- 'gobject-introspection' 'evolution-data-server' 'gnome-bluetooth' 'gstreamer0.10' 'telepathy-logger')
-makedepends=('intltool' 'gnome-doc-utils')
-optdepends=('network-manager-applet: shell integration for networkmanager'
- 'gnome-power-manager: shell integration for power management')
-options=('!libtool' '!emptydirs')
-install=gnome-shell.install
-groups=(gnome)
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2
- arch.patch
- bluetoothstatus-always-update-devices.patch
- shell-recorder-missing-XFree.patch)
-sha256sums=('a44963877da895d9b9f1ea98617067c5e88a5c4b414c6ccf0fcbfacdeac7db95'
- 'a35d5e5f9f781728070aecae3bfe329f49dadcd50ca2984e0fbdd2219825a0db'
- 'f592752875085fceebdb27e65802e09c07edd7be57eec0da3edfcad5052be2ae'
- '070edd5e720c063be41c158f39b7ef62a0d4a7f547ca0d23216104d5428ff971')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- patch -Np1 -i "${srcdir}/arch.patch"
- patch -Np1 -i "${srcdir}/bluetoothstatus-always-update-devices.patch"
- patch -Np1 -i "${srcdir}/shell-recorder-missing-XFree.patch"
-
- ./configure --prefix=/usr --sysconfdir=/etc \
- --libexecdir=/usr/lib/gnome-shell \
- --localstatedir=/var --disable-static \
- --disable-schemas-compile
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
- install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
- gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-shell ${pkgdir}/etc/gconf/schemas/*.schemas
- rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/gnome-shell/arch.patch b/testing/gnome-shell/arch.patch
deleted file mode 100644
index 67baefdcb..000000000
--- a/testing/gnome-shell/arch.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur gnome-shell.orig/data/org.gnome.shell.gschema.xml.in gnome-shell/data/org.gnome.shell.gschema.xml.in
---- gnome-shell.orig/data/org.gnome.shell.gschema.xml.in 2011-04-06 08:47:58.638600793 -0700
-+++ gnome-shell/data/org.gnome.shell.gschema.xml.in 2011-04-06 08:49:17.035274675 -0700
-@@ -30,7 +30,7 @@
- </_description>
- </key>
- <key name="favorite-apps" type="as">
-- <default>[ 'mozilla-firefox.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'openoffice.org-writer.desktop', 'nautilus.desktop' ]</default>
-+ <default>[ 'firefox.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'writer.desktop', 'nautilus.desktop' ]</default>
- <_summary>List of desktop file IDs for favorite applications</_summary>
- <_description>
- The applications corresponding to these identifiers
diff --git a/testing/gnome-shell/bluetoothstatus-always-update-devices.patch b/testing/gnome-shell/bluetoothstatus-always-update-devices.patch
deleted file mode 100644
index 0272169f5..000000000
--- a/testing/gnome-shell/bluetoothstatus-always-update-devices.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-From 76fce94b66be7bdebbedcc3bce62898da51da15a Mon Sep 17 00:00:00 2001
-From: Giovanni Campagna <gcampagna@src.gnome.org>
-Date: Wed, 13 Apr 2011 17:08:45 +0000
-Subject: BluetoothStatus: always update devices
-
-Previously, we skipped rebuilding device items in case the device
-had already been seen, but this caused the connected switch not to
-be updated. Now it has been refactored to update in case the device
-changes, and to create only when the device is completely new.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=647565
----
-diff --git a/js/ui/status/bluetooth.js b/js/ui/status/bluetooth.js
-index 070016a..cee2f90 100644
---- a/js/ui/status/bluetooth.js
-+++ b/js/ui/status/bluetooth.js
-@@ -127,13 +127,6 @@ Indicator.prototype = {
- }
- },
-
-- _deviceCompare: function(d1, d2) {
-- return d1.device_path == d2.device_path &&
-- d1.bdaddr == d2.bdaddr &&
-- d1.can_connect == d2.can_connect &&
-- d1.capabilities == d2.capabilities;
-- },
--
- _updateDevices: function() {
- let devices = this._applet.get_devices();
-
-@@ -142,12 +135,8 @@ Indicator.prototype = {
- let item = this._deviceItems[i];
- let destroy = true;
- for (let j = 0; j < devices.length; j++) {
-- // we need to deep compare because BluetoothSimpleDevice is a boxed type
-- // (but we take advantage of that, because _skip will disappear the next
-- // time get_devices() is called)
-- if (this._deviceCompare(item._device, devices[j])) {
-- item.label.text = devices[j].alias;
-- devices[j]._skip = true;
-+ if (item._device.device_path == devices[j].device_path) {
-+ this._updateDeviceItem(item, devices[j]);
- destroy = false;
- break;
- }
-@@ -162,7 +151,7 @@ Indicator.prototype = {
- this._hasDevices = newlist.length > 0;
- for (let i = 0; i < devices.length; i++) {
- let d = devices[i];
-- if (d._skip)
-+ if (d._item)
- continue;
- let item = this._createDeviceItem(d);
- if (item) {
-@@ -177,17 +166,55 @@ Indicator.prototype = {
- this._deviceSep.actor.hide();
- },
-
-+ _updateDeviceItem: function(item, device) {
-+ if (!device.can_connect && device.capabilities == GnomeBluetoothApplet.Capabilities.NONE) {
-+ item.destroy();
-+ return;
-+ }
-+
-+ let prevDevice = item._device;
-+ let prevCapabilities = prevDevice.capabilities;
-+ let prevCanConnect = prevDevice.can_connect;
-+
-+ // adopt the new device object
-+ item._device = device;
-+ device._item = item;
-+
-+ // update properties
-+ item.label.text = device.alias;
-+
-+ if (prevCapabilities != device.capabilities ||
-+ prevCanConnect != device.can_connect) {
-+ // need to rebuild the submenu
-+ item.menu.removeAll();
-+ this._buildDeviceSubMenu(item, device);
-+ }
-+
-+ // update connected property
-+ if (device.can_connect)
-+ item._connectedMenuitem.setToggleState(device.connected);
-+ },
-+
- _createDeviceItem: function(device) {
- if (!device.can_connect && device.capabilities == GnomeBluetoothApplet.Capabilities.NONE)
- return null;
- let item = new PopupMenu.PopupSubMenuMenuItem(device.alias);
-+
-+ // adopt the device object, and add a back link
- item._device = device;
-+ device._item = item;
-
-+ this._buildDeviceSubMenu(item, device);
-+
-+ return item;
-+ },
-+
-+ _buildDeviceSubMenu: function(item, device) {
- if (device.can_connect) {
- item._connected = device.connected;
-- let menuitem = new PopupMenu.PopupSwitchMenuItem(_("Connection"), device.connected);
-+ item._connectedMenuitem = new PopupMenu.PopupSwitchMenuItem(_("Connection"), device.connected);
-
-- menuitem.connect('toggled', Lang.bind(this, function() {
-+ item._connectedMenuitem.connect('toggled', Lang.bind(this, function() {
- if (item._connected > ConnectionState.CONNECTED) {
- // operation already in progress, revert
- menuitem.setToggleState(menuitem.state);
-@@ -217,7 +244,7 @@ Indicator.prototype = {
- }
- }));
-
-- item.menu.addMenuItem(menuitem);
-+ item.menu.addMenuItem(item._connectedMenuitem);
- }
-
- if (device.capabilities & GnomeBluetoothApplet.Capabilities.OBEX_PUSH) {
-@@ -263,8 +290,6 @@ Indicator.prototype = {
- default:
- break;
- }
--
-- return item;
- },
-
- _updateFullMenu: function() {
---
-cgit v0.9
diff --git a/testing/gnome-shell/gnome-shell.install b/testing/gnome-shell/gnome-shell.install
deleted file mode 100644
index a07105c24..000000000
--- a/testing/gnome-shell/gnome-shell.install
+++ /dev/null
@@ -1,22 +0,0 @@
-pkgname=gnome-shell
-
-post_install() {
- glib-compile-schemas usr/share/glib-2.0/schemas
- usr/sbin/gconfpkg --install ${pkgname}
-}
-
-pre_upgrade() {
- pre_remove $1
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
- glib-compile-schemas usr/share/glib-2.0/schemas
-}
diff --git a/testing/gnome-shell/shell-recorder-missing-XFree.patch b/testing/gnome-shell/shell-recorder-missing-XFree.patch
deleted file mode 100644
index a7329166f..000000000
--- a/testing/gnome-shell/shell-recorder-missing-XFree.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 88df18345069c295e68d319606a11b7727b2bd4b Mon Sep 17 00:00:00 2001
-From: Maxim Ermilov <zaspire@rambler.ru>
-Date: Tue, 24 May 2011 22:46:47 +0000
-Subject: shell-recorder: missing XFree
-
-https://bugzilla.gnome.org/show_bug.cgi?id=650934
----
-diff --git a/src/shell-recorder.c b/src/shell-recorder.c
-index 6555187..d297923 100644
---- a/src/shell-recorder.c
-+++ b/src/shell-recorder.c
-@@ -412,6 +412,8 @@ recorder_fetch_cursor_image (ShellRecorder *recorder)
- *(guint32 *)(data + i * stride + 4 * j) = cursor_image->pixels[i * cursor_image->width + j];
-
- cairo_surface_mark_dirty (recorder->cursor_image);
-+
-+ XFree (cursor_image);
- }
-
- /* Overlay the cursor image on the frame. We draw the cursor image
---
-cgit v0.9
diff --git a/testing/gnome-system-monitor/PKGBUILD b/testing/gnome-system-monitor/PKGBUILD
deleted file mode 100644
index c25d0b22b..000000000
--- a/testing/gnome-system-monitor/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 124753 2011-05-24 07:53:49Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-system-monitor
-pkgver=3.0.1
-pkgrel=1
-pkgdesc="A system monitor for GNOME"
-arch=(i686 x86_64)
-license=('GPL')
-depends=('libwnck3' 'libgtop' 'gtkmm3' 'librsvg' 'gnome-icon-theme')
-makedepends=('pkgconfig' 'gnome-doc-utils' 'intltool')
-options=(!emptydirs)
-url="http://www.gnome.org"
-groups=('gnome-extra')
-install=gnome-system-monitor.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('0fe6a263875b23a35fd17d8952e666e17801cb68bb664d6ce8cabcfd9ac0f972')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-scrollkeeper
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gnome-system-monitor/gnome-system-monitor.install b/testing/gnome-system-monitor/gnome-system-monitor.install
deleted file mode 100644
index e2957a570..000000000
--- a/testing/gnome-system-monitor/gnome-system-monitor.install
+++ /dev/null
@@ -1,19 +0,0 @@
-pkgname=gnome-system-monitor
-
-post_install() {
- glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-pre_upgrade() {
- if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
- usr/sbin/gconfpkg --uninstall ${pkgname}
- fi
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- post_install $1
-}
diff --git a/testing/gnome-themes-standard/PKGBUILD b/testing/gnome-themes-standard/PKGBUILD
deleted file mode 100644
index 12b8c7d90..000000000
--- a/testing/gnome-themes-standard/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 124628 2011-05-23 14:48:53Z ibiru $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-pkgname=gnome-themes-standard
-pkgver=3.0.2
-pkgrel=1
-pkgdesc="Default themes for the GNOME desktop"
-arch=('i686' 'x86_64')
-url="http://abattis.org/cantarell/"
-license=('GPL2')
-depends=('cantarell-fonts' 'gtk3' 'gtk-engines')
-makedepends=('intltool')
-groups=('gnome')
-replaces=('gnome-themes')
-conflicts=('gnome-themes')
-source=(http://download.gnome.org/sources/$pkgname/3.0/$pkgname-${pkgver}.tar.bz2)
-sha256sums=('1def884063aa441860e20dd9925bb7c3b6f917bae44f77b1ada999940c463809')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="${pkgdir}" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/grep/PKGBUILD b/testing/grep/PKGBUILD
deleted file mode 100644
index d2b07cf23..000000000
--- a/testing/grep/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 124062 2011-05-16 11:49:29Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=grep
-pkgver=2.8
-pkgrel=1
-pkgdesc="A string search utility"
-arch=('i686' 'x86_64')
-license=('GPL3')
-url="http://www.gnu.org/software/grep/grep.html"
-groups=('base')
-depends=('glibc' 'pcre' 'sh')
-makedepends=('texinfo')
-install=${pkgname}.install
-source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz)
-md5sums=('b59003c42b330bdabd417e00d07102da')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- ./configure --prefix=/usr --bindir=/bin --without-included-regex
- make
-}
-
-check() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make check
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
-}
diff --git a/testing/grep/grep.install b/testing/grep/grep.install
deleted file mode 100644
index 7cd31301f..000000000
--- a/testing/grep/grep.install
+++ /dev/null
@@ -1,21 +0,0 @@
-infodir=usr/share/info
-filelist=(grep.info)
-
-post_install() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
-
diff --git a/testing/gtk3/PKGBUILD b/testing/gtk3/PKGBUILD
deleted file mode 100644
index 0daea5d15..000000000
--- a/testing/gtk3/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 124599 2011-05-23 09:25:48Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=gtk3
-pkgver=3.0.10
-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.bz2
- settings.ini)
-sha256sums=('a217ed31aed9843810eabb241239e0f2c5ca0e14bd91687cf4180b3e346abc30'
- '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/gtksourceview3/PKGBUILD b/testing/gtksourceview3/PKGBUILD
deleted file mode 100644
index 23b576238..000000000
--- a/testing/gtksourceview3/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 124948 2011-05-25 12:12:09Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=gtksourceview3
-_pkgbasename=gtksourceview
-pkgver=3.0.2
-pkgrel=1
-pkgdesc="A text widget adding syntax highlighting and more to GNOME"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gtk3' 'libxml2')
-makedepends=('intltool' 'pkgconfig' 'gobject-introspection')
-options=('!libtool')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-${pkgver}.tar.bz2)
-sha256sums=('2cda7851594778c903a3f2a6e303edbe665d18d4ffd0c143ab2d3cfe54ccf8ab')
-
-build() {
- cd "${srcdir}/$_pkgbasename-${pkgver}"
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-static
- make
-}
-
-package() {
- cd "${srcdir}/$_pkgbasename-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gvfs/PKGBUILD b/testing/gvfs/PKGBUILD
deleted file mode 100644
index 7169a5364..000000000
--- a/testing/gvfs/PKGBUILD
+++ /dev/null
@@ -1,101 +0,0 @@
-# $Id: PKGBUILD 124634 2011-05-23 15:36:42Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=gvfs
-pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-gphoto2' 'gvfs-obexftp')
-pkgver=1.8.2
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('LGPL')
-makedepends=('libsoup-gnome' 'libcdio' 'fuse' 'bluez' 'smbclient' 'libgphoto2'
- 'libarchive' 'gnome-disk-utility' 'pkgconfig' 'intltool'
- 'libimobiledevice')
-url="http://www.gnome.org"
-options=(!libtool)
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.bz2)
-sha256sums=('0895ac8f6d416e1b15433b6b6b68eb119c6e8b04fdb66db665d684355ef89345')
-
-build() {
- cd "${srcdir}/${pkgbase}-${pkgver}"
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-static \
- --libexecdir=/usr/lib/gvfs \
- --with-bash-completion-dir=/etc/bash_completion.d
- make
-}
-
-package_gvfs() {
- pkgdesc="Userspace virtual filesystem implemented as a pluggable module for gio"
- depends=('libsoup-gnome' 'gnome-disk-utility' 'libcdio' 'fuse' 'libarchive')
- optdepends=('gvfs-afc: AFC (mobile devices) support'
- 'gvfs-smb: SMB/CIFS (Windows client) support'
- 'gvfs-gphoto2: gphoto2 (PTP camera/MTP media player) support'
- 'gvfs-obexftp: ObexFTP (bluetooth) support')
- install=gvfs.install
-
- cd "${srcdir}/${pkgbase}-${pkgver}"
- sed -e 's/^am__append_3/#am__append_3/' \
- -e 's/^am__append_4/#am__append_4/' \
- -i monitor/Makefile
- make DESTDIR="${pkgdir}" install
-
- cd "${pkgdir}"
- rm usr/lib/gvfs/gvfsd-{smb,smb-browse,afc,gphoto2,obexftp}
- rm usr/share/gvfs/mounts/{smb,smb-browse,afc,gphoto2,obexftp}.mount
- rm usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml
- rm usr/share/GConf/gsettings/gvfs-smb.convert
-}
-
-package_gvfs-smb() {
- pkgdesc="SMB/CIFS (Windows client) backend for gvfs"
- depends=("gvfs=${pkgver}" 'smbclient' 'libgnome-keyring')
- install=gvfs-smb.install
-
- cd "${srcdir}/${pkgbase}-${pkgver}/daemon"
- install -m755 -d "${pkgdir}/usr/lib/gvfs"
- install -m755 -d "${pkgdir}/usr/share/gvfs/mounts"
-
- install -m755 .libs/gvfsd-smb{,-browse} "${pkgdir}/usr/lib/gvfs/"
- install -m644 smb{,-browse}.mount "${pkgdir}/usr/share/gvfs/mounts/"
-
- install -Dm644 org.gnome.system.smb.gschema.xml \
- "${pkgdir}/usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml"
- install -Dm644 gvfs-smb.convert \
- "${pkgdir}/usr/share/GConf/gsettings/gvfs-smb.convert"
-}
-
-package_gvfs-afc() {
- pkgdesc="AFC (mobile devices) backend for gvfs"
- depends=("gvfs=${pkgver}" 'libimobiledevice')
- install=gvfs-module.install
-
- cd "${srcdir}/${pkgbase}-${pkgver}/daemon"
- install -D .libs/gvfsd-afc "${pkgdir}/usr/lib/gvfs/gvfsd-afc"
- install -Dm644 afc.mount "${pkgdir}/usr/share/gvfs/mounts/afc.mount"
-
- cd "${srcdir}/${pkgbase}-${pkgver}/monitor/afc"
- make DESTDIR="${pkgdir}" install
-}
-
-package_gvfs-gphoto2() {
- pkgdesc="gphoto2 (PTP camera/MTP media player) backend for gvfs"
- depends=("gvfs=${pkgver}" 'dbus-core' 'libgphoto2' 'udev')
- install=gvfs-module.install
-
- cd "${srcdir}/${pkgbase}-${pkgver}/daemon"
- install -D .libs/gvfsd-gphoto2 "${pkgdir}/usr/lib/gvfs/gvfsd-gphoto2"
- install -Dm644 gphoto2.mount "${pkgdir}/usr/share/gvfs/mounts/gphoto2.mount"
-
- cd "${srcdir}/${pkgbase}-${pkgver}/monitor/gphoto2"
- make DESTDIR="${pkgdir}" install
-}
-
-package_gvfs-obexftp() {
- pkgdesc="ObexFTP (bluetooth) backend for gvfs"
- depends=("gvfs=${pkgver}" 'dbus-glib' 'bluez' 'obex-data-server')
- install=gvfs-module.install
-
- cd "${srcdir}/${pkgbase}-${pkgver}/daemon"
- install -D .libs/gvfsd-obexftp "${pkgdir}/usr/lib/gvfs/gvfsd-obexftp"
- install -Dm644 obexftp.mount "${pkgdir}/usr/share/gvfs/mounts/obexftp.mount"
-}
diff --git a/testing/gvfs/gvfs-module.install b/testing/gvfs/gvfs-module.install
deleted file mode 100644
index 09d1f11ec..000000000
--- a/testing/gvfs/gvfs-module.install
+++ /dev/null
@@ -1,7 +0,0 @@
-post_install() {
- killall -USR1 gvfsd >&/dev/null || :
-}
-
-post_upgrade() {
- post_install
-}
diff --git a/testing/gvfs/gvfs-smb.install b/testing/gvfs/gvfs-smb.install
deleted file mode 100644
index 0b8783c7b..000000000
--- a/testing/gvfs/gvfs-smb.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
- killall -USR1 gvfsd >&/dev/null || :
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
diff --git a/testing/gvfs/gvfs.install b/testing/gvfs/gvfs.install
deleted file mode 100644
index 9458b1513..000000000
--- a/testing/gvfs/gvfs.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
- usr/bin/gio-querymodules usr/lib/gio/modules
- usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
- killall -USR1 gvfsd >&/dev/null || :
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- usr/bin/gio-querymodules usr/lib/gio/modules
- usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
diff --git a/testing/libgweather/01_gettext_not_xml.patch b/testing/libgweather/01_gettext_not_xml.patch
deleted file mode 100644
index d5f57305e..000000000
--- a/testing/libgweather/01_gettext_not_xml.patch
+++ /dev/null
@@ -1,527 +0,0 @@
-only in patch2:
-unchanged:
-diff -Nur -x '*.orig' -x '*~' libgweather-2.27.91/configure.in libgweather-2.27.91.new/configure.in
---- libgweather-2.27.91/configure.in 2009-08-25 23:56:58.000000000 +1000
-+++ libgweather-2.27.91.new/configure.in 2009-08-26 11:54:52.000000000 +1000
-@@ -40,6 +40,10 @@
- AM_MAINTAINER_MODE
- GNOME_MAINTAINER_MODE_DEFINES
-
-+dnl IT_PROG_INTLTOOL does this for us in the case of the po/ subdir, but we're on our own for po-locations
-+AC_OUTPUT_COMMANDS([sed -e "/POTFILES =/r po/POTFILES" po-locations/Makefile.in > po-locations/Makefile])
-+IT_PO_SUBDIR([po-locations])
-+
- IT_PROG_INTLTOOL([0.40.3])
- PKG_PROG_PKG_CONFIG([0.19])
-
-@@ -50,13 +54,6 @@
- AM_PROG_LIBTOOL
- AC_PATH_PROG(GCONFTOOL, gconftool-2)
-
--AC_ARG_ENABLE(all-translations-in-one-xml,
-- [AC_HELP_STRING([--enable-all-translations-in-one-xml],
-- [Put all translations in a big Locations.xml file (slow to parse)])],
-- [enable_big_xml=yes],
-- [enable_big_xml=no])
--AM_CONDITIONAL(USE_ONE_BIG_XML, test "x$enable_big_xml" = "xyes")
--
- AC_ARG_ENABLE(locations-compression,
- [AC_HELP_STRING([--enable-locations-compression],
- [Compress Locations.xml files])],
-@@ -253,7 +250,7 @@
- Makefile
- doc/Makefile
- po/Makefile.in
--po-locations/Makefile
-+po-locations/Makefile.in
- libgweather/Makefile
- libgweather/gweather.pc
- libgweather/gweather-uninstalled.pc
-@@ -261,12 +258,6 @@
- python/Makefile
- ])
-
--if test "x$enable_big_xml" = "xyes"; then
-- LOCATIONS_XML_TRANSLATIONS="one big file"
--else
-- LOCATIONS_XML_TRANSLATIONS="one file per translation"
--fi
--
- dnl ***************************************************************************
- dnl *** Display Summary ***
- dnl ***************************************************************************
-diff -Nur -x '*.orig' -x '*~' libgweather-2.27.91/data/Makefile.am libgweather-2.27.91.new/data/Makefile.am
---- libgweather-2.27.91/data/Makefile.am 2009-07-22 03:01:11.000000000 +1000
-+++ libgweather-2.27.91.new/data/Makefile.am 2009-08-26 11:57:46.000000000 +1000
-@@ -4,55 +4,23 @@
- libgweatherlocationsdir = $(pkgdatadir)
- libgweatherlocations_in_files = Locations.xml.in
-
--if USE_ONE_BIG_XML
--
--LOCATIONS_STAMP =
--
--libgweatherlocations_DATA = $(libgweatherlocations_in_files:.xml.in=.xml$(COMPRESS_EXT))
--
--%.xml$(COMPRESS_EXT): %.xml.in $(wildcard $(top_srcdir)/po-locations/*.po)
-- $(AM_V_GEN)LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po-locations/.intltool-merge-cache $(top_srcdir)/po-locations $< `echo $@ | sed "s/.xml$(COMPRESS_EXT)/.xml/"` && \
-- if test "x$(COMPRESS_EXT)" = "x.gz"; then \
-- gzip --force `echo $@ | sed "s/.xml$(COMPRESS_EXT)/.xml/"`; \
-- fi
--
--else # USE_ONE_BIG_XML
--
- LOCATIONS_STAMP = stamp-Locations.xml
-
--PO_LOCATIONS = $(shell if test -n "$(LINGUAS)"; then for lang in $(LINGUAS); do if test -f "$(top_srcdir)/po-locations/$$lang.po"; then echo "$(top_srcdir)/po-locations/$$lang.po "; fi; done; else for pofile in $(top_srcdir)/po-locations/*.po; do echo $$pofile; done; fi)
--
- # Helper variable
--libgweatherlocations_data = $(libgweatherlocations_in_files:.xml.in=.xml)
--
--libgweatherlocations_DATA = $(shell echo $(PO_LOCATIONS) | sed "s|$(top_srcdir)/po-locations/|Locations.|g;s|\.po|.xml$(COMPRESS_EXT)|g") $(libgweatherlocations_data)$(COMPRESS_EXT)
-+libgweatherlocations_DATA = $(libgweatherlocations_in_files:.xml.in=.xml)
-
- # We need this step so that we merge all the make Locations.xy.xml destinations
- # into one unique destination. This makes -j2 work. (Else, we end up with
- # multiple and conflicting calls to intltool-merge)
- $(libgweatherlocations_DATA): $(LOCATIONS_STAMP)
-
--$(LOCATIONS_STAMP): $(libgweatherlocations_in_files) $(PO_LOCATIONS) Makefile
-- $(AM_V_at)LC_ALL=C $(INTLTOOL_MERGE) --multiple-output --xml-style --utf8 --cache=$(top_builddir)/po-locations/.intltool-merge-cache $(top_srcdir)/po-locations $< $(libgweatherlocations_data) && \
-- for pofile in $(PO_LOCATIONS); do \
-- locale=`echo $$pofile | sed "s;$(top_srcdir)/po-locations/\(.*\)\.po;\1;"`; \
-- xmllint --noblanks -o Locations.$$locale.xml $$locale/$(libgweatherlocations_data); \
-- rm -f $$locale/$(libgweatherlocations_data); \
-- test -d $$locale && rmdir $$locale; \
-- if test "x$(COMPRESS_EXT)" = "x.gz"; then \
-- gzip --force Locations.$$locale.xml; \
-- fi; \
-- done && \
-- xmllint --noblanks -o Locations.xml C/$(libgweatherlocations_data) && \
-- rm -f C/$(libgweatherlocations_data) && \
-+$(LOCATIONS_STAMP): $(libgweatherlocations_in_files) Makefile
-+ LC_ALL=C $(INTLTOOL_MERGE) --multiple-output --xml-style --utf8 --cache=$(top_builddir)/po-locations/.intltool-merge-cache /dev/null $< $(libgweatherlocations_DATA) && \
-+ xmllint --noblanks -o Locations.xml C/$(libgweatherlocations_DATA) && \
-+ rm -f C/$(libgweatherlocations_DATA) && \
- test -d C && rmdir C && \
-- if test "x$(COMPRESS_EXT)" = "x.gz"; then \
-- gzip --force Locations.xml; \
-- fi && \
- touch $@
-
--endif # USE_ONE_BIG_XML
--
- check:
- xmllint --valid --noout $(top_srcdir)/data/Locations.xml.in
- $(srcdir)/check-timezones.sh $(srcdir)/Locations.xml.in
-diff -Nur -x '*.orig' -x '*~' libgweather-2.27.91/libgweather/gweather-location.c libgweather-2.27.91.new/libgweather/gweather-location.c
---- libgweather-2.27.91/libgweather/gweather-location.c 2009-04-20 03:41:11.000000000 +1000
-+++ libgweather-2.27.91.new/libgweather/gweather-location.c 2009-08-26 11:54:52.000000000 +1000
-@@ -22,11 +22,14 @@
- #include <config.h>
- #endif
-
-+#include "config.h"
-+
- #include <string.h>
- #include <math.h>
- #include <locale.h>
- #include <gtk/gtk.h>
- #include <libxml/xmlreader.h>
-+#include <libintl.h>
-
- #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
- #include "gweather-location.h"
-@@ -184,10 +187,20 @@
-
- tagname = (const char *) xmlTextReaderConstName (parser->xml);
- if (!strcmp (tagname, "name") && !loc->name) {
-- value = gweather_parser_get_localized_value (parser);
-+ char *context = NULL;
-+ context = xmlTextReaderGetAttribute(parser->xml,"msgctxt");
-+
-+ value = gweather_parser_get_value (parser);
- if (!value)
- goto error_out;
-- loc->name = g_strdup (value);
-+
-+ if (context != NULL) {
-+ loc->name = g_strdup (g_dpgettext2(GETTEXT_PACKAGE "-locations", context, value));
-+ xmlFree (context);
-+ }
-+ else
-+ loc->name = g_strdup (dgettext(GETTEXT_PACKAGE "-locations",value));
-+
- xmlFree (value);
- normalized = g_utf8_normalize (loc->name, -1, G_NORMALIZE_ALL);
- loc->sort_name = g_utf8_casefold (normalized, -1);
-diff -Nur -x '*.orig' -x '*~' libgweather-2.27.91/libgweather/gweather-timezone.c libgweather-2.27.91.new/libgweather/gweather-timezone.c
---- libgweather-2.27.91/libgweather/gweather-timezone.c 2009-08-12 19:00:52.000000000 +1000
-+++ libgweather-2.27.91.new/libgweather/gweather-timezone.c 2009-08-26 11:54:52.000000000 +1000
-@@ -23,6 +23,7 @@
- #endif
-
- #include <string.h>
-+#include <libintl.h>
-
- #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
- #include "gweather-timezone.h"
-@@ -152,7 +153,7 @@
- parse_timezone (GWeatherParser *parser)
- {
- GWeatherTimezone *zone = NULL;
-- char *id = NULL, *name = NULL;
-+ char *id = NULL, *name = NULL, *context = NULL;
- int offset = 0, dst_offset = 0;
- gboolean has_dst = FALSE;
-
-@@ -175,27 +176,34 @@
- continue;
- }
-
-- if (!strcmp ((const char *) xmlTextReaderConstName (parser->xml), "name"))
-- name = gweather_parser_get_localized_value (parser);
-+ if (!strcmp ((const char *) xmlTextReaderConstName (parser->xml), "name")) {
-+ context = xmlTextReaderGetAttribute(parser->xml,"msgctxt");
-+ name = gweather_parser_get_value (parser);
-+ }
- else {
- if (xmlTextReaderNext (parser->xml) != 1)
- break;
- }
- }
- }
--
-+
- if (parse_tzdata (id, parser->year_start, parser->year_end,
- &offset, &has_dst, &dst_offset)) {
- zone = g_slice_new0 (GWeatherTimezone);
- zone->ref_count = 1;
- zone->id = g_strdup (id);
-- zone->name = g_strdup (name);
-+ if (context != NULL)
-+ zone->name = g_strdup (g_dpgettext2(GETTEXT_PACKAGE "-locations", context, name));
-+ else
-+ zone->name = g_strdup (dgettext(GETTEXT_PACKAGE "-locations",name));
- zone->offset = offset;
- zone->has_dst = has_dst;
- zone->dst_offset = dst_offset;
- }
-
- xmlFree (id);
-+ if (context)
-+ xmlFree (context);
- if (name)
- xmlFree (name);
-
-diff -Nur -x '*.orig' -x '*~' libgweather-2.27.91/po-locations/LINGUAS libgweather-2.27.91.new/po-locations/LINGUAS
---- libgweather-2.27.91/po-locations/LINGUAS 1970-01-01 10:00:00.000000000 +1000
-+++ libgweather-2.27.91.new/po-locations/LINGUAS 2009-08-26 11:54:52.000000000 +1000
-@@ -0,0 +1,78 @@
-+ang
-+ar
-+as
-+az
-+be
-+be@latin
-+bg
-+bn_IN
-+bn
-+bs
-+ca
-+cs
-+cy
-+da
-+de
-+dz
-+el
-+en_CA
-+en_GB
-+es
-+et
-+eu
-+fa
-+fi
-+fr
-+ga
-+gl
-+gu
-+he
-+hi
-+hr
-+hu
-+id
-+it
-+ja
-+ka
-+kn
-+ko
-+ku
-+ky
-+lt
-+lv
-+mai
-+mg
-+mk
-+ml
-+mn
-+mr
-+ms
-+nb
-+ne
-+nl
-+nn
-+oc
-+or
-+pa
-+pl
-+pt_BR
-+pt
-+ro
-+ru
-+rw
-+si
-+sk
-+sl
-+sq
-+sr@latin
-+sr
-+sv
-+ta
-+te
-+th
-+tr
-+uk
-+vi
-+zh_CN
-+zh_HK
-+zh_TW
-diff -Nur -x '*.orig' -x '*~' libgweather-2.27.91/po-locations/Makefile.in.in libgweather-2.27.91.new/po-locations/Makefile.in.in
---- libgweather-2.27.91/po-locations/Makefile.in.in 1970-01-01 10:00:00.000000000 +1000
-+++ libgweather-2.27.91.new/po-locations/Makefile.in.in 2009-08-26 11:54:52.000000000 +1000
-@@ -0,0 +1,217 @@
-+# Makefile for program source directory in GNU NLS utilities package.
-+# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
-+# Copyright (C) 2004-2008 Rodney Dawes <dobey.pwns@gmail.com>
-+#
-+# This file may be copied and used freely without restrictions. It may
-+# be used in projects which are not available under a GNU Public License,
-+# but which still want to provide support for the GNU gettext functionality.
-+#
-+# - Modified by Owen Taylor <otaylor@redhat.com> to use GETTEXT_PACKAGE
-+# instead of PACKAGE and to look for po2tbl in ./ not in intl/
-+#
-+# - Modified by jacob berkman <jacob@ximian.com> to install
-+# Makefile.in.in and po2tbl.sed.in for use with glib-gettextize
-+#
-+# - Modified by Rodney Dawes <dobey.pwns@gmail.com> for use with intltool
-+#
-+# We have the following line for use by intltoolize:
-+# INTLTOOL_MAKEFILE
-+
-+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@-locations
-+PACKAGE = @PACKAGE@
-+VERSION = @VERSION@
-+
-+SHELL = /bin/sh
-+
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+top_builddir = @top_builddir@
-+VPATH = @srcdir@
-+
-+prefix = @prefix@
-+exec_prefix = @exec_prefix@
-+datadir = @datadir@
-+datarootdir = @datarootdir@
-+libdir = @libdir@
-+DATADIRNAME = @DATADIRNAME@
-+itlocaledir = $(prefix)/$(DATADIRNAME)/locale
-+subdir = po-locations
-+install_sh = @install_sh@
-+# Automake >= 1.8 provides @mkdir_p@.
-+# Until it can be supposed, use the safe fallback:
-+mkdir_p = $(install_sh) -d
-+
-+INSTALL = @INSTALL@
-+INSTALL_DATA = @INSTALL_DATA@
-+
-+GMSGFMT = @GMSGFMT@
-+MSGFMT = @MSGFMT@
-+XGETTEXT = @XGETTEXT@
-+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-+MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
-+GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
-+
-+ALL_LINGUAS = @ALL_LINGUAS@
-+
-+PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi)
-+
-+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep ^$$lang$$`"; then printf "$$lang "; fi; done; fi)
-+
-+USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
-+
-+POFILES=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
-+
-+DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES)
-+EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS
-+
-+POTFILES = \
-+# This comment gets stripped out
-+
-+CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
-+
-+.SUFFIXES:
-+.SUFFIXES: .po .pox .gmo .mo .msg .cat
-+
-+.po.pox:
-+ $(MAKE) $(GETTEXT_PACKAGE).pot
-+ $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox
-+
-+.po.mo:
-+ $(MSGFMT) -o $@ $<
-+
-+.po.gmo:
-+ file=`echo $* | sed 's,.*/,,'`.gmo \
-+ && rm -f $$file && $(GMSGFMT) -o $$file $<
-+
-+.po.cat:
-+ sed -f ../intl/po2msg.sed < $< > $*.msg \
-+ && rm -f $@ && gencat $@ $*.msg
-+
-+
-+all: all-@USE_NLS@
-+
-+all-yes: $(CATALOGS)
-+all-no:
-+
-+$(GETTEXT_PACKAGE).pot: $(POTFILES)
-+ $(GENPOT)
-+
-+install: install-data
-+install-data: install-data-@USE_NLS@
-+install-data-no: all
-+install-data-yes: all
-+ linguas="$(USE_LINGUAS)"; \
-+ for lang in $$linguas; do \
-+ dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
-+ $(mkdir_p) $$dir; \
-+ if test -r $$lang.gmo; then \
-+ $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
-+ echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \
-+ else \
-+ $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
-+ echo "installing $(srcdir)/$$lang.gmo as" \
-+ "$$dir/$(GETTEXT_PACKAGE).mo"; \
-+ fi; \
-+ if test -r $$lang.gmo.m; then \
-+ $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \
-+ echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \
-+ else \
-+ if test -r $(srcdir)/$$lang.gmo.m ; then \
-+ $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \
-+ $$dir/$(GETTEXT_PACKAGE).mo.m; \
-+ echo "installing $(srcdir)/$$lang.gmo.m as" \
-+ "$$dir/$(GETTEXT_PACKAGE).mo.m"; \
-+ else \
-+ true; \
-+ fi; \
-+ fi; \
-+ done
-+
-+# Empty stubs to satisfy archaic automake needs
-+dvi info tags TAGS ID:
-+
-+# Define this as empty until I found a useful application.
-+install-exec installcheck:
-+
-+uninstall:
-+ linguas="$(USE_LINGUAS)"; \
-+ for lang in $$linguas; do \
-+ rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
-+ rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
-+ done
-+
-+check: all $(GETTEXT_PACKAGE).pot
-+ rm -f missing notexist
-+ srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m
-+ if [ -r missing -o -r notexist ]; then \
-+ exit 1; \
-+ fi
-+
-+mostlyclean:
-+ rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
-+ rm -f .intltool-merge-cache
-+
-+clean: mostlyclean
-+
-+distclean: clean
-+ rm -f Makefile Makefile.in POTFILES stamp-it
-+ rm -f *.mo *.msg *.cat *.cat.m *.gmo
-+
-+maintainer-clean: distclean
-+ @echo "This command is intended for maintainers to use;"
-+ @echo "it deletes files that may require special tools to rebuild."
-+ rm -f Makefile.in.in
-+
-+distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
-+dist distdir: $(DISTFILES)
-+ dists="$(DISTFILES)"; \
-+ extra_dists="$(EXTRA_DISTFILES)"; \
-+ for file in $$extra_dists; do \
-+ test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \
-+ done; \
-+ for file in $$dists; do \
-+ test -f $$file || file="$(srcdir)/$$file"; \
-+ ln $$file $(distdir) 2> /dev/null \
-+ || cp -p $$file $(distdir); \
-+ done
-+
-+update-po: Makefile
-+ $(MAKE) $(GETTEXT_PACKAGE).pot
-+ tmpdir=`pwd`; \
-+ linguas="$(USE_LINGUAS)"; \
-+ for lang in $$linguas; do \
-+ echo "$$lang:"; \
-+ result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \
-+ if $$result; then \
-+ if cmp $(srcdir)/$$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
-+ rm -f $$tmpdir/$$lang.new.po; \
-+ else \
-+ if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
-+ :; \
-+ else \
-+ echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
-+ rm -f $$tmpdir/$$lang.new.po; \
-+ exit 1; \
-+ fi; \
-+ fi; \
-+ else \
-+ echo "msgmerge for $$lang.gmo failed!"; \
-+ rm -f $$tmpdir/$$lang.new.po; \
-+ fi; \
-+ done
-+
-+Makefile POTFILES: stamp-it
-+ @if test ! -f $@; then \
-+ rm -f stamp-it; \
-+ $(MAKE) stamp-it; \
-+ fi
-+
-+stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in
-+ cd $(top_builddir) \
-+ && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \
-+ $(SHELL) ./config.status
-+
-+# Tell versions [3.59,3.63) of GNU make not to export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-diff -Nur -x '*.orig' -x '*~' libgweather-2.27.91/po-locations/POTFILES.in libgweather-2.27.91.new/po-locations/POTFILES.in
---- libgweather-2.27.91/po-locations/POTFILES.in 1970-01-01 10:00:00.000000000 +1000
-+++ libgweather-2.27.91.new/po-locations/POTFILES.in 2009-08-26 11:54:52.000000000 +1000
-@@ -0,0 +1,4 @@
-+# This list should contain *only* data/Locations.xml.in.
-+# Everything else should be in POTFILES.skip.
-+[encoding:UTF-8]
-+data/Locations.xml.in
diff --git a/testing/libgweather/PKGBUILD b/testing/libgweather/PKGBUILD
deleted file mode 100644
index f8c1e71c4..000000000
--- a/testing/libgweather/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 124751 2011-05-24 07:48:30Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=libgweather
-pkgver=3.0.2
-pkgrel=1
-pkgdesc="Provides access to weather information from the net"
-arch=('i686' 'x86_64')
-license=('LGPL')
-depends=('gconf' 'libsoup-gnome' 'gnome-icon-theme')
-makedepends=('pkgconfig' 'intltool' 'gtk-doc' 'gobject-introspection')
-options=('!libtool' '!emptydirs')
-url="http://www.gnome.org/"
-install=libgweather.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
- gettext-not-xml.patch)
-sha256sums=('9041526fa0466b99dae5cf06c2cc70376f25531eec5d58b1e1378acfb302410c'
- 'f21d55ab7916a50cad10d1c0bb3785a262e8ad8f35b9fb4c02ae23f1b0783727')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- patch -Np1 -i "${srcdir}/gettext-not-xml.patch"
- gtkdocize
- autoreconf -fi
-
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-static \
- --enable-locations-compression
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
- install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
- gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain libgweather ${pkgdir}/etc/gconf/schemas/*.schemas
- rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/libgweather/gettext-not-xml.patch b/testing/libgweather/gettext-not-xml.patch
deleted file mode 100644
index 4fd2e3aa6..000000000
--- a/testing/libgweather/gettext-not-xml.patch
+++ /dev/null
@@ -1,533 +0,0 @@
-diff -up libgweather-2.91.0/configure.ac.gettext libgweather-2.91.0/configure.ac
---- libgweather-2.91.0/configure.ac.gettext 2010-10-04 18:08:07.000000000 -0400
-+++ libgweather-2.91.0/configure.ac 2011-01-30 13:51:19.615635059 -0500
-@@ -40,6 +40,10 @@ LIBXML_REQUIRED=2.6.0
- AM_MAINTAINER_MODE
- GNOME_MAINTAINER_MODE_DEFINES
-
-+dnl IT_PROG_INTLTOOL does this for us in the case of the po/ subdir, but we're on our own for po-locations
-+AC_OUTPUT_COMMANDS([sed -e "/POTFILES =/r po/POTFILES" po-locations/Makefile.in > po-locations/Makefile])
-+IT_PO_SUBDIR([po-locations])
-+
- IT_PROG_INTLTOOL([0.40.3])
- PKG_PROG_PKG_CONFIG([0.19])
-
-@@ -50,13 +54,6 @@ AC_STDC_HEADERS
- AM_PROG_LIBTOOL
- AC_PATH_PROG(GCONFTOOL, gconftool-2)
-
--AC_ARG_ENABLE(all-translations-in-one-xml,
-- [AC_HELP_STRING([--enable-all-translations-in-one-xml],
-- [Put all translations in a big Locations.xml file (slow to parse)])],
-- [enable_big_xml=yes],
-- [enable_big_xml=no])
--AM_CONDITIONAL(USE_ONE_BIG_XML, test "x$enable_big_xml" = "xyes")
--
- AC_ARG_ENABLE(locations-compression,
- [AC_HELP_STRING([--enable-locations-compression],
- [Compress Locations.xml files])],
-@@ -236,7 +233,7 @@ AC_OUTPUT([
- Makefile
- doc/Makefile
- po/Makefile.in
--po-locations/Makefile
-+po-locations/Makefile.in
- libgweather/Makefile
- libgweather/gweather-3.0.pc
- libgweather/gweather-3.0-uninstalled.pc
-@@ -244,12 +241,6 @@ data/Makefile
- icons/Makefile
- ])
-
--if test "x$enable_big_xml" = "xyes"; then
-- LOCATIONS_XML_TRANSLATIONS="one big file"
--else
-- LOCATIONS_XML_TRANSLATIONS="one file per translation"
--fi
--
- dnl ***************************************************************************
- dnl *** Display Summary ***
- dnl ***************************************************************************
-@@ -260,6 +251,4 @@ libgweather-$VERSION configure summary:
- Source code location: ${srcdir}
- Compiler: ${CC}
- Introspection support: ${found_introspection}
-- Locations.xml translations: ${LOCATIONS_XML_TRANSLATIONS}
-- Locations.xml compression: ${enable_locations_compression}
- " >&2
-diff -up libgweather-2.91.0/data/Makefile.am.gettext libgweather-2.91.0/data/Makefile.am
---- libgweather-2.91.0/data/Makefile.am.gettext 2010-10-04 18:07:31.000000000 -0400
-+++ libgweather-2.91.0/data/Makefile.am 2011-01-30 13:53:12.581466339 -0500
-@@ -4,55 +4,23 @@ libgweatherdtd_DATA = locations.dtd
- libgweatherlocationsdir = $(pkgdatadir)
- libgweatherlocations_in_files = Locations.xml.in
-
--if USE_ONE_BIG_XML
--
--LOCATIONS_STAMP =
--
--libgweatherlocations_DATA = $(libgweatherlocations_in_files:.xml.in=.xml$(COMPRESS_EXT))
--
--%.xml$(COMPRESS_EXT): %.xml.in $(wildcard $(top_srcdir)/po-locations/*.po)
-- $(AM_V_GEN)LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po-locations/.intltool-merge-cache $(top_srcdir)/po-locations $< `echo $@ | sed "s/.xml$(COMPRESS_EXT)/.xml/"` && \
-- if test "x$(COMPRESS_EXT)" = "x.gz"; then \
-- gzip --force `echo $@ | sed "s/.xml$(COMPRESS_EXT)/.xml/"`; \
-- fi
--
--else # USE_ONE_BIG_XML
--
- LOCATIONS_STAMP = stamp-Locations.xml
-
--PO_LOCATIONS = $(shell if test -n "$(LINGUAS)"; then for lang in $(LINGUAS); do if test -f "$(top_srcdir)/po-locations/$$lang.po"; then echo "$(top_srcdir)/po-locations/$$lang.po "; fi; done; else for pofile in $(top_srcdir)/po-locations/*.po; do echo $$pofile; done; fi)
--
- # Helper variable
--libgweatherlocations_data = $(libgweatherlocations_in_files:.xml.in=.xml)
--
--libgweatherlocations_DATA = $(shell echo $(PO_LOCATIONS) | sed "s|$(top_srcdir)/po-locations/|Locations.|g;s|\.po|.xml$(COMPRESS_EXT)|g") $(libgweatherlocations_data)$(COMPRESS_EXT)
-+libgweatherlocations_DATA = $(libgweatherlocations_in_files:.xml.in=.xml)
-
- # We need this step so that we merge all the make Locations.xy.xml destinations
- # into one unique destination. This makes -j2 work. (Else, we end up with
- # multiple and conflicting calls to intltool-merge)
- $(libgweatherlocations_DATA): $(LOCATIONS_STAMP)
-
--$(LOCATIONS_STAMP): $(libgweatherlocations_in_files) $(PO_LOCATIONS) Makefile
-- $(AM_V_at)LC_ALL=C $(INTLTOOL_MERGE) --multiple-output --xml-style --utf8 --cache=$(top_builddir)/po-locations/.intltool-merge-cache $(top_srcdir)/po-locations $< $(libgweatherlocations_data) && \
-- for pofile in $(PO_LOCATIONS); do \
-- locale=`echo $$pofile | sed "s;$(top_srcdir)/po-locations/\(.*\)\.po;\1;"`; \
-- xmllint --noblanks -o Locations.$$locale.xml $$locale/$(libgweatherlocations_data); \
-- rm -f $$locale/$(libgweatherlocations_data); \
-- test -d $$locale && rmdir $$locale; \
-- if test "x$(COMPRESS_EXT)" = "x.gz"; then \
-- gzip --force Locations.$$locale.xml; \
-- fi; \
-- done && \
-- xmllint --noblanks -o Locations.xml C/$(libgweatherlocations_data) && \
-- rm -f C/$(libgweatherlocations_data) && \
-- test -d C && rmdir C && \
-- if test "x$(COMPRESS_EXT)" = "x.gz"; then \
-- gzip --force Locations.xml; \
-- fi && \
-+$(LOCATIONS_STAMP): $(libgweatherlocations_in_files) Makefile
-+ LC_ALL=C $(INTLTOOL_MERGE) --multiple-output --xml-style --utf8 --cache=$(top_builddir)/po-locations/.intltool-merge-cache /dev/null $< $(libgweatherlocations_DATA)
-+ xmllint --noblanks -o Locations.xml C/$(libgweatherlocations_DATA)
-+ rm -f C/$(libgweatherlocations_DATA)
-+ test -d C && rmdir C
- touch $@
-
--endif # USE_ONE_BIG_XML
--
- ### Locations.xml.in rebuild
- rebuild-locations: locationdb.sqlite update-locations.py
- $(AM_V_GEN)($(srcdir)/update-locations.py > Locations.xml.in.new && mv Locations.xml.in.new Locations.xml.in) || rm -f Locations.xml.in.new
-diff -up libgweather-2.91.0/libgweather/gweather-location.c.gettext libgweather-2.91.0/libgweather/gweather-location.c
---- libgweather-2.91.0/libgweather/gweather-location.c.gettext 2010-02-09 07:28:03.000000000 -0500
-+++ libgweather-2.91.0/libgweather/gweather-location.c 2011-01-30 13:51:19.616635049 -0500
-@@ -22,11 +22,14 @@
- #include <config.h>
- #endif
-
-+#include "config.h"
-+
- #include <string.h>
- #include <math.h>
- #include <locale.h>
- #include <gtk/gtk.h>
- #include <libxml/xmlreader.h>
-+#include <libintl.h>
-
- #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
- #include "gweather-location.h"
-@@ -184,10 +187,20 @@ location_new_from_xml (GWeatherParser *p
-
- tagname = (const char *) xmlTextReaderConstName (parser->xml);
- if (!strcmp (tagname, "name") && !loc->name) {
-- value = gweather_parser_get_localized_value (parser);
-+ char *context = NULL;
-+ context = xmlTextReaderGetAttribute(parser->xml,"msgctxt");
-+
-+ value = gweather_parser_get_value (parser);
- if (!value)
- goto error_out;
-- loc->name = g_strdup (value);
-+
-+ if (context != NULL) {
-+ loc->name = g_strdup (g_dpgettext2(GETTEXT_PACKAGE "-locations", context, value));
-+ xmlFree (context);
-+ }
-+ else
-+ loc->name = g_strdup (dgettext(GETTEXT_PACKAGE "-locations",value));
-+
- xmlFree (value);
- normalized = g_utf8_normalize (loc->name, -1, G_NORMALIZE_ALL);
- loc->sort_name = g_utf8_casefold (normalized, -1);
-diff -up libgweather-2.91.0/libgweather/gweather-timezone.c.gettext libgweather-2.91.0/libgweather/gweather-timezone.c
---- libgweather-2.91.0/libgweather/gweather-timezone.c.gettext 2010-02-09 07:28:03.000000000 -0500
-+++ libgweather-2.91.0/libgweather/gweather-timezone.c 2011-01-30 13:51:19.617635039 -0500
-@@ -23,6 +23,7 @@
- #endif
-
- #include <string.h>
-+#include <libintl.h>
-
- #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
- #include "gweather-timezone.h"
-@@ -152,7 +153,7 @@ static GWeatherTimezone *
- parse_timezone (GWeatherParser *parser)
- {
- GWeatherTimezone *zone = NULL;
-- char *id = NULL, *name = NULL;
-+ char *id = NULL, *name = NULL, *context = NULL;
- int offset = 0, dst_offset = 0;
- gboolean has_dst = FALSE;
-
-@@ -175,27 +176,34 @@ parse_timezone (GWeatherParser *parser)
- continue;
- }
-
-- if (!strcmp ((const char *) xmlTextReaderConstName (parser->xml), "name"))
-- name = gweather_parser_get_localized_value (parser);
-+ if (!strcmp ((const char *) xmlTextReaderConstName (parser->xml), "name")) {
-+ context = xmlTextReaderGetAttribute(parser->xml,"msgctxt");
-+ name = gweather_parser_get_value (parser);
-+ }
- else {
- if (xmlTextReaderNext (parser->xml) != 1)
- break;
- }
- }
- }
--
-+
- if (parse_tzdata (id, parser->year_start, parser->year_end,
- &offset, &has_dst, &dst_offset)) {
- zone = g_slice_new0 (GWeatherTimezone);
- zone->ref_count = 1;
- zone->id = g_strdup (id);
-- zone->name = g_strdup (name);
-+ if (context != NULL)
-+ zone->name = g_strdup (g_dpgettext2(GETTEXT_PACKAGE "-locations", context, name));
-+ else
-+ zone->name = g_strdup (dgettext(GETTEXT_PACKAGE "-locations",name));
- zone->offset = offset;
- zone->has_dst = has_dst;
- zone->dst_offset = dst_offset;
- }
-
- xmlFree (id);
-+ if (context)
-+ xmlFree (context);
- if (name)
- xmlFree (name);
-
-diff -up libgweather-2.91.0/po-locations/LINGUAS.gettext libgweather-2.91.0/po-locations/LINGUAS
---- libgweather-2.91.0/po-locations/LINGUAS.gettext 2011-01-30 13:51:19.617635039 -0500
-+++ libgweather-2.91.0/po-locations/LINGUAS 2011-01-30 13:51:19.617635039 -0500
-@@ -0,0 +1,78 @@
-+ang
-+ar
-+as
-+az
-+be
-+be@latin
-+bg
-+bn_IN
-+bn
-+bs
-+ca
-+cs
-+cy
-+da
-+de
-+dz
-+el
-+en_CA
-+en_GB
-+es
-+et
-+eu
-+fa
-+fi
-+fr
-+ga
-+gl
-+gu
-+he
-+hi
-+hr
-+hu
-+id
-+it
-+ja
-+ka
-+kn
-+ko
-+ku
-+ky
-+lt
-+lv
-+mai
-+mg
-+mk
-+ml
-+mn
-+mr
-+ms
-+nb
-+ne
-+nl
-+nn
-+oc
-+or
-+pa
-+pl
-+pt_BR
-+pt
-+ro
-+ru
-+rw
-+si
-+sk
-+sl
-+sq
-+sr@latin
-+sr
-+sv
-+ta
-+te
-+th
-+tr
-+uk
-+vi
-+zh_CN
-+zh_HK
-+zh_TW
-diff -up libgweather-2.91.0/po-locations/Makefile.in.in.gettext libgweather-2.91.0/po-locations/Makefile.in.in
---- libgweather-2.91.0/po-locations/Makefile.in.in.gettext 2011-01-30 13:51:19.618635028 -0500
-+++ libgweather-2.91.0/po-locations/Makefile.in.in 2011-01-30 13:51:19.618635028 -0500
-@@ -0,0 +1,217 @@
-+# Makefile for program source directory in GNU NLS utilities package.
-+# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
-+# Copyright (C) 2004-2008 Rodney Dawes <dobey.pwns@gmail.com>
-+#
-+# This file may be copied and used freely without restrictions. It may
-+# be used in projects which are not available under a GNU Public License,
-+# but which still want to provide support for the GNU gettext functionality.
-+#
-+# - Modified by Owen Taylor <otaylor@redhat.com> to use GETTEXT_PACKAGE
-+# instead of PACKAGE and to look for po2tbl in ./ not in intl/
-+#
-+# - Modified by jacob berkman <jacob@ximian.com> to install
-+# Makefile.in.in and po2tbl.sed.in for use with glib-gettextize
-+#
-+# - Modified by Rodney Dawes <dobey.pwns@gmail.com> for use with intltool
-+#
-+# We have the following line for use by intltoolize:
-+# INTLTOOL_MAKEFILE
-+
-+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@-locations
-+PACKAGE = @PACKAGE@
-+VERSION = @VERSION@
-+
-+SHELL = /bin/sh
-+
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+top_builddir = @top_builddir@
-+VPATH = @srcdir@
-+
-+prefix = @prefix@
-+exec_prefix = @exec_prefix@
-+datadir = @datadir@
-+datarootdir = @datarootdir@
-+libdir = @libdir@
-+DATADIRNAME = @DATADIRNAME@
-+itlocaledir = $(prefix)/$(DATADIRNAME)/locale
-+subdir = po-locations
-+install_sh = @install_sh@
-+# Automake >= 1.8 provides @mkdir_p@.
-+# Until it can be supposed, use the safe fallback:
-+mkdir_p = $(install_sh) -d
-+
-+INSTALL = @INSTALL@
-+INSTALL_DATA = @INSTALL_DATA@
-+
-+GMSGFMT = @GMSGFMT@
-+MSGFMT = @MSGFMT@
-+XGETTEXT = @XGETTEXT@
-+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-+MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
-+GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
-+
-+ALL_LINGUAS = @ALL_LINGUAS@
-+
-+PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi)
-+
-+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep ^$$lang$$`"; then printf "$$lang "; fi; done; fi)
-+
-+USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
-+
-+POFILES=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
-+
-+DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES)
-+EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS
-+
-+POTFILES = \
-+# This comment gets stripped out
-+
-+CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
-+
-+.SUFFIXES:
-+.SUFFIXES: .po .pox .gmo .mo .msg .cat
-+
-+.po.pox:
-+ $(MAKE) $(GETTEXT_PACKAGE).pot
-+ $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox
-+
-+.po.mo:
-+ $(MSGFMT) -o $@ $<
-+
-+.po.gmo:
-+ file=`echo $* | sed 's,.*/,,'`.gmo \
-+ && rm -f $$file && $(GMSGFMT) -o $$file $<
-+
-+.po.cat:
-+ sed -f ../intl/po2msg.sed < $< > $*.msg \
-+ && rm -f $@ && gencat $@ $*.msg
-+
-+
-+all: all-@USE_NLS@
-+
-+all-yes: $(CATALOGS)
-+all-no:
-+
-+$(GETTEXT_PACKAGE).pot: $(POTFILES)
-+ $(GENPOT)
-+
-+install: install-data
-+install-data: install-data-@USE_NLS@
-+install-data-no: all
-+install-data-yes: all
-+ linguas="$(USE_LINGUAS)"; \
-+ for lang in $$linguas; do \
-+ dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
-+ $(mkdir_p) $$dir; \
-+ if test -r $$lang.gmo; then \
-+ $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
-+ echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \
-+ else \
-+ $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
-+ echo "installing $(srcdir)/$$lang.gmo as" \
-+ "$$dir/$(GETTEXT_PACKAGE).mo"; \
-+ fi; \
-+ if test -r $$lang.gmo.m; then \
-+ $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \
-+ echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \
-+ else \
-+ if test -r $(srcdir)/$$lang.gmo.m ; then \
-+ $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \
-+ $$dir/$(GETTEXT_PACKAGE).mo.m; \
-+ echo "installing $(srcdir)/$$lang.gmo.m as" \
-+ "$$dir/$(GETTEXT_PACKAGE).mo.m"; \
-+ else \
-+ true; \
-+ fi; \
-+ fi; \
-+ done
-+
-+# Empty stubs to satisfy archaic automake needs
-+dvi info tags TAGS ID:
-+
-+# Define this as empty until I found a useful application.
-+install-exec installcheck:
-+
-+uninstall:
-+ linguas="$(USE_LINGUAS)"; \
-+ for lang in $$linguas; do \
-+ rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
-+ rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
-+ done
-+
-+check: all $(GETTEXT_PACKAGE).pot
-+ rm -f missing notexist
-+ srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m
-+ if [ -r missing -o -r notexist ]; then \
-+ exit 1; \
-+ fi
-+
-+mostlyclean:
-+ rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
-+ rm -f .intltool-merge-cache
-+
-+clean: mostlyclean
-+
-+distclean: clean
-+ rm -f Makefile Makefile.in POTFILES stamp-it
-+ rm -f *.mo *.msg *.cat *.cat.m *.gmo
-+
-+maintainer-clean: distclean
-+ @echo "This command is intended for maintainers to use;"
-+ @echo "it deletes files that may require special tools to rebuild."
-+ rm -f Makefile.in.in
-+
-+distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
-+dist distdir: $(DISTFILES)
-+ dists="$(DISTFILES)"; \
-+ extra_dists="$(EXTRA_DISTFILES)"; \
-+ for file in $$extra_dists; do \
-+ test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \
-+ done; \
-+ for file in $$dists; do \
-+ test -f $$file || file="$(srcdir)/$$file"; \
-+ ln $$file $(distdir) 2> /dev/null \
-+ || cp -p $$file $(distdir); \
-+ done
-+
-+update-po: Makefile
-+ $(MAKE) $(GETTEXT_PACKAGE).pot
-+ tmpdir=`pwd`; \
-+ linguas="$(USE_LINGUAS)"; \
-+ for lang in $$linguas; do \
-+ echo "$$lang:"; \
-+ result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \
-+ if $$result; then \
-+ if cmp $(srcdir)/$$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
-+ rm -f $$tmpdir/$$lang.new.po; \
-+ else \
-+ if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
-+ :; \
-+ else \
-+ echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
-+ rm -f $$tmpdir/$$lang.new.po; \
-+ exit 1; \
-+ fi; \
-+ fi; \
-+ else \
-+ echo "msgmerge for $$lang.gmo failed!"; \
-+ rm -f $$tmpdir/$$lang.new.po; \
-+ fi; \
-+ done
-+
-+Makefile POTFILES: stamp-it
-+ @if test ! -f $@; then \
-+ rm -f stamp-it; \
-+ $(MAKE) stamp-it; \
-+ fi
-+
-+stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in
-+ cd $(top_builddir) \
-+ && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \
-+ $(SHELL) ./config.status
-+
-+# Tell versions [3.59,3.63) of GNU make not to export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-diff -up libgweather-2.91.0/po-locations/POTFILES.in.gettext libgweather-2.91.0/po-locations/POTFILES.in
---- libgweather-2.91.0/po-locations/POTFILES.in.gettext 2011-01-30 13:51:19.618635028 -0500
-+++ libgweather-2.91.0/po-locations/POTFILES.in 2011-01-30 13:51:19.618635028 -0500
-@@ -0,0 +1,4 @@
-+# This list should contain *only* data/Locations.xml.in.
-+# Everything else should be in POTFILES.skip.
-+[encoding:UTF-8]
-+data/Locations.xml.in
diff --git a/testing/libgweather/libgweather.install b/testing/libgweather/libgweather.install
deleted file mode 100644
index 7062d4167..000000000
--- a/testing/libgweather/libgweather.install
+++ /dev/null
@@ -1,22 +0,0 @@
-pkgname=libgweather
-
-post_install() {
- usr/sbin/gconfpkg --install ${pkgname}
- gtk-update-icon-cache -q -t -f usr/share/icons/gnome
-}
-
-pre_upgrade() {
- pre_remove $1
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
- gtk-update-icon-cache -q -t -f usr/share/icons/gnome
-}
diff --git a/testing/libsoup/PKGBUILD b/testing/libsoup/PKGBUILD
deleted file mode 100644
index 7c2aa02ae..000000000
--- a/testing/libsoup/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 124678 2011-05-23 20:49:40Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=libsoup
-pkgname=('libsoup' 'libsoup-gnome')
-pkgver=2.34.2
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('LGPL')
-makedepends=('glib2' 'libxml2' 'sqlite3' 'libgnome-keyring' 'intltool' 'gobject-introspection' 'glib-networking')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.bz2)
-options=('!libtool' '!emptydirs')
-sha256sums=('1d70edc48c309528635012269733739f9cd22548913125864318a65d1b6f1261')
-
-build() {
- cd "${srcdir}/${pkgbase}-${pkgver}"
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-static
- make
-}
-
-package_libsoup() {
- pkgdesc="GNOME HTTP Library - base library"
- depends=('glib2' 'libxml2' 'glib-networking')
-
- cd "${srcdir}/${pkgbase}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-
- rm -f "${pkgdir}"/usr/lib/libsoup-gnome-2.4.*
- rm -f "${pkgdir}/usr/lib/pkgconfig/libsoup-gnome-2.4.pc"
- rm -rf "${pkgdir}/usr/include/libsoup-gnome-2.4"
- rm -f "${pkgdir}/usr/lib/girepository-1.0/SoupGNOME-2.4.typelib"
-}
-
-package_libsoup-gnome() {
- pkgdesc="GNOME HTTP Library - GNOME libraries"
- depends=("libsoup=${pkgver}" 'libgnome-keyring')
-
- cd "${srcdir}/${pkgbase}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-
- rm -f "${pkgdir}"/usr/lib/libsoup-2.4.*
- rm -f "${pkgdir}/usr/lib/pkgconfig/libsoup-2.4.pc"
- rm -rf "${pkgdir}/usr/include/libsoup-2.4"
- rm -rf "${pkgdir}/usr/share"
- rm -f "${pkgdir}/usr/lib/girepository-1.0/Soup-2.4.typelib"
-}
diff --git a/testing/libwnck3/PKGBUILD b/testing/libwnck3/PKGBUILD
deleted file mode 100644
index d37c740ec..000000000
--- a/testing/libwnck3/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 124742 2011-05-24 07:31:15Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-pkgname=libwnck3
-_pkgbasename=libwnck
-pkgver=3.0.2
-pkgrel=1
-pkgdesc="Window Navigator Construction Kit (GTK+3)"
-arch=('i686' 'x86_64')
-license=('LGPL')
-depends=('gtk3' 'startup-notification' 'libxres')
-makedepends=('intltool' 'gobject-introspection')
-options=('!libtool')
-url="http://www.gnome.org/"
-source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgbasename}/${pkgver%.*}/${_pkgbasename}-${pkgver}.tar.bz2)
-sha256sums=('4946b612c22d53238810d431f1b05c21f073f201edfd247ff74e2fa228618083')
-
-build() {
- cd "${srcdir}/${_pkgbasename}-${pkgver}"
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-static
- make
-}
-
-package() {
- cd "${srcdir}/${_pkgbasename}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/mutter/PKGBUILD b/testing/mutter/PKGBUILD
deleted file mode 100644
index 7f1a0f89a..000000000
--- a/testing/mutter/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 125321 2011-05-25 21:21:29Z ibiru $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-# Contributor: Michael Kanis <mkanis_at_gmx_dot_de>
-
-pkgname=mutter
-pkgver=3.0.2.1
-pkgrel=1
-pkgdesc="A window manager for GNOME3"
-arch=(i686 x86_64)
-license=('GPL')
-depends=('startup-notification' 'gconf' 'zenity' 'libcanberra' 'clutter' 'gobject-introspection')
-makedepends=('intltool' 'gnome-doc-utils')
-url="http://www.gnome.org"
-groups=('gnome')
-options=('!libtool' '!emptydirs')
-install=mutter.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('b122ffe170078af3edb9d4aa076c89eefd7a12a8aa57a1025227c1ab92912b3c')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --sysconfdir=/etc \
- --libexecdir=/usr/lib/mutter \
- --localstatedir=/var --disable-static
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
- install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
- gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain mutter ${pkgdir}/etc/gconf/schemas/*.schemas
- rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/mutter/mutter.install b/testing/mutter/mutter.install
deleted file mode 100644
index 199f12584..000000000
--- a/testing/mutter/mutter.install
+++ /dev/null
@@ -1,17 +0,0 @@
-pkgname=mutter
-
-post_install() {
- usr/sbin/gconfpkg --install ${pkgname}
-}
-
-pre_upgrade() {
- pre_remove $1
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- usr/sbin/gconfpkg --uninstall ${pkgname}
-}
diff --git a/testing/nautilus/PKGBUILD b/testing/nautilus/PKGBUILD
deleted file mode 100644
index 3f1c44be4..000000000
--- a/testing/nautilus/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 124892 2011-05-24 21:49:03Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=nautilus
-pkgver=3.0.2
-pkgrel=1
-pkgdesc="The GNOME shell and file manager"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('libexif' 'gnome-desktop' 'exempi' 'gtk3' 'hicolor-icon-theme' 'gvfs' 'desktop-file-utils' 'gsettings-desktop-schemas' 'shared-mime-info' 'gnome-icon-theme')
-makedepends=('intltool' 'gobject-introspection')
-replaces=('gnome-volume-manager')
-url="http://www.gnome.org"
-groups=('gnome')
-options=('!libtool' '!emptydirs')
-install=nautilus.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('6a4c6b75593f0e815763d0040878cd908da72318f18b05f33d24040e0d602b22')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-static \
- --libexecdir=/usr/lib/nautilus \
- --disable-nst-extension \
- --disable-update-mimedb \
- --disable-packagekit \
- --disable-schemas-compile
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/nautilus/nautilus.install b/testing/nautilus/nautilus.install
deleted file mode 100644
index 631e38649..000000000
--- a/testing/nautilus/nautilus.install
+++ /dev/null
@@ -1,20 +0,0 @@
-post_install() {
- usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
- update-desktop-database -q
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
- update-mime-database usr/share/mime > /dev/null
-}
-
-pre_upgrade() {
- if (( $(vercmp $2 2.90.0) < 0 )); then
- usr/sbin/gconfpkg --uninstall nautilus
- fi
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/testing/sqlite3/PKGBUILD b/testing/sqlite3/PKGBUILD
deleted file mode 100644
index 63be526f7..000000000
--- a/testing/sqlite3/PKGBUILD
+++ /dev/null
@@ -1,75 +0,0 @@
-# $Id: PKGBUILD 124333 2011-05-19 19:31:27Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgbase="sqlite3"
-pkgname=('sqlite3' 'sqlite3-tcl' 'sqlite3-doc')
-_amalgamationver=3070603
-_amalgamationver2=${_amalgamationver/00/}
-_docver=3070600
-pkgver=${_amalgamationver2//0/.}
-pkgrel=1
-pkgdesc="A C library that implements an SQL database engine"
-arch=('i686' 'x86_64')
-license=('custom')
-url="http://www.sqlite.org/"
-makedepends=('tcl' 'readline>=6.0.00')
-source=( # tarball containing the amalgamation for SQLite 3.7.5 together with a configure script and makefile for building it; includes now also the Tcl Extension Architecture (TEA)
- http://www.sqlite.org/sqlite-autoconf-$_amalgamationver.tar.gz
- #http://www.sqlite.org/sqlite-doc-${_amalgamationver}.zip
- http://www.sqlite.org/sqlite-doc-${_docver}.zip
- license.txt)
-options=('!libtool' '!emptydirs')
-md5sums=('7eb41eea5ffa5cbe359a48629084c425'
- '1c9b9da6f98f1da2d8958254662c393c'
- 'c1cdbc5544034d9012e421e75a5e4890')
-
-build() {
- export CFLAGS="$CFLAGS -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE"
-
- # build sqlite
- cd "$srcdir"/sqlite-autoconf-$_amalgamationver
- ./configure --prefix=/usr \
- --disable-static
- make
-
- # build the tcl extension
- cd "$srcdir"/sqlite-autoconf-$_amalgamationver/tea
- ./configure --prefix=/usr \
- --with-system-sqlite
- make
-
-}
-
-package_sqlite3() {
-
- pkgdesc="A C library that implements an SQL database engine"
- depends=('readline>=6.0.00')
- conflicts=('sqlite')
- replaces=('sqlite')
-
- cd ${srcdir}/sqlite-autoconf-$_amalgamationver
- make DESTDIR=${pkgdir} install
-
- # license
- install -D -m644 ${srcdir}/license.txt ${pkgdir}/usr/share/licenses/${pkgname}/license.txt
-}
-
-package_sqlite3-tcl() {
-
- pkgdesc="sqlite3 Tcl Extension Architecture (TEA)"
- depends=('sqlite3>=3.7.5')
-
- cd ${srcdir}/sqlite-autoconf-$_amalgamationver/tea
- make DESTDIR=${pkgdir} install
-}
-
-package_sqlite3-doc() {
- pkgdesc="most of the static HTML files that comprise this website, including all of the SQL Syntax and the C/C++ interface specs and other miscellaneous documentation"
- #arch=('any') - not yet supported
-
- #cd ${srcdir}/sqlite-doc-${_amalgamationver}
- cd ${srcdir}/sqlite-doc-${_docver}
- mkdir -p ${pkgdir}/usr/share/doc/${pkgbase}
- cp -R * ${pkgdir}/usr/share/doc/${pkgbase}/
-}
diff --git a/testing/sqlite3/license.txt b/testing/sqlite3/license.txt
deleted file mode 100644
index 118c5d5e6..000000000
--- a/testing/sqlite3/license.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-SQLite Copyright
-SQLite is in the
-Public Domain
-
-
-All of the deliverable code in SQLite has been dedicated to the public domain by the authors. All code authors, and representatives of the companies they work for, have signed affidavits dedicating their contributions to the public domain and originals of those signed affidavits are stored in a firesafe at the main offices of Hwaci. Anyone is free to copy, modify, publish, use, compile, sell, or distribute the original SQLite code, either in source code form or as a compiled binary, for any purpose, commercial or non-commercial, and by any means.
-
-The previous paragraph applies to the deliverable code in SQLite - those parts of the SQLite library that you actually bundle and ship with a larger application. Portions of the documentation and some code used as part of the build process might fall under other licenses. The details here are unclear. We do not worry about the licensing of the documentation and build code so much because none of these things are part of the core deliverable SQLite library.
-
-All of the deliverable code in SQLite has been written from scratch. No code has been taken from other projects or from the open internet. Every line of code can be traced back to its original author, and all of those authors have public domain dedications on file. So the SQLite code base is clean and is uncontaminated with licensed code from other projects.
-Obtaining An Explicit License To Use SQLite
-
-Even though SQLite is in the public domain and does not require a license, some users want to obtain a license anyway. Some reasons for obtaining a license include:
-You are using SQLite in a jurisdiction that does not recognize the public domain.
-You are using SQLite in a jurisdiction that does not recognize the right of an author to dedicate their work to the public domain.
-You want to hold a tangible legal document as evidence that you have the legal right to use and distribute SQLite.
-Your legal department tells you that you have to purchase a license.
-
-If you feel like you really have to purchase a license for SQLite, Hwaci, the company that employs the architect and principal developers of SQLite, will sell you one.
-Contributed Code
-
-In order to keep SQLite completely free and unencumbered by copyright, all new contributors to the SQLite code base are asked to dedicate their contributions to the public domain. If you want to send a patch or enhancement for possible inclusion in the SQLite source tree, please accompany the patch with the following statement:
-The author or authors of this code dedicate any and all copyright interest in this code to the public domain. We make this dedication for the benefit of the public at large and to the detriment of our heirs and successors. We intend this dedication to be an overt act of relinquishment in perpetuity of all present and future rights to this code under copyright law.
-
-We are not able to accept patches or changes to SQLite that are not accompanied by a statement such as the above. In addition, if you make changes or enhancements as an employee, then a simple statement such as the above is insufficient. You must also send by surface mail a copyright release signed by a company officer. A signed original of the copyright release should be mailed to:
-Hwaci
-6200 Maple Cove Lane
-Charlotte, NC 28269
-USA
-
-A template copyright release is available in PDF or HTML. You can use this release to make future changes.
-
-see http://www.sqlite.org/copyright.html \ No newline at end of file
diff --git a/testing/upower/PKGBUILD b/testing/upower/PKGBUILD
deleted file mode 100644
index 4f45a4e78..000000000
--- a/testing/upower/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 124973 2011-05-25 14:17:57Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=upower
-pkgver=0.9.11
-pkgrel=1
-pkgdesc="Abstraction for enumerating power devices, listening to device events and querying history and statistics"
-arch=('i686' 'x86_64')
-url="http://upower.freedesktop.org"
-license=('GPL')
-depends=('udev' 'libusb' 'polkit' 'pm-utils' 'dbus-glib')
-makedepends=('pkg-config' 'intltool' 'docbook-xsl' 'gobject-introspection')
-replaces=('devicekit-power')
-options=('!libtool')
-source=($url/releases/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('567358cc1b4887485d29e309897dd091c2c2ae95e48dfbb3279ffdc44a4b2956')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
- --libexecdir=/usr/lib/upower --disable-static
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/xz/PKGBUILD b/testing/xz/PKGBUILD
deleted file mode 100644
index e2c47b128..000000000
--- a/testing/xz/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 124452 2011-05-21 17:48:29Z pierre $
-# Maintainer: Pierre Schmitz <pierre@archlinux.de>
-# Contributor: François Charette <firmicus@gmx.net>
-
-pkgname=xz
-pkgver=5.0.3
-pkgrel=1
-pkgdesc='Library and command line tools for XZ and LZMA compressed files'
-arch=('i686' 'x86_64')
-url='http://tukaani.org/xz/'
-license=('GPL' 'LGPL' 'custom')
-depends=('sh')
-provides=('lzma' 'lzma-utils' 'xz-utils')
-replaces=('lzma' 'lzma-utils' 'xz-utils')
-conflicts=('lzma' 'lzma-utils' 'xz-utils')
-options=('!libtool')
-source=("http://tukaani.org/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('fefe52f9ecd521de2a8ce38c21a27574')
-
-# keep an upgrade path for older installations
-PKGEXT='.pkg.tar.gz'
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
-
- ./configure --prefix=/usr \
- --disable-rpath \
- --enable-werror
- make
-}
-
-check() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make check
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
- install -d -m755 ${pkgdir}/usr/share/licenses/xz/
- ln -sf /usr/share/doc/xz/COPYING ${pkgdir}/usr/share/licenses/xz/
- ln -sf /usr/share/licenses/common/GPL2/license.txt ${pkgdir}/usr/share/doc/xz/COPYING.GPLv2
-}