From 560b1b3f431dd45e28f9fe86332e49b32d108163 Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Wed, 7 Apr 2004 10:21:15 +0000 Subject: [PATCH] Clifford Wolf: Removed all the *-x files. This extension should only be used for local testing and never in the official tree. git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@2673 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/base/dietlibc/buff_hotfix.patch-x | 17 -- .../dietlibc/pkg_patch/pkg_fileutils.patch-x | 156 ------------------ .../dietlibc/pkg_patch/pkg_sh-utils.patch-x | 65 -------- .../dietlibc/pkg_patch/pkg_textutils.patch-x | 97 ----------- package/base/man/pl-nlu-10-fix.patch-x | 33 ---- package/be-el/sge/linux.patch-x | 15 -- package/jsaw/epplets-extra16/e-apm.patch-x | 10 -- package/jsaw/epplets-extra16/e-playcd.patch-x | 10 -- 8 files changed, 403 deletions(-) delete mode 100644 package/base/dietlibc/buff_hotfix.patch-x delete mode 100644 package/base/dietlibc/pkg_patch/pkg_fileutils.patch-x delete mode 100644 package/base/dietlibc/pkg_patch/pkg_sh-utils.patch-x delete mode 100644 package/base/dietlibc/pkg_patch/pkg_textutils.patch-x delete mode 100644 package/base/man/pl-nlu-10-fix.patch-x delete mode 100644 package/be-el/sge/linux.patch-x delete mode 100644 package/jsaw/epplets-extra16/e-apm.patch-x delete mode 100644 package/jsaw/epplets-extra16/e-playcd.patch-x diff --git a/package/base/dietlibc/buff_hotfix.patch-x b/package/base/dietlibc/buff_hotfix.patch-x deleted file mode 100644 index 1b67132a5..000000000 --- a/package/base/dietlibc/buff_hotfix.patch-x +++ /dev/null @@ -1,17 +0,0 @@ ---- ./dietstdio.h~ Wed Dec 4 18:32:33 2002 -+++ ./dietstdio.h Sun Jan 12 08:47:14 2003 -@@ -8,11 +8,12 @@ - #endif - #include - --#ifdef WANT_SMALL_STDIO_BUFS -+/*#ifdef WANT_SMALL_STDIO_BUFS - #define BUFSIZE 128 - #else - #define BUFSIZE 2048 --#endif -+#endif*/ -+#define BUFSIZE 0 - - struct __stdio_file { - int fd; diff --git a/package/base/dietlibc/pkg_patch/pkg_fileutils.patch-x b/package/base/dietlibc/pkg_patch/pkg_fileutils.patch-x deleted file mode 100644 index 133ba9826..000000000 --- a/package/base/dietlibc/pkg_patch/pkg_fileutils.patch-x +++ /dev/null @@ -1,156 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/base/dietlibc/pkg_patch/pkg_fileutils.patch-x -# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./lib/getline.c.orig Wed May 1 12:11:46 2002 -+++ ./lib/getline.c Wed May 1 12:22:40 2002 -@@ -22,10 +22,8 @@ - # include - #endif - --/* The `getdelim' function is only declared if the following symbol -- is defined. */ --#ifndef _GNU_SOURCE --# define _GNU_SOURCE 1 -+#ifdef _GNU_SOURCE -+# undef _GNU_SOURCE - #endif - - #include ---- ./lib/getline.h.orig Tue Oct 31 08:08:05 2000 -+++ ./lib/getline.h Wed May 1 12:22:40 2002 -@@ -17,6 +17,10 @@ - #ifndef GETLINE_H_ - # define GETLINE_H_ 1 - -+#ifdef _GNU_SOURCE -+# undef _GNU_SOURCE -+#endif -+ - # include - - # ifndef PARAMS ---- ./src/sys2.h.orig Wed May 1 12:27:35 2002 -+++ ./src/sys2.h Wed May 1 12:28:12 2002 -@@ -445,8 +445,8 @@ - CHAR_MIN - 1, as it may equal -1, the getopt end-of-options value. */ - enum - { -- GETOPT_HELP_CHAR = (CHAR_MIN - 2), -- GETOPT_VERSION_CHAR = (CHAR_MIN - 3) -+ GETOPT_HELP_CHAR = (-2), -+ GETOPT_VERSION_CHAR = (-3) - }; - - #define GETOPT_HELP_OPTION_DECL \ ---- ./src/chown-core.c.orig Wed May 1 12:28:42 2002 -+++ ./src/chown-core.c Wed May 1 12:28:53 2002 -@@ -40,8 +40,6 @@ - struct group *getgrgid (); - #endif - --int lstat (); -- - void - chopt_init (struct Chown_option *chopt) - { ---- ./src/copy.h.orig Wed May 1 12:29:13 2002 -+++ ./src/copy.h Wed May 1 12:29:18 2002 -@@ -131,7 +131,6 @@ - }; - - int stat (); --int lstat (); - - /* Arrange to make lstat calls go through the wrapper function - on systems with an lstat function that does not dereference symlinks ---- ./src/du.c.orig Wed May 1 12:29:29 2002 -+++ ./src/du.c Wed May 1 12:29:32 2002 -@@ -108,7 +108,6 @@ - typedef struct String String; - - int stat (); --int lstat (); - - /* Name under which this program was invoked. */ - char *program_name; ---- ./src/mv.c.orig Wed May 1 12:29:43 2002 -+++ ./src/mv.c Wed May 1 12:29:46 2002 -@@ -58,7 +58,6 @@ - int euidaccess (); - int full_write (); - int isdir (); --int lstat (); - int yesno (); - - /* The name this program was run with. */ ---- ./src/shred.c.orig Wed May 1 12:30:24 2002 -+++ ./src/shred.c Wed May 1 12:30:35 2002 -@@ -889,7 +889,7 @@ - #else - # if HAVE_CLOCK_GETTIME /* POSIX ns-resolution */ - struct timespec t; -- clock_gettime (CLOCK_REALTIME, &t); -+ clock_gettime (0, &t); - # else - # if HAVE_GETTIMEOFDAY - struct timeval t; ---- ./configure.orig Wed May 1 12:19:36 2002 -+++ ./configure Wed May 1 12:24:49 2002 -@@ -1,4 +1,14 @@ - #! /bin/sh -+ -+# disable some headers -+# -+ac_cv_header_wchar_h=no -+ac_cv_header_wctype_h=no -+ac_cv_header_utmpx_h=no -+ac_cv_header_sys_statfs_h=no -+ac_cv_header_sys_statvfs_h=no -+ac_cv_header_stdbool_h=no -+ - # Guess values for system-dependent variables and create Makefiles. - # Generated by Autoconf 2.49e. - # ---- ./config.h.in.orig Sun Apr 22 12:19:08 2001 -+++ ./config.h.in Wed May 1 12:23:06 2002 -@@ -1050,10 +1050,6 @@ - /* Number of bits in a file offset, on hosts where this is settable. */ - #undef _FILE_OFFSET_BITS - --#ifndef _GNU_SOURCE --# define _GNU_SOURCE --#endif -- - /* Define for large files, on AIX-style hosts. */ - #undef _LARGE_FILES - ---- ./src/rmdir.c.orig 2002-10-09 12:22:49.000000000 +0200 -+++ ./src/rmdir.c 2002-10-09 12:24:56.000000000 +0200 -@@ -87,7 +87,7 @@ - static int - errno_rmdir_non_empty (int error_number) - { -- return (error_number == RMDIR_ERRNO_NOT_EMPTY); -+ return error_number == ENOTEMPTY; - } - - /* Remove any empty parent directories of PATH. diff --git a/package/base/dietlibc/pkg_patch/pkg_sh-utils.patch-x b/package/base/dietlibc/pkg_patch/pkg_sh-utils.patch-x deleted file mode 100644 index 7eced9ca3..000000000 --- a/package/base/dietlibc/pkg_patch/pkg_sh-utils.patch-x +++ /dev/null @@ -1,65 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/base/dietlibc/pkg_patch/pkg_sh-utils.patch-x -# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./lib/getline.c.orig Wed May 1 12:05:24 2002 -+++ ./lib/getline.c Wed May 1 12:05:24 2002 -@@ -22,10 +22,8 @@ - # include - #endif - --/* The `getdelim' function is only declared if the following symbol -- is defined. */ --#ifndef _GNU_SOURCE --# define _GNU_SOURCE 1 -+#ifdef _GNU_SOURCE -+# undef _GNU_SOURCE - #endif - - #include ---- ./lib/getline.h.orig Thu May 13 22:51:26 1999 -+++ ./lib/getline.h Wed May 1 12:05:24 2002 -@@ -17,6 +17,10 @@ - #ifndef GETLINE_H_ - # define GETLINE_H_ 1 - -+#ifdef _GNU_SOURCE -+# undef _GNU_SOURCE -+#endif -+ - # include - - # ifndef PARAMS ---- ./config.h.in.orig Wed May 1 12:10:17 2002 -+++ ./config.h.in Wed May 1 12:10:36 2002 -@@ -123,12 +123,6 @@ - byte first (like Motorola and SPARC, unlike Intel and VAX). */ - #undef WORDS_BIGENDIAN - --/* This is always defined. It enables GNU extensions on systems that -- have them. */ --#ifndef _GNU_SOURCE --# undef _GNU_SOURCE --#endif -- - /* Define if your system's definition of `struct termios' has a member - named c_line. */ - #undef HAVE_C_LINE diff --git a/package/base/dietlibc/pkg_patch/pkg_textutils.patch-x b/package/base/dietlibc/pkg_patch/pkg_textutils.patch-x deleted file mode 100644 index 04f47310a..000000000 --- a/package/base/dietlibc/pkg_patch/pkg_textutils.patch-x +++ /dev/null @@ -1,97 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/base/dietlibc/pkg_patch/pkg_textutils.patch-x -# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./lib/getline.c.orig Wed May 1 12:32:27 2002 -+++ ./lib/getline.c Wed May 1 12:35:45 2002 -@@ -22,10 +22,8 @@ - # include - #endif - --/* The `getdelim' function is only declared if the following symbol -- is defined. */ --#ifndef _GNU_SOURCE --# define _GNU_SOURCE 1 -+#ifdef _GNU_SOURCE -+# undef _GNU_SOURCE - #endif - - #include ---- ./lib/getline.h.orig Thu May 13 22:51:21 1999 -+++ ./lib/getline.h Wed May 1 12:35:45 2002 -@@ -17,6 +17,10 @@ - #ifndef GETLINE_H_ - # define GETLINE_H_ 1 - -+#ifdef _GNU_SOURCE -+# undef _GNU_SOURCE -+#endif -+ - # include - - # ifndef PARAMS ---- ./src/paste.c.orig Wed May 1 12:40:33 2002 -+++ ./src/paste.c Wed May 1 12:40:47 2002 -@@ -54,11 +54,11 @@ - /* Indicates that no delimiter should be added in the current position. */ - #define EMPTY_DELIM '\0' - --static FILE dummy_closed; -+static int dummy_closed; - /* Element marking a file that has reached EOF and been closed. */ - #define CLOSED (&dummy_closed) - --static FILE dummy_endlist; -+static int dummy_endlist; - /* Element marking end of list of open files. */ - #define ENDLIST (&dummy_endlist) - ---- ./config.hin.orig 2002-10-09 12:42:20.000000000 +0200 -+++ ./config.hin 2002-10-09 12:42:28.000000000 +0200 -@@ -1269,11 +1269,6 @@ - /* Number of bits in a file offset, on hosts where this is settable. */ - #undef _FILE_OFFSET_BITS - --/* Enable GNU extensions on systems that have them. */ --#ifndef _GNU_SOURCE --# undef _GNU_SOURCE --#endif -- - /* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */ - #undef _LARGEFILE_SOURCE - ---- ./src/sys2.h.orig 2002-10-09 13:03:20.000000000 +0200 -+++ ./src/sys2.h 2002-10-09 13:06:06.000000000 +0200 -@@ -264,6 +264,14 @@ - # include /* for the definition of UINTMAX_MAX */ - #endif - -+#ifdef __CHAR_UNSIGNED__ -+# define CHAR_MIN 0 -+# define CHAR_MAX UCHAR_MAX -+#else -+# define CHAR_MIN SCHAR_MIN -+# define CHAR_MAX SCHAR_MAX -+#endif -+ - #include - - /* Jim Meyering writes: diff --git a/package/base/man/pl-nlu-10-fix.patch-x b/package/base/man/pl-nlu-10-fix.patch-x deleted file mode 100644 index d7ef178db..000000000 --- a/package/base/man/pl-nlu-10-fix.patch-x +++ /dev/null @@ -1,33 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/base/man/pl-nlu-10-fix.patch-x -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./src/man.c.orig Wed Jun 6 00:01:47 2001 -+++ ./src/man.c Mon Jun 11 00:25:27 2001 -@@ -514,7 +514,7 @@ - the current position plus 10 lines. This plus setpl() - gives us a single page that just contains the whole - man page. (William Webber, wew@cs.rmit.edu.au) */ -- strcat(buft, "; echo; echo \".pl \\n(nlu+10\""); -+ strcat(buft, "; echo; echo \".pl (n;lu+10\""); - #if 0 - /* In case this doesnt work for some reason, - michaelkjohnson suggests: I've got a simple diff --git a/package/be-el/sge/linux.patch-x b/package/be-el/sge/linux.patch-x deleted file mode 100644 index 78a9fbc20..000000000 --- a/package/be-el/sge/linux.patch-x +++ /dev/null @@ -1,15 +0,0 @@ ---- ./aimk.orig 2003-05-11 16:52:24.000000000 +0200 -+++ ./aimk 2003-05-11 16:53:18.000000000 +0200 -@@ -1172,6 +1172,12 @@ - set CFLAGS = "-DHAS_IN_PORT_T $CFLAGS" - endif - -+ strings /lib/libc.so.6 | grep "GNU C Library" | grep 2.3 >& /dev/null -+ if ( $status == 0 ) then -+ set CFLAGS = "-DHAS_IN_PORT_T $CFLAGS" -+ endif -+ -+ - set COMPILE_DC = 1 - if ( $USE_QMAKE == 0 ) then - set MAKE = make diff --git a/package/jsaw/epplets-extra16/e-apm.patch-x b/package/jsaw/epplets-extra16/e-apm.patch-x deleted file mode 100644 index 6d6c6b212..000000000 --- a/package/jsaw/epplets-extra16/e-apm.patch-x +++ /dev/null @@ -1,10 +0,0 @@ ---- eApm-0.2/COMPILE.orig-rock-maint 2003-08-29 08:43:25.000000000 +0200 -+++ eApm-0.2/COMPILE 2003-08-29 09:06:12.000000000 +0200 -@@ -1,6 +1,6 @@ - #!/bin/sh - echo "You will get some warnings... it's ok. Read the README" --g++ eApm.cpp epplet.c -o eApm.epplet -O2 `imlib-config --libs` `imlib-config --cflags` -+g++ eApm.cpp epplet.c -o eApm.epplet -O2 `imlib-config --libs` `imlib-config --cflags` -I$E16/include -L$E16/lib -lepplet - cp -f eApm.epplet $EBIN/eApm.epplet - chmod a+x $EBIN/eApm.epplet - diff --git a/package/jsaw/epplets-extra16/e-playcd.patch-x b/package/jsaw/epplets-extra16/e-playcd.patch-x deleted file mode 100644 index 875fc34fd..000000000 --- a/package/jsaw/epplets-extra16/e-playcd.patch-x +++ /dev/null @@ -1,10 +0,0 @@ ---- E-PlayCD/COMPILE.orig-rock-maint 2003-08-29 08:40:36.000000000 +0200 -+++ E-PlayCD/COMPILE 2003-08-29 09:04:53.000000000 +0200 -@@ -1,6 +1,6 @@ - #!/bin/sh - --cc eplaycd.c -o E-PlayCD.epplet -ggdb -O3 `imlib-config --libs` `imlib-config --cflags` -lcdaudio -lepplet -+$CC $CFLAGS eplaycd.c -o E-PlayCD.epplet -O3 `imlib-config --libs` `imlib-config --cflags` -lcdaudio -L$E16/libs -lepplet - cp -f E-PlayCD.epplet $EBIN/E-PlayCD.epplet - chmod a+x $EBIN/E-PlayCD.epplet -