[arch-commits] Commit in tk/repos (4 files)

[Allan McRae]

    Date: Wednesday, August 20, 2008 @ 04:29:04
  Author: allan
Revision: 9873

Merged revisions 8744-9872 via svnmerge from 
svn+ssh://archlinux.org/home/svn-packages/tk/trunk

........
  r9872 | allan | 2008-08-20 18:28:11 +1000 (Wed, 20 Aug 2008) | 2 lines
  
  upgpkg: tk 8.5.4-2
      Remove patch which is no longer need and breaks stuff
........

Modified:
  tk/repos/extra-i686/	(properties)
  tk/repos/extra-i686/ChangeLog
  tk/repos/extra-i686/PKGBUILD
Deleted:
  tk/repos/extra-i686/xproto-7-0-13.patch

---------------------+
 ChangeLog           |    5 +++++
 PKGBUILD            |   11 +++--------
 xproto-7-0-13.patch |   13 -------------
 3 files changed, 8 insertions(+), 21 deletions(-)


Property changes on: tk/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /tk/trunk:1-8743
   + /tk/trunk:1-9872

Modified: extra-i686/ChangeLog
===================================================================
--- extra-i686/ChangeLog	2008-08-20 08:28:11 UTC (rev 9872)
+++ extra-i686/ChangeLog	2008-08-20 08:29:04 UTC (rev 9873)
@@ -1,3 +1,8 @@
+2008-08-20 Allan McRae <allan at archlinux.org>
+
+	* 8.5.4-2 :
+	Remove xproto compatibility patch as no longer needed
+
 2008-08-16 Allan McRae <allan at archlinux.org>
 
 	* 8.5.4-1 :

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-08-20 08:28:11 UTC (rev 9872)
+++ extra-i686/PKGBUILD	2008-08-20 08:29:04 UTC (rev 9873)
@@ -4,21 +4,16 @@
 
 pkgname=tk
 pkgver=8.5.4
-pkgrel=1
+pkgrel=2
 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
-        xproto-7-0-13.patch)
-md5sums=('a6aee7653566ec0b7c4b0f4c24a96f20'
-         '024f8db9663bd7035feac59aabd7e516')
+source=(http://downloads.sourceforge.net/sourceforge/tcl/tk${pkgver}-src.tar.gz)
+md5sums=('a6aee7653566ec0b7c4b0f4c24a96f20')
 
 build() {
-  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 --mandir=/usr/share/man --enable-threads --enable-64bit

Deleted: extra-i686/xproto-7-0-13.patch
===================================================================
--- extra-i686/xproto-7-0-13.patch	2008-08-20 08:28:11 UTC (rev 9872)
+++ extra-i686/xproto-7-0-13.patch	2008-08-20 08:29:04 UTC (rev 9873)
@@ -1,13 +0,0 @@
-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,