diff options
Diffstat (limited to 'source/x/m17n-lib')
| -rw-r--r-- | source/x/m17n-lib/internal-flt.h | 53 | ||||
| -rw-r--r-- | source/x/m17n-lib/m17n-docs_makefile.patch | 31 | ||||
| -rwxr-xr-x | source/x/m17n-lib/m17n-lib.SlackBuild | 89 |
3 files changed, 48 insertions, 125 deletions
diff --git a/source/x/m17n-lib/internal-flt.h b/source/x/m17n-lib/internal-flt.h deleted file mode 100644 index e47dbb1fa..000000000 --- a/source/x/m17n-lib/internal-flt.h +++ /dev/null @@ -1,53 +0,0 @@ -/* internal-flt.h -- common header file for the internal FLT API. - Copyright (C) 2007 - National Institute of Advanced Industrial Science and Technology (AIST) - Registration Number H15PRO112 - - This file is part of the m17n library. - - The m17n library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public License - as published by the Free Software Foundation; either version 2.1 of - the License, or (at your option) any later version. - - The m17n library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the m17n library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - 02111-1307, USA. */ - -#ifndef _M_INTERNAL_FLT_H -#define _M_INTERNAL_FLT_H - -#define MAKE_COMBINING_CODE(base_y, base_x, add_y, add_x, off_y, off_x) \ - (((off_y) << 16) \ - | ((off_x) << 8) \ - | ((base_x) << 6) \ - | ((base_y) << 4) \ - | ((add_x) << 2) \ - | (add_y)) - -#define COMBINING_CODE_OFF_Y(code) ((((code) >> 16) & 0xFF) - 128) -#define COMBINING_CODE_OFF_X(code) ((((code) >> 8) & 0xFF) - 128) -#define COMBINING_CODE_BASE_X(code) (((code) >> 6) & 0x3) -#define COMBINING_CODE_BASE_Y(code) (((code) >> 4) & 0x3) -#define COMBINING_CODE_ADD_X(code) (((code) >> 2) & 0x3) -#define COMBINING_CODE_ADD_Y(code) ((code) & 0x3) - -#define MAKE_COMBINING_CODE_BY_CLASS(class) (0x1000000 | class) - -#define COMBINING_BY_CLASS_P(code) ((code) & 0x1000000) - -#define COMBINING_CODE_CLASS(code) ((code) & 0xFFFFFF) - -#define MAKE_PRECOMPUTED_COMBINDING_CODE() (0x2000000) - -#define COMBINING_PRECOMPUTED_P(code) ((code) & 0x2000000) - -extern MSymbol Mcombining; - -#endif /* _M_INTERNAL_FLT_H */ diff --git a/source/x/m17n-lib/m17n-docs_makefile.patch b/source/x/m17n-lib/m17n-docs_makefile.patch deleted file mode 100644 index 11f88ef3f..000000000 --- a/source/x/m17n-lib/m17n-docs_makefile.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- Makefile.in.orig 2007-12-28 02:15:49.000000000 +0100 -+++ Makefile.in 2008-01-29 13:43:46.000000000 +0100 -@@ -676,20 +676,20 @@ - - - install-pkgdataDATA: $(pkgdata_DATA) -- $(mkinstalldirs) $(pkgdatadir)/html -- $(mkinstalldirs) $(mandir)/man1 $(mandir)/man3 $(mandir)/man5 -- $(INSTALL_DATA) usr/latex/m17n-lib.dvi $(pkgdatadir)/m17n-lib.dvi -- $(INSTALL_DATA) usr/latex/m17n-lib.ps $(pkgdatadir)/m17n-lib.ps -+ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/html -+ $(mkinstalldirs) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man3 $(DESTDIR)$(mandir)/man5 -+ $(INSTALL_DATA) usr/latex/m17n-lib.dvi $(DESTDIR)$(pkgdatadir)/m17n-lib.dvi -+ $(INSTALL_DATA) usr/latex/m17n-lib.ps $(DESTDIR)$(pkgdatadir)/m17n-lib.ps - cd usr/html; \ - for f in *.html *.png; do \ -- $(INSTALL_DATA) $$f $(pkgdatadir)/html/$$f; \ -+ $(INSTALL_DATA) $$f $(DESTDIR)$(pkgdatadir)/html/$$f; \ - done - cd man/man1; \ -- for f in *.1; do $(INSTALL_DATA) $$f $(mandir)/man1/$$f; done -+ for f in *.1; do $(INSTALL_DATA) $$f $(DESTDIR)$(mandir)/man1/$$f; done - cd man/man3; \ -- for f in *.3m17n; do $(INSTALL_DATA) $$f $(mandir)/man3/$$f; done -+ for f in *.3m17n; do $(INSTALL_DATA) $$f $(DESTDIR)$(mandir)/man3/$$f; done - cd man/man5; \ -- for f in *.5; do $(INSTALL_DATA) $$f $(mandir)/man5/$$f; done -+ for f in *.5; do $(INSTALL_DATA) $$f $(DESTDIR)$(mandir)/man5/$$f; done - - @MAINTAINER_MODE_TRUE@usr-html html-usr: ${HTML_USR_TARGET} - @MAINTAINER_MODE_TRUE@ja-html html-ja: ${HTML_JA_TARGET} diff --git a/source/x/m17n-lib/m17n-lib.SlackBuild b/source/x/m17n-lib/m17n-lib.SlackBuild index 02a5d29dc..82cc38ad3 100755 --- a/source/x/m17n-lib/m17n-lib.SlackBuild +++ b/source/x/m17n-lib/m17n-lib.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Copyright 2008, 2009 Eric Hameleers, Eindhoven, NL -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN USA +# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN USA # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -33,14 +33,24 @@ # ----------------------------------------------------------------------------- -PRGNAM=m17n-lib +PKGNAM=m17n-lib SHORTNAM=m17n -VERSION=${VERSION:-1.5.4} -DBVERSION=${DBVERSION:-1.5.4} -DOCVERSION=${DOCVERSION:-1.5.2} -ARCH=${ARCH:-x86_64} +VERSION=${VERSION:-1.6.1} +DBVERSION=${DBVERSION:-1.6.1} +# Won't build && are not maintained for current version +#DOCVERSION=${DOCVERSION:-1.5.5} BUILD=${BUILD:-1} +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + NUMJOBS=${NUMJOBS:-" -j7 "} DOCS="ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README TODO" @@ -49,11 +59,11 @@ DOCS_DOC="AUTHORS COPYING ChangeLog INSTALL NEWS README" CWD=$(pwd) TMP=${TMP:-/tmp} -PKG=$TMP/package-$PRGNAM +PKG=$TMP/package-$PKGNAM -SOURCE[0]="$CWD/${PRGNAM}-${VERSION}.tar.gz" -SOURCE[1]="$CWD/${SHORTNAM}-db-${DBVERSION}.tar.gz" -SOURCE[2]="$CWD/${SHORTNAM}-docs-${DOCVERSION}.tar.gz" +SOURCE[0]="$CWD/${PKGNAM}-${VERSION}.tar.xz" +SOURCE[1]="$CWD/${SHORTNAM}-db-${DBVERSION}.tar.xz" +#SOURCE[2]="$CWD/${SHORTNAM}-docs-${DOCVERSION}.tar.xz" if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" @@ -73,19 +83,16 @@ elif [ "$ARCH" = "armel" ]; then fi rm -rf $PKG -mkdir -p $TMP/build-${PRGNAM} $PKG +mkdir -p $TMP/build-${PKGNAM} $PKG -cd $TMP/build-${PRGNAM} +cd $TMP/build-${PKGNAM} for (( i = 0; i < ${#SOURCE[*]}; i++ )) ; do - tar -xvf ${SOURCE[$i]} || exit 1 + tar xvf ${SOURCE[$i]} || exit 1 done chown -R root:root * chmod -R u+w,go+r-w,a-s * -# Patch the docs makefile: -( cd $SHORTNAM-docs-$DOCVERSION - cat $CWD/${SHORTNAM}-docs_makefile.patch | patch -p0 --verbose || exit 1 -) -cd ${PRGNAM}-${VERSION} + +cd ${PKGNAM}-${VERSION} # Add the missing internal-flt.h file: [ ! -r src/internal-flt.h ] && cp $CWD/internal-flt.h src/ @@ -125,32 +132,32 @@ make $NUMJOBS || make || exit 1 make DESTDIR=$PKG install || exit 1 cd .. -# Compile and install the m17n user documentation: -echo "Building the m17n user docs..." -cd ${SHORTNAM}-docs-${DOCVERSION} -CXXFLAGS="$SLKCFLAGS" \ -CFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --localstatedir=/var \ - --sysconfdir=/etc \ - --mandir=/usr/man \ - --program-prefix= \ - --program-suffix= \ - --build=$ARCH-slackware-linux -make $NUMJOBS || make || exit 1 -make DESTDIR=$PKG install || exit 1 -cd .. +## Compile and install the m17n user documentation: +#echo "Building the m17n user docs..." +#cd ${SHORTNAM}-docs-${DOCVERSION} +#CXXFLAGS="$SLKCFLAGS" \ +#CFLAGS="$SLKCFLAGS" \ +#./configure \ +# --prefix=/usr \ +# --libdir=/usr/lib${LIBDIRSUFFIX} \ +# --localstatedir=/var \ +# --sysconfdir=/etc \ +# --mandir=/usr/man \ +# --program-prefix= \ +# --program-suffix= \ +# --build=$ARCH-slackware-linux +#make $NUMJOBS || make || exit 1 +#make DESTDIR=$PKG install || exit 1 +#cd .. # Add package documentation: -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/{db,docs} -cd ${PRGNAM}-${VERSION} -cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/{db,docs} +cd ${PKGNAM}-${VERSION} +cp -a $DOCS $PKG/usr/doc/$PKGNAM-$VERSION cd ../${SHORTNAM}-db-${DBVERSION} -cp -a $DOCS_DB $PKG/usr/doc/$PRGNAM-$VERSION/db +cp -a $DOCS_DB $PKG/usr/doc/$PKGNAM-$VERSION/db cd ../${SHORTNAM}-docs-${DOCVERSION} -cp -a $DOCS_DOC $PKG/usr/doc/$PRGNAM-$VERSION/docs +cp -a $DOCS_DOC $PKG/usr/doc/$PKGNAM-$VERSION/docs cd .. find $PKG/usr/doc -type f -exec chmod 644 {} \; @@ -178,5 +185,5 @@ fi # Build the package: cd $PKG -/sbin/makepkg -l y -c n $TMP/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txz +/sbin/makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz |