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

2020-11-12 Thread Felix Yan via arch-commits
Date: Thursday, November 12, 2020 @ 19:55:38
  Author: felixonmars
Revision: 400718

upgpkg: fontforge 20200314-5: Python 3.9 rebuild

Modified:
  fontforge/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-11-12 19:54:42 UTC (rev 400717)
+++ PKGBUILD2020-11-12 19:55:38 UTC (rev 400718)
@@ -4,7 +4,7 @@
 
 pkgname=fontforge
 pkgver=20200314
-pkgrel=4
+pkgrel=5
 pkgdesc='Outline and bitmap font editor'
 url='https://fontforge.github.io/'
 arch=('x86_64')


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

2020-11-09 Thread Evangelos Foutras via arch-commits
Date: Tuesday, November 10, 2020 @ 05:07:09
  Author: foutrelis
Revision: 400029

upgpkg: fontforge 20200314-4: Python 3.9 rebuild

Modified:
  fontforge/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-11-10 05:05:11 UTC (rev 400028)
+++ PKGBUILD2020-11-10 05:07:09 UTC (rev 400029)
@@ -4,7 +4,7 @@
 
 pkgname=fontforge
 pkgver=20200314
-pkgrel=3
+pkgrel=4
 pkgdesc='Outline and bitmap font editor'
 url='https://fontforge.github.io/'
 arch=('x86_64')


[arch-commits] Commit in fontforge/trunk (PKGBUILD fontforge-doc-no-warn-error.patch)

2020-08-30 Thread Evangelos Foutras via arch-commits
Date: Sunday, August 30, 2020 @ 10:20:49
  Author: foutrelis
Revision: 394923

upgpkg: fontforge 20200314-3: rebuild bisson's pkgs

Added:
  fontforge/trunk/fontforge-doc-no-warn-error.patch
Modified:
  fontforge/trunk/PKGBUILD

---+
 PKGBUILD  |   18 --
 fontforge-doc-no-warn-error.patch |   25 +
 2 files changed, 37 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-08-30 10:20:48 UTC (rev 394922)
+++ PKGBUILD2020-08-30 10:20:49 UTC (rev 394923)
@@ -4,7 +4,7 @@
 
 pkgname=fontforge
 pkgver=20200314
-pkgrel=2
+pkgrel=3
 pkgdesc='Outline and bitmap font editor'
 url='https://fontforge.github.io/'
 arch=('x86_64')
@@ -12,13 +12,19 @@
 makedepends=('cmake' 'git' 'python-sphinx')
 depends=('libtool' 'pango' 'giflib' 'libtiff' 'libxml2' 'libspiro' 'python'
  'potrace' 'woff2' 'gtk3' 'libuninameslist')
-source=("https://github.com/${pkgname}/${pkgname}/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.xz";)
-sha256sums=('cd190b237353dc3f48ddca7b0b3439da8ec4fcf27911d14cc1ccc76c1a47c861')
+source=("https://github.com/${pkgname}/${pkgname}/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.xz";
+fontforge-doc-no-warn-error.patch)
+sha256sums=('cd190b237353dc3f48ddca7b0b3439da8ec4fcf27911d14cc1ccc76c1a47c861'
+'b87fa5a39d6948262d2dfb9b84c2462dc21de0bfb115cdd13e893c1b533d8f78')
 
+prepare() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   mkdir build
+   patch -Np1 -i ../fontforge-doc-no-warn-error.patch
+}
+
 build() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
-   install -d build
-   cd build
+   cd "${srcdir}/${pkgname}-${pkgver}/build"
cmake \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \

Added: fontforge-doc-no-warn-error.patch
===
--- fontforge-doc-no-warn-error.patch   (rev 0)
+++ fontforge-doc-no-warn-error.patch   2020-08-30 10:20:49 UTC (rev 394923)
@@ -0,0 +1,25 @@
+From e8164ed0fa747bfc8e7e80e6ff6b9a34b7c1a33f Mon Sep 17 00:00:00 2001
+From: Mike Gilbert 
+Date: Mon, 27 Apr 2020 20:00:54 -0400
+Subject: [PATCH] doc: do not treat warnings as errors
+
+---
+ doc/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
+index 6c4601a05..e5aeaed4f 100644
+--- a/doc/CMakeLists.txt
 b/doc/CMakeLists.txt
+@@ -21,7 +21,7 @@ file(STRINGS manifest.txt _manifest)
+ configure_file(manifest.txt manifest.txt COPYONLY)
+ 
+ add_custom_command(OUTPUT sphinx-docs
+-  COMMAND "${Sphinx_BUILD_BINARY}" -q -n -W -b html -d doctrees 
"${CMAKE_CURRENT_SOURCE_DIR}/sphinx" sphinx-docs
++  COMMAND "${Sphinx_BUILD_BINARY}" -q -n -b html -d doctrees 
"${CMAKE_CURRENT_SOURCE_DIR}/sphinx" sphinx-docs
+   DEPENDS ${_manifest}
+ )
+ 
+-- 
+2.26.2
+


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

2020-03-18 Thread Gaëtan Bisson via arch-commits
Date: Wednesday, March 18, 2020 @ 19:33:55
  Author: bisson
Revision: 377873

build with gdk

Modified:
  fontforge/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-03-18 19:24:03 UTC (rev 377872)
+++ PKGBUILD2020-03-18 19:33:55 UTC (rev 377873)
@@ -4,7 +4,7 @@
 
 pkgname=fontforge
 pkgver=20200314
-pkgrel=1
+pkgrel=2
 pkgdesc='Outline and bitmap font editor'
 url='https://fontforge.github.io/'
 arch=('x86_64')
@@ -20,10 +20,10 @@
install -d build
cd build
cmake \
+   -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \
-DENABLE_MAINTAINER_TOOLS=TRUE \
-DENABLE_FONTFORGE_EXTRAS=TRUE \
-   -DENABLE_X11=TRUE \
-DUNIX=TRUE \
..
 


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

2020-03-15 Thread Gaëtan Bisson via arch-commits
Date: Monday, March 16, 2020 @ 03:17:17
  Author: bisson
Revision: 377682

upstream update

Modified:
  fontforge/trunk/PKGBUILD

--+
 PKGBUILD |   34 --
 1 file changed, 16 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-03-16 02:46:25 UTC (rev 377681)
+++ PKGBUILD2020-03-16 03:17:17 UTC (rev 377682)
@@ -3,32 +3,29 @@
 # Contributor: William Rea 
 
 pkgname=fontforge
-pkgver=20190801
-pkgrel=2
+pkgver=20200314
+pkgrel=1
 pkgdesc='Outline and bitmap font editor'
 url='https://fontforge.github.io/'
 arch=('x86_64')
 license=('BSD')
-makedepends=('git')
+makedepends=('cmake' 'git' 'python-sphinx')
 depends=('libtool' 'pango' 'giflib' 'libtiff' 'libxml2' 'libspiro' 'python'
  'potrace' 'woff2' 'gtk3' 'libuninameslist')
-source=("https://github.com/${pkgname}/${pkgname}/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.gz";)
-sha256sums=('d92075ca783c97dc68433b1ed629b9054a4b4c74ac64c54ced7f691540f70852')
+source=("https://github.com/${pkgname}/${pkgname}/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.xz";)
+sha256sums=('cd190b237353dc3f48ddca7b0b3439da8ec4fcf27911d14cc1ccc76c1a47c861')
 
-prepare() {
-  cd $pkgname-$pkgver
-  sed -e 's|python-"${PYTHON_VERSION}"|python-"${PYTHON_VERSION}"-embed|g' -i 
m4/fontforge_arg_enable.m4 # Fix linking to python 3.8
-  autoreconf -vif
-}
-
 build() {
cd "${srcdir}/${pkgname}-${pkgver}"
-   ./configure \
-   --prefix=/usr \
-   --mandir=/usr/share/man \
-   --enable-python-extension \
-   --enable-woff2 \
-   --enable-gdk \
+   install -d build
+   cd build
+   cmake \
+   -DCMAKE_INSTALL_PREFIX=/usr \
+   -DENABLE_MAINTAINER_TOOLS=TRUE \
+   -DENABLE_FONTFORGE_EXTRAS=TRUE \
+   -DENABLE_X11=TRUE \
+   -DUNIX=TRUE \
+   ..
 
make
 }
@@ -35,6 +32,7 @@
 
 package() {
cd "${srcdir}/${pkgname}-${pkgver}"
+   cd build
make DESTDIR="${pkgdir}" install
-   install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+   install -Dm644 ../LICENSE 
"${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }


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

2019-11-04 Thread Felix Yan via arch-commits
Date: Monday, November 4, 2019 @ 19:33:28
  Author: felixonmars
Revision: 366754

Python 3.8 rebuild

Modified:
  fontforge/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-11-04 19:29:48 UTC (rev 366753)
+++ PKGBUILD2019-11-04 19:33:28 UTC (rev 366754)
@@ -4,7 +4,7 @@
 
 pkgname=fontforge
 pkgver=20190801
-pkgrel=1
+pkgrel=2
 pkgdesc='Outline and bitmap font editor'
 url='https://fontforge.github.io/'
 arch=('x86_64')


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

2019-11-04 Thread Antonio Rojas via arch-commits
Date: Monday, November 4, 2019 @ 19:29:48
  Author: arojas
Revision: 366753

Fix linking with python 3.8

Modified:
  fontforge/trunk/PKGBUILD

--+
 PKGBUILD |6 ++
 1 file changed, 6 insertions(+)

Modified: PKGBUILD
===
--- PKGBUILD2019-11-04 18:35:28 UTC (rev 366752)
+++ PKGBUILD2019-11-04 19:29:48 UTC (rev 366753)
@@ -15,6 +15,12 @@
 
source=("https://github.com/${pkgname}/${pkgname}/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.gz";)
 sha256sums=('d92075ca783c97dc68433b1ed629b9054a4b4c74ac64c54ced7f691540f70852')
 
+prepare() {
+  cd $pkgname-$pkgver
+  sed -e 's|python-"${PYTHON_VERSION}"|python-"${PYTHON_VERSION}"-embed|g' -i 
m4/fontforge_arg_enable.m4 # Fix linking to python 3.8
+  autoreconf -vif
+}
+
 build() {
cd "${srcdir}/${pkgname}-${pkgver}"
./configure \


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

2019-08-01 Thread Gaëtan Bisson via arch-commits
Date: Thursday, August 1, 2019 @ 23:26:56
  Author: bisson
Revision: 358875

upstream update

Modified:
  fontforge/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-08-01 23:26:37 UTC (rev 358874)
+++ PKGBUILD2019-08-01 23:26:56 UTC (rev 358875)
@@ -3,7 +3,7 @@
 # Contributor: William Rea 
 
 pkgname=fontforge
-pkgver=20190413
+pkgver=20190801
 pkgrel=1
 pkgdesc='Outline and bitmap font editor'
 url='https://fontforge.github.io/'
@@ -11,9 +11,9 @@
 license=('BSD')
 makedepends=('git')
 depends=('libtool' 'pango' 'giflib' 'libtiff' 'libxml2' 'libspiro' 'python'
- 'potrace' 'woff2' 'gtk3')
+ 'potrace' 'woff2' 'gtk3' 'libuninameslist')
 
source=("https://github.com/${pkgname}/${pkgname}/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.gz";)
-sha256sums=('6762a045aba3d6ff1a7b856ae2e1e900a08a8925ccac5ebf24de91692b206617')
+sha256sums=('d92075ca783c97dc68433b1ed629b9054a4b4c74ac64c54ced7f691540f70852')
 
 build() {
cd "${srcdir}/${pkgname}-${pkgver}"


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

2019-04-26 Thread Gaëtan Bisson via arch-commits
Date: Saturday, April 27, 2019 @ 02:41:27
  Author: bisson
Revision: 352157

upstream update

Modified:
  fontforge/trunk/PKGBUILD

--+
 PKGBUILD |   19 +++
 1 file changed, 3 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-04-26 22:57:45 UTC (rev 352156)
+++ PKGBUILD2019-04-27 02:41:27 UTC (rev 352157)
@@ -3,7 +3,7 @@
 # Contributor: William Rea 
 
 pkgname=fontforge
-pkgver=20190317
+pkgver=20190413
 pkgrel=1
 pkgdesc='Outline and bitmap font editor'
 url='https://fontforge.github.io/'
@@ -12,19 +12,9 @@
 makedepends=('git')
 depends=('libtool' 'pango' 'giflib' 'libtiff' 'libxml2' 'libspiro' 'python'
  'potrace' 'woff2' 'gtk3')
-source=("https://github.com/fontforge/fontforge/archive/${pkgver}.tar.gz";
-'https://fontforge.github.io/cidmaps.tgz'
-   'git+https://github.com/coreutils/gnulib.git')
-sha256sums=('0f2dd80ea99f9ba432ceba94fe81227e23b9c1489a17dce6fde98458b4d529d5'
-'1bf9c7eb8835e6ed94e62cb49f1141bc046c562849e52e6c3c7f1d7cfc95c7b3'
-'SKIP')
+source=("https://github.com/${pkgname}/${pkgname}/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.gz";)
+sha256sums=('6762a045aba3d6ff1a7b856ae2e1e900a08a8925ccac5ebf24de91692b206617')
 
-prepare() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
-   ln -s ../gnulib .
-   ./bootstrap --force
-}
-
 build() {
cd "${srcdir}/${pkgname}-${pkgver}"
./configure \
@@ -40,8 +30,5 @@
 package() {
cd "${srcdir}/${pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
-
-   install -d "${pkgdir}/usr/share/fontforge"
-   install -m644 ../Adobe-* "${pkgdir}/usr/share/fontforge"
install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }


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

2019-03-17 Thread Gaëtan Bisson via arch-commits
Date: Sunday, March 17, 2019 @ 22:14:48
  Author: bisson
Revision: 348582

upstream update, switch to gtk3 ui, general clean up

Modified:
  fontforge/trunk/PKGBUILD

--+
 PKGBUILD |   29 +
 1 file changed, 17 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-03-17 20:41:23 UTC (rev 348581)
+++ PKGBUILD2019-03-17 22:14:48 UTC (rev 348582)
@@ -3,29 +3,36 @@
 # Contributor: William Rea 
 
 pkgname=fontforge
-pkgver=20170731
-pkgrel=3
+pkgver=20190317
+pkgrel=1
 pkgdesc='Outline and bitmap font editor'
 url='https://fontforge.github.io/'
 arch=('x86_64')
 license=('BSD')
 makedepends=('git')
-depends=('libtool' 'libxkbui' 'libxi'
- 'pango' 'giflib' 'libtiff' 'libxml2' 'libspiro' 'libunicodenames' 
'zeromq'
- 'python' 'desktop-file-utils' 'gtk-update-icon-cache' 
'hicolor-icon-theme')
+depends=('libtool' 'pango' 'giflib' 'libtiff' 'libxml2' 'libspiro' 'python'
+ 'potrace' 'woff2' 'gtk3')
 source=("https://github.com/fontforge/fontforge/archive/${pkgver}.tar.gz";
-'https://fontforge.github.io/cidmaps.tgz')
-sha256sums=('89203db05658e79418104fb6442b3feffb20762198c2d8b0343db49a07769302'
-'1bf9c7eb8835e6ed94e62cb49f1141bc046c562849e52e6c3c7f1d7cfc95c7b3')
+'https://fontforge.github.io/cidmaps.tgz'
+   'git+https://github.com/coreutils/gnulib.git')
+sha256sums=('0f2dd80ea99f9ba432ceba94fe81227e23b9c1489a17dce6fde98458b4d529d5'
+'1bf9c7eb8835e6ed94e62cb49f1141bc046c562849e52e6c3c7f1d7cfc95c7b3'
+'SKIP')
 
+prepare() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   ln -s ../gnulib .
+   ./bootstrap --force
+}
+
 build() {
cd "${srcdir}/${pkgname}-${pkgver}"
-   export LIBZMQ_LIBS=-lzmq
-   ./bootstrap --force
./configure \
--prefix=/usr \
--mandir=/usr/share/man \
--enable-python-extension \
+   --enable-woff2 \
+   --enable-gdk \
 
make
 }
