X11 updates

Aurélien Larcher

2022-07-12 1cd2c182085b757c0f81842f3e823cbae6d821da

X11 updates

* x11: parametrize archive extension

* xclipboard: bump to 1.1.4

* xcmsdb: bump to 1.0.6

* xcmsdb: bump to 1.0.6

* xconsole: bump to 1.0.8

* xfontsel: bump to 1.1.0

* xfs: bump to 1.2.1

* xmodmap: bump to 1.0.11

* xpr: bump to 1.1.0

* xscope: bump to 1.4.3

* xwud: bump to 1.0.6

 components/x11/xclipboard/Makefile

@@ -18,13 +18,13 @@
include $(WS_MAKE_RULES)/x11.mk

COMPONENT_NAME=           xclipboard
COMPONENT_VERSION=        1.1.3
COMPONENT_REVISION=       1
COMPONENT_VERSION=        1.1.4
COMPONENT_FMRI=           x11/xclipboard
COMPONENT_CLASSIFICATION= Applications/Accessories
COMPONENT_SUMMARY=  xclipboard − X clipboard client
COMPONENT_ARCHIVE_EXTENSION= .tar.gz
COMPONENT_ARCHIVE_HASH= \
  sha256:9c0e0a1f4f1d49f73c6cf3ccd27b5ca0e18afc63679f1a1ee466b1d82446ebb5
  sha256:c40cb97f6c8597ba74a3de5c188d4429f686e4d395b85dac0ec8c7311bdf3d10

include $(WS_MAKE_RULES)/common.mk


 components/x11/xclipboard/manifests/sample-manifest.p5m

@@ -10,10 +10,11 @@
#

#
# Copyright 2018 <contributor>
# 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)

 components/x11/xclipboard/pkg5

