Sisyphus repository
Last update: 1 october 2023 | SRPMs: 18631 | Visits: 37896438
en ru br
ALT Linux repos
S:5.69-alt1
5.0: 5.27-alt10.M50.1
4.1: 5.27-alt5.M41.1
4.0: 5.27-alt8.M40.1.1

Group :: Graphical desktop/Other
RPM: xlockmore

 Main   Changelog   Spec   Patches   Sources   Download   Gear   Bugs and FR  Repocop 

Patch: xlockmore-5.46-droidfonts.patch
Download


diff -ur xlockmore-5.43/etc/marquee.sh xlockmore-5.43.new/etc/marquee.sh
--- xlockmore-5.43/etc/marquee.sh	2014-06-29 13:15:55.000000000 +0000
+++ xlockmore-5.43.new/etc/marquee.sh	2014-06-29 13:32:51.144580670 +0000
@@ -14,7 +14,7 @@
 
 xlock -mode marquee \
  -size 1 \
- -messagefont "-*-courier-*-r-*-*-34-*-*-*-*-*-*-*" \
+ -messagefont "-*-droid sans mono-*-r-*-*-24-*-*-*-*-*-*-*" \
  -message "$message" \
  -logoutButtonHelp "^ LOGOUT BUTTON ^
 
diff -ur xlockmore-5.43/etc/xlockmess.sh xlockmore-5.43.new/etc/xlockmess.sh
--- xlockmore-5.43/etc/xlockmess.sh	2014-06-29 13:15:55.000000000 +0000
+++ xlockmore-5.43.new/etc/xlockmess.sh	2014-06-29 13:32:07.063350757 +0000
@@ -22,7 +22,7 @@
 
 xlock -mode $MESSMODE -icongeometry 512x512 \
  -size 1 \
- -messagefont "-*-courier-*-r-*-*-34-*-*-*-*-*-*-*" \
+ -messagefont "-*-droid sans mono-*-r-*-*-24-*-*-*-*-*-*-*" \
  -message "$message" \
  -logoutButtonHelp "^ LOGOUT BUTTON ^"
 # -logoutButton 1
diff -ur xlockmore-5.43/modes/xjack.c xlockmore-5.43.new/modes/xjack.c
--- xlockmore-5.43/modes/xjack.c	2014-06-29 13:15:55.000000000 +0000
+++ xlockmore-5.43.new/modes/xjack.c	2014-06-29 13:33:07.053024532 +0000
@@ -39,7 +39,7 @@
  "*font: \n" \
  "*text: \n" \
  "*fullrandom: True \n"
-#define DEF_FONT "-*-courier-medium-r-*-*-*-240-*-*-m-*-*-*",
+#define DEF_FONT "-*-droid sans mono-medium-r-*-*-*-240-*-*-m-*-*-*",
 #define DEF_TEXT "All work and no play makes Jack a dull boy.  ";
 #include "xlockmore.h"  /* in xscreensaver distribution */
 