@@ -36,7 +43,5 @@
 
install -d "${pkgdir}/usr/share/fontforge"
install -m644 ../Adobe-* "${pkgdir}/usr/share/fontforge"
-
install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-   install -Dm644 desktop/fontforge.desktop 
"${pkgdir}/usr/share/applications/fontforge.desktop"
 }


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

2019-01-10 Thread Felix Yan via arch-commits
Date: Friday, January 11, 2019 @ 07:41:24
  Author: felixonmars
Revision: 343567

Readline 8.0 rebuild

Modified:
  fontforge/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-01-11 07:37:09 UTC (rev 343566)
+++ PKGBUILD2019-01-11 07:41:24 UTC (rev 343567)
@@ -4,7 +4,7 @@
 
 pkgname=fontforge
 pkgver=20170731
-pkgrel=2
+pkgrel=3
 pkgdesc='Outline and bitmap font editor'
 url='https://fontforge.github.io/'
 arch=('x86_64')


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

2018-07-14 Thread Felix Yan via arch-commits
Date: Saturday, July 14, 2018 @ 18:58:27
  Author: felixonmars
Revision: 328670

Python 3.7 rebuild

Modified:
  fontforge/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-07-14 18:54:15 UTC (rev 328669)
+++ PKGBUILD2018-07-14 18:58:27 UTC (rev 328670)
@@ -5,7 +5,7 @@
 
 pkgname=fontforge
 pkgver=20170731
-pkgrel=1
+pkgrel=2
 pkgdesc='Outline and bitmap font editor'
 url='https://fontforge.github.io/'
 arch=('x86_64')


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

2018-07-14 Thread Evangelos Foutras via arch-commits
Date: Saturday, July 14, 2018 @ 18:54:15
  Author: foutrelis
Revision: 328669

Refresh checksums (20170731.tar.gz failed verification)

Modified:
  fontforge/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-07-14 17:41:15 UTC (rev 328668)
+++ PKGBUILD2018-07-14 18:54:15 UTC (rev 328669)
@@ -16,7 +16,7 @@
  'python' 'desktop-file-utils' 'gtk-update-icon-cache' 
'hicolor-icon-theme')
 source=("https://github.com/fontforge/fontforge/archive/${pkgver}.tar.gz";
 'https://fontforge.github.io/cidmaps.tgz')
-sha256sums=('3f53d06caba2a96dc498df81717e35504815046b3178e811c85c4cc135492d8c'
+sha256sums=('89203db05658e79418104fb6442b3feffb20762198c2d8b0343db49a07769302'
 '1bf9c7eb8835e6ed94e62cb49f1141bc046c562849e52e6c3c7f1d7cfc95c7b3')
 
 build() {


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

2017-08-05 Thread Gaëtan Bisson
Date: Saturday, August 5, 2017 @ 23:34:43
  Author: bisson
Revision: 301692

upstream update

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

--+
 PKGBUILD |   17 +-
 pymem_free.patch |  141 -
 2 files changed, 5 insertions(+), 153 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-08-05 22:33:00 UTC (rev 301691)
+++ PKGBUILD2017-08-05 23:34:43 UTC (rev 301692)
@@ -4,8 +4,8 @@
 # Contributor: William Rea 
 
 pkgname=fontforge
-pkgver=20161012
-pkgrel=4
+pkgver=20170731
+pkgrel=1
 pkgdesc='Outline and bitmap font editor'
 url='https://fontforge.github.io/'
 arch=('i686' 'x86_64')
@@ -15,17 +15,10 @@
  'pango' 'giflib' 'libtiff' 'libxml2' 'libspiro' 'libunicodenames' 
'zeromq'
  'python' 'desktop-file-utils' 'gtk-update-icon-cache' 
'hicolor-icon-theme')
 source=("https://github.com/fontforge/fontforge/archive/${pkgver}.tar.gz";
-'https://fontforge.github.io/cidmaps.tgz'
-'pymem_free.patch')
-sha256sums=('a5f5c2974eb9109b607e24f06e57696d5861aaebb620fc2c132bdbac6e656351'
-'1bf9c7eb8835e6ed94e62cb49f1141bc046c562849e52e6c3c7f1d7cfc95c7b3'
-'fd6059fe263e12d02240466c23e773fcd7776ea37c90de52bafd3dc40f09a524')
+'https://fontforge.github.io/cidmaps.tgz')
+sha256sums=('3f53d06caba2a96dc498df81717e35504815046b3178e811c85c4cc135492d8c'
+'1bf9c7eb8835e6ed94e62cb49f1141bc046c562849e52e6c3c7f1d7cfc95c7b3')
 
-prepare() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
-   patch -p1 -i ../pymem_free.patch
-}
-
 build() {
cd "${srcdir}/${pkgname}-${pkgver}"
export LIBZMQ_LIBS=-lzmq

Deleted: pymem_free.patch
===
--- pymem_free.patch2017-08-05 22:33:00 UTC (rev 301691)
+++ pymem_free.patch2017-08-05 23:34:43 UTC (rev 301692)
@@ -1,141 +0,0 @@
-From b5a057f004d2686f5ae47d3f892c63b531c7da13 Mon Sep 17 00:00:00 2001
-From: Parag A Nemade 
-Date: Fri, 10 Mar 2017 08:41:24 +0530
-Subject: [PATCH] Fix many of the free() calls to PyMem_Free() for the
- python3.6 requirement This is also based on the discussion happened in
- upstream issue https://github.com/fontforge/fontforge/issues/2992
-
-This commit is a fix for the reported two problems in issue
-https://github.com/fontforge/fontforge/issues/3042
-
-The upstream documentation says
-PyArg_ParseTuple() will allocate a buffer of the needed size, copy the
-encoded data into this buffer and adjust *buffer to reference the newly
-allocated storage. The caller is responsible for calling PyMem_Free()
-to free the allocated buffer after use.

- fontforge/python.c | 27 ++-
- 1 file changed, 14 insertions(+), 13 deletions(-)
-
-diff --git a/fontforge/python.c b/fontforge/python.c
-index faa7485..758422a 100644
 a/fontforge/python.c
-+++ b/fontforge/python.c
-@@ -1045,7 +1045,7 @@ static PyObject *PyFF_OpenFont(PyObject *UNUSED(self), 
PyObject *args) {
- if ( !PyArg_ParseTuple(args,"es|i", "UTF-8", &filename, &openflags ))
- return( NULL );
- locfilename = utf82def_copy(filename);
--free(filename);
-+PyMem_Free(filename);
- 
- /* The actual filename opened may be different from the one passed
-  * to LoadSplineFont, so we can't report the filename on an
-@@ -1072,7 +1072,7 @@ static PyObject *PyFF_FontsInFile(PyObject 
*UNUSED(self), PyObject *args) {
- if ( !PyArg_ParseTuple(args,"es","UTF-8",&filename) )
- return( NULL );
- locfilename = utf82def_copy(filename);
--free(filename);
-+PyMem_Free(filename);
- ret = GetFontNames(locfilename, 1);
- free(locfilename);
- cnt = 0;
-@@ -4128,7 +4128,7 @@ static PyObject *PyFFLayer_export(PyFF_Layer *self, 
PyObject *args) {
- if ( !PyArg_ParseTuple(args,"es","UTF-8",&filename) )
- return( NULL );
- locfilename = utf82def_copy(filename);
--free(filename);
-+PyMem_Free(filename);
- 
- pt = strrchr(locfilename,'.');
- if ( pt==NULL ) pt=locfilename;
-@@ -7785,7 +7785,7 @@ static PyObject *PyFFGlyph_import(PyObject *self, 
PyObject *args) {
- if ( !PyArg_ParseTuple(args,"es|O","UTF-8",&filename, &flags) )
- return( NULL );
- locfilename = utf82def_copy(filename);
--free(filename);
-+PyMem_Free(filename);
- 
- /* Check if the file exists and is readable */
- if ( access(locfilename,R_OK)!=0 ) {
-@@ -7854,7 +7854,7 @@ static PyObject *PyFFGlyph_export(PyObject *self, 
PyObject *args) {
- if ( !PyArg_ParseTuple(args,"es|OO","UTF-8",&filename,&foo,&bar) )
- return( NULL );
- locfilename = utf82def_copy(filename);
--free(filename);
-+PyMem_Free(filename);
- 
- pt = strrchr(locfilename,'.');
- if ( pt==NULL ) pt=locfilename;
-@@ -13549,7 +13549,7 @@ return (NULL);
-   &to_background) )
- return( NULL );
- locfilename = utf82def_copy(filena

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

2017-04-08 Thread Gaëtan Bisson
Date: Saturday, April 8, 2017 @ 19:25:12
  Author: bisson
Revision: 292521

fix FS#53549

Modified:
  fontforge/trunk/PKGBUILD

--+
 PKGBUILD |4 
 1 file changed, 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-04-08 19:05:31 UTC (rev 292520)
+++ PKGBUILD2017-04-08 19:25:12 UTC (rev 292521)
@@ -45,10 +45,6 @@
install -d "${pkgdir}/usr/share/fontforge"
install -m644 ../Adobe-* "${pkgdir}/usr/share/fontforge"
 
-   install -d "${pkgdir}/usr/share/icons"
-   cp -a desktop/icons "${pkgdir}/usr/share/icons/hicolor"
-   rm -fr "${pkgdir}/usr/share/icons/hicolor/src"
-
install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
install -Dm644 desktop/fontforge.desktop 
"${pkgdir}/usr/share/applications/fontforge.desktop"
 }


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

2017-03-20 Thread Gaëtan Bisson
Date: Monday, March 20, 2017 @ 08:10:47
  Author: bisson
Revision: 291094

fix FS#53370

Added:
  fontforge/trunk/pymem_free.patch
Modified:
  fontforge/trunk/PKGBUILD

--+
 PKGBUILD |   13 +++-
 pymem_free.patch |  141 +
 2 files changed, 151 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-03-19 16:15:04 UTC (rev 291093)
+++ PKGBUILD2017-03-20 08:10:47 UTC (rev 291094)
@@ -5,7 +5,7 @@
 
 pkgname=fontforge
 pkgver=20161012
-pkgrel=3
+pkgrel=4
 pkgdesc='Outline and bitmap font editor'
 url='https://fontforge.github.io/'
 arch=('i686' 'x86_64')
@@ -15,10 +15,17 @@
  'pango' 'giflib' 'libtiff' 'libxml2' 'libspiro' 'libunicodenames' 
'zeromq'
  'python' 'desktop-file-utils' 'gtk-update-icon-cache' 
'hicolor-icon-theme')
 source=("https://github.com/fontforge/fontforge/archive/${pkgver}.tar.gz";
-'https://fontforge.github.io/cidmaps.tgz')
+'https://fontforge.github.io/cidmaps.tgz'
+'pymem_free.patch')
 sha256sums=('a5f5c2974eb9109b607e24f06e57696d5861aaebb620fc2c132bdbac6e656351'
-'1bf9c7eb8835e6ed94e62cb49f1141bc046c562849e52e6c3c7f1d7cfc95c7b3')
+'1bf9c7eb8835e6ed94e62cb49f1141bc046c562849e52e6c3c7f1d7cfc95c7b3'
+'fd6059fe263e12d02240466c23e773fcd7776ea37c90de52bafd3dc40f09a524')
 