@@ -2,6 +2,7 @@
    "dependencies": [
        "SUNWcs",
        "developer/build/autoconf/xorg-macros",
        "shell/ksh93",
        "system/library",
        "x11/header/x11-protocols",
        "x11/library/libx11",

 components/x11/xcmsdb/Makefile

@@ -18,12 +18,12 @@
include $(WS_MAKE_RULES)/x11.mk

COMPONENT_NAME=     xcmsdb
COMPONENT_VERSION=  1.0.5
COMPONENT_REVISION= 1
COMPONENT_VERSION=  1.0.6
COMPONENT_FMRI=     x11/xcmsdb
COMPONENT_SUMMARY=  the xcmsdb Device Color Characterization utility
COMPONENT_ARCHIVE_EXTENSION= .tar.gz
COMPONENT_ARCHIVE_HASH= \
  sha256:e5585361bb8b6a05bb814a8d0e444ee93e0f00180881d3070aff4571e97f67c6
  sha256:640b42c746eb34bdd71ca2850f2bc9fb0ade194c9f152a8d002425a0684df077

include $(WS_MAKE_RULES)/common.mk


 components/x11/xcmsdb/manifests/sample-manifest.p5m

@@ -10,10 +10,11 @@
#

#
# Copyright 2018 <contributor>
# 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)

 components/x11/xcmsdb/pkg5

@@ -2,6 +2,7 @@
    "dependencies": [
        "SUNWcs",
        "developer/build/autoconf/xorg-macros",
        "shell/ksh93",
        "system/library",
        "x11/header/x11-protocols",
        "x11/library/libx11"

 components/x11/xconsole/Makefile

@@ -18,13 +18,13 @@
include $(WS_MAKE_RULES)/x11.mk

COMPONENT_NAME=           xconsole
COMPONENT_VERSION=        1.0.7
COMPONENT_REVISION=       1
COMPONENT_VERSION=        1.0.8
COMPONENT_SUMMARY=        xconsole - monitor system console messages with X 
COMPONENT_CLASSIFICATION= Applications/System Utilities
COMPONENT_FMRI=           x11/xconsole
COMPONENT_ARCHIVE_EXTENSION= .tar.gz
COMPONENT_ARCHIVE_HASH= \
  sha256:d1144882df207378381bc83927906559defbf7b83a01d52c50ad44234c5851e0
  sha256:1897be35738489f92ef511caef189db8d5079469374021dc09b59e89992b7c29

include $(WS_MAKE_RULES)/common.mk


 components/x11/xconsole/manifests/sample-manifest.p5m

@@ -10,10 +10,11 @@
#

#
# Copyright 2018 <contributor>
# 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)

 components/x11/xconsole/pkg5

@@ -2,6 +2,7 @@
    "dependencies": [
        "SUNWcs",
        "developer/build/autoconf/xorg-macros",
        "shell/ksh93",
        "system/library",
        "x11/header/x11-protocols",
        "x11/library/libx11",

 components/x11/xfontsel/Makefile

@@ -18,12 +18,12 @@
include $(WS_MAKE_RULES)/x11.mk

COMPONENT_NAME=    xfontsel
COMPONENT_VERSION= 1.0.6
COMPONENT_REVISION=1
COMPONENT_VERSION= 1.1.0
COMPONENT_SUMMARY= xfontsel - point and click selection of X11 font names
COMPONENT_FMRI=    x11/xfontsel
COMPONENT_ARCHIVE_EXTENSION= .tar.gz
COMPONENT_ARCHIVE_HASH= \
  sha256:25aa0b7c4262f5e99c07c2b96e00e4eb25b7e53f94fa803942af9d0e8da3001c
  sha256:32938f671c706dc15644ceebf5daebbf0f2f1fe45afa2d06d2b905cc7d6c7de2

include $(WS_MAKE_RULES)/common.mk


 components/x11/xfontsel/manifests/sample-manifest.p5m

@@ -10,10 +10,11 @@
#

#
# Copyright 2018 <contributor>
# 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)

 components/x11/xfontsel/patches/xfontsel.patch

@@ -1,9 +1,7 @@
diff --git a/xfontsel.c b/xfontsel.c
index 9ab33d1..861a6ce 100644
--- a/xfontsel.c
+++ b/xfontsel.c
@@ -52,6 +52,9 @@ Modified: Mark Leisher <mleisher@crl.nmsu.edu> to deal with UCS sample text.
 #include <X11/Xfuncs.h>
--- a/xfontsel.c    2022-07-12 14:08:44.281585500 +0000
+++ b/xfontsel.c    2022-07-12 14:08:51.804374434 +0000
@@ -53,6 +53,9 @@
 #include <X11/Xlib.h>
 #include "ULabel.h"
 
+#include <libintl.h>
@@ -12,7 +10,7 @@
 #define MIN_APP_DEFAULTS_VERSION 1
 #define FIELD_COUNT 14
 #define DELIM '-'
@@ -151,6 +154,7 @@ static XrmOptionDescRec options[] = {
@@ -154,6 +157,7 @@
 static void Syntax(const char *call)
 {
     fprintf (stderr, "usage:  %s [-options ...] -fn font\n\n%s\n", call,
@@ -20,16 +18,16 @@
     "where options include:\n"
     "    -display dpy           X server to contact\n"
     "    -geometry geom         size and location of window\n"
@@ -159,7 +163,7 @@ static void Syntax(const char *call)
     "    -sample string         sample text to use for 1-byte fonts\n"
@@ -163,7 +167,7 @@
     "    -sample16 string       sample text to use for 2-byte fonts\n"
     "    -sampleUCS string      sample text to use for ISO10646 fonts\n"
-    "    -scaled                use scaled instances of fonts\n");
+    "    -scaled                use scaled instances of fonts\n"));
     "    -scaled                use scaled instances of fonts\n"
-    "plus any standard toolkit options\n");
+    "plus any standard toolkit options\n"));
     exit (1);
 }
 