diff -ur xlockmore-5.43/xglock/xglockrc xlockmore-5.43.new/xglock/xglockrc
--- xlockmore-5.43/xglock/xglockrc	2014-06-29 13:15:55.000000000 +0000
+++ xlockmore-5.43.new/xglock/xglockrc	2014-06-29 13:47:05.744493213 +0000
@@ -1,13 +1,13 @@
   style "tooltip"
   {
-    font = "-adobe-helvetica-medium-r-normal--*-80-*-*-*-*-*-*"
+    font = "-*-droid sans-medium-r-normal--*-80-*-*-*-*-*-*"
     fg[NORMAL] = { 0.0, 0.0, 0.0 }
     bg[NORMAL] = { 1.0, 1.0, 1.0 }
   }
 
   style "button"
   {
-     font = "-adobe-helvetica-bold-r-normal--*-100-*-*-*-*-*-*"
+     font = "-*-droid sans-bold-r-normal--*-100-*-*-*-*-*-*"
      fg[PRELIGHT] = { 1.0, 1.0, 1.0 }
      bg[PRELIGHT] = { 0.67, 0.85, 0.90 }
      fg[ACTIVE] =   { 1.0, 1.0, 1.0 }
diff -ur xlockmore-5.43/xlock/iostuff.h xlockmore-5.43.new/xlock/iostuff.h
--- xlockmore-5.43/xlock/iostuff.h	2014-06-29 13:15:55.000000000 +0000
+++ xlockmore-5.43.new/xlock/iostuff.h	2014-06-29 13:49:44.496924502 +0000
@@ -17,7 +17,7 @@
 
 #define FALLBACK_FONTNAME "fixed"
 #ifndef DEF_MESSAGEFONT
-#define DEF_MESSAGEFONT "-*-times-*-*-*-*-18-*-*-*-*-*-*-*"
+#define DEF_MESSAGEFONT "-*-droid serif-*-*-*-*-18-*-*-*-*-*-*-*"
 #define DEF_MESSAGEFONTSET "-*-*-medium-r-normal-*-18-*-*-*-*-*-*-*"
 #endif
 #ifndef DEF_PROGRAM		/* Try the -o option ;) */
diff -ur xlockmore-5.43/xlock/resource.c xlockmore-5.43.new/xlock/resource.c
--- xlockmore-5.43/xlock/resource.c	2014-06-29 13:55:24.330410334 +0000
+++ xlockmore-5.43.new/xlock/resource.c	2014-06-29 13:48:03.462104296 +0000
@@ -163,10 +163,10 @@
 # ifdef AIXV3
 #  define DEF_FONT	"fixed"
 # else /* !AIXV3 */
-#  define DEF_FONT	"-*-helvetica-medium-r-*-*-24-*-*-*-*-*-*"
+#  define DEF_FONT	"-*-droid sans-medium-r-*-*-24-*-*-*-*-*-*"
 # endif /* !AIXV3 */
 #endif
-#define DEF_PLANFONT     "-*-fixed-medium-r-*-*-14-*-*-*-*-*-*"
+#define DEF_PLANFONT     "-*-droid sans mono-medium-r-*-*-14-*-*-*-*-*-*-*"
 #ifdef USE_MB
 # define DEF_FONTSET	DEF_FONT ",-*-*-medium-r-normal--24-*"
 # define DEF_PLANFONTSET DEF_PLANFONT ",-*-*-medium-r-normal--14-*"
diff -ur xlockmore-5.43/xlock/XLock.ad xlockmore-5.43.new/xlock/XLock.ad
--- xlockmore-5.43/xlock/XLock.ad	2014-06-29 13:55:24.326410222 +0000
+++ xlockmore-5.43.new/xlock/XLock.ad	2014-06-29 13:49:26.756429306 +0000
@@ -6,8 +6,7 @@
 !XLock.mode: life
 !XLock.erasemode: no_fade
 XLock.erasedelay: 400
-XLock.font: *8x16*
-!XLock.font: -b&h-lucida-medium-r-normal-sans-24-*-*-*-*-*-iso8859-1
+XLock.font: -*-droid serif-medium-r-normal-*-24-*-*-*-*-*-*-*
 !XLock.font: -*-times-*-*-*-*-18-*-*-*-*-*-*-*
 !XLock.background: White
 !XLock.foreground: Black
diff -ur xlockmore-5.43/xlock/XLock-ja.ad xlockmore-5.43.new/xlock/XLock-ja.ad
--- xlockmore-5.43/xlock/XLock-ja.ad	2014-06-29 13:55:24.322410111 +0000
+++ xlockmore-5.43.new/xlock/XLock-ja.ad	2014-06-29 13:31:11.393797520 +0000
@@ -1,6 +1,6 @@
 !! Japanese by: YOKOTA Hiroshi <yokota@netlab.is.tsukuba.ac.jp>
-XLock.fontset: -*-droid sans mono-bold-*-normal--24-*-,-*-*-bold-*-normal--14-*-,-*-*-medium-*-normal--14-*-
-XLock.planfontset: -*-droid sans mono-bold-*-normal--12-*-,-*-*-bold-*-normal--12-*-
+XLock.fontset: -*-terminus-bold-*-normal--24-*-,-*-*-bold-*-normal--14-*-,-*-*-medium-*-normal--14-*-
+XLock.planfontset: -*-terminus-bold-*-normal--12-*-,-*-*-bold-*-normal--12-*-
 XLock.username: ログイン名:
 XLock.password: パスワード:
 XLock.info: Enter パスワードを入力して下さい。アイコンをクリックすると再ロックします。
diff -ur xlockmore-5.43/xlock/XLock-ru.ad xlockmore-5.43.new/xlock/XLock-ru.ad
--- xlockmore-5.43/xlock/XLock-ru.ad	2014-06-29 13:55:24.322410111 +0000
+++ xlockmore-5.43.new/xlock/XLock-ru.ad	2014-06-29 13:31:11.393797520 +0000
@@ -1,6 +1,6 @@
 !! Russian by Paul Wolneykien <manowar@altlinux.org>
-XLock.fontset: -*-droid sans mono-bold-*-normal--24-*-,-*-*-bold-*-normal--14-*-,-*-*-medium-*-normal--14-*-
-XLock.planfontset: -*-droid sans mono-bold-*-normal--12-*-,-*-*-bold-*-normal--12-*-
+XLock.fontset: -*-terminus-bold-*-normal--24-*-,-*-*-bold-*-normal--14-*-,-*-*-medium-*-normal--14-*-
+XLock.planfontset: -*-terminus-bold-*-normal--12-*-,-*-*-bold-*-normal--12-*-
 XLock.username: 仄: 
 XLock.password: 舒仂仍: 
 XLock.info: 于亠亟亳亠 仗舒仂仍, 仂弍 仆 弍仍仂从亳仂于从. 舒亢仄亳亠 亳从仂仆从 亟仍 仗仂仄仂舒 亰舒舒于从亳.
diff -ur xlockmore-5.43.old/configure.ac xlockmore-5.43/configure.ac
--- xlockmore-5.43.old/configure.ac	2014-06-29 16:04:00.610486203 +0000
+++ xlockmore-5.43/configure.ac	2014-06-29 16:05:57.829766622 +0000
@@ -1686,9 +1686,9 @@
   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/xlock/fonts/`"], [True Text Font])
   else
-    AC_DEFINE_UNQUOTED([DEF_TTFONT], ["${prefix}/lib/X11/xlock/fonts/"], [True Text Font])
+    AC_DEFINE_UNQUOTED([DEF_TTFONT], ["${prefix}/share/xlock/fonts/"], [True Text Font])
   fi
   XLOCKLIBS="${XLOCKLIBS} -lttf"
   test "x$ttf_includes" = xNONE && ttf_includes=$ac_ttf_includes
@@ -2086,9 +2086,9 @@
   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/xlock/fonts/"], [True Text Font])
   else
-    AC_DEFINE_UNQUOTED([DEF_TTFONT], ["${prefix}/lib/X11/xlock/fonts/"], [True Text Font])
+    AC_DEFINE_UNQUOTED([DEF_TTFONT], ["${prefix}/share/xlock/fonts/"], [True Text Font])
   fi
   XLOCKLIBS="${XLOCKLIBS} -lfreetype"
   test "x$freetype_includes" = xNONE && freetype_includes=$ac_freetype_includes
 
design & coding: Vladimir Lettiev aka crux © 2004-2005, Andrew Avramenko aka liks © 2007-2008
current maintainer: Michael Shigorin