pool/xlockmore
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 210959 from openSUSE:Factory:Staging:freetype2

Browse Source 
Added xlockmore-extend-freetype-include-search.patch -- needed for freetype2 2.5.1

OBS-URL: https://build.opensuse.org/request/show/210959
OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/xlockmore?expand=0&rev=20
This commit is contained in:
Stephan Kulow 2013-12-16 06:26:06 +00:00 committed by Git OBS Bridge
parent 9a81ca20e7
commit c2273db453
3 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
xlockmore-extend-freetype-include-search.patch Normal file
View File

@ -0,0 +1,28 @@
diff -Naur xlockmore-5.43/configure.in xlockmore-5.43.new/configure.in
--- xlockmore-5.43/configure.in 2013-02-21 17:32:25.000000000 +0100
+++ xlockmore-5.43.new/configure.in 2013-12-15 20:09:47.668438807 +0100
@@ -1914,7 +1914,7 @@
AC_DEFUN(AC_PATH_FREETYPE_DIRECT,
[test -z "$freetype_direct_test_library" && freetype_direct_test_library=freetype
test -z "$freetype_direct_test_function" && freetype_direct_test_function=FT_Init_FreeType
-test -z "$freetype_direct_test_include" && freetype_direct_test_include=freetype2/freetype/freetype.h
+test -z "$freetype_direct_test_include" && freetype_direct_test_include=freetype.h
for ac_dir in \
/usr/X11R6.5.1/include \
/usr/X11R6.4/include \
@@ -1974,11 +1974,14 @@
/usr/openwin/share/include \
/usr/openwin/include \
\
+ /usr/include/freetype2 \
+ /usr/include/freetype2/freetype \
+ \
$extra_include \
; \
do
if test -r "$ac_dir/$freetype_direct_test_include"; then
- no_freetype= ac_freetype_includes=$ac_dir/freetype2
+ no_freetype= ac_freetype_includes=$ac_dir
break
fi
done

10
xlockmore.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Sun Dec 15 18:57:59 UTC 2013 - hrvoje.senjan@gmail.com
- Added xlockmore-extend-freetype-include-search.patch: search only
for freetype.h, not the half path. Also, extended list of
directories where could freetype be found
- Pass $(freetype-config --cflags) to exported CPPFLAGS for potential
future changes of freetype headers (as xlockmore uses hardcoded
paths instead of a saner buildsystem)
-------------------------------------------------------------------
Thu Jul 18 17:14:27 CEST 2013 - sbrabec@suse.cz

6
xlockmore.spec
View File

@ -37,6 +37,9 @@ Patch3: xlockmore-ttf_dir.patch
Patch7: xlockmore-strict-aliasing.patch
# feel free to improve it and please upstream it
Patch8: xlockmore-no-copy-dt-needed-entries.patch
# PATCH-FIX-UPSTREAM xlockmore-extend-freetype-include-search.patch -- search only for freetype.h, not the half path. Also,
# extended list of directories where could freetype be found
Patch9: xlockmore-extend-freetype-include-search.patch
BuildRequires: automake
BuildRequires: bc
BuildRequires: esound-devel
@ -76,11 +79,12 @@ chmod -x README docs/Revisions
%patch3
%patch7
%patch8 -p1
%patch9 -p1
%build
aclocal
autoconf
export CPPFLAGS="-I/usr/include/FTGL"
export CPPFLAGS="-I/usr/include/FTGL $(freetype-config --cflags)"
export CFLAGS="%{optflags}"
export CXXFLAGS="%{optflags}"
./configure \