From e5e9b978d16f3a418fcae51695fb9398f0a160ed Mon Sep 17 00:00:00 2001
From: Marcel Telka <marcel@telka.sk>
Date: Fri, 05 Apr 2024 17:27:45 +0200
Subject: [PATCH] Obsolete libXp
---
components/meta-packages/history/history | 1 +
/dev/null | 15 ---------------
2 files changed, 1 insertions(+), 15 deletions(-)
diff --git a/components/meta-packages/history/history b/components/meta-packages/history/history
index a6300ca..0b1e94e 100644
--- a/components/meta-packages/history/history
+++ b/components/meta-packages/history/history
@@ -1700,6 +1700,7 @@
x11/keyboard/accessx@7.5,5.11-2020.0.1.2
x11/library/dps@7.5,5.11-2013.0.0.1
x11/library/libowconfig@0.5.11,5.11-2013.0.0.1
+x11/library/libxp@1.0.4,5.11-2022.0.0.1
x11/library/libxxf86misc@1.0.4,5.11-2020.0.1.1
x11/network/rstart@1.0.3,5.11-2013.0.0.1
x11/network/x11-network-proxies@7.5,5.11-2013.0.0.1
diff --git a/components/x11/libXp/Makefile b/components/x11/libXp/Makefile
deleted file mode 100644
index 6f7d46c..0000000
--- a/components/x11/libXp/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# This file and its contents are supplied under the terms of the
-# Common Development and Distribution License ("CDDL"), version 1.0.
-# You may only use this file in accordance with the terms of version
-# 1.0 of the CDDL.
-#
-# A full copy of the text of the CDDL should have accompanied this
-# source. A copy of the CDDL is also available via the Internet at
-# http://www.illumos.org/license/CDDL.
-#
-
-#
-# Copyright 2015 Aurelien Larcher
-#
-
-X11_CATEGORY=LIB
-include ../../../make-rules/shared-macros.mk
-include $(WS_MAKE_RULES)/x11.mk
-
-COMPONENT_NAME= libXp
-COMPONENT_VERSION= 1.0.4
-COMPONENT_FMRI= x11/library/libxp
-COMPONENT_SUMMARY= libXp - X print library
-COMPONENT_ARCHIVE_EXTENSION= .tar.xz
-COMPONENT_ARCHIVE_HASH= sha256:1f19e3b8e82a34a8fd9889a7d9af0abe8588cb03fb57c37c569634cf3b9df1a4
-
-include $(WS_MAKE_RULES)/common.mk
-
-CONFIGURE_ENV+= XPRINT_LIBS='-lX11 -lXext'
-
-COMPONENT_PREP_ACTION = ( cd $(@D) && autoreconf -f -i )
-
-CONFIGURE_OPTIONS+= --disable-static
-CONFIGURE_OPTIONS+= --enable-shared
-
-# Auto-generated dependencies
-REQUIRED_PACKAGES += system/library
-REQUIRED_PACKAGES += x11/library/libx11
-REQUIRED_PACKAGES += x11/library/libxext
diff --git a/components/x11/libXp/libXp.license b/components/x11/libXp/libXp.license
deleted file mode 100644
index bb88558..0000000
--- a/components/x11/libXp/libXp.license
+++ /dev/null
@@ -1,58 +0,0 @@
-Copyright 1996 Hewlett-Packard Company
-Copyright 1996 International Business Machines Corp.
-Copyright 1996, 1999, 2004, Oracle and/or its affiliates. All rights reserved.
-Copyright 1996 Novell, Inc.
-Copyright 1996 Digital Equipment Corp.
-Copyright 1996 Fujitsu Limited
-Copyright 1996 Hitachi, Ltd.
-Copyright 1996 X Consortium, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute,
-sublicense, and/or sell copies of the Software, and to permit persons
-to whom the Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the names of the copyright holders
-shall not be used in advertising or otherwise to promote the sale, use
-or other dealings in this Software without prior written authorization
-from said copyright holders.
-
- ----------------------------------------
-
-Copyright (C) 2000 The XFree86 Project, Inc. All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to
-deal in the Software without restriction, including without limitation the
-rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the XFree86 Project shall
-not be used in advertising or otherwise to promote the sale, use or other
-dealings in this Software without prior written authorization from the
-XFree86 Project.
diff --git a/components/x11/libXp/libXp.p5m b/components/x11/libXp/libXp.p5m
deleted file mode 100644
index 7080b0d..0000000
--- a/components/x11/libXp/libXp.p5m
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-# This file and its contents are supplied under the terms of the
-# Common Development and Distribution License ("CDDL"), version 1.0.
-# You may only use this file in accordance with the terms of version
-# 1.0 of the CDDL.
-#
-# A full copy of the text of the CDDL should have accompanied this
-# source. A copy of the CDDL is also available via the Internet at
-# http://www.illumos.org/license/CDDL.
-#
-
-#
-# Copyright 2016 Aurelien Larcher
-#
-
-set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="$(COMPONENT_SUMMARY)"
-set name=pkg.human-version value=$(HUMAN_VERSION)
-set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
-set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
-set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
-
-<transform file path=usr/share/man/man3xp/(.+)$ \
- -> set action.hash usr/share/man/man3/%<\1> >
-
-link path=usr/X11/lib/$(MACH64)/libXp.so target=../../../lib/$(MACH64)/libXp.so
-link path=usr/X11/lib/$(MACH64)/libXp.so.1 target=../../../lib/$(MACH64)/libXp.so.1
-link path=usr/X11/lib/libXp.so target=../../lib/libXp.so
-link path=usr/X11/lib/libXp.so.1 target=../../lib/libXp.so.1
-
-link path=usr/lib/$(MACH64)/libXp.so target=libXp.so.1.0.0
-link path=usr/lib/$(MACH64)/libXp.so.1 target=libXp.so.1.0.0
-file path=usr/lib/$(MACH64)/libXp.so.1.0.0
-file path=usr/lib/$(MACH64)/pkgconfig/xp.pc
-link path=usr/lib/libXp.so target=libXp.so.1.0.0
-link path=usr/lib/libXp.so.1 target=libXp.so.1.0.0
-file path=usr/lib/libXp.so.1.0.0
-file path=usr/lib/pkgconfig/xp.pc
-file path=usr/share/man/man3xp/XpCancelDoc.3
-file path=usr/share/man/man3xp/XpCancelJob.3
-file path=usr/share/man/man3xp/XpCancelPage.3
-file path=usr/share/man/man3xp/XpCreateContext.3
-file path=usr/share/man/man3xp/XpDestroyContext.3
-file path=usr/share/man/man3xp/XpEndDoc.3
-file path=usr/share/man/man3xp/XpEndJob.3
-file path=usr/share/man/man3xp/XpEndPage.3
-file path=usr/share/man/man3xp/XpFreePrinterList.3
-file path=usr/share/man/man3xp/XpGetAttributes.3
-file path=usr/share/man/man3xp/XpGetContext.3
-file path=usr/share/man/man3xp/XpGetDocumentData.3
-file path=usr/share/man/man3xp/XpGetImageResolution.3
-file path=usr/share/man/man3xp/XpGetLocaleHinter.3
-file path=usr/share/man/man3xp/XpGetOneAttribute.3
-file path=usr/share/man/man3xp/XpGetPageDimensions.3
-file path=usr/share/man/man3xp/XpGetPdmStartParams.3
-file path=usr/share/man/man3xp/XpGetPrinterList.3
-file path=usr/share/man/man3xp/XpGetScreenOfContext.3
-file path=usr/share/man/man3xp/XpInputSelected.3
-file path=usr/share/man/man3xp/XpPutDocumentData.3
-file path=usr/share/man/man3xp/XpQueryExtension.3
-file path=usr/share/man/man3xp/XpQueryScreens.3
-file path=usr/share/man/man3xp/XpQueryVersion.3
-file path=usr/share/man/man3xp/XpRehashPrinterList.3
-file path=usr/share/man/man3xp/XpSelectInput.3
-file path=usr/share/man/man3xp/XpSetAttributes.3
-file path=usr/share/man/man3xp/XpSetContext.3
-file path=usr/share/man/man3xp/XpSetImageResolution.3
-file path=usr/share/man/man3xp/XpSetLocaleHinter.3
-file path=usr/share/man/man3xp/XpStartDoc.3
-file path=usr/share/man/man3xp/XpStartJob.3
-file path=usr/share/man/man3xp/XpStartPage.3
-file path=usr/share/man/man3xp/libXp.3
diff --git a/components/x11/libXp/manifests/sample-manifest.p5m b/components/x11/libXp/manifests/sample-manifest.p5m
deleted file mode 100644
index bb58c1f..0000000
--- a/components/x11/libXp/manifests/sample-manifest.p5m
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# This file and its contents are supplied under the terms of the
-# Common Development and Distribution License ("CDDL"), version 1.0.
-# You may only use this file in accordance with the terms of version
-# 1.0 of the CDDL.
-#
-# A full copy of the text of the CDDL should have accompanied this
-# source. A copy of the CDDL is also available via the Internet at
-# http://www.illumos.org/license/CDDL.
-#
-
-#
-# Copyright 2022 <contributor>
-#
-
-set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.human-version value=$(HUMAN_VERSION)
-set name=pkg.summary value="$(COMPONENT_SUMMARY)"
-set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
-set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
-set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
-
-link path=usr/lib/$(MACH64)/libXp.so target=libXp.so.1.0.0
-link path=usr/lib/$(MACH64)/libXp.so.1 target=libXp.so.1.0.0
-file path=usr/lib/$(MACH64)/libXp.so.1.0.0
-file path=usr/lib/$(MACH64)/pkgconfig/xp.pc
-link path=usr/lib/libXp.so target=libXp.so.1.0.0
-link path=usr/lib/libXp.so.1 target=libXp.so.1.0.0
-file path=usr/lib/libXp.so.1.0.0
-file path=usr/lib/pkgconfig/xp.pc
-file path=usr/share/man/man3/XpCancelDoc.3
-file path=usr/share/man/man3/XpCancelJob.3
-file path=usr/share/man/man3/XpCancelPage.3
-file path=usr/share/man/man3/XpCreateContext.3
-file path=usr/share/man/man3/XpDestroyContext.3
-file path=usr/share/man/man3/XpEndDoc.3
-file path=usr/share/man/man3/XpEndJob.3
-file path=usr/share/man/man3/XpEndPage.3
-file path=usr/share/man/man3/XpFreePrinterList.3
-file path=usr/share/man/man3/XpGetAttributes.3
-file path=usr/share/man/man3/XpGetContext.3
-file path=usr/share/man/man3/XpGetDocumentData.3
-file path=usr/share/man/man3/XpGetImageResolution.3
-file path=usr/share/man/man3/XpGetLocaleHinter.3
-file path=usr/share/man/man3/XpGetOneAttribute.3
-file path=usr/share/man/man3/XpGetPageDimensions.3
-file path=usr/share/man/man3/XpGetPdmStartParams.3
-file path=usr/share/man/man3/XpGetPrinterList.3
-file path=usr/share/man/man3/XpGetScreenOfContext.3
-file path=usr/share/man/man3/XpInputSelected.3
-file path=usr/share/man/man3/XpPutDocumentData.3
-file path=usr/share/man/man3/XpQueryExtension.3
-file path=usr/share/man/man3/XpQueryScreens.3
-file path=usr/share/man/man3/XpQueryVersion.3
-file path=usr/share/man/man3/XpRehashPrinterList.3
-file path=usr/share/man/man3/XpSelectInput.3
-file path=usr/share/man/man3/XpSetAttributes.3
-file path=usr/share/man/man3/XpSetContext.3
-file path=usr/share/man/man3/XpSetImageResolution.3
-file path=usr/share/man/man3/XpSetLocaleHinter.3
-file path=usr/share/man/man3/XpStartDoc.3
-file path=usr/share/man/man3/XpStartJob.3
-file path=usr/share/man/man3/XpStartPage.3
-file path=usr/share/man/man3/libXp.3
diff --git a/components/x11/libXp/patches/6724993.patch b/components/x11/libXp/patches/6724993.patch
deleted file mode 100644
index 99a5924..0000000
--- a/components/x11/libXp/patches/6724993.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 37671e4..6d34ad3 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -17,6 +17,7 @@ libXp_la_SOURCES = \
- XpPrinter.c \
- XpPutData.c \
- XpScreens.c \
-+ XpDpi.c \
- \
- XpExtUtil.h
-
-diff --git a/./tmp-regen/src/XpDpi.c b/src/XpDpi.c
-new file mode 100644
-index 0000000..cb9b909
---- /dev/null
-+++ b/src/XpDpi.c
-@@ -0,0 +1,101 @@
-+/* $XConsortium: XpDpi.c /main/4 1996/12/04 10:24:31 lehors $ */
-+/******************************************************************************
-+ ******************************************************************************
-+ **
-+ ** (c) Copyright 1996 Hewlett-Packard Company
-+ ** (c) Copyright 1996 International Business Machines Corp.
-+ ** (c) Copyright 1996, Oracle and/or its affiliates. All rights reserved.
-+ ** (c) Copyright 1996 Novell, Inc.
-+ ** (c) Copyright 1996 Digital Equipment Corp.
-+ ** (c) Copyright 1996 Fujitsu Limited
-+ ** (c) Copyright 1996 Hitachi, Ltd.
-+ **
-+ ** Permission is hereby granted, free of charge, to any person obtaining a copy
-+ ** of this software and associated documentation files (the "Software"), to deal
-+ ** in the Software without restriction, including without limitation the rights
-+ ** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-+ ** copies of the Software, and to permit persons to whom the Software is
-+ ** furnished to do so, subject to the following conditions:
-+ **
-+ ** The above copyright notice and this permission notice shall be included in
-+ ** all copies or substantial portions of the Software.
-+ **
-+ ** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+ ** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ ** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-+ ** COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-+ ** IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-+ ** CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ **
-+ ** Except as contained in this notice, the names of the copyright holders shall
-+ ** not be used in advertising or otherwise to promote the sale, use or other
-+ ** dealings in this Software without prior written authorization from said
-+ ** copyright holders.
-+ **
-+ ******************************************************************************
-+ *****************************************************************************/
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+#include <X11/extensions/Printstr.h>
-+#include "XpExtUtil.h"
-+#include <X11/Xlibint.h>
-+#include <X11/Xos.h>
-+#include <limits.h>
-+#ifndef WIN32
-+#define X_INCLUDE_PWD_H
-+#define XOS_USE_XLIB_LOCKING
-+#include <X11/Xos_r.h>
-+#endif
-+#include <limits.h>
-+
-+
-+Bool
-+XpClientDPI (
-+ Display *dpy,
-+ int client_dpi
-+)
-+{
-+ xPrintClientDpiReq *req;
-+ xPrintClientDpiReply rep;
-+ XExtDisplayInfo *info = (XExtDisplayInfo *) xp_find_display (dpy);
-+ short dpi = (short)client_dpi;
-+
-+ XPContext context;
-+
-+ if (XpCheckExtInit(dpy, XP_SECOND_RELEASE) == -1)
-+ return (False); /* NoSuchExtension */
-+
-+ LockDisplay (dpy);
-+
-+ GetReq(PrintClientDpi,req);
-+ req->reqType = info->codes->major_opcode;
-+ req->printReqType = X_PrintClientDpi;
-+ req->clientDPI = (CARD16) dpi;
-+
-+ if (! _XReply (dpy, (xReply *) &rep, 0, xTrue)) {
-+ UnlockDisplay (dpy);
-+ SyncHandle ();
-+ return (False);
-+ }
-+
-+ UnlockDisplay(dpy);
-+ SyncHandle ();
-+
-+ return ( rep.status );
-+}
-+
-+/*
-+ * Bug 4402782: Add Sun specific propietary call until X.Org takes the
-+ * change.
-+ */
-+#ifdef SUNSOFT
-+Bool
-+XpClientDPI_SUNW (
-+ Display *dpy,
-+ int client_dpi
-+)
-+{
-+ return XpClientDPI(dpy, client_dpi);
-+}
-+#endif
-diff --git a/src/XpExtUtil.c b/src/XpExtUtil.c
-index 89f66c0..b5ef6b8 100644
---- a/src/XpExtUtil.c
-+++ b/src/XpExtUtil.c
-@@ -103,6 +103,7 @@ static XEXT_GENERATE_ERROR_STRING (XpError, xp_extension_name,
- */
-
- static XPrintLocalExtensionVersion xpprintversions[] = {{XP_ABSENT,0,0},
-+ {XP_PRESENT, XP_PROTO_MAJOR, 0},
- {XP_PRESENT, XP_PROTO_MAJOR, XP_PROTO_MINOR}};
-
-
diff --git a/components/x11/libXp/patches/solaris-abi.patch b/components/x11/libXp/patches/solaris-abi.patch
deleted file mode 100644
index c066af3..0000000
--- a/components/x11/libXp/patches/solaris-abi.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-Solaris libXp was shipped as libXp.so.1 so use that for binary compatibility
-
---- ./src/Makefile.am Fri Dec 2 20:41:50 2005
-+++ ./src/Makefile.am Mon Aug 11 14:49:19 2008
-@@ -31,5 +31,4 @@
- # every platform, so until we change the ABI in an incompatible fashion,
- # we have to use -version-number
- #
--XP_VERSION=-version-number 6:2:0
--libXp_la_LDFLAGS = $(XP_VERSION) -no-undefined
-+libXp_la_LDFLAGS = -version-number 1 -no-undefined
diff --git a/components/x11/libXp/pkg5 b/components/x11/libXp/pkg5
deleted file mode 100644
index 6407fb5..0000000
--- a/components/x11/libXp/pkg5
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "dependencies": [
- "SUNWcs",
- "developer/build/autoconf/xorg-macros",
- "shell/ksh93",
- "system/library",
- "x11/header/x11-protocols",
- "x11/library/libx11",
- "x11/library/libxext"
- ],
- "fmris": [
- "x11/library/libxp"
- ],
- "name": "libXp"
-}
\ No newline at end of file
--
Gitblit v1.9.3