xlockmore/xlockmore-ttf_dir.patch
Ondřej Súkup f31aa276d3 Accepting request 491917 from home:sbrabec:branches:X11:Utilities
- Add a fix for double entering of password in non-English locales
  (boo#1035688, xlockmore-pam.patch).
- Update to version 5.53:
  * dclock fix for led bounce.
  * Install changes for fortune.
  * strange mode updates.
  * life3d updates.
  * messagefont fix.
  * Changed default message font.
  * spiral erase mode changed.
  * Fix for kumppa -speed 0.2.
  * new website at http://www.sillycycle.com
  * xmb fonts fix.
  * fixed xjack mode.
  * Updated language use.
- Refresh xlockmore-bitmaps.patch, xlockmore-ttf_dir.patch,
  xlockmore-extend-freetype-include-search.patch.
- Re-enable PAM (boo#1035688).
- Disable obsolete --enable-use-mb.

OBS-URL: https://build.opensuse.org/request/show/491917
OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/xlockmore?expand=0&rev=36
2017-05-03 18:12:33 +00:00

29 lines
1.3 KiB
Diff

Index: configure.ac
===================================================================
--- configure.ac.orig
+++ configure.ac
@@ -1686,9 +1686,9 @@ else
ttf=yes
AC_DEFINE([HAVE_TTF], [1], [True Text Font])
if test "x$prefix" = "xNONE"; then
- AC_DEFINE_UNQUOTED([DEF_TTFONT], ["/usr/lib/X11/xlock/fonts/"], [True Text Font])
+ AC_DEFINE_UNQUOTED([DEF_TTFONT], ["/usr/share/fonts/truetype/"], [True Text Font])
else
- AC_DEFINE_UNQUOTED([DEF_TTFONT], ["${prefix}/lib/X11/xlock/fonts/"], [True Text Font])
+ AC_DEFINE_UNQUOTED([DEF_TTFONT], ["/usr/share/fonts/truetype/"], [True Text Font])
fi
XLOCKLIBS="${XLOCKLIBS} -lttf"
test "x$ttf_includes" = xNONE && ttf_includes=$ac_ttf_includes
@@ -2086,9 +2086,9 @@ else
freetype=yes
AC_DEFINE([HAVE_FREETYPE], [1], [Free Type])
if test "x$prefix" = "xNONE"; then
- AC_DEFINE_UNQUOTED([DEF_TTFONT], ["/usr/lib/X11/xlock/fonts/"], [True Text Font])
+ AC_DEFINE_UNQUOTED([DEF_TTFONT], ["/usr/share/fonts/truetype/"], [True Text Font])
else
- AC_DEFINE_UNQUOTED([DEF_TTFONT], ["${prefix}/lib/X11/xlock/fonts/"], [True Text Font])
+ AC_DEFINE_UNQUOTED([DEF_TTFONT], ["/usr/share/fonts/truetype/"], [True Text Font])
fi
XLOCKLIBS="${XLOCKLIBS} -lfreetype"
test "x$freetype_includes" = xNONE && freetype_includes=$ac_freetype_includes