[arch-commits] Commit in tk/repos (4 files)
Allan McRae
allan at archlinux.org
Tue Jul 1 10:10:34 UTC 2008
Date: Tuesday, July 1, 2008 @ 06:10:34
Author: allan
Revision: 3829
upgpkg: tk 8.5.3-1
Added:
tk/repos/extra-x86_64/ChangeLog
(from rev 3826, tk/trunk/ChangeLog)
tk/repos/extra-x86_64/xproto-7-0-13.patch
(from rev 3826, tk/trunk/xproto-7-0-13.patch)
Modified:
tk/repos/extra-x86_64/ (properties)
tk/repos/extra-x86_64/PKGBUILD
---------------------+
ChangeLog | 5 +++++
PKGBUILD | 37 +++++++++++++++++++++++--------------
xproto-7-0-13.patch | 13 +++++++++++++
3 files changed, 41 insertions(+), 14 deletions(-)
Property changes on: tk/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
- /tk/trunk:1
+ /tk/trunk:1-3828
Copied: tk/repos/extra-x86_64/ChangeLog (from rev 3826, tk/trunk/ChangeLog)
===================================================================
--- extra-x86_64/ChangeLog (rev 0)
+++ extra-x86_64/ChangeLog 2008-07-01 10:10:34 UTC (rev 3829)
@@ -0,0 +1,5 @@
+2008-07-01 Allan McRae <allan at archlinux.org>
+
+ * 8.5.3-1 :
+ new upstream release
+ added patch for xproto-7.0.13 compatibility
Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2008-07-01 10:04:42 UTC (rev 3828)
+++ extra-x86_64/PKGBUILD 2008-07-01 10:10:34 UTC (rev 3829)
@@ -1,27 +1,36 @@
# $Id$
-# Maintainer: dorphell <dorphell at archlinux.org>
-# Committer: Judd Vinet <jvinet at zeroflux.org>
+# Maintainer: Allan McRae <allan at archlinux.org>
+# Contributor: Judd Vinet <jvinet at zeroflux.org>
+
pkgname=tk
-pkgver=8.5.2
+pkgver=8.5.3
pkgrel=1
pkgdesc="A windowing toolkit for use with tcl"
arch=('i686' 'x86_64')
+url="http://tcl.sourceforge.net/"
license=('custom')
depends=("tcl=${pkgver}" 'libxss' 'libxft')
-source=(http://downloads.sourceforge.net/sourceforge/tcl/tk${pkgver}-src.tar.gz)
-md5sums=('bd014bd3e1a818e06ad375b95241452d')
+source=(http://downloads.sourceforge.net/sourceforge/tcl/tk${pkgver}-src.tar.gz
+ xproto-7-0-13.patch)
+md5sums=('c7d2ef187d0f313850689cda20148ec3'
+ '024f8db9663bd7035feac59aabd7e516')
build() {
- cd ${startdir}/src/tk${pkgver}/unix
-if [ "$CARCH" = "x86_64" ]; then
- ./configure --prefix=/usr --enable-threads --enable-64bit
- else ./configure --prefix=/usr --enable-threads --disable-64bit
-fi
+ cd ${srcdir}/tk${pkgver}
+ patch -Np1 -i ${srcdir}/xproto-7-0-13.patch
+
+ cd ${srcdir}/tk${pkgver}/unix
+ if [ "$CARCH" = "x86_64" ]; then
+ ./configure --prefix=/usr --enable-threads --enable-64bit
+ else
+ ./configure --prefix=/usr --enable-threads --disable-64bit
+ fi
+
make
- make INSTALL_ROOT=${startdir}/pkg install install-private-headers
- ln -sf wish8.5 ${startdir}/pkg/usr/bin/wish
+ make INSTALL_ROOT=${pkgdir} install install-private-headers
+ ln -sf wish8.5 ${pkgdir}/usr/bin/wish
# install license
- install -Dm644 ../license.terms $startdir/pkg/usr/share/licenses/$pkgname/LICENSE
+ install -Dm644 ../license.terms ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
# remove buildroot traces / fixes #3602
sed -i \
@@ -29,5 +38,5 @@
-e "s,^TK_SRC_DIR='.*',TK_SRC_DIR='/usr/include'," \
-e "s,^TK_BUILD_STUB_LIB_SPEC='-L.*/unix,TK_BUILD_STUB_LIB_SPEC='-L/usr/lib," \
-e "s,^TK_BUILD_STUB_LIB_PATH='.*/unix,TK_BUILD_STUB_LIB_PATH='/usr/lib," \
- $startdir/pkg/usr/lib/tkConfig.sh
+ ${pkgdir}/usr/lib/tkConfig.sh
}
Copied: tk/repos/extra-x86_64/xproto-7-0-13.patch (from rev 3826, tk/trunk/xproto-7-0-13.patch)
===================================================================
--- extra-x86_64/xproto-7-0-13.patch (rev 0)
+++ extra-x86_64/xproto-7-0-13.patch 2008-07-01 10:10:34 UTC (rev 3829)
@@ -0,0 +1,13 @@
+diff -urp tk8.5.3-old/generic/tkBind.c tk8.5.3/generic/tkBind.c
+--- tk8.5.3-old/generic/tkBind.c 2007-12-14 01:24:13.000000000 +1000
++++ tk8.5.3/generic/tkBind.c 2008-07-01 16:25:16.000000000 +1000
+@@ -574,6 +574,9 @@ static int flagArray[TK_LASTEVENT] = {
+ /* ColormapNotify */ COLORMAP,
+ /* ClientMessage */ 0,
+ /* MappingNotify */ 0,
++#ifdef GenericEvent
++ /* GenericEvent */ 0,
++#endif
+ /* VirtualEvent */ VIRTUAL,
+ /* Activate */ ACTIVATE,
+ /* Deactivate */ ACTIVATE,
More information about the arch-commits
mailing list