@@ -252,10 +256,28 @@ main(int argc, char **argv)
@@ -258,10 +262,28 @@
 {
     Widget topLevel, pane;
 
@@ -58,7 +56,7 @@
 
     if (argc != 1) Syntax(argv[0]);
 
@@ -266,12 +288,15 @@ main(int argc, char **argv)
@@ -272,12 +294,15 @@
     XtGetApplicationResources( topLevel, (XtPointer)&AppRes,
                    resources, XtNumber(resources), NZ );
     if (AppRes.app_defaults_version < MIN_APP_DEFAULTS_VERSION) {
@@ -78,8 +76,8 @@
+    XrmPutLineResource( &rdb, full_message);
     }
 
     ScheduleWork(GetFontNames, (XtPointer)XtDisplay(topLevel), 0);
@@ -507,7 +532,7 @@ void GetFontNames(XtPointer closure)
     ScheduleWork(GetFontNames, (XtPointer)topLevel, 0);
@@ -519,7 +544,7 @@
         }
         else
         XtAppWarning( appCtx,
@@ -88,7 +86,7 @@
     }
     else {
         SetNoFonts();
@@ -1005,11 +1030,11 @@ static void SetCurrentFontCount(void)
@@ -1056,11 +1081,11 @@
     char label[80];
     Arg args[1];
     if (matchingFontCount == 1)
@@ -103,7 +101,7 @@
     XtSetArg( args[0], XtNlabel, label );
     XtSetValues( countLabel, args, ONE );
 }
@@ -1020,9 +1045,9 @@ static void SetParsingFontCount(int count)
@@ -1071,9 +1096,9 @@
     char label[80];
     Arg args[1];
     if (count == 1)
@@ -115,7 +113,7 @@
     XtSetArg( args[0], XtNlabel, label );
     XtSetValues( countLabel, args, ONE );
     FlushXqueue(XtDisplay(countLabel));
@@ -1228,9 +1253,9 @@ void SelectField(Widget w, XtPointer closure, XtPointer callData)
@@ -1279,9 +1304,9 @@
     int field = (long)closure;
     FieldValue *values = fieldValues[field]->value;
     int count = fieldValues[field]->count;

 components/x11/xfontsel/pkg5

