Hello community, here is the log from the commit of package xlockmore for openSUSE:Factory checked in at 2013-12-16 16:47:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xlockmore (Old) and /work/SRC/openSUSE:Factory/.xlockmore.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xlockmore" Changes: -------- --- /work/SRC/openSUSE:Factory/xlockmore/xlockmore.changes 2013-07-22 14:16:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xlockmore.new/xlockmore.changes 2013-12-16 18:11:10.000000000 +0100 @@ -1,0 +2,10 @@ +Sun Dec 15 18:57:59 UTC 2013 - [email protected] + +- 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) + +------------------------------------------------------------------- New: ---- xlockmore-extend-freetype-include-search.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xlockmore.spec ++++++ --- /var/tmp/diff_new_pack.xwtxQp/_old 2013-12-16 18:11:11.000000000 +0100 +++ /var/tmp/diff_new_pack.xwtxQp/_new 2013-12-16 18:11:11.000000000 +0100 @@ -37,6 +37,9 @@ 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 @@ %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 \ ++++++ xlockmore-extend-freetype-include-search.patch ++++++ 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 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
