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

[Allan McRae]

    Date: Tuesday, April 28, 2009 @ 09:33:52
  Author: allan
Revision: 36913

Merged revisions 36912 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/tk/trunk

........
  r36912 | allan | 2009-04-28 23:32:40 +1000 (Tue, 28 Apr 2009) | 2 lines
  
  upgpkg: tk 8.5.7-1
      upstream update, add private headers
........

Modified:
  tk/repos/extra-i686/	(properties)
  tk/repos/extra-i686/ChangeLog
  tk/repos/extra-i686/PKGBUILD

-----------+
 ChangeLog |    5 +++++
 PKGBUILD  |   15 ++++++++++++---
 2 files changed, 17 insertions(+), 3 deletions(-)


Property changes on: tk/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /tk/trunk:1-22247
   + /tk/trunk:1-36912

Modified: extra-i686/ChangeLog
===================================================================
--- extra-i686/ChangeLog	2009-04-28 13:32:40 UTC (rev 36912)
+++ extra-i686/ChangeLog	2009-04-28 13:33:52 UTC (rev 36913)
@@ -1,3 +1,8 @@
+2000-04-28  Allan McRae <allan at archlinux.org>
+	* 8.5.7-1 :
+	new upstream release
+	include private headers (FS#14388)
+
 2008-12-24  Allan McRae <allan at archlinux.org>
 	* 8.5.6-1 :
 	new upstream release

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-04-28 13:32:40 UTC (rev 36912)
+++ extra-i686/PKGBUILD	2009-04-28 13:33:52 UTC (rev 36913)
@@ -3,7 +3,7 @@
 # Contributor: Judd Vinet <jvinet at zeroflux.org>
 
 pkgname=tk
-pkgver=8.5.6
+pkgver=8.5.7
 pkgrel=1
 pkgdesc="A windowing toolkit for use with tcl"
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@
 license=('custom')
 depends=("tcl=${pkgver}" 'libxss' 'libxft')
 source=(http://downloads.sourceforge.net/sourceforge/tcl/tk${pkgver}-src.tar.gz)
-md5sums=('7da2e00adddc7eed6080df904579d94e')
+md5sums=('0764f63ae2106b4774c4ecb0ef391610')
 
 build() {
   cd ${srcdir}/tk${pkgver}/unix  
@@ -24,9 +24,18 @@
   make
   make INSTALL_ROOT=${pkgdir} install install-private-headers
   ln -sf wish8.5 ${pkgdir}/usr/bin/wish
+  
+  # install private headers (FS#14388)
+  cd ${srcdir}/tk${pkgver}
+  for dir in compat generic generic/ttk unix; do
+    install -dm755 ${pkgdir}/usr/include/tk-private/$dir
+    install -m644 -t ${pkgdir}/usr/include/tk-private/$dir $dir/*.h
+  done
+
   # install license
-  install -Dm644 ../license.terms ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  install -Dm644 license.terms ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 
+
   # remove buildroot traces / fixes #3602
   sed -i \
   -e "s,^TK_BUILD_LIB_SPEC='-L.*/unix,TK_BUILD_LIB_SPEC='-L/usr/lib," \