From c9319830e3b34a97ad4784637471e7d62b8ec161 Mon Sep 17 00:00:00 2001 From: Andreas Hüttel Date: Sun, 11 Dec 2011 23:51:36 +0000 Subject: Cleanup Package-Manager: portage-2.1.10.39/cvs/Linux x86_64 --- kde-base/kstars/ChangeLog | 6 +++++- kde-base/kstars/files/kstars-4.3.80-solaris.patch | 26 ----------------------- 2 files changed, 5 insertions(+), 27 deletions(-) delete mode 100644 kde-base/kstars/files/kstars-4.3.80-solaris.patch (limited to 'kde-base/kstars') diff --git a/kde-base/kstars/ChangeLog b/kde-base/kstars/ChangeLog index b0231b4ee76c..a5a3c7370a3c 100644 --- a/kde-base/kstars/ChangeLog +++ b/kde-base/kstars/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kstars # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kstars/ChangeLog,v 1.207 2011/12/11 18:52:30 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kstars/ChangeLog,v 1.208 2011/12/11 23:51:36 dilfridge Exp $ + + 11 Dec 2011; Andreas K. Huettel + -files/kstars-4.3.80-solaris.patch: + Cleanup *kstars-4.7.4 (11 Dec 2011) diff --git a/kde-base/kstars/files/kstars-4.3.80-solaris.patch b/kde-base/kstars/files/kstars-4.3.80-solaris.patch deleted file mode 100644 index 53fa4086f48d..000000000000 --- a/kde-base/kstars/files/kstars-4.3.80-solaris.patch +++ /dev/null @@ -1,26 +0,0 @@ -Desc: Fix compilation on Solaris with some defines. -Author: Heiko Przybyl ---- kstars-4.3.80.orig/kstars/kstars/htmesh/SpatialGeneral.h -+++ kstars-4.3.80/kstars/kstars/htmesh/SpatialGeneral.h -@@ -83,7 +83,7 @@ typedef unsigned long long uint64; - - // emulate the standard bool type where not supported by compiler - --# if !defined(SXGENERAL_H) && !defined(__sgi) && !defined(__linux__) && !defined(_WIN32) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__GLIBC__) -+# if !defined(SXGENERAL_H) && !defined(__sgi) && !defined(__linux__) && !defined(_WIN32) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__GLIBC__) && !defined(__sun) - # ifdef __unix__ - /* - * The following ifndef must ALWAYS be present since C++ may use ---- kstars-4.3.80.orig/kstars/kstars/skycomponents/starcomponent.cpp -+++ kstars-4.3.80/kstars/kstars/skycomponents/starcomponent.cpp -@@ -41,6 +41,10 @@ - #include - #define bswap_16(x) bswap16(x) - #define bswap_32(x) bswap32(x) -+#elif defined(__sun) -+#include -+#define bswap_16(x) BSWAP_16(x) -+#define bswap_32(x) BSWAP_32(x) - #else - #include "byteorder.h" - #endif -- cgit v1.2.3-65-gdbad