summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
Diffstat (limited to 'extra')
-rw-r--r--extra/bdf-unifont/LICENSE60
-rw-r--r--extra/bdf-unifont/PKGBUILD24
-rw-r--r--extra/bdf-unifont/unifont.install15
-rw-r--r--extra/compface/compface-1.4-errno.patch.bz2bin373 -> 0 bytes
-rw-r--r--extra/convmv/PKGBUILD20
-rw-r--r--extra/cowsay/ChangeLog7
-rw-r--r--extra/cowsay/PKGBUILD22
-rw-r--r--extra/cowsay/cowsay.patch11
-rw-r--r--extra/curl/PKGBUILD53
-rw-r--r--extra/curl/curlbuild.h9
-rw-r--r--extra/dbus-qt3/PKGBUILD32
-rw-r--r--extra/dbus-qt3/dbus-qt3-compile-fix-thoenig-01.patch85
-rw-r--r--extra/dbus-qt3/dbus-qt3-do-not-close-shared-connection-thoenig-01.patch12
-rw-r--r--extra/dvd+rw-tools/buildpatch-7.0-3-20080108-karolina.patch22
-rw-r--r--extra/emovix/PKGBUILD23
-rw-r--r--extra/foobillard/03_bugfixes36
-rw-r--r--extra/foobillard/05_foul_explanation262
-rw-r--r--extra/foobillard/06_show_ball_to_hit255
-rw-r--r--extra/foobillard/ChangeLog16
-rw-r--r--extra/foobillard/PKGBUILD46
-rw-r--r--extra/foobillard/foobillard.desktop9
-rw-r--r--extra/foobillard/foobillard.pngbin4288 -> 0 bytes
-rw-r--r--extra/foobillard/snooker_draw.patch48
-rw-r--r--extra/foobillard/snooker_reset.patch11
-rw-r--r--extra/fribidi/ChangeLog5
-rw-r--r--extra/gd/ChangeLog11
-rw-r--r--extra/glhack/ChangeLog12
-rw-r--r--extra/gnome-spell/PKGBUILD30
-rw-r--r--extra/gnome-spell/gnome-spell-enchant.diff551
-rw-r--r--extra/grip/grip.install33
-rw-r--r--extra/kdeplasma-addons/kdeobservatory-qwt6.patch12
-rw-r--r--extra/ladspa/ladspa-sdk-1.12-gcc4.patch18
-rw-r--r--extra/lesstif/ChangeLog19
-rw-r--r--extra/libssh2/PKGBUILD33
-rw-r--r--extra/mkbootcd/PKGBUILD26
-rw-r--r--extra/mkbootcd/boot.msg14
-rwxr-xr-xextra/mkbootcd/mkbootcd143
-rw-r--r--extra/mkbootcd/mkbootcd.conf38
-rw-r--r--extra/mkbootcd/options.msg6
-rw-r--r--extra/mozilla-common/PKGBUILD20
-rwxr-xr-xextra/mozilla-common/mozilla-common.csh1
-rw-r--r--extra/mozilla-common/mozilla-common.install4
-rwxr-xr-xextra/mozilla-common/mozilla-common.sh1
-rw-r--r--extra/ndesk-dbus-glib/PKGBUILD26
-rw-r--r--extra/openjpeg/30_fix_build_for_debian.dpatch70
-rw-r--r--extra/smpeg/ChangeLog6
-rw-r--r--extra/x11vnc/x11vnc.conf5
-rw-r--r--extra/x11vnc/x11vnc.rc37
-rw-r--r--extra/xaos/ChangeLog24
-rw-r--r--extra/xfce4-session/gdm.patch21
-rw-r--r--extra/xfdesktop/fix-desktop-drag-and-drop.patch57
-rw-r--r--extra/xfwm4-themes/PKGBUILD24
-rw-r--r--extra/xorg-server/randr-compare-all-the-bytes-in-rrpostpendingproperties.patch36
53 files changed, 0 insertions, 2361 deletions
diff --git a/extra/bdf-unifont/LICENSE b/extra/bdf-unifont/LICENSE
deleted file mode 100644
index 066ea1699..000000000
--- a/extra/bdf-unifont/LICENSE
+++ /dev/null
@@ -1,60 +0,0 @@
-CENSE
--------
-Roman Czyborra released his work (Perl scripts and font .hex files)
-under the following terms:
-
- All of my works you find here are freeware. You may
- freely copy, use, quote, modify or redistribute them
- as long as you properly attribute my contribution and
- have given a quick thought about whether Roman might
- perhaps be interested to read what you did with his
- stuff. Horizontal rules don't apply.
-
-David Starner released what in this package is named "hex2bdf-split"
-under the same license as Roman Czyborra's work.
-
-License for all of Paul Hardy's work (except "johab2ucs2" and
-"blanks.hex", mentioned separately), Makefile and debian/ mods
-by Anthony Fok, and modified software from Luis Gonzalez Miranda
-(with permission granted to Paul Hardy):
-
- These are released under the terms of the GNU General Public
- License version 2, or (at your option) a later version.
-
-License for Fonts:
-
- Any fonts using glyphs from the "wqy-cjk.hex" file (including
- the default TrueType font) are bound by the terms of the Wen
- Quan Yi font license. Those fonts are released under the terms
- of the GNU General Public License (GPL) versionn 2, with the
- exception that embedding the font in a document does not by
- itself bind that document to the terms of the GNU GPL.
-
- Any fonts that do not use glyphs from the "wqy-cjk.hex" file
- fall under the above "License for all of Roman Czyborra's work".
-
- The fonts in "./font/precompiled" do use wqy-cjk.hex, and so
- are licensed under the GNU GPL version 2, with the exception
- that embedding the font in a document does not in itself bind
- that document to the terms of the GNU GPL. The following
- paragraphs explaining the exception is taken from the Wen
- Quan Yi font distribution:
-
- ** GPL v2.0 license with font embedding exception:
-
- As a special exception, if you create a document which
- uses this font, and embed this font or unaltered portions
- of this font into the document, this font does not by
- itself cause the resulting document to be covered by
- the GNU General Public License. This exception does not
- however invalidate any other reasons why the document
- might be covered by the GNU General Public License.
- If you modify this font, you may extend this exception
- to your version of the font, but you are not obligated
- to do so. If you do not wish to do so, delete this
- exception statement from your version.
-
-License for "blanks.hex":
-
- There is one exception to the above rules: Paul Hardy earlier
- released the "blanks.hex" file into the public domain.
diff --git a/extra/bdf-unifont/PKGBUILD b/extra/bdf-unifont/PKGBUILD
deleted file mode 100644
index 2df7993e6..000000000
--- a/extra/bdf-unifont/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# $Id: PKGBUILD,v 1.5 2008/09/24 07:16:54 ronald Exp $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-
-pkgname=bdf-unifont
-pkgver=5.1.20080820
-pkgrel=1
-pkgdesc="GNU Unifont Glyphs"
-arch=('i686' 'x86_64')
-license=('custom' 'GPL2')
-url="http://unifoundry.com/unifont.html"
-depends=('fontconfig' 'xorg-fonts-encodings' 'xorg-font-utils')
-install=unifont.install
-source=('http://unifoundry.com/unifont-5.1.20080820.bdf.gz' 'LICENSE')
-md5sums=('6b8263ceccef33bd633aa019d74b7943'
- '64da5a96d6789d29d485cd67a43bc547')
-
-build() {
- install -Dm644 ${srcdir}/unifont-5.1.20080820.bdf \
- ${pkgdir}/usr/share/fonts/misc/unifont.bdf
-
- # install LICENSE file
- install -Dm644 ${srcdir}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}
-
diff --git a/extra/bdf-unifont/unifont.install b/extra/bdf-unifont/unifont.install
deleted file mode 100644
index 7d21ab51b..000000000
--- a/extra/bdf-unifont/unifont.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
- echo -n "Updating font cache... "
- fc-cache -f > /dev/null
- mkfontscale /usr/share/fonts/misc
- mkfontdir /usr/share/fonts/misc
- echo "done."
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- post_install $1
-}
diff --git a/extra/compface/compface-1.4-errno.patch.bz2 b/extra/compface/compface-1.4-errno.patch.bz2
deleted file mode 100644
index bfc47425d..000000000
--- a/extra/compface/compface-1.4-errno.patch.bz2
+++ /dev/null
Binary files differ
diff --git a/extra/convmv/PKGBUILD b/extra/convmv/PKGBUILD
deleted file mode 100644
index 4601b7cf3..000000000
--- a/extra/convmv/PKGBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-# $Id: PKGBUILD 26708 2009-02-11 17:18:18Z tpowa $
-# Maintainer : Aaron Griffin <aaron@archlinux.org>
-
-pkgname=convmv
-pkgver=1.14
-pkgrel=1
-pkgdesc="Tool for converting encodings on filesystems"
-license=('GPL2')
-arch=(i686 x86_64)
-url="http://j3e.de/linux/convmv/"
-depends=('perl')
-source=(http://j3e.de/linux/convmv/$pkgname-$pkgver.tar.gz)
-
-build()
-{
- cd $startdir/src/$pkgname-$pkgver
- make
- make PREFIX=$startdir/pkg/usr install || return 1
-}
-md5sums=('d41238051c13b2e6c0cc2310a8f69d68')
diff --git a/extra/cowsay/ChangeLog b/extra/cowsay/ChangeLog
deleted file mode 100644
index ca646a273..000000000
--- a/extra/cowsay/ChangeLog
+++ /dev/null
@@ -1,7 +0,0 @@
-2008-12-08 Eric Belanger <eric@archlinux.org>
-
- * cowsay 3.03-6
- * Added license
- * FHS man pages
- * Added arch tag
- * Added ChangeLog
diff --git a/extra/cowsay/PKGBUILD b/extra/cowsay/PKGBUILD
deleted file mode 100644
index 7f71b15e7..000000000
--- a/extra/cowsay/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# $Id: PKGBUILD 21051 2008-12-09 04:32:04Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
-
-pkgname=cowsay
-pkgver=3.03
-pkgrel=6
-pkgdesc="Add speaking and thinking cows (and a few other creatures) to anything"
-arch=('i686' 'x86_64')
-url="http://www.nog.net/~tony/warez/cowsay.shtml"
-license=('PerlArtistic' 'GPL')
-depends=('perl')
-source=(http://www.nog.net/~tony/warez/${pkgname}-${pkgver}.tar.gz cowsay.patch)
-md5sums=('b29169797359420dadb998079021a494' '7091f9a6d97006299a1f27a665b638b6')
-sha1sums=('cc65a9b13295c87df94a58caa8a9176ce5ec4a27' '0da25fd2f80de4d92096c5d1ece2c6dcc05bea75')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- patch -p1 < ../cowsay.patch
- sed -i 's|/man/|/share/man/|' install.sh
- echo "${pkgdir}/usr" | ./install.sh
-}
diff --git a/extra/cowsay/cowsay.patch b/extra/cowsay/cowsay.patch
deleted file mode 100644
index 299d52895..000000000
--- a/extra/cowsay/cowsay.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cowsay-3.03/install.sh 1999-11-01 21:19:21.000000000 +0100
-+++ cowsay-3.03-new/install.sh 2003-08-15 17:14:23.000000000 +0200
-@@ -67,7 +67,7 @@
- echo Okay, time to install this puppy.
-
- echo s,%BANGPERL%,!$usethisperl,\; > install.pl
--echo s,%PREFIX%,$PREFIX,\; >> install.pl
-+echo s,%PREFIX%,/usr,\; >> install.pl
- set -x
- mkdir -p $PREFIX/bin || (mkdir $PREFIX; mkdir $PREFIX/bin)
- $usethisperl -p install.pl cowsay > $PREFIX/bin/cowsay
diff --git a/extra/curl/PKGBUILD b/extra/curl/PKGBUILD
deleted file mode 100644
index 07712c045..000000000
--- a/extra/curl/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# $Id: PKGBUILD 128353 2011-06-23 12:54:15Z dreisner $
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-# Contributor: 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.7
-pkgrel=1
-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=('5f6d50c4d4ee38c57fe37e3cff75adbd'
- '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 -m644 "$srcdir/curlbuild.h" "$pkgdir/usr/include/curl/curlbuild.h"
-}
diff --git a/extra/curl/curlbuild.h b/extra/curl/curlbuild.h
deleted file mode 100644
index b48862696..000000000
--- a/extra/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/extra/dbus-qt3/PKGBUILD b/extra/dbus-qt3/PKGBUILD
deleted file mode 100644
index c14237077..000000000
--- a/extra/dbus-qt3/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 49853 2009-08-16 18:53:06Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=dbus-qt3
-pkgver=0.62
-pkgrel=4
-pkgdesc="QT3 bindings for DBUS"
-arch=(i686 x86_64)
-license=('GPL')
-url="http://www.freedesktop.org/software/dbus"
-depends=('qt3' 'dbus-core>=1.2.14')
-makedepends=('pkgconfig')
-options=('!libtool')
-source=(ftp://ftp.archlinux.org/other/dbus/dbus-qt3_0.62.git.20060814.orig.tar.gz
- dbus-qt3-compile-fix-thoenig-01.patch
- dbus-qt3-do-not-close-shared-connection-thoenig-01.patch)
-md5sums=('bdc61add46f64238fdc68a15e5f7269c'
- '6c7a45865568340ee601d31e184653c1'
- '9252c03a00d751201e53839d6a8ef78f')
-
-build() {
- . /etc/profile.d/qt3.sh
- cd "${srcdir}/${pkgname}-${pkgver}/qt3"
- patch -Np1 -i "${srcdir}/dbus-qt3-compile-fix-thoenig-01.patch" || return 1
- patch -Np1 -i "${srcdir}/dbus-qt3-do-not-close-shared-connection-thoenig-01.patch" || return 1
- cd ..
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var || return 1
- sed -e "s|DBUS_QT3_LIBS =|DBUS_QT3_LIBS = -L${QTDIR}/lib -lqt-mt|" \
- -i Makefile qt3/Makefile || return 1
- make || return 1
- make DESTDIR="${pkgdir}" install || return 1
-}
diff --git a/extra/dbus-qt3/dbus-qt3-compile-fix-thoenig-01.patch b/extra/dbus-qt3/dbus-qt3-compile-fix-thoenig-01.patch
deleted file mode 100644
index 00b8b6026..000000000
--- a/extra/dbus-qt3/dbus-qt3-compile-fix-thoenig-01.patch
+++ /dev/null
@@ -1,85 +0,0 @@
---- dbus-qt3/connection.cpp 2005-04-18 05:19:17.000000000 -0600
-+++ dbus-qt3/connection.cpp 2005-04-19 14:35:07.000000000 -0600
-@@ -154,6 +154,7 @@
-
- void* Connection::virtual_hook( int, void* )
- {
-+ return (void *)NULL;
- }
-
- void Connection::dbus_connection_setup_with_qt_main (DBusConnection *connection)
---- dbus-qt3/message.cpp 2005-04-18 05:19:17.000000000 -0600
-+++ dbus-qt3/message.cpp 2005-04-19 14:55:32.000000000 -0600
-@@ -359,6 +359,7 @@
- Message Message::operator=( const Message& other )
- {
- //FIXME: ref the other.d->msg instead of copying it?
-+ return (Message &)(d->msg);
- }
- /**
- * Destructs message.
-@@ -508,42 +509,49 @@
- const dbus_bool_t right_size_bool = b;
- dbus_message_append_args( d->msg, DBUS_TYPE_BOOLEAN, &right_size_bool,
- DBUS_TYPE_INVALID );
-+ return (Message &)(d->msg);
- }
-
- Message& Message::operator<<( Q_INT8 byte )
- {
- dbus_message_append_args( d->msg, DBUS_TYPE_BYTE, &byte,
- DBUS_TYPE_INVALID );
-+ return (Message &)(d->msg);
- }
-
- Message& Message::operator<<( Q_INT32 num )
- {
- dbus_message_append_args( d->msg, DBUS_TYPE_INT32, &num,
- DBUS_TYPE_INVALID );
-+ return (Message &)(d->msg);
- }
-
- Message& Message::operator<<( Q_UINT32 num )
- {
- dbus_message_append_args( d->msg, DBUS_TYPE_UINT32, &num,
- DBUS_TYPE_INVALID );
-+ return (Message &)(d->msg);
- }
-
- Message& Message::operator<<( Q_INT64 num )
- {
- dbus_message_append_args( d->msg, DBUS_TYPE_INT64, &num,
- DBUS_TYPE_INVALID );
-+ return (Message &)(d->msg);
- }
-
- Message& Message::operator<<( Q_UINT64 num )
- {
- dbus_message_append_args( d->msg, DBUS_TYPE_UINT64, &num,
- DBUS_TYPE_INVALID );
-+ return (Message &)(d->msg);
- }
-
- Message& Message::operator<<( double num )
- {
- dbus_message_append_args( d->msg, DBUS_TYPE_DOUBLE, &num,
- DBUS_TYPE_INVALID );
-+ return (Message &)(d->msg);
- }
-
- Message& Message::operator<<( const QString& str )
-@@ -551,11 +559,13 @@
- const char *u = str.utf8();
- dbus_message_append_args( d->msg, DBUS_TYPE_STRING, &u,
- DBUS_TYPE_INVALID );
-+ return (Message &)(d->msg);
- }
-
- Message& Message::operator<<( const QVariant& custom )
- {
- //FIXME: imeplement
-+ return (Message &)(d->msg);
- }
-
- }
-
diff --git a/extra/dbus-qt3/dbus-qt3-do-not-close-shared-connection-thoenig-01.patch b/extra/dbus-qt3/dbus-qt3-do-not-close-shared-connection-thoenig-01.patch
deleted file mode 100644
index c159c0a90..000000000
--- a/extra/dbus-qt3/dbus-qt3-do-not-close-shared-connection-thoenig-01.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- dbus-qt3/connection.cpp 2006-10-20 16:33:29.000000000 +0200
-+++ dbus-qt3/connection.cpp 2006-10-20 16:33:10.000000000 +0200
-@@ -106,7 +106,7 @@
-
- void Connection::close()
- {
-- dbus_connection_close( d->connection );
-+ dbus_connection_unref ( d->connection );
- }
-
- void Connection::flush()
-
diff --git a/extra/dvd+rw-tools/buildpatch-7.0-3-20080108-karolina.patch b/extra/dvd+rw-tools/buildpatch-7.0-3-20080108-karolina.patch
deleted file mode 100644
index 0b7951f1b..000000000
--- a/extra/dvd+rw-tools/buildpatch-7.0-3-20080108-karolina.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naur dvd+rw-tools-7.0/growisofs.c dvd+rw-tools-7.0_new/growisofs.c
---- dvd+rw-tools-7.0/growisofs.c 2006-09-24 19:28:53.000000000 +0200
-+++ dvd+rw-tools-7.0_new/growisofs.c 2008-01-08 00:56:57.000000000 +0100
-@@ -418,6 +418,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <assert.h>
-+#include <limits.h>
- #include "mp.h"
-
- #if defined(__unix) || defined(__unix__)
-diff -Naur dvd+rw-tools-7.0/transport.hxx dvd+rw-tools-7.0_new/transport.hxx
---- dvd+rw-tools-7.0/transport.hxx 2006-09-23 13:29:07.000000000 +0200
-+++ dvd+rw-tools-7.0_new/transport.hxx 2008-01-08 00:57:36.000000000 +0100
-@@ -137,6 +137,7 @@
- #include <sys/wait.h>
- #include <sys/utsname.h>
- #include <scsi/sg.h>
-+#include <limits.h>
- #if !defined(SG_FLAG_LUN_INHIBIT)
- # if defined(SG_FLAG_UNUSED_LUN_INHIBIT)
- # define SG_FLAG_LUN_INHIBIT SG_FLAG_UNUSED_LUN_INHIBIT
diff --git a/extra/emovix/PKGBUILD b/extra/emovix/PKGBUILD
deleted file mode 100644
index f18c36675..000000000
--- a/extra/emovix/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id: PKGBUILD 37013 2009-04-29 22:54:35Z eric $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=emovix
-pkgver=0.9.0
-pkgrel=4
-pkgdesc="Create Movix-CD's (also emovix plugin for k3b)"
-arch=(i686 x86_64)
-url="http://movix.sourceforge.net/"
-license=('GPL2')
-depends=('perl' 'cdrtools')
-options=('!makeflags')
-source=(http://downloads.sourceforge.net/sourceforge/movix/$pkgname-$pkgver.tar.gz)
-md5sums=('a96492f338824b24c5a9e714c57eddcf')
-
-build() {
- cd $srcdir/$pkgname-$pkgver
- ./configure --prefix=/usr || return 1
- make || return 1
- make DESTDIR=$pkgdir install || return 1
- find $pkgdir/usr/share/emovix -type d -exec chmod 755 {} \; || return 1
-}
-
diff --git a/extra/foobillard/03_bugfixes b/extra/foobillard/03_bugfixes
deleted file mode 100644
index 99f282b10..000000000
--- a/extra/foobillard/03_bugfixes
+++ /dev/null
@@ -1,36 +0,0 @@
-Index: foobillard-3.0a/src/ball.c
-===================================================================
---- foobillard-3.0a.orig/src/ball.c 2006-10-12 16:42:39.000000000 +0200
-+++ foobillard-3.0a/src/ball.c 2006-10-12 16:42:48.000000000 +0200
-@@ -1821,6 +1821,7 @@
- } else if( options_cuberef && cuberef_binds!=0 ){
- glBindTexture(GL_TEXTURE_CUBE_MAP_ARB, cuberef_binds[i]);
- #ifdef GL_VERTEX_PROGRAM_NV
-+#ifdef USE_BALL_FRESNEL
- {
- myvec cam_pos2;
- // cam_pos2=vec_scale(vec_unit(vec_diff(cam_pos,balls.ball[i].r)),BALL_D/2.5);
-@@ -1829,6 +1830,7 @@
- BALL_D/2.0,BALL_D/2.5,0,0 );
- }
- #endif
-+#endif
- draw_ball(&balls.ball[i],cam_pos,cam_FOV,win_width,0);
- }else{
- draw_ball(&balls.ball[i],cam_pos,cam_FOV,win_width,0);
-Index: foobillard-3.0a/src/evaluate_move.c
-===================================================================
---- foobillard-3.0a.orig/src/evaluate_move.c 2006-10-12 16:42:43.000000000 +0200
-+++ foobillard-3.0a/src/evaluate_move.c 2006-10-12 16:42:48.000000000 +0200
-@@ -385,6 +385,11 @@
- int ball_out;
- int other_player=(act_player==1)?0:1;
- int b1hit = BM_get_1st_ball_hit(); if (b1hit>=8) b1hit=1;
-+ if(st.to_play==SN_DONE)
-+ {
-+ BM_reset_move_info();
-+ return;
-+ }
-
- if( player[act_player].place_cue_ball ) player[act_player].place_cue_ball=0;
- printf("EVAL start\n");
diff --git a/extra/foobillard/05_foul_explanation b/extra/foobillard/05_foul_explanation
deleted file mode 100644
index af89c5e95..000000000
--- a/extra/foobillard/05_foul_explanation
+++ /dev/null
@@ -1,262 +0,0 @@
-Index: foobillard-3.0a/src/billard3d.c
-===================================================================
---- foobillard-3.0a.orig/src/billard3d.c 2006-10-12 16:44:17.000000000 +0200
-+++ foobillard-3.0a/src/billard3d.c 2006-10-12 16:44:31.000000000 +0200
-@@ -331,6 +331,8 @@
- static textObj * winner_name_text_obj;
- static textObj * winner_text_obj;
-
-+textObj * last_fault_text;
-+
- #ifndef _WIN32
-
- enum optionType
-@@ -3322,6 +3324,13 @@
- if( player[act_player].text != 0 ){
- textObj_draw( player[act_player].text );
- }
-+ /* last fault */
-+ if (strcmp("x", last_fault_text->str)!=0) {
-+ glTranslatef(0.0, 70.0, 0.0);
-+ textObj_draw(last_fault_text);
-+ glTranslatef(0.0,-70.0,0.0);
-+ }
-+
- glTranslatef(0,30,0);
- if (gametype==GAME_8BALL){
- switch(player[act_player].half_full){
-@@ -5197,6 +5206,9 @@
- }
- DPRINTF("created winner text obj's\n");
-
-+
-+ last_fault_text = textObj_new( "x", options_help_fontname, 20 );
-+
- init_menu();
-
- sys_set_timer(frametime_ms, Idle_timer); /* assure a framerate of max 50 fps (1frame/20ms) */
-Index: foobillard-3.0a/src/evaluate_move.c
-===================================================================
---- foobillard-3.0a.orig/src/evaluate_move.c 2006-10-12 16:44:22.000000000 +0200
-+++ foobillard-3.0a/src/evaluate_move.c 2006-10-12 16:44:31.000000000 +0200
-@@ -4,6 +4,9 @@
- ** Copyright (C) 2001 Florian Berger
- ** Email: harpin_floh@yahoo.de, florian.berger@jk.uni-linz.ac.at
- **
-+** Small changes to output a reason why the last shot was a fault by
-+** Thorsten Gunkel <tgunkel-lists@tgunkel.de>
-+**
- ** This program is free software; you can redistribute it and/or modify
- ** it under the terms of the GNU General Public License Version 2 as
- ** published by the Free Software Foundation;
-@@ -108,11 +111,12 @@
-
- /* wenn fremde kugel zuerst angespielt -> foul */
- first_ball_hit=BM_get_1st_ball_hit();
-- if( player[act_player].half_full == BALL_FULL ){
-- if ( first_ball_hit>8 && first_ball_hit<16 ) foul=1;
-- }
-- if( player[act_player].half_full == BALL_HALF ){
-- if ( first_ball_hit>0 && first_ball_hit<8 ) foul=1;
-+ if(
-+ ( player[act_player].half_full == BALL_FULL && first_ball_hit>8 && first_ball_hit<16 ) ||
-+ ( player[act_player].half_full == BALL_HALF && first_ball_hit>0 && first_ball_hit<8 )
-+ ){
-+ foul=1;
-+ textObj_setText(last_fault_text, "First ball hit was not one of yours");
- }
-
- /* erst an 2. stelle, da oben kein foul bei break */
-@@ -146,7 +150,10 @@
- }
- }
- }
-- if(eigene_da) foul=1;
-+ if(eigene_da){
-+ foul=1;
-+ textObj_setText(last_fault_text, "You hit the 8-Ball too soon");
-+ }
- }
-
- /* wenn angespielte kugel im strafraum */
-@@ -154,6 +161,7 @@
- in_strafraum(BM_get_1st_ball_hit_pos()) &&
- !BM_get_non_strafraum_wall_hit_before_1st_ball(in_strafraum) ){
- foul=1;
-+ textObj_setText(last_fault_text, "You hit a ball not behind the head string");
- }
-
- /* wenn eigene rein naechster */
-@@ -169,7 +177,10 @@
- }
-
-
-- if( BM_get_balls_hit()==0 ) foul=1;
-+ if( BM_get_balls_hit()==0 ){
-+ foul=1;
-+ textObj_setText(last_fault_text, "No Ball hit");
-+ }
-
- /* wenn weisse rein */
- if( BM_get_white_out() ){
-@@ -177,6 +188,7 @@
- foul=1;
- balls.ball[0].in_game=1;
- balls.ball[0].in_hole=0;
-+ textObj_setText(last_fault_text, "White ball potted");
- }
-
- /* wenn foul */
-@@ -188,6 +200,8 @@
- balls.ball[0].w=vec_xyz(0.0,0.0,0.0);
- balls.ball[0].r=vec_xyz(0.0,-TABLE_L/4.0,0.0);
- // balls.ball[0].r=vec_xyz(x,y,0.0);
-+ } else {
-+ textObj_setText(last_fault_text, "x");
- }
-
- /* if 8 out */
-@@ -221,6 +235,7 @@
- else
- {
- player[(act_player==1)?0:1].winner=1;
-+ textObj_setText(last_fault_text, "8 ball potted too soon");
- }
-
- }
-@@ -277,9 +292,15 @@
- nextplayer=0;
- }
-
-- if( BM_get_balls_hit()==0 ) foul=1;
--
-- if( BM_get_1st_ball_hit()!=minball ) foul=1;
-+ if( BM_get_balls_hit()==0 ){
-+ textObj_setText(last_fault_text, "No Ball hit");
-+ foul=1;
-+ } else {
-+ if( BM_get_1st_ball_hit()!=minball ){
-+ textObj_setText(last_fault_text, "First ball hit was not the lowest");
-+ foul=1;
-+ }
-+ }
-
- /* wenn weisse rein */
- if( BM_get_white_out() ){
-@@ -287,6 +308,7 @@
- nextplayer=1;
- pballs->ball[0].in_game=1;
- pballs->ball[0].in_hole=0;
-+ textObj_setText(last_fault_text, "White ball is potted");
- }
-
- /* wenn foul - weisse platzieren */
-@@ -297,6 +319,8 @@
- pballs->ball[0].v=vec_xyz(0.0,0.0,0.0);
- pballs->ball[0].w=vec_xyz(0.0,0.0,0.0);
- pballs->ball[0].r=vec_xyz(0,-TABLE_L/4.0,0.0);
-+ } else {
-+ textObj_setText(last_fault_text, "x");
- }
-
- fprintf(stderr,"foul:%d, nextplayer:%d, BM_get_ball_out(9):%d\n",foul,nextplayer,BM_get_ball_out(9));
-@@ -409,6 +433,7 @@
- act_penalty =MAX(act_penalty,(BM_get_1st_ball_hit()<=7?BM_get_1st_ball_hit():4));
- spot_snooker_ball(pballs,0);
- player[other_player].place_cue_ball=1;
-+ textObj_setText(last_fault_text, "White ball is potted");
- }
-
- switch(st.to_play)
-@@ -420,6 +445,11 @@
- foul=1;
- act_penalty=MAX(act_penalty,b1hit);
- printf("EVAL foul 1\n");
-+ if( BM_get_balls_hit()==0 ){
-+ textObj_setText(last_fault_text, "No Ball hit");
-+ } else {
-+ textObj_setText(last_fault_text, "First ball hit was not a red one");
-+ }
- }
- i=1;
- while((ball_out=BM_get_nth_ball_out(i++))>=0)
-@@ -434,6 +464,11 @@
- act_penalty=MAX(act_penalty,ball_out);
- foul=1;
- printf("EVAL foul 2\n");
-+ if (BM_get_white_out()){
-+ textObj_setText(last_fault_text, "White ball potted");
-+ } else {
-+ textObj_setText(last_fault_text, "Potted ball was not a red one");
-+ }
- }
- }
- for(i=2;i<8;i++)
-@@ -449,6 +484,11 @@
- foul=1;
- printf("EVAL foul 3\n");
- act_penalty=MAX(act_penalty,7);
-+ if( BM_get_balls_hit()==0 ){
-+ textObj_setText(last_fault_text, "No Ball hit");
-+ } else {
-+ textObj_setText(last_fault_text, "First ball hit was not a colored one");
-+ }
- }
- color_to_pot=b1hit;
- i=1;
-@@ -464,6 +504,11 @@
- foul=1;
- printf("EVAL foul 4\n");
- act_penalty=MAX(act_penalty,ball_out==1?7:ball_out);
-+ if (BM_get_white_out()){
-+ textObj_setText(last_fault_text, "White ball potted");
-+ } else {
-+ textObj_setText(last_fault_text, "Potted ball was not a colored one");
-+ }
- }
- }
- if(red_balls_are_in_game)
-@@ -490,6 +535,11 @@
- printf("EVAL foul 5\n");
- act_penalty=MAX(act_penalty,b1hit);
- act_penalty=MAX(act_penalty,color_to_pot);
-+ if( BM_get_balls_hit()==0 ){
-+ textObj_setText(last_fault_text, "No Ball hit");
-+ } else {
-+ textObj_setText(last_fault_text, "First ball hit was not the correct one");
-+ }
- }
- i=1;
- while((ball_out=BM_get_nth_ball_out(i++))>=0)
-@@ -505,6 +555,11 @@
- printf("EVAL foul 6\n");
- act_penalty=MAX(act_penalty,b1hit);
- act_penalty=MAX(act_penalty,color_to_pot);
-+ if (BM_get_white_out()){
-+ textObj_setText(last_fault_text, "White ball potted");
-+ } else {
-+ textObj_setText(last_fault_text, "Potted ball was not the correct one");
-+ }
- }
- }
- if(!foul && act_score>0) st.to_play++;
-@@ -528,6 +583,7 @@
- {
- player[act_player].score += act_score ;
- printf("EVAL no foul\n");
-+ textObj_setText(last_fault_text, "x");
- }
- if(act_score==0 || foul)
- {
-Index: foobillard-3.0a/src/evaluate_move.h
-===================================================================
---- foobillard-3.0a.orig/src/evaluate_move.h 2006-10-12 16:44:24.000000000 +0200
-+++ foobillard-3.0a/src/evaluate_move.h 2006-10-12 16:44:31.000000000 +0200
-@@ -31,6 +31,7 @@
- BallsType * pballs, int * pqueue_view, float * pXque );
- #endif
-
-+extern textObj * last_fault_text;
-
- void evaluate_last_move_8ball ( struct Player * player, int * actual_player,
- BallsType * pballs, int * pqueue_view, float * pXque );
diff --git a/extra/foobillard/06_show_ball_to_hit b/extra/foobillard/06_show_ball_to_hit
deleted file mode 100644
index 9c49f58cc..000000000
--- a/extra/foobillard/06_show_ball_to_hit
+++ /dev/null
@@ -1,255 +0,0 @@
-Index: foobillard-3.0a/src/billard.c
-===================================================================
---- foobillard-3.0a.orig/src/billard.c 2006-10-12 16:45:04.000000000 +0200
-+++ foobillard-3.0a/src/billard.c 2006-10-12 16:45:23.000000000 +0200
-@@ -31,6 +31,8 @@
- void * (*billard_malloc)( size_t size ) = malloc;
- void (*billard_free)( void * ptr ) = free;
-
-+SnookerState snooker_state={SN_PLAY_RED};
-+
- void setfunc_create_scene( void (*func)( BallsType * balls ) )
- {
- create_scene=func;
-Index: foobillard-3.0a/src/billard.h
-===================================================================
---- foobillard-3.0a.orig/src/billard.h 2006-10-12 16:45:05.000000000 +0200
-+++ foobillard-3.0a/src/billard.h 2006-10-12 16:45:23.000000000 +0200
-@@ -76,9 +76,30 @@
- #define BALL_HALF 2
- #define BALL_ANY 0
-
-+typedef enum
-+{
-+ SN_PLAY_RED,
-+ SN_PLAY_ANY_COLOR,
-+ SN_PLAY_YELLOW,
-+ SN_PLAY_GREEN,
-+ SN_PLAY_BROWN,
-+ SN_PLAY_BLUE,
-+ SN_PLAY_PINK,
-+ SN_PLAY_BLACK,
-+ SN_DONE
-+}
-+SnookerBallToPlay;
-+
-+typedef struct
-+{
-+ SnookerBallToPlay to_play;
-+}
-+SnookerState;
-+
- #ifndef BILLARD_C
- extern void (*create_scene)( BallsType * balls );
- extern void (*create_walls)( BordersType * walls );
-+extern SnookerState snooker_state;
- #endif
-
- void create_0hole_walls( BordersType * walls ); /* carambol */
-Index: foobillard-3.0a/src/billard3d.c
-===================================================================
---- foobillard-3.0a.orig/src/billard3d.c 2006-10-12 16:45:08.000000000 +0200
-+++ foobillard-3.0a/src/billard3d.c 2006-10-12 16:45:23.000000000 +0200
-@@ -829,6 +829,7 @@
- player[act_player].place_cue_ball=1;
- human_player_roster.player[0].cue_ball=0; human_player_roster.player[1].cue_ball=0;
- human_player_roster.player[act_player].place_cue_ball=1;
-+ snooker_state.to_play=SN_PLAY_RED;
- }
- }
-
-@@ -1787,6 +1788,7 @@
- /* score text */
- for(i=0;i<2;i++){
- char str[256];
-+ char *color;
- switch(gametype){
- case GAME_8BALL: strcpy(str,"0"); break;
- case GAME_9BALL:
-@@ -1805,7 +1807,44 @@
- sprintf( str, "%d", player[i].score );
- break;
- case GAME_SNOOKER:
-- sprintf( str, "%c%03d %s", (player[i].score<0)?'-':'+', abs(player[i].score), player[i].snooker_on_red ? "red":"col" );
-+ switch(snooker_state.to_play)
-+ {
-+ case SN_PLAY_RED:
-+ color="red";
-+ break;
-+ case SN_PLAY_ANY_COLOR:
-+ color="color";
-+ break;
-+ case SN_PLAY_YELLOW:
-+ color="yellow";
-+ break;
-+ case SN_PLAY_GREEN:
-+ color="green";
-+ break;
-+ case SN_PLAY_BROWN:
-+ color="brown";
-+ break;
-+ case SN_PLAY_BLUE:
-+ color="blue";
-+ break;
-+ case SN_PLAY_PINK:
-+ color="pink";
-+ break;
-+ case SN_PLAY_BLACK:
-+ color="black";
-+ break;
-+ case SN_DONE:
-+ color="";
-+ break;
-+ }
-+ if(i==act_player)
-+ {
-+ sprintf( str, "%.3d %s", player[i].score, color);
-+ }
-+ else
-+ {
-+ sprintf( str, "%.3d", player[i].score);
-+ }
- break;
- }
- textObj_setText( player[i].score_text, str );
-Index: foobillard-3.0a/src/evaluate_move.c
-===================================================================
---- foobillard-3.0a.orig/src/evaluate_move.c 2006-10-12 16:45:12.000000000 +0200
-+++ foobillard-3.0a/src/evaluate_move.c 2006-10-12 16:45:23.000000000 +0200
-@@ -30,26 +30,6 @@
-
- #define MAX(x,y) ((x)>(y)?(x):(y));
-
--typedef enum
--{
-- SN_PLAY_RED,
-- SN_PLAY_ANY_COLOR,
-- SN_PLAY_YELLOW,
-- SN_PLAY_GREEN,
-- SN_PLAY_BROWN,
-- SN_PLAY_BLUE,
-- SN_PLAY_PINK,
-- SN_PLAY_BLACK,
-- SN_DONE
--}
--SnookerBallToPlay;
--
--typedef struct
--{
-- SnookerBallToPlay to_play;
--}
--SnookerState;
--
-
- void spot_snooker_ball(BallsType *balls,int nr);
-
-@@ -400,7 +380,6 @@
- #define act_player (*pact_player)
- #define IS_RED(x) ( x==1 || x>=8 )
- int red_balls_are_in_game=0;
-- static SnookerState st={SN_PLAY_RED};
- int color_to_pot;
- int i;
- int act_score=0;
-@@ -409,7 +388,7 @@
- int ball_out;
- int other_player=(act_player==1)?0:1;
- int b1hit = BM_get_1st_ball_hit(); if (b1hit>=8) b1hit=1;
-- if(st.to_play==SN_DONE)
-+ if(snooker_state.to_play==SN_DONE)
- {
- BM_reset_move_info();
- return;
-@@ -417,7 +396,7 @@
-
- if( player[act_player].place_cue_ball ) player[act_player].place_cue_ball=0;
- printf("EVAL start\n");
-- printf("EVAL to_play=%d\n",st.to_play);
-+ printf("EVAL to_play=%d\n",snooker_state.to_play);
- printf("EVAL b1hit=%d\n",b1hit);
- for(i=0;i<pballs->nr;i++){
- if( IS_RED(pballs->ball[i].nr) && pballs->ball[i].in_game ){
-@@ -436,7 +415,7 @@
- textObj_setText(last_fault_text, "White ball is potted");
- }
-
-- switch(st.to_play)
-+ switch(snooker_state.to_play)
- {
- case SN_PLAY_RED:
- color_to_pot=1;
-@@ -476,7 +455,7 @@
- if( BM_get_ball_out(i))
- spot_snooker_ball(pballs,i);
- }
-- st.to_play=SN_PLAY_ANY_COLOR;
-+ snooker_state.to_play=SN_PLAY_ANY_COLOR;
- break;
- case SN_PLAY_ANY_COLOR:
- if(b1hit==1)
-@@ -512,9 +491,9 @@
- }
- }
- if(red_balls_are_in_game)
-- st.to_play=SN_PLAY_RED;
-+ snooker_state.to_play=SN_PLAY_RED;
- else
-- st.to_play=SN_PLAY_YELLOW;
-+ snooker_state.to_play=SN_PLAY_YELLOW;
-
- for(i=2;i<8;i++)
- {
-@@ -528,7 +507,7 @@
- case SN_PLAY_BLUE:
- case SN_PLAY_PINK:
- case SN_PLAY_BLACK:
-- color_to_pot=st.to_play;
-+ color_to_pot=snooker_state.to_play;
- if(b1hit!=color_to_pot)
- {
- foul=1;
-@@ -562,9 +541,9 @@
- }
- }
- }
-- if(!foul && act_score>0) st.to_play++;
-+ if(!foul && act_score>0) snooker_state.to_play++;
-
-- for(i=st.to_play;i<8;i++)
-+ for(i=snooker_state.to_play;i<8;i++)
- {
- if( BM_get_ball_out(i))
- spot_snooker_ball(pballs,i);
-@@ -590,13 +569,13 @@
- printf("EVAL next player\n");
- if(red_balls_are_in_game)
- {
-- st.to_play=SN_PLAY_RED;
-+ snooker_state.to_play=SN_PLAY_RED;
- }
- else
- {
-- if(st.to_play<=SN_PLAY_ANY_COLOR)
-+ if(snooker_state.to_play<=SN_PLAY_ANY_COLOR)
- {
-- st.to_play=SN_PLAY_YELLOW;
-+ snooker_state.to_play=SN_PLAY_YELLOW;
- }
- }
- player[act_player].queue_view=*pqueue_view;
-@@ -605,11 +584,11 @@
- *pqueue_view=player[act_player].queue_view;
- }
-
-- player[act_player].snooker_on_red=st.to_play==SN_PLAY_RED;
-- player[act_player].snooker_next_color=st.to_play;
-- printf("EVAL to_play=%d\n",st.to_play);
-+ player[act_player].snooker_on_red=snooker_state.to_play==SN_PLAY_RED;
-+ player[act_player].snooker_next_color=snooker_state.to_play;
-+ printf("EVAL to_play=%d\n",snooker_state.to_play);
-
-- if(st.to_play==SN_DONE)
-+ if(snooker_state.to_play==SN_DONE)
- {
- int other_player;
-
diff --git a/extra/foobillard/ChangeLog b/extra/foobillard/ChangeLog
deleted file mode 100644
index 0b82e7aec..000000000
--- a/extra/foobillard/ChangeLog
+++ /dev/null
@@ -1,16 +0,0 @@
-2010-07-10 Eric Belanger <eric@archlinux.org>
-
- * foobillard 3.0a-6
- * Fixed hang after a draw in snooker (close FS#18631)
- * Removed unneeded libxaw and libxi depends
-
-2010-01-18 Eric Belanger <eric@archlinux.org>
-
- * foobillard 3.0a-4
- * Rebuilt for libpng 1.4 and libjpeg 8
- * Added bug fix and improvement patches
- * Fixed license
- * Updated url
- * Added man page
- * Added desktop file and icon
- * Added ChangeLog
diff --git a/extra/foobillard/PKGBUILD b/extra/foobillard/PKGBUILD
deleted file mode 100644
index decb5c49d..000000000
--- a/extra/foobillard/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 85242 2010-07-11 02:23:37Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=foobillard
-pkgver=3.0a
-pkgrel=6
-pkgdesc="An OpenGL billiard game for Linux"
-arch=('i686' 'x86_64')
-url="http://foobillard.sourceforge.net/"
-license=('GPL2' 'custom')
-depends=('sdl' 'freetype2' 'libpng' 'mesa')
-changelog=ChangeLog
-source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz \
- foobillard.desktop foobillard.png 03_bugfixes 05_foul_explanation \
- 06_show_ball_to_hit snooker_reset.patch snooker_draw.patch)
-md5sums=('c2d92edeaaf8bfb18aa26f1c79931b7d' '436f76ad44910a2524a38ff158bc32fc'\
- '4bb47566197a252388bf49583536dd4d' '4400c87674b8a442c0cbbd619e118cd3'\
- '0b79b9b71bebd7e0e1584f0593cc348d' 'eed13569ab099054619137eabce96045'\
- '329ddc735af17f33df99c5fe7ff672b9' '97f04be3ad4a0f78c6d7a8b658099a5d')
-sha1sums=('1caa51a201b55883640b5c5b1e9fde20fc71a095' '7e820e047497eae5f3d495cc8c61870d7b438a2e'\
- '67db7b2a96784ff3baaeca9610414376210e5c49' '119aa2bfcfb2b074e0d9b441441808c22eacf625'\
- '347535e3db4b04caab2f040779576229b2ce71ac' '11cff3e62fccd101cc85d58cc0d0eb4a1b99670f'\
- '405a64db7e92e7ba046dd9007d4bf1433914ef79' 'a3151458667488117524ce8948b0d101657ad425')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- sed -i -e 's/-lXaw//' -e 's/-lXi//' src/Makefile.in
- patch -p1 < ../03_bugfixes
- patch -p1 < ../05_foul_explanation
- patch -p1 < ../06_show_ball_to_hit
- patch -p0 < ../snooker_reset.patch
- patch -p0 < ../snooker_draw.patch
-
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
- install -D -m644 foobillard.6 "${pkgdir}/usr/share/man/man6/foobillard.6"
- install -D -m644 README.FONTS "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.FONTS"
- install -D -m644 ../foobillard.desktop "${pkgdir}/usr/share/applications/foobillard.desktop"
- install -D -m644 ../foobillard.png "${pkgdir}/usr/share/pixmaps/foobillard.png"
-}
diff --git a/extra/foobillard/foobillard.desktop b/extra/foobillard/foobillard.desktop
deleted file mode 100644
index 1028c19f5..000000000
--- a/extra/foobillard/foobillard.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Foobillard
-Comment=A 3D billiards game using OpenGL
-Exec=foobillard
-Icon=foobillard.png
-Terminal=false
-Type=Application
-Categories=Game;SportsGame;
-StartupNotify=false
diff --git a/extra/foobillard/foobillard.png b/extra/foobillard/foobillard.png
deleted file mode 100644
index c57fadb30..000000000
--- a/extra/foobillard/foobillard.png
+++ /dev/null
Binary files differ
diff --git a/extra/foobillard/snooker_draw.patch b/extra/foobillard/snooker_draw.patch
deleted file mode 100644
index 1d45e9498..000000000
--- a/extra/foobillard/snooker_draw.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Index: src/evaluate_move.c
-===================================================================
---- src/evaluate_move.c (revision 6)
-+++ src/evaluate_move.c (working copy)
-@@ -602,6 +602,11 @@
- player[act_player].winner=0;
- player[other_player].winner=1;
- }
-+ if(player[act_player].score==player[other_player].score) {
-+ player[act_player].winner=1;
-+ player[other_player].winner=1;
-+ }
-+
- }
-
- printf("EVAL done\n");
-Index: src/billard3d.c
-===================================================================
---- src/billard3d.c (revision 6)
-+++ src/billard3d.c (working copy)
-@@ -1760,8 +1760,17 @@
- options_gamemode==options_gamemode_tournament &&
- (player[0].winner || player[1].winner) )
- {
-- tournament_evaluate_last_match( &tournament_state );
-- tournament_state.wait_for_next_match=1;
-+ if ( player[0].winner == player[1].winner )
-+ { // Draw
-+ restart_game_common();
-+ player[act_player].winner=0;
-+ player[other_player].winner=0;
-+ }
-+ else
-+ {
-+ tournament_evaluate_last_match( &tournament_state );
-+ tournament_state.wait_for_next_match=1;
-+ }
- }
- } else {
- int old_cueball_ind;
-@@ -3654,6 +3663,7 @@
- create_walls( &walls );
- create_scene( &balls );
- g_shot_due=1;
-+ snooker_state.to_play=SN_PLAY_RED;
- }
-
-
diff --git a/extra/foobillard/snooker_reset.patch b/extra/foobillard/snooker_reset.patch
deleted file mode 100644
index 392226ec3..000000000
--- a/extra/foobillard/snooker_reset.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/billard3d.c 2010-02-27 04:01:40.000000000 -0600
-+++ src/billard3d.c 2010-02-27 04:02:59.000000000 -0600
-@@ -1219,6 +1219,8 @@
- printf("tournament_state_setup_next_match 7\n");
- queue_view=player[act_player].queue_view;
- printf("tournament_state_setup_next_match 8\n");
-+ snooker_state.to_play = SN_PLAY_RED;
-+ printf("tournament_state_setup_next_match 9\n");
- }
-
- void create_players_text()
diff --git a/extra/fribidi/ChangeLog b/extra/fribidi/ChangeLog
deleted file mode 100644
index 43b17a515..000000000
--- a/extra/fribidi/ChangeLog
+++ /dev/null
@@ -1,5 +0,0 @@
-2008-02-16 Travis Willard <travis@archlinux.org>
-
- * 0.10.9
- Added ChangeLog
- New upstream release.
diff --git a/extra/gd/ChangeLog b/extra/gd/ChangeLog
deleted file mode 100644
index 813a49e46..000000000
--- a/extra/gd/ChangeLog
+++ /dev/null
@@ -1,11 +0,0 @@
-2010-01-17 Ionut Biru <ionut@archlinux.ro>
-
- * gd 2.0.36RC1-2
- * libpng 1.4.0/libjpeg 8 rebuild
-
-2009-10-30 Eric Belanger <eric@archlinux.org>
-
- * gd 2.0.36RC1-1
- * Upstream update
- * Added perl depends
- * Added ChangeLog
diff --git a/extra/glhack/ChangeLog b/extra/glhack/ChangeLog
deleted file mode 100644
index cc13a2560..000000000
--- a/extra/glhack/ChangeLog
+++ /dev/null
@@ -1,12 +0,0 @@
-2010-01-18 Eric Belanger <eric@archlinux.org>
-
- * glhack 1.2-4
- * Rebuilt for libpng 1.4 and libjpeg 8
- * Fixed man page conflict with nethack (close FS#17226)
-
-2009-06-29 Eric Belanger <eric@archlinux.org>
-
- * glhack 1.2-3
- * Moved binaries to /usr/bin (close FS#15303)
- * Moved saved games to /var
- * Added ChangeLog
diff --git a/extra/gnome-spell/PKGBUILD b/extra/gnome-spell/PKGBUILD
deleted file mode 100644
index 020398658..000000000
--- a/extra/gnome-spell/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 49931 2009-08-16 21:48:16Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-spell
-pkgver=1.0.8
-pkgrel=2
-pkgdesc="Spell Checking Support for Gnome"
-arch=(i686 x86_64)
-license=('GPL')
-depends=('libgnomeui>=2.24.1' 'enchant>=1.4.2')
-makedepends=('pkgconfig' 'intltool')
-options=('!libtool')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.0/${pkgname}-${pkgver}.tar.bz2
- gnome-spell-enchant.diff)
-md5sums=('6ccc46b4e3dc7cb1c6d413358e35d445' '12a357212809e0f0aba8c08d1372e60a')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -Np0 -i "${srcdir}/gnome-spell-enchant.diff" || return 1
- libtoolize --force || return 1
- aclocal || return 1
- autoconf || return 1
- automake || return 1
-
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-static || return 1
- make || return 1
- make DESTDIR="${pkgdir}" install || return 1
-}
diff --git a/extra/gnome-spell/gnome-spell-enchant.diff b/extra/gnome-spell/gnome-spell-enchant.diff
deleted file mode 100644
index 7c0493813..000000000
--- a/extra/gnome-spell/gnome-spell-enchant.diff
+++ /dev/null
@@ -1,551 +0,0 @@
-? INSTALL
-? autom4te.cache
-? depcomp
-? gnome-spell-enchant.diff
-? gnome-spell-zip
-? intltool-extract
-? intltool-extract.in
-? intltool-merge
-? intltool-merge.in
-? intltool-update
-? intltool-update.in
-? missing
-? mkinstalldirs
-? stamp-h1
-? gnome-spell/GNOME_Spell.server
-? gnome-spell/GNOME_Spell.server.in
-? gnome-spell/
-Index: configure.in
-===================================================================
-RCS file: /cvs/gnome/gnome-spell/configure.in,v
-retrieving revision 1.86
-diff -u -p -u -p -r1.86 configure.in
---- configure.in 10 Feb 2006 12:08:11 -0000 1.86
-+++ configure.in 2 Apr 2006 14:31:45 -0000
-@@ -68,34 +68,6 @@ AC_DEFINE_UNQUOTED(API_VERSION, "${API_V
- AC_SUBST(API_VERSION)
-
- dnl
--dnl aspell
--dnl
--
--AC_ARG_WITH(aspell-prefix, [ --with-aspell-prefix=DIR
-- specify under which prefix aspell is installed.], with_aspell_prefix="$withval", )
--
--if test "x$with_aspell_prefix" != "x"; then
-- saved_LDFLAGS=$LDFLAGS
-- LDFLAGS="-L$with_aspell_prefix/lib "$LDFLAGS
-- ASPELL_INC="-I$with_aspell_prefix/include"
-- ASPELL_LIBS="-L$with_aspell_prefix/lib -laspell"
-- ASPELL_DATA="$with_aspell_prefix/lib/aspell"
--else
-- LDFLAGS="-L`aspell config prefix`/lib "$LDFLAGS
-- ASPELL_INC="-I`aspell config prefix`/include"
-- ASPELL_LIBS="-L`aspell config prefix`/lib -laspell"
-- ASPELL_DICT="`aspell config dict-dir`"
--fi
--AC_CHECK_LIB(aspell,new_aspell_config,,AC_MSG_ERROR([gnome-spell cannot be built without aspell library]),)
--if test "x$with_aspell_prefix" != "x"; then
-- LDFLAGS=$saved_LDFLAGS
--fi
--
--AC_SUBST(ASPELL_DICT)
--AC_SUBST(ASPELL_INC)
--AC_SUBST(ASPELL_LIBS)
--
--dnl
- dnl flags
- dnl
-
-@@ -104,7 +76,7 @@ AC_SUBST(CFLAGS)
- AC_SUBST(CPPFLAGS)
- AC_SUBST(LDFLAGS)
-
--GNOME_SPELL_MODULES="libgnomeui-2.0 >= 1.112.1 libbonoboui-2.0 >= 1.112.1 libglade-2.0 >= 1.99.9"
-+GNOME_SPELL_MODULES="libgnomeui-2.0 >= 1.112.1 libbonoboui-2.0 >= 1.112.1 libglade-2.0 >= 1.99.9 enchant >= 1.2.5"
- PKG_CHECK_MODULES(GNOME_SPELL, $GNOME_SPELL_MODULES)
- AC_SUBST(GNOME_SPELL_CFLAGS)
- AC_SUBST(GNOME_SPELL_LIBS)
-Index: gnome-spell/Makefile.am
-===================================================================
-RCS file: /cvs/gnome/gnome-spell/gnome-spell/Makefile.am,v
-retrieving revision 1.34
-diff -u -p -u -p -r1.34 Makefile.am
---- gnome-spell/Makefile.am 19 Jan 2006 23:37:50 -0000 1.34
-+++ gnome-spell/Makefile.am 2 Apr 2006 14:31:46 -0000
-@@ -7,13 +7,11 @@ END =
-
- INCLUDES = \
- -I$(srcdir) \
-- $(ASPELL_INC) \
- -DPREFIX=\""$(prefix)"\" \
- -DGNOMEDATADIR=\""$(datadir)"\" \
- -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
- -DGLADE_DATADIR=\"$(gladedir)\" \
- -DPLUGIN_DIR=\""$(PLUGIN_DIR)"\" \
-- -DASPELL_DICT=\""$(ASPELL_DICT)"\" \
- $(GNOME_SPELL_CFLAGS) \
- $(END)
-
-@@ -55,7 +53,6 @@ libgnome_spell_idl_la_SOURCES = \
- libgnome_spell_component_la_LDFLAGS = -release $(API_VERSION) $(NO_UNDEFINED)
- libgnome_spell_component_la_LIBADD = \
- libgnome-spell-idl.la \
-- $(ASPELL_LIBS) \
- $(GNOME_SPELL_LIBS) \
- $(END)
-
-@@ -69,7 +66,6 @@ libgnome_spell_component_la_SOURCES = \
-
- test_gnome_spell_component_LDADD = \
- libgnome-spell-idl.la \
-- $(ASPELL_LIBS) \
- $(GNOME_SPELL_LIBS) \
- $(END)
-
-Index: gnome-spell/dictionary.c
-===================================================================
-RCS file: /cvs/gnome/gnome-spell/gnome-spell/dictionary.c,v
-retrieving revision 1.39
-diff -u -p -u -p -r1.39 dictionary.c
---- gnome-spell/dictionary.c 5 Feb 2006 21:31:09 -0000 1.39
-+++ gnome-spell/dictionary.c 2 Apr 2006 14:31:46 -0000
-@@ -30,16 +30,21 @@
- #include <glib.h>
- #include <libgnome/gnome-i18n.h>
- #include <libgnome/gnome-config.h>
--#include <gconf/gconf-client.h>
- #include <bonobo.h>
-
- #include "Spell.h"
- #include "dictionary.h"
-
-+#include <enchant.h>
-+
-+typedef struct {
-+ EnchantBroker * config;
-+ EnchantDict * speller;
-+} SpellEngine;
-+
- static BonoboObjectClass *dictionary_parent_class;
-
- #define DICT_DEBUG(x)
--#define GNOME_SPELL_GCONF_DIR "/GNOME/Spell"
-
- static void release_engines (GNOMESpellDictionary *dict);
-
-@@ -72,12 +77,24 @@ gnome_spell_dictionary_init (GObject *ob
- {
- GNOMESpellDictionary *dict = GNOME_SPELL_DICTIONARY (object);
-
-- dict->changed = TRUE;
- dict->engines = NULL;
- dict->languages = g_hash_table_new (g_str_hash, g_str_equal);
- dict->engines_ht = g_hash_table_new (NULL, NULL);
- }
-
-+static char **
-+dup_string_list (char ** str_list, size_t list_len)
-+{
-+ char ** new_str_list;
-+ size_t i;
-+
-+ new_str_list = g_new0 (char *, list_len + 1);
-+ for (i = 0; i < list_len; i++)
-+ new_str_list [i] = g_strdup (str_list [i]);
-+
-+ return new_str_list;
-+}
-+
- static void
- dictionary_finalize (GObject *object)
- {
-@@ -93,15 +110,16 @@ dictionary_finalize (GObject *object)
- }
-
- static SpellEngine *
--new_engine (const gchar *language)
-+new_engine (const gchar *language, CORBA_Environment *ev)
- {
- SpellEngine *se;
-
- se = g_new0 (SpellEngine, 1);
-- se->config = new_aspell_config ();
-- aspell_config_replace (se->config, "language-tag", language);
-- aspell_config_replace (se->config, "encoding", "utf-8");
-- se->changed = TRUE;
-+ se->config = enchant_broker_init ();
-+ se->speller = enchant_broker_request_dict (se->config, language);
-+
-+ if(se->speller == NULL)
-+ raise_error (ev, enchant_broker_get_error (se->config));
-
- return se;
- }
-@@ -129,9 +147,9 @@ release_engines (GNOMESpellDictionary *d
- SpellEngine *se = dict->engines->data;
-
- if (se->speller)
-- delete_aspell_speller (se->speller);
-+ enchant_broker_free_dict (se->config, se->speller);
- if (se->config)
-- delete_aspell_config (se->config);
-+ enchant_broker_free (se->config);
- g_free (se);
- dict->engines = g_slist_remove (dict->engines, se);
- }
-@@ -140,7 +158,6 @@ release_engines (GNOMESpellDictionary *d
- g_hash_table_foreach_remove (dict->languages, remove_engine_ht, NULL);
-
- dict->engines = NULL;
-- dict->changed = TRUE;
- }
-
- static LangInfo known_languages [] = {
-@@ -352,88 +369,31 @@ static LangInfo known_languages [] = {
- };
-
- static GSList *
--get_languages_real (gint *ln)
-+get_languages (gint *ln)
- {
- GSList *langs;
-- AspellCanHaveError *err;
-- AspellConfig *config;
-- AspellSpeller *speller;
-- gint i;
-+ EnchantBroker *broker;
-+ gint i, nb_langs;
-
-- DICT_DEBUG (printf ("get_languages_real\n"));
-+ DICT_DEBUG (printf ("get_languages\n"));
-
-+ /* todo: this could probably be better done by enchant_broker_list_dicts(), but let's keep
-+ the initial code change to a minimum */
-+
-+ broker = enchant_broker_init ();
- langs = NULL;
-- *ln = 0;
-+ nb_langs = 0;
- for (i=0; i < G_N_ELEMENTS (known_languages); i++) {
-- config = new_aspell_config ();
-- aspell_config_replace (config, "language-tag", known_languages [i].abbreviation);
-- err = new_aspell_speller (config);
-- if (aspell_error_number (err) == 0) {
-- speller = to_aspell_speller (err);
-+ if (enchant_broker_dict_exists (broker, known_languages [i].abbreviation)) {
- DICT_DEBUG (printf ("Language: %s\n", known_languages [i].name));
-- delete_aspell_speller (speller);
- langs = g_slist_prepend (langs, GINT_TO_POINTER (i));
-- (*ln) ++;
-+ nb_langs++;
- }
- }
-
-- return langs;
--}
--
--static GSList *
--get_languages_load (GConfClient *gc, gint *ln)
--{
-- GString *str;
-- GSList *langs = NULL;
-- gint i, lang_num;
--
-- /* printf ("get_languages_load\n"); */
--
-- str = g_string_new (NULL);
-- *ln = gconf_client_get_int (gc, GNOME_SPELL_GCONF_DIR "/languages", NULL);
-- for (i = 0; i < *ln; i++) {
-- g_string_sprintf (str, GNOME_SPELL_GCONF_DIR "/language%d", i);
-- lang_num = gconf_client_get_int (gc, str->str, NULL);
-- langs = g_slist_prepend (langs, GINT_TO_POINTER (lang_num));
-- }
--
-- return langs;
--}
--
--static GSList *
--get_languages (gint *ln)
--{
-- GSList *langs, *l;
-- GConfClient *gc;
-- time_t mtime;
-- struct stat buf;
-- gint i, kl;
--
-- gc = gconf_client_get_default ();
--
-- mtime = gconf_client_get_int (gc, GNOME_SPELL_GCONF_DIR "/mtime", NULL);
-- kl = gconf_client_get_int (gc, GNOME_SPELL_GCONF_DIR "/known_languages", NULL);
--
-- if (stat (ASPELL_DICT, &buf) || buf.st_mtime != mtime || kl != G_N_ELEMENTS(known_languages)) {
-- GString *str;
-- langs = get_languages_real (ln);
--
-- str = g_string_new (NULL);
-- gconf_client_set_int (gc, GNOME_SPELL_GCONF_DIR "/languages", *ln, NULL);
-- for (l = langs, i = 0; i < *ln; i ++) {
-- g_string_sprintf (str, GNOME_SPELL_GCONF_DIR "/language%d", *ln - i - 1);
-- gconf_client_set_int (gc, str->str, GPOINTER_TO_INT (l->data), NULL);
-- l = l->next;
-- }
-- gconf_client_set_int (gc, GNOME_SPELL_GCONF_DIR "/mtime", buf.st_mtime, NULL);
-- gconf_client_set_int (gc, GNOME_SPELL_GCONF_DIR "/known_languages", G_N_ELEMENTS(known_languages), NULL);
-- g_string_free (str, TRUE);
-- gnome_config_sync ();
-- } else
-- langs = get_languages_load (gc, ln);
-+ *ln = nb_langs;
-
-- gconf_client_suggest_sync (gc, NULL);
-- g_object_unref (gc);
-+ enchant_broker_free (broker);
-
- return langs;
- }
-@@ -504,59 +464,19 @@ impl_gnome_spell_dictionary_set_language
- SpellEngine *se;
-
- one_language = g_strndup (begin, len);
-- se = new_engine (one_language);
-+ se = new_engine (one_language, ev);
- dict->engines = g_slist_prepend (dict->engines, se);
- g_hash_table_insert (dict->languages, one_language, se);
- g_hash_table_insert (dict->engines_ht, se, g_strdup (one_language));
--
-- dict->changed = TRUE;
-- }
-- }
--}
--
--static void
--update_engine (SpellEngine *se, CORBA_Environment * ev)
--{
-- AspellCanHaveError *err;
--
-- DICT_DEBUG (printf ("Dictionary: creating new aspell speller\n"));
--
-- if (se->changed) {
-- if (se->speller)
-- delete_aspell_speller (se->speller);
-- err = new_aspell_speller (se->config);
-- if (aspell_error_number (err) != 0) {
-- g_warning ("aspell error: %s\n", aspell_error_message (err));
-- se->speller = NULL;
-- raise_error (ev, aspell_error_message (err));
-- } else {
-- se->speller = to_aspell_speller (err);
-- se->changed = FALSE;
- }
- }
- }
-
--static void
--update_engines (GNOMESpellDictionary *dict, CORBA_Environment * ev)
--{
-- g_return_if_fail (IS_GNOME_SPELL_DICTIONARY (dict));
--
-- if (dict->changed) {
-- GSList *l;
--
-- for (l = dict->engines; l; l = l->next) {
-- update_engine ((SpellEngine *) l->data, ev);
-- }
--
-- dict->changed = FALSE;
-- }
--}
--
- static CORBA_boolean
- engine_check_word (SpellEngine *se, const gchar *word, CORBA_Environment *ev)
- {
-- CORBA_boolean result = CORBA_TRUE;
-- gint aspell_result;
-+ CORBA_boolean result = CORBA_FALSE;
-+ gint enchant_result;
-
- #ifndef G_DISABLE_CHECKS
- g_return_val_if_fail (se->speller, CORBA_TRUE);
-@@ -564,12 +484,12 @@ engine_check_word (SpellEngine *se, cons
- if (!se->speller)
- return CORBA_TRUE;
- #endif
-- aspell_result = aspell_speller_check (se->speller, word, strlen (word));
-- if (aspell_result == 0)
-- result = CORBA_FALSE;
-- if (aspell_result == -1) {
-- g_warning ("aspell error: %s\n", aspell_speller_error_message (se->speller));
-- raise_error (ev, aspell_speller_error_message (se->speller));
-+ enchant_result = enchant_dict_check (se->speller, word, strlen (word));
-+ if (enchant_result == 0)
-+ result = CORBA_TRUE;
-+ if (enchant_result == -1) {
-+ g_warning ("enchant error: %s\n", enchant_dict_get_error (se->speller));
-+ raise_error (ev, enchant_dict_get_error (se->speller));
- }
-
- return result;
-@@ -592,7 +512,6 @@ impl_gnome_spell_dictionary_check_word (
- if (!strcmp (word, "Ximian"))
- return CORBA_TRUE;
-
-- update_engines (dict, ev);
- for (l = dict->engines; l; l = l->next) {
- if (((SpellEngine *) l->data)->speller) {
- valid_speller = TRUE;
-@@ -621,11 +540,10 @@ impl_gnome_spell_dictionary_add_word_to_
- if (!word)
- return;
- #endif
-- update_engines (dict, ev);
- DICT_DEBUG (printf ("Dictionary add_word_to_session: %s\n", word));
- for (l = dict->engines; l; l = l->next) {
- if (((SpellEngine *) l->data)->speller)
-- aspell_speller_add_to_session (((SpellEngine *) l->data)->speller, word, strlen (word));
-+ enchant_dict_add_to_session (((SpellEngine *) l->data)->speller, word, strlen (word));
- }
- }
-
-@@ -642,13 +560,11 @@ impl_gnome_spell_dictionary_add_word_to_
- if (!word || !language)
- return;
- #endif
-- update_engines (dict, ev);
- DICT_DEBUG (printf ("Dictionary add_word_to_personal: %s (%s)\n", word, language));
- se = (SpellEngine *) g_hash_table_lookup (dict->languages, language);
-
- if (se && se->speller) {
-- aspell_speller_add_to_personal (se->speller, word, strlen (word));
-- aspell_speller_save_all_word_lists (se->speller);
-+ enchant_dict_add_to_pwl (se->speller, word, strlen (word));
- DICT_DEBUG (printf ("Added and saved.\n"));
- }
- }
-@@ -666,14 +582,12 @@ impl_gnome_spell_dictionary_set_correcti
- if (!word || !replacement)
- return;
- #endif
-- update_engines (dict, ev);
- DICT_DEBUG (printf ("Dictionary correction: %s <-- %s\n", word, replacement));
- se = (SpellEngine *) g_hash_table_lookup (dict->languages, language);
-
- if (se && se->speller) {
-- aspell_speller_store_replacement (se->speller, word, strlen (word),
-- replacement, strlen (replacement));
-- aspell_speller_save_all_word_lists (se->speller);
-+ enchant_dict_store_replacement (se->speller, word, strlen (word),
-+ replacement, strlen (replacement));
- DICT_DEBUG (printf ("Set and saved.\n"));
- }
- }
-@@ -683,8 +597,8 @@ impl_gnome_spell_dictionary_get_suggesti
- const CORBA_char *word, CORBA_Environment *ev)
- {
- GNOMESpellDictionary *dict = GNOME_SPELL_DICTIONARY (bonobo_object_from_servant (servant));
-- const AspellWordList *suggestions;
-- AspellStringEnumeration *elements;
-+ char **suggestions;
-+ size_t number_of_suggestions;
- GNOME_Spell_StringSeq *seq = NULL;
- GSList *l, *suggestion_list = NULL;
- gint i, len, pos;
-@@ -696,17 +610,19 @@ impl_gnome_spell_dictionary_get_suggesti
- return NULL;
- #endif
- DICT_DEBUG (printf ("Dictionary correction: %s\n", word));
-- update_engines (dict, ev);
-
- len = 0;
- for (l = dict->engines; l; l = l->next) {
- SpellEngine *se = (SpellEngine *) l->data;
-
- if (se->speller) {
-- suggestions = aspell_speller_suggest (se->speller, word, strlen (word));
-- suggestion_list = g_slist_prepend (suggestion_list, (gpointer) suggestions);
-- len += 2*aspell_word_list_size (suggestions);
-+ suggestions = enchant_dict_suggest (se->speller, word, strlen (word), &number_of_suggestions);
-+ suggestion_list = g_slist_prepend (suggestion_list,
-+ (gpointer) dup_string_list (suggestions, number_of_suggestions));
-+ len += 2*number_of_suggestions;
- suggestion_list = g_slist_prepend (suggestion_list, engine_to_language (dict, se));
-+ suggestion_list = g_slist_prepend (suggestion_list, GINT_TO_POINTER (number_of_suggestions));
-+ enchant_dict_free_string_list (se->speller, suggestions);
- }
- }
-
-@@ -723,17 +639,18 @@ impl_gnome_spell_dictionary_get_suggesti
- gint list_len;
- gchar *language;
-
-+ list_len = GPOINTER_TO_INT (l->data);
-+ l = l->next;
- language = (gchar *) l->data;
- l = l->next;
-- suggestions = (const AspellWordList *) l->data;
-- elements = aspell_word_list_elements (suggestions);
-- list_len = aspell_word_list_size (suggestions);
-+ suggestions = (char **) l->data;
- for (i = 0; i < list_len; i ++, pos ++) {
-- seq->_buffer [pos] = CORBA_string_dup (aspell_string_enumeration_next (elements));
-+ seq->_buffer [pos] = CORBA_string_dup (suggestions [i]);
- pos ++;
- seq->_buffer [pos] = CORBA_string_dup (language);
- }
-- delete_aspell_string_enumeration (elements);
-+
-+ g_strfreev (suggestions);
- }
- CORBA_sequence_set_release (seq, CORBA_TRUE);
- g_slist_free (suggestion_list);
-Index: gnome-spell/dictionary.h
-===================================================================
-RCS file: /cvs/gnome/gnome-spell/gnome-spell/dictionary.h,v
-retrieving revision 1.8
-diff -u -p -u -p -r1.8 dictionary.h
---- gnome-spell/dictionary.h 5 Feb 2006 21:31:09 -0000 1.8
-+++ gnome-spell/dictionary.h 2 Apr 2006 14:31:46 -0000
-@@ -26,7 +26,6 @@
- G_BEGIN_DECLS
-
- #include <bonobo/bonobo-object.h>
--#include <aspell.h>
-
- #define GNOME_SPELL_DICTIONARY_TYPE (gnome_spell_dictionary_get_type ())
- #define GNOME_SPELL_DICTIONARY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), \
-@@ -37,12 +36,6 @@ G_BEGIN_DECLS
- #define IS_GNOME_SPELL_DICTIONARY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GNOME_SPELL_DICTIONARY_TYPE))
-
- typedef struct {
-- AspellConfig *config;
-- AspellSpeller *speller;
-- gboolean changed;
--} SpellEngine;
--
--typedef struct {
- gchar *abbreviation;
- gchar *name;
- } LangInfo;
-@@ -50,7 +43,6 @@ typedef struct {
- typedef struct {
- BonoboObject parent;
-
-- gboolean changed;
- GSList *engines;
- GHashTable *languages;
- GHashTable *engines_ht;
-Index: gnome-spell/test-spell.c
-===================================================================
-RCS file: /cvs/gnome/gnome-spell/gnome-spell/test-spell.c,v
-retrieving revision 1.12
-diff -u -p -u -p -r1.12 test-spell.c
---- gnome-spell/test-spell.c 6 Mar 2003 16:37:36 -0000 1.12
-+++ gnome-spell/test-spell.c 2 Apr 2006 14:31:46 -0000
-@@ -52,7 +52,6 @@ main (int argc, char *argv [])
- * test dictionary
- */
-
-- GNOME_Spell_Dictionary_getLanguages (en, &ev);
- GNOME_Spell_Dictionary_setLanguage (en, "en", &ev);
-
- printf ("check: %s --> %d\n",
diff --git a/extra/grip/grip.install b/extra/grip/grip.install
deleted file mode 100644
index db4c764ac..000000000
--- a/extra/grip/grip.install
+++ /dev/null
@@ -1,33 +0,0 @@
-
-# This is a default template for a post-install scriptlet. You can
-# remove any functions you don't need (and this header).
-
-# arg 1: the new package version
-post_install() {
- cat << EOM
-
- --> please note that you will need "yelp" to display the help and the notices
- --> of grip. Every other functionality can be used out of the box.
-
-EOM
-}
-
-# arg 1: the new package version
-# arg 2: the old package version
-post_upgrade() {
- post_install $1
-}
-
-# arg 1: the old package version
-pre_remove() {
- /bin/true
-}
-
-# arg 1: the old package version
-post_remove() {
- /bin/true
-}
-
-op=$1
-shift
-$op $*
diff --git a/extra/kdeplasma-addons/kdeobservatory-qwt6.patch b/extra/kdeplasma-addons/kdeobservatory-qwt6.patch
deleted file mode 100644
index 46ba0345d..000000000
--- a/extra/kdeplasma-addons/kdeobservatory-qwt6.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur kdeplasma-addons-4.6.5.bak/applets/kdeobservatory/src/commithistoryview.cpp kdeplasma-addons-4.6.5/applets/kdeobservatory/src/commithistoryview.cpp
---- kdeplasma-addons-4.6.5.bak/applets/kdeobservatory/src/commithistoryview.cpp 2011-07-15 14:04:17.323188525 +0200
-+++ kdeplasma-addons-4.6.5/applets/kdeobservatory/src/commithistoryview.cpp 2011-07-15 14:04:39.186521458 +0200
-@@ -124,7 +124,7 @@
- plot->setCanvasBackground(QColor(0, 0, 140));
-
- QwtPlotCurve *curve = new QwtPlotCurve;
-- curve->setData(x, y, j);
-+ curve->setSamples(x, y, j);
- delete []x;
- delete []y;
-
diff --git a/extra/ladspa/ladspa-sdk-1.12-gcc4.patch b/extra/ladspa/ladspa-sdk-1.12-gcc4.patch
deleted file mode 100644
index fa21be8ef..000000000
--- a/extra/ladspa/ladspa-sdk-1.12-gcc4.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- ladspa_sdk/src/plugins/sine.cpp.orig 2002-07-06 17:23:17.000000000
-0000
-+++ ladspa_sdk/src/plugins/sine.cpp 2005-11-25 11:15:11.691087784 +0000
-@@ -59,6 +59,15 @@
-
- /*****************************************************************************/
-
-+LADSPA_Handle instantiateSineOscillator(const LADSPA_Descriptor *, unsigned long SampleRate);
-+void connectPortToSineOscillator(LADSPA_Handle Instance, unsigned long Port, LADSPA_Data * DataLocation);
-+void activateSineOscillator(void * pvHandle);
-+void runSineOscillator_FreqAudio_AmpAudio(LADSPA_Handle Instance, unsigned long SampleCount);
-+void runSineOscillator_FreqAudio_AmpCtrl(LADSPA_Handle Instance, unsigned long SampleCount);
-+void runSineOscillator_FreqCtrl_AmpAudio(LADSPA_Handle Instance, unsigned long SampleCount);
-+void runSineOscillator_FreqCtrl_AmpCtrl(LADSPA_Handle Instance, unsigned long SampleCount);
-+void cleanupSineOscillator(void *pvHandle);
-+
- class SineOscillator {
- private:
diff --git a/extra/lesstif/ChangeLog b/extra/lesstif/ChangeLog
deleted file mode 100644
index c600228c3..000000000
--- a/extra/lesstif/ChangeLog
+++ /dev/null
@@ -1,19 +0,0 @@
-2010-01-05 Eric Belanger <eric@archlinux.org>
-
- * lesstif 0.95.2-2
- * Fixed segmentation fault when doing copy/paste on i686 (close FS#17712)
-
-2009-12-30 Eric Belanger <eric@archlinux.org>
-
- * lesstif 0.95.2-1
- * Upstream update
- * Added docs
-
-2008-12-08 Eric Belanger <eric@archlinux.org>
-
- * lesstif 0.95.0-3
- * Added license
- * Updated options syntax
- * Added url
- * FHS man pages
- * Added ChangeLog
diff --git a/extra/libssh2/PKGBUILD b/extra/libssh2/PKGBUILD
deleted file mode 100644
index 00a2e5bb3..000000000
--- a/extra/libssh2/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 137230 2011-09-06 21:12:10Z dreisner $
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-# Contributor: Angel Velasquez <angvp@archlinux.org>
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: ice-man <icemanf@gmail.com>
-
-pkgname=libssh2
-pkgver=1.3.0
-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"{,.asc})
-md5sums=('6425331899ccf1015f1ed79448cb4709'
- '6ddcc9f2b37941f8291d7494ee8f89b7')
-
-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/extra/mkbootcd/PKGBUILD b/extra/mkbootcd/PKGBUILD
deleted file mode 100644
index dc06beb41..000000000
--- a/extra/mkbootcd/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 12672 2008-09-17 21:20:37Z tpowa $
-# Maintainer : Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=mkbootcd
-pkgver=2008.09
-pkgrel=1
-pkgdesc="Advanced, modular isolinux bootcd image creation utility"
-arch=(i686 x86_64)
-license=('GPL')
-url="http://www.archlinux.org/"
-depends=('mkinitcpio' 'cdrkit' 'syslinux')
-source=('boot.msg' 'mkbootcd' 'mkbootcd.conf' 'options.msg')
-backup=(etc/mkbootcd.conf)
-
-build()
-{
- cd $startdir/src/
- install -D -m755 mkbootcd $startdir/pkg/usr/sbin/mkbootcd
- install -D -m644 mkbootcd.conf $startdir/pkg/etc/mkbootcd.conf
- install -D -m644 boot.msg $startdir/pkg/usr/share/mkbootcd/boot.msg
- install -D -m644 options.msg $startdir/pkg/usr/share/mkbootcd/options.msg
-}
-md5sums=('d02e111f81204044644f728ff85e2284'
- 'bfae68f0a5168bd41f8d0c56f524fb08'
- 'e08b9b952b5e468feb16e3f20ee3faf2'
- 'fa078942b8adf261e4d925e080dc3018')
diff --git a/extra/mkbootcd/boot.msg b/extra/mkbootcd/boot.msg
deleted file mode 100644
index 271c58016..000000000
--- a/extra/mkbootcd/boot.msg
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-------------------------------------------------------------------------------
-Arch Linux
-ISOLINUX BOOT
-created with 'mkbootcd' written by Tobias Powalowski <tpowa@archlinux.org>
-
-Press ENTER or type 'arch' to boot the CD.
-
-If you wish to change your defaults to boot into your existing system,
-type 'vmlinuz initrd=initrd.img <any_other_boot_option>'
-Use the F2 key for troubleshooting and options.
-------------------------------------------------------------------------------
-
diff --git a/extra/mkbootcd/mkbootcd b/extra/mkbootcd/mkbootcd
deleted file mode 100755
index e7e5e62b1..000000000
--- a/extra/mkbootcd/mkbootcd
+++ /dev/null
@@ -1,143 +0,0 @@
-#! /bin/sh
-# Created by Tobias Powalowski <tpowa@archlinux.org>
-# Settings
-APPNAME=$(basename "${0}")
-CONFIG="/etc/mkbootcd.conf"
-GENIMG=""
-BURN="0"
-BLANK="0"
-GRUB="0"
-TARNAME=""
-export TEMPDIR=$(mktemp /tmp/mkbootcd.XXXX)
-usage ()
-{
- echo "${APPNAME}: usage"
- echo " -g=IMAGE Generate a ISO image as IMAGE"
- echo " -c=CONFIG Use CONFIG file. default: /etc/mkbootcd.conf"
- echo " -B Burn the ISO image after creation"
- echo " -b Blanking media first"
- echo " -grub Use grub instead of isolinux"
- echo " -t=TARNAME Generate a tar image instead of an iso image"
- echo " -h This message."
- exit 1
-}
-
-[ "$1" == "" ] && usage
-
-while [ $# -gt 0 ]; do
- case $1 in
- -c=*|--c=*) CONFIG="$(echo $1 | awk -F= '{print $2;}')" ;;
- -g=*|--g=*) GENIMG="$(echo $1 | awk -F= '{print $2;}')" ;;
- -B|--B) BURN="1" ;;
- -b|--b) BLANK="1" ;;
- -grub|--grub) GRUB="1" ;;
- -t=*|--t=*) TARNAME="$(echo $1 | awk -F= '{print $2;}')" ;;
- -h|--h|?) usage ;;
- *) usage ;;
- esac
- shift
-done
-
-if [ "${TARNAME}" = "" -a "${GENIMG}" = "" ]; then
- echo "ERROR: No image name specified, please use the -g option"
- exit 1
-fi
-
-if [ ! -f "${CONFIG}" ]; then
- echo "config file '${CONFIG}' cannot be found, aborting..."
- exit 1
-fi
-
-. "${CONFIG}"
-# export for mkinitcpio
-[ -n "${APPENDBOOTMESSAGE}" ] && export APPENDBOOTMESSAGE
-[ -n "${APPENDBOOTMESSAGE_SYSLINUX}" ] && export APPENDBOOTMESSAGE_SYSLINUX
-[ -n "${APPENDBOOTMESSAGE_SYSLINUX_LOWMEM}" ] && export APPENDBOOTMESSAGE_SYSLINUX_LOWMEM
-[ -n "${APPENDOPTIONSBOOTMESSAGE}" ] && export APPENDOPTIONSBOOTMESSAGE
-
-if [ "$GRUB" = "1" ]; then
- export RUNPROGRAM="${APPNAME}-grub"
- export BOOTDIRNAME="boot"
-else
- export RUNPROGRAM="${APPNAME}"
- export BOOTDIRNAME="isolinux"
-fi
-[ "${BOOTMESSAGE}" = "" ] && export BOOTMESSAGE=$(mktemp /tmp/bootmessage.XXXX)
-[ "${OPTIONSBOOTMESSAGE}" = "" ] && export OPTIONSBOOTMESSAGE=$(mktemp /tmp/optionsbootmessage.XXXX)
-[ "${ISONAME}" = "" ] && export ISONAME=$(mktemp /tmp/isoname.XXXX)
-export USEKERNEL=${VERSION}
-# begin script
-[ -e ${TEMPDIR} ] && rm -r ${TEMPDIR}
-mkdir -p ${TEMPDIR}/${BOOTDIRNAME}
-if [ "$GRUB" = "1" ]; then
- mkdir ${TEMPDIR}/${BOOTDIRNAME}/grub
- install -m755 /usr/share/grub/i386-pc/stage2_eltorito ${TEMPDIR}/${BOOTDIRNAME}/grub/stage2_eltorito
-else
- install -m755 /usr/lib/syslinux/isolinux.bin ${TEMPDIR}/${BOOTDIRNAME}/isolinux.bin
-fi
-# create isolinux.cfg
-if [ "$GRUB" = "1" ]; then
- echo ":: Creating menu.lst ..."
- [ ! -e "${MENULST}" ] && echo "No menu.lst found" && exit 1
- sed "s|@@PROMPT@@|${PROMPT}|g;s|@@TIMEOUT@@|${TIMEOUT}|g;s|@@KERNEL_BOOT_OPTIONS@@|${KERNEL_BOOT_OPTIONS}|g" \
- ${MENULST} \
- > ${TEMPDIR}/${BOOTDIRNAME}/grub/menu.lst
-else
- echo ":: Creating isolinux.cfg ..."
- if [ "${ISOLINUXCFG}" = "" ]; then
- [ -e ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg ] && rm ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg
- echo "prompt ${PROMPT}" >> ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg
- echo "timeout ${TIMEOUT}" >> ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg
- echo "display boot.msg" >> ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg
- echo "F1 boot.msg" >> ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg
- echo "F2 options.msg" >> ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg
- echo "default arch" >> ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg
- echo "label arch" >> ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg
- echo "kernel vmlinuz" >> ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg
- echo "append initrd=initrd.img ${KERNEL_BOOT_OPTIONS}" >> ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg
- else
- sed "s|@@PROMPT@@|${PROMPT}|g;s|@@TIMEOUT@@|${TIMEOUT}|g;s|@@KERNEL_BOOT_OPTIONS@@|${KERNEL_BOOT_OPTIONS}|g" \
- ${ISOLINUXCFG} > ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg
- fi
- [ ! -s ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg ] && echo "No isolinux.cfg found" && exit 1
-fi
-echo ":: Calling mkinitcpio CONFIG=${MKINITCPIO_CONFIG} KERNEL=${VERSION} ..."
-# generate initramdisk
-echo ":: Creating initramdisk ..."
- mkinitcpio -c ${MKINITCPIO_CONFIG} -k ${VERSION} -g ${TEMPDIR}/${BOOTDIRNAME}/initrd.img
-echo ":: Using ${KERNEL} as image kernel ..."
- install -m644 ${KERNEL} ${TEMPDIR}/${BOOTDIRNAME}/vmlinuz
- install -m644 ${BOOTMESSAGE} ${TEMPDIR}/${BOOTDIRNAME}/boot.msg
- install -m644 ${OPTIONSBOOTMESSAGE} ${TEMPDIR}/${BOOTDIRNAME}/options.msg
- [ ! -s ${TEMPDIR}/${BOOTDIRNAME}/boot.msg ] && echo 'ERROR:no boot.msg found, aborting!' && exit 1
- [ ! -s ${TEMPDIR}/${BOOTDIRNAME}/options.msg ] && echo 'ERROR:no options.msg found, aborting!' && exit 1
-# create image
-if ! [ "${TARNAME}" = "" ]; then
- echo ":: Creating tar image ..."
- [ -e ${TARNAME} ] && rm ${TARNAME}
- rm ${TEMPDIR}/arch/pkg/*.pkg.tar.gz > /dev/null 2>&1
- tar cfv ${TARNAME} ${TEMPDIR} > /dev/null 2>&1 && echo ":: tar Image succesfull created at ${TARNAME}"
-else
- echo ":: Creating ISO image ..."
- [ -e ${GENIMG} ] && rm ${GENIMG}
- [ -s "${ISONAME}" ] && ISONAME=$(cat $ISONAME) || ISONAME="Arch Linux"
- if [ "$GRUB" = "1" ]; then
- mkisofs -RlDJLV "${ISONAME}" -b boot/grub/stage2_eltorito -c boot/boot.cat \
- -no-emul-boot -boot-load-size 4 -boot-info-table -o ${GENIMG} ${TEMPDIR}/ > /dev/null 2>&1
- else
- mkisofs -RlDJLV "${ISONAME}" -b isolinux/isolinux.bin -c isolinux/boot.cat \
- -no-emul-boot -boot-load-size 4 -boot-info-table -o ${GENIMG} ${TEMPDIR}/ > /dev/null 2>&1
- fi
- [ $? -ne 0 ] && echo ":: ISO Image succesfull created at ${GENIMG}"
- # burning/blanking image
- if [ "$BLANK" = "1" ]; then
- echo ":: Blanking media DEVICE=${DEVICE}, BLANKMODE=${BLANKMODE}, SPEED=${SPEED} ..."
- cdrecord dev=${DEVICE} speed=${SPEED} blank=${BLANKMODE} > /dev/null 2>&1 && echo ":: Successfull."
- fi
- if [ "$BURN" = "1" ]; then
- echo ":: Burning ISO image DEVICE=${DEVICE}, SPEED=${SPEED} ..."
- cdrecord dev=${DEVICE} speed=${SPEED} -eject ${GENIMG} > /dev/null 2>&1 && echo ":: Successfull."
- fi
-fi
-# clean /tmp
-rm -r ${TEMPDIR}
diff --git a/extra/mkbootcd/mkbootcd.conf b/extra/mkbootcd/mkbootcd.conf
deleted file mode 100644
index b27be81e6..000000000
--- a/extra/mkbootcd/mkbootcd.conf
+++ /dev/null
@@ -1,38 +0,0 @@
-# Created by Tobias Powalowski <tpowa@archlinux.org>
-# config file of mkbootcd
-
-# DEFAULT kernel boot options like root=/dev/hda3 etc.
-# add your root= option, if you boot from a disk device
-# and don't want to add it by hand on each boot
-KERNEL_BOOT_OPTIONS=""
-
-# mkinitcpio config file, defaulted to stock config file
-MKINITCPIO_CONFIG="/etc/mkinitcpio.conf"
-
-# kernel version, defaulted to build for runtime kernel
-VERSION="$(uname -r)"
-
-# kernel image, defaulted to stock arch kernel
-KERNEL="/boot/vmlinuz26"
-
-# boot message files
-BOOTMESSAGE="/usr/share/mkbootcd/boot.msg"
-OPTIONSBOOTMESSAGE="/usr/share/mkbootcd/options.msg"
-
-# menu.lst or isolinux.cfg file to use
-ISOLINUXCFG=""
-MENULST=""
-
-# Prompt on CD boot, defaulted to yes, 1=yes 0=no
-PROMPT="1"
-
-# Name of the ISO, if empty Arch Linux is used if not set by a HOOK later
-ISONAME=""
-
-# Timeout in seconds on CD boot, defaulted to 0, because we prompt by default
-TIMEOUT="0"
-
-# Setting cdrecord options
-DEVICE=""
-SPEED=""
-BLANKMODE="" \ No newline at end of file
diff --git a/extra/mkbootcd/options.msg b/extra/mkbootcd/options.msg
deleted file mode 100644
index 300922e38..000000000
--- a/extra/mkbootcd/options.msg
+++ /dev/null
@@ -1,6 +0,0 @@
-------------------------------------------------------------------------------
-Arch Linux options and troubleshooting:
-
-- If your system hangs during the boot process, any combinations of the
- boot options noapic acpi=off pci=routeirq nosmp may be useful.
------------------------------------------------------------------------------- \ No newline at end of file
diff --git a/extra/mozilla-common/PKGBUILD b/extra/mozilla-common/PKGBUILD
deleted file mode 100644
index ad7efa3a2..000000000
--- a/extra/mozilla-common/PKGBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-# $Id: PKGBUILD 42378 2009-06-13 13:07:05Z jgc $
-# Maintainer: dale <dale@archlinux.org>
-
-pkgname=mozilla-common
-pkgver=1.4
-pkgrel=1
-pkgdesc="Common Initialization Profile for Mozilla.org products"
-arch=(i686 x86_64)
-license=('GPL')
-url="http://www.mozilla.org/"
-install=mozilla-common.install
-source=(mozilla-common.sh
- mozilla-common.csh)
-md5sums=('39451f6fe87d3cb224e140322c55eb27'
- '924887e41bd96db37029f479befe40cf')
-
-build() {
- install -m755 -d "${pkgdir}/etc/profile.d"
- install -m755 mozilla-common.{,c}sh "${pkgdir}/etc/profile.d/" || return 1
-}
diff --git a/extra/mozilla-common/mozilla-common.csh b/extra/mozilla-common/mozilla-common.csh
deleted file mode 100755
index 09e49c783..000000000
--- a/extra/mozilla-common/mozilla-common.csh
+++ /dev/null
@@ -1 +0,0 @@
-setenv MOZ_PLUGIN_PATH "/usr/lib/mozilla/plugins"
diff --git a/extra/mozilla-common/mozilla-common.install b/extra/mozilla-common/mozilla-common.install
deleted file mode 100644
index dc4228b08..000000000
--- a/extra/mozilla-common/mozilla-common.install
+++ /dev/null
@@ -1,4 +0,0 @@
-post_install() {
- echo "relogin or source /etc/profile.d/mozilla-common.sh"
-}
-# vim:set ts=2 sw=2 et:
diff --git a/extra/mozilla-common/mozilla-common.sh b/extra/mozilla-common/mozilla-common.sh
deleted file mode 100755
index 132b5731e..000000000
--- a/extra/mozilla-common/mozilla-common.sh
+++ /dev/null
@@ -1 +0,0 @@
-export MOZ_PLUGIN_PATH="/usr/lib/mozilla/plugins"
diff --git a/extra/ndesk-dbus-glib/PKGBUILD b/extra/ndesk-dbus-glib/PKGBUILD
deleted file mode 100644
index b25ce9ce5..000000000
--- a/extra/ndesk-dbus-glib/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 33728 2009-04-04 18:41:25Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: tardo <tardo@nagi-fanboi.net>
-
-pkgname=ndesk-dbus-glib
-pkgver=0.4.1
-pkgrel=2
-pkgdesc="C# GLib implementation of D-Bus"
-arch=('i686' 'x86_64')
-url="http://www.ndesk.org/DBusSharp"
-license=('custom')
-depends=('ndesk-dbus>=0.6')
-makedepends=('pkgconfig')
-options=(!makeflags)
-source=(http://www.ndesk.org/archive/dbus-sharp/$pkgname-$pkgver.tar.gz)
-md5sums=('7faf8770b214956fa9de009def550826')
-
-build() {
- cd $startdir/src/$pkgname-$pkgver
- export MONO_SHARED_DIR="${startdir}/src/.wabi"
- mkdir -p "${MONO_SHARED_DIR}"
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
- make || return 1
- make DESTDIR=$startdir/pkg install || return 1
- install -D COPYING $startdir/pkg/usr/share/licenses/$pkgname/COPYING
-}
diff --git a/extra/openjpeg/30_fix_build_for_debian.dpatch b/extra/openjpeg/30_fix_build_for_debian.dpatch
deleted file mode 100644
index afd995054..000000000
--- a/extra/openjpeg/30_fix_build_for_debian.dpatch
+++ /dev/null
@@ -1,70 +0,0 @@
-
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 30_fix_build_for_debian.dpatch by <robin.cornelius@gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Dont apply the -s strip flag to the shared lib debian will do it for us
-## DP: where necessary
-## DP: Remove unnecessary linkage on lstdc++ and lm and add missing linkage for -lm
-
-@DPATCH@
-
-Index: ./Makefile
-===================================================================
---- ./Makefile (revision 96)
-+++ ./Makefile (working copy)
-@@ -18,8 +18,7 @@
- # Converts cr/lf to just lf
- DOS2UNIX = dos2unix
-
--COMPILERFLAGS = -Wall -O3 -ffast-math -std=c99 -fPIC
--LIBRARIES = -lstdc++
-+COMPILERFLAGS = -Wall -O3 -ffast-math -std=c99 -fPIC -g $(EXTRA_CFLAGS)
-
- MODULES = $(SRCS:.c=.o)
- CFLAGS = $(COMPILERFLAGS) $(INCLUDE)
-@@ -54,7 +53,7 @@
- $(AR) r $@ $(MODULES)
-
- $(SHAREDLIB): $(MODULES)
-- $(CC) -s -shared -Wl,-soname,$(LIBNAME) -o $@ $(MODULES) $(LIBRARIES)
-+ $(CC) -shared -Wl,-soname,$(LIBNAME) -o $@ $(MODULES) -lm
-
- install: OpenJPEG
- install -d '$(DESTDIR)$(INSTALL_LIBDIR)' '$(DESTDIR)$(INSTALL_INCLUDE)'
-
-Index: ./indexer_JPIP/Makefile
-===================================================================
---- ./indexer_JPIP/Makefile (revision 95)
-+++ ./indexer_JPIP/Makefile (working copy)
-@@ -1,7 +1,6 @@
- CC = gcc
-
--LDFLAGS = -lm
--CFLAGS = -Wall
-+CFLAGS = -Wall $(EXTRA_CFLAGS)
-
- all: index_create
-
-Index: ./codec/Makefile
-===================================================================
---- ./codec/Makefile (revision 96)
-+++ ./codec/Makefile (working copy)
-@@ -1,13 +1,13 @@
- # Makefile for the main OpenJPEG codecs: j2k_to_image and image_to_j2k
-
--CFLAGS = -O3 -lstdc++ # -g -p -pg
-+CFLAGS = $(EXTRA_CFLAGS) # -g -p -pg
-
- all: j2k_to_image image_to_j2k
-
--j2k_to_image: j2k_to_image.c ../libopenjpeg.a
-+j2k_to_image: j2k_to_image.c
- gcc $(CFLAGS) compat/getopt.c index.c convert.c j2k_to_image.c -o j2k_to_image -L.. -lopenjpeg -I ../libopenjpeg/ -lm -ltiff
-
--image_to_j2k: image_to_j2k.c ../libopenjpeg.a
-+image_to_j2k: image_to_j2k.c
- gcc $(CFLAGS) compat/getopt.c index.c convert.c image_to_j2k.c -o image_to_j2k -L.. -lopenjpeg -I ../libopenjpeg/ -lm -ltiff
-
- clean:
-
diff --git a/extra/smpeg/ChangeLog b/extra/smpeg/ChangeLog
deleted file mode 100644
index 77a784590..000000000
--- a/extra/smpeg/ChangeLog
+++ /dev/null
@@ -1,6 +0,0 @@
-2009-02-07 Eric Belanger <eric@archlinux.org>
-
- * smpeg 0.4.4-5
- * Added gtk and mesa optdepends (close FS#12693)
- * FHS man pages
- * Added ChangeLog
diff --git a/extra/x11vnc/x11vnc.conf b/extra/x11vnc/x11vnc.conf
deleted file mode 100644
index 8a81e3286..000000000
--- a/extra/x11vnc/x11vnc.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Parameters to be passed to x11vnc
-#
-
-X11VNC_ARGS=""
diff --git a/extra/x11vnc/x11vnc.rc b/extra/x11vnc/x11vnc.rc
deleted file mode 100644
index d7bbdd15e..000000000
--- a/extra/x11vnc/x11vnc.rc
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/x11vnc
-
-PID=$(pidof -o %PPID /usr/bin/x11vnc)
-case "$1" in
- start)
- stat_busy "Starting x11vnc"
- [ -z "$PID" ] && /usr/bin/x11vnc $X11VNC_ARGS &> /dev/null &
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon x11vnc
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping x11vnc"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon x11vnc
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/extra/xaos/ChangeLog b/extra/xaos/ChangeLog
deleted file mode 100644
index 7554cd7b3..000000000
--- a/extra/xaos/ChangeLog
+++ /dev/null
@@ -1,24 +0,0 @@
-2010-02-06 Eric Belanger <eric@archlinux.org>
-
- * xaos 3.5-3
- * Added aalib support
- * Removed unneeded depends
- * Improved description
-
-2010-01-19 Eric Belanger <eric@archlinux.org>
-
- * xaos 3.5-2
- * Rebuilt for libpng 1.4 and libjpeg 8
-
-2009-07-21 Eric Belanger <eric@archlinux.org>
-
- * xaos 3.5-1
- * Upstream update
- * Added texinfo depends
-
-2008-11-08 Eric Belanger <eric@archlinux.org>
-
- * xaos 3.4-1
- * Upstream update
- * Added install scriptlet for info file
- * Added ChangeLog
diff --git a/extra/xfce4-session/gdm.patch b/extra/xfce4-session/gdm.patch
deleted file mode 100644
index e89e6a0b6..000000000
--- a/extra/xfce4-session/gdm.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 3bba8eb773a96339fb841c76b04f2d4fd3317814 Mon Sep 17 00:00:00 2001
-From: Panu Matilainen <pmatilai@laiskiainen.org>
-Date: Wed, 23 Mar 2011 21:13:40 +0000
-Subject: Fix GDM_LANG usage to be compatible with GDM3 (bug #7400).
-
----
-diff --git a/xfce4-session/main.c b/xfce4-session/main.c
-index ff6e324..fcf69f8 100644
---- a/xfce4-session/main.c
-+++ b/xfce4-session/main.c
-@@ -103,7 +103,7 @@ setup_environment (void)
-
- /* this is for compatibility with the GNOME Display Manager */
- lang = g_getenv ("GDM_LANG");
-- if (lang != NULL)
-+ if (lang != NULL && strlen (lang) > 0)
- {
- xfce_setenv ("LANG", lang, TRUE);
- xfce_unsetenv ("GDM_LANG");
---
-cgit
diff --git a/extra/xfdesktop/fix-desktop-drag-and-drop.patch b/extra/xfdesktop/fix-desktop-drag-and-drop.patch
deleted file mode 100644
index 8c0c4bcc8..000000000
--- a/extra/xfdesktop/fix-desktop-drag-and-drop.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff --git a/src/xfdesktop-file-icon-manager.c b/src/xfdesktop-file-icon-manager.c
-index 2711646..d3ca2eb 100644
---- a/src/xfdesktop-file-icon-manager.c
-+++ b/src/xfdesktop-file-icon-manager.c
-@@ -2794,7 +2794,7 @@ xfdesktop_file_icon_manager_drag_data_received(XfdesktopIconViewManager *manager
- GFile *tfile = NULL;
- gboolean copy_only = TRUE, drop_ok = FALSE;
- GList *file_list;
--
-+
- if(info == TARGET_XDND_DIRECT_SAVE0) {
- /* we don't suppose XdndDirectSave stage 3, result F, i.e., the app
- * has to save the data itself given the filename we provided in
-@@ -2816,7 +2816,7 @@ xfdesktop_file_icon_manager_drag_data_received(XfdesktopIconViewManager *manager
- /* data is "URL\nTITLE" */
- GFile *source_file = NULL;
- gchar *exo_desktop_item_edit = g_find_program_in_path("exo-desktop-item-edit");
--
-+
- if(drop_icon) {
- GFileInfo *finfo = xfdesktop_file_icon_peek_file_info(XFDESKTOP_FILE_ICON(drop_icon));
- if(g_file_info_get_file_type(finfo) == G_FILE_TYPE_DIRECTORY)
-@@ -2911,8 +2911,15 @@ xfdesktop_file_icon_manager_drag_data_received(XfdesktopIconViewManager *manager
- gchar *dest_basename = g_file_get_basename(l->data);
-
- if(dest_basename && *dest_basename != '\0') {
-- GFile *dest_file = g_file_get_child(base_dest_file, dest_basename);
-- dest_file_list = g_list_prepend(dest_file_list, dest_file);
-+ /* If we copy a file, we need to use the new absolute filename
-+ * as the destination. If we move, we need to use the destination
-+ * directory. */
-+ if(copy_only) {
-+ GFile *dest_file = g_file_get_child(base_dest_file, dest_basename);
-+ dest_file_list = g_list_prepend(dest_file_list, dest_file);
-+ } else {
-+ dest_file_list = g_list_prepend(dest_file_list, base_dest_file);
-+ }
- }
-
- g_free(dest_basename);
-@@ -2923,10 +2930,10 @@ xfdesktop_file_icon_manager_drag_data_received(XfdesktopIconViewManager *manager
- if(dest_file_list) {
- dest_file_list = g_list_reverse(dest_file_list);
-
-- drop_ok =xfdesktop_file_utils_transfer_files(context->action,
-- file_list,
-- dest_file_list,
-- fmanager->priv->gscreen);
-+ drop_ok = xfdesktop_file_utils_transfer_files(context->action,
-+ file_list,
-+ dest_file_list,
-+ fmanager->priv->gscreen);
- }
-
- xfdesktop_file_utils_file_list_free(dest_file_list);
-
-
diff --git a/extra/xfwm4-themes/PKGBUILD b/extra/xfwm4-themes/PKGBUILD
deleted file mode 100644
index 2e6f414e6..000000000
--- a/extra/xfwm4-themes/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# $Id: PKGBUILD 28064 2009-02-27 20:44:58Z andyrtr $
-# Maintainer: Tobias Kieslich <tobias funnychar archlinux.org>
-
-pkgname=xfwm4-themes
-pkgver=4.6.0
-pkgrel=1
-pkgdesc="A set of additionnal themes for the Xfce window manager"
-arch=(i686 x86_64)
-license=('GPL2')
-url="http://www.xfce.org/"
-groups=('xfce4')
-depends=("xfwm4>=${pkgver}")
-makedepends=('pkgconfig')
-options=('!libtool')
-source=(http://www.xfce.org/archive/xfce-${pkgver}/src/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('4dc5cb29cbd40e3b9dece12a85e20854')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
- --localstatedir=/var --disable-static
- make || return 1
- make DESTDIR=${pkgdir} install || return 1
-}
diff --git a/extra/xorg-server/randr-compare-all-the-bytes-in-rrpostpendingproperties.patch b/extra/xorg-server/randr-compare-all-the-bytes-in-rrpostpendingproperties.patch
deleted file mode 100644
index 36d28ded0..000000000
--- a/extra/xorg-server/randr-compare-all-the-bytes-in-rrpostpendingproperties.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From fa425363e3927e86d57f42c4b6e4995d26d6bd0c Mon Sep 17 00:00:00 2001
-From: Aaron Plattner <aplattner@nvidia.com>
-Date: Fri, 29 Jul 2011 23:12:06 +0000
-Subject: randr: Compare all the bytes in RRPostPendingProperties
-
-RRPostPendingProperties tries to compare the pending and current
-property values to decide whether they're actually changing. However,
-it does this using a memcmp that passes in pending_value->size as the
-number of bytes. This is actually the number of elements, where each
-element is (pending_value->format / 8) bytes long. This causes the
-pending value to not be propagated if the first pending_value->size
-bytes are the same and only the end of it is changing.
-
-Fix this by computing the total number of bytes to compare in the
-memcmp.
-
-Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
-Reviewed-by: Keith Packard <keithp@keithp.com>
-Signed-off-by: Keith Packard <keithp@keithp.com>
-(cherry picked from commit 08dfff92e8d0c2b1726634392c147f6634d1706d)
----
-diff --git a/randr/rrproperty.c b/randr/rrproperty.c
-index ba04c16..61e7bb4 100644
---- a/randr/rrproperty.c
-+++ b/randr/rrproperty.c
-@@ -283,7 +283,7 @@ RRPostPendingProperties (RROutputPtr output)
- pending_value->format == current_value->format &&
- pending_value->size == current_value->size &&
- !memcmp (pending_value->data, current_value->data,
-- pending_value->size))
-+ pending_value->size * (pending_value->format / 8)))
- continue;
-
- if (RRChangeOutputProperty (output, property->propertyName,
---
-cgit v0.8.3-6-g21f6