diff options
| -rw-r--r-- | graphics/fontmatrix/README | 21 | ||||
| -rw-r--r-- | graphics/fontmatrix/doinst.sh | 1 | ||||
| -rw-r--r-- | graphics/fontmatrix/fontmatrix-0.9.99-adapt-to-icu-56.patch | 47 | ||||
| -rw-r--r-- | graphics/fontmatrix/fontmatrix.SlackBuild | 45 | ||||
| -rw-r--r-- | graphics/fontmatrix/fontmatrix.info | 10 | ||||
| -rw-r--r-- | graphics/fontmatrix/slack-desc | 2 |
6 files changed, 29 insertions, 97 deletions
diff --git a/graphics/fontmatrix/README b/graphics/fontmatrix/README index c897b38a34..d0db4dab95 100644 --- a/graphics/fontmatrix/README +++ b/graphics/fontmatrix/README @@ -1,16 +1,13 @@ -fontmatrix is a manager built with the kind of features and abilities +Fontmatrix is a professional font manager and organiser. + +Fontmatrix is a manager built with the kind of features and abilities graphic designers, layout professionals along with others have felt necessary, but modernized with some new touches. -Fontmatrix has a concept of 'tagging'. This makes it really nice to -group fonts and even sub-group them logically for use in a book for -instance. It also has extensive gui support for showing all glyphs -in a font, previews of sample text, variable sizing and also tells -what kinds of advanced Open Type features are inside each font. These -features have never been seen outside of a font editor. And not least, -it creates a nice PDF catalogue of user's fonts for printing or -reference. In short, fontmatrix is a font manager for professionals, -but is nice and user friendly. +Fontmatrix provides a font browser, organiser, and manager. It makes it +easy to tag and group (or sub-group) fonts logically. It has extensive +GUI support for showing all glyphs in a font, previews of sample text, +variable sizing, and to reveal advanced Open Type features. -This package can make use of the optional dependency podofo: install -it and then pass HAVE_PODOFO="yes" to the slackbuild. +Fontmatrix can also create a PDF catalogue of your fonts for printing or +reference. diff --git a/graphics/fontmatrix/doinst.sh b/graphics/fontmatrix/doinst.sh index 1f8ff67ded..3e5691a052 100644 --- a/graphics/fontmatrix/doinst.sh +++ b/graphics/fontmatrix/doinst.sh @@ -7,4 +7,3 @@ if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1 fi fi - diff --git a/graphics/fontmatrix/fontmatrix-0.9.99-adapt-to-icu-56.patch b/graphics/fontmatrix/fontmatrix-0.9.99-adapt-to-icu-56.patch deleted file mode 100644 index 56d171a5d3..0000000000 --- a/graphics/fontmatrix/fontmatrix-0.9.99-adapt-to-icu-56.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -ur old.fontmatrix-0.9.99-Source/src/icushaper.cpp fontmatrix-0.9.99-Source/src/icushaper.cpp ---- old.fontmatrix-0.9.99-Source/src/icushaper.cpp 2011-10-03 08:02:54.369203955 +0200 -+++ fontmatrix-0.9.99-Source/src/icushaper.cpp 2015-10-29 12:58:30.806886446 +0100 -@@ -248,7 +248,7 @@ - - } - --const void * IcuFontImpl::getFontTable ( LETag tableTag ) const -+const void * IcuFontImpl::getFontTable ( LETag tableTag, size_t &olength ) const - { - // qDebug()<< "IcuFontImpl::getFontTable" << OTF_tag_name( tableTag ); - FT_Face face ( otf->face() ); -@@ -263,13 +263,21 @@ - FT_Load_Sfnt_Table ( face, tableTag, 0, bA, &length ); - - regTables( tableTag, bA ); -+ olength = length; - return (const void*) tables.value(tableTag); - } - - } -+ olength = length; - return 0; - } - -+const void * IcuFontImpl::getFontTable ( LETag tableTag ) const -+{ -+ size_t length(0); -+ return getFontTable( tableTag, length); -+} -+ - le_int32 IcuFontImpl::getUnitsPerEM() const - { - return otf->face()->units_per_EM; -diff -ur old.fontmatrix-0.9.99-Source/src/icushaper.h fontmatrix-0.9.99-Source/src/icushaper.h ---- old.fontmatrix-0.9.99-Source/src/icushaper.h 2011-10-03 08:02:54.363203913 +0200 -+++ fontmatrix-0.9.99-Source/src/icushaper.h 2015-10-29 12:55:57.983050904 +0100 -@@ -27,7 +27,8 @@ - ~IcuFontImpl(); - // implements pure virtual methods of LEFontInstance - -- const void* getFontTable(LETag tableTag ) const; -+ const void* getFontTable(LETag tableTag, size_t &length ) const; -+ const void* getFontTable(LETag tableTag ) const; // DEPRECATED - le_bool canDisplay (LEUnicode32 ch) const {return true;} - le_int32 getUnitsPerEM () const; - LEGlyphID mapCharToGlyph (LEUnicode32 ch) const ; diff --git a/graphics/fontmatrix/fontmatrix.SlackBuild b/graphics/fontmatrix/fontmatrix.SlackBuild index 3919641d27..7a7eb49dfd 100644 --- a/graphics/fontmatrix/fontmatrix.SlackBuild +++ b/graphics/fontmatrix/fontmatrix.SlackBuild @@ -5,13 +5,13 @@ # Maintained by Klaatu <klaatu@member.fsf.org> PRGNAM=fontmatrix -VERSION=${VERSION:-r1220} -BUILD=${BUILD:-2} +VERSION=${VERSION:-20161216} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -22,8 +22,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -41,44 +41,27 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION-Source -tar xvf $CWD/$PRGNAM-$VERSION-Source.tar.?z* -cd $PRGNAM-$VERSION-Source +rm -rf $PRGNAM-$VERSION +unzip $CWD/$PRGNAM-$VERSION.zip +cd $PRGNAM-$VERSION chown -R root:root . find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# Fix the desktop menu item and location of man files. -echo "StartupNotify=false" >> $PRGNAM.desktop sed -i 's|share/man|man|' CMakeLists.txt -# Fix fontmatrix build against icu 0.56. -patch -p1 < $CWD/fontmatrix-0.9.99-adapt-to-icu-56.patch - # Cmake uses the static python lib. Let's use the shared lib instead. PYVER=$(python -c 'import sys; print sys.version[:3]') PY_LIB_SHARED="/usr/lib${LIBDIRSUFFIX}/libpython${PYVER}.so" -# Decide if we want PODOFO support (default is no). -if [ "${HAVE_PODOFO:-no}" == "yes" ]; then - USE_PODOFO="TRUE" -else - USE_PODOFO="FALSE" -fi - mkdir build && cd build cmake \ -DCMAKE_INSTALL_PREFIX:PATH=/usr \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DPYTHON_LIBRARY:PATH="$PY_LIB_SHARED" \ - -DCMAKE_SKIP_RPATH:BOOL=1 \ - -DWANT_ICU:BOOL=true \ -DWANT_M17N:BOOL=true \ - -DWANT_PYTHONQT:BOOL=true \ - -DWANT_PODOFO:BOOL="$USE_PODOFO" \ + -DWANT_PODOFO:BOOL=true \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_BUILD_TYPE=Release .. @@ -86,7 +69,7 @@ mkdir build && cd build # Remove -O3 flag. for i in $(find . -name "flags.make"); do sed -i 's|-O3||g' $i - done + done || echo "not needed" make VERBOSE=1 make install DESTDIR=$PKG diff --git a/graphics/fontmatrix/fontmatrix.info b/graphics/fontmatrix/fontmatrix.info index 2ac31d1917..e006a798e1 100644 --- a/graphics/fontmatrix/fontmatrix.info +++ b/graphics/fontmatrix/fontmatrix.info @@ -1,10 +1,10 @@ PRGNAM="fontmatrix" -VERSION="r1220" -HOMEPAGE="http://fontmatrix.be/" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/fontmatrix-r1220-Source.tar.xz" -MD5SUM="fa908bca2306706a7fae162abfd1e9f4" +VERSION="20161216" +HOMEPAGE="https://github.com/fontmatrix/fontmatrix" +DOWNLOAD="http://slackermedia.info/slackbuilds/fontmatrix/fontmatrix-20161216.zip" +MD5SUM="3c2b3bab19a121a9e1e8a9a5d1900a57" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="podofo" MAINTAINER="Klaatu" EMAIL="klaatu@member.fsf.org" diff --git a/graphics/fontmatrix/slack-desc b/graphics/fontmatrix/slack-desc index 2aaa0a1c87..293c0c0771 100644 --- a/graphics/fontmatrix/slack-desc +++ b/graphics/fontmatrix/slack-desc @@ -12,7 +12,7 @@ fontmatrix: fontmatrix is a manager built with the kind of features and abilitie fontmatrix: graphic designers, layout professionals, and others have felt fontmatrix: necessary, but modernized with some new touches. fontmatrix: -fontmatrix: Homepage: http://fontmatrix.be/ +fontmatrix: Homepage: https://github.com/fontmatrix/fontmatrix fontmatrix: fontmatrix: fontmatrix: |