Some Mate fixes

Andreas Wacknitz

2022-07-25 8c8e7c98ac582f97f11f09ce0c39c7f5709a99a1

Some Mate fixes

* mate.mk: handle meson builds and make everything 64-bit only

* libmatekbd: fix build and make it 64-bit only

* libmatemixer: make it 64-bit only

* libmateweather: make it 64-bit only

* mate-backgrounds: fix build

* marco: fix build

 components/desktop/mate/libmatekbd/Makefile

@@ -13,44 +13,26 @@
# Copyright 2016 Ken Mays
# Copyright 2020 Michal Nowak
# Copyright (c) 2021 Tim Mooney.  All rights reserved
# Copyright 2022 Andreas Wacknitz
#

BUILD_BITS=        64_and_32

MATE_CATEGORY= LIB
BUILD_STYLE=configure
include ../../../../make-rules/shared-macros.mk
include $(WS_MAKE_RULES)/mate.mk

COMPONENT_NAME=        libmatekbd
COMPONENT_MJR_VERSION=  1.26
COMPONENT_MNR_VERSION=  0
COMPONENT_VERSION=      $(COMPONENT_MJR_VERSION).$(COMPONENT_MNR_VERSION)
COMPONENT_PROJECT_URL=    https://www.mate-desktop.org
COMPONENT_REVISION=        1
COMPONENT_SUMMARY=    MATE keyboard shared library
COMPONENT_SRC=        $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE=    $(COMPONENT_SRC).tar.xz
COMPONENT_ARCHIVE_HASH=    \
    sha256:220ee8cab0cbc5f42ca6b621bcd009b0b736507945a2aedbffe2235fa1d811ad
COMPONENT_ARCHIVE_URL=    https://pub.mate-desktop.org/releases/$(COMPONENT_MJR_VERSION)/$(COMPONENT_ARCHIVE)
COMPONENT_LICENSE=    GPLv2, LGPLv2, FDLv1.1
COMPONENT_LICENSE_FILE=    $(COMPONENT_NAME).license
COMPONENT_CLASSIFICATION= System/Libraries
COMPONENT_FMRI=        library/desktop/mate/$(COMPONENT_NAME)

TEST_TARGET=        $(NO_TESTS)

include $(WS_MAKE_RULES)/common.mk

PATH=$(PATH.gnu)

COMPONENT_PREP_ACTION=    cd $(@D) && NOCONFIGURE=1 ./autogen.sh

CONFIGURE_OPTIONS+= --sysconfdir=/etc
CONFIGURE_OPTIONS+= --disable-static
CONFIGURE_OPTIONS+= --localstatedir=/var/lib

CONFIGURE_ENV+= PYTHON="$(PYTHON)"

COMPONENT_BUILD_ENV += CC="$(CC)"
COMPONENT_BUILD_ENV += CFLAGS="$(CFLAGS)"

# Auto-generated dependencies
REQUIRED_PACKAGES += library/desktop/cairo

 components/desktop/mate/libmatekbd/libmatekbd.p5m

@@ -14,6 +14,7 @@
#

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)
@@ -38,14 +39,6 @@
file path=usr/lib/$(MACH64)/libmatekbdui.so.4.2.0
file path=usr/lib/$(MACH64)/pkgconfig/libmatekbd.pc
file path=usr/lib/$(MACH64)/pkgconfig/libmatekbdui.pc
link path=usr/lib/libmatekbd.so target=libmatekbd.so.4.2.0
link path=usr/lib/libmatekbd.so.4 target=libmatekbd.so.4.2.0
file path=usr/lib/libmatekbd.so.4.2.0
link path=usr/lib/libmatekbdui.so target=libmatekbdui.so.4.2.0
link path=usr/lib/libmatekbdui.so.4 target=libmatekbdui.so.4.2.0
file path=usr/lib/libmatekbdui.so.4.2.0
file path=usr/lib/pkgconfig/libmatekbd.pc
file path=usr/lib/pkgconfig/libmatekbdui.pc
file path=usr/share/gir-1.0/Matekbd-1.0.gir
file path=usr/share/glib-2.0/schemas/org.mate.peripherals-keyboard-xkb.gschema.xml
file path=usr/share/locale/af/LC_MESSAGES/libmatekbd.mo

 components/desktop/mate/libmatekbd/manifests/sample-manifest.p5m

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

