diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /net-misc/nx/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'net-misc/nx/files')
-rw-r--r-- | net-misc/nx/files/1.5.0/nx-x11-1.5.0-tmp-exec.patch | 11 | ||||
-rw-r--r-- | net-misc/nx/files/1.5.0/nxcomp-1.5.0-pic.patch | 20 | ||||
-rw-r--r-- | net-misc/nx/files/nx-3.2.0-nxproxy_read_from_stdin.patch | 68 | ||||
-rw-r--r-- | net-misc/nx/files/nx-3.3.0-cflags.patch | 54 | ||||
-rw-r--r-- | net-misc/nx/files/nx-3.5.0.17-cflags_ar_ranlib.patch | 100 | ||||
-rw-r--r-- | net-misc/nx/files/nx-3.5.0.30-fix_X11_underlinking.patch | 11 |
6 files changed, 264 insertions, 0 deletions
diff --git a/net-misc/nx/files/1.5.0/nx-x11-1.5.0-tmp-exec.patch b/net-misc/nx/files/1.5.0/nx-x11-1.5.0-tmp-exec.patch new file mode 100644 index 000000000000..ece22145c47f --- /dev/null +++ b/net-misc/nx/files/1.5.0/nx-x11-1.5.0-tmp-exec.patch @@ -0,0 +1,11 @@ +--- nx-X11/config/imake/imake.c.orig 2006-11-05 00:10:49.000000000 +0000 ++++ nx-X11/config/imake/imake.c 2006-11-05 00:11:49.000000000 +0000 +@@ -974,7 +974,7 @@ + static void + get_libc_version(FILE *inFile) + { +- char aout[] = "/tmp/imakeXXXXXX"; ++ char aout[] = "./imakeXXXXXX"; + FILE *fp; + const char *format = "%s -o %s -x c -"; + char *cc; diff --git a/net-misc/nx/files/1.5.0/nxcomp-1.5.0-pic.patch b/net-misc/nx/files/1.5.0/nxcomp-1.5.0-pic.patch new file mode 100644 index 000000000000..2ccaf978dd09 --- /dev/null +++ b/net-misc/nx/files/1.5.0/nxcomp-1.5.0-pic.patch @@ -0,0 +1,20 @@ +--- nxcomp/Makefile.in.agriffis 2005-11-12 12:48:42.000000000 -0500 ++++ nxcomp/Makefile.in 2005-12-15 12:24:46.000000000 -0500 +@@ -32,7 +32,7 @@ + + CXX = @CXX@ + CXXFLAGS = @CXXFLAGS@ @X_CFLAGS@ @DEFS@ \ +- -Wall -Wpointer-arith ++ -Wall -Wpointer-arith -fPIC + CXXINCLUDES = + CXXDEFINES = + +@@ -42,7 +42,7 @@ + + CC = @CC@ + CCFLAGS = @CFLAGS@ @X_CFLAGS@ @DEFS@ \ +- -Wall -Wpointer-arith ++ -Wall -Wpointer-arith -fPIC + CCINCLUDES = + CCDEFINES = + diff --git a/net-misc/nx/files/nx-3.2.0-nxproxy_read_from_stdin.patch b/net-misc/nx/files/nx-3.2.0-nxproxy_read_from_stdin.patch new file mode 100644 index 000000000000..bce692d10a7a --- /dev/null +++ b/net-misc/nx/files/nx-3.2.0-nxproxy_read_from_stdin.patch @@ -0,0 +1,68 @@ +--- Main.c.old 2007-07-18 17:39:13.000000000 +0200 ++++ Main.c 2008-03-12 04:40:30.000000000 +0100 +@@ -36,28 +36,48 @@ + int result = -1; + + char *options = NULL; +- ++ ++ char *nx_commfd_str = NULL; ++ + options = getenv("NX_DISPLAY"); +- +- if (NXTransParseCommandLine(argc, argv) < 0) ++ ++ if ((nx_commfd_str = getenv("NX_COMMFD")) != NULL) + { +- NXTransCleanup(); +- } ++ int nx_commfd = atoi(nx_commfd_str); + +- if (NXTransParseEnvironment(options, 0) < 0) +- { +- NXTransCleanup(); ++ if (result) ++ result = NXTransCreate(nx_commfd, NX_MODE_SERVER, options); ++ ++ // go into endless loop ++ ++ if (result) ++ { ++ while (NXTransRunning(NX_FD_ANY)) ++ result = NXTransContinue(NULL); ++ } + } ++ else ++ { ++ if (NXTransParseCommandLine(argc, argv) < 0) ++ { ++ NXTransCleanup(); ++ } ++ ++ if (NXTransParseEnvironment(options, 0) < 0) ++ { ++ NXTransCleanup(); ++ } ++ ++ /* ++ * This should not return... ++ */ ++ ++ #ifdef TEST ++ fprintf(stderr, "Main: Yielding control to NX entry point.\n"); ++ #endif + +- /* +- * This should not return... +- */ +- +- #ifdef TEST +- fprintf(stderr, "Main: Yielding control to NX entry point.\n"); +- #endif +- +- result = NXTransProxy(NX_FD_ANY, NX_MODE_ANY, NX_DISPLAY_ANY); ++ result = NXTransProxy(NX_FD_ANY, NX_MODE_ANY, NX_DISPLAY_ANY); ++ } + + /* + * ...So these should not be called. diff --git a/net-misc/nx/files/nx-3.3.0-cflags.patch b/net-misc/nx/files/nx-3.3.0-cflags.patch new file mode 100644 index 000000000000..35562939c5b2 --- /dev/null +++ b/net-misc/nx/files/nx-3.3.0-cflags.patch @@ -0,0 +1,54 @@ +--- nxcomp/configure.in.orig 2008-12-18 15:48:09.000000000 +0100 ++++ nxcomp/configure.in 2008-12-18 15:54:14.000000000 +0100 +@@ -7,8 +7,7 @@ + + dnl Set our default compilation flags. + +-CXXFLAGS="-O3 -fno-rtti -fno-exceptions" +-CFLAGS="-O3" ++CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions" + + dnl Reset default linking directives. + +--- nxcompext/configure.in.orig 2008-12-18 15:55:29.000000000 +0100 ++++ nxcompext/configure.in 2008-12-18 15:55:51.000000000 +0100 +@@ -5,11 +5,6 @@ + AC_INIT(NXlib.h) + AC_PREREQ(2.13) + +-dnl Reset default compilation flags. +- +-CXXFLAGS="-O3" +-CFLAGS="-O3" +- + dnl Reset default linking directives. + + LIBSTATIC="" +--- nxcompshad/configure.in.orig 2008-12-18 15:56:13.000000000 +0100 ++++ nxcompshad/configure.in 2008-12-18 15:56:22.000000000 +0100 +@@ -5,11 +5,6 @@ + AC_INIT(Shadow.h) + AC_PREREQ(2.13) + +-dnl Reset default compilation flags. +- +-CXXFLAGS="-O3" +-CPPFLAGS="-O3" +- + dnl Reset default linking directives. + + LIBSTATIC="" +--- nxproxy/configure.in.orig 2008-12-18 15:57:48.000000000 +0100 ++++ nxproxy/configure.in 2008-12-18 15:57:55.000000000 +0100 +@@ -5,11 +5,6 @@ + AC_INIT(Main.c) + AC_PREREQ(2.13) + +-dnl Reset default compilation flags. +- +-CXXFLAGS="-O3" +-CPPFLAGS="-O3" +- + dnl Prefer headers and libraries from nx-X11 if present. + + if test -d "../nx-X11/exports/include" ; then diff --git a/net-misc/nx/files/nx-3.5.0.17-cflags_ar_ranlib.patch b/net-misc/nx/files/nx-3.5.0.17-cflags_ar_ranlib.patch new file mode 100644 index 000000000000..668a6bf4c310 --- /dev/null +++ b/net-misc/nx/files/nx-3.5.0.17-cflags_ar_ranlib.patch @@ -0,0 +1,100 @@ +diff -Naur nx-libs-3.5.0.17.orig/nxcomp/Makefile.in nx-libs-3.5.0.17/nxcomp/Makefile.in +--- nx-libs-3.5.0.17.orig/nxcomp/Makefile.in 2013-01-09 15:03:33.152952758 +0100 ++++ nx-libs-3.5.0.17/nxcomp/Makefile.in 2013-01-09 15:05:39.771898159 +0100 +@@ -243,8 +243,8 @@ + + $(LIBARCHIVE): $(CXXOBJ) $(COBJ) + rm -f $(LIBARCHIVE) +- ar clq $(LIBARCHIVE) $(CXXOBJ) $(COBJ) +- ranlib $(LIBARCHIVE) ++ $(AR) $(LIBARCHIVE) $(CXXOBJ) $(COBJ) ++ $(RANLIB) $(LIBARCHIVE) + + $(LIBCYGSHARED): $(LIBARCHIVE) + $(CC) -shared -o $(LIBCYGSHARED) \ +diff -Naur nx-libs-3.5.0.17.orig/nxcomp/configure.in nx-libs-3.5.0.17/nxcomp/configure.in +--- nx-libs-3.5.0.17.orig/nxcomp/configure.in 2013-01-09 15:03:33.151952758 +0100 ++++ nx-libs-3.5.0.17/nxcomp/configure.in 2013-01-09 15:04:03.312940892 +0100 +@@ -7,8 +7,7 @@ + + dnl Set our default compilation flags. + +-CXXFLAGS="$CXXFLAGS -O3 -fno-rtti -fno-exceptions" +-CFLAGS="$CFLAGS -O3" ++CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions" + + dnl Reset default linking directives. + +diff -Naur nx-libs-3.5.0.17.orig/nxcompext/Makefile.in nx-libs-3.5.0.17/nxcompext/Makefile.in +--- nx-libs-3.5.0.17.orig/nxcompext/Makefile.in 2013-01-09 15:03:33.164952753 +0100 ++++ nx-libs-3.5.0.17/nxcompext/Makefile.in 2013-01-09 15:06:08.747879052 +0100 +@@ -125,8 +125,8 @@ + + $(LIBARCHIVE): $(CXXOBJ) $(COBJ) + rm -f $(LIBARCHIVE) +- ar clq $(LIBARCHIVE) $(CXXOBJ) $(COBJ) +- ranlib $(LIBARCHIVE) ++ $(AR) $(LIBARCHIVE) $(CXXOBJ) $(COBJ) ++ $(RANLIB) $(LIBARCHIVE) + + $(LIBCYGSHARED): $(LIBARCHIVE) + $(CC) -shared -o $(LIBCYGSHARED) \ +diff -Naur nx-libs-3.5.0.17.orig/nxcompext/configure.in nx-libs-3.5.0.17/nxcompext/configure.in +--- nx-libs-3.5.0.17.orig/nxcompext/configure.in 2013-01-09 15:03:33.164952753 +0100 ++++ nx-libs-3.5.0.17/nxcompext/configure.in 2013-01-09 15:04:16.247935801 +0100 +@@ -5,11 +5,6 @@ + AC_INIT(NXlib.h) + AC_PREREQ(2.13) + +-dnl Reset default compilation flags. +- +-CXXFLAGS="$CXXFLAGS -O3" +-CFLAGS="$CFLAGS -O3" +- + dnl Reset default linking directives. + + LIBSTATIC="" +diff -Naur nx-libs-3.5.0.17.orig/nxcompshad/Makefile.in nx-libs-3.5.0.17/nxcompshad/Makefile.in +--- nx-libs-3.5.0.17.orig/nxcompshad/Makefile.in 2013-01-09 15:03:33.163952754 +0100 ++++ nx-libs-3.5.0.17/nxcompshad/Makefile.in 2013-01-09 15:06:16.933873660 +0100 +@@ -158,8 +158,8 @@ + + $(LIBARCHIVE): $(CXXOBJ) $(COBJ) + rm -f $(LIBARCHIVE) +- ar clq $(LIBARCHIVE) $(CXXOBJ) $(COBJ) +- ranlib $(LIBARCHIVE) ++ $(AR) $(LIBARCHIVE) $(CXXOBJ) $(COBJ) ++ $(RANLIB) $(LIBARCHIVE) + + $(LIBDLL): $(LIBARCHIVE) + $(CC) -o $@ \ +diff -Naur nx-libs-3.5.0.17.orig/nxcompshad/configure.in nx-libs-3.5.0.17/nxcompshad/configure.in +--- nx-libs-3.5.0.17.orig/nxcompshad/configure.in 2013-01-09 15:03:33.163952754 +0100 ++++ nx-libs-3.5.0.17/nxcompshad/configure.in 2013-01-09 15:04:20.073934295 +0100 +@@ -5,11 +5,6 @@ + AC_INIT(Shadow.h) + AC_PREREQ(2.13) + +-dnl Reset default compilation flags. +- +-CXXFLAGS="$CXXFLAGS -O3" +-CPPFLAGS="$CPPFLAGS -O3" +- + dnl Reset default linking directives. + + LIBSTATIC="" +diff -Naur nx-libs-3.5.0.17.orig/nxproxy/configure.in nx-libs-3.5.0.17/nxproxy/configure.in +--- nx-libs-3.5.0.17.orig/nxproxy/configure.in 2013-01-09 15:03:33.163952754 +0100 ++++ nx-libs-3.5.0.17/nxproxy/configure.in 2013-01-09 15:04:24.842932418 +0100 +@@ -5,11 +5,6 @@ + AC_INIT(Main.c) + AC_PREREQ(2.13) + +-dnl Reset default compilation flags. +- +-CXXFLAGS="$CXXFLAGS -O3" +-CPPFLAGS="$CPPFLAGS -O3" +- + dnl Prefer headers and libraries from nx-X11 if present. + + if test -d "../nx-X11/exports/include" ; then diff --git a/net-misc/nx/files/nx-3.5.0.30-fix_X11_underlinking.patch b/net-misc/nx/files/nx-3.5.0.30-fix_X11_underlinking.patch new file mode 100644 index 000000000000..87d73c5a8d37 --- /dev/null +++ b/net-misc/nx/files/nx-3.5.0.30-fix_X11_underlinking.patch @@ -0,0 +1,11 @@ +--- nx-X11/lib/X11/Imakefile.orig 2015-04-24 15:24:36.171666957 +0200 ++++ nx-X11/lib/X11/Imakefile 2015-04-24 15:25:17.516179627 +0200 +@@ -107,7 +107,7 @@ + EXCLUDE_SYMBOL = -Wl,--exclude-symbol,XdmcpWrap:_XdmcpWrapperToOddParity + #endif + +-REQUIREDLIBS=$(REQUIREDX11LIBS) $(REQUIREDI18NLIBS) $(EXCLUDE_SYMBOL) $(NX_REQUIREDLIBS) ++REQUIREDLIBS=$(REQUIREDX11LIBS) $(REQUIREDI18NLIBS) $(EXCLUDE_SYMBOL) $(NX_REQUIREDLIBS) -ldl + + #if defined(MacIIArchitecture) || defined(SequentArchitecture) || defined(i386ScoArchitecture) + XBSDLIB = /**/ |