+prepare() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   patch -p1 -i ../pymem_free.patch
+}
+
 build() {
cd "${srcdir}/${pkgname}-${pkgver}"
export LIBZMQ_LIBS=-lzmq

Added: pymem_free.patch
===
--- pymem_free.patch(rev 0)
+++ pymem_free.patch2017-03-20 08:10:47 UTC (rev 291094)
@@ -0,0 +1,141 @@
+From b5a057f004d2686f5ae47d3f892c63b531c7da13 Mon Sep 17 00:00:00 2001
+From: Parag A Nemade 
+Date: Fri, 10 Mar 2017 08:41:24 +0530
+Subject: [PATCH] Fix many of the free() calls to PyMem_Free() for the
+ python3.6 requirement This is also based on the discussion happened in
+ upstream issue https://github.com/fontforge/fontforge/issues/2992
+
+This commit is a fix for the reported two problems in issue
+https://github.com/fontforge/fontforge/issues/3042
+
+The upstream documentation says
+PyArg_ParseTuple() will allocate a buffer of the needed size, copy the
+encoded data into this buffer and adjust *buffer to reference the newly
+allocated storage. The caller is responsible for calling PyMem_Free()
+to free the allocated buffer after use.
+---
+ fontforge/python.c | 27 ++-
+ 1 file changed, 14 insertions(+), 13 deletions(-)
+
+diff --git a/fontforge/python.c b/fontforge/python.c
+index faa7485..758422a 100644
+--- a/fontforge/python.c
 b/fontforge/python.c
+@@ -1045,7 +1045,7 @@ static PyObject *PyFF_OpenFont(PyObject *UNUSED(self), 
PyObject *args) {
+ if ( !PyArg_ParseTuple(args,"es|i", "UTF-8", &filename, &openflags ))
+ return( NULL );
+ locfilename = utf82def_copy(filename);
+-free(filename);
++PyMem_Free(filename);
+ 
+ /* The actual filename opened may be different from the one passed
+  * to LoadSplineFont, so we can't report the filename on an
+@@ -1072,7 +1072,7 @@ static PyObject *PyFF_FontsInFile(PyObject 
*UNUSED(self), PyObject *args) {
+ if ( !PyArg_ParseTuple(args,"es","UTF-8",&filename) )
+ return( NULL );
+ locfilename = utf82def_copy(filename);
+-free(filename);
++PyMem_Free(filename);
+ ret = GetFontNames(locfilename, 1);
+ free(locfilename);
+ cnt = 0;
+@@ -4128,7 +4128,7 @@ static PyObject *PyFFLayer_export(PyFF_Layer *self, 
PyObject *args) {
+ if ( !PyArg_ParseTuple(args,"es","UTF-8",&filename) )
+ return( NULL );
+ locfilename = utf82def_copy(filename);
+-free(filename);
++PyMem_Free(filename);
+ 
+ pt = strrchr(locfilename,'.');
+ if ( pt==NULL ) pt=locfilename;
+@@ -7785,7 +7785,7 @@ static PyObject *PyFFGlyph_import(PyObject *self, 
PyObject *args) {
+ if ( !PyArg_ParseTuple(args,"es|O","UTF-8",&filename, &flags) )
+ return( NULL );
+ locfilename = utf82def_copy(filename);
+-free(filename);
++PyMem_Free(filename);
+ 
+ /* Check if the file exists and is readable */
+ if ( access(locfilename,R_OK)!=0 ) {
+@@ -7854,7 +7854,7 @@ static PyObject *PyFFGlyph_export(PyObject *self, 
PyObject *args) {
+ if ( !PyArg_ParseTuple(args,"es|OO","UTF-8",&filename,&foo,&bar) )
+ return( NULL );
+ locfilename = utf82def_copy(filename);
+-free(filename);
++PyMem_Free(filename);
+ 
+ pt = strrchr(locfilename,'.');
+ if ( pt==NULL ) pt=locfilename;
+@@ -13549,7 +13549,7 @@ return (NULL);
+   &to_background) )
+ return( NULL );
+ locfilename = utf82def_copy(filename);
+-free(filename);
++PyMem_Free(filename);
+ 
+ ext = strrchr(locfilename,'.');
+ if ( ext==NULL ) {
+@@ -13623,7 +13623,7

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

2017-03-01 Thread Gaëtan Bisson
Date: Thursday, March 2, 2017 @ 01:31:26
  Author: bisson
Revision: 289790

switch to sha256sum

Modified:
  fontforge/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-03-02 01:31:20 UTC (rev 289789)
+++ PKGBUILD2017-03-02 01:31:26 UTC (rev 289790)
@@ -16,8 +16,8 @@
  'python' 'desktop-file-utils' 'gtk-update-icon-cache' 
'hicolor-icon-theme')
 source=("https://github.com/fontforge/fontforge/archive/${pkgver}.tar.gz";
 'https://fontforge.github.io/cidmaps.tgz')
-sha1sums=('b0acc58e3fa2bc9ae2cab0a2c24ad30101ffba79'
-  'efbc7c9d3e95159f5600dc71f9cccb370e46bb94')
+sha256sums=('a5f5c2974eb9109b607e24f06e57696d5861aaebb620fc2c132bdbac6e656351'
+'1bf9c7eb8835e6ed94e62cb49f1141bc046c562849e52e6c3c7f1d7cfc95c7b3')
 
 build() {
cd "${srcdir}/${pkgname}-${pkgver}"


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

2016-12-24 Thread Bartłomiej Piotrowski
Date: Saturday, December 24, 2016 @ 15:39:22
  Author: bpiotrowski
Revision: 284645

Python 3.6 rebuild

Modified:
  fontforge/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-12-24 15:35:02 UTC (rev 284644)
+++ PKGBUILD2016-12-24 15:39:22 UTC (rev 284645)
@@ -5,7 +5,7 @@
 
 pkgname=fontforge
 pkgver=20161012
-pkgrel=2
+pkgrel=3
 pkgdesc='Outline and bitmap font editor'
 url='https://fontforge.github.io/'
 arch=('i686' 'x86_64')


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

2016-11-07 Thread Evangelos Foutras
Date: Monday, November 7, 2016 @ 17:27:43
  Author: foutrelis
Revision: 280051

readline 7.0 rebuild

Modified:
  fontforge/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-11-07 17:27:02 UTC (rev 280050)
+++ PKGBUILD2016-11-07 17:27:43 UTC (rev 280051)
@@ -5,7 +5,7 @@
 
 pkgname=fontforge
 pkgver=20161012
-pkgrel=1
+pkgrel=2
 pkgdesc='Outline and bitmap font editor'
 url='https://fontforge.github.io/'
 arch=('i686' 'x86_64')


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

2016-11-01 Thread Gaëtan Bisson
Date: Tuesday, November 1, 2016 @ 22:10:50
  Author: bisson
Revision: 279708

add https

Modified:
  fontforge/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-11-01 22:10:44 UTC (rev 279707)
+++ PKGBUILD2016-11-01 22:10:50 UTC (rev 279708)
@@ -7,7 +7,7 @@
 pkgver=20161012
 pkgrel=1
 pkgdesc='Outline and bitmap font editor'
-url='http://fontforge.github.io/'
+url='https://fontforge.github.io/'
 arch=('i686' 'x86_64')
 license=('BSD')
 makedepends=('git')
@@ -15,7 +15,7 @@
  'pango' 'giflib' 'libtiff' 'libxml2' 'libspiro' 'libunicodenames' 
'zeromq'
  'python' 'desktop-file-utils' 'gtk-update-icon-cache' 
'hicolor-icon-theme')
 source=("https://github.com/fontforge/fontforge/archive/${pkgver}.tar.gz";
-'http://fontforge.github.io/cidmaps.tgz')
+'https://fontforge.github.io/cidmaps.tgz')
 sha1sums=('b0acc58e3fa2bc9ae2cab0a2c24ad30101ffba79'
   'efbc7c9d3e95159f5600dc71f9cccb370e46bb94')
 


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

2016-10-17 Thread Gaëtan Bisson
Date: Monday, October 17, 2016 @ 17:28:17
  Author: bisson
Revision: 278896

upstream update

Modified:
  fontforge/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-10-17 16:09:20 UTC (rev 278895)
+++ PKGBUILD2016-10-17 17:28:17 UTC (rev 278896)
@@ -4,7 +4,7 @@
 # Contributor: William Rea 
 
 pkgname=fontforge
-pkgver=20161004
+pkgver=20161012
 pkgrel=1
 pkgdesc='Outline and bitmap font editor'
 url='http://fontforge.github.io/'
@@ -16,7 +16,7 @@
  'python' 'desktop-file-utils' 'gtk-update-icon-cache' 
'hicolor-icon-theme')
 source=("https://github.com/fontforge/fontforge/archive/${pkgver}.tar.gz";
 'http://fontforge.github.io/cidmaps.tgz')
-sha1sums=('5248f1938a2371fcd8a77eeb24a80e635b59d91a'
+sha1sums=('b0acc58e3fa2bc9ae2cab0a2c24ad30101ffba79'
   'efbc7c9d3e95159f5600dc71f9cccb370e46bb94')
 
 build() {


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

2016-10-04 Thread Gaëtan Bisson
Date: Tuesday, October 4, 2016 @ 18:21:01
  Author: bisson
Revision: 277705

upstream update

Modified:
  fontforge/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-10-04 18:17:03 UTC (rev 277704)
+++ PKGBUILD2016-10-04 18:21:01 UTC (rev 277705)
@@ -4,7 +4,7 @@
 # Contributor: William Rea 
 
 pkgname=fontforge
-pkgver=20160404
+pkgver=20161004
 pkgrel=1
 pkgdesc='Outline and bitmap font editor'
 url='http://fontforge.github.io/'
@@ -16,7 +16,7 @@
  'python' 'desktop-file-utils' 'gtk-update-icon-cache' 
'hicolor-icon-theme')
 source=("https://github.com/fontforge/fontforge/archive/${pkgver}.tar.gz";
 'http://fontforge.github.io/cidmaps.tgz')
-sha1sums=('ace3a019701391459623ea1f0860fb5de8f99977'
+sha1sums=('5248f1938a2371fcd8a77eeb24a80e635b59d91a'
   'efbc7c9d3e95159f5600dc71f9cccb370e46bb94')
 
 build() {


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

2016-05-06 Thread Gaetan Bisson
Date: Saturday, May 7, 2016 @ 02:01:55
  Author: bisson
Revision: 267077

upstream update

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

+
 PKGBUILD   |   17 +
 python35.patch |   12 
 2 files changed, 5 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-05-06 23:46:44 UTC (rev 267076)
+++ PKGBUILD2016-05-07 00:01:55 UTC (rev 267077)
@@ -4,8 +4,8 @@
 # Contributor: William Rea 
 
 pkgname=fontforge
-pkgver=20150824
-pkgrel=2
+pkgver=20160404
+pkgrel=1
 pkgdesc='Outline and bitmap font editor'
 url='http://fontforge.github.io/'
 arch=('i686' 'x86_64')
@@ -15,17 +15,10 @@
  'pango' 'giflib' 'libtiff' 'libxml2' 'libspiro' 'libunicodenames' 
'zeromq'
  'python' 'desktop-file-utils' 'gtk-update-icon-cache' 
'hicolor-icon-theme')
 source=("https://github.com/fontforge/fontforge/archive/${pkgver}.tar.gz";
-'http://fontforge.github.io/cidmaps.tgz'
-'python35.patch')
-sha1sums=('ef57ecfcb438b7d9f38b19c4c5293de7fd274000'
-  'efbc7c9d3e95159f5600dc71f9cccb370e46bb94'
-  '8003bc30a56aee7378ac1d74639d2678a823d952')
+'http://fontforge.github.io/cidmaps.tgz')
+sha1sums=('ace3a019701391459623ea1f0860fb5de8f99977'
+  'efbc7c9d3e95159f5600dc71f9cccb370e46bb94')
 
-prepare() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
-   patch -p1 -i ../python35.patch
-}
-
 build() {
cd "${srcdir}/${pkgname}-${pkgver}"
export LIBZMQ_LIBS=-lzmq

Deleted: python35.patch
===
--- python35.patch  2016-05-06 23:46:44 UTC (rev 267076)
+++ python35.patch  2016-05-07 00:01:55 UTC (rev 267077)
@@ -1,12 +0,0 @@
-diff -Naur old/fontforge/python.c new/fontforge/python.c
 old/fontforge/python.c 2015-06-12 10:48:13.0 -1000
-+++ new/fontforge/python.c 2015-09-19 08:44:21.523111860 -1000
-@@ -18175,7 +18175,7 @@
- mdef->runtime.pymod_def.m_doc = mdef->docstring;
- mdef->runtime.pymod_def.m_methods = mdef->methods;
- mdef->runtime.pymod_def.m_size = -1;
--mdef->runtime.pymod_def.m_reload = NULL;
-+mdef->runtime.pymod_def.m_slots = NULL;
- mdef->runtime.pymod_def.m_traverse = NULL;
- mdef->runtime.pymod_def.m_clear = NULL;
- mdef->runtime.pymod_def.m_free = NULL;


[arch-commits] Commit in fontforge/trunk (PKGBUILD install)

2016-05-03 Thread Gaetan Bisson
Date: Tuesday, May 3, 2016 @ 23:09:22
  Author: bisson
Revision: 266828

remove deprecated install file

Modified:
  fontforge/trunk/PKGBUILD
Deleted:
  fontforge/trunk/install

--+
 PKGBUILD |4 +---
 install  |   12 
 2 files changed, 1 insertion(+), 15 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-05-03 21:07:45 UTC (rev 266827)
+++ PKGBUILD2016-05-03 21:09:22 UTC (rev 266828)
@@ -5,7 +5,7 @@
 
 pkgname=fontforge
 pkgver=20150824
-pkgrel=1
+pkgrel=2
 pkgdesc='Outline and bitmap font editor'
 url='http://fontforge.github.io/'
 arch=('i686' 'x86_64')
@@ -21,8 +21,6 @@
   'efbc7c9d3e95159f5600dc71f9cccb370e46bb94'
   '8003bc30a56aee7378ac1d74639d2678a823d952')
 