#
# Copyright 2020 <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)
@@ -38,14 +39,6 @@
file path=usr/lib/$(MACH64)/libmatekbdui.so.4.2.0
file path=usr/lib/$(MACH64)/pkgconfig/libmatekbd.pc
file path=usr/lib/$(MACH64)/pkgconfig/libmatekbdui.pc
link path=usr/lib/libmatekbd.so target=libmatekbd.so.4.2.0
link path=usr/lib/libmatekbd.so.4 target=libmatekbd.so.4.2.0
file path=usr/lib/libmatekbd.so.4.2.0
link path=usr/lib/libmatekbdui.so target=libmatekbdui.so.4.2.0
link path=usr/lib/libmatekbdui.so.4 target=libmatekbdui.so.4.2.0
file path=usr/lib/libmatekbdui.so.4.2.0
file path=usr/lib/pkgconfig/libmatekbd.pc
file path=usr/lib/pkgconfig/libmatekbdui.pc
file path=usr/share/gir-1.0/Matekbd-1.0.gir
file path=usr/share/glib-2.0/schemas/org.mate.peripherals-keyboard-xkb.gschema.xml
file path=usr/share/locale/af/LC_MESSAGES/libmatekbd.mo

 components/desktop/mate/libmatekbd/pkg5

@@ -1,10 +1,14 @@
{
    "dependencies": [
        "SUNWcs",
        "developer/build/autoconf",
        "developer/build/pkg-config",
        "developer/documentation-tool/gtk-doc",
        "library/desktop/cairo",
        "library/desktop/gdk-pixbuf",
        "library/desktop/gtk3",
        "library/desktop/libxklavier",
        "library/desktop/mate/mate-common",
        "library/desktop/pango",
        "library/glib2",
        "shell/ksh93",

 components/desktop/mate/libmatemixer/Makefile

@@ -13,53 +13,33 @@
# Copyright 2016 Ken Mays
# Copyright 2020 Michal Nowak
# Copyright (c) 2021 Tim Mooney. All rights reserved
# Copyright 2022 Andreas Wacknitz
#

BUILD_BITS=        64_and_32

MATE_CATEGORY= LIB
BUILD_STYLE= configure
include ../../../../make-rules/shared-macros.mk
include $(WS_MAKE_RULES)/mate.mk

COMPONENT_NAME=        libmatemixer
COMPONENT_MJR_VERSION=  1.26
COMPONENT_MNR_VERSION=    0
COMPONENT_VERSION=    $(COMPONENT_MJR_VERSION).$(COMPONENT_MNR_VERSION)
COMPONENT_PROJECT_URL=    https://www.mate-desktop.org
COMPONENT_REVISION=        1
COMPONENT_SUMMARY=    Mixer library for MATE desktop
COMPONENT_SRC=        $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE=    $(COMPONENT_SRC).tar.xz
COMPONENT_ARCHIVE_HASH=    \
    sha256:9a9bcc605b27e9c5c91a28eb7cb79831e6d6fbf6339f5e5c18d524f3ee259ff1
COMPONENT_ARCHIVE_URL=    https://pub.mate-desktop.org/releases/$(COMPONENT_MJR_VERSION)/$(COMPONENT_ARCHIVE)
COMPONENT_LICENSE=    GPLv2, LGPLv2, FDLv1.1
COMPONENT_LICENSE_FILE=    $(COMPONENT_NAME).license
COMPONENT_CLASSIFICATION= System/Libraries
COMPONENT_FMRI=        library/desktop/mate/$(COMPONENT_NAME)

TEST_TARGET=        $(NO_TESTS)

include $(WS_MAKE_RULES)/common.mk

PATH=$(PATH.gnu)

COMPONENT_PREP_ACTION=    cd $(@D) && NOCONFIGURE=1 ./autogen.sh

CONFIGURE_OPTIONS+= --sysconfdir=/etc
CONFIGURE_OPTIONS+= --disable-static
CONFIGURE_OPTIONS+= --enable-pulseaudio
CONFIGURE_OPTIONS+= --enable-oss
CONFIGURE_OPTIONS+= --localstatedir=/var/lib

CONFIGURE_ENV+= PYTHON="$(PYTHON)"

COMPONENT_BUILD_ENV += CC="$(CC)"
COMPONENT_BUILD_ENV += CFLAGS="$(CFLAGS)"

# Build requirements
REQUIRED_PACKAGES += system/header/header-audio
# if we stop rebuilding configure these two build dependencies can
# be dropped
REQUIRED_PACKAGES += developer/build/autoconf-archive
REQUIRED_PACKAGES += library/desktop/mate/mate-common

# Auto-generated dependencies
REQUIRED_PACKAGES += library/audio/pulseaudio

 components/desktop/mate/libmatemixer/libmatemixer.p5m

@@ -15,6 +15,7 @@
#

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)
@@ -46,13 +47,6 @@
file path=usr/lib/$(MACH64)/libmatemixer/libmatemixer-oss.so
file path=usr/lib/$(MACH64)/libmatemixer/libmatemixer-pulse.so
file path=usr/lib/$(MACH64)/pkgconfig/libmatemixer.pc
link path=usr/lib/libmatemixer.so target=libmatemixer.so.0.0.0
link path=usr/lib/libmatemixer.so.0 target=libmatemixer.so.0.0.0
file path=usr/lib/libmatemixer.so.0.0.0
file path=usr/lib/libmatemixer/libmatemixer-null.so
file path=usr/lib/libmatemixer/libmatemixer-oss.so
file path=usr/lib/libmatemixer/libmatemixer-pulse.so
file path=usr/lib/pkgconfig/libmatemixer.pc
file path=usr/share/locale/af/LC_MESSAGES/libmatemixer.mo
file path=usr/share/locale/am/LC_MESSAGES/libmatemixer.mo
file path=usr/share/locale/ar/LC_MESSAGES/libmatemixer.mo

 components/desktop/mate/libmatemixer/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)
