Attachment 110201 Details for Bug 86833 – xorg/xclock-1.0.5/configure.ac-X11R7.6.patch

[patch] xorg/xclock-1.0.5/configure.ac-X11R7.6.patch

configure.ac-X11R7.6.patch (text/plain), 2.74 KB, created by slackguy on 2014-11-28 20:02:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: slackguy

Created: 2014-11-28 20:02:18 UTC

Size: 2.74 KB

patch

obsolete

>--- configure.ac.orig	2014-11-25 21:10:13.000000000 -0500
>+++ configure.ac	2014-11-26 15:02:08.000000000 -0500
>@@ -60,6 +60,79 @@
> 	AC_DEFINE([XFREE86_FT2],1,[Define to use Xft2 library])
> fi
> 
>+dnl ok but do it Xft again ...
>+
>+dnl jdh
>+dnl added
>+#
>+# freetype2 autoconf
>+#
>+LIBFREETYPE2="freetype2 >= 10.0"
>+AC_ARG_WITH(freetype2, 
>+  AC_HELP_STRING([--with-freetype2],
>+  [Use freetype2 for xft (default YES for xft)]),
>+  [USE_FREETYPE2="$withval"],
>+  PKG_CHECK_EXISTS(freetype2, [USE_FREETYPE2="yes"], [USE_FREETYPE2="no"]))
>+if test "x$USE_FREETYPE2" = "xyes" ; then
>+  PKG_CHECK_MODULES([FREETYPE2], [$LIBFREETYPE2], [HAVE_FREETYPE2="yes"], [HAVE_FREETYPE2="no"])
>+  if test "x$HAVE_FREETYPE2" = xyes ; then
>+    AC_DEFINE(FREETYPE2, 1, [Support freetyp2])
>+    AC_DEFINE(HAVE_FREETYPE2, 1, [Support freetyp2])
>+    AC_DEFINE([USE_FREETYPE2], 1, [Define to 1 to use freetype2 for text])
>+    REQUIRED_MODULES="$REQUIRED_MODULES $LIBFREETYPE2"
>+    REQUIRED_LIBS="$REQUIRED_LIBS $LIBFREETYPE2"
>+  fi
>+fi
>+if ! test "x$HAVE_LIBFREETYPE2" = xyes ; then
>+  unset FREETYPE2 HAVE_LIBFREETYPE2
>+fi
>+#
>+# Xft autoconf ; for using such fonts on greeter screen
>+#
>+LIBXFT="xft >= 1.0"
>+AC_ARG_WITH(xft,
>+  AC_HELP_STRING([--with-xft],
>+  [Use Xft to draw text (default is YES if installed)]),
>+  [USE_XFT="$withval"],
>+  PKG_CHECK_EXISTS(xft, [USE_XFT="yes"], [USE_XFT="no"])
>+)
>+if test "x$USE_XFT" = "xyes" ; then
>+  PKG_CHECK_MODULES([XFT], [$LIBXFT], [HAVE_XFT="yes"], [HAVE_XFT="no"])
>+  if test "x$HAVE_XFT" = xyes ; then
>+    AC_DEFINE(XFT, 1, [Support Xft])
>+    AC_DEFINE(HAVE_XFT, 1, [Support Xft])
>+    AC_DEFINE([USE_XFT], 1, [Define to 1 to use Xft for text ])
>+    REQUIRED_MODULES="$REQUIRED_MODULES $LIBXFT $LIBFREETYPE2"
>+    REQUIRED_LIBS="$REQUIRED_LIBS $LIBXFT $LIBFREETYPE2"
>+    XFT_CFLAGS="$XFT_CFLAGS $FREETYPE2_CFLAGS"
>+    XFT_LIBS="$XFT_LIBS $FREETYPE2_LIBS"
>+  fi
>+fi
>+if ! test "x$HAVE_XFT" = xyes ; then
>+  unset XFT HAVE_XFT
>+fi
>+dnl incl freetype2 into xft since app knows of that or REQ but not of freetype2
>+dnl bug: many pkg .h use #if(def) IDENT not HAVE_IDENT, "no" is bad, undef var
>+dnl Xft depends on freetype
>+if ! test c"$HAVE_XFT" = c"yes" && ! test c"$HAVE_XFT" = c"yes" ; then
>+  unset XFT HAVE_XFT
>+  unset FREETYPE2 HAVE_FREETYPE2
>+else
>+  XCLOCK_CFLAGS="$XCLOCK_CFLAGS $XFT_CFLAGS"
>+  XCLOCK_LIBS="$XCLOCK_LIBS $XFT_LIBS"
>+fi
>+#
>+
>+
>+dnl orig
>+dnl	PKG_CHECK_MODULES(XFT, xft)
>+dnl	GREETER_CFLAGS="$GREETER_CFLAGS $XFT_CFLAGS"
>+dnl	GREETER_LIBS="$GREETER_LIBS $XFT_LIBS"
>+dnl	AC_DEFINE([USE_XFT], 1, 
>+dnl	    [Define to 1 to use Xft for text on greeter screen])
>+
>+
>+
> AC_ARG_WITH(xkb, AC_HELP_STRING([--with-xkb],[Use XKB to sound bells (Default is YES)]),use_xkb="$withval",use_xkb="try")
> if test x$use_xkb != xno ; then
> 	PKG_CHECK_MODULES(XKB, xkbfile)

Actions: View | Splinter Review

Attachments on bug 86833: 110191 | 110192 | 110193 | 110194 | 110195 | 110196 | 110197 | 110198 | 110199 | 110200 | 110201 | 110202 | 110249 | 110250 | 110252 | 110254 | 110268 | 110269 | 110271

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.