[pkg-remote-commits] [nx-libs] 17/18: debian/patches: Add 1001_shrink-mesa-patch-5001.patch. Shrink over-zealous Mesa patch.

Mike Gabriel sunweaver at debian.org
Wed Aug 30 20:35:19 UTC 2017


This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch master
in repository nx-libs.

commit 54e9215bfc81b85719cf40128fdd4350dd2e8ada
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Aug 30 22:18:44 2017 +0200

    debian/patches: Add 1001_shrink-mesa-patch-5001.patch. Shrink over-zealous Mesa patch.
---
 debian/patches/1001_shrink-mesa-patch-5001.patch | 56 ++++++++++++++++++++++++
 debian/patches/series                            |  1 +
 2 files changed, 57 insertions(+)

diff --git a/debian/patches/1001_shrink-mesa-patch-5001.patch b/debian/patches/1001_shrink-mesa-patch-5001.patch
new file mode 100644
index 0000000..9e93c3e
--- /dev/null
+++ b/debian/patches/1001_shrink-mesa-patch-5001.patch
@@ -0,0 +1,56 @@
+Author: Mike Gabriel
+Description: Shrink over-zealous Mesa patch
+
+--- a/nx-X11/extras/Mesa.patches/5001_nasty-typo-fixes.patch
++++ b/nx-X11/extras/Mesa.patches/5001_nasty-typo-fixes.patch
+@@ -1,50 +1,6 @@
+ Description: Some nasty typos fixed to silence lintian et al.
+ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+ 
+-Index: Mesa/src/mesa/drivers/dri/common/xmlconfig.c
+-===================================================================
+---- Mesa.orig/src/mesa/drivers/dri/common/xmlconfig.c
+-+++ Mesa/src/mesa/drivers/dri/common/xmlconfig.c
+-@@ -729,7 +729,7 @@ static void parseDeviceAttr (struct OptC
+-     for (i = 0; attr[i]; i += 2) {
+- 	if (!strcmp (attr[i], "driver")) driver = attr[i+1];
+- 	else if (!strcmp (attr[i], "screen")) screen = attr[i+1];
+--	else XML_WARNING("unkown device attribute: %s.", attr[i]);
+-+	else XML_WARNING("unknown device attribute: %s.", attr[i]);
+-     }
+-     if (driver && strcmp (driver, data->driverName))
+- 	data->ignoringDevice = data->inDevice;
+-@@ -749,7 +749,7 @@ static void parseAppAttr (struct OptConf
+-     for (i = 0; attr[i]; i += 2) {
+- 	if (!strcmp (attr[i], "name")) name = attr[i+1];
+- 	else if (!strcmp (attr[i], "executable")) exec = attr[i+1];
+--	else XML_WARNING("unkown application attribute: %s.", attr[i]);
+-+	else XML_WARNING("unknown application attribute: %s.", attr[i]);
+-     }
+-     if (exec && strcmp (exec, data->execName))
+- 	data->ignoringApp = data->inApp;
+-@@ -762,7 +762,7 @@ static void parseOptConfAttr (struct Opt
+-     for (i = 0; attr[i]; i += 2) {
+- 	if (!strcmp (attr[i], "name")) name = attr[i+1];
+- 	else if (!strcmp (attr[i], "value")) value = attr[i+1];
+--	else XML_WARNING("unkown option attribute: %s.", attr[i]);
+-+	else XML_WARNING("unknown option attribute: %s.", attr[i]);
+-     }
+-     if (!name) XML_WARNING1 ("name attribute missing in option.");
+-     if (!value) XML_WARNING1 ("value attribute missing in option.");
+-Index: Mesa/src/mesa/glapi/glX_proto_size.py
+-===================================================================
+---- Mesa.orig/src/mesa/glapi/glX_proto_size.py
+-+++ Mesa/src/mesa/glapi/glX_proto_size.py
+-@@ -432,7 +432,7 @@ class PrintGlxReqSize_c(PrintGlxReqSize_
+- 	"""Create the server-side 'request size' functions.
+- 
+- 	Create the server-side functions that are used to determine what the
+--	size of a varible length command should be.  The server then uses
+-+	size of a variable length command should be.  The server then uses
+- 	this value to determine if the incoming command packed it malformed.
+- 	"""
+- 
+ Index: Mesa/src/mesa/main/debug.c
+ ===================================================================
+ --- Mesa.orig/src/mesa/main/debug.c
diff --git a/debian/patches/series b/debian/patches/series
index 79df365..03dae87 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 2001_nx-X11_install-location.debian.patch
 2002_xserver-xext_set-securitypolicy-path.debian.patch
+1001_shrink-mesa-patch-5001.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-remote/nx-libs.git



More information about the pkg-remote-commits mailing list