-install=install
-
 prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
patch -p1 -i ../python35.patch

Deleted: install
===
--- install 2016-05-03 21:07:45 UTC (rev 266827)
+++ install 2016-05-03 21:09:22 UTC (rev 266828)
@@ -1,12 +0,0 @@
-post_upgrade() {
-   update-desktop-database -q
-   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_install() {
-   post_upgrade
-}
-
-post_remove() {
-   post_upgrade
-}


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

2015-09-28 Thread Gaetan Bisson
Date: Tuesday, September 29, 2015 @ 01:42:17
  Author: bisson
Revision: 247857

upstream update

Modified:
  fontforge/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-09-28 23:13:41 UTC (rev 247856)
+++ PKGBUILD2015-09-28 23:42:17 UTC (rev 247857)
@@ -4,10 +4,10 @@
 # Contributor: William Rea 
 
 pkgname=fontforge
-pkgver=20150612
-pkgrel=2
+pkgver=20150824
+pkgrel=1
 pkgdesc='Outline and bitmap font editor'
-url='http://www.fontforge.org/'
+url='http://fontforge.github.io/'
 arch=('i686' 'x86_64')
 license=('BSD')
 makedepends=('git')
@@ -15,9 +15,9 @@
  'pango' 'giflib' 'libtiff' 'libxml2' 'libspiro' 'libunicodenames' 
'zeromq'
  'python' 'desktop-file-utils' 'gtk-update-icon-cache' 
'hicolor-icon-theme')
 source=("https://github.com/fontforge/fontforge/archive/${pkgver}.tar.gz";
-'http://fontforge.org/cidmaps.tgz'
+'http://fontforge.github.io/cidmaps.tgz'
 'python35.patch')
-sha1sums=('a29ef3ff4df9b77344e29b25c632b36fb79c13e9'
+sha1sums=('ef57ecfcb438b7d9f38b19c4c5293de7fd274000'
   'efbc7c9d3e95159f5600dc71f9cccb370e46bb94'
   '8003bc30a56aee7378ac1d74639d2678a823d952')
 


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

2015-09-19 Thread Gaetan Bisson
Date: Saturday, September 19, 2015 @ 20:57:48
  Author: bisson
Revision: 246681

rebuild for python-3.5

Added:
  fontforge/trunk/python35.patch
Modified:
  fontforge/trunk/PKGBUILD

+
 PKGBUILD   |   13 ++---
 python35.patch |   12 
 2 files changed, 22 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-09-19 18:24:11 UTC (rev 246680)
+++ PKGBUILD2015-09-19 18:57:48 UTC (rev 246681)
@@ -5,7 +5,7 @@
 
 pkgname=fontforge
 pkgver=20150612
-pkgrel=1
+pkgrel=2
 pkgdesc='Outline and bitmap font editor'
 url='http://www.fontforge.org/'
 arch=('i686' 'x86_64')
@@ -15,12 +15,19 @@
  'pango' 'giflib' 'libtiff' 'libxml2' 'libspiro' 'libunicodenames' 
'zeromq'
  'python' 'desktop-file-utils' 'gtk-update-icon-cache' 
'hicolor-icon-theme')
 source=("https://github.com/fontforge/fontforge/archive/${pkgver}.tar.gz";
-'http://fontforge.org/cidmaps.tgz')
+'http://fontforge.org/cidmaps.tgz'
+'python35.patch')
 sha1sums=('a29ef3ff4df9b77344e29b25c632b36fb79c13e9'
-  'efbc7c9d3e95159f5600dc71f9cccb370e46bb94')
+  'efbc7c9d3e95159f5600dc71f9cccb370e46bb94'
+  '8003bc30a56aee7378ac1d74639d2678a823d952')
 
 install=install
 
+prepare() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   patch -p1 -i ../python35.patch
+}
+
 build() {
cd "${srcdir}/${pkgname}-${pkgver}"
export LIBZMQ_LIBS=-lzmq

Added: python35.patch
===
--- python35.patch  (rev 0)
+++ python35.patch  2015-09-19 18:57:48 UTC (rev 246681)
@@ -0,0 +1,12 @@
+diff -Naur old/fontforge/python.c new/fontforge/python.c
+--- old/fontforge/python.c 2015-06-12 10:48:13.0 -1000
 new/fontforge/python.c 2015-09-19 08:44:21.523111860 -1000
+@@ -18175,7 +18175,7 @@
+ mdef->runtime.pymod_def.m_doc = mdef->docstring;
+ mdef->runtime.pymod_def.m_methods = mdef->methods;
+ mdef->runtime.pymod_def.m_size = -1;
+-mdef->runtime.pymod_def.m_reload = NULL;
++mdef->runtime.pymod_def.m_slots = NULL;
+ mdef->runtime.pymod_def.m_traverse = NULL;
+ mdef->runtime.pymod_def.m_clear = NULL;
+ mdef->runtime.pymod_def.m_free = NULL;


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

2015-06-25 Thread Gaetan Bisson
Date: Thursday, June 25, 2015 @ 12:52:59
  Author: bisson
Revision: 241276

upstream update

Modified:
  fontforge/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-06-25 06:45:46 UTC (rev 241275)
+++ PKGBUILD2015-06-25 10:52:59 UTC (rev 241276)
@@ -4,8 +4,8 @@
 # Contributor: William Rea 
 
 pkgname=fontforge
-pkgver=20150430
-pkgrel=2
+pkgver=20150612
+pkgrel=1
 pkgdesc='Outline and bitmap font editor'
 url='http://www.fontforge.org/'
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@
  'python' 'desktop-file-utils' 'gtk-update-icon-cache' 
'hicolor-icon-theme')
 source=("https://github.com/fontforge/fontforge/archive/${pkgver}.tar.gz";
 'http://fontforge.org/cidmaps.tgz')
-sha1sums=('3497280231d65b8339315e61420f8e9d05d2e03d'
+sha1sums=('a29ef3ff4df9b77344e29b25c632b36fb79c13e9'
   'efbc7c9d3e95159f5600dc71f9cccb370e46bb94')
 
 install=install


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

2015-06-15 Thread Gaetan Bisson
Date: Tuesday, June 16, 2015 @ 03:10:00
  Author: bisson
Revision: 240939

rebuild for zeromq

Modified:
  fontforge/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-06-15 22:16:59 UTC (rev 240938)
+++ PKGBUILD2015-06-16 01:10:00 UTC (rev 240939)
@@ -5,7 +5,7 @@
 
 pkgname=fontforge
 pkgver=20150430
-pkgrel=1
+pkgrel=2
 pkgdesc='Outline and bitmap font editor'
 url='http://www.fontforge.org/'
 arch=('i686' 'x86_64')


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

2015-05-26 Thread Gaetan Bisson
Date: Tuesday, May 26, 2015 @ 13:06:46
  Author: bisson
Revision: 239797

fix FS#45092

Modified:
  fontforge/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-05-26 09:46:54 UTC (rev 239796)
+++ PKGBUILD2015-05-26 11:06:46 UTC (rev 239797)
@@ -12,7 +12,7 @@
 license=('BSD')
 makedepends=('git')
 depends=('libtool' 'libxkbui' 'libxi'
- 'pango' 'giflib' 'libtiff' 'libspiro' 'libxml2' 'libspiro' 
'libunicodenames' 'zeromq'
+ 'pango' 'giflib' 'libtiff' 'libxml2' 'libspiro' 'libunicodenames' 
'zeromq'
  'python' 'desktop-file-utils' 'gtk-update-icon-cache' 
'hicolor-icon-theme')
 source=("https://github.com/fontforge/fontforge/archive/${pkgver}.tar.gz";
 'http://fontforge.org/cidmaps.tgz')


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

2015-05-07 Thread Gaetan Bisson
Date: Thursday, May 7, 2015 @ 12:06:10
  Author: bisson
Revision: 238573

upstream update

Modified:
  fontforge/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-05-07 09:33:14 UTC (rev 238572)
+++ PKGBUILD2015-05-07 10:06:10 UTC (rev 238573)
@@ -4,7 +4,7 @@
 # Contributor: William Rea 
 
 pkgname=fontforge
-pkgver=20150330
+pkgver=20150430
 pkgrel=1
 pkgdesc='Outline and bitmap font editor'
 url='http://www.fontforge.org/'
@@ -16,7 +16,7 @@
  'python' 'desktop-file-utils' 'gtk-update-icon-cache' 
'hicolor-icon-theme')
 source=("https://github.com/fontforge/fontforge/archive/${pkgver}.tar.gz";
 'http://fontforge.org/cidmaps.tgz')
-sha1sums=('73c9bbdbcf506f39b5b09f4be8fe38e171bfc48f'
+sha1sums=('3497280231d65b8339315e61420f8e9d05d2e03d'
   'efbc7c9d3e95159f5600dc71f9cccb370e46bb94')
 
 install=install


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

2015-04-02 Thread Gaetan Bisson
Date: Friday, April 3, 2015 @ 07:09:00
  Author: bisson
Revision: 235359

upstream update

Modified:
  fontforge/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-04-03 01:21:25 UTC (rev 235358)
+++ PKGBUILD2015-04-03 05:09:00 UTC (rev 235359)
@@ -4,8 +4,8 @@
 # Contributor: William Rea 
 
 pkgname=fontforge
-pkgver=20150228
-pkgrel=3
+pkgver=20150330
+pkgrel=1
 pkgdesc='Outline and bitmap font editor'
 url='http://www.fontforge.org/'
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@
  'python' 'desktop-file-utils' 'gtk-update-icon-cache' 
'hicolor-icon-theme')
 source=("https://github.com/fontforge/fontforge/archive/${pkgver}.tar.gz";
 'http://fontforge.org/cidmaps.tgz')