@@ -2,6 +2,7 @@
    "dependencies": [
        "SUNWcs",
        "developer/build/autoconf/xorg-macros",
        "shell/ksh93",
        "system/library",
        "x11/header/x11-protocols",
        "x11/library/libx11",

 components/x11/xfs/Makefile

@@ -18,11 +18,12 @@
include $(WS_MAKE_RULES)/x11.mk

COMPONENT_NAME=    xfs
COMPONENT_VERSION= 1.2.0
COMPONENT_VERSION= 1.2.1
COMPONENT_SUMMARY= xfs - X Font Server
COMPONENT_FMRI=    x11/xfs
COMPONENT_ARCHIVE_EXTENSION= .tar.gz
COMPONENT_ARCHIVE_HASH= \
  sha256:db2212115783498f8eeaaee1349461d6c4e9d2005e142bacd3a984fe57269860
  sha256:76df0106dbf845cb44534eb89f1ed7e9fb4d466125200baeb4719eb2586ded29
COMPONENT_LICENSE_FILE= COPYING

include $(WS_MAKE_RULES)/common.mk
@@ -42,6 +43,7 @@
REQUIRED_PACKAGES += x11/library/xtrans

# Auto-generated dependencies
REQUIRED_PACKAGES += shell/ksh93
REQUIRED_PACKAGES += SUNWcs
REQUIRED_PACKAGES += system/library
REQUIRED_PACKAGES += x11/library/libxfont2

 components/x11/xfs/manifests/sample-manifest.p5m

@@ -10,10 +10,11 @@
#

#
# Copyright 2018 <contributor>
# 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)

 components/x11/xfs/pkg5

@@ -2,6 +2,7 @@
    "dependencies": [
        "SUNWcs",
        "developer/build/autoconf/xorg-macros",
        "shell/ksh93",
        "system/library",
        "x11/header/x11-protocols",
        "x11/library/libxfont2",

 components/x11/xmodmap/Makefile

@@ -18,11 +18,12 @@
include $(WS_MAKE_RULES)/x11.mk

COMPONENT_NAME=     xmodmap
COMPONENT_VERSION=  1.0.10
COMPONENT_VERSION=  1.0.11
COMPONENT_FMRI=     x11/xmodmap
COMPONENT_SUMMARY=  xmodmap - X11 keyboard/mouse mapping configuration utility
COMPONENT_ARCHIVE_EXTENSION= .tar.gz
COMPONENT_ARCHIVE_HASH= \
  sha256:473f0941d7439d501bb895ff358832b936ec34c749b9704c37a15e11c318487c
  sha256:c4fac9df448b98ac5a1620f364e74ed5f7084baae0d09123700f34d4b63cb5d8

include $(WS_MAKE_RULES)/common.mk


 components/x11/xmodmap/manifests/sample-manifest.p5m

@@ -10,10 +10,11 @@
#

#
# Copyright 2018 <contributor>
# 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)

 components/x11/xmodmap/pkg5

@@ -2,6 +2,7 @@
    "dependencies": [
        "SUNWcs",
        "developer/build/autoconf/xorg-macros",
        "shell/ksh93",
        "system/library",
        "x11/header/x11-protocols",
        "x11/library/libx11"

 components/x11/xpr/Makefile

@@ -18,16 +18,17 @@
include $(WS_MAKE_RULES)/x11.mk

COMPONENT_NAME=           xpr
COMPONENT_VERSION=        1.0.5
COMPONENT_VERSION=        1.1.0
COMPONENT_SUMMARY=        xpr - utility for printing xwd window dump images
COMPONENT_FMRI=           x11/xpr
COMPONENT_ARCHIVE_EXTENSION= .tar.gz
COMPONENT_ARCHIVE_HASH= \
  sha256:b936e0f1f8d63f5ad097a0bbdce2e67c34f5d49b7263f32a832ff62d394d1e1f
  sha256:fabd02fb1a52358d521f1be7422738bc8c9b511a8d82a163888f628db6f6cb18

include $(WS_MAKE_RULES)/common.mk

# Auto-generated dependencies
REQUIRED_PACKAGES += SUNWcs
REQUIRED_PACKAGES += shell/ksh93
REQUIRED_PACKAGES += system/library
REQUIRED_PACKAGES += x11/library/libx11
REQUIRED_PACKAGES += x11/library/libxmuu

 components/x11/xpr/manifests/sample-manifest.p5m

@@ -10,10 +10,11 @@
#

#
# Copyright 2017 <contributor>
# 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)

 components/x11/xpr/patches/6724753.patch

@@ -1,5 +1,5 @@
--- xpr-1.0.5/xpr.c.orig    2018-05-08 16:36:23.067816056 +0000
+++ xpr-1.0.5/xpr.c    2018-05-08 16:45:10.666447370 +0000
--- xpr-1.1.0/xpr.c    2022-07-11 00:57:30.000000000 +0000
+++ xpr-1.1.0.patched/xpr.c    2022-07-12 14:42:36.990257063 +0000
@@ -69,6 +69,29 @@
  * to devices recognized.  Also added -density, -cutoff, and -noposition
  * command line options.
@@ -30,7 +30,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
@@ -116,6 +139,9 @@
@@ -115,6 +138,9 @@
 #define W_PAGE 2550
 #define H_PAGE 3225
 
@@ -40,7 +40,7 @@
 #ifdef NOINLINE
 #define min(x,y) (((x)<(y))?(x):(y))
 #endif /* NOINLINE */
@@ -158,6 +184,50 @@
@@ -155,6 +181,50 @@
 static GrayRec gray3x3 = {sizeof(grayscale3x3)/sizeof(long), 3, 3, grayscale3x3};
 static GrayRec gray4x4 = {sizeof(grayscale4x4)/sizeof(long), 4, 4, grayscale4x4};
 
@@ -91,7 +91,7 @@
 /* mapping tables to map a byte in to the hex representation of its
  * bit-reversal
  */
@@ -195,7 +265,9 @@
@@ -192,7 +262,9 @@
   int *density,
   unsigned int *cutoff,
   float *gamma,
@@ -102,7 +102,7 @@
 static
 void setup_layout(
   enum device device,
@@ -207,7 +279,9 @@
@@ -204,7 +276,9 @@
   char *header,
   char *trailer,
   int *scale,
@@ -113,18 +113,7 @@
 static
 char *convert_data(
     XWDFileHeader *win,
@@ -241,7 +315,9 @@
   int *top_margin,
   int flags,
   const char *header,
-  const char *trailer);
+  const char *trailer,
+  int paper_width,
+  int paper_length);
 static void ln03_finish(void);
 static void la100_setup(int iw, int ih, int scale);
 static void la100_finish(void);
@@ -259,7 +335,9 @@
@@ -227,7 +301,9 @@
   int flags,
   const char *header,
   const char *trailer,
@@ -133,9 +122,9 @@
+  int paper_width,
+  int paper_length);
 static void ps_finish(void);
 static
 void ln03_output_sixels(
@@ -324,6 +402,10 @@
 static void ps_output_bits(
   int iw,
@@ -273,6 +349,10 @@
     enum orientation orientation;
     enum device device;
     XColor *colors = (XColor *)NULL;
@@ -146,7 +135,7 @@
 
     if (!(progname = argv[0]))
       progname = "xpr";
@@ -332,7 +414,14 @@
@@ -281,7 +361,14 @@
 #endif
     parse_args (argc, argv, &scale, &width, &height, &left, &top, &device,
         &flags, &split, &header, &trailer, &plane, &gray,
@@ -162,7 +151,7 @@
 
     if (device == PP) {
     x2pmp(stdin, stdout, scale,
@@ -418,7 +507,8 @@
@@ -370,13 +457,14 @@
 
     /* calculate orientation and scale */
     setup_layout(device, (int) win.pixmap_width, (int) win.pixmap_height,
@@ -170,36 +159,25 @@
+         flags, width, height, header, trailer, &scale, &orientation,
+         w_max, h_max);
 
     if (device == PS) {
     iw = win.pixmap_width;
@@ -440,7 +530,7 @@
     if (device == LN03) {
 /*    ln03_grind_fonts(sixmap, iw, ih, scale, &pixmap); */
     ln03_setup(iw, ih, orientation, scale, left, top,
-           &left_margin, &top_margin, flags, header, trailer);
+           &left_margin, &top_margin, flags, header, trailer, paper_width, paper_length);
     ln03_output_sixels(sixmap, iw, ih, (flags & F_NOSIXOPT), split,
                scale, top_margin, left_margin);
     ln03_finish();
@@ -450,7 +540,7 @@
     la100_finish();
     } else if (device == PS) {
     ps_setup(iw, ih, orientation, scale, left, top,
-           flags, header, trailer, w_name);
+           flags, header, trailer, w_name, paper_width, paper_length);
     ps_output_bits(iw, ih, flags, orientation, &win, data);
     ps_finish();
     } else {
@@ -508,6 +598,8 @@
     iw = win.pixmap_width;
     ih = win.pixmap_height;
 
     ps_setup(iw, ih, orientation, scale, left, top,
-             flags, header, trailer, w_name);
+             flags, header, trailer, w_name, paper_width, paper_length);
     ps_output_bits(iw, ih, flags, orientation, &win, data);
     ps_finish();
 
@@ -428,6 +516,8 @@
         "    -landscape  -portrait\n"
         "    -left <inches>  -top <inches>\n"
         "    -noposition\n"
         "    -nosixopt\n"
+        "    -papertype {letter | legal | A0-A10 | B0-B10 | C0-C10}\n"
+        "    -pheight <inches>[in | cm | mm] -pwidth <inches>[in | cm | mm]\n"
+        "    -papertype {letter | legal | A0-A10 | B0-B10 | C0-C10}\n"
+        "    -pheight <inches>[in | cm | mm] -pwidth <inches>[in | cm | mm]\n"
         "    -plane <n>\n"
         "    -psfig\n"
         "    -render <type>\n"
@@ -540,7 +632,9 @@
@@ -460,7 +550,9 @@
   int *density,
   unsigned int *cutoff,
   float *gamma,
@@ -210,7 +188,7 @@
 {
     register char *output_filename;
     register int f;
@@ -656,12 +750,49 @@
@@ -568,12 +660,49 @@
         output_filename = *argv;
     } else if (!strcmp(*argv, "-portrait")) {
         *flags |= F_PORTRAIT;
@@ -260,7 +238,7 @@
     } else if (!strcmp(*argv, "-rv")) {
         *flags |= F_INVERT;
     } else if (!strcmp(*argv, "-render")) {
@@ -748,7 +879,9 @@
@@ -660,7 +789,9 @@
   char *header,
   char *trailer,
   int *scale,
@@ -271,7 +249,7 @@
 {
     register int w_scale;
     register int h_scale;
@@ -764,22 +897,22 @@
@@ -676,22 +807,22 @@
     if ((win_width < win_height || (flags & F_PORTRAIT)) &&
         !(flags & F_LANDSCAPE)) {
         *orientation = PORTRAIT;
@@ -292,25 +270,14 @@
         h_scale = h_max / win_height;
         *scale = min(w_scale, h_scale);
     }
     } else {            /* device == LA100 */
     } else {
     *orientation = PORTRAIT;
-    *scale = W_MAX / win_width;
+    *scale = wmax / win_width;
     }
     if (*scale == 0) *scale = 1;
     if (*scale > 6) *scale = 6;
@@ -1086,7 +1219,9 @@
   int *top_margin,
   int flags,
   const char *header,
-  const char *trailer)
+  const char *trailer,
+  int paper_width,
+  int paper_length)
 {
     register int i;
     register int lm, tm, xm;
@@ -1368,7 +1503,9 @@
@@ -1072,7 +1203,9 @@
   int flags,
   const char *header,
   const char *trailer,

 components/x11/xpr/pkg5

@@ -2,6 +2,7 @@
    "dependencies": [
        "SUNWcs",
        "developer/build/autoconf/xorg-macros",
        "shell/ksh93",
        "system/library",
        "x11/header/x11-protocols",
        "x11/library/libx11",

 components/x11/xscope/Makefile

@@ -18,11 +18,12 @@
include $(WS_MAKE_RULES)/x11.mk

COMPONENT_NAME=         xscope
COMPONENT_VERSION=      1.4.2
COMPONENT_VERSION=      1.4.3
COMPONENT_FMRI=         x11/diagnostic/xscope
COMPONENT_SUMMARY=      xscope - X Window Protocol Viewer
COMPONENT_ARCHIVE=        $(COMPONENT_SRC).tar.xz
COMPONENT_ARCHIVE_HASH= sha256:507c107ce6969430b9d57441283a4278aecab656bf9d343a7a1ab56ec5ac4764
COMPONENT_ARCHIVE_EXTENSION= .tar.xz
COMPONENT_ARCHIVE_HASH= \
  sha256:50604759481ac9f747d75b3fd1ad1bab846656d5aa2b3cee5d0e4cb814273985

include $(WS_MAKE_RULES)/common.mk


 components/x11/xscope/manifests/sample-manifest.p5m

@@ -10,10 +10,11 @@
#

#
# Copyright 2018 <contributor>
# 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)

 components/x11/xwud/Makefile

@@ -18,11 +18,12 @@
include $(WS_MAKE_RULES)/x11.mk

COMPONENT_NAME=           xwud
COMPONENT_VERSION=        1.0.5
COMPONENT_VERSION=        1.0.6
COMPONENT_SUMMARY=        xwud - viewer application for xwd images
COMPONENT_FMRI=           x11/xwud
COMPONENT_ARCHIVE_EXTENSION= .tar.xz
COMPONENT_ARCHIVE_HASH= \
  sha256:99997051f8a892313f22edf41dab45864e86e7062ee9012d5dbb6a40fc6b10a9
  sha256:64048cd15eba3cd9a3d2e3280650391259ebf6b529f2101d1a20f441038c1afe

include $(WS_MAKE_RULES)/common.mk


 components/x11/xwud/manifests/sample-manifest.p5m

@@ -10,10 +10,11 @@
#

#
# Copyright 2017 <contributor>
# 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)

 components/x11/xwud/pkg5

@@ -2,6 +2,7 @@
    "dependencies": [
        "SUNWcs",
        "developer/build/autoconf/xorg-macros",
        "shell/ksh93",
        "system/library",
        "x11/header/x11-protocols",
        "x11/library/libx11"

 make-rules/x11.mk

@@ -49,7 +49,8 @@
ifeq ($(COMPONENT_X11_DEFAULTS),yes)
COMPONENT_PROJECT_URL ?= $(XORG_PROJECT_URL)
COMPONENT_SRC         ?= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE     ?= $(COMPONENT_SRC).tar.bz2
COMPONENT_ARCHIVE_EXTENSION ?= .tar.bz2
COMPONENT_ARCHIVE     ?= $(COMPONENT_SRC)$(COMPONENT_ARCHIVE_EXTENSION)
ifneq ($(strip $(X11_CATEGORY)),)
COMPONENT_ARCHIVE_URL ?= $(XORG_$(X11_CATEGORY)_BASE_URL)/$(COMPONENT_ARCHIVE)
endif