aboutsummaryrefslogtreecommitdiff
path: root/debian/patches/0601_nx-X11_build-option-changes-to-not-use-bundled-libraries.full.patch
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2017-08-03 09:41:21 +0200
committerMihai Moldovan <ionic@ionic.de>2017-08-03 09:41:21 +0200
commit6ae091cc27f90bd431e4d9564c760fa209f8efb8 (patch)
tree253588fb5860a00d39e957085a08a0dfcd736927 /debian/patches/0601_nx-X11_build-option-changes-to-not-use-bundled-libraries.full.patch
parenta4fb30f8d0dc188821ac61d64d113a6ae6156b95 (diff)
downloadnx-libs-6ae091cc27f90bd431e4d9564c760fa209f8efb8.tar.gz
nx-libs-6ae091cc27f90bd431e4d9564c760fa209f8efb8.tar.bz2
nx-libs-6ae091cc27f90bd431e4d9564c760fa209f8efb8.zip
debian/patches: refresh all patches.
Removes some fuzziness and adds the -p diff option to show the C function name in hunk headers.
Diffstat (limited to 'debian/patches/0601_nx-X11_build-option-changes-to-not-use-bundled-libraries.full.patch')
-rw-r--r--debian/patches/0601_nx-X11_build-option-changes-to-not-use-bundled-libraries.full.patch14
1 files changed, 7 insertions, 7 deletions
diff --git a/debian/patches/0601_nx-X11_build-option-changes-to-not-use-bundled-libraries.full.patch b/debian/patches/0601_nx-X11_build-option-changes-to-not-use-bundled-libraries.full.patch
index dbb2e85b0..6301b64ba 100644
--- a/debian/patches/0601_nx-X11_build-option-changes-to-not-use-bundled-libraries.full.patch
+++ b/debian/patches/0601_nx-X11_build-option-changes-to-not-use-bundled-libraries.full.patch
@@ -15,7 +15,7 @@ Abstract:
--- a/nx-X11/config/cf/host.def
+++ b/nx-X11/config/cf/host.def
-@@ -311,6 +311,7 @@
+@@ -311,6 +311,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.de
*
#define BuildFreeType NO
*/
@@ -23,7 +23,7 @@ Abstract:
/*
* To set non-default build options for the underlying FreeType libraries,
-@@ -892,7 +893,7 @@
+@@ -892,7 +893,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.de
*
#define HasFreetype2 NO
*/
@@ -32,7 +32,7 @@ Abstract:
/*
* To use a FreeType library already installed outside the default search
-@@ -909,7 +910,7 @@
+@@ -909,7 +910,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.de
*
#define HasFontconfig NO
*/
@@ -41,7 +41,7 @@ Abstract:
/*
* To use a Fontconfig library already installed outside the default search
-@@ -925,7 +926,7 @@
+@@ -925,7 +926,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.de
*
#define HasExpat NO
*/
@@ -50,7 +50,7 @@ Abstract:
/*
* To use a Expat library already installed outside the default search
-@@ -961,7 +962,7 @@
+@@ -961,7 +962,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.de
#define SharedLibXdmcp YES
@@ -59,7 +59,7 @@ Abstract:
#else /* #if !defined(NXZaurusXServer) && !defined(NXiPAQXServer) && !defined(DarwinArchitecture) */
-@@ -1019,3 +1020,11 @@
+@@ -1019,3 +1020,11 @@ XCOMM $XFree86: xc/config/cf/xf86site.de
#endif
#endif /* #if !defined(NXZaurusXServer) && !defined(NXiPAQXServer) && !defined(DarwinArchitecture) */
@@ -82,7 +82,7 @@ Abstract:
all::
--- a/nx-X11/lib/Imakefile
+++ b/nx-X11/lib/Imakefile
-@@ -213,14 +213,8 @@
+@@ -213,14 +213,8 @@ XEXTLIBDIR = Xext
#if BuildLibraries
OLDXLIBDIR = oldX