integrate build configuration patch into libk2pdfopt

koreader · Aug 15, 2013 · 6cb2c9c · 6cb2c9c
1 parent 94e5586
commit 6cb2c9c
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -15,7 +15,7 @@
 	url = http://luajit.org/git/luajit-2.0.git
 [submodule "libk2pdfopt"]
 	path = libk2pdfopt
-	url = git://github.com/chrox/libk2pdfopt.git
+	url = git://github.com/koreader/libk2pdfopt.git
 [submodule "sdcv-0.4.2"]
 	path = sdcv-0.4.2
 	url = git://github.com/koreader/sdcv.git

diff --git a/Makefile b/Makefile
@@ -342,8 +342,6 @@ fetchthirdparty:
 		|| echo "USE_FONTCONFIG already disabled"
 	# MuPDF patch: use external fonts
 	cd mupdf && patch -N -p1 < ../mupdf.patch
-	# libk2pdfopt patch for build configuration
-	-cd libk2pdfopt && patch -N -p1 < ../libk2pdfopt.patch
 	# Download popen-noshell
 	test -f popen-noshell/popen_noshell.c \
 		|| svn co http://popen-noshell.googlecode.com/svn/trunk/ \

diff --git a/libk2pdfopt b/libk2pdfopt