Date: Saturday, November 30, 2013 @ 10:22:16
Author: bisson
Revision: 200627
revert bikeshedding
Added:
inkscape/trunk/freetype.patch
(from rev 200626, inkscape/trunk/build_fix.diff)
Modified:
inkscape/trunk/PKGBUILD
Deleted:
inkscape/trunk/build_fix.diff
----------------+
PKGBUILD | 17 ++++++++---------
build_fix.diff | 15 ---------------
freetype.patch | 15 +++++++++++++++
3 files changed, 23 insertions(+), 24 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-11-30 09:14:38 UTC (rev 200626)
+++ PKGBUILD 2013-11-30 09:22:16 UTC (rev 200627)
@@ -11,7 +11,7 @@
license=('GPL' 'LGPL')
arch=('i686' 'x86_64')
makedepends=('boost' 'intltool')
-depends=('gc' 'gsl' 'gtkmm' 'gtkspell' 'imagemagick' 'libxslt'
'poppler-glib>=0.24.4' 'popt'
+depends=('gc' 'gsl' 'gtkmm' 'gtkspell' 'imagemagick' 'libxslt' 'poppler-glib'
'popt'
'python2' 'desktop-file-utils' 'hicolor-icon-theme')
optdepends=('pstoedit: latex formulas'
'texlive-core: latex formulas'
@@ -18,9 +18,9 @@
'python2-numpy: some extensions'
'python2-lxml: some extensions and filters'
'uniconvertor: reading/writing to some proprietary formats')
-source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2
- spuriouscomma.patch
- build_fix.diff)
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2";
+ 'spuriouscomma.patch'
+ 'freetype.patch')
sha1sums=('5f26f6ad191d1e7c2a9fb69a438722beb172224c'
'7d1d5a6d1d2b0926721a994d5889c52890fc57c1'
'aba4d98bebae088c3401fd9259ea3cf70b96fbbf')
@@ -28,10 +28,9 @@
install=install
prepare() {
- cd ${pkgname}-${pkgver}
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -p0 -i ../freetype.patch # FS#37956
patch -p0 -i ../spuriouscomma.patch
- # fix build with freetype 2.5.1
- patch -Np0 -i ../build_fix.diff
sed -i 's|/usr/bin/python\>|/usr/bin/python2|g' cxxtest/*.py
sed -i 's|/usr/bin/env python\>|/usr/bin/env python2|g'
share/*/{test/,}*.py
sed -i 's|"python" },|"python2" },|g'
src/extension/implementation/script.cpp
@@ -41,7 +40,7 @@
}
build() {
- cd ${pkgname}-${pkgver}
+ cd "${srcdir}/${pkgname}-${pkgver}"
./configure \
--prefix=/usr \
--with-python \
@@ -53,6 +52,6 @@
}
package() {
- cd ${pkgname}-${pkgver}
+ cd "${srcdir}/${pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
}
Deleted: build_fix.diff
===================================================================
--- build_fix.diff 2013-11-30 09:14:38 UTC (rev 200626)
+++ build_fix.diff 2013-11-30 09:22:16 UTC (rev 200627)
@@ -1,15 +0,0 @@
-=== modified file 'src/libnrtype/FontFactory.h'
---- src/libnrtype/FontFactory.h 2010-04-15 19:00:11 +0000
-+++ src/libnrtype/FontFactory.h 2013-11-28 05:54:34 +0000
-@@ -31,7 +31,8 @@
- #include <pango/pangowin32.h>
- #else
- #include <pango/pangoft2.h>
--#include <freetype/freetype.h>
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
- #endif
-
- namespace Glib
-
-
Copied: inkscape/trunk/freetype.patch (from rev 200626,
inkscape/trunk/build_fix.diff)
===================================================================
--- freetype.patch (rev 0)
+++ freetype.patch 2013-11-30 09:22:16 UTC (rev 200627)
@@ -0,0 +1,15 @@
+=== modified file 'src/libnrtype/FontFactory.h'
+--- src/libnrtype/FontFactory.h 2010-04-15 19:00:11 +0000
++++ src/libnrtype/FontFactory.h 2013-11-28 05:54:34 +0000
+@@ -31,7 +31,8 @@
+ #include <pango/pangowin32.h>
+ #else
+ #include <pango/pangoft2.h>
+-#include <freetype/freetype.h>
++#include <ft2build.h>
++#include FT_FREETYPE_H
+ #endif
+
+ namespace Glib
+
+
