Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=0470348ecb7f431c8e2b00478fba60532d7c6641

commit 0470348ecb7f431c8e2b00478fba60532d7c6641
Author: bouleetbil <bouleet...@frogdev.info>
Date:   Sat Mar 5 17:33:11 2011 +0100

fontforge-20110222-1-x86_64
*version bump

diff --git a/source/xapps/fontforge/FrugalBuild 
b/source/xapps/fontforge/FrugalBuild
index d3690e8..cdc8180 100644
--- a/source/xapps/fontforge/FrugalBuild
+++ b/source/xapps/fontforge/FrugalBuild
@@ -2,8 +2,8 @@
# Maintainer: bouleetbil <bouleet...@frogdev.info>

pkgname=fontforge
-pkgver=20100501
-pkgrel=2
+pkgver=20110222
+pkgrel=1
pkgdesc="Font editor and converter"
_F_sourceforge_ext=".tar.bz2"
_F_sourceforge_name=fontforge_full
@@ -13,10 +13,9 @@ depends=('libxi>=1.2.1-1' 'libxkbui>=1.0.2-3' 
'libuninameslist' 'freetype2' \
'libgif' 'libjpeg>=8a' 'libpng>=1.4.1' 'libtiff' 'python>=2.7')
groups=('xapps' 'misc-fonts')
archs=('i686' 'x86_64')
-source=("${source[@]}" $url/cidmaps.tgz python27-compat.patch)
-sha1sums=('483425116c6af6ad90e37f9ada0c28e34f251ec3' \
-          'efbc7c9d3e95159f5600dc71f9cccb370e46bb94' \
-          '83c7a09a59c71d93f5276411e8c18ae3bec557f4')
+source=("${source[@]}" $url/cidmaps.tgz)
+sha1sums=('8fada07647f102351bb1d7d1c4da487356e7142f' \
+          'efbc7c9d3e95159f5600dc71f9cccb370e46bb94')
options=('noversrc')
_F_cd_path=$pkgname-$pkgver

diff --git a/source/xapps/fontforge/python27-compat.patch 
b/source/xapps/fontforge/python27-compat.patch
deleted file mode 100644
index 0ef43ce..0000000
--- a/source/xapps/fontforge/python27-compat.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -ur fontforge-20100501/fontforge/ffpython.h 
fontforge-20100501.new/fontforge/ffpython.h
---- fontforge-20100501/fontforge/ffpython.h    2010-04-05 22:10:26.000000000 
+0200
-+++ fontforge-20100501.new/fontforge/ffpython.h        2010-08-31 
18:18:07.915888604 +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
-
-diff -ur fontforge-20100501/Makefile.dynamic.in 
fontforge-20100501.new/Makefile.dynamic.in
---- fontforge-20100501/Makefile.dynamic.in     2008-11-14 06:31:07.000000000 
+0100
-+++ fontforge-20100501.new/Makefile.dynamic.in 2010-08-31 18:10:00.824156613 
+0200
-@@ -130,7 +130,7 @@
-       sh -c "if test -d fontforge/FontForge.app >/dev/null ; then rm -rf 
/Applications/FontForge.app ; mv fontforge/FontForge.app /Applications ; ln -s 
/usr/local/bin/fontforge /Applications/FontForge.app/Contents/MacOS/FontForge ; 
fi"
-       sh < systemspecific
- #we don't always create a setup.py
--      -(cd pyhook ; if test -r setup.py ; then python setup.py install 
--prefix=$(prefix) --root=$(DESTDIR); for dir in * ; do if test -d $$dir -a 
"$$dir" != "CVS" ; then  rm -rf $$dir ; fi; done ; fi )
-+      -(cd pyhook ; if test -r setup.py ; then python2 setup.py install 
--prefix=$(prefix) --root=$(DESTDIR); for dir in * ; do if test -d $$dir -a 
"$$dir" != "CVS" ; then  rm -rf $$dir ; fi; done ; fi )
-
- install_py: $(DESTDIR)$(sharedir) all install_libs install_incs install_po 
install_prog install_pycontrib
- # You may need to be root to do the install
-@@ -138,7 +138,7 @@
-       sh -c "if test -d $(srcdir)/htdocs >/dev/null ; then $(MAKE) 
install_docs ; for dir in * ; do if test -d $$dir ; then  rm -rf $$dir ; fi; 
done ; fi"
-       sh -c "if test -d fontforge/FontForge.app >/dev/null ; then rm -rf 
/Applications/FontForge.app ; mv fontforge/FontForge.app /Applications ; ln -s 
/usr/local/bin/fontforge /Applications/FontForge.app/Contents/MacOS/FontForge ; 
fi"
-       sh < systemspecific
--      -(cd pyhook ; python setup.py bdist --formats=gztar ; cp 
dist/fontforge-*.tar.gz $(DESTDIR)/tmp; for dir in * ; do if test -d $$dir -a 
"$$dir" != "CVS" ; then  rm -rf $$dir ; fi; done )
-+      -(cd pyhook ; python2 setup.py bdist --formats=gztar ; cp 
dist/fontforge-*.tar.gz $(DESTDIR)/tmp; for dir in * ; do if test -d $$dir -a 
"$$dir" != "CVS" ; then  rm -rf $$dir ; fi; done )
-
- install_gtk: fontforgegtk
-       (cd gtkui ; $(MAKE) install )
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to