package/qt/qt3/X11R7.patch

   1 # --- T2-COPYRIGHT-NOTE-BEGIN ---
   2 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
   3 #
   4 # T2 SDE: package/.../qt/X11R7.patch
   5 # Copyright (C) 2004 - 2006 The T2 SDE Project
   6 #
   7 # More information can be found in the files COPYING and README.
   8 #
   9 # This patch file is dual-licensed. It is available under the license the
  10 # patched project is licensed under, as long as it is an OpenSource license
  11 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  12 # of the GNU General Public License as published by the Free Software
  13 # Foundation; either version 2 of the License, or (at your option) any later
  14 # version.
  15 # --- T2-COPYRIGHT-NOTE-END ---
  16
  17 We no longer have X11R6 ... ,-) and demand lib64 for 64bit builds.
  18
  19   - Rene Rebe <rene@exactcode.de>
  20
  21 --- ./mkspecs/linux-g++-64/qmake.conf.vanilla   2005-10-08 09:38:19.000000000 +0200
  22 +++ ./mkspecs/linux-g++-64/qmake.conf   2005-10-08 09:38:27.000000000 +0200
  23 @@ -43,12 +43,12 @@
  24
  25  QMAKE_INCDIR           =
  26  QMAKE_LIBDIR           =
  27 -QMAKE_INCDIR_X11       = /usr/X11R6/include
  28 -QMAKE_LIBDIR_X11       = /usr/X11R6/lib64
  29 +QMAKE_INCDIR_X11       = /usr/X11/include
  30 +QMAKE_LIBDIR_X11       = /usr/X11/lib64
  31  QMAKE_INCDIR_QT                = $(QTDIR)/include
  32 -QMAKE_LIBDIR_QT                = $(QTDIR)/lib
  33 -QMAKE_INCDIR_OPENGL    = /usr/X11R6/include
  34 -QMAKE_LIBDIR_OPENGL    = /usr/X11R6/lib64
  35 +QMAKE_LIBDIR_QT                = $(QTDIR)/lib64
  36 +QMAKE_INCDIR_OPENGL    = /usr/X11/include
  37 +QMAKE_LIBDIR_OPENGL    = /usr/X11/lib64
  38
  39  QMAKE_LINK             = g++
  40  QMAKE_LINK_SHLIB       = g++
  41 --- ./mkspecs/linux-g++/qmake.conf.vanilla      2005-10-08 09:37:47.000000000 +0200
  42 +++ ./mkspecs/linux-g++/qmake.conf      2005-10-08 09:37:57.000000000 +0200
  43 @@ -40,12 +40,12 @@
  44
  45  QMAKE_INCDIR           =
  46  QMAKE_LIBDIR           =
  47 -QMAKE_INCDIR_X11       = /usr/X11R6/include
  48 -QMAKE_LIBDIR_X11       = /usr/X11R6/lib
  49 +QMAKE_INCDIR_X11       = /usr/X11/include
  50 +QMAKE_LIBDIR_X11       = /usr/X11/lib
  51  QMAKE_INCDIR_QT                = $(QTDIR)/include
  52  QMAKE_LIBDIR_QT                = $(QTDIR)/lib
  53 -QMAKE_INCDIR_OPENGL    = /usr/X11R6/include
  54 -QMAKE_LIBDIR_OPENGL    = /usr/X11R6/lib
  55 +QMAKE_INCDIR_OPENGL    = /usr/X11/include
  56 +QMAKE_LIBDIR_OPENGL    = /usr/X11/lib
  57
  58  QMAKE_LINK             = g++
  59  QMAKE_LINK_SHLIB       = g++