[Glibc-bsd-commits] r2308 - trunk/web/patches
ps-guest at alioth.debian.org
ps-guest at alioth.debian.org
Wed Aug 20 15:45:34 UTC 2008
Author: ps-guest
Date: 2008-08-20 15:45:33 +0000 (Wed, 20 Aug 2008)
New Revision: 2308
Removed:
trunk/web/patches/kdeadmin.diff
trunk/web/patches/kdeedu.diff
trunk/web/patches/kdemultimedia.diff
trunk/web/patches/kdenetwork.diff
trunk/web/patches/kdepim.diff
trunk/web/patches/kdesdk.diff
trunk/web/patches/kdeutils.diff
trunk/web/patches/libpcap0.8.diff
trunk/web/patches/x86info.diff
Log:
* drop obsolete patches
Deleted: trunk/web/patches/kdeadmin.diff
===================================================================
--- trunk/web/patches/kdeadmin.diff 2008-08-20 15:39:54 UTC (rev 2307)
+++ trunk/web/patches/kdeadmin.diff 2008-08-20 15:45:33 UTC (rev 2308)
@@ -1,71 +0,0 @@
-Author: aurel32
-Status: ugly, don't merge! We need the new dpkg to make it cleaner
-
-diff -u kdeadmin-3.4.2/debian/control kdeadmin-3.4.2/debian/control
---- kdeadmin-3.4.2/debian/control
-+++ kdeadmin-3.4.2/debian/control
-@@ -8,8 +8,8 @@
-
- Package: kdeadmin
- Section: kde
--Architecture: all
--Depends: kcron (>= ${Source-Version}), kdat (>= ${Source-Version}), kdeadmin-kfile-plugins (>= ${Source-Version}), kpackage (>= ${Source-Version}), ksysv (>= ${Source-Version}), kuser (>= ${Source-Version}), secpolicy (>= ${Source-Version})
-+Architecture: any
-+Depends: kcron (>= ${Source-Version}), ${kdat}, kdeadmin-kfile-plugins (>= ${Source-Version}), kpackage (>= ${Source-Version}), ksysv (>= ${Source-Version}), kuser (>= ${Source-Version}), secpolicy (>= ${Source-Version})
- Recommends: lilo-config (>= ${Source-Version})
- Suggests: kdeadmin-doc-html (>= ${Source-Version})
- Description: system adminstration tools from the official KDE release
-@@ -53,7 +53,7 @@
-
- Package: kdat
- Section: admin
--Architecture: any
-+Architecture: i386 ia64 alpha amd64 arm hppa m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc
- Depends: ${shlibs:Depends}
- Suggests: khelpcenter
- Description: a KDE tape backup tool
-diff -u kdeadmin-3.4.2/debian/rules kdeadmin-3.4.2/debian/rules
---- kdeadmin-3.4.2/debian/rules
-+++ kdeadmin-3.4.2/debian/rules
-@@ -10,0 +11,11 @@
-+
-+kdat (>= ${Source-Version})
-+
-+###
-+
-+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
-+
-+binary-predeb/kdeadmin::
-+ifeq (linux,$(DEB_HOST_ARCH_OS))
-+ echo "kdat=kdat (>= ${Source-Version})" >>debian/kdeadmin.substvars
-+endif
-only in patch2:
-unchanged:
---- kdeadmin-3.4.2.orig/debian/patches/02_kfreebsd.diff
-+++ kdeadmin-3.4.2/debian/patches/02_kfreebsd.diff
-@@ -0,0 +1,25 @@
-+#DPATCHLEVEL=0
-+--- configure.orig 2005-08-28 16:15:33.000000000 +0200
-++++ configure 2005-08-28 16:16:41.000000000 +0200
-+@@ -33309,6 +33309,7 @@
-+ echo "$as_me:$LINENO: checking if ksysv can be compiled" >&5
-+ echo $ECHO_N "checking if ksysv can be compiled... $ECHO_C" >&6
-+ case "$host" in
-++ *-*-*bsd-gnu) ksysv_compile=yes;;
-+ *-*-*bsd*) ksysv_compile=no;;
-+ *) ksysv_compile=yes;;
-+ esac
-+--- configure.in.orig 2005-08-28 16:15:29.000000000 +0200
-++++ configure.in 2005-08-28 16:16:17.000000000 +0200
-+@@ -99,9 +99,10 @@
-+ dnl FILE: ./ksysv/configure.in.in
-+ dnl =======================================================
-+
-+-dnl Disabled on BSD, where it doesn't apply
-++dnl Disabled on BSD, where it doesn't apply, except with a GNU userland
-+ AC_MSG_CHECKING(if ksysv can be compiled)
-+ case "$host" in
-++ *-*-*bsd-gnu) ksysv_compile=yes;;
-+ *-*-*bsd*) ksysv_compile=no;;
-+ *) ksysv_compile=yes;;
-+ esac
Deleted: trunk/web/patches/kdeedu.diff
===================================================================
--- trunk/web/patches/kdeedu.diff 2008-08-20 15:39:54 UTC (rev 2307)
+++ trunk/web/patches/kdeedu.diff 2008-08-20 15:45:33 UTC (rev 2308)
@@ -1,138 +0,0 @@
-Author: aurel32
-Status: in BTS
-
---- kdeedu-3.4.2.orig/debian/patches/kfreebsd.diff
-+++ kdeedu-3.4.2/debian/patches/kfreebsd.diff
-@@ -0,0 +1,104 @@
-+--- kdeedu/kstars/kstars/indi/fli/libfli-usb.h.orig 2005-09-02 11:29:44.000000000 +0200
-++++ kdeedu/kstars/kstars/indi/fli/libfli-usb.h 2005-09-02 11:30:09.000000000 +0200
-+@@ -50,7 +50,7 @@
-+ #define unix_bulkwrite linux_bulkwrite
-+ #define unix_bulkread linux_bulkread
-+
-+-#elif defined(__FreeBSD__) || defined(__NetBSD__)
-++#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
-+ #define unix_bulkwrite bsd_bulkwrite
-+ #define unix_bulkread bsd_bulkread
-+
-+--- kdeedu/kstars/kstars/indi/fli/libfli-sys.h.orig 2005-09-02 11:29:32.000000000 +0200
-++++ kdeedu/kstars/kstars/indi/fli/libfli-sys.h 2005-09-02 11:26:05.000000000 +0200
-+@@ -58,7 +58,7 @@
-+ #define USB_GLOB "/proc/bus/usb/*/*"
-+ #define SERIAL_GLOB "/dev/ttyS[0-9]*"
-+
-+-#elif defined(__FreeBSD__)
-++#elif defined(__FreeBSD__) || defined (__FreeBSD_kernel__)
-+ // FIXME - this does not actually work on OSX
-+
-+ #define __SYSNAME__ "FreeBSD"
-+--- kdeedu/admin/libtool.m4.in.orig 23 Mar 2005 16:07:03 -0000 1.86
-++++ kdeedu/admin/libtool.m4.in 13 Apr 2005 05:18:05 -0000
-+@@ -1273,7 +1273,7 @@ freebsd1*)
-+ dynamic_linker=no
-+ ;;
-+
-+-freebsd*-gnu*)
-++kfreebsd*-gnu*)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+@@ -2119,7 +2119,7 @@ darwin* | rhapsody*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+
-+-freebsd*)
-++freebsd* | kfreebsd*-gnu)
-+ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-+ case $host_cpu in
-+ i*86 )
-+@@ -2953,7 +2953,7 @@ case $host_os in
-+ freebsd-elf*)
-+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-+ ;;
-+- freebsd*)
-++ freebsd* | kfreebsd*-gnu)
-+ # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-+ # conventions
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-+@@ -4599,7 +4599,7 @@ AC_MSG_CHECKING([for $compiler option to
-+ ;;
-+ esac
-+ ;;
-+- freebsd*)
-++ freebsd* | kfreebsd*-gnu)
-+ # FreeBSD uses GNU C++
-+ ;;
-+ hpux9* | hpux10* | hpux11*)
-+@@ -5409,7 +5409,7 @@ EOF
-+ ;;
-+
-+ # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-+- freebsd*)
-++ freebsd* | kfreebsd*-gnu)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+--- kdeedu/admin/ltmain.sh.orig 12 Dec 2004 19:19:25 -0000 1.67
-++++ kdeedu/admin/ltmain.sh 13 Apr 2005 05:18:05 -0000
-+@@ -1276,9 +1276,6 @@ EOF
-+ # These systems don't actually have a C or math library (as such)
-+ continue
-+ ;;
-+- *-*-freebsd*-gnu*)
-+- # prevent being parsed by the freebsd regexp below
-+- ;;
-+ *-*-mingw* | *-*-os2*)
-+ # These systems don't actually have a C library (as such)
-+ test "X$arg" = "X-lc" && continue
-+@@ -1294,9 +1291,6 @@ EOF
-+ esac
-+ elif test "X$arg" = "X-lc_r"; then
-+ case $host in
-+- *-*-freebsd*-gnu*)
-+- # prevent being parsed by the freebsd regexp below
-+- ;;
-+ *-*-openbsd*)
-+ # Do not include libc_r directly, use -pthread flag.
-+ continue
-+@@ -3181,12 +3175,6 @@ EOF
-+ *-*-netbsd*)
-+ # Don't link with libc until the a.out ld.so is fixed.
-+ ;;
-+- *-*-freebsd*-gnu*)
-+- # Prevent $arg from being parsed by the freebsd regexp below.
-+- if test "$build_libtool_need_lc" = "yes"; then
-+- deplibs="$deplibs -lc"
-+- fi
-+- ;;
-+ *-*-openbsd* | *-*-freebsd*)
-+ # Do not include libc due to us having libc/libc_r.
-+ test "X$arg" = "X-lc" && continue
---- kdeedu-3.4.2.orig/debian/kstars.install.kfreebsd-i386
-+++ kdeedu-3.4.2/debian/kstars.install.kfreebsd-i386
-@@ -0,0 +1,25 @@
-+etc/kde3/kstarsrc
-+usr/bin/celestrongps
-+usr/bin/fliccd
-+usr/bin/indiserver
-+usr/bin/lx200_16
-+usr/bin/lx200autostar
-+usr/bin/lx200classic
-+usr/bin/lx200generic
-+usr/bin/lx200gps
-+usr/bin/kstars
-+usr/bin/temma
-+usr/include/kde/kstarsinterface.h
-+usr/include/kde/simclockinterface.h
-+usr/share/applications/kde/kstars.desktop
-+usr/share/config.kcfg/kstars.kcfg
-+usr/share/doc/kde/HTML/en/kstars/common
-+usr/share/doc/kde/HTML/en/kstars/index.cache.bz2
-+usr/share/doc/kde/HTML/en/kstars/*.docbook
-+usr/share/doc/kde/HTML/en/kstars/*.png
-+usr/share/icons/crystalsvg/16x16/apps/kstars.png
-+usr/share/icons/crystalsvg/32x32/apps/kstars.png
-+usr/share/icons/crystalsvg/48x48/apps/kstars.png
-+usr/share/icons/crystalsvg/128x128/apps/kstars.png
-+usr/share/icons/crystalsvg/scalable/apps/kstars.svgz
-+../kstars.xpm usr/share/pixmaps
Deleted: trunk/web/patches/kdemultimedia.diff
===================================================================
--- trunk/web/patches/kdemultimedia.diff 2008-08-20 15:39:54 UTC (rev 2307)
+++ trunk/web/patches/kdemultimedia.diff 2008-08-20 15:45:33 UTC (rev 2308)
@@ -1,182 +0,0 @@
-Author: aurel32
-Status: ugly, libbsd has to be fixed
- needs enhanced cdparanoia_3.10+debian~pre0-4, already built, but does not seem uploaded (may be binNMU of all packages using cdparanoia should be performed as it slightly changed ABI)
-
-diff -u kdemultimedia-3.5.5/debian/rules kdemultimedia-3.5.5/debian/rules
---- kdemultimedia-3.5.5/debian/rules
-+++ kdemultimedia-3.5.5/debian/rules
-@@ -6,11 +6,14 @@
- include /usr/share/cdbs/1/rules/utils.mk
-
- DEB_CONFIGURE_EXTRA_FLAGS := \
-- --with-alsa --with-arts-alsa \
- --with-extra-includes=/usr/include/speex:/usr/include/kde/arts
- # The include/kde/arts one should be temporary. See
- # "juk/Makefile.am: arts_includes vs ARTS_CFLAGS" in -talk.
-
-+ifeq (linux,$(DEB_HOST_ARCH_OS))
-+DEB_CONFIGURE_EXTRA_FLAGS += --with-alsa --with-arts-alsa
-+endif
-+
- DOC_HTML_PRUNE := kcontrol
-
- DEB_DH_STRIP_ARGS := --dbg-package=kdemultimedia-dbg
-only in patch2:
-unchanged:
---- kdemultimedia-3.5.5.orig/config.h.in
-+++ kdemultimedia-3.5.5/config.h.in
-@@ -406,13 +406,14 @@
- #endif
- #endif
-
-+#include <stddef.h>
-
-
- #if !defined(HAVE_STRLCAT_PROTO)
- #ifdef __cplusplus
- extern "C" {
- #endif
--unsigned long strlcat(char*, const char*, unsigned long);
-+size_t strlcat(char*, const char*, size_t);
- #ifdef __cplusplus
- }
- #endif
-@@ -424,7 +425,7 @@
- #ifdef __cplusplus
- extern "C" {
- #endif
--unsigned long strlcpy(char*, const char*, unsigned long);
-+size_t strlcpy(char*, const char*, size_t);
- #ifdef __cplusplus
- }
- #endif
-only in patch2:
-unchanged:
---- kdemultimedia-3.5.5.orig/debian/patches/13_kfreebsd.patch
-+++ kdemultimedia-3.5.5/debian/patches/13_kfreebsd.patch
-@@ -0,0 +1,125 @@
-+--- kde.orig/kscd/kscdmagic/sound.cpp 2005-09-05 02:02:29.000000000 +0200
-++++ kde.patched/kscd/kscdmagic/sound.cpp 2005-09-05 02:03:33.000000000 +0200
-+@@ -102,7 +102,7 @@
-+
-+ int format, stereo, fragment, fqc;
-+
-+-#ifdef __FreeBSD__
-++#if defined (__FreeBSD__) || defined(__FreeBSD_kernel__)
-+ attempt(device = open(dspName,O_WRONLY),"opening dsp device",true);
-+ format = SOUNDFORMAT;
-+ attempt(ioctl(device,SNDCTL_DSP_SETFMT,&format),"setting format",true);
-+@@ -143,7 +143,7 @@
-+ //Was 0x00010000 + m;
-+
-+ attemptNoDie(ioctl(device,SNDCTL_DSP_SETFRAGMENT,&fragment),"setting fragment",true);
-+-#ifndef __FreeBSD__
-++#if ! defined(__FreeBSD__) && ! defined(__FreeBSD_kernel__)
-+ attempt(ioctl(device,SNDCTL_DSP_SETFMT,&format),"setting format",true);
-+ if (format != SOUNDFORMAT) error("setting format (2)");
-+ #endif
-+--- kde.orig/kscd/libwm/include/wm_config.h 2005-09-05 08:34:47.000000000 +0200
-++++ kde.patched/kscd/libwm/include/wm_config.h 2005-09-05 08:35:44.000000000 +0200
-+@@ -129,9 +129,9 @@
-+ *** ****** ** ** ****** ****** ** ****** ** * **********
-+ *** ****** ** ** ** ** **** *** ***********
-+ ******************************************************************/
-+-#if defined(__FreeBSD__) || defined(__FreeBSD)
-++#if defined(__FreeBSD__) || defined(__FreeBSD) || defined(__FreeBSD_kernel__)
-+
-+-#if __FreeBSD_version >= 500100
-++#if __FreeBSD_version >= 500100 || __FreeBSD_kernel_version >= 500100
-+ #define DEFAULT_CD_DEVICE "/dev/acd0"
-+ #else
-+ #define DEFAULT_CD_DEVICE "/dev/acd0c"
-+--- kde.orig/kscd/libwm/plat_freebsd.c 2005-09-05 08:37:39.000000000 +0200
-++++ kde.patched/kscd/libwm/plat_freebsd.c 2005-09-05 08:38:55.000000000 +0200
-+@@ -30,7 +30,7 @@
-+ *
-+ */
-+
-+-#if defined(__FreeBSD__) || defined(__FreeBSD) || defined(__NetBSD__) || defined (__NetBSD)
-++#if defined(__FreeBSD__) || defined(__FreeBSD) || defined(__NetBSD__) || defined (__NetBSD) || defined(__FreeBSD_kernel__)
-+
-+ #include <errno.h>
-+ #include <stdio.h>
-+@@ -61,7 +61,10 @@
-+ #else
-+ # define LEFT_PORT 0
-+ # define RIGHT_PORT 1
-+-# if __FreeBSD_version < 300000
-++#ifndef __FreeBSD_kernel_version
-++#define __FreeBSD_kernel_version __FreeBSD_version
-++#endif
-++# if __FreeBSD_kernel_version < 300000
-+ # include <scsi.h>
-+ # endif
-+ #endif
-+--- kde.orig/mpeglib/configure.in.in.orig 2005-09-05 08:42:19.000000000 +0200
-++++ kde.patched/mpeglib/configure.in.in 2005-09-05 08:42:38.000000000 +0200
-+@@ -211,6 +211,9 @@
-+ kde_mpeglib_compiles=no
-+
-+ case "$OS_TYPE" in
-++ GNU/kFreeBSD)
-++ kde_mpeglib_compiles=yes
-++ ;;
-+ FreeBSD)
-+ kde_mpeglib_compiles=yes
-+ ;;
-+--- kde.orig/configure.in.orig 2005-09-05 08:40:05.000000000 +0200
-++++ kde.patched/configure.in 2005-09-05 08:41:28.000000000 +0200
-+@@ -1923,6 +1923,9 @@
-+ kde_mpeglib_compiles=no
-+
-+ case "$OS_TYPE" in
-++ GNU/kFreeBSD)
-++ kde_mpeglib_compiles=yes
-++ ;;
-+ FreeBSD)
-+ kde_mpeglib_compiles=yes
-+ ;;
-+--- kde.orig/configure.orig 2005-09-05 08:40:08.000000000 +0200
-++++ kde.patched/configure 2005-09-05 08:42:02.000000000 +0200
-+@@ -42630,6 +42630,9 @@
-+ kde_mpeglib_compiles=no
-+
-+ case "$OS_TYPE" in
-++ GNU/kFreeBSD)
-++ kde_mpeglib_compiles=yes
-++ ;;
-+ FreeBSD)
-+ kde_mpeglib_compiles=yes
-+ ;;
-+--- kde.orig/configure 2005-09-05 09:35:31.000000000 +0200
-++++ kde.patched/configure 2005-09-05 09:36:44.000000000 +0200
-+@@ -42913,6 +42913,15 @@
-+
-+ ;;
-+
-++GNU/kFreeBSD)
-++ OS_TYPE="BSD"
-++
-++cat >>confdefs.h <<\_ACEOF
-++#define OS_BSD 1
-++_ACEOF
-++
-++ ;;
-++
-+ BSD/OS)
-+ OS_TYPE="BSD"
-+
-+--- kde.orig/configure.in 2005-09-05 09:35:26.000000000 +0200
-++++ kde.patched/configure.in 2005-09-05 09:36:27.000000000 +0200
-+@@ -1956,6 +1956,11 @@
-+ AC_DEFINE(OS_Linux,1,[Define if you have linux pthread])
-+ ;;
-+
-++ GNU/kFreeBSD)
-++ OS_TYPE="BSD"
-++ AC_DEFINE(OS_BSD,1,[Define if you have BSD pthread])
-++ ;;
-++
-+ FreeBSD)
-+ OS_TYPE="BSD"
-+ AC_DEFINE(OS_BSD,1,[Define if you have BSD pthread])
Deleted: trunk/web/patches/kdenetwork.diff
===================================================================
--- trunk/web/patches/kdenetwork.diff 2008-08-20 15:39:54 UTC (rev 2307)
+++ trunk/web/patches/kdenetwork.diff 2008-08-20 15:45:33 UTC (rev 2308)
@@ -1,45 +0,0 @@
-Author: aurel32
-Status: unclean, we need the new dpkg to make a cleaner patch
-
-diff -u kdenetwork-3.4.2/debian/control kdenetwork-3.4.2/debian/control
---- kdenetwork-3.4.2/debian/control
-+++ kdenetwork-3.4.2/debian/control
-@@ -3,13 +3,13 @@
- Priority: optional
- Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
- Uploaders: Isaac Clerencia <isaac at debian.org>, Pierre Habouzit <madcoder at debian.org>, Christopher Martin <chrsmrtn at freeshell.org>, Adeodato Simó <asp16 at alu.ua.es>, Riku Voipio <riku.voipio at iki.fi>, Luk Claes <luk at debian.org>
--Build-Depends: g++-3.4 [arm m68k hppa], cdbs (>= 0.4.27), debhelper (>= 4.2.30), autotools-dev, docbook-to-man, doxygen, gawk, gettext, kdelibs4-dev (>= 4:3.4.2), libgadu-dev, libiw-dev (>> 27+28pre8), libslp-dev, libtiff4-dev, libxml2-dev, libxslt1-dev, libxtst-dev, qt3-doc, sharutils, valgrind [i386], xmms-dev, libxxf86vm-dev
-+Build-Depends: g++-3.4 [arm m68k hppa], cdbs (>= 0.4.27), debhelper (>= 4.2.30), autotools-dev, docbook-to-man, doxygen, gawk, gettext, kdelibs4-dev (>= 4:3.4.2), libgadu-dev, libiw-dev (>> 27+28pre8) [i386 ia64 alpha amd64 arm hppa m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc], libslp-dev, libtiff4-dev, libxml2-dev, libxslt1-dev, libxtst-dev, qt3-doc, sharutils, valgrind [i386], xmms-dev, libxxf86vm-dev
- Standards-Version: 3.6.2
-
- Package: kdenetwork
- Section: kde
- Architecture: all
--Depends: dcoprss (>= ${Source-Version}), kdenetwork-kfile-plugins (>= ${Source-Version}), kdict (>= ${Source-Version}), kget (>= ${Source-Version}), knewsticker (>= ${Source-Version}), kopete (>= ${Source-Version}), kpf (>= ${Source-Version}), kppp (>= ${Source-Version}), krdc (>= ${Source-Version}), krfb (>= ${Source-Version}), ksirc (>= ${Source-Version}), kwifimanager (>= ${Source-Version}), librss1 (>= ${Source-Version})
-+Depends: dcoprss (>= ${Source-Version}), kdenetwork-kfile-plugins (>= ${Source-Version}), kdict (>= ${Source-Version}), kget (>= ${Source-Version}), knewsticker (>= ${Source-Version}), kopete (>= ${Source-Version}), kpf (>= ${Source-Version}), krdc (>= ${Source-Version}), krfb (>= ${Source-Version}), ksirc (>= ${Source-Version}), librss1 (>= ${Source-Version})
- Recommends: kdenetwork-filesharing (>= ${Source-Version}), ktalkd (>= ${Source-Version}), lisa (>= ${Source-Version})
- Suggests: kdenetwork-doc-html (>= ${Source-Version})
- Description: network-related apps from the official KDE release
-@@ -248,7 +248,7 @@
-
- Package: kwifimanager
- Section: net
--Architecture: any
-+Architecture: i386 ia64 alpha amd64 arm hppa m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc
- Depends: ${shlibs:Depends}
- Suggests: khelpcenter
- Description: wireless lan manager for KDE
---- kdenetwork-3.4.2.orig/debian/patches/14_kfreebsd.diff
-+++ kdenetwork-3.4.2/debian/patches/14_kfreebsd.diff
-@@ -0,0 +1,11 @@
-+--- kde.orig/krfb/libvncserver/rfb.h 2005-05-23 14:07:26.000000000 +0200
-++++ kde.patched/krfb/libvncserver/rfb.h 2005-08-30 21:58:54.000000000 +0200
-+@@ -60,7 +60,7 @@
-+
-+ #include "rfbproto.h"
-+
-+-#ifdef __linux__
-++#if defined(__linux__) || defined(__GLIBC__)
-+ #include <endian.h>
-+ #elif defined(__APPLE__) || defined(__FreeBSD__)
-+ #include <sys/types.h>
Deleted: trunk/web/patches/kdepim.diff
===================================================================
--- trunk/web/patches/kdepim.diff 2008-08-20 15:39:54 UTC (rev 2307)
+++ trunk/web/patches/kdepim.diff 2008-08-20 15:45:33 UTC (rev 2308)
@@ -1,12 +0,0 @@
-diff -u kdepim-3.4.2/debian/control kdepim-3.4.2/debian/control
---- kdepim-3.4.2/debian/control
-+++ kdepim-3.4.2/debian/control
-@@ -3,7 +3,7 @@
- Priority: optional
- Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
- Uploaders: Daniel Schepler <schepler at debian.org>
--Build-Depends: autoconf, automake1.9, bison, byacc, bzip2, cdbs (>= 0.4.27), debhelper (>= 4.2.21), flex, gawk, gettext, groff-base, kdelibs4-dev (>= 4:3.4.2), libbluetooth1-dev, libgnokii2-dev (>= 0.6.5), libgpgme11-dev, liblockdev1-dev, libmal-dev, libpisock-dev, libreadline5-dev, libsasl2-dev, libtool (>= 1.5), libxpm-dev, libxss-dev, sharutils, texinfo
-+Build-Depends: autoconf, automake1.9, bison, byacc, bzip2, cdbs (>= 0.4.27), debhelper (>= 4.2.21), flex, gawk, gettext, groff-base, kdelibs4-dev (>= 4:3.4.2), libbluetooth1-dev [!kfreebsd-i386], libgnokii2-dev (>= 0.6.5), libgpgme11-dev, liblockdev1-dev, libmal-dev, libpisock-dev, libreadline5-dev, libsasl2-dev, libtool (>= 1.5), libxpm-dev, libxss-dev, sharutils, texinfo
- Build-Depends-Indep: doxygen, qt3-doc, kdelibs4-doc
- Standards-Version: 3.6.2
-
Deleted: trunk/web/patches/kdesdk.diff
===================================================================
--- trunk/web/patches/kdesdk.diff 2008-08-20 15:39:54 UTC (rev 2307)
+++ trunk/web/patches/kdesdk.diff 2008-08-20 15:45:33 UTC (rev 2308)
@@ -1,88 +0,0 @@
-Author: aurel32
-Status: in BTS
-
---- kdesdk-3.4.2.orig/debian/patches/kfreebsd.diff
-+++ kdesdk-3.4.2/debian/patches/kfreebsd.diff
-@@ -0,0 +1,82 @@
-+--- kdesdk/admin/libtool.m4.in 23 Mar 2005 16:07:03 -0000
-++++ kdesdk/admin/libtool.m4.in 13 Apr 2005 05:18:05 -0000
-+@@ -1273,7 +1273,7 @@ freebsd1*)
-+ dynamic_linker=no
-+ ;;
-+
-+-freebsd*-gnu*)
-++kfreebsd*-gnu*)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+@@ -2119,7 +2119,7 @@ darwin* | rhapsody*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+
-+-freebsd*)
-++freebsd* | kfreebsd*-gnu)
-+ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-+ case $host_cpu in
-+ i*86 )
-+@@ -2953,7 +2953,7 @@ case $host_os in
-+ freebsd-elf*)
-+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-+ ;;
-+- freebsd*)
-++ freebsd* | kfreebsd*-gnu)
-+ # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-+ # conventions
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-+@@ -4599,7 +4599,7 @@ AC_MSG_CHECKING([for $compiler option to
-+ ;;
-+ esac
-+ ;;
-+- freebsd*)
-++ freebsd* | kfreebsd*-gnu)
-+ # FreeBSD uses GNU C++
-+ ;;
-+ hpux9* | hpux10* | hpux11*)
-+@@ -5409,7 +5409,7 @@ EOF
-+ ;;
-+
-+ # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-+- freebsd*)
-++ freebsd* | kfreebsd*-gnu)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+--- kdesdk/admin/ltmain.sh 12 Dec 2004 19:19:25 -0000
-++++ kdesdk/admin/ltmain.sh 13 Apr 2005 05:18:05 -0000
-+@@ -1276,9 +1276,6 @@ EOF
-+ # These systems don't actually have a C or math library (as such)
-+ continue
-+ ;;
-+- *-*-freebsd*-gnu*)
-+- # prevent being parsed by the freebsd regexp below
-+- ;;
-+ *-*-mingw* | *-*-os2*)
-+ # These systems don't actually have a C library (as such)
-+ test "X$arg" = "X-lc" && continue
-+@@ -1294,9 +1291,6 @@ EOF
-+ esac
-+ elif test "X$arg" = "X-lc_r"; then
-+ case $host in
-+- *-*-freebsd*-gnu*)
-+- # prevent being parsed by the freebsd regexp below
-+- ;;
-+ *-*-openbsd*)
-+ # Do not include libc_r directly, use -pthread flag.
-+ continue
-+@@ -3181,12 +3175,6 @@ EOF
-+ *-*-netbsd*)
-+ # Don't link with libc until the a.out ld.so is fixed.
-+ ;;
-+- *-*-freebsd*-gnu*)
-+- # Prevent $arg from being parsed by the freebsd regexp below.
-+- if test "$build_libtool_need_lc" = "yes"; then
-+- deplibs="$deplibs -lc"
-+- fi
-+- ;;
-+ *-*-openbsd* | *-*-freebsd*)
-+ # Do not include libc due to us having libc/libc_r.
-+ test "X$arg" = "X-lc" && continue
Deleted: trunk/web/patches/kdeutils.diff
===================================================================
--- trunk/web/patches/kdeutils.diff 2008-08-20 15:39:54 UTC (rev 2307)
+++ trunk/web/patches/kdeutils.diff 2008-08-20 15:45:33 UTC (rev 2308)
@@ -1,97 +0,0 @@
-diff -u kdeutils-3.4.3/debian/control kdeutils-3.4.3/debian/control
---- kdeutils-3.4.3/debian/control
-+++ kdeutils-3.4.3/debian/control
-@@ -3,7 +3,7 @@
- Priority: optional
- Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
- Uploaders: Isaac Clerencia <isaac at debian.org>, Pierre Habouzit <madcoder at debian.org>, Christopher Martin <chrsmrtn at debian.org>, Adeodato Simó <dato at net.com.org.es>, Riku Voipio <riku.voipio at iki.fi>, Luk Claes <luk at debian.org>
--Build-Depends: g++-3.4 [arm hppa m68k], cdbs (>= 0.4.27), debhelper (>= 4.2.30), autotools-dev, gawk, gettext, kdelibs4-dev (>= 4:3.4.3), libkonq4-dev (>= 4:3.4.3), libsnmp9-dev, libxtst-dev, pbbuttonsd-dev [powerpc], sharutils, tpctl [i386]
-+Build-Depends: g++-3.4 [arm hppa m68k], cdbs (>= 0.4.27), debhelper (>= 4.2.30), autotools-dev, gawk, gettext, kdelibs4-dev (>= 4:3.4.3), libkonq4-dev (>= 4:3.4.3), libsnmp9-dev [!kfreebsd-i386], libxtst-dev, pbbuttonsd-dev [powerpc], sharutils, tpctl [i386]
- Standards-Version: 3.6.2
-
- Package: kdeutils
-diff -u kdeutils-3.4.3/debian/ksim.install kdeutils-3.4.3/debian/ksim.install
---- kdeutils-3.4.3/debian/ksim.install
-+++ kdeutils-3.4.3/debian/ksim.install
-@@ -5,12 +5,7 @@
- debian/tmp/usr/lib/libksimcore.so.1.0.0
- debian/tmp/usr/share/applications/kde/ksim.desktop
- debian/tmp/usr/share/apps/kicker/extensions/ksim.desktop
--debian/tmp/usr/share/apps/ksim/monitors/DFree.desktop
--debian/tmp/usr/share/apps/ksim/monitors/Lm_sensors.desktop
--debian/tmp/usr/share/apps/ksim/monitors/Net.desktop
--debian/tmp/usr/share/apps/ksim/monitors/Snmp.desktop
--debian/tmp/usr/share/apps/ksim/monitors/cpu.desktop
--debian/tmp/usr/share/apps/ksim/monitors/disk.desktop
-+debian/tmp/usr/share/apps/ksim/monitors/*.desktop
- debian/tmp/usr/share/apps/ksim/pics/clock.png
- debian/tmp/usr/share/apps/ksim/pics/uptime.png
- debian/tmp/usr/share/apps/ksim/themes/ksim/bg_chart.png
---- kdeutils-3.4.3.orig/debian/patches/11_kfreebsd.diff
-+++ kdeutils-3.4.3/debian/patches/11_kfreebsd.diff
-@@ -0,0 +1,42 @@
-+--- kde.orig/ksim/monitors/cpu/ksimcpu.h 2005-08-29 16:36:23.000000000 +0200
-++++ kde.patched/ksim/monitors/cpu/ksimcpu.h 2005-05-23 14:09:16.000000000 +0200
-+@@ -191,7 +191,7 @@
-+ bool m_firstTime;
-+ CpuList m_cpus;
-+
-+-#ifdef __linux__
-++#ifdef Q_OS_LINUX
-+ FILE *m_procFile;
-+ QTextStream *m_procStream;
-+ #endif
-+--- kde.orig/ksim/monitors/disk/ksimdisk.cpp 2005-08-29 16:41:47.000000000 +0200
-++++ kde.patched/ksim/monitors/disk/ksimdisk.cpp 2005-05-23 14:09:16.000000000 +0200
-+@@ -52,7 +52,7 @@
-+ #include <stdlib.h>
-+ #endif
-+
-+-#ifdef Q_OS_LINUX
-++#if __linux__
-+ #include <linux/major.h>
-+ #endif
-+
-+@@ -403,7 +403,7 @@
-+
-+ QString DiskView::diskName( int major, int minor ) const
-+ {
-+-#ifdef Q_OS_LINUX
-++#ifdef __linux__
-+ QString returnValue;
-+ switch ( major )
-+ {
-+--- kde.orig/ark/arkutils.cpp 2005-12-18 00:25:06.000000000 +0100
-++++ kde.orig/ark/arkutils.cpp 2005-12-18 00:23:36.000000000 +0100
-+@@ -46,7 +46,7 @@
-+ // for statfs:
-+ #ifdef BSD4_4
-+ #include <sys/mount.h>
-+-#elif defined(__linux__)
-++#elif defined(__linux__) || defined(__GLIBC__)
-+ #include <sys/vfs.h>
-+ #elif defined(__sun)
-+ #include <sys/statvfs.h>
-only in patch2:
-unchanged:
---- kdeutils-3.4.3.orig/debian/kmilo.install.kfreebsd-i386
-+++ kdeutils-3.4.3/debian/kmilo.install.kfreebsd-i386
-@@ -0,0 +1,18 @@
-+debian/tmp/usr/lib/kde3/kcm_thinkpad.la
-+debian/tmp/usr/lib/kde3/kcm_thinkpad.so
-+debian/tmp/usr/lib/kde3/kded_kmilod.la
-+debian/tmp/usr/lib/kde3/kded_kmilod.so
-+debian/tmp/usr/lib/kde3/kmilo_asus.la
-+debian/tmp/usr/lib/kde3/kmilo_asus.so
-+debian/tmp/usr/lib/kde3/kmilo_generic.la
-+debian/tmp/usr/lib/kde3/kmilo_generic.so
-+debian/tmp/usr/lib/kde3/kmilo_thinkpad.la
-+debian/tmp/usr/lib/kde3/kmilo_thinkpad.so
-+debian/tmp/usr/lib/libkmilo.so.1
-+debian/tmp/usr/lib/libkmilo.so.1.0.0
-+debian/tmp/usr/share/applications/kde/thinkpad.desktop
-+debian/tmp/usr/share/services/kded/kmilod.desktop
-+debian/tmp/usr/share/services/kmilo/kmilo_asus.desktop
-+debian/tmp/usr/share/services/kmilo/kmilo_generic.desktop
-+debian/tmp/usr/share/services/kmilo/kmilo_thinkpad.desktop
-+debian/tmp/usr/share/servicetypes/kmilo/kmilopluginsvc.desktop
Deleted: trunk/web/patches/libpcap0.8.diff
===================================================================
--- trunk/web/patches/libpcap0.8.diff 2008-08-20 15:39:54 UTC (rev 2307)
+++ trunk/web/patches/libpcap0.8.diff 2008-08-20 15:45:33 UTC (rev 2308)
@@ -1,40 +0,0 @@
-Author: aurel32
-Status: don't merge. temporary changes until libpcap transition begins
-
-diff -u libpcap0.8-0.9.5/debian/control libpcap0.8-0.9.5/debian/control
---- libpcap0.8-0.9.5/debian/control
-+++ libpcap0.8-0.9.5/debian/control
-@@ -5,11 +5,19 @@
- Build-Depends: debhelper (>= 5), flex, bison, dpatch, perl
- Standards-Version: 3.7.2
-
-+Package: libpcap-dev
-+Section: oldlibs
-+Architecture: all
-+Depends: libpcap0.8-dev
-+Priority: extra
-+Description: Development library for libpcap (transitional package)
-+ Empty package to facilitate upgrades, can be safely removed.
-+
- Package: libpcap0.8-dev
- Section: libdevel
- Architecture: any
- Depends: libpcap0.8 (= ${Source-Version}), libc6-dev
--Conflicts: libpcap-dev, libpcap0.7-dev
-+Conflicts: libpcap-dev (<< 0.9), libpcap0.7-dev
- Description: Development library and header files for libpcap 0.8
- Headers, static libraries, and documentation for the libpcap library.
- .
-diff -u libpcap0.8-0.9.5/debian/changelog libpcap0.8-0.9.5/debian/changelog
---- libpcap0.8-0.9.5/debian/changelog
-+++ libpcap0.8-0.9.5/debian/changelog
-@@ -1,3 +1,9 @@
-+libpcap0.8 (0.9.5-1+kbsd) unreleased; urgency=low
-+
-+ * Added a libpcap-dev package as libpcap0.7 is fucked on kfreebsd-i386.
-+
-+ -- Aurelien Jarno <aurel32 at debian.org> Wed, 12 Oct 2005 20:50:30 +0200
-+
- libpcap0.8 (0.9.5-1) unstable; urgency=low
-
- * New upstream release: no API changes, no ABI changes.
Deleted: trunk/web/patches/x86info.diff
===================================================================
--- trunk/web/patches/x86info.diff 2008-08-20 15:39:54 UTC (rev 2307)
+++ trunk/web/patches/x86info.diff 2008-08-20 15:45:33 UTC (rev 2308)
@@ -1,53 +0,0 @@
-Author: aurel32
-Status: in BTS
-
-diff -u x86info-1.15/debian/control x86info-1.15/debian/control
---- x86info-1.15/debian/control
-+++ x86info-1.15/debian/control
-@@ -6,7 +6,7 @@
- Standards-Version: 3.6.2
-
- Package: x86info
--Architecture: i386 amd64
-+Architecture: i386 kfreebsd-i386 amd64
- Depends: ${shlibs:Depends}, ${misc:Depends}, makedev (>= 2.3.1-53)
- Description: Display diagnostic information about i386 compatible CPUs
- x86info displays diagnostic information about the CPUs fitted to i386
---- x86info-1.15.orig/bench/benchmarks.c
-+++ x86info-1.15/bench/benchmarks.c
-@@ -1,7 +1,8 @@
- #include <time.h>
- #include <sys/time.h>
--#include <asm/unistd.h>
-+#include <sys/unistd.h>
- #include <sys/stat.h>
-+#include <sys/syscall.h>
- #include <stdio.h>
- #include "../x86info.h"
- #include "bench.h"
-@@ -13,7 +14,7 @@
- if (show_bench != 1)
- return;
-
-- TIME(asm volatile("int $0x80" :"=a" (ret) :"0" (__NR_getppid)), "int 0x80");
-+ TIME(asm volatile("int $0x80" :"=a" (ret) :"0" (SYS_getppid)), "int 0x80");
- TIME(asm volatile("cpuid": : :"ax", "dx", "cx", "bx"), "cpuid");
-
- TIME(asm volatile("addl $1,0(%esp)"), "addl");
---- x86info-1.15.orig/x86info.h
-+++ x86info-1.15/x86info.h
-@@ -1,10 +1,10 @@
- #ifndef _X86INFO_H
- #define _X86INFO_H
-
--#include <linux/types.h>
--typedef unsigned char u8;
--typedef unsigned short u16;
--typedef unsigned int u32;
-+#include <sys/types.h>
-+typedef u_int8_t u8;
-+typedef u_int16_t u16;
-+typedef u_int32_t u32;
-
- #define VENDOR_AMD 1
- #define VENDOR_CENTAUR 2
More information about the Glibc-bsd-commits
mailing list