Date: Thursday, September 12, 2013 @ 12:15:40 Author: spupykin Revision: 97075
archrelease: copy trunk to community-i686, community-x86_64 Added: tix/repos/community-i686/PKGBUILD (from rev 97074, tix/trunk/PKGBUILD) tix/repos/community-i686/tcl-tk-path.patch (from rev 97074, tix/trunk/tcl-tk-path.patch) tix/repos/community-x86_64/PKGBUILD (from rev 97074, tix/trunk/PKGBUILD) tix/repos/community-x86_64/tcl-tk-path.patch (from rev 97074, tix/trunk/tcl-tk-path.patch) Deleted: tix/repos/community-i686/PKGBUILD tix/repos/community-i686/tcl-tk-path.patch tix/repos/community-x86_64/PKGBUILD tix/repos/community-x86_64/tcl-tk-path.patch ------------------------------------+ /PKGBUILD | 116 +++++++++++++++++++++++++++++++++++ /tcl-tk-path.patch | 44 +++++++++++++ community-i686/PKGBUILD | 46 ------------- community-i686/tcl-tk-path.patch | 22 ------ community-x86_64/PKGBUILD | 46 ------------- community-x86_64/tcl-tk-path.patch | 22 ------ 6 files changed, 160 insertions(+), 136 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2013-09-12 10:15:21 UTC (rev 97074) +++ community-i686/PKGBUILD 2013-09-12 10:15:40 UTC (rev 97075) @@ -1,46 +0,0 @@ -# $Id$ -# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> -# Contributor: Brice Méalier <mealier_br...@yahoo.fr> - -pkgname=tix -pkgver=8.4.3 -pkgrel=4 -pkgdesc="Tk Interface eXtension, a powerful set of user interface components" -arch=(i686 'x86_64') -url="http://tix.sourceforge.net/" -license=("BSD") -depends=('tk' 'libx11') -source=(http://downloads.sourceforge.net/tix/Tix$pkgver-src.tar.gz - tcl-tk-path.patch) -md5sums=('2b8bf4b10a852264678182652f477e59' - 'd4df48da39dd51872d58706a51bab505') - -build() { - cd $srcdir/Tix$pkgver - - patch -p1 <$srcdir/tcl-tk-path.patch - - export CFLAGS="$CFLAGS -DERR_IN_PROGRESS=2" - - ./configure --prefix=/usr - make - make DESTDIR=$pkgdir install - # move things around - - install -m755 tools/tixindex $pkgdir/usr/bin/tixindex - rm -rf $pkgdir/usr/lib/Tix8.4/html - rm -f $pkgdir/usr/lib/Tix8.4/{README.txt,license.terms} - ln -s Tix$pkgver/libTix$pkgver.so $pkgdir/usr/lib/libTix$pkgver.so - - mkdir -p $pkgdir/usr/share/man/man1 - mkdir -p $pkgdir/usr/share/man/man3 - cp -p man/tixwish.1 $pkgdir/usr/share/man/man1 - cd $srcdir/Tix$pkgver/man - for i in *.n; do - cp -p $i $pkgdir/usr/share/man/man3/${i%n}3 - done - - mkdir -p $pkgdir/usr/share/licenses/tix - cp $srcdir/Tix$pkgver/license.terms $pkgdir/usr/share/licenses/tix/ -} - Copied: tix/repos/community-i686/PKGBUILD (from rev 97074, tix/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2013-09-12 10:15:40 UTC (rev 97075) @@ -0,0 +1,58 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> +# Contributor: Brice Méalier <mealier_br...@yahoo.fr> + +pkgname=tix +pkgver=8.4.3 +pkgrel=5 +pkgdesc="Tk Interface eXtension, a powerful set of user interface components" +arch=(i686 'x86_64') +url="http://tix.sourceforge.net/" +license=("BSD") +depends=('tk' 'libx11') +source=("http://downloads.sourceforge.net/tix/Tix$pkgver-src.tar.gz" + "tix-8.4.3-tcl8.6.patch::https://bugs.archlinux.org/task/36882?getfile=10973" + "tcl-tk-path.patch") +md5sums=('2b8bf4b10a852264678182652f477e59' + 'c26297f9e1744dc38308a062ef00549e' + 'd4df48da39dd51872d58706a51bab505') + +prepare() { + cd $srcdir/Tix$pkgver + sed -i -e 's:-Os::g' -i configure tclconfig/tcl.m4 + patch -Np1 -i "${srcdir}/tix-8.4.3-tcl8.6.patch" + sed -i -e 's:generic/tclInt.h:tclInt.h:g' configure + sed -i -e 's:generic/tkInt.h:tkInt.h:g' configure +} + +build() { + cd $srcdir/Tix$pkgver + + export CFLAGS="$CFLAGS -DERR_IN_PROGRESS=2" + [[ $CARCH == "x86_64" ]] && BIT="--enable-64bit" + + ./configure --prefix=/usr \ + --with-tcl=/usr/lib \ + --with-tk=/usr/lib \ + $BIT \ + + make + make DESTDIR=$pkgdir install + # move things around + + install -m755 tools/tixindex $pkgdir/usr/bin/tixindex + rm -rf $pkgdir/usr/lib/Tix8.4/html + rm -f $pkgdir/usr/lib/Tix8.4/{README.txt,license.terms} + ln -s Tix$pkgver/libTix$pkgver.so $pkgdir/usr/lib/libTix$pkgver.so + + mkdir -p $pkgdir/usr/share/man/man1 + mkdir -p $pkgdir/usr/share/man/man3 + cp -p man/tixwish.1 $pkgdir/usr/share/man/man1 + cd $srcdir/Tix$pkgver/man + for i in *.n; do + cp -p $i $pkgdir/usr/share/man/man3/${i%n}3 + done + + mkdir -p $pkgdir/usr/share/licenses/tix + cp $srcdir/Tix$pkgver/license.terms $pkgdir/usr/share/licenses/tix/ +} Deleted: community-i686/tcl-tk-path.patch =================================================================== --- community-i686/tcl-tk-path.patch 2013-09-12 10:15:21 UTC (rev 97074) +++ community-i686/tcl-tk-path.patch 2013-09-12 10:15:40 UTC (rev 97075) @@ -1,22 +0,0 @@ -diff -wbBur Tix8.4.3/configure Tix8.4.3.my/configure ---- Tix8.4.3/configure 2008-02-28 04:35:01.000000000 +0000 -+++ Tix8.4.3.my/configure 2009-12-28 10:57:33.000000000 +0000 -@@ -6645,7 +6645,7 @@ - ;; - esac - else -- if test ! -f "${TCL_SRC_DIR}/generic/tclInt.h" ; then -+ if test ! -f "${TCL_SRC_DIR}/tclInt.h" ; then - { { echo "$as_me:$LINENO: error: Cannot find private header tclInt.h in ${TCL_SRC_DIR}" >&5 - echo "$as_me: error: Cannot find private header tclInt.h in ${TCL_SRC_DIR}" >&2;} - { (exit 1); exit 1; }; } -@@ -6700,7 +6700,7 @@ - ;; - esac - else -- if test ! -f "${TK_SRC_DIR}/generic/tkInt.h" ; then -+ if test ! -f "${TK_SRC_DIR}/tk-private/generic/tkInt.h" ; then - { { echo "$as_me:$LINENO: error: Cannot find private header tkInt.h in ${TK_SRC_DIR}" >&5 - echo "$as_me: error: Cannot find private header tkInt.h in ${TK_SRC_DIR}" >&2;} - { (exit 1); exit 1; }; } - Copied: tix/repos/community-i686/tcl-tk-path.patch (from rev 97074, tix/trunk/tcl-tk-path.patch) =================================================================== --- community-i686/tcl-tk-path.patch (rev 0) +++ community-i686/tcl-tk-path.patch 2013-09-12 10:15:40 UTC (rev 97075) @@ -0,0 +1,22 @@ +diff -wbBur Tix8.4.3/configure Tix8.4.3.my/configure +--- Tix8.4.3/configure 2008-02-28 04:35:01.000000000 +0000 ++++ Tix8.4.3.my/configure 2009-12-28 10:57:33.000000000 +0000 +@@ -6645,7 +6645,7 @@ + ;; + esac + else +- if test ! -f "${TCL_SRC_DIR}/generic/tclInt.h" ; then ++ if test ! -f "${TCL_SRC_DIR}/tclInt.h" ; then + { { echo "$as_me:$LINENO: error: Cannot find private header tclInt.h in ${TCL_SRC_DIR}" >&5 + echo "$as_me: error: Cannot find private header tclInt.h in ${TCL_SRC_DIR}" >&2;} + { (exit 1); exit 1; }; } +@@ -6700,7 +6700,7 @@ + ;; + esac + else +- if test ! -f "${TK_SRC_DIR}/generic/tkInt.h" ; then ++ if test ! -f "${TK_SRC_DIR}/tk-private/generic/tkInt.h" ; then + { { echo "$as_me:$LINENO: error: Cannot find private header tkInt.h in ${TK_SRC_DIR}" >&5 + echo "$as_me: error: Cannot find private header tkInt.h in ${TK_SRC_DIR}" >&2;} + { (exit 1); exit 1; }; } + Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2013-09-12 10:15:21 UTC (rev 97074) +++ community-x86_64/PKGBUILD 2013-09-12 10:15:40 UTC (rev 97075) @@ -1,46 +0,0 @@ -# $Id$ -# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> -# Contributor: Brice Méalier <mealier_br...@yahoo.fr> - -pkgname=tix -pkgver=8.4.3 -pkgrel=4 -pkgdesc="Tk Interface eXtension, a powerful set of user interface components" -arch=(i686 'x86_64') -url="http://tix.sourceforge.net/" -license=("BSD") -depends=('tk' 'libx11') -source=(http://downloads.sourceforge.net/tix/Tix$pkgver-src.tar.gz - tcl-tk-path.patch) -md5sums=('2b8bf4b10a852264678182652f477e59' - 'd4df48da39dd51872d58706a51bab505') - -build() { - cd $srcdir/Tix$pkgver - - patch -p1 <$srcdir/tcl-tk-path.patch - - export CFLAGS="$CFLAGS -DERR_IN_PROGRESS=2" - - ./configure --prefix=/usr - make - make DESTDIR=$pkgdir install - # move things around - - install -m755 tools/tixindex $pkgdir/usr/bin/tixindex - rm -rf $pkgdir/usr/lib/Tix8.4/html - rm -f $pkgdir/usr/lib/Tix8.4/{README.txt,license.terms} - ln -s Tix$pkgver/libTix$pkgver.so $pkgdir/usr/lib/libTix$pkgver.so - - mkdir -p $pkgdir/usr/share/man/man1 - mkdir -p $pkgdir/usr/share/man/man3 - cp -p man/tixwish.1 $pkgdir/usr/share/man/man1 - cd $srcdir/Tix$pkgver/man - for i in *.n; do - cp -p $i $pkgdir/usr/share/man/man3/${i%n}3 - done - - mkdir -p $pkgdir/usr/share/licenses/tix - cp $srcdir/Tix$pkgver/license.terms $pkgdir/usr/share/licenses/tix/ -} - Copied: tix/repos/community-x86_64/PKGBUILD (from rev 97074, tix/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2013-09-12 10:15:40 UTC (rev 97075) @@ -0,0 +1,58 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> +# Contributor: Brice Méalier <mealier_br...@yahoo.fr> + +pkgname=tix +pkgver=8.4.3 +pkgrel=5 +pkgdesc="Tk Interface eXtension, a powerful set of user interface components" +arch=(i686 'x86_64') +url="http://tix.sourceforge.net/" +license=("BSD") +depends=('tk' 'libx11') +source=("http://downloads.sourceforge.net/tix/Tix$pkgver-src.tar.gz" + "tix-8.4.3-tcl8.6.patch::https://bugs.archlinux.org/task/36882?getfile=10973" + "tcl-tk-path.patch") +md5sums=('2b8bf4b10a852264678182652f477e59' + 'c26297f9e1744dc38308a062ef00549e' + 'd4df48da39dd51872d58706a51bab505') + +prepare() { + cd $srcdir/Tix$pkgver + sed -i -e 's:-Os::g' -i configure tclconfig/tcl.m4 + patch -Np1 -i "${srcdir}/tix-8.4.3-tcl8.6.patch" + sed -i -e 's:generic/tclInt.h:tclInt.h:g' configure + sed -i -e 's:generic/tkInt.h:tkInt.h:g' configure +} + +build() { + cd $srcdir/Tix$pkgver + + export CFLAGS="$CFLAGS -DERR_IN_PROGRESS=2" + [[ $CARCH == "x86_64" ]] && BIT="--enable-64bit" + + ./configure --prefix=/usr \ + --with-tcl=/usr/lib \ + --with-tk=/usr/lib \ + $BIT \ + + make + make DESTDIR=$pkgdir install + # move things around + + install -m755 tools/tixindex $pkgdir/usr/bin/tixindex + rm -rf $pkgdir/usr/lib/Tix8.4/html + rm -f $pkgdir/usr/lib/Tix8.4/{README.txt,license.terms} + ln -s Tix$pkgver/libTix$pkgver.so $pkgdir/usr/lib/libTix$pkgver.so + + mkdir -p $pkgdir/usr/share/man/man1 + mkdir -p $pkgdir/usr/share/man/man3 + cp -p man/tixwish.1 $pkgdir/usr/share/man/man1 + cd $srcdir/Tix$pkgver/man + for i in *.n; do + cp -p $i $pkgdir/usr/share/man/man3/${i%n}3 + done + + mkdir -p $pkgdir/usr/share/licenses/tix + cp $srcdir/Tix$pkgver/license.terms $pkgdir/usr/share/licenses/tix/ +} Deleted: community-x86_64/tcl-tk-path.patch =================================================================== --- community-x86_64/tcl-tk-path.patch 2013-09-12 10:15:21 UTC (rev 97074) +++ community-x86_64/tcl-tk-path.patch 2013-09-12 10:15:40 UTC (rev 97075) @@ -1,22 +0,0 @@ -diff -wbBur Tix8.4.3/configure Tix8.4.3.my/configure ---- Tix8.4.3/configure 2008-02-28 04:35:01.000000000 +0000 -+++ Tix8.4.3.my/configure 2009-12-28 10:57:33.000000000 +0000 -@@ -6645,7 +6645,7 @@ - ;; - esac - else -- if test ! -f "${TCL_SRC_DIR}/generic/tclInt.h" ; then -+ if test ! -f "${TCL_SRC_DIR}/tclInt.h" ; then - { { echo "$as_me:$LINENO: error: Cannot find private header tclInt.h in ${TCL_SRC_DIR}" >&5 - echo "$as_me: error: Cannot find private header tclInt.h in ${TCL_SRC_DIR}" >&2;} - { (exit 1); exit 1; }; } -@@ -6700,7 +6700,7 @@ - ;; - esac - else -- if test ! -f "${TK_SRC_DIR}/generic/tkInt.h" ; then -+ if test ! -f "${TK_SRC_DIR}/tk-private/generic/tkInt.h" ; then - { { echo "$as_me:$LINENO: error: Cannot find private header tkInt.h in ${TK_SRC_DIR}" >&5 - echo "$as_me: error: Cannot find private header tkInt.h in ${TK_SRC_DIR}" >&2;} - { (exit 1); exit 1; }; } - Copied: tix/repos/community-x86_64/tcl-tk-path.patch (from rev 97074, tix/trunk/tcl-tk-path.patch) =================================================================== --- community-x86_64/tcl-tk-path.patch (rev 0) +++ community-x86_64/tcl-tk-path.patch 2013-09-12 10:15:40 UTC (rev 97075) @@ -0,0 +1,22 @@ +diff -wbBur Tix8.4.3/configure Tix8.4.3.my/configure +--- Tix8.4.3/configure 2008-02-28 04:35:01.000000000 +0000 ++++ Tix8.4.3.my/configure 2009-12-28 10:57:33.000000000 +0000 +@@ -6645,7 +6645,7 @@ + ;; + esac + else +- if test ! -f "${TCL_SRC_DIR}/generic/tclInt.h" ; then ++ if test ! -f "${TCL_SRC_DIR}/tclInt.h" ; then + { { echo "$as_me:$LINENO: error: Cannot find private header tclInt.h in ${TCL_SRC_DIR}" >&5 + echo "$as_me: error: Cannot find private header tclInt.h in ${TCL_SRC_DIR}" >&2;} + { (exit 1); exit 1; }; } +@@ -6700,7 +6700,7 @@ + ;; + esac + else +- if test ! -f "${TK_SRC_DIR}/generic/tkInt.h" ; then ++ if test ! -f "${TK_SRC_DIR}/tk-private/generic/tkInt.h" ; then + { { echo "$as_me:$LINENO: error: Cannot find private header tkInt.h in ${TK_SRC_DIR}" >&5 + echo "$as_me: error: Cannot find private header tkInt.h in ${TK_SRC_DIR}" >&2;} + { (exit 1); exit 1; }; } +