Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (664f86d18c44f55693a18539e54e99ddb76ea1a4)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Remko van der Vossen <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (664f86d18c44f55693a18539e54e99ddb76ea1a4)
  • Date: Fri, 27 Aug 2010 14:21:28 -0500

GIT changes to master grimoire by Remko van der Vossen <wich AT sourcemage.org>:

graphics/fontforge/DEPENDS | 25 +++++++++++++++++++++----
graphics/fontforge/DETAILS | 8 ++++----
graphics/fontforge/HISTORY | 5 +++++
graphics/fontforge/PRE_BUILD | 3 ++-
graphics/fontforge/fontforge_python.patch | 12 ++++++++++++
5 files changed, 44 insertions(+), 9 deletions(-)

New commits:
commit 664f86d18c44f55693a18539e54e99ddb76ea1a4
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

fontforge: version 20100501

diff --git a/graphics/fontforge/DEPENDS b/graphics/fontforge/DEPENDS
index 2bc19ca..e393620 100755
--- a/graphics/fontforge/DEPENDS
+++ b/graphics/fontforge/DEPENDS
@@ -4,13 +4,30 @@ depends libxkbui &&
depends libxi &&
depends libice &&
depends libsm &&
-depends cairo &&
-depends zlib &&
+depends zlib &&
depends libpng &&
depends giflib &&
depends tiff &&
depends jpeg &&
depends freetype2 "--with-freetype-src=$INSTALL_ROOT/usr/include/freetype2"
&&

-optional_depends autotrace "" "" "for outlining bitmaps for conversion to
fonts" &&
-optional_depends potrace "" "" "for outlining bitmaps for conversion to
fonts"
+optional_depends autotrace \
+ "" \
+ "" \
+ "for outlining bitmaps for conversion to fonts" &&
+optional_depends cairo \
+ "--with-cairo" \
+ "--without-cairo" \
+ "use cairo for glyph rendering" &&
+optional_depends pango \
+ "--with-pango" \
+ "--without-pango" \
+ "use pango for UI rendering" &&
+optional_depends potrace \
+ "" \
+ "" \
+ "for outlining bitmaps for conversion to fonts" &&
+optional_depends python \
+ "--with-python" \
+ "--without-python" \
+ "for python interpreter"
diff --git a/graphics/fontforge/DETAILS b/graphics/fontforge/DETAILS
index 1d1efa9..c20368a 100755
--- a/graphics/fontforge/DETAILS
+++ b/graphics/fontforge/DETAILS
@@ -1,13 +1,13 @@
SPELL=fontforge
- VERSION=20090923
-
SOURCE_HASH=sha512:2a7646e67c1887ae39cda8917c2cdb29fd54b3e9418e05f9976893aeb0829c46a81d3d5aff73c01f6eb9e67922d7f687abde613295fcc6d3d07b9ef7c4606b2d
+ VERSION=20100501
+
SOURCE_HASH=sha512:5e8ef9c1015178715cf163f45082bec0235fb59cf14ab9d81abda640ab6b583c9b7dc0c1b1cfe7de7208866fa53b2a30c6d8a8cf31586a9d0eae6baee660cfba
SOURCE=${SPELL}_full-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
if [[ "$INSTALL_DOCS" == "y" ]]; then
- DOCS_VERSION=20090914
-
SOURCE2_HASH=sha512:1df006b65e784950e0ce79cae011248e61c0fdf5331134735a6dadf520a53c087e8ec0d4082a59167a3f013b02f6a8564be178c7a749244cced5b690f2d1078c
+ DOCS_VERSION=20100429
+
SOURCE2_HASH=sha512:057e0e8db31c7abd7c6078ae064481af3c576509c5a88309f02fc5915e9ea3fe3fe6586121d787f44d5e6fe8f33e3e81afe035be4e0ef8949d352d3965413eb7
SOURCE2=${SPELL}_htdocs-$DOCS_VERSION.tar.bz2
SOURCE2_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE2
# SOURCE2_GPG="gurus.gpg:${SOURCE2}.sig"
diff --git a/graphics/fontforge/HISTORY b/graphics/fontforge/HISTORY
index 24a5387..4de5e97 100644
--- a/graphics/fontforge/HISTORY
+++ b/graphics/fontforge/HISTORY
@@ -1,3 +1,8 @@
+2010-08-27 Remko van der Vossen <wich AT sourcemage.org>
+ * DETAILS: version 20100501
+ * DEPENDS: optionals
+ * PRE_BUILD: patch for python 2.7 compatibility
+
2009-10-11 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 20090923
* DEPENDS: replace xorg-libs by specific libraries
diff --git a/graphics/fontforge/PRE_BUILD b/graphics/fontforge/PRE_BUILD
index 4dcd4dd..5fa6188 100755
--- a/graphics/fontforge/PRE_BUILD
+++ b/graphics/fontforge/PRE_BUILD
@@ -1,5 +1,6 @@
-default_pre_build &&
+default_pre_build &&
cd $SOURCE_DIRECTORY &&
+patch -p1 < $SPELL_DIRECTORY/fontforge_python.patch &&
# fix bad config file
sed -i '/CFLAGS_NOOPT/s|sed -e s/-O2//|sed "s/-O2//;s/-O3//"|' configure
configure.dynamic &&
if [[ "$INSTALL_DOCS" == "y" ]]; then
diff --git a/graphics/fontforge/fontforge_python.patch
b/graphics/fontforge/fontforge_python.patch
new file mode 100644
index 0000000..6f23151
--- /dev/null
+++ b/graphics/fontforge/fontforge_python.patch
@@ -0,0 +1,12 @@
+diff -Naur fontforge-20100501.orig/fontforge/ffpython.h
fontforge-20100501.new/fontforge/ffpython.h
+--- fontforge-20100501.orig/fontforge/ffpython.h 2010-04-05
22:10:26.000000000 +0200
++++ fontforge-20100501.new/fontforge/ffpython.h 2010-08-27
19:42:21.000000000 +0200
+@@ -43,7 +43,7 @@
+
+ #define STRING_CHECK PyBytes_Check
+ #define STRING_TO_PY PyBytes_FromString
+-#define DECODE_UTF8(s, size, errors) PyBytes_Decode(s, size, "UTF-8",
errors)
++#define DECODE_UTF8(s, size, errors) PyString_Decode(s, size, "UTF-8",
errors)
+ #define PYBYTES_UTF8(str) PyString_AsEncodedObject(str, "UTF-8",
NULL)
+ #define STRING_FROM_FORMAT PyBytes_FromFormat
+



  • [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (664f86d18c44f55693a18539e54e99ddb76ea1a4), Remko van der Vossen, 08/27/2010

Archive powered by MHonArc 2.6.24.

Top of Page