-sha1sums=('a034746fb1c14cff31879e2abb51bd6972fabbcd'
+sha1sums=('73c9bbdbcf506f39b5b09f4be8fe38e171bfc48f'
   'efbc7c9d3e95159f5600dc71f9cccb370e46bb94')
 
 install=install


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

2015-03-28 Thread Felix Yan
Date: Saturday, March 28, 2015 @ 10:07:33
  Author: fyan
Revision: 235198

upgpkg: fontforge 20150228-3

rebuild against python 3.4.3-2 (fix missing symbols)

Modified:
  fontforge/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-03-28 08:56:48 UTC (rev 235197)
+++ PKGBUILD2015-03-28 09:07:33 UTC (rev 235198)
@@ -5,7 +5,7 @@
 
 pkgname=fontforge
 pkgver=20150228
-pkgrel=2
+pkgrel=3
 pkgdesc='Outline and bitmap font editor'
 url='http://www.fontforge.org/'
 arch=('i686' 'x86_64')


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

2015-03-10 Thread Gaetan Bisson
Date: Tuesday, March 10, 2015 @ 22:03:06
  Author: bisson
Revision: 20

implement FS#44130

Modified:
  fontforge/trunk/PKGBUILD

--+
 PKGBUILD |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-03-10 20:52:39 UTC (rev 233329)
+++ PKGBUILD2015-03-10 21:03:06 UTC (rev 20)
@@ -5,7 +5,7 @@
 
 pkgname=fontforge
 pkgver=20150228
-pkgrel=1
+pkgrel=2
 pkgdesc='Outline and bitmap font editor'
 url='http://www.fontforge.org/'
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@
 makedepends=('git')
 depends=('libtool' 'libxkbui' 'libxi'
  'pango' 'giflib' 'libtiff' 'libspiro' 'libxml2' 'libspiro' 
'libunicodenames' 'zeromq'
- 'python2' 'desktop-file-utils' 'gtk-update-icon-cache' 
'hicolor-icon-theme')
+ 'python' 'desktop-file-utils' 'gtk-update-icon-cache' 
'hicolor-icon-theme')
 source=("https://github.com/fontforge/fontforge/archive/${pkgver}.tar.gz";
 'http://fontforge.org/cidmaps.tgz')
 sha1sums=('a034746fb1c14cff31879e2abb51bd6972fabbcd'
@@ -24,7 +24,6 @@
 build() {
cd "${srcdir}/${pkgname}-${pkgver}"
export LIBZMQ_LIBS=-lzmq
-   export PYTHON=python2
./bootstrap --force
./configure \
--prefix=/usr \


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

2015-03-07 Thread Gaetan Bisson
Date: Saturday, March 7, 2015 @ 19:09:51
  Author: bisson
Revision: 232990

upstream update

Modified:
  fontforge/trunk/PKGBUILD

--+
 PKGBUILD |   19 ---
 1 file changed, 4 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-03-07 17:41:37 UTC (rev 232989)
+++ PKGBUILD2015-03-07 18:09:51 UTC (rev 232990)
@@ -4,9 +4,8 @@
 # Contributor: William Rea 
 
 pkgname=fontforge
-_pkgver=2014-11-26
-pkgver=${_pkgver//-/}
-pkgrel=3
+pkgver=20150228
+pkgrel=1
 pkgdesc='Outline and bitmap font editor'
 url='http://www.fontforge.org/'
 arch=('i686' 'x86_64')
@@ -15,23 +14,13 @@
 depends=('libtool' 'libxkbui' 'libxi'
  'pango' 'giflib' 'libtiff' 'libspiro' 'libxml2' 'libspiro' 
'libunicodenames' 'zeromq'
  'python2' 'desktop-file-utils' 'gtk-update-icon-cache' 
'hicolor-icon-theme')
-source=("http://github.com/fontforge/fontforge/releases/download/${pkgver}/fontforge-${_pkgver}-Unix-Source.tar.gz";
+source=("https://github.com/fontforge/fontforge/archive/${pkgver}.tar.gz";
 'http://fontforge.org/cidmaps.tgz')
-sha1sums=('ecd776480a47cdcbe1b30ce275172d7d52288e77'
+sha1sums=('a034746fb1c14cff31879e2abb51bd6972fabbcd'
   'efbc7c9d3e95159f5600dc71f9cccb370e46bb94')
 
 install=install
 
-prepare() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
-   rm -fr libltdl
-   for i in m4/*.m4; do
-   if [[ ! -L $i ]]; then continue; fi
-   j=$(readlink "$i")
-   ln -sf "${j/aclocal\//aclocal\/lt}" "$i"
-   done
-}
-
 build() {
cd "${srcdir}/${pkgname}-${pkgver}"
export LIBZMQ_LIBS=-lzmq


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

2015-01-31 Thread Gaetan Bisson
Date: Sunday, February 1, 2015 @ 08:46:30
  Author: bisson
Revision: 230347

rebuild against libspiro

Modified:
  fontforge/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-02-01 07:00:54 UTC (rev 230346)
+++ PKGBUILD2015-02-01 07:46:30 UTC (rev 230347)
@@ -6,7 +6,7 @@
 pkgname=fontforge
 _pkgver=2014-11-26
 pkgver=${_pkgver//-/}
-pkgrel=2
+pkgrel=3
 pkgdesc='Outline and bitmap font editor'
 url='http://www.fontforge.org/'
 arch=('i686' 'x86_64')


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

2014-12-25 Thread Gaetan Bisson
Date: Thursday, December 25, 2014 @ 10:03:18
  Author: bisson
Revision: 228034

fix FS#43161

Modified:
  fontforge/trunk/PKGBUILD

--+
 PKGBUILD |   22 --
 1 file changed, 16 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-12-25 07:12:20 UTC (rev 228033)
+++ PKGBUILD2014-12-25 09:03:18 UTC (rev 228034)
@@ -4,29 +4,39 @@
 # Contributor: William Rea 
 
 pkgname=fontforge
-pkgver=20141126
-pkgrel=1
+_pkgver=2014-11-26
+pkgver=${_pkgver//-/}
+pkgrel=2
 pkgdesc='Outline and bitmap font editor'
 url='http://www.fontforge.org/'
 arch=('i686' 'x86_64')
 license=('BSD')
 makedepends=('git')
-depends=('libltdl' 'libxkbui' 'libxi'
+depends=('libtool' 'libxkbui' 'libxi'
  'pango' 'giflib' 'libtiff' 'libspiro' 'libxml2' 'libspiro' 
'libunicodenames' 'zeromq'
  'python2' 'desktop-file-utils' 'gtk-update-icon-cache' 
'hicolor-icon-theme')
-source=("http://github.com/fontforge/fontforge/releases/download/${pkgver}/fontforge-${pkgver}.tar.gz";
+source=("http://github.com/fontforge/fontforge/releases/download/${pkgver}/fontforge-${_pkgver}-Unix-Source.tar.gz";
 'http://fontforge.org/cidmaps.tgz')
 sha1sums=('ecd776480a47cdcbe1b30ce275172d7d52288e77'
   'efbc7c9d3e95159f5600dc71f9cccb370e46bb94')
 
-options=('!makeflags')
 install=install
 
+prepare() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   rm -fr libltdl
+   for i in m4/*.m4; do
+   if [[ ! -L $i ]]; then continue; fi
+   j=$(readlink "$i")
+   ln -sf "${j/aclocal\//aclocal\/lt}" "$i"
+   done
+}
+
 build() {
cd "${srcdir}/${pkgname}-${pkgver}"
export LIBZMQ_LIBS=-lzmq
export PYTHON=python2
-   ./bootstrap
+   ./bootstrap --force
./configure \
--prefix=/usr \
--mandir=/usr/share/man \


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

2014-11-26 Thread Gaetan Bisson
Date: Thursday, November 27, 2014 @ 06:36:29
  Author: bisson
Revision: 227147

upstream update

Modified:
  fontforge/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-11-27 04:00:02 UTC (rev 227146)
+++ PKGBUILD2014-11-27 05:36:29 UTC (rev 227147)
@@ -4,7 +4,7 @@
 # Contributor: William Rea 
 
 pkgname=fontforge
-pkgver=20141014
+pkgver=20141126
 pkgrel=1
 pkgdesc='Outline and bitmap font editor'
 url='http://www.fontforge.org/'
@@ -14,9 +14,9 @@
 depends=('libltdl' 'libxkbui' 'libxi'
  'pango' 'giflib' 'libtiff' 'libspiro' 'libxml2' 'libspiro' 
'libunicodenames' 'zeromq'
  'python2' 'desktop-file-utils' 'gtk-update-icon-cache' 
'hicolor-icon-theme')
-source=("https://github.com/fontforge/fontforge/releases/download/${pkgver}/fontforge-${pkgver}.tar.gz";
+source=("http://github.com/fontforge/fontforge/releases/download/${pkgver}/fontforge-${pkgver}.tar.gz";
 'http://fontforge.org/cidmaps.tgz')
-sha1sums=('b366293e423a94d213824368460fa80f9a1ad810'
+sha1sums=('ecd776480a47cdcbe1b30ce275172d7d52288e77'
   'efbc7c9d3e95159f5600dc71f9cccb370e46bb94')
 
 options=('!makeflags')


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

2014-10-19 Thread Gaetan Bisson
Date: Monday, October 20, 2014 @ 01:19:07
  Author: bisson
Revision: 224847

upstream update

Modified:
  fontforge/trunk/PKGBUILD

--+
 PKGBUILD |   28 ++--
 1 file changed, 10 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-10-19 22:51:14 UTC (rev 224846)
+++ PKGBUILD2014-10-19 23:19:07 UTC (rev 224847)
@@ -4,37 +4,29 @@
 # Contributor: William Rea 
 
 pkgname=fontforge
-_pkgver=2.0.20140101
-pkgver=${_pkgver##*.}
-pkgrel=4
+pkgver=20141014
+pkgrel=1
 pkgdesc='Outline and bitmap font editor'
 url='http://www.fontforge.org/'
 arch=('i686' 'x86_64')
 license=('BSD')
+makedepends=('git')
 depends=('libltdl' 'libxkbui' 'libxi'
  'pango' 'giflib' 'libtiff' 'libspiro' 'libxml2' 'libspiro' 
'libunicodenames' 'zeromq'
  'python2' 'desktop-file-utils' 'gtk-update-icon-cache' 
'hicolor-icon-theme')
-source=("https://github.com/fontforge/fontforge/archive/${_pkgver}.tar.gz";
-'http://fontforge.org/cidmaps.tgz'
-'giflib.patch')
-sha1sums=('abce297e53e8b6ff6f08871e53d1eb0be5ab82e7'
-  'efbc7c9d3e95159f5600dc71f9cccb370e46bb94'
-  '420dd1dd75d72719f3203d832bfa8c1c7e7eef86')
+source=("https://github.com/fontforge/fontforge/releases/download/${pkgver}/fontforge-${pkgver}.tar.gz";
+'http://fontforge.org/cidmaps.tgz')
+sha1sums=('b366293e423a94d213824368460fa80f9a1ad810'
+  'efbc7c9d3e95159f5600dc71f9cccb370e46bb94')
 
 options=('!makeflags')
 install=install
 
-prepare() {
-   cd "${srcdir}/${pkgname}-${_pkgver}"
-   sed '/fontforge_package_name/s/^#//' -i configure.ac
-   patch -p1 -i ../giflib.patch
-   ./autogen.sh
-}
-
 build() {
-   cd "${srcdir}/${pkgname}-${_pkgver}"
+   cd "${srcdir}/${pkgname}-${pkgver}"
export LIBZMQ_LIBS=-lzmq
export PYTHON=python2
+   ./bootstrap
./configure \
--prefix=/usr \
--mandir=/usr/share/man \
@@ -44,7 +36,7 @@
 }
 
 package() {
-   cd "${srcdir}/${pkgname}-${_pkgver}"
+   cd "${srcdir}/${pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
 
install -d "${pkgdir}/usr/share/fontforge"


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

2014-10-14 Thread Dave Reisner
Date: Wednesday, October 15, 2014 @ 03:15:25
  Author: dreisner
Revision: 224351

Modified:
  fontforge/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-10-14 17:49:08 UTC (rev 224350)
+++ PKGBUILD2014-10-15 01:15:25 UTC (rev 224351)
@@ -6,7 +6,7 @@
 pkgname=fontforge
 _pkgver=2.0.20140101
 pkgver=${_pkgver##*.}
-pkgrel=3
+pkgrel=4
 pkgdesc='Outline and bitmap font editor'
 url='http://www.fontforge.org/'
 arch=('i686' 'x86_64')


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

2014-05-27 Thread Gaetan Bisson
Date: Tuesday, May 27, 2014 @ 19:28:50
  Author: bisson
Revision: 213655

rebuild for giflib-5.1.0

Added:
  fontforge/trunk/giflib.patch
Modified:
  fontforge/trunk/PKGBUILD

--+
 PKGBUILD |   11 +++
 giflib.patch |   37 +
 2 files changed, 44 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-05-27 13:33:40 UTC (rev 213654)
+++ PKGBUILD2014-05-27 17:28:50 UTC (rev 213655)
@@ -6,9 +6,9 @@
 pkgname=fontforge
 _pkgver=2.0.20140101
 pkgver=${_pkgver##*.}
-pkgrel=2
+pkgrel=3
 pkgdesc='Outline and bitmap font editor'
-url='http://fontforge.sourceforge.net/'
+url='http://www.fontforge.org/'
 arch=('i686' 'x86_64')
 license=('BSD')
 depends=('libltdl' 'libxkbui' 'libxi'
@@ -15,9 +15,11 @@
  'pango' 'giflib' 'libtiff' 'libspiro' 'libxml2' 'libspiro' 
'libunicodenames' 'zeromq'
  'python2' 'desktop-file-utils' 'gtk-update-icon-cache' 
'hicolor-icon-theme')
 source=("https://github.com/fontforge/fontforge/archive/${_pkgver}.tar.gz";
-'http://fontforge.org/cidmaps.tgz')
+'http://fontforge.org/cidmaps.tgz'
+'giflib.patch')
 sha1sums=('abce297e53e8b6ff6f08871e53d1eb0be5ab82e7'
-  'efbc7c9d3e95159f5600dc71f9cccb370e46bb94')
+  'efbc7c9d3e95159f5600dc71f9cccb370e46bb94'
+  '420dd1dd75d72719f3203d832bfa8c1c7e7eef86')
 
 options=('!makeflags')
 install=install
@@ -25,6 +27,7 @@
 prepare() {
cd "${srcdir}/${pkgname}-${_pkgver}"
sed '/fontforge_package_name/s/^#//' -i configure.ac
+   patch -p1 -i ../giflib.patch
./autogen.sh
 }
 

Added: giflib.patch
===
--- giflib.patch(rev 0)
+++ giflib.patch2014-05-27 17:28:50 UTC (rev 213655)
@@ -0,0 +1,37 @@
+diff -Naur old/gutils/gimagereadgif.c new/gutils/gimagereadgif.c
+--- old/gutils/gimagereadgif.c 2014-01-01 05:56:11.0 -1000
 new/gutils/gimagereadgif.c 2014-05-27 07:04:34.930338020 -1000
+@@ -170,13 +170,13 @@
+ 
+ if ( DGifSlurp(gif)!=GIF_OK ) {
+   fprintf(stderr,"Bad input file \"%s\"\n",filename );
+-  DGifCloseFile(gif);
++  DGifCloseFile(gif, NULL);
+   return( NULL );
+ }
+ 
+ /* Process each image so that it/they can be imported into FF. */
+ if ( (images=(GImage **) malloc(gif->ImageCount*sizeof(GImage *)))==NULL 
) {
+-  DGifCloseFile(gif);
++  DGifCloseFile(gif, NULL);
+   NoMoreMemMessage();
+   return( NULL );
+ }
+@@ -185,7 +185,7 @@
+   if ( (images[i]=ProcessSavedImage(gif,&gif->SavedImages[i],il))==NULL ) 
{
+   while ( --i>=0 ) free(images[i]);
+   free(images);
+-  DGifCloseFile(gif);
++  DGifCloseFile(gif, NULL);
+   return( NULL );
+   }
+ }
+@@ -195,7 +195,7 @@
+   ret = images[0];
+ else
+   ret = GImageCreateAnimation(images,gif->ImageCount);
+-DGifCloseFile(gif);
++DGifCloseFile(gif, NULL);
+ free(images);
+ return( ret );
+ }



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

2014-03-31 Thread Gaetan Bisson
Date: Monday, March 31, 2014 @ 09:33:59
  Author: bisson
Revision: 209261

implement FS#39681

Modified:
  fontforge/trunk/PKGBUILD

--+
 PKGBUILD |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-03-31 07:30:03 UTC (rev 209260)
+++ PKGBUILD2014-03-31 07:33:59 UTC (rev 209261)
@@ -6,13 +6,14 @@
 pkgname=fontforge
 _pkgver=2.0.20140101
 pkgver=${_pkgver##*.}
-pkgrel=1
+pkgrel=2
 pkgdesc='Outline and bitmap font editor'
 url='http://fontforge.sourceforge.net/'
 arch=('i686' 'x86_64')
 license=('BSD')
-depends=('libxkbui' 'libxi' 'libxml2' 'pango' 'giflib' 'libtiff' 'python2' 
'libspiro'
- 'libltdl' 'desktop-file-utils' 'gtk-update-icon-cache' 
'hicolor-icon-theme')
+depends=('libltdl' 'libxkbui' 'libxi'
+ 'pango' 'giflib' 'libtiff' 'libspiro' 'libxml2' 'libspiro' 
'libunicodenames' 'zeromq'
+ 'python2' 'desktop-file-utils' 'gtk-update-icon-cache' 
'hicolor-icon-theme')
 source=("https://github.com/fontforge/fontforge/archive/${_pkgver}.tar.gz";
 'http://fontforge.org/cidmaps.tgz')
 sha1sums=('abce297e53e8b6ff6f08871e53d1eb0be5ab82e7'
@@ -29,6 +30,7 @@
 
 build() {
cd "${srcdir}/${pkgname}-${_pkgver}"
+   export LIBZMQ_LIBS=-lzmq
export PYTHON=python2
./configure \
--prefix=/usr \



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

2014-01-05 Thread Gaetan Bisson
Date: Sunday, January 5, 2014 @ 10:56:47
  Author: bisson
Revision: 203199

upstream update

Modified:
  fontforge/trunk/PKGBUILD

--+
 PKGBUILD |9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-01-05 05:36:51 UTC (rev 203198)
+++ PKGBUILD2014-01-05 09:56:47 UTC (rev 203199)
@@ -12,7 +12,7 @@
 arch=('i686' 'x86_64')
 license=('BSD')
 depends=('libxkbui' 'libxi' 'libxml2' 'pango' 'giflib' 'libtiff' 'python2' 
'libspiro'
- 'desktop-file-utils' 'gtk-update-icon-cache' 'hicolor-icon-theme')
+ 'libltdl' 'desktop-file-utils' 'gtk-update-icon-cache' 
'hicolor-icon-theme')
 source=("https://github.com/fontforge/fontforge/archive/${_pkgver}.tar.gz";
 'http://fontforge.org/cidmaps.tgz')
 sha1sums=('abce297e53e8b6ff6f08871e53d1eb0be5ab82e7'
@@ -21,10 +21,15 @@
 options=('!makeflags')
 install=install
 
+prepare() {
+   cd "${srcdir}/${pkgname}-${_pkgver}"
+   sed '/fontforge_package_name/s/^#//' -i configure.ac
+   ./autogen.sh
+}
+
 build() {
cd "${srcdir}/${pkgname}-${_pkgver}"
export PYTHON=python2
-   ./autogen.sh
./configure \
--prefix=/usr \
--mandir=/usr/share/man \



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

2014-01-04 Thread Gaetan Bisson
Date: Sunday, January 5, 2014 @ 06:36:51
  Author: bisson
Revision: 203198

tentative upstream update

Modified:
  fontforge/trunk/PKGBUILD

--+
 PKGBUILD |   35 ---
 1 file changed, 12 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-01-05 05:25:55 UTC (rev 203197)
+++ PKGBUILD2014-01-05 05:36:51 UTC (rev 203198)
@@ -4,8 +4,9 @@
 # Contributor: William Rea 
 
 pkgname=fontforge
-pkgver=20120731_b
-pkgrel=6
+_pkgver=2.0.20140101
+pkgver=${_pkgver##*.}
+pkgrel=1
 pkgdesc='Outline and bitmap font editor'
 url='http://fontforge.sourceforge.net/'
 arch=('i686' 'x86_64')
@@ -12,40 +13,28 @@
 license=('BSD')
 depends=('libxkbui' 'libxi' 'libxml2' 'pango' 'giflib' 'libtiff' 'python2' 
'libspiro'
  'desktop-file-utils' 'gtk-update-icon-cache' 'hicolor-icon-theme')
-source=("http://downloads.sourceforge.net/project/fontforge/fontforge-source/fontforge_full-${pkgver//_/-}.tar.bz2";
+source=("https://github.com/fontforge/fontforge/archive/${_pkgver}.tar.gz";
 'http://fontforge.org/cidmaps.tgz')
-sha1sums=('b520f532b48e557c177dffa29120225066cc4e84'
+sha1sums=('abce297e53e8b6ff6f08871e53d1eb0be5ab82e7'
   'efbc7c9d3e95159f5600dc71f9cccb370e46bb94')
 
-# 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";)
-
 options=('!makeflags')
 install=install
 
-prepare() {
-   cd "${srcdir}/${pkgname}-${pkgver//_/-}"
-   sed 's/python /python2 /g' -i Makefile.dynamic.in
-   sed 's/\(DGifOpenFileName([^)]*\))/\1,NULL)/g' -i gutils/gimagereadgif.c
-}
-
 build() {
-   cd "${srcdir}/${pkgname}-${pkgver//_/-}"
+   cd "${srcdir}/${pkgname}-${_pkgver}"
+   export PYTHON=python2
+   ./autogen.sh
./configure \
--prefix=/usr \
--mandir=/usr/share/man \
-   --enable-type3 \
-   --enable-devicetables \
-   --enable-double \
-   --with-regular-link \
-   --with-python=python2 \
-   --enable-pyextension \
+   --enable-python-extension \
 
make
 }
 
 package() {
-   cd "${srcdir}/${pkgname}-${pkgver//_/-}"
+   cd "${srcdir}/${pkgname}-${_pkgver}"
make DESTDIR="${pkgdir}" install
 
install -d "${pkgdir}/usr/share/fontforge"
@@ -52,9 +41,9 @@
install -m644 ../Adobe-* "${pkgdir}/usr/share/fontforge"
 
install -d "${pkgdir}/usr/share/icons"
-   cp -a Packaging/icons "${pkgdir}/usr/share/icons/hicolor"
+   cp -a desktop/icons "${pkgdir}/usr/share/icons/hicolor"
rm -fr "${pkgdir}/usr/share/icons/hicolor/src"
 
install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-   install -Dm644 Packaging/fontforge.desktop 
"${pkgdir}/usr/share/applications/fontforge.desktop"
+   install -Dm644 desktop/fontforge.desktop 
"${pkgdir}/usr/share/applications/fontforge.desktop"
 }



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

2013-10-26 Thread Gaetan Bisson
Date: Saturday, October 26, 2013 @ 09:49:39
  Author: bisson
Revision: 197465

remove options enforced by newer pacman

Modified:
  fontforge/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-10-26 07:49:34 UTC (rev 197464)
+++ PKGBUILD2013-10-26 07:49:39 UTC (rev 197465)
@@ -20,7 +20,7 @@
 # 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";)
 
-options=('!libtool' '!makeflags')
+options=('!makeflags')
 install=install
 
 prepare() {



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

2013-07-30 Thread Gaetan Bisson
Date: Tuesday, July 30, 2013 @ 16:43:21
  Author: bisson
Revision: 191776

giflib has been fixed

Modified:
  fontforge/trunk/PKGBUILD

--+
 PKGBUILD |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-07-30 14:04:36 UTC (rev 191775)
+++ PKGBUILD2013-07-30 14:43:21 UTC (rev 191776)
@@ -26,10 +26,7 @@
 prepare() {
cd "${srcdir}/${pkgname}-${pkgver//_/-}"
sed 's/python /python2 /g' -i Makefile.dynamic.in
-   sed \
-   -e'/^#include /i #include ' \
-   -e 's/\(DGifOpenFileName([^)]*\))/\1,NULL)/g' \
-   -i configure gutils/gimagereadgif.c
+   sed 's/\(DGifOpenFileName([^)]*\))/\1,NULL)/g' -i gutils/gimagereadgif.c
 }
 
 build() {



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

2013-07-29 Thread Gaetan Bisson
Date: Monday, July 29, 2013 @ 20:17:22
  Author: bisson
Revision: 191725

rebuild against giflib-5.0.4

Modified:
  fontforge/trunk/PKGBUILD

--+
 PKGBUILD |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-07-29 18:15:18 UTC (rev 191724)
+++ PKGBUILD2013-07-29 18:17:22 UTC (rev 191725)
@@ -5,14 +5,13 @@
 
 pkgname=fontforge
 pkgver=20120731_b
-pkgrel=5
+pkgrel=6
 pkgdesc='Outline and bitmap font editor'
+url='http://fontforge.sourceforge.net/'
 arch=('i686' 'x86_64')
-url='http://fontforge.sourceforge.net/'
 license=('BSD')
 depends=('libxkbui' 'libxi' 'libxml2' 'pango' 'giflib' 'libtiff' 'python2' 
'libspiro'
  'desktop-file-utils' 'gtk-update-icon-cache' 'hicolor-icon-theme')
-options=('!libtool' '!makeflags')
 
source=("http://downloads.sourceforge.net/project/fontforge/fontforge-source/fontforge_full-${pkgver//_/-}.tar.bz2";
 'http://fontforge.org/cidmaps.tgz')
 sha1sums=('b520f532b48e557c177dffa29120225066cc4e84'
@@ -21,11 +20,16 @@
 # 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";)
 
+options=('!libtool' '!makeflags')
 install=install
 
 prepare() {
cd "${srcdir}/${pkgname}-${pkgver//_/-}"
sed 's/python /python2 /g' -i Makefile.dynamic.in
+   sed \
+   -e'/^#include /i #include ' \
+   -e 's/\(DGifOpenFileName([^)]*\))/\1,NULL)/g' \
+   -i configure gutils/gimagereadgif.c
 }
 
 build() {



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

2013-07-27 Thread Gaetan Bisson
Date: Sunday, July 28, 2013 @ 07:20:59
  Author: bisson
Revision: 191621

implement FS#36301

Modified:
  fontforge/trunk/PKGBUILD

--+
 PKGBUILD |   19 +++
 1 file changed, 15 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-07-28 04:40:12 UTC (rev 191620)
+++ PKGBUILD2013-07-28 05:20:59 UTC (rev 191621)
@@ -5,7 +5,7 @@
 
 pkgname=fontforge
 pkgver=20120731_b
-pkgrel=4
+pkgrel=5
 pkgdesc='Outline and bitmap font editor'
 arch=('i686' 'x86_64')
 url='http://fontforge.sourceforge.net/'
@@ -13,17 +13,23 @@
 depends=('libxkbui' 'libxi' 'libxml2' 'pango' 'giflib' 'libtiff' 'python2' 
'libspiro'
  'desktop-file-utils' 'gtk-update-icon-cache' 'hicolor-icon-theme')
 options=('!libtool' '!makeflags')
-source=("http://downloads.sourceforge.net/project/fontforge/fontforge-source/fontforge_full-${pkgver//_/-}.tar.bz2";)
-sha1sums=('b520f532b48e557c177dffa29120225066cc4e84')
+source=("http://downloads.sourceforge.net/project/fontforge/fontforge-source/fontforge_full-${pkgver//_/-}.tar.bz2";
+'http://fontforge.org/cidmaps.tgz')
+sha1sums=('b520f532b48e557c177dffa29120225066cc4e84'
+  'efbc7c9d3e95159f5600dc71f9cccb370e46bb94')
 
 # 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";)
 
 install=install
 
+prepare() {
+   cd "${srcdir}/${pkgname}-${pkgver//_/-}"
+   sed 's/python /python2 /g' -i Makefile.dynamic.in
+}
+
 build() {
cd "${srcdir}/${pkgname}-${pkgver//_/-}"
-   sed -i 's/python /python2 /g' Makefile.dynamic.in
./configure \
--prefix=/usr \
--mandir=/usr/share/man \
@@ -40,9 +46,14 @@
 package() {
cd "${srcdir}/${pkgname}-${pkgver//_/-}"
make DESTDIR="${pkgdir}" install
+
+   install -d "${pkgdir}/usr/share/fontforge"
+   install -m644 ../Adobe-* "${pkgdir}/usr/share/fontforge"
+
install -d "${pkgdir}/usr/share/icons"
cp -a Packaging/icons "${pkgdir}/usr/share/icons/hicolor"
rm -fr "${pkgdir}/usr/share/icons/hicolor/src"
+
install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
install -Dm644 Packaging/fontforge.desktop 
"${pkgdir}/usr/share/applications/fontforge.desktop"
 }



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

2013-07-23 Thread Gaetan Bisson
Date: Tuesday, July 23, 2013 @ 12:42:20
  Author: bisson
Revision: 191291

fix FS#36184

Modified:
  fontforge/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-07-23 10:37:22 UTC (rev 191290)
+++ PKGBUILD2013-07-23 10:42:20 UTC (rev 191291)
@@ -5,7 +5,7 @@
 
 pkgname=fontforge
 pkgver=20120731_b
-pkgrel=3
+pkgrel=4
 pkgdesc='Outline and bitmap font editor'
 arch=('i686' 'x86_64')
 url='http://fontforge.sourceforge.net/'



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

2012-11-25 Thread Gaetan Bisson
Date: Sunday, November 25, 2012 @ 16:49:58
  Author: bisson
Revision: 171996

fix FS#32846

Modified:
  fontforge/trunk/PKGBUILD

--+
 PKGBUILD |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-11-25 21:24:57 UTC (rev 171995)
+++ PKGBUILD2012-11-25 21:49:58 UTC (rev 171996)
@@ -5,7 +5,7 @@
 
 pkgname=fontforge
 pkgver=20120731_b
-pkgrel=2
+pkgrel=3
 pkgdesc='Outline and bitmap font editor'
 arch=('i686' 'x86_64')
 url='http://fontforge.sourceforge.net/'
@@ -40,7 +40,9 @@
 package() {
cd "${srcdir}/${pkgname}-${pkgver//_/-}"
make DESTDIR="${pkgdir}" install
+   install -d "${pkgdir}/usr/share/icons"
+   cp -a Packaging/icons "${pkgdir}/usr/share/icons/hicolor"
+   rm -fr "${pkgdir}/usr/share/icons/hicolor/src"
install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
install -Dm644 Packaging/fontforge.desktop 
"${pkgdir}/usr/share/applications/fontforge.desktop"
-   install -d "${pkgdir}/usr/share/icons/hicolor"; mv Packaging/icons 
"${pkgdir}/usr/share/icons/hicolor"
 }



[arch-commits] Commit in fontforge/trunk (PKGBUILD install)

2012-11-18 Thread Gaetan Bisson
Date: Sunday, November 18, 2012 @ 03:11:58
  Author: bisson
Revision: 171503

implement FS#32732

Added:
  fontforge/trunk/install
Modified:
  fontforge/trunk/PKGBUILD

--+
 PKGBUILD |9 +++--
 install  |   12 
 2 files changed, 19 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-11-18 08:01:29 UTC (rev 171502)
+++ PKGBUILD2012-11-18 08:11:58 UTC (rev 171503)
@@ -5,12 +5,13 @@
 
 pkgname=fontforge
 pkgver=20120731_b
-pkgrel=1
+pkgrel=2
 pkgdesc='Outline and bitmap font editor'
 arch=('i686' 'x86_64')
 url='http://fontforge.sourceforge.net/'
 license=('BSD')
-depends=('libxkbui' 'libxi' 'libxml2' 'pango' 'giflib' 'libtiff' 'python2' 
'libspiro')
+depends=('libxkbui' 'libxi' 'libxml2' 'pango' 'giflib' 'libtiff' 'python2' 
'libspiro'
+ 'desktop-file-utils' 'gtk-update-icon-cache' 'hicolor-icon-theme')
 options=('!libtool' '!makeflags')
 
source=("http://downloads.sourceforge.net/project/fontforge/fontforge-source/fontforge_full-${pkgver//_/-}.tar.bz2";)
 sha1sums=('b520f532b48e557c177dffa29120225066cc4e84')
@@ -18,6 +19,8 @@
 # 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";)
 
+install=install
+
 build() {
cd "${srcdir}/${pkgname}-${pkgver//_/-}"
sed -i 's/python /python2 /g' Makefile.dynamic.in
@@ -38,4 +41,6 @@
cd "${srcdir}/${pkgname}-${pkgver//_/-}"
make DESTDIR="${pkgdir}" install
install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+   install -Dm644 Packaging/fontforge.desktop 
"${pkgdir}/usr/share/applications/fontforge.desktop"
+   install -d "${pkgdir}/usr/share/icons/hicolor"; mv Packaging/icons 
"${pkgdir}/usr/share/icons/hicolor"
 }

Added: install
===
--- install (rev 0)
+++ install 2012-11-18 08:11:58 UTC (rev 171503)
@@ -0,0 +1,12 @@
+post_upgrade() {
+   update-desktop-database -q
+   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_install() {
+   post_upgrade
+}
+
+post_remove() {
+   post_upgrade
+}



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

2012-08-02 Thread 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
===
--- PKGBUILD2012-08-02 15:42:06 UTC (rev 164685)
+++ PKGBUILD2012-08-02 16:05:57 UTC (rev 164686)
@@ -4,7 +4,7 @@
 # Contributor: William Rea 
 
 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



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

2012-08-02 Thread Gaetan Bisson
Date: Thursday, August 2, 2012 @ 03:31:02
  Author: bisson
Revision: 164662

upstream update

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

-+
 PKGBUILD|   10 +++---
 stamp.patch |8 
 2 files changed, 15 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-08-02 06:47:24 UTC (rev 164661)
+++ PKGBUILD2012-08-02 07:31:02 UTC (rev 164662)
@@ -4,7 +4,7 @@
 # Contributor: William Rea 
 
 pkgname=fontforge
-pkgver=20120119
+pkgver=20120731
 pkgrel=1
 pkgdesc='Outline and bitmap font editor'
 arch=('i686' 'x86_64')
@@ -12,14 +12,18 @@
 license=('BSD')
 depends=('libxkbui' 'libxi' 'libxml2' 'pango' 'giflib' 'libtiff' 'python2' 
'libspiro')
 options=('!libtool' '!makeflags')
-source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz";)
-sha1sums=('2c363af075e77bf35d21ee1939e3d6ab39a9f80c')
+source=("http://downloads.sourceforge.net/project/fontforge/fontforge-source/fontforge_full-${pkgver}.tar.bz2";
+'stamp.patch')
+sha1sums=('b44548813d937d41dd7c1005dadd86cf7339f530'
+  '13603ee42e4cd8f6bcbb32638769facbaa2dde43')
 
 # 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}"
sed -i 's/python /python2 /g' Makefile.dynamic.in
+   patch -p1 -i ../stamp.patch
./configure \
--prefix=/usr \
--mandir=/usr/share/man \

Added: stamp.patch
===
--- stamp.patch (rev 0)
+++ stamp.patch 2012-08-02 07:31:02 UTC (rev 164662)
@@ -0,0 +1,8 @@
+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



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

2012-01-18 Thread Gaetan Bisson
Date: Wednesday, January 18, 2012 @ 23:54:34
  Author: bisson
Revision: 146902

rebuild for libpng-1.5, new upstream snapshot

Modified:
  fontforge/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-19 04:44:44 UTC (rev 146901)
+++ PKGBUILD2012-01-19 04:54:34 UTC (rev 146902)
@@ -4,8 +4,8 @@
 # Contributor: William Rea 
 
 pkgname=fontforge
-pkgver=20111214
-pkgrel=3
+pkgver=20120119
+pkgrel=1
 pkgdesc='Outline and bitmap font editor'
 arch=('i686' 'x86_64')
 url='http://fontforge.sourceforge.net/'
@@ -13,7 +13,7 @@
 depends=('libxkbui' 'libxi' 'libxml2' 'pango' 'giflib' 'libtiff' 'python2' 
'libspiro')
 options=('!libtool' '!makeflags')
 source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz";)
-sha1sums=('55c3f00c0b486492ba071fc479e1feb426562e2b')
+sha1sums=('2c363af075e77bf35d21ee1939e3d6ab39a9f80c')
 
 # git clone git://fontforge.git.sourceforge.net/gitroot/fontforge/fontforge; 
cd fontforge; git archive --prefix=${pkgname}-${pkgver}/ master | xz > 
../${pkgname}-${pkgver}.tar.xz
 



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

2012-01-15 Thread Gaetan Bisson
Date: Sunday, January 15, 2012 @ 05:18:40
  Author: bisson
Revision: 146644

fix FS#27889

Modified:
  fontforge/trunk/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-15 09:45:20 UTC (rev 146643)
+++ PKGBUILD2012-01-15 10:18:40 UTC (rev 146644)
@@ -5,7 +5,7 @@
 
 pkgname=fontforge
 pkgver=20111214
-pkgrel=2
+pkgrel=3
 pkgdesc='Outline and bitmap font editor'
 arch=('i686' 'x86_64')
 url='http://fontforge.sourceforge.net/'
@@ -25,6 +25,7 @@
--mandir=/usr/share/man \
--enable-type3 \
--enable-devicetables \
+   --enable-double \
--with-regular-link \
--with-python=python2 \
--enable-pyextension \



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

2011-12-17 Thread Gaetan Bisson
Date: Saturday, December 17, 2011 @ 03:00:27
  Author: bisson
Revision: 145119

add libspiro support

Modified:
  fontforge/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-12-17 08:00:09 UTC (rev 145118)
+++ PKGBUILD2011-12-17 08:00:27 UTC (rev 145119)
@@ -5,12 +5,12 @@
 
 pkgname=fontforge
 pkgver=20111214
-pkgrel=1
+pkgrel=2
 pkgdesc='Outline and bitmap font editor'
 arch=('i686' 'x86_64')
 url='http://fontforge.sourceforge.net/'
 license=('BSD')
-depends=('libxkbui' 'libxi' 'libxml2' 'pango' 'giflib' 'libtiff' 'python2')
+depends=('libxkbui' 'libxi' 'libxml2' 'pango' 'giflib' 'libtiff' 'python2' 
'libspiro')
 options=('!libtool' '!makeflags')
 source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz";)
 sha1sums=('55c3f00c0b486492ba071fc479e1feb426562e2b')



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

2011-12-14 Thread Gaetan Bisson
Date: Wednesday, December 14, 2011 @ 05:50:23
  Author: bisson
Revision: 145013

switch to git version (hopefully temporarily) to fix many bugs

Modified:
  fontforge/trunk/PKGBUILD

--+
 PKGBUILD |   13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-12-14 10:17:16 UTC (rev 145012)
+++ PKGBUILD2011-12-14 10:50:23 UTC (rev 145013)
@@ -4,21 +4,22 @@
 # Contributor: William Rea 
 
 pkgname=fontforge
-pkgver=20110222
-pkgrel=2
+pkgver=20111214
+pkgrel=1
 pkgdesc='Outline and bitmap font editor'
 arch=('i686' 'x86_64')
-url='http://fontforge.sourceforge.net'
+url='http://fontforge.sourceforge.net/'
 license=('BSD')
 depends=('libxkbui' 'libxi' 'libxml2' 'pango' 'giflib' 'libtiff' 'python2')
 options=('!libtool' '!makeflags')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}_full-${pkgver}.tar.bz2";)
-sha1sums=('8fada07647f102351bb1d7d1c4da487356e7142f')
+source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz";)
+sha1sums=('55c3f00c0b486492ba071fc479e1feb426562e2b')
 
+# git clone git://fontforge.git.sourceforge.net/gitroot/fontforge/fontforge; 
cd fontforge; git archive --prefix=${pkgname}-${pkgver}/ master | xz > 
../${pkgname}-${pkgver}.tar.xz
+
 build() {
cd "${srcdir}/${pkgname}-${pkgver}"
sed -i 's/python /python2 /g' Makefile.dynamic.in
-   export CFLAGS="${CFLAGS// -O2 / -O1 }" # on i686, -O2 yields FS#20430
./configure \
--prefix=/usr \
--mandir=/usr/share/man \



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

2011-05-20 Thread Gaetan Bisson
Date: Friday, May 20, 2011 @ 04:42:23
  Author: bisson
Revision: 124359

remove --enable-double for FS#24346

Modified:
  fontforge/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-05-20 06:48:49 UTC (rev 124358)
+++ PKGBUILD2011-05-20 08:42:23 UTC (rev 124359)
@@ -5,7 +5,7 @@
 
 pkgname=fontforge
 pkgver=20110222
-pkgrel=1
+pkgrel=2
 pkgdesc='Outline and bitmap font editor'
 arch=('i686' 'x86_64')
 url='http://fontforge.sourceforge.net'
@@ -23,11 +23,11 @@
--prefix=/usr \
--mandir=/usr/share/man \
--enable-type3 \
-   --enable-double \
--enable-devicetables \
--with-regular-link \
--with-python=python2 \
-   --enable-pyextension
+   --enable-pyextension \
+
make
 }
 



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

2011-02-23 Thread Gaetan Bisson
Date: Wednesday, February 23, 2011 @ 04:57:15
  Author: bisson
Revision: 110943

upstream update

Modified:
  fontforge/trunk/PKGBUILD

--+
 PKGBUILD |8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-02-23 08:06:30 UTC (rev 110942)
+++ PKGBUILD2011-02-23 09:57:15 UTC (rev 110943)
@@ -4,7 +4,7 @@
 # Contributor: William Rea 
 
 pkgname=fontforge
-pkgver=20110221
+pkgver=20110222
 pkgrel=1
 pkgdesc='Outline and bitmap font editor'
 arch=('i686' 'x86_64')
@@ -13,14 +13,12 @@
 depends=('libxkbui' 'libxi' 'libxml2' 'pango' 'giflib' 'libtiff' 'python2')
 options=('!libtool' '!makeflags')
 
source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}_full-${pkgver}.tar.bz2";)
-sha1sums=('e6a9acbbcfe99aa658bc622b709f2d721a120b18')
+sha1sums=('8fada07647f102351bb1d7d1c4da487356e7142f')
 
 build() {
cd "${srcdir}/${pkgname}-${pkgver}"
sed -i 's/python /python2 /g' Makefile.dynamic.in
-   # Compiling with -O2 yields FS#20430
-   CFLAGS="${CFLAGS// -O2 / -O1 }"
-
+   export CFLAGS="${CFLAGS// -O2 / -O1 }" # on i686, -O2 yields FS#20430
./configure \
--prefix=/usr \
--mandir=/usr/share/man \



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

2011-01-04 Thread Gaetan Bisson
Date: Tuesday, January 4, 2011 @ 20:38:16
  Author: bisson
Revision: 104850

fixes FS#20430

Modified:
  fontforge/trunk/PKGBUILD

--+
 PKGBUILD |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-01-05 01:23:38 UTC (rev 104849)
+++ PKGBUILD2011-01-05 01:38:16 UTC (rev 104850)
@@ -5,7 +5,7 @@
 
 pkgname=fontforge
 pkgver=20100501
-pkgrel=4
+pkgrel=5
 pkgdesc='An outline and bitmap font editor'
 arch=('i686' 'x86_64')
 url='http://fontforge.sourceforge.net'
@@ -14,7 +14,7 @@
 options=('!libtool')
 
source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}_full-${pkgver}.tar.bz2";
 'python27-compat.patch'
-   'spline-fix.patch')
+'spline-fix.patch')
 sha1sums=('483425116c6af6ad90e37f9ada0c28e34f251ec3'
   '83c7a09a59c71d93f5276411e8c18ae3bec557f4'
   '05d7603aa8873c1f417d69e95d647116b51061b6')
@@ -28,6 +28,9 @@
# Fixes regression affecting lilypond, see FS#20991 (from SVN)
patch -p1 < ../spline-fix.patch
 
+   # Compiling with -O2 yields FS#20430
+   CFLAGS="${CFLAGS// -O2 / -O1 }"
+
./configure \
--prefix=/usr \
--mandir=/usr/share/man \



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

2010-09-29 Thread Gaetan Bisson
Date: Wednesday, September 29, 2010 @ 18:45:04
  Author: bisson
Revision: 92449

fix for FS#20991 (staging)

Added:
  fontforge/trunk/python27-compat.patch
Modified:
  fontforge/trunk/PKGBUILD

---+
 PKGBUILD  |   11 ---
 python27-compat.patch |   33 +
 2 files changed, 41 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-09-29 22:43:57 UTC (rev 92448)
+++ PKGBUILD2010-09-29 22:45:04 UTC (rev 92449)
@@ -5,21 +5,26 @@
 
 pkgname=fontforge
 pkgver=20100501
-pkgrel=3
+pkgrel=4
 pkgdesc='An outline and bitmap font editor'
 arch=('i686' 'x86_64')
 url='http://fontforge.sourceforge.net'
 license=('BSD')
-depends=('libxkbui' 'libxi' 'libxml2' 'pango' 'giflib' 'libtiff' 'python')
+depends=('libxkbui' 'libxi' 'libxml2' 'pango' 'giflib' 'libtiff' 'python2')
 options=('!libtool')
 
source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}_full-${pkgver}.tar.bz2";
+'python27-compat.patch'
'spline-fix.patch')
 sha1sums=('483425116c6af6ad90e37f9ada0c28e34f251ec3'
+  '83c7a09a59c71d93f5276411e8c18ae3bec557f4'
   '05d7603aa8873c1f417d69e95d647116b51061b6')
 
 build() {
cd "${srcdir}/${pkgname}-${pkgver}"
 
+   # Patch for python 2.7 compatibility (fontforge-devel ML)
+   patch -p1 < ../python27-compat.patch
+
# Fixes regression affecting lilypond, see FS#20991 (from SVN)
patch -p1 < ../spline-fix.patch
 
@@ -30,7 +35,7 @@
--enable-double \
--enable-devicetables \
--with-regular-link \
-   --with-python=python \
+   --with-python=python2 \
--enable-pyextension
make
 }

Added: python27-compat.patch
===
--- python27-compat.patch   (rev 0)
+++ python27-compat.patch   2010-09-29 22:45:04 UTC (rev 92449)
@@ -0,0 +1,33 @@
+diff -ur fontforge-20100501/fontforge/ffpython.h 
fontforge-20100501.new/fontforge/ffpython.h
+--- fontforge-20100501/fontforge/ffpython.h2010-04-05 22:10:26.0 
+0200
 fontforge-20100501.new/fontforge/ffpython.h2010-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.0 
+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 )



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

2010-09-29 Thread Gaetan Bisson
Date: Wednesday, September 29, 2010 @ 18:37:05
  Author: bisson
Revision: 92439

fix for FS#20991 (extra)

Modified:
  fontforge/trunk/PKGBUILD
Deleted:
  fontforge/trunk/python27-compat.patch

---+
 PKGBUILD  |   47 +--
 python27-compat.patch |   33 -
 2 files changed, 25 insertions(+), 55 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-09-29 22:06:09 UTC (rev 92438)
+++ PKGBUILD2010-09-29 22:37:05 UTC (rev 92439)
@@ -5,35 +5,38 @@
 
 pkgname=fontforge
 pkgver=20100501
-pkgrel=2
-pkgdesc="An outline and bitmap font editor"
+pkgrel=3
+pkgdesc='An outline and bitmap font editor'
 arch=('i686' 'x86_64')
-url="http://fontforge.sourceforge.net";
+url='http://fontforge.sourceforge.net'
 license=('BSD')
-depends=('libxkbui' 'libxi' 'libxml2' 'pango' 'giflib' 'libtiff' 'python2')
+depends=('libxkbui' 'libxi' 'libxml2' 'pango' 'giflib' 'libtiff' 'python')
 options=('!libtool')
 
source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}_full-${pkgver}.tar.bz2";
-"python27-compat.patch")
-md5sums=('5f3d20d645ec1aa2b7b4876386df8717'
- '5a8e248febbce9ce3836ce5218a13f47')
+   'spline-fix.patch')
+sha1sums=('483425116c6af6ad90e37f9ada0c28e34f251ec3'
+  '05d7603aa8873c1f417d69e95d647116b51061b6')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  # Patch for python 2.7 compatibility (fontforge-devel ML)
-  patch -p1 -i "$srcdir"/python27-compat.patch
-  ./configure --prefix=/usr \
---mandir=/usr/share/man \
---enable-type3 \
---enable-double \
---enable-devicetables \
---with-regular-link \
---with-python=python2 \
---enable-pyextension || return 1
-  make || return 1
+   cd "${srcdir}/${pkgname}-${pkgver}"
+
+   # Fixes regression affecting lilypond, see FS#20991 (from SVN)
+   patch -p1 < ../spline-fix.patch
+
+   ./configure \
+   --prefix=/usr \
+   --mandir=/usr/share/man \
+   --enable-type3 \
+   --enable-double \
+   --enable-devicetables \
+   --with-regular-link \
+   --with-python=python \
+   --enable-pyextension
+   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make -j1 DESTDIR="${pkgdir}" install || return 1
-  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || 
return 1
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   make -j1 DESTDIR="${pkgdir}" install
+   install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }

Deleted: python27-compat.patch
===
--- python27-compat.patch   2010-09-29 22:06:09 UTC (rev 92438)
+++ python27-compat.patch   2010-09-29 22:37:05 UTC (rev 92439)
@@ -1,33 +0,0 @@
-diff -ur fontforge-20100501/fontforge/ffpython.h 
fontforge-20100501.new/fontforge/ffpython.h
 fontforge-20100501/fontforge/ffpython.h2010-04-05 22:10:26.0 
+0200
-+++ fontforge-20100501.new/fontforge/ffpython.h2010-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.0 
+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

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

2010-08-31 Thread Rémy Oudompheng
Date: Tuesday, August 31, 2010 @ 12:24:30
  Author: remy
Revision: 89417

upgpkg: fontforge 20100501-2
Rebuild for python2.

Modified:
  fontforge/trunk/PKGBUILD

--+
 PKGBUILD |   18 +++---
 1 file changed, 11 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-08-31 16:04:23 UTC (rev 89416)
+++ PKGBUILD2010-08-31 16:24:30 UTC (rev 89417)
@@ -5,31 +5,35 @@
 
 pkgname=fontforge
 pkgver=20100501
-pkgrel=1
+pkgrel=2
 pkgdesc="An outline and bitmap font editor"
 arch=('i686' 'x86_64')
 url="http://fontforge.sourceforge.net";
 license=('BSD')
-depends=('libxkbui' 'libxi' 'libxml2' 'pango' 'giflib' 'libtiff' 'python')
-options=('!libtool' '!makeflags')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}_full-${pkgver}.tar.bz2";)
-md5sums=('5f3d20d645ec1aa2b7b4876386df8717')
+depends=('libxkbui' 'libxi' 'libxml2' 'pango' 'giflib' 'libtiff' 'python2')
+options=('!libtool')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}_full-${pkgver}.tar.bz2";
+"python27-compat.patch")
+md5sums=('5f3d20d645ec1aa2b7b4876386df8717'
+ '5a8e248febbce9ce3836ce5218a13f47')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  # Patch for python 2.7 compatibility (fontforge-devel ML)
+  patch -p1 -i "$srcdir"/python27-compat.patch
   ./configure --prefix=/usr \
 --mandir=/usr/share/man \
 --enable-type3 \
 --enable-double \
 --enable-devicetables \
 --with-regular-link \
---with-python \
+--with-python=python2 \
 --enable-pyextension || return 1
   make || return 1
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install || return 1
+  make -j1 DESTDIR="${pkgdir}" install || return 1
   install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || 
return 1
 }