[Glibc-bsd-commits] r1662 - in trunk/web/patches: . upstream-only
Petr Salinger
ps-guest at costa.debian.org
Mon Sep 25 19:48:49 UTC 2006
Author: ps-guest
Date: 2006-09-25 19:48:49 +0000 (Mon, 25 Sep 2006)
New Revision: 1662
Removed:
trunk/web/patches/gcc-3.3.diff
trunk/web/patches/libggi.diff
trunk/web/patches/nas.diff
trunk/web/patches/upstream-only/mgetty-1.1.33.diff
Log:
* again drop obsolete patches
Deleted: trunk/web/patches/gcc-3.3.diff
===================================================================
--- trunk/web/patches/gcc-3.3.diff 2006-09-25 18:55:28 UTC (rev 1661)
+++ trunk/web/patches/gcc-3.3.diff 2006-09-25 19:48:49 UTC (rev 1662)
@@ -1,71 +0,0 @@
-Author: aurel32
-Status: in BTS
-
-diff -u gcc-3.3-3.3.6/debian/patches/kbsd-gnu.dpatch gcc-3.3-3.3.6/debian/patches/kbsd-gnu.dpatch
---- gcc-3.3-3.3.6/debian/patches/kbsd-gnu.dpatch
-+++ gcc-3.3-3.3.6/debian/patches/kbsd-gnu.dpatch
-@@ -91,7 +91,7 @@
- diff -Nur gcc-3.3.6.orig/gcc/config/i386/kfreebsd-gnu.h gcc-3.3.6/gcc/config/i386/kfreebsd-gnu.h
- --- gcc-3.3.6.orig/gcc/config/i386/kfreebsd-gnu.h 1970-01-01 01:00:00.000000000 +0100
- +++ gcc-3.3.6/gcc/config/i386/kfreebsd-gnu.h 2005-07-18 01:53:05.000000000 +0200
--@@ -0,0 +1,26 @@
-+@@ -0,0 +1,45 @@
- +/* Definitions for Intel 386 running kFreeBSD-based GNU systems with ELF format
- + Copyright (C) 2004
- + Free Software Foundation, Inc.
-@@ -118,6 +118,25 @@
- +#define LINK_EMULATION "elf_i386_fbsd"
- +#undef REG_NAME
- +#define REG_NAME(reg) sc_ ## reg
-++
-++#undef TARGET_OS_CPP_BUILTINS
-++#define TARGET_OS_CPP_BUILTINS() \
-++ do \
-++ { \
-++ builtin_define ("__FreeBSD_kernel__"); \
-++ builtin_define ("__GLIBC__"); \
-++ builtin_define_std ("unix"); \
-++ builtin_define ("__ELF__"); \
-++ builtin_assert ("system=unix"); \
-++ builtin_assert ("system=posix"); \
-++ if (flag_pic) \
-++ { \
-++ builtin_define ("__PIC__"); \
-++ builtin_define ("__pic__"); \
-++ } \
-++ } \
-++ while (0)
-++
- diff -Nur gcc-3.3.6.orig/gcc/config/i386/knetbsd-gnu.h gcc-3.3.6/gcc/config/i386/knetbsd-gnu.h
- --- gcc-3.3.6.orig/gcc/config/i386/knetbsd-gnu.h 1970-01-01 01:00:00.000000000 +0100
- +++ gcc-3.3.6/gcc/config/i386/knetbsd-gnu.h 2005-07-18 01:53:05.000000000 +0200
-@@ -251,7 +270,7 @@
- diff -Nur gcc-3.3.6.orig/gcc/config/kfreebsd-gnu.h gcc-3.3.6/gcc/config/kfreebsd-gnu.h
- --- gcc-3.3.6.orig/gcc/config/kfreebsd-gnu.h 1970-01-01 01:00:00.000000000 +0100
- +++ gcc-3.3.6/gcc/config/kfreebsd-gnu.h 2005-07-18 01:54:10.000000000 +0200
--@@ -0,0 +1,37 @@
-+@@ -0,0 +1,24 @@
- +/* Definitions for kFreeBSD-based GNU systems with ELF format
- + Copyright (C) 2004
- + Free Software Foundation, Inc.
-@@ -274,19 +293,6 @@
- +the Free Software Foundation, 59 Temple Place - Suite 330,
- +Boston, MA 02111-1307, USA. */
- +
--+#undef TARGET_OS_CPP_BUILTINS
--+#define TARGET_OS_CPP_BUILTINS() \
--+ do \
--+ { \
--+ builtin_define ("__FreeBSD_kernel__"); \
--+ builtin_define ("__GLIBC__"); \
--+ builtin_define_std ("unix"); \
--+ builtin_define ("__ELF__"); \
--+ builtin_assert ("system=unix"); \
--+ builtin_assert ("system=posix"); \
--+ } \
--+ while (0)
--+
- +#undef DYNAMIC_LINKER
- +#define DYNAMIC_LINKER "/lib/ld.so.1"
- diff -Nur gcc-3.3.6.orig/gcc/config/knetbsd-gnu.h gcc-3.3.6/gcc/config/knetbsd-gnu.h
-
Deleted: trunk/web/patches/libggi.diff
===================================================================
--- trunk/web/patches/libggi.diff 2006-09-25 18:55:28 UTC (rev 1661)
+++ trunk/web/patches/libggi.diff 2006-09-25 19:48:49 UTC (rev 1662)
@@ -1,99 +0,0 @@
-Author: aurel32
-Status: ugly
-
-diff -u libggi-2.0.5/debian/control libggi-2.0.5/debian/control
---- libggi-2.0.5/debian/control
-+++ libggi-2.0.5/debian/control
-@@ -151,28 +151,6 @@
- text-mode target using the "monotext" target.) Output is displayed in
- a terminal-independent fashion using the "ncurses" library.
-
--Package: libggi-target-fbdev
--Architecture: any
--Section: libs
--Priority: optional
--Depends: ${shlibs:Depends}, makedev (>= 2.3.1-24) | devfsd
--Provides: libggi-target
--Conflicts: libggi2 (<< 1:2.0.1+)
--Replaces: libggi2 (<< 1:2.0.1+)
--Enhances: libggi2
--Description: General Graphics Interface direct access framebuffer target
-- "General Graphics Interface" - a fast, portable graphics environment.
-- .
-- This package contains the driver for the "fbdev" target, enabling
-- libGGI (and therefore any program using libGGI) to display its output
-- on the kernel framebuffer device. The framebuffer device is the usual
-- means of displaying graphics on most non-i386 architectures, and, for
-- i386, kernels from the stable 2.2 kernel series on contain a working i386
-- framebuffer device.
-- .
-- Installation of libdirectfb is recommended for accellerated drawing on
-- supported graphic cards.
--
- Package: libggi-target-x
- Architecture: any
- Section: libs
-diff -u libggi-2.0.5/debian/rules libggi-2.0.5/debian/rules
---- libggi-2.0.5/debian/rules
-+++ libggi-2.0.5/debian/rules
-@@ -46,7 +46,6 @@
- taapkg=$(baspkg)-target-aa
- tmtpkg=$(baspkg)-target-monotext
- tvcpkg=$(baspkg)-target-vcsa
--tfbpkg=$(baspkg)-target-fbdev
- ttipkg=$(baspkg)-target-terminfo
- tgdpkg=$(baspkg)-target-glide
- tsvpkg=$(baspkg)-target-svgalib
-@@ -92,19 +91,13 @@
- cp display/trueemu/README $(INSTDIR)/README.trueemu; \
- cp display/monotext/README $(INSTDIR)/README.monotext; \
- cp display/X/README $(INSTDIR)/README.X; \
-- cp default/fbdev/ati/mach64/README $(INSTDIR)/README.mach64; \
- cp programs/demos/.libs/flying_ggis $(INSTDIR)/usr/bin/ggi-flying_ggis; \
- cp programs/demos/.libs/demo $(INSTDIR)/usr/bin/ggi-demo; \
- cd $(INSTDIR)/usr; \
- mv bin/cube3d bin/ggi-cube3d; \
- mv bin/monitest bin/ggi-monitest; \
- mv share/man/man1/cube3d.1 share/man/man1/ggi-cube3d.1; \
-- mv share/man/man1/monitest.1 share/man/man1/ggi-monitest.1; \
-- \
-- cd $(INSTDIR)/etc/ggi/targets; \
-- mv fbdev.conf fbdev.conf-unhacked; \
-- sed -e '/directfb/ s/^/#/' <fbdev.conf-unhacked >fbdev.conf; \
-- rm fbdev.conf-unhacked; )
-+ mv share/man/man1/monitest.1 share/man/man1/ggi-monitest.1; )
-
-
- # Build architecture-independent files here.
-@@ -120,17 +113,12 @@
- usr/lib/*.so usr/lib/*.la \
- usr/lib/ggi/display/*.la \
- usr/lib/ggi/helper/*.la \
-- usr/lib/ggi/default/*.la \
-- usr/lib/ggi/default/fbdev/*/*.la
-+ usr/lib/ggi/default/*.la
- dh_movefiles -p$(emupkg) usr/lib/ggi/display/*emu.*
- dh_movefiles -p$(taapkg) usr/lib/ggi/display/aa.*
- dh_movefiles -p$(tmtpkg) usr/lib/ggi/display/monotext.*
- dh_movefiles -p$(ttipkg) usr/lib/ggi/display/terminfo.*
- dh_movefiles -p$(tvcpkg) usr/lib/ggi/display/vcsa.*
-- dh_movefiles -p$(tfbpkg) usr/lib/ggi/display/fbdev.* \
-- usr/lib/ggi/display/linvtsw.* \
-- usr/lib/ggi/default/fbdev/*/*.so\
-- etc/ggi/targets/fbdev.conf
- dh_movefiles -p$(tgdpkg) usr/lib/ggi/display/glide.*
- dh_movefiles -p$(tsvpkg) usr/lib/ggi/display/vgagl.* \
- usr/lib/ggi/display/svgalib*.*
-@@ -166,11 +154,10 @@
- dh_link -p$(devpkg) usr/share/doc/$(libpkg) \
- usr/share/doc/$(devpkg)
- # dh_installdebconf
-- dh_installdocs -N$(smppkg) -N$(emupkg) -N$(tmtpkg) -N$(tfbpkg) -N$(txxpkg)
-+ dh_installdocs -N$(smppkg) -N$(emupkg) -N$(tmtpkg) -N$(txxpkg)
- dh_installdocs -p$(smppkg) debian/README.samples
- dh_installdocs -p$(emupkg) debian/tmp/README.*emu
- dh_installdocs -p$(tmtpkg) debian/tmp/README.monotext
-- dh_installdocs -p$(tfbpkg) debian/tmp/README.mach64
- dh_installdocs -p$(txxpkg) debian/tmp/README.X
- dh_installexamples -p$(smppkg) programs/demos/*.c programs/util/*.c
- dh_installmenu
Deleted: trunk/web/patches/nas.diff
===================================================================
--- trunk/web/patches/nas.diff 2006-09-25 18:55:28 UTC (rev 1661)
+++ trunk/web/patches/nas.diff 2006-09-25 19:48:49 UTC (rev 1662)
@@ -1,29 +0,0 @@
-Author: aurel32
-Status: in BTS
-
-diff -u nas-1.7/server/Imakefile nas-1.7/server/Imakefile
---- nas-1.7/server/Imakefile
-+++ nas-1.7/server/Imakefile
-@@ -99,7 +99,7 @@
- #endif
-
-
--#if defined(i386SVR4Architecture) || defined(__FreeBSD__) || defined(FreeBSDArchitecture) || defined(LinuxArchitecture) || defined(GNUArchitecture) || defined(i386BsdArchitecture) || defined(USLArchitecture) || defined(cygwinArchitecture)
-+#if defined(i386SVR4Architecture) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(FreeBSDArchitecture) || defined(LinuxArchitecture) || defined(GNUArchitecture) || defined(i386BsdArchitecture) || defined(USLArchitecture) || defined(cygwinArchitecture)
- # define CanBuildAuServer YES
-
- # if defined(LinuxArchitecture) || defined(GNUArchitecture) || defined(GNUMachArchitecture)
-diff -u nas-1.7/debian/rules nas-1.7/debian/rules
---- nas-1.7/debian/rules
-+++ nas-1.7/debian/rules
-@@ -16,10 +16,6 @@
- endif
- allpacs=nas-doc
-
--ifneq (, $(filter $(DEB_BUILD_GNU_SYSTEM),kfreebsd-gnu knetbsd-gnu))
--DEB_BUILD_GNU_TYPE = $(DEB_BUILD_GNU_CPU)-gnu
--endif
--
- build:
- # Make include symlinks
- ( cd include/audio; for file in ../../lib/audio/*.h; do ln -s $$file .; done )
Deleted: trunk/web/patches/upstream-only/mgetty-1.1.33.diff
===================================================================
--- trunk/web/patches/upstream-only/mgetty-1.1.33.diff 2006-09-25 18:55:28 UTC (rev 1661)
+++ trunk/web/patches/upstream-only/mgetty-1.1.33.diff 2006-09-25 19:48:49 UTC (rev 1662)
@@ -1,48 +0,0 @@
-diff -uNr mgetty-1.1.33.old/logfile.c mgetty-1.1.33.new/logfile.c
---- mgetty-1.1.33.old/logfile.c 2005-11-09 10:26:41.000000000 +0100
-+++ mgetty-1.1.33.new/logfile.c 2005-11-09 10:32:35.000000000 +0100
-@@ -25,7 +25,7 @@
- #include <syslog.h>
-
- #if !defined(linux) && !defined(BSD) && !defined(_SCO_DS) && \
-- !defined(SVR42) && !defined(solaris2) && !defined(_AIX)
-+ !defined(SVR42) && !defined(solaris2) && !defined(_AIX) && !defined(__GLIBC__)
- int openlog _PROTO(( char *, int, int ));
- int syslog _PROTO(( int, char *, ... ));
- #endif
-diff -uNr mgetty-1.1.33.old/mgetty.h mgetty-1.1.33.new/mgetty.h
---- mgetty-1.1.33.old/mgetty.h 2005-11-09 10:26:41.000000000 +0100
-+++ mgetty-1.1.33.new/mgetty.h 2005-11-09 10:28:50.000000000 +0100
-@@ -313,7 +313,7 @@
- extern char * mktemp _PROTO(( char * template ));
-
- #if !defined(linux) && !defined(SVR4) && !defined(__hpux) && \
-- !defined(BSD) && !defined(M_UNIX) && !defined(_AIX)
-+ !defined(BSD) && !defined(M_UNIX) && !defined(_AIX) && !defined(__GLIBC__)
- extern int getopt _PROTO(( int, char **, char * ));
- #endif
- extern int optind;
-diff -uNr mgetty-1.1.33.old/tio.c mgetty-1.1.33.new/tio.c
---- mgetty-1.1.33.old/tio.c 2005-11-09 10:26:41.000000000 +0100
-+++ mgetty-1.1.33.new/tio.c 2005-11-09 10:34:02.000000000 +0100
-@@ -45,7 +45,7 @@
-
- /* some systems do not define all flags needed later, e.g. NetBSD */
-
--#ifdef BSD
-+#if defined(BSD) || defined(__FreeBSD_kernel__)
- # ifndef IUCLC
- # define IUCLC 0
- # endif
-diff -uNr mgetty-1.1.33.old/tio.h mgetty-1.1.33.new/tio.h
---- mgetty-1.1.33.old/tio.h 2005-11-09 10:26:41.000000000 +0100
-+++ mgetty-1.1.33.new/tio.h 2005-11-09 10:31:10.000000000 +0100
-@@ -18,7 +18,7 @@
- #if !defined( POSIX_TERMIOS ) && !defined( BSD_SGTTY ) && !defined( SYSV_TERMIO)
- # if defined(linux) || defined(sunos4) || defined(_AIX) || defined(BSD) || \
- defined(SVR4) || defined(solaris2) || defined(m88k) || defined(M_UNIX) ||\
-- defined(__sgi)
-+ defined(__sgi) || defined(__GLIBC__)
- # define POSIX_TERMIOS
- # else
- # define SYSV_TERMIO
More information about the Glibc-bsd-commits
mailing list