[arch-commits] Commit in fontforge/trunk (PKGBUILD stamp.patch)

[Gaetan Bisson]

    Date: Thursday, August 2, 2012 @ 12:05:57
  Author: bisson
Revision: 164686

upstream update

Modified:
  fontforge/trunk/PKGBUILD
Deleted:
  fontforge/trunk/stamp.patch

-------------+
 PKGBUILD    |   13 +++++--------
 stamp.patch |    8 --------
 2 files changed, 5 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-08-02 15:42:06 UTC (rev 164685)
+++ PKGBUILD	2012-08-02 16:05:57 UTC (rev 164686)
@@ -4,7 +4,7 @@
 # Contributor: William Rea <sillywilly at gmail.com>
 
 pkgname=fontforge
-pkgver=20120731
+pkgver=20120731_b
 pkgrel=1
 pkgdesc='Outline and bitmap font editor'
 arch=('i686' 'x86_64')
@@ -12,18 +12,15 @@
 license=('BSD')
 depends=('libxkbui' 'libxi' 'libxml2' 'pango' 'giflib' 'libtiff' 'python2' 'libspiro')
 options=('!libtool' '!makeflags')
-source=("http://downloads.sourceforge.net/project/fontforge/fontforge-source/fontforge_full-${pkgver}.tar.bz2"
-        'stamp.patch')
-sha1sums=('b44548813d937d41dd7c1005dadd86cf7339f530'
-          '13603ee42e4cd8f6bcbb32638769facbaa2dde43')
+source=("http://downloads.sourceforge.net/project/fontforge/fontforge-source/fontforge_full-${pkgver//_/-}.tar.bz2")
+sha1sums=('b520f532b48e557c177dffa29120225066cc4e84')
 
 # git clone git://fontforge.git.sourceforge.net/gitroot/fontforge/fontforge; cd fontforge; git archive --prefix=${pkgname}-${pkgver}/ master | xz > ../${pkgname}-${pkgver}.tar.xz
 # source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz")
 
 build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
+	cd "${srcdir}/${pkgname}-${pkgver//_/-}"
 	sed -i 's/python /python2 /g' Makefile.dynamic.in
-	patch -p1 -i ../stamp.patch
 	./configure \
 		--prefix=/usr \
 		--mandir=/usr/share/man \
@@ -38,7 +35,7 @@
 }
 
 package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
+	cd "${srcdir}/${pkgname}-${pkgver//_/-}"
 	make DESTDIR="${pkgdir}" install
 	install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }

Deleted: stamp.patch
===================================================================
--- stamp.patch	2012-08-02 15:42:06 UTC (rev 164685)
+++ stamp.patch	2012-08-02 16:05:57 UTC (rev 164686)
@@ -1,8 +0,0 @@
-diff -Naur old/fontforge/libffstamp.h new/fontforge/libffstamp.h
---- old/fontforge/libffstamp.h	2012-08-02 17:11:23.784662933 +1000
-+++ new/fontforge/libffstamp.h	2012-08-02 17:11:40.508364985 +1000
-@@ -1,3 +1,3 @@
- #define LibFF_ModTime		1343746639L	/* Seconds since 1970 (standard unix time) */
- #define LibFF_ModTime_Str	"14:57 GMT 31-Jul-2012"
--#define LibFF_VersionDate	"20120731"
-+#define LibFF_VersionDate	20120731