diff options
| author | Jan Engelhardt <jengelh@medozas.de> | 2015-02-13 13:27:42 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-02-13 13:27:42 +0100 |
| commit | c4a8556c45786c83b04b2e958234cb4c724e1910 (patch) | |
| tree | 753b7f4d4ff8eacc0bbf79be7251facfa4aea0a1 /nx-X11/lib/Xcursor | |
| parent | d4d3fe0e6e77a58e68defc5895a589a681d7d092 (diff) | |
| download | nx-libs-c4a8556c45786c83b04b2e958234cb4c724e1910.tar.gz nx-libs-c4a8556c45786c83b04b2e958234cb4c724e1910.tar.bz2 nx-libs-c4a8556c45786c83b04b2e958234cb4c724e1910.zip | |
Unique Library Names Patch (600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch).
We really want to make use of rpm's automatic dependency finding.
Binaries are scanned for DT_NEEDED entries, the latter of which are
then used for populating the "Requires"-type deps. The "nxagent"
binary for example would require libX11.so.6. That incurs problems:
1. A package manager told to install nxagent could select xorg-x11
rather than nx-libs, even though nxagent depends on the NX version.
2. A package manager told to install $some_program could select nx-libs
rather than xorg-x11 (since both provide libX11.so.6), but, since
the NX library is in an obscure directory, running $some_program
would fail as libX11.so.6 is not found.
To solve this, give the NX libraries unique names different from the
Xorg ones.
Diffstat (limited to 'nx-X11/lib/Xcursor')
| -rw-r--r-- | nx-X11/lib/Xcursor/Imakefile | 2 | ||||
| -rw-r--r-- | nx-X11/lib/Xcursor/xcursor.pc.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nx-X11/lib/Xcursor/Imakefile b/nx-X11/lib/Xcursor/Imakefile index 3e50841ff..53b41e893 100644 --- a/nx-X11/lib/Xcursor/Imakefile +++ b/nx-X11/lib/Xcursor/Imakefile @@ -15,7 +15,7 @@ SOXCURSORREV=1.0.2 #define DoDebugLib DebugLibXcursor #define DoProfileLib ProfileLibXcursor -#define LibName Xcursor +#define LibName NX_Xcursor #define SoRev SOXCURSORREV #define IncSubdir X11 #define IncSubSubdir Xcursor diff --git a/nx-X11/lib/Xcursor/xcursor.pc.in b/nx-X11/lib/Xcursor/xcursor.pc.in index c39fce712..87aba1209 100644 --- a/nx-X11/lib/Xcursor/xcursor.pc.in +++ b/nx-X11/lib/Xcursor/xcursor.pc.in @@ -12,4 +12,4 @@ Description: X Cursor Library Version: @VERSION@ Requires: xrender Cflags: -I${includedir} ${xrendercflags} ${xcflags} -Libs: -L${libdir} -lXcursor ${xrenderlibs} ${xlibs} +Libs: -L${libdir} -lNX_Xcursor ${xrenderlibs} ${xlibs} |