summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2013-01-03 00:38:37 -0800
committerroot <root@rshg054.dnsready.net>2013-01-03 00:38:37 -0800
commitf2bbb5646aefe9ea6502524fbf4d0138cee8b2a1 (patch)
treef8dcab5e1ac3d149a39377f3437d9d3f812e62f9
parentfa3e18ade0ab762a414c45ec433025d96b71254b (diff)
Thu Jan 3 00:38:37 PST 2013
-rw-r--r--community/avrdude/PKGBUILD4
-rw-r--r--community/cgminer/PKGBUILD7
-rw-r--r--community/goocanvas1/PKGBUILD9
-rw-r--r--community/ibus-anthy/PKGBUILD13
-rw-r--r--community/ibus-anthy/ibus-anthy.install11
-rw-r--r--community/libgexiv2/PKGBUILD10
-rw-r--r--community/xmobar/PKGBUILD18
-rw-r--r--extra/dosfstools/PKGBUILD12
-rw-r--r--extra/dosfstools/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch25
-rw-r--r--extra/git/PKGBUILD15
-rw-r--r--extra/git/fix-git-build-python.patch109
-rw-r--r--extra/re-alpine/PKGBUILD13
-rw-r--r--extra/soundtouch/PKGBUILD19
-rw-r--r--libre/kdepim-libre/PKGBUILD307
-rw-r--r--libre/kdepim-libre/kdepim-kleopatra.install12
-rw-r--r--libre/kdepim-libre/kdepim-kmail.install12
-rw-r--r--libre/kdepim-libre/kdepim-knode.install12
-rw-r--r--libre/kdepim-libre/kdepim-korganizer.install12
-rw-r--r--libre/kdepim-libre/kdepim-ktnef.install12
-rw-r--r--libre/kdepim-libre/kdepim.install11
-rw-r--r--pcr/luabind/PKGBUILD53
-rw-r--r--pcr/luabind/luabind_boost.patch59
22 files changed, 695 insertions, 60 deletions
diff --git a/community/avrdude/PKGBUILD b/community/avrdude/PKGBUILD
index ee235f8a7..9d71d347b 100644
--- a/community/avrdude/PKGBUILD
+++ b/community/avrdude/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 60059 2011-12-04 15:21:41Z jelle $
+# $Id: PKGBUILD 81870 2013-01-02 15:51:02Z jelle $
# Contributor: Corrado Primier <bardo@aur.archlinux.org>
# Maintainer: Brad Fanella <bradfanella@archlinux.us>
pkgname=avrdude
pkgver=5.11.1
-pkgrel=1
+pkgrel=2
pkgdesc="Download/upload/manipulate the ROM and EEPROM contents of AVR microcontrollers"
arch=('i686' 'x86_64')
url="http://www.nongnu.org/avrdude/"
diff --git a/community/cgminer/PKGBUILD b/community/cgminer/PKGBUILD
index 378b00845..48be6d113 100644
--- a/community/cgminer/PKGBUILD
+++ b/community/cgminer/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 81650 2012-12-26 01:18:51Z fyan $
+# $Id: PKGBUILD 81884 2013-01-03 04:27:41Z fyan $
# Maintainer: Felix Yan <felixonmars@gmail.com>
# Contributor: monson <holymonson@gmail.com>
# Contributor: Thomas Dziedzic < gostrc at gmail >
# Contributor: David Manouchehri <david@davidmanouchehri.com>
pkgname=cgminer
-pkgver=2.10.3
+pkgver=2.10.4
_build=
pkgrel=1
pkgdesc="Multi-threaded multi-pool CPU and GPU miner for bitcoin, forked from cpuminer."
@@ -50,7 +50,8 @@ package() {
sed 's#/usr/local/bin#/usr/bin#g' example.conf > $pkgname.conf
install -Dm644 $pkgname.conf "$pkgdir"/etc/$pkgname.conf
}
-md5sums=('6c4851d2c86558432477104e9925d23b'
+
+md5sums=('f165e9060796d07b031aacc9468536f4'
'fe4a243fabe24608f5c05e40f0f118f6'
'ee39698273671fee0e98d4af16014c36'
'bd76fc92fedce18c59ccea2aa79cc664')
diff --git a/community/goocanvas1/PKGBUILD b/community/goocanvas1/PKGBUILD
index f0124333e..f07afd059 100644
--- a/community/goocanvas1/PKGBUILD
+++ b/community/goocanvas1/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 56150 2011-10-02 11:40:26Z ibiru $
+# $Id: PKGBUILD 81872 2013-01-02 15:56:34Z jelle $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: William Rea <sillywilly@gmail.com>
pkgname=goocanvas1
pkgver=1.0.0
-pkgrel=1
+pkgrel=2
pkgdesc="A cairo canvas widget for GTK+"
arch=(i686 x86_64)
url="http://live.gnome.org/GooCanvas"
@@ -24,3 +24,8 @@ package() {
cd $srcdir/goocanvas-$pkgver
make DESTDIR=$pkgdir install
}
+check() {
+ cd $srcdir/goocanvas-$pkgver
+ make check
+
+}
diff --git a/community/ibus-anthy/PKGBUILD b/community/ibus-anthy/PKGBUILD
index a97a36fd0..cc646ff72 100644
--- a/community/ibus-anthy/PKGBUILD
+++ b/community/ibus-anthy/PKGBUILD
@@ -1,20 +1,21 @@
-# $Id: PKGBUILD 79278 2012-11-02 10:15:38Z bpiotrowski $
+# $Id: PKGBUILD 81882 2013-01-03 03:41:12Z fyan $
+# Maintainer: Felix Yan <felixonmars@gmail.com>
# Contributor: Rainy <rainylau(at)gmail(dot)com>
# Contributor: Lee.MaRS <leemars at gmail dot com>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
pkgname=ibus-anthy
-pkgver=1.4.99.20121006
+pkgver=1.5.0
pkgrel=1
pkgdesc='Japanese input method Anthy IMEngine for IBus Framework'
arch=('i686' 'x86_64')
license=('LGPL')
url='http://ibus.googlecode.com'
-depends=('ibus' 'anthy' 'python2' 'pygtk')
+depends=('ibus' 'anthy' 'python2' 'pygtk' 'gtk-update-icon-cache')
makedepends=('swig' 'intltool')
options=('!libtool')
+install=$pkgname.install
source=(http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
-md5sums=('518aa503ce40054e0027f2a79c9df640')
build() {
cd $srcdir/$pkgname-$pkgver
@@ -32,3 +33,5 @@ package() {
cd $srcdir/$pkgname-$pkgver
make DESTDIR=$pkgdir/ install
}
+
+md5sums=('4ff000bec3c342f5cd5a6d9e05a4abdf')
diff --git a/community/ibus-anthy/ibus-anthy.install b/community/ibus-anthy/ibus-anthy.install
new file mode 100644
index 000000000..6b1b64bdd
--- /dev/null
+++ b/community/ibus-anthy/ibus-anthy.install
@@ -0,0 +1,11 @@
+post_install() {
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
diff --git a/community/libgexiv2/PKGBUILD b/community/libgexiv2/PKGBUILD
index deab9eb1a..0ee1f9d67 100644
--- a/community/libgexiv2/PKGBUILD
+++ b/community/libgexiv2/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 74838 2012-08-06 23:09:09Z andrea $
+# $Id: PKGBUILD 81868 2013-01-02 15:41:00Z jelle $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
pkgname=libgexiv2
-pkgver=0.4.1
-pkgrel=3
+pkgver=0.5.0
+pkgrel=1
pkgdesc="GObject-based wrapper around the Exiv2 library."
arch=('i686' 'x86_64')
url="http://redmine.yorba.org/projects/gexiv2"
license=('GPL2')
depends=('exiv2' 'glib2')
options=('!libtool')
-source=(http://yorba.org/download/gexiv2/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('b74cd19a4cf4a4a32a938ecb267974c29e630dc2')
+source=("http://yorba.org/download/gexiv2/0.5/$pkgname-$pkgver.tar.xz")
+md5sums=('655528168648fd681a061bddaabc79ee')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/xmobar/PKGBUILD b/community/xmobar/PKGBUILD
index 6d64134e9..8da30d456 100644
--- a/community/xmobar/PKGBUILD
+++ b/community/xmobar/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 80796 2012-12-03 20:58:24Z jelle $
+# $Id: PKGBUILD 81878 2013-01-02 19:55:16Z jelle $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
pkgname=xmobar
pkgver=0.16
-pkgrel=3
+pkgrel=4
pkgdesc="A Minimalistic Text Based Status Bar"
url="http://hackage.haskell.org/package/xmobar"
license=('custom:BSD3')
@@ -13,20 +13,18 @@ depends=('gmp' 'libxft' 'libxinerama' 'wireless_tools' 'libxrandr')
makedepends=('ghc=7.6.1-1' 'haskell-x11=1.6.0.2' 'haskell-x11-xft=0.3.1' 'haskell-utf8-string'
'haskell-stm>=2.3' 'haskell-parsec>=3.1' 'haskell-mtl>=2')
options=('strip')
-source=(http://hackage.haskell.org/packages/archive/xmobar/$pkgver/xmobar-$pkgver.tar.gz
-0001-Update-usage-of-catch-to-catchIOError-since-catch-ha.patch)
-md5sums=('b470f8253f8d2b014f59e9d657cc7ddd'
- '149583c19ac3d0ad829f3138342bb9db')
+source=(http://hackage.haskell.org/packages/archive/xmobar/$pkgver/xmobar-$pkgver.tar.gz)
+md5sums=('4742f1556a8e9b292f18df1176dcd378')
+
build() {
- cd ${srcdir}/xmobar
- patch -Np1 -i $srcdir/0001-Update-usage-of-catch-to-catchIOError-since-catch-ha.patch
+ cd ${srcdir}/xmobar-$pkgver
- runhaskell Setup configure --disable-optimization --prefix=/usr --flags="with_threaded with_utf8 with_xft with_iwlib"
+ runhaskell Setup configure --disable-optimization --prefix=/usr --flags="with_utf8 with_xft with_iwlib"
runhaskell Setup build
}
package() {
- cd ${srcdir}/xmobar
+ cd ${srcdir}/xmobar-$pkgver
runhaskell Setup copy --destdir=${pkgdir}
install -D -m644 license ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
}
diff --git a/extra/dosfstools/PKGBUILD b/extra/dosfstools/PKGBUILD
index 764b471d0..fbe672432 100644
--- a/extra/dosfstools/PKGBUILD
+++ b/extra/dosfstools/PKGBUILD
@@ -1,20 +1,23 @@
-# $Id: PKGBUILD 173425 2012-12-19 14:56:38Z tpowa $
+# $Id: PKGBUILD 174137 2013-01-02 14:44:16Z tpowa $
# Maintainer: dorphell <dorphell@archlinux.org>
# Committer: Judd Vinet <jvinet@zeroflux.org>
pkgname=dosfstools
pkgver=3.0.13
-pkgrel=1
+pkgrel=2
pkgdesc="DOS filesystem utilities"
arch=(i686 x86_64)
depends=('glibc')
#source=(http://www.daniel-baumann.ch/software/dosfstools/$pkgname-$pkgver.tar.xz)
# using debian source, main page is down since quite some time
-source=(http://ftp.de.debian.org/debian/pool/main/d/dosfstools/dosfstools_3.0.13.orig.tar.xz)
+source=(http://ftp.de.debian.org/debian/pool/main/d/dosfstools/dosfstools_3.0.13.orig.tar.xz
+ dosfstools-3.0.12-fix-alloc-rootdir-entry.patch)
url="http://www.daniel-baumann.ch/software/dosfstools/"
license=('GPL2')
build() {
cd $srcdir/$pkgname-$pkgver
+ # fix https://bugs.archlinux.org/task/33248
+ patch -Np1 -i ${srcdir}/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch
make
}
@@ -22,4 +25,5 @@ package () {
cd $srcdir/$pkgname-$pkgver
make PREFIX=$pkgdir MANDIR=$pkgdir/usr/share/man DOCDIR=$pkgdir/usr/share/doc install
}
-md5sums=('c1d851e3fc065a935c7cf919545d239f')
+md5sums=('c1d851e3fc065a935c7cf919545d239f'
+ 'c2be6f2cd1d47297b2d6a8ba237e04eb')
diff --git a/extra/dosfstools/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch b/extra/dosfstools/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch
new file mode 100644
index 000000000..44e6e86b5
--- /dev/null
+++ b/extra/dosfstools/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch
@@ -0,0 +1,25 @@
+--- dosfstools-3.0.12/src/check.c.old 2010-01-23 10:13:17.000000000 +0100
++++ dosfstools-3.0.12/src/check.c 2011-01-31 17:43:31.462674941 +0100
+@@ -174,7 +174,10 @@
+ offset = fs->root_start + next_free * sizeof(DIR_ENT);
+ memset(de, 0, sizeof(DIR_ENT));
+ while (1) {
+- sprintf((char *)de->name, pattern, curr_num);
++ char expanded[12];
++ sprintf(expanded, pattern, curr_num);
++ memcpy(de->name, expanded, 8);
++ memcpy(de->ext, expanded + 8, 3);
+ for (scan = 0; scan < fs->root_entries; scan++)
+ if (scan != next_free &&
+ !strncmp((const char *)root[scan].name,
+--- dosfstools-3.0.12/src/fat.c
++++ dosfstools-3.0.12/src/fat.c
+@@ -474,7 +474,7 @@ void reclaim_file(DOS_FS * fs)
+ DIR_ENT de;
+ loff_t offset;
+ files++;
+- offset = alloc_rootdir_entry(fs, &de, "FSCK%04d");
++ offset = alloc_rootdir_entry(fs, &de, "FSCK%04dREC");
+ de.start = CT_LE_W(i & 0xffff);
+ if (fs->fat_bits == 32)
+ de.starthi = CT_LE_W(i >> 16);
diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD
index e409042f9..e8de55002 100644
--- a/extra/git/PKGBUILD
+++ b/extra/git/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 173917 2012-12-28 04:30:01Z dan $
+# $Id: PKGBUILD 174135 2013-01-02 14:21:11Z dan $
# Maintainer: Dan McGee <dan@archlinux.org>
pkgname=git
-pkgver=1.8.0.3
+pkgver=1.8.1
pkgrel=1
pkgdesc="the fast distributed version control system"
arch=(i686 x86_64)
@@ -28,11 +28,13 @@ source=("http://git-core.googlecode.com/files/git-$pkgver.tar.gz"
git-daemon
git-daemon.conf
git-daemon@.service
- git-daemon.socket)
+ git-daemon.socket
+ fix-git-build-python.patch)
build() {
export PYTHON_PATH='/usr/bin/python2'
cd "$srcdir/$pkgname-$pkgver"
+ patch -Np1 < ../fix-git-build-python.patch
make prefix=/usr gitexecdir=/usr/lib/git-core \
CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
USE_LIBPCRE=1 \
@@ -109,9 +111,10 @@ package() {
install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket
}
-md5sums=('6a32290550c9e8aa55aeb6e8db9c183f'
- '962ba4fb286372386c83c3712d1fd59a'
+md5sums=('a2c6f4404c5e432b47474d246ca83c7e'
+ '8da825142aed9f37f80ad67164990373'
'8e2648910fd5dd4f1c41d3c7fa9e9156'
'2e42bf97779a1c6411d89043334c9e78'
'042524f942785772d7bd52a1f02fe5ae'
- 'f67869315c2cc112e076f0c73f248002')
+ 'f67869315c2cc112e076f0c73f248002'
+ '7fd505fdcd0cd0223e5b8ad641090de8')
diff --git a/extra/git/fix-git-build-python.patch b/extra/git/fix-git-build-python.patch
new file mode 100644
index 000000000..11618a49a
--- /dev/null
+++ b/extra/git/fix-git-build-python.patch
@@ -0,0 +1,109 @@
+Date: Wed, 2 Jan 2013 03:59:35 -0500
+From: Jeff King <peff@peff.net>
+To: Junio C Hamano <gitster@pobox.com>
+Cc: Dan McGee <dan@archlinux.org>, GIT Mailing-list <git@vger.kernel.org>,
+ Florian Achleitner <florian.achleitner.2.6.31@gmail.com>,
+ David Michael Barr <b@rr-dav.id.au>,
+ "Eric S. Raymond" <esr@thyrsus.com>
+Subject: Re: Test failures with python versions when building git 1.8.1
+Message-ID: <20130102085935.GB9328@sigill.intra.peff.net>
+References: <CAEik5nOqge8ix4WGf-h+0Dmz1CanH_XtQdB-CxvPsggSu1-LzQ@mail.gmail.com>
+ <7va9ss5fhq.fsf@alter.siamese.dyndns.org>
+ <20130102065345.GA8685@sigill.intra.peff.net>
+ <7v1ue459yh.fsf@alter.siamese.dyndns.org>
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf-8
+Content-Disposition: inline
+In-Reply-To: <7v1ue459yh.fsf@alter.siamese.dyndns.org>
+
+On Tue, Jan 01, 2013 at 11:18:46PM -0800, Junio C Hamano wrote:
+
+> Jeff King <peff@peff.net> writes:
+>
+> > [1] This symlink is doubly wrong, because any use of symbolic links
+> > in the test scripts needs to depend on the SYMLINKS prereq, and this
+> > does not.
+>
+> Yeah, I think we have discussed this once already in
+>
+> http://thread.gmane.org/gmane.comp.version-control.git/210688/focus=210714
+
+Thanks for the pointer; it looks like nothing productive came of the
+earlier discussion. To give a hat trick of failure to this line of code,
+I notice that the existing code also does not properly put quotes around
+$GIT_BUILD_DIR.
+
+> > [2] In both the current code and what I showed above, the test scripts
+> > depend on things in contrib/. This is probably a bad idea in
+> > general, as the quality of what goes into contrib is not as closely
+> > watched (especially with respect to things like portability).
+> > Certainly I would not have known to look more carefully at a patch
+> > to contrib/svn-fe for breakage to the test suite.
+>
+> As long as such tests are made skippable with appropriate
+> prerequisites, I do not think it is bad to have their tests in t/; I
+> would say it is rather better than having them in contrib/ and leave
+> it not run by anybody, which happened to some of the stuff in
+> contrib/ already.
+
+Good point. While my sense of decorum wants to keep contrib totally
+split out, from a practical point of view, it is better to have more
+people run the tests and report failures than not.
+
+Whether we end up doing something with contrib and tests or not, the
+patch below gives a minimal fix in the meantime. Dan, does it fix your
+problem?
+
+-- >8 --
+Subject: [PATCH] t9020: don't run python from $PATH
+
+In t9020, we symlink in a python script from contrib to help
+with the testing. However, we don't munge its #!-line, which
+means we may run the wrong python (we want the one in
+PYTHON_PATH). On top of this, we use a symlink without
+checking the SYMLINKS prereq, and we fail to properly quote
+GIT_BUILD_DIR, which may have spaces.
+
+Instead of symlinking, let's just write a small script which
+will feed the contrib script to PYTHON_PATH. To avoid
+quoting issues, we just export the variables the script
+needs to run.
+
+Signed-off-by: Jeff King <peff@peff.net>
+---
+ t/t9020-remote-svn.sh | 5 ++++-
+ t/test-lib.sh | 2 +-
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/t/t9020-remote-svn.sh b/t/t9020-remote-svn.sh
+index 4f2dfe0..416623b 100755
+--- a/t/t9020-remote-svn.sh
++++ b/t/t9020-remote-svn.sh
+@@ -14,7 +14,10 @@ export PATH="$HOME:$PATH"
+
+ # We override svnrdump by placing a symlink to the svnrdump-emulator in .
+ export PATH="$HOME:$PATH"
+-ln -sf $GIT_BUILD_DIR/contrib/svn-fe/svnrdump_sim.py "$HOME/svnrdump"
++export GIT_BUILD_DIR
++write_script svnrdump <<\EOF
++exec "$PYTHON_PATH" "$GIT_BUILD_DIR"/contrib/svn-fe/svnrdump_sim.py "$@"
++EOF
+
+ init_git () {
+ rm -fr .git &&
+diff --git a/t/test-lib.sh b/t/test-lib.sh
+index f50f834..c17db19 100644
+--- a/t/test-lib.sh
++++ b/t/test-lib.sh
+@@ -45,7 +45,7 @@ fi
+ fi
+
+ . "$GIT_BUILD_DIR"/GIT-BUILD-OPTIONS
+-export PERL_PATH SHELL_PATH
++export PERL_PATH SHELL_PATH PYTHON_PATH
+
+ # if --tee was passed, write the output not only to the terminal, but
+ # additionally to the file test-results/$BASENAME.out, too.
+--
+1.8.1.rc3.4.gf3a2f57
+
diff --git a/extra/re-alpine/PKGBUILD b/extra/re-alpine/PKGBUILD
index 92043c7a3..bb3ce25ef 100644
--- a/extra/re-alpine/PKGBUILD
+++ b/extra/re-alpine/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 146303 2012-01-09 01:01:51Z eric $
+# $Id: PKGBUILD 174144 2013-01-03 03:51:33Z eric $
# Maintainer: Eric Bélanger <eric@archlinux.org>
# Contributor: Smith Dhumbumroong <zodmaner@gmail.com>
pkgname=re-alpine
-pkgver=2.02
-pkgrel=3
+pkgver=2.03
+pkgrel=1
pkgdesc="The continuation of the Alpine email client from University of Washington"
arch=('i686' 'x86_64')
url="http://sourceforge.net/projects/re-alpine/"
@@ -12,15 +12,10 @@ license=('APACHE')
depends=('libldap' 'krb5')
optdepends=('aspell: spell-checking support'
'hunspell: spell-checking support')
-provides=('pine' 'alpine')
-conflicts=('pine' 'alpine')
-replaces=('pine' 'alpine')
options=('!makeflags')
source=(http://downloads.sourceforge.net/project/re-alpine/${pkgname}-${pkgver}.tar.bz2
maildir.patch)
-md5sums=('5e75826b15f05674856be8618bdefdfb'
- '8d7a0e8d940e84e978f50266405c7361')
-sha1sums=('9c2f13dbc7ca75e7a09f81df607db84694b10fa6'
+sha1sums=('8e1c4f4a4d38814478e8bd3bbeed1c0f8ee9491b'
'c09a8e42f9dba3e63a3755a9c418af95da721d8d')
build() {
diff --git a/extra/soundtouch/PKGBUILD b/extra/soundtouch/PKGBUILD
index e27054573..40b2c87a4 100644
--- a/extra/soundtouch/PKGBUILD
+++ b/extra/soundtouch/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 136036 2011-08-21 23:32:17Z eric $
+# $Id: PKGBUILD 174146 2013-01-03 05:00:13Z eric $
# Maintainer: Eric Bélanger <eric@archlinux.org>
pkgname=soundtouch
-pkgver=1.6.0
+pkgver=1.7.1
pkgrel=1
pkgdesc="An audio processing library"
arch=('i686' 'x86_64')
@@ -10,22 +10,13 @@ url="http://www.surina.net/soundtouch/"
license=('LGPL')
depends=('gcc-libs')
options=('!libtool')
-source=(http://www.surina.net/soundtouch/${pkgname}-${pkgver}.tar.gz
- soundtouch-1.4.0-mmx-sse-compile-fix.patch
- soundtouch-1.4.0-x86_64-asm-broken.patch)
-md5sums=('aa1c63d4d67b033f044a6a48d2be5bdd'
- '108cd080b4b0ebe8ed1f950ff1315e7a'
- '0d856bb5b519b18c6ba3a2e1770bdfd2')
-sha1sums=('9871dcbf75a68665a3515bb9dda4727beb0358e7'
- '7a245aacadcb3003e73c1c202c8de0ecc09283ac'
- '95282cca856b3b8645fadb530ce5eb892074f193')
+source=(http://www.surina.net/soundtouch/${pkgname}-${pkgver}.tar.gz)
+sha1sums=('8b1a461754853f9c7328571449b7f9b8bd578a89')
build() {
cd "${srcdir}/${pkgname}"
- patch -p1 -i "${srcdir}/soundtouch-1.4.0-mmx-sse-compile-fix.patch"
- patch -p1 -i "${srcdir}/soundtouch-1.4.0-x86_64-asm-broken.patch"
-
[ "${CARCH}" = "x86_64" ] && CONFIGFLAG="--with-pic"
+ sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADER/' configure.ac
./bootstrap
./configure --prefix=/usr --enable-shared ${CONFIGFLAG}
make
diff --git a/libre/kdepim-libre/PKGBUILD b/libre/kdepim-libre/PKGBUILD
new file mode 100644
index 000000000..9f90eb367
--- /dev/null
+++ b/libre/kdepim-libre/PKGBUILD
@@ -0,0 +1,307 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Pierre Schmitz <pierre@archlinux.de>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+
+_pkgbase=kdepim
+pkgbase=kdepim-libre
+pkgname=('kdepim-akonadiconsole-libre'
+ 'kdepim-akregator-libre'
+ 'kdepim-blogilo-libre'
+ 'kdepim-console-libre'
+ 'kdepim-kaddressbook-libre'
+ 'kdepim-kalarm-libre'
+ 'kdepim-kjots-libre'
+ 'kdepim-kleopatra-libre'
+ 'kdepim-kmail-libre'
+ 'kdepim-knode-libre'
+ 'kdepim-knotes-libre'
+ 'kdepim-kontact-libre'
+ 'kdepim-korganizer-libre'
+ 'kdepim-kresources-libre'
+ 'kdepim-ktimetracker-libre'
+ 'kdepim-ktnef-libre'
+ 'kdepim-libkdepim-libre')
+pkgver=4.9.4
+pkgrel=1
+arch=('i686' 'x86_64' 'mips64el')
+url='http://pim.kde.org'
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdepim-libre')
+makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'kde-agent')
+source=("http://download.kde.org/stable/${pkgver}/src/${_pkgbase}-${pkgver}.tar.xz")
+sha1sums=('f383306430705ff2af14518b9be90448bf857398')
+
+build() {
+ mkdir build
+ cd build
+ cmake ../${_pkgbase}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DKDEPIM_BUILD_MOBILE=OFF
+ make
+}
+
+package_kdepim-akonadiconsole-libre() {
+ pkgdesc='Akonadi Management and Debugging Console (without nonfree pilot-link support)'
+ depends=('kdepim-libkdepim')
+ url='http://pim.kde.org'
+ replaces=('kdepim-akonadiconsole')
+ conflicts=('kdepim-akonadiconsole')
+ provides=("kdepim-akonadiconsole=${pkgver}")
+ install='kdepim.install'
+ cd "${srcdir}"/build/akonadiconsole
+ make DESTDIR="${pkgdir}" install
+}
+
+package_kdepim-akregator-libre() {
+ pkgdesc='A Feed Reader for KDE (without nonfree pilot-link support)'
+ depends=('kdepim-libkdepim')
+ url="http://kde.org/applications/internet/akregator/"
+ replaces=('kdepim-akregator')
+ conflicts=('kdepim-akregator')
+ provides=("kdepim-akregator=${pkgver}")
+ install='kdepim.install'
+ cd "${srcdir}"/build/akregator
+ make DESTDIR="${pkgdir}" install
+ cd "${srcdir}"/build/doc/akregator
+ make DESTDIR="${pkgdir}" install
+ cd "${srcdir}"/build/kontact/plugins/akregator
+ make DESTDIR="${pkgdir}" install
+}
+
+package_kdepim-blogilo-libre() {
+ pkgdesc='A KDE Blogging Client (without nonfree pilot-link support)'
+ depends=('kdepim-runtime')
+ url="http://kde.org/applications/internet/blogilo/"
+ replaces=('kdepim-blogilo' 'blogilo')
+ conflicts=('kdepim-blogilo' 'blogilo')
+ provides=("kdepim-blogilo=${pkgver}")
+ install='kdepim.install'
+ cd "${srcdir}"/build/blogilo
+ make DESTDIR="${pkgdir}" install
+ cd "${srcdir}"/build/doc/blogilo
+ make DESTDIR="${pkgdir}" install
+}
+
+package_kdepim-console-libre() {
+ pkgdesc='Command line tool for accessing calendar files (without nonfree pilot-link support)'
+ depends=('kdepim-runtime')
+ url='http://pim.kde.org'
+ replaces=('kdepim-console')
+ conflicts=('kdepim-console')
+ provides=("kdepim-console=${pkgver}")
+ install='kdepim.install'
+ cd "${srcdir}"/build/console
+ make DESTDIR="${pkgdir}" install
+ cd "${srcdir}"/build/doc/kabcclient
+ make DESTDIR="${pkgdir}" install
+ cd "${srcdir}"/build/doc/konsolekalendar
+ make DESTDIR="${pkgdir}" install
+}
+
+package_kdepim-kaddressbook-libre() {
+ pkgdesc='Contact Manager (without nonfree pilot-link support)'
+ depends=('kdepim-libkdepim')
+ url="http://kde.org/applications/office/kaddressbook/"
+ replaces=('kdepim-kaddressbook')
+ conflicts=('kdepim-kaddressbook')
+ provides=("kdepim-kaddressbook=${pkgver}")
+ install='kdepim.install'
+ cd "${srcdir}"/build/kaddressbook
+ make DESTDIR="${pkgdir}" install
+ cd "${srcdir}"/build/kontact/plugins/kaddressbook
+ make DESTDIR="${pkgdir}" install
+ cd "${srcdir}"/build/plugins/kaddressbook
+ make DESTDIR="${pkgdir}" install
+}
+
+package_kdepim-kalarm-libre() {
+ pkgdesc='Personal Alarm Scheduler (without nonfree pilot-link support)'
+ depends=('kdepim-libkdepim')
+ url="http://kde.org/applications/utilities/kalarm/"
+ replaces=('kdepim-kalarm')
+ conflicts=('kdepim-kalarm')
+ provides=("kdepim-kalarm=${pkgver}")
+ install='kdepim.install'
+ cd "${srcdir}"/build/kalarm
+ make DESTDIR="${pkgdir}" install
+ cd "${srcdir}"/build/doc/kalarm
+ make DESTDIR="${pkgdir}" install
+}
+
+package_kdepim-kjots-libre() {
+ pkgdesc='Note Taker (without nonfree pilot-link support)'
+ depends=('kdepim-libkdepim')
+ url="http://kde.org/applications/utilities/kjots/"
+ replaces=('kdepim-kjots')
+ conflicts=('kdepim-kjots')
+ provides=("kdepim-kjots=${pkgver}")
+ install='kdepim.install'
+ cd "${srcdir}"/build/kjots
+ make DESTDIR="${pkgdir}" install
+ cd "${srcdir}"/build/doc/kjots
+ make DESTDIR="${pkgdir}" install
+ cd "${srcdir}"/build/kontact/plugins/kjots
+ make DESTDIR="${pkgdir}" install
+}
+
+package_kdepim-kleopatra-libre() {
+ pkgdesc='Certificate Manager and Unified Crypto GUI (without nonfree pilot-link support)'
+ depends=('kdepim-libkdepim')
+ install='kdepim-kleopatra.install'
+ url="http://kde.org/applications/utilities/kleopatra/"
+ replaces=('kdepim-kleopatra')
+ conflicts=('kdepim-kleopatra')
+ provides=("kdepim-kleopatra=${pkgver}")
+ cd "${srcdir}"/build/kleopatra
+ make DESTDIR="${pkgdir}" install
+ cd "${srcdir}"/build/doc/kleopatra
+ make DESTDIR="${pkgdir}" install
+ cd "${srcdir}"/build/doc/kwatchgnupg
+ make DESTDIR="${pkgdir}" install
+}
+
+package_kdepim-kmail-libre() {
+ pkgdesc='Mail Client (without nonfree pilot-link support)'
+ depends=('kdepim-libkdepim')
+ url="http://kde.org/applications/internet/kmail/"
+ install='kdepim-kmail.install'
+ conflicts=('kdepim-kmail' 'kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve'
+ 'kdepim-mimelib' 'kdepim-plugins')
+ replaces=('kdepim-kmail' 'kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve'
+ 'kdepim-mimelib' 'kdepim-plugins')
+ provides=("kdepim-kmail=${pkgver}")
+ for i in kmail doc/kmail kmailcvt archivemailagent backupmail \
+ importwizard ksendemail libksieve messagelist mailfilteragent \
+ mailimporter ontologies kontact/plugins/kmail; do
+ cd "${srcdir}"/build/${i}
+ make DESTDIR="${pkgdir}" install
+ done
+}
+
+package_kdepim-knode-libre() {
+ pkgdesc='News Reader (without nonfree pilot-link support)'
+ depends=('kdepim-libkdepim')
+ url="http://kde.org/applications/internet/knode/"
+ replaces=('kdepim-knode')
+ conflicts=('kdepim-knode')
+ provides=("kdepim-knode=${pkgver}")
+ install='kdepim-knode.install'
+ cd "${srcdir}"/build/knode
+ make DESTDIR="${pkgdir}" install
+ cd "${srcdir}"/build/doc/knode
+ make DESTDIR="${pkgdir}" install
+ cd "${srcdir}"/build/doc/kioslave/news
+ make DESTDIR="${pkgdir}" install
+ cd "${srcdir}"/build/kontact/plugins/knode
+ make DESTDIR="${pkgdir}" install
+}
+
+package_kdepim-knotes-libre() {
+ pkgdesc='Popup Notes (without nonfree pilot-link support)'
+ depends=('kdepim-libkdepim')
+ url="http://kde.org/applications/utilities/knotes/"
+ replaces=('kdepim-knotes')
+ conflicts=('kdepim-knotes')
+ provides=("kdepim-knotes=${pkgver}")
+ install='kdepim.install'
+ cd "${srcdir}"/build/knotes
+ make DESTDIR="${pkgdir}" install
+ cd "${srcdir}"/build/doc/knotes
+ make DESTDIR="${pkgdir}" install
+ cd "${srcdir}"/build/kontact/plugins/knotes
+ make DESTDIR="${pkgdir}" install
+}
+
+package_kdepim-kontact-libre() {
+ pkgdesc='Personal Information Manager (without nonfree pilot-link support)'
+ depends=('kdepim-libkdepim')
+ url="http://kde.org/applications/office/kontact/"
+ install='kdepim.install'
+ conflicts=('kdepim-kontact' 'kdepim-kontactinterfaces')
+ replaces=('kdepim-kontact' 'kdepim-kontactinterfaces')
+ provides=("kdepim-kontact=${pkgver}")
+ for i in kontact/src doc/kontact kontact/plugins/summary \
+ kontact/plugins/specialdates doc/kontact-admin; do
+ cd "${srcdir}"/build/${i}
+ make DESTDIR="${pkgdir}" install
+ done
+}
+
+package_kdepim-korganizer-libre() {
+ pkgdesc='Calendar and Scheduling Program (without nonfree pilot-link support)'
+ depends=('kdepim-libkdepim')
+ url="http://kde.org/applications/office/korganizer"
+ replaces=('kdepim-korganizer')
+ conflicts=('kdepim-korganizer')
+ provides=("kdepim-korganizer=${pkgver}")
+ install='kdepim-korganizer.install'
+ for i in korganizer doc/korganizer kontact/plugins/korganizer \
+ calendarviews; do
+ cd "${srcdir}"/build/${i}
+ make DESTDIR="${pkgdir}" install
+ done
+}
+
+package_kdepim-kresources-libre() {
+ pkgdesc='KDE PIM resources (without nonfree pilot-link support)'
+ depends=('kdepim-libkdepim')
+ url='http://pim.kde.org'
+ replaces=('kdepim-kresources')
+ conflicts=('kdepim-kresources')
+ provides=("kdepim-kresources=${pkgver}")
+ cd "${srcdir}"/build/kresources
+ make DESTDIR="${pkgdir}" install
+}
+
+package_kdepim-ktimetracker-libre() {
+ pkgdesc='Personal Time Tracker (without nonfree pilot-link support)'
+ depends=('kdepim-kresources')
+ url="http://kde.org/applications/utilities/ktimetracker/"
+ replaces=('kdepim-ktimetracker')
+ conflicts=('kdepim-ktimetracker')
+ provides=("kdepim-ktimetracker=${pkgver}")
+ install='kdepim.install'
+ cd "${srcdir}"/build/ktimetracker
+ make DESTDIR="${pkgdir}" install
+ cd "${srcdir}"/build/doc/ktimetracker
+ make DESTDIR="${pkgdir}" install
+ cd "${srcdir}"/build/kontact/plugins/ktimetracker
+ make DESTDIR="${pkgdir}" install
+}
+
+package_kdepim-ktnef-libre() {
+ pkgdesc='A viewer/extractor for TNEF files (without nonfree pilot-link support)'
+ depends=('kdebase-runtime' 'kdepimlibs')
+ url="https://projects.kde.org/projects/kde/kdepim/ktnef"
+ replaces=('kdepim-ktnef')
+ conflicts=('kdepim-ktnef')
+ provides=("kdepim-ktnef=${pkgver}")
+ install=kdepim-ktnef.install
+ cd "${srcdir}"/build/ktnef
+ make DESTDIR="${pkgdir}" install
+ cd "${srcdir}"/build/doc/ktnef
+ make DESTDIR="${pkgdir}" install
+}
+
+package_kdepim-libkdepim-libre() {
+ pkgdesc='Library for KDE PIM (without nonfree pilot-link support)'
+ groups=()
+ depends=('kde-agent' 'kdepim-runtime')
+ url='http://pim.kde.org'
+ conflicts=('kdepim-libkdepim' 'kdepim-icons' 'kdepim-libkleo'
+ 'kdepim-libkpgp' 'kdepim-strigi-analyzer' 'kdepim-akonadi')
+ replaces=('kdepim-libkdepim' 'kdepim-icons' 'kdepim-libkleo'
+ 'kdepim-libkpgp' 'kdepim-strigi-analyzer' 'kdepim-akonadi')
+ provides=("kdepim-libkdepim=${pkgver}")
+ for i in akonadi_next calendarsupport incidenceeditor-ng \
+ kdgantt2 libkdepim libkdepimdbusinterfaces libkleo libkpgp \
+ mailcommon messagecomposer messagecore messageviewer icons \
+ strigi-analyzer templateparser plugins/messageviewer \
+ plugins/ktexteditor; do
+ cd "${srcdir}"/build/${i}
+ make DESTDIR="${pkgdir}" install
+ done
+}
diff --git a/libre/kdepim-libre/kdepim-kleopatra.install b/libre/kdepim-libre/kdepim-kleopatra.install
new file mode 100644
index 000000000..5787df72f
--- /dev/null
+++ b/libre/kdepim-libre/kdepim-kleopatra.install
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
diff --git a/libre/kdepim-libre/kdepim-kmail.install b/libre/kdepim-libre/kdepim-kmail.install
new file mode 100644
index 000000000..5787df72f
--- /dev/null
+++ b/libre/kdepim-libre/kdepim-kmail.install
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
diff --git a/libre/kdepim-libre/kdepim-knode.install b/libre/kdepim-libre/kdepim-knode.install
new file mode 100644
index 000000000..5787df72f
--- /dev/null
+++ b/libre/kdepim-libre/kdepim-knode.install
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
diff --git a/libre/kdepim-libre/kdepim-korganizer.install b/libre/kdepim-libre/kdepim-korganizer.install
new file mode 100644
index 000000000..5787df72f
--- /dev/null
+++ b/libre/kdepim-libre/kdepim-korganizer.install
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
diff --git a/libre/kdepim-libre/kdepim-ktnef.install b/libre/kdepim-libre/kdepim-ktnef.install
new file mode 100644
index 000000000..5787df72f
--- /dev/null
+++ b/libre/kdepim-libre/kdepim-ktnef.install
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
diff --git a/libre/kdepim-libre/kdepim.install b/libre/kdepim-libre/kdepim.install
new file mode 100644
index 000000000..e70c054ec
--- /dev/null
+++ b/libre/kdepim-libre/kdepim.install
@@ -0,0 +1,11 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
diff --git a/pcr/luabind/PKGBUILD b/pcr/luabind/PKGBUILD
new file mode 100644
index 000000000..da47f927b
--- /dev/null
+++ b/pcr/luabind/PKGBUILD
@@ -0,0 +1,53 @@
+# $Id: PKGBUILD 78820 2012-10-25 06:47:28Z foutrelis $
+# Maintainer: Jakob Gruber <jakob.gruber@gmail.com>
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor: rayte <rabyte.at.gmail.dot.com>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+
+pkgname=luabind
+pkgver=0.9.1
+pkgrel=3
+pkgdesc='A library that helps you create bindings between C++ and Lua'
+arch=(
+ i686
+ x86_64
+ mips64el
+)
+url="http://www.rasterbar.com/products/$pkgname.html"
+license=MIT
+makedepends=(
+ boost
+ boost-build
+ unzip
+)
+depends=(
+ gcc-libs
+ lua51
+)
+source=(
+ "http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
+ ${pkgname}_boost.patch
+)
+md5sums=(
+ 8a323fb51d07dad5cfdb12c432793d55
+ d62ae6fc635300bc659df9dbb587ac53
+)
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+
+ patch -Np1 -i $srcdir/${pkgname}_boost.patch
+
+ # build luabind
+ setarch $CARCH bjam release --prefix=$pkgdir/usr link=static,shared
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+
+ setarch $CARCH bjam release --prefix=$pkgdir/usr link=static,shared install
+
+ # copy license
+ install -Dm644 $srcdir/$pkgname-$pkgver/LICENSE \
+ $pkgdir/usr/share/licenses/$pkgname/LICENSE
+}
diff --git a/pcr/luabind/luabind_boost.patch b/pcr/luabind/luabind_boost.patch
new file mode 100644
index 000000000..92e32828a
--- /dev/null
+++ b/pcr/luabind/luabind_boost.patch
@@ -0,0 +1,59 @@
+diff --git luabind-0.9.1/luabind/detail/call_function.hpp luabind-0.9.1-fixed/luabind/detail/call_function.hpp
+index 1b45ec1..8f5afff 100644
+--- luabind-0.9.1/luabind/detail/call_function.hpp
++++ luabind-0.9.1-fixed/luabind/detail/call_function.hpp
+@@ -323,7 +323,8 @@ namespace luabind
+
+ #endif // LUABIND_CALL_FUNCTION_HPP_INCLUDED
+
+-#elif BOOST_PP_ITERATION_FLAGS() == 1
++#else
++#if BOOST_PP_ITERATION_FLAGS() == 1
+
+ #define LUABIND_TUPLE_PARAMS(z, n, data) const A##n *
+ #define LUABIND_OPERATOR_PARAMS(z, n, data) const A##n & a##n
+@@ -440,4 +441,5 @@ namespace luabind
+
+
+ #endif
++#endif
+
+diff --git luabind-0.9.1/luabind/detail/call_member.hpp luabind-0.9.1-fixed/luabind/detail/call_member.hpp
+index de8d563..e63555b 100644
+--- luabind-0.9.1/luabind/detail/call_member.hpp
++++ luabind-0.9.1-fixed/luabind/detail/call_member.hpp
+@@ -316,7 +316,8 @@ namespace luabind
+
+ #endif // LUABIND_CALL_MEMBER_HPP_INCLUDED
+
+-#elif BOOST_PP_ITERATION_FLAGS() == 1
++#else
++#if BOOST_PP_ITERATION_FLAGS() == 1
+
+ #define LUABIND_TUPLE_PARAMS(z, n, data) const A##n *
+ #define LUABIND_OPERATOR_PARAMS(z, n, data) const A##n & a##n
+@@ -360,4 +361,5 @@ namespace luabind
+ #undef LUABIND_TUPLE_PARAMS
+
+ #endif
++#endif
+
+diff --git luabind-0.9.1/luabind/wrapper_base.hpp luabind-0.9.1-fixed/luabind/wrapper_base.hpp
+index d54c668..0f88cc5 100755
+--- luabind-0.9.1/luabind/wrapper_base.hpp
++++ luabind-0.9.1-fixed/luabind/wrapper_base.hpp
+@@ -89,7 +89,8 @@ namespace luabind
+
+ #endif // LUABIND_WRAPPER_BASE_HPP_INCLUDED
+
+-#elif BOOST_PP_ITERATION_FLAGS() == 1
++#else
++#if BOOST_PP_ITERATION_FLAGS() == 1
+
+ #define LUABIND_TUPLE_PARAMS(z, n, data) const A##n *
+ #define LUABIND_OPERATOR_PARAMS(z, n, data) const A##n & a##n
+@@ -188,3 +189,4 @@ namespace luabind
+ #undef N
+
+ #endif
++#endif