summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2013-12-05 19:35:25 -0200
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2013-12-05 19:35:25 -0200
commit9f3a95b3c508566fb531a6570cb534143941efc1 (patch)
treef2257d19188bcc96c9203ca585d67435c4fc658e
parentd66302bcdecf776fbbee52874a42def4e97933ca (diff)
ogre-libre: remove freetype.patch
-rw-r--r--libre/ogre-libre/PKGBUILD4
-rw-r--r--libre/ogre-libre/freetype.patch21
2 files changed, 0 insertions, 25 deletions
diff --git a/libre/ogre-libre/PKGBUILD b/libre/ogre-libre/PKGBUILD
index 71b58b4ff..3cae7fc96 100644
--- a/libre/ogre-libre/PKGBUILD
+++ b/libre/ogre-libre/PKGBUILD
@@ -45,18 +45,14 @@ makedepends=(
)
source=(
ogre::hg+https://bitbucket.org/sinbad/ogre/src#tag=v${pkgver//./-}
- freetype.patch
)
sha512sums=(
SKIP
- a4bb1f263895110a65e2a2d9cd9c82a15953ed3b8ba3922bb75e29d5cd24376b089b02caaccdd3e314011d0a3209706574216de34558d77686005e31f66ff54c
)
build() {
cd ${pkgbase}
- patch -Np1 < $srcdir/freetype.patch
-
# get a clean build dir
[[ -d build ]] && rm -vrf build
mkdir -v build && cd build
diff --git a/libre/ogre-libre/freetype.patch b/libre/ogre-libre/freetype.patch
deleted file mode 100644
index d98dc9f1b..000000000
--- a/libre/ogre-libre/freetype.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -r 538b33f531b5 CMake/Packages/FindFreetype.cmake
---- a/CMake/Packages/FindFreetype.cmake Sun Nov 24 00:46:46 2013 -0600
-+++ b/CMake/Packages/FindFreetype.cmake Tue Nov 26 12:56:17 2013 +0100
-@@ -31,7 +31,7 @@
- FREETYPE_INCLUDE_DIR
- )
-
--set(FREETYPE_LIBRARY_NAMES freetype2501 freetype250 freetype2412 freetype2411 freetype2410 freetype249 freetype248 freetype246 freetype2311 freetype239 freetype238 freetype235 freetype219 freetype)
-+set(FREETYPE_LIBRARY_NAMES freetype251 freetype2501 freetype250 freetype2412 freetype2411 freetype2410 freetype249 freetype248 freetype246 freetype2311 freetype239 freetype238 freetype235 freetype219 freetype)
- get_debug_names(FREETYPE_LIBRARY_NAMES)
-
- use_pkgconfig(FREETYPE_PKGC freetype2)
-@@ -43,7 +43,7 @@
- findpkg_framework(FREETYPE)
- message(STATUS "CMAKE_PREFIX_PATH: ${CMAKE_PREFIX_PATH}")
-
--find_path(FREETYPE_INCLUDE_DIR NAMES freetype/freetype.h HINTS ${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS} PATH_SUFFIXES freetype2)
-+find_path(FREETYPE_INCLUDE_DIR NAMES freetype.h freetype/freetype.h HINTS ${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS} PATH_SUFFIXES freetype2)
- find_path(FREETYPE_FT2BUILD_INCLUDE_DIR NAMES ft2build.h HINTS ${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS})
-
- find_library(FREETYPE_LIBRARY_REL NAMES ${FREETYPE_LIBRARY_NAMES} HINTS ${FREETYPE_LIB_SEARCH_PATH} ${FREETYPE_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Release RelWithDebInfo MinSizeRel)