summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorKroshKobel2015-10-09 18:40:31 +0300
committerKroshKobel2015-10-09 18:40:31 +0300
commitd929d9e59894c789d62d44d2175df66062e25d6d (patch)
treef4d5053dd1f57781b3ee6a7f57ccb7722bdb8c90
parent3e5505ff49046ce59f01bdd693349d908695d7be (diff)
downloadaur-coolreader3-git.tar.gz
Update the freetype2 include path.
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD7
-rw-r--r--freetype2_path_fix.patch11
3 files changed, 18 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0f64bc1064f1..2106c902c4be 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = coolreader3-git
pkgdesc = E-book reader for Linux
pkgver = r4097.1e07d15
- pkgrel = 2
+ pkgrel = 3
url = http://sourceforge.net/projects/crengine/
install = coolreader3-git.install
arch = i686
@@ -19,9 +19,11 @@ pkgbase = coolreader3-git
source = coolreader3-git::git://git.code.sf.net/p/crengine/crengine
source = use_freetype2.patch
source = config_saving_fix.patch
+ source = freetype2_path_fix.patch
md5sums = SKIP
md5sums = 390a7e6a9a1bb7ef2723176e276bd524
md5sums = 262b3b926956473d3cbb45602485e897
+ md5sums = d0c80482b6712c8211f9ac4423c37d6a
pkgname = coolreader3-git
diff --git a/PKGBUILD b/PKGBUILD
index 59bb99f4fae5..d3ebb5f37688 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=coolreader3-git
pkgver=r4097.1e07d15
-pkgrel=2
+pkgrel=3
pkgdesc="E-book reader for Linux"
arch=("i686" "x86_64")
url="http://sourceforge.net/projects/crengine/"
@@ -12,8 +12,8 @@ makedepends=("git" "cmake")
provides=("coolreader3")
conflicts=("coolreader3")
install="${pkgname}.install"
-source=("${pkgname}::git://git.code.sf.net/p/crengine/crengine" "use_freetype2.patch" "config_saving_fix.patch")
-md5sums=("SKIP" "390a7e6a9a1bb7ef2723176e276bd524" "262b3b926956473d3cbb45602485e897")
+source=("${pkgname}::git://git.code.sf.net/p/crengine/crengine" "use_freetype2.patch" "config_saving_fix.patch" "freetype2_path_fix.patch")
+md5sums=("SKIP" "390a7e6a9a1bb7ef2723176e276bd524" "262b3b926956473d3cbb45602485e897" "d0c80482b6712c8211f9ac4423c37d6a")
pkgver() {
cd "${srcdir}/${pkgname}"
@@ -24,6 +24,7 @@ prepare() {
cd "${srcdir}/${pkgname}"
patch -Np1 -i "${srcdir}/use_freetype2.patch"
patch -Np1 -i "${srcdir}/config_saving_fix.patch"
+ patch -Np1 -i "${srcdir}/freetype2_path_fix.patch"
}
build() {
diff --git a/freetype2_path_fix.patch b/freetype2_path_fix.patch
new file mode 100644
index 000000000000..bcc173e06f10
--- /dev/null
+++ b/freetype2_path_fix.patch
@@ -0,0 +1,11 @@
+--- a/crengine/src/lvfntman.cpp
++++ b/crengine/src/lvfntman.cpp
+@@ -53,7 +53,7 @@
+ #else
+
+ #ifdef USE_FREETYPE2
+-#include <freetype2/config/ftheader.h>
++#include <freetype2/freetype/config/ftheader.h>
+ #else
+ #include <freetype/config/ftheader.h>
+ #endif