[pkg-remote-commits] [nx-libs] 02/07: debian/patches: Drop 0001_fix-ftbfs-on-aarch64.patch, 0002_fix-ftbfs-on-sparc64.patch, 0005_define-USE_IEEE-macro-for-more-platforms.patch and 0006_fix-duplicate-build-attempt-in-main-Makefile.patch. Patches shipped upstream now.

[Mike Gabriel]

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

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

commit a6f9152acf88abd153a95a6ab35b3b6b653d3cc2
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Apr 21 21:12:04 2017 +0200

    debian/patches: Drop 0001_fix-ftbfs-on-aarch64.patch, 0002_fix-ftbfs-on-sparc64.patch, 0005_define-USE_IEEE-macro-for-more-platforms.patch and 0006_fix-duplicate-build-attempt-in-main-Makefile.patch. Patches shipped upstream now.
---
 debian/patches/0001_fix-ftbfs-on-aarch64.patch     | 19 ---------------
 debian/patches/0002_fix-ftbfs-on-sparc64.patch     | 25 --------------------
 ..._define-USE_IEEE-macro-for-more-platforms.patch | 16 -------------
 ...-duplicate-build-attempt-in-main-Makefile.patch | 27 ----------------------
 debian/patches/series                              |  4 ----
 5 files changed, 91 deletions(-)

diff --git a/debian/patches/0001_fix-ftbfs-on-aarch64.patch b/debian/patches/0001_fix-ftbfs-on-aarch64.patch
deleted file mode 100644
index c368792..0000000
--- a/debian/patches/0001_fix-ftbfs-on-aarch64.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 53dc4ba1290a60818988ce36b9613c225f63a791
-Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
-Date:   Wed Apr 12 19:23:37 2017 +0200
-
-    nx-X11/config/cf/linux.cf: Fix FTBFS on arm64 (aarch64) due to missing -D_XSERVER64 definition.
-
-diff --git a/nx-X11/config/cf/linux.cf b/nx-X11/config/cf/linux.cf
-index 2f5aa11..d91dd37 100644
---- a/nx-X11/config/cf/linux.cf
-+++ b/nx-X11/config/cf/linux.cf
-@@ -694,7 +694,7 @@ XCOMM binutils:	(LinuxBinUtilsMajorVersion)
- # endif
- # define LinuxMachineDefines	-D__aarch64__ -U__arm -Uarm
- # define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME
--# define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines
-+# define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
- #endif /* Arm64Achitecture */
- 
- #ifdef i386Architecture
diff --git a/debian/patches/0002_fix-ftbfs-on-sparc64.patch b/debian/patches/0002_fix-ftbfs-on-sparc64.patch
deleted file mode 100644
index 55ffb3d..0000000
--- a/debian/patches/0002_fix-ftbfs-on-sparc64.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-commit a05fa476359b918945e195d8cda625698425177b
-Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
-Date:   Thu Apr 13 10:24:19 2017 +0200
-
-    nx-X11/config/cf/linux.cf: Fix FTBFS on Linux SPARC64 due to missing -D_XSERVER64 definition.
-
-diff --git a/nx-X11/config/cf/linux.cf b/nx-X11/config/cf/linux.cf
-index 2f5aa11..074cc2a 100644
---- a/nx-X11/config/cf/linux.cf
-+++ b/nx-X11/config/cf/linux.cf
-@@ -776,12 +776,13 @@ XCOMM binutils:	(LinuxBinUtilsMajorVersion)
- # endif
- # define LinuxMachineDefines	-D__sparc__
- # define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME
--# define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines
- # define AsVISOption		-Av9a
- # ifdef Sparc64Architecture
- #  define AsOutputArchSize	64
-+#  define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
- # else
- #  define AsOutputArchSize	32
-+#  define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines
- # endif
- #endif
- 
diff --git a/debian/patches/0005_define-USE_IEEE-macro-for-more-platforms.patch b/debian/patches/0005_define-USE_IEEE-macro-for-more-platforms.patch
deleted file mode 100644
index 67932d7..0000000
--- a/debian/patches/0005_define-USE_IEEE-macro-for-more-platforms.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
-Description: define USE_IEEE for __aarch64__ and __mc68000__, as well
-
-Index: nx-X11/extras/Mesa/src/mesa/main/imports.h
-===================================================================
---- a/nx-X11/extras/Mesa/src/mesa/main/imports.h
-+++ b/nx-X11/extras/Mesa/src/mesa/main/imports.h
-@@ -204,6 +204,8 @@ typedef union { GLfloat f; GLint i; } fi
-     defined(ia64) || defined(__ia64__) || \
-     defined(__mips) || defined(_MIPS_ARCH) || \
-     defined(__arm__) || \
-+    defined(__aarch64__) || \
-+    defined(__mc68000__) || \
-     defined(__sh__) || \
-     (defined(__alpha__) && (defined(__IEEE_FLOAT) || !defined(VMS)))
- #define USE_IEEE
diff --git a/debian/patches/0006_fix-duplicate-build-attempt-in-main-Makefile.patch b/debian/patches/0006_fix-duplicate-build-attempt-in-main-Makefile.patch
deleted file mode 100644
index 4f758ac..0000000
--- a/debian/patches/0006_fix-duplicate-build-attempt-in-main-Makefile.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
-Description: On 'make all', don't call the subfolders' 'build' rules via the '%:' ruleset.
-
-index 8ea31cd..dedbe21 100644
---- a/Makefile
-+++ b/Makefile
-@@ -38,16 +38,18 @@
- 	    if test -f nx-X11/Makefile; then ${MAKE} -C nx-X11 $@; fi; \
- 	fi
- 
--	# clean auto-generated nxversion.def file \
-+	# clean auto-generated files
- 	if [ "x$@" == "xclean" ] || [ "x$@" = "xdistclean" ]; then \
- 	    ./mesa-quilt pop -a; \
- 	    rm -Rf nx-X11/extras/Mesa/.pc/; \
-+	    rm -f nx-X11/config/cf/date.def; \
- 	    rm -f nx-X11/config/cf/nxversion.def; \
- 	    rm -f bin/nxagent; \
- 	    rm -f bin/nxproxy; \
- 	fi
- 
--all: build
-+all:
-+	${MAKE} build
- 
- test:
- 	echo "No testing for NX (redistributed)"
diff --git a/debian/patches/series b/debian/patches/series
index d3db640..a10cc84 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,9 +1,5 @@
-0001_fix-ftbfs-on-aarch64.patch
-0002_fix-ftbfs-on-sparc64.patch
 0003_define-EBADFD-if-undefined.patch
 0004_nx-X11-gnu-hurd-support.patch
-0005_define-USE_IEEE-macro-for-more-platforms.patch
-0006_fix-duplicate-build-attempt-in-main-Makefile.patch
 0007_fix-ftbfs-on-mips64el.patch
 2001_nx-X11_install-location.debian.patch
 2002_xserver-xext_set-securitypolicy-path.debian.patch

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