Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/emacs/patches/xft.patch
author Ali Bahrami <Ali.Bahrami@Oracle.COM>
Mon, 13 Feb 2012 09:15:28 -0700
changeset 686 b4fe91eb660b
parent 176 11a04b640bf2
permissions -rw-r--r--
7087610 emacs runpath points at wrong ELFCLASS as well as being redundant 7048759 font not available error when attempting to set default font in emacs-gtk 7117531 update GNU Emacs to 23.4
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
686
b4fe91eb660b 7087610 emacs runpath points at wrong ELFCLASS as well as being redundant
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents: 176
diff changeset 
     1
 
*** emacs-23.4.orig/configure	Thu Jan 19 08:01:37 2012
b4fe91eb660b 7087610 emacs runpath points at wrong ELFCLASS as well as being redundant
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents: 176
diff changeset 
     2
 
--- emacs-23.4/configure	Tue Feb  7 12:38:02 2012
b4fe91eb660b 7087610 emacs runpath points at wrong ELFCLASS as well as being redundant
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents: 176
diff changeset 
     3
 
***************
b4fe91eb660b 7087610 emacs runpath points at wrong ELFCLASS as well as being redundant
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents: 176
diff changeset 
     4
 
*** 9283,9288 ****
b4fe91eb660b 7087610 emacs runpath points at wrong ELFCLASS as well as being redundant
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents: 176
diff changeset 
     5
 
--- 9283,9289 ----
b4fe91eb660b 7087610 emacs runpath points at wrong ELFCLASS as well as being redundant
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents: 176
diff changeset 
     6
 
              { $as_echo "$as_me:${as_lineno-$LINENO}: checking XFT_LIBS" >&5
b4fe91eb660b 7087610 emacs runpath points at wrong ELFCLASS as well as being redundant
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents: 176
diff changeset 
     7
 
  $as_echo_n "checking XFT_LIBS... " >&6; }
b4fe91eb660b 7087610 emacs runpath points at wrong ELFCLASS as well as being redundant
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents: 176
diff changeset 
     8
 
              XFT_LIBS=`$PKG_CONFIG --libs "xft >= 0.13.0"|sed -e 's,///*,/,g'`
b4fe91eb660b 7087610 emacs runpath points at wrong ELFCLASS as well as being redundant
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents: 176
diff changeset 
     9
 
+             XFT_LIBS='-lXft -lXrender -lfontconfig -lfreetype -lX11  '
b4fe91eb660b 7087610 emacs runpath points at wrong ELFCLASS as well as being redundant
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents: 176
diff changeset 
    10
 
              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XFT_LIBS" >&5
b4fe91eb660b 7087610 emacs runpath points at wrong ELFCLASS as well as being redundant
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents: 176
diff changeset 
    11
 
  $as_echo "$XFT_LIBS" >&6; }
b4fe91eb660b 7087610 emacs runpath points at wrong ELFCLASS as well as being redundant
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents: 176
diff changeset 
    12
 
          else
upstream/oracle/userland-gate