@@ -45,13 +46,6 @@
file path=usr/lib/$(MACH64)/libmatemixer/libmatemixer-oss.so
file path=usr/lib/$(MACH64)/libmatemixer/libmatemixer-pulse.so
file path=usr/lib/$(MACH64)/pkgconfig/libmatemixer.pc
link path=usr/lib/libmatemixer.so target=libmatemixer.so.0.0.0
link path=usr/lib/libmatemixer.so.0 target=libmatemixer.so.0.0.0
file path=usr/lib/libmatemixer.so.0.0.0
file path=usr/lib/libmatemixer/libmatemixer-null.so
file path=usr/lib/libmatemixer/libmatemixer-oss.so
file path=usr/lib/libmatemixer/libmatemixer-pulse.so
file path=usr/lib/pkgconfig/libmatemixer.pc
file path=usr/share/locale/af/LC_MESSAGES/libmatemixer.mo
file path=usr/share/locale/am/LC_MESSAGES/libmatemixer.mo
file path=usr/share/locale/ar/LC_MESSAGES/libmatemixer.mo

 components/desktop/mate/libmatemixer/pkg5

@@ -1,7 +1,10 @@
{
    "dependencies": [
        "SUNWcs",
        "developer/build/autoconf",
        "developer/build/autoconf-archive",
        "developer/build/pkg-config",
        "developer/documentation-tool/gtk-doc",
        "library/audio/pulseaudio",
        "library/desktop/mate/mate-common",
        "library/glib2",

 components/desktop/mate/libmateweather/Makefile

@@ -13,44 +13,24 @@
# Copyright 2016 Ken Mays
# Copyright 2020 Michal Nowak
# Copyright (c) 2021 Tim Mooney.  All rights reserved
# Copyright 2022 Andreas Wacknitz
#

BUILD_BITS=        64_and_32

MATE_CATEGORY= LIB
BUILD_STYLE= configure
include ../../../../make-rules/shared-macros.mk
include $(WS_MAKE_RULES)/mate.mk

COMPONENT_NAME=        libmateweather
COMPONENT_MJR_VERSION=    1.26
COMPONENT_MNR_VERSION=    0
COMPONENT_VERSION=    $(COMPONENT_MJR_VERSION).$(COMPONENT_MNR_VERSION)
COMPONENT_PROJECT_URL=    https://www.mate-desktop.org
COMPONENT_REVISION=        1
COMPONENT_SUMMARY=    Library to accessing online weather information
COMPONENT_SRC=        $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE=    $(COMPONENT_SRC).tar.xz
COMPONENT_ARCHIVE_HASH=    \
    sha256:a7fd9713099c88826fb67249771cd0cdb92ee9d4784068b1a165840b84607b15
COMPONENT_ARCHIVE_URL=    https://pub.mate-desktop.org/releases/$(COMPONENT_MJR_VERSION)/$(COMPONENT_ARCHIVE)
COMPONENT_LICENSE=    GPLv2, LGPLv2, FDLv1.1
COMPONENT_LICENSE_FILE=    $(COMPONENT_NAME).license
COMPONENT_CLASSIFICATION= System/Libraries
COMPONENT_FMRI=        library/desktop/mate/$(COMPONENT_NAME)

TEST_TARGET=        $(NO_TESTS)

include $(WS_MAKE_RULES)/common.mk

PATH=$(PATH.gnu)

COMPONENT_PREP_ACTION = cd $(@D) && NOCONFIGURE=1 ./autogen.sh

CONFIGURE_OPTIONS+= --sysconfdir=/etc
CONFIGURE_OPTIONS+= --disable-static
CONFIGURE_OPTIONS+= --localstatedir=/var/lib

CONFIGURE_ENV+= PYTHON="$(PYTHON)"

COMPONENT_BUILD_ENV += CC="$(CC)"
COMPONENT_BUILD_ENV += CFLAGS="$(CFLAGS)"

# Auto-generated dependencies
REQUIRED_PACKAGES += library/desktop/gdk-pixbuf

 components/desktop/mate/libmateweather/libmateweather.p5m

@@ -16,6 +16,7 @@
#

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)
@@ -36,10 +37,6 @@
link path=usr/lib/$(MACH64)/libmateweather.so.1 target=libmateweather.so.1.6.9
file path=usr/lib/$(MACH64)/libmateweather.so.1.6.9
file path=usr/lib/$(MACH64)/pkgconfig/mateweather.pc
link path=usr/lib/libmateweather.so target=libmateweather.so.1.6.9
link path=usr/lib/libmateweather.so.1 target=libmateweather.so.1.6.9
file path=usr/lib/libmateweather.so.1.6.9
file path=usr/lib/pkgconfig/mateweather.pc
file path=usr/share/glib-2.0/schemas/org.mate.weather.gschema.xml
file path=usr/share/icons/hicolor/16x16/status/weather-clear-night-000.png
file path=usr/share/icons/hicolor/16x16/status/weather-clear-night-010.png

 components/desktop/mate/libmateweather/manifests/sample-manifest.p5m

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

#
# Copyright 2021 <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)
@@ -34,10 +35,6 @@
link path=usr/lib/$(MACH64)/libmateweather.so.1 target=libmateweather.so.1.6.9
file path=usr/lib/$(MACH64)/libmateweather.so.1.6.9
file path=usr/lib/$(MACH64)/pkgconfig/mateweather.pc
link path=usr/lib/libmateweather.so target=libmateweather.so.1.6.9
link path=usr/lib/libmateweather.so.1 target=libmateweather.so.1.6.9
file path=usr/lib/libmateweather.so.1.6.9
file path=usr/lib/pkgconfig/mateweather.pc
file path=usr/share/glib-2.0/schemas/org.mate.weather.gschema.xml
file path=usr/share/icons/hicolor/16x16/status/weather-clear-night-000.png
file path=usr/share/icons/hicolor/16x16/status/weather-clear-night-010.png

 components/desktop/mate/libmateweather/pkg5

@@ -1,8 +1,12 @@
{
    "dependencies": [
        "SUNWcs",
        "developer/build/autoconf",
        "developer/build/pkg-config",
        "developer/documentation-tool/gtk-doc",
        "library/desktop/gdk-pixbuf",
        "library/desktop/gtk3",
        "library/desktop/mate/mate-common",
        "library/glib2",
        "library/libsoup",
        "library/libxml2",

 components/desktop/mate/marco/Makefile

@@ -13,47 +13,34 @@
# Copyright 2016 Till Wegmueller
# Copyright 2020 Michal Nowak
# Copyright (c) 2021 Tim Mooney.  All rights reserved
# Copyright 2022 Andreas Wacknitz
#
BUILD_BITS=        64
BUILD_STYLE=        meson

MATE_CATEGORY= LIB
BUILD_STYLE= meson
include ../../../../make-rules/shared-macros.mk
include $(WS_MAKE_RULES)/mate.mk

COMPONENT_NAME=        marco
COMPONENT_MJR_VERSION=    1.26
COMPONENT_MNR_VERSION=    0
COMPONENT_VERSION=    $(COMPONENT_MJR_VERSION).$(COMPONENT_MNR_VERSION)
COMPONENT_PROJECT_URL=    https://www.mate-desktop.org
COMPONENT_REVISION=        1
COMPONENT_SUMMARY=    MATE Window Manager
COMPONENT_SRC=        $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE=    $(COMPONENT_SRC).tar.xz
COMPONENT_ARCHIVE_HASH= sha256:f63c08cd8b07450ab3e33a04605c4f9e69522358884273b3cbcf30275eee5b05
COMPONENT_ARCHIVE_URL=    https://pub.mate-desktop.org/releases/$(COMPONENT_MJR_VERSION)/$(COMPONENT_ARCHIVE)
COMPONENT_LICENSE=    GPLv2, LGPLv2, FDLv1.1
COMPONENT_CLASSIFICATION= System/Libraries
COMPONENT_FMRI=        desktop/mate/$(COMPONENT_NAME)

TEST_TARGET=        $(NO_TESTS)

include $(WS_MAKE_RULES)/common.mk

PATH=$(PATH.gnu)

CFLAGS+=-D__EXTENSIONS__
CFLAGS+=-std=gnu99

CONFIGURE_OPTIONS+= --sysconfdir=/etc
CONFIGURE_OPTIONS+= --localstatedir=/var/lib

COMPONENT_BUILD_ENV += CC="$(CC)"
COMPONENT_BUILD_ENV += CFLAGS="$(CFLAGS)"
COMPONENT_BUILD_ENV += CPPFLAGS="$(CPPFLAGS)"

# Build dependencies
REQUIRED_PACKAGES += gnome/zenity
REQUIRED_PACKAGES += text/itstool
# Needed for autogen.sh
REQUIRED_PACKAGES += library/desktop/mate/mate-common
REQUIRED_PACKAGES += library/gnome/yelp-tools

# Auto-generated dependencies

 components/desktop/mate/marco/manifests/sample-manifest.p5m

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

#
# Copyright 2021 <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/desktop/mate/marco/marco.p5m

@@ -16,6 +16,7 @@
#

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/desktop/mate/marco/patches/02-meson.build.patch

New file
@@ -0,0 +1,13 @@
Newer meson version don't accept positional arguments. See https://github.com/mesonbuild/meson/issues/9441

--- marco-1.26.0/src/meson.build.orig    2021-08-04 09:45:37.000000000 +0000
+++ marco-1.26.0/src/meson.build    2022-07-25 11:09:48.772241106 +0000
@@ -211,7 +211,7 @@
   ]
 
 foreach xml : xml_files
-  i18n.merge_file(xml,
+  i18n.merge_file(
     input: xml+ '.in',
     output: xml,
     po_dir: '../po',

 components/desktop/mate/marco/pkg5

@@ -3,6 +3,8 @@
        "SUNWcs",
        "developer/build/meson",
        "developer/build/ninja",
        "developer/build/pkg-config",
        "developer/documentation-tool/gtk-doc",
        "gnome/zenity",
        "library/desktop/atk",
        "library/desktop/cairo",

 components/desktop/mate/mate-backgrounds/Makefile

@@ -12,41 +12,24 @@
# Copyright 2016 Till Wegmueller
# Copyright 2016 Ken Mays
# Copyright 2020 Michal Nowak
# Copyright 2022 Andreas Wacknitz
#

BUILD_BITS=        64
MATE_CATEGORY= LIB
BUILD_STYLE=        meson

include ../../../../make-rules/shared-macros.mk
include $(WS_MAKE_RULES)/mate.mk

COMPONENT_NAME=        mate-backgrounds
COMPONENT_MJR_VERSION=    1.26
COMPONENT_MNR_VERSION=    0
COMPONENT_VERSION=    $(COMPONENT_MJR_VERSION).$(COMPONENT_MNR_VERSION)
COMPONENT_PROJECT_URL=    http://www.mate-desktop.org
COMPONENT_REVISION=        1
COMPONENT_SUMMARY=    Collection of backgrounds for MATE
COMPONENT_SRC=        $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE=    $(COMPONENT_SRC).tar.xz
COMPONENT_FMRI= desktop/mate/$(COMPONENT_NAME)
COMPONENT_ARCHIVE_HASH=    \
    sha256:0dc9127224ae1573301cfa0aaa6c6262827072d2bf6e5c67c9e1aae19f85e90c
COMPONENT_ARCHIVE_URL=    https://pub.mate-desktop.org/releases/$(COMPONENT_MJR_VERSION)/$(COMPONENT_ARCHIVE)
COMPONENT_LICENSE=    GPLv2, LGPLv2, FDLv1.1
COMPONENT_LICENSE_FILE=    $(COMPONENT_NAME).license
COMPONENT_CLASSIFICATION= System/Libraries
COMPONENT_FMRI=        desktop/mate/$(COMPONENT_NAME)

TEST_TARGET=        $(NO_TESTS)

include $(WS_MAKE_RULES)/common.mk

PATH=$(PATH.gnu)

CONFIGURE_OPTIONS+= --sysconfdir=/etc
CONFIGURE_OPTIONS+= --libexecdir=/usr/lib/mate
CONFIGURE_OPTIONS+= --localstatedir=/var/lib

CONFIGURE_ENV+= PYTHON="$(PYTHON)"

COMPONENT_BUILD_ENV += CC="$(CC)"
COMPONENT_BUILD_ENV += CFLAGS="$(CFLAGS)"


 components/desktop/mate/mate-backgrounds/manifests/sample-manifest.p5m

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

#
# Copyright 2020 <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/desktop/mate/mate-backgrounds/mate-backgrounds.p5m

@@ -15,6 +15,7 @@
#

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/desktop/mate/mate-backgrounds/patches/01-meson-build.patch

New file
@@ -0,0 +1,32 @@
Newer meson version don't accept positional arguments. See https://github.com/mesonbuild/meson/issues/9441

--- mate-backgrounds-1.26.0/abstract/meson.build.orig    2021-08-04 10:38:32.000000000 +0000
+++ mate-backgrounds-1.26.0/abstract/meson.build    2022-07-25 10:12:47.588025695 +0000
@@ -1,6 +1,6 @@
 # replace @datadir@ and translate
 metadata = 'mate-abstract.xml'
-i18n.merge_file(metadata,
+i18n.merge_file(
   input: configure_file(
     input: metadata + '.in.in',
     output: metadata + '.in',
--- mate-backgrounds-1.26.0/desktop/meson.build.orig    2021-08-04 10:38:32.000000000 +0000
+++ mate-backgrounds-1.26.0/desktop/meson.build    2022-07-25 10:13:00.983788622 +0000
@@ -1,6 +1,6 @@
 # replace @datadir@ and translate
 metadata = 'mate-desktop.xml'
-i18n.merge_file(metadata,
+i18n.merge_file(
   input: configure_file(
     input: metadata + '.in.in',
     output: metadata + '.in',
--- mate-backgrounds-1.26.0/nature/meson.build.orig    2021-08-04 10:38:32.000000000 +0000
+++ mate-backgrounds-1.26.0/nature/meson.build    2022-07-25 10:13:16.447308400 +0000
@@ -1,6 +1,6 @@
 # replace @datadir@ and translate
 metadata = 'mate-nature.xml'
-i18n.merge_file(metadata,
+i18n.merge_file(
   input: configure_file(
     input: metadata + '.in.in',
     output: metadata + '.in',

 components/desktop/mate/mate-backgrounds/pkg5

@@ -3,6 +3,9 @@
        "SUNWcs",
        "developer/build/meson",
        "developer/build/ninja",
        "developer/build/pkg-config",
        "developer/documentation-tool/gtk-doc",
        "library/desktop/mate/mate-common",
        "shell/ksh93",
        "system/library"
    ],

 make-rules/mate.mk

@@ -8,8 +8,11 @@
#

#
# Copyright (c) 2021, Andreas Wacknitz. All rights reserved.
# Copyright (c) 2022, Andreas Wacknitz. All rights reserved.
#

BUILD_BITS= 64
BUILD_STYLE ?= configure

COMPONENT_VERSION=  $(COMPONENT_MJR_VERSION).$(COMPONENT_MNR_VERSION)
COMPONENT_PROJECT_URL=  https://www.mate-desktop.org
@@ -22,11 +25,15 @@

PATH=$(PATH.gnu)

ifeq   ($(strip $(BUILD_STYLE)),configure)
COMPONENT_PREP_ACTION= cd $(@D)  && NOCONFIGURE=1 ./autogen.sh
endif

CONFIGURE_OPTIONS+= --sysconfdir=/etc
CONFIGURE_OPTIONS+= --libexecdir=$(CONFIGURE_LIBDIR.$(BITS))/mate
ifeq   ($(strip $(BUILD_STYLE)),configure)
CONFIGURE_OPTIONS+= --disable-static
endif
CONFIGURE_OPTIONS+= --localstatedir=/var/lib

CONFIGURE_ENV+= PYTHON="$(PYTHON)"
@@ -38,23 +45,22 @@
# Set defaults for Mate libraries
#
ifeq ($(strip $(MATE_CATEGORY)),LIB)
BUILD_BITS = 32_and_64
COMPONENT_CLASSIFICATION=    System/Libraries
COMPONENT_FMRI=             library/desktop/mate/$(COMPONENT_NAME)
COMPONENT_CLASSIFICATION ?=    System/Libraries
COMPONENT_FMRI ?=             library/desktop/mate/$(COMPONENT_NAME)
endif


#
# Set defaults for Mate applications
#
ifeq ($(strip $(MATE_CATEGORY)),APP)
BUILD_BITS = 64
PREFERRED_BITS=    64
COMPONENT_FMRI=     desktop/mate/$(COMPONENT_NAME)
# APPs don't have a common COMPONENT_CLASSIFICATION and thus need to define it separately.
COMPONENT_FMRI ?=     desktop/mate/$(COMPONENT_NAME)
endif

# Default build dependencies
ifeq   ($(strip $(BUILD_STYLE)),configure)
REQUIRED_PACKAGES += developer/build/autoconf
endif
REQUIRED_PACKAGES += developer/build/pkg-config
REQUIRED_PACKAGES += developer/documentation-tool/gtk-doc
REQUIRED_PACKAGES += library/desktop/mate/mate-common