From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id D602A1381F4 for ; Fri, 17 Aug 2012 15:50:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 770B9E06C2; Fri, 17 Aug 2012 15:50:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 37799E06C2 for ; Fri, 17 Aug 2012 15:50:16 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 745FB1B402D for ; Fri, 17 Aug 2012 15:50:15 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 1C403E5444 for ; Fri, 17 Aug 2012 15:50:13 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1345218428.15dd278f55dc125f32b479c04101e8a6e800b238.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-base/kdelibs/, kde-base/kdelibs/files/ X-VCS-Repository: proj/kde X-VCS-Files: kde-base/kdelibs/files/kdelibs-4.3.2-solaris-fileunix.patch kde-base/kdelibs/files/kdelibs-4.3.2-solaris-getgrouplist.patch kde-base/kdelibs/files/kdelibs-4.3.2-solaris-ksyscoca.patch kde-base/kdelibs/kdelibs-4.9.49.9999.ebuild kde-base/kdelibs/kdelibs-9999.ebuild X-VCS-Directories: kde-base/kdelibs/ kde-base/kdelibs/files/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 15dd278f55dc125f32b479c04101e8a6e800b238 X-VCS-Branch: master Date: Fri, 17 Aug 2012 15:50:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 4cb28faa-5a67-48bb-87ed-20476477b4a4 X-Archives-Hash: 79d7b1af10b0c7c6fd7a825eaaae945f commit: 15dd278f55dc125f32b479c04101e8a6e800b238 Author: Michael Palimaka gentoo org> AuthorDate: Fri Aug 17 15:47:08 2012 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Fri Aug 17 15:47:08 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=15dd278f [kde-base/kdelibs] Remove solaris patches as per meeting. (Portage version: 2.1.11.10/git/Linux x86_64, unsigned Manifest commit) --- .../files/kdelibs-4.3.2-solaris-fileunix.patch | 40 ------- .../files/kdelibs-4.3.2-solaris-getgrouplist.patch | 109 -------------------- .../files/kdelibs-4.3.2-solaris-ksyscoca.patch | 16 --- kde-base/kdelibs/kdelibs-4.9.49.9999.ebuild | 8 -- kde-base/kdelibs/kdelibs-9999.ebuild | 8 -- 5 files changed, 0 insertions(+), 181 deletions(-) diff --git a/kde-base/kdelibs/files/kdelibs-4.3.2-solaris-fileunix.patch b/kde-base/kdelibs/files/kdelibs-4.3.2-solaris-fileunix.patch deleted file mode 100644 index c036206..0000000 --- a/kde-base/kdelibs/files/kdelibs-4.3.2-solaris-fileunix.patch +++ /dev/null @@ -1,40 +0,0 @@ -Solaris has no d_type element in dir_ent. - -Please refer to - https://solaris.bionicmutton.org/hg/kde4-specs-432/rev/be96f7fc958a - ---- kioslave/file/file_unix.cpp.orig 2009-03-10 13:26:04.000000000 +0100 -+++ kioslave/file/file_unix.cpp 2009-05-04 03:27:15.231305077 +0200 -@@ -42,7 +42,7 @@ - #include - #include - #include -- -+#include - #if defined(HAVE_LIMITS_H) - #include // PATH_MAX - #endif -@@ -338,15 +338,20 @@ - // files where QFile::encodeName(QFile::decodeName(a)) != a. - QList entryNames; - KDE_struct_dirent *ep; -+ KDE_struct_stat hajmaep; - if (details == 0) { - // Fast path (for recursive deletion, mostly) - // Simply emit the name and file type, nothing else. - while ( ( ep = KDE_readdir( dp ) ) != 0 ) { - entry.clear(); - entry.insert(KIO::UDSEntry::UDS_NAME, QFile::decodeName(ep->d_name)); -- entry.insert(KIO::UDSEntry::UDS_FILE_TYPE, -- (ep->d_type & DT_DIR) ? S_IFDIR : S_IFREG ); -- if (ep->d_type & DT_LNK) { -+// entry.insert(KIO::UDSEntry::UDS_FILE_TYPE, -+// (ep->d_type & DT_DIR) ? S_IFDIR : S_IFREG ); -+KDE_lstat( ep->d_name, &hajmaep ); -+entry.insert(KIO::UDSEntry::UDS_FILE_TYPE, -+(S_ISDIR(hajmaep.st_mode)) ? S_IFDIR : S_IFREG ); -+// if (ep->d_type & DT_LNK) { -+if (S_ISLNK(hajmaep.st_mode)) { - // for symlinks obey the UDSEntry contract and provide UDS_LINK_DEST - // even if we don't know the link dest (and DeleteJob doesn't care...) - entry.insert(KIO::UDSEntry::UDS_LINK_DEST, QLatin1String("Dummy Link Target")); diff --git a/kde-base/kdelibs/files/kdelibs-4.3.2-solaris-getgrouplist.patch b/kde-base/kdelibs/files/kdelibs-4.3.2-solaris-getgrouplist.patch deleted file mode 100644 index 59ab862..0000000 --- a/kde-base/kdelibs/files/kdelibs-4.3.2-solaris-getgrouplist.patch +++ /dev/null @@ -1,109 +0,0 @@ -Solaris does not provide getgrouplist(). - -Please refer to - https://solaris.bionicmutton.org/hg/kde4-specs-432/file/539d9ed6c7b5/specs/patches/kdelibs-getgrouplist.diff - ---- ./kio/kfile/kpropertiesdialog.cpp.orig Tue Apr 14 23:40:16 2009 -+++ ./kio/kfile/kpropertiesdialog.cpp Tue Apr 14 23:40:29 2009 -@@ -141,6 +141,101 @@ - #endif - #endif - -+/*- -+ * Copyright (c) 1991, 1993 -+ * The Regents of the University of California. All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * 3. All advertising materials mentioning features or use of this software -+ * must display the following acknowledgement: -+ * This product includes software developed by the University of -+ * California, Berkeley and its contributors. -+ * 4. Neither the name of the University nor the names of its contributors -+ * may be used to endorse or promote products derived from this software -+ * without specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND -+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -+ * SUCH DAMAGE. -+ */ -+ -+#if 0 -+#if defined(LIBC_SCCS) && !defined(lint) -+static char sccsid[] = "@(#)getgrouplist.c 8.2 (Berkeley) 12/8/94"; -+#endif /* LIBC_SCCS and not lint */ -+#include -+__FBSDID("$FreeBSD: src/lib/libc/gen/getgrouplist.c,v 1.14 2005/05/03 16:20:03 delphij Exp $"); -+#endif -+ -+/* -+ * get credential -+ */ -+#include -+ -+#include -+#include -+#include -+ -+int -+getgrouplist(const char *uname, gid_t agroup, gid_t *groups, int *grpcnt) -+{ -+ const struct group *grp; -+ int i, maxgroups, ngroups, ret; -+ -+ ret = 0; -+ ngroups = 0; -+ maxgroups = *grpcnt; -+ /* -+ * When installing primary group, duplicate it; -+ * the first element of groups is the effective gid -+ * and will be overwritten when a setgid file is executed. -+ */ -+ groups ? groups[ngroups++] = agroup : ngroups++; -+ if (maxgroups > 1) -+ groups ? groups[ngroups++] = agroup : ngroups++; -+ /* -+ * Scan the group file to find additional groups. -+ */ -+ setgrent(); -+ while ((grp = getgrent()) != NULL) { -+ if (groups) { -+ for (i = 0; i < ngroups; i++) { -+ if (grp->gr_gid == groups[i]) -+ goto skip; -+ } -+ } -+ for (i = 0; grp->gr_mem[i]; i++) { -+ if (!strcmp(grp->gr_mem[i], uname)) { -+ if (ngroups >= maxgroups) { -+ ret = -1; -+ break; -+ } -+ groups ? groups[ngroups++] = grp->gr_gid : ngroups++; -+ break; -+ } -+ } -+skip: -+ ; -+ } -+ endgrent(); -+ *grpcnt = ngroups; -+ return (ret); -+} - using namespace KDEPrivate; - - static QString nameFromFileName(QString nameStr) diff --git a/kde-base/kdelibs/files/kdelibs-4.3.2-solaris-ksyscoca.patch b/kde-base/kdelibs/files/kdelibs-4.3.2-solaris-ksyscoca.patch deleted file mode 100644 index 64da2e6..0000000 --- a/kde-base/kdelibs/files/kdelibs-4.3.2-solaris-ksyscoca.patch +++ /dev/null @@ -1,16 +0,0 @@ -Desc: Add needed include for mmap() on Solaris. -Author: Daniel Vergien - ---- kdelibs-4.3.2/kdecore/sycoca/ksycoca.cpp.orig 2009-10-14 12:12:45.697358506 +0200 -+++ kdelibs-4.3.2/kdecore/sycoca/ksycoca.cpp 2009-10-14 12:13:16.082152232 +0200 -@@ -46,6 +46,10 @@ - - #include "ksycocadevices_p.h" - -+/* needed on solaris 10 for mmap */ -+ -+#include -+ - // TODO: remove mmap() from kdewin32 and use QFile::mmap() when needed - #ifdef Q_WS_WIN - #undef HAVE_MMAP diff --git a/kde-base/kdelibs/kdelibs-4.9.49.9999.ebuild b/kde-base/kdelibs/kdelibs-4.9.49.9999.ebuild index 9348d0d..5302c91 100644 --- a/kde-base/kdelibs/kdelibs-4.9.49.9999.ebuild +++ b/kde-base/kdelibs/kdelibs-4.9.49.9999.ebuild @@ -197,14 +197,6 @@ src_prepare() { # Try to fix kkeyserver_mac epatch "${FILESDIR}"/${PN}-4.3.80-kdeui_util_kkeyserver_mac.patch fi - - if [[ ${CHOST} == *-solaris* ]] ; then - epatch "${FILESDIR}/kdelibs-4.3.2-solaris-ksyscoca.patch" - # getgrouplist not in solaris libc - epatch "${FILESDIR}/kdelibs-4.3.2-solaris-getgrouplist.patch" - # solaris has no d_type element in dir_ent - epatch "${FILESDIR}/kdelibs-4.3.2-solaris-fileunix.patch" - fi } src_configure() { diff --git a/kde-base/kdelibs/kdelibs-9999.ebuild b/kde-base/kdelibs/kdelibs-9999.ebuild index 9348d0d..5302c91 100644 --- a/kde-base/kdelibs/kdelibs-9999.ebuild +++ b/kde-base/kdelibs/kdelibs-9999.ebuild @@ -197,14 +197,6 @@ src_prepare() { # Try to fix kkeyserver_mac epatch "${FILESDIR}"/${PN}-4.3.80-kdeui_util_kkeyserver_mac.patch fi - - if [[ ${CHOST} == *-solaris* ]] ; then - epatch "${FILESDIR}/kdelibs-4.3.2-solaris-ksyscoca.patch" - # getgrouplist not in solaris libc - epatch "${FILESDIR}/kdelibs-4.3.2-solaris-getgrouplist.patch" - # solaris has no d_type element in dir_ent - epatch "${FILESDIR}/kdelibs-4.3.2-solaris-fileunix.patch" - fi } src_configure() {