From 9837f204ed920f8f594f82261f63e0e336f105e0 Mon Sep 17 00:00:00 2001
From: Andreas Wacknitz <A.Wacknitz@gmx.de>
Date: Sun, 26 Nov 2023 11:39:14 +0100
Subject: [PATCH] gtk+2: drop 32 bit & backend-papi + add test results
---
/dev/null | 25 ------
components/library/gtk+/gtk-backend-cups.p5m | 1
components/library/gtk+/gtk2.p5m | 40 ----------
components/library/gtk+/Makefile | 19 ++--
components/library/gtk+/test/results-all.master | 56 ++++++++++++++
components/library/gtk+/history | 1
components/library/gtk+/pkg5 | 2
components/library/gtk+/manifests/sample-manifest.p5m | 42 ----------
8 files changed, 67 insertions(+), 119 deletions(-)
diff --git a/components/library/gtk+/Makefile b/components/library/gtk+/Makefile
index dc3a475..c75e3c0 100644
--- a/components/library/gtk+/Makefile
+++ b/components/library/gtk+/Makefile
@@ -13,22 +13,19 @@
# Copyright 2016 Alexander Pyhalov
#
-BUILD_BITS = 32_and_64
+BUILD_BITS= 64
+USE_DEFAULT_TEST_TRANSFORMS= yes
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME= gtk+
COMPONENT_VERSION= 2.24.33
+COMPONENT_REVISION= 1
COMPONENT_SUMMARY= GTK+ - GIMP Toolkit Library for creation of graphical user interfaces
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.xz
COMPONENT_ARCHIVE_HASH= sha256:ac2ac757f5942d318a311a54b0c80b5ef295f299c2a73c632f6bfb1ff49cc6da
COMPONENT_ARCHIVE_URL= https://download.gnome.org/sources/$(COMPONENT_NAME)/2.24/$(COMPONENT_ARCHIVE)
COMPONENT_PROJECT_URL= https://www.gtk.org/
-
-TEST_TARGET= $(NO_TESTS)
-
-# Build fails with gcc-13
-GCC_VERSION = 10
include $(WS_MAKE_RULES)/common.mk
@@ -43,8 +40,8 @@
automake -a -f -c --gnu &&\
autoconf )
-CONFIGURE_OPTIONS.32 = --sysconfdir=$(ETCDIR)
-CONFIGURE_OPTIONS.64 = --sysconfdir=$(ETCDIR)/$(MACH64)
+CONFIGURE_OPTIONS += --sysconfdir=$(ETCDIR)
+#CONFIGURE_OPTIONS += --sysconfdir=$(ETCDIR)/$(MACH64)
CONFIGURE_OPTIONS += --enable-shm
CONFIGURE_OPTIONS += --with-gdktarget=x11
CONFIGURE_OPTIONS += --enable-explicit-deps=yes
@@ -62,6 +59,11 @@
COMPONENT_POST_INSTALL_ACTION = ( $(GSED) -i -e 's:/usr/bin/env python:$(PYTHON):' $(PROTO_DIR)/usr/bin/gtk-builder-convert )
+COMPONENT_TEST_TRANSFORMS += \
+ ' -e "/check in/p" ' \
+ ' -e "/======/p" ' \
+ ' -e "/summary/p" '
+
# Manually added dependencies
REQUIRED_PACKAGES += developer/documentation-tool/gtk-doc
REQUIRED_PACKAGES += library/desktop/gobject/gobject-introspection
@@ -74,7 +76,6 @@
REQUIRED_PACKAGES += library/desktop/pango
REQUIRED_PACKAGES += library/glib2
REQUIRED_PACKAGES += library/print/cups-libs
-REQUIRED_PACKAGES += library/print/open-printing
REQUIRED_PACKAGES += system/library
REQUIRED_PACKAGES += system/library/fontconfig
REQUIRED_PACKAGES += system/library/math
diff --git a/components/library/gtk+/gtk-backend-cups.p5m b/components/library/gtk+/gtk-backend-cups.p5m
index e922893..d0be91b 100644
--- a/components/library/gtk+/gtk-backend-cups.p5m
+++ b/components/library/gtk+/gtk-backend-cups.p5m
@@ -23,4 +23,3 @@
license COPYING license='LGPLv2'
file path=usr/lib/$(MACH64)/gtk-2.0/2.10.0/printbackends/libprintbackend-cups.so
-file path=usr/lib/gtk-2.0/2.10.0/printbackends/libprintbackend-cups.so
diff --git a/components/library/gtk+/gtk-backend-papi.p5m b/components/library/gtk+/gtk-backend-papi.p5m
deleted file mode 100644
index f0d4140..0000000
--- a/components/library/gtk+/gtk-backend-papi.p5m
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# This file and its contents are supplied under the terms of the
-# Common Development and Distribution License ("CDDL"). You may
-# only use this file in accordance with the terms 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 2014 Alexander Pyhalov. All rights reserved.
-#
-
-set name=pkg.fmri value=pkg:/library/desktop/gtk2/gtk-backend-papi@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.human-version value=$(HUMAN_VERSION)
-set name=pkg.summary value="$(COMPONENT_SUMMARY) - PAPI (LP) Print Backend"
-set name=info.classification value="org.opensolaris.category.2008:Desktop (GNOME)/Libraries"
-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 COPYING license='LGPLv2'
-
-file path=usr/lib/gtk-2.0/2.10.0/printbackends/libprintbackend-papi.so
diff --git a/components/library/gtk+/gtk2.p5m b/components/library/gtk+/gtk2.p5m
index 051fd61..cfd58a3 100644
--- a/components/library/gtk+/gtk2.p5m
+++ b/components/library/gtk+/gtk2.p5m
@@ -26,13 +26,8 @@
<transform file path=usr/lib/(.*)gtk-2.0/2.10.0/immodules/im-xim.so.* -> default restart_fmri svc:/application/desktop-cache/input-method-cache:default>
file usr/bin/gtk-demo path=usr/demo/jds/bin/gtk-demo mode=0555
-file usr/bin/$(MACH64)/gtk-demo path=usr/demo/jds/bin/$(MACH64)/gtk-demo mode=0555
-file path=etc/$(MACH64)/gtk-2.0/im-multipress.conf preserve=true
file path=etc/gtk-2.0/im-multipress.conf preserve=true
-#file path=usr/bin/$(MACH64)/gtk-builder-convert
-file path=usr/bin/$(MACH64)/gtk-query-immodules-2.0
-file path=usr/bin/$(MACH64)/gtk-update-icon-cache
file path=usr/bin/gtk-builder-convert
file path=usr/bin/gtk-query-immodules-2.0
file path=usr/bin/gtk-update-icon-cache
@@ -331,41 +326,6 @@
file path=usr/lib/$(MACH64)/pkgconfig/gtk+-2.0.pc
file path=usr/lib/$(MACH64)/pkgconfig/gtk+-unix-print-2.0.pc
file path=usr/lib/$(MACH64)/pkgconfig/gtk+-x11-2.0.pc
-file path=usr/lib/girepository-1.0/Gdk-2.0.typelib
-file path=usr/lib/girepository-1.0/GdkX11-2.0.typelib
-file path=usr/lib/girepository-1.0/Gtk-2.0.typelib
-file path=usr/lib/gtk-2.0/2.10.0/engines/libpixmap.so
-file path=usr/lib/gtk-2.0/2.10.0/immodules/im-am-et.so
-file path=usr/lib/gtk-2.0/2.10.0/immodules/im-cedilla.so
-file path=usr/lib/gtk-2.0/2.10.0/immodules/im-cyrillic-translit.so
-file path=usr/lib/gtk-2.0/2.10.0/immodules/im-inuktitut.so
-file path=usr/lib/gtk-2.0/2.10.0/immodules/im-ipa.so
-file path=usr/lib/gtk-2.0/2.10.0/immodules/im-multipress.so
-file path=usr/lib/gtk-2.0/2.10.0/immodules/im-thai.so
-file path=usr/lib/gtk-2.0/2.10.0/immodules/im-ti-er.so
-file path=usr/lib/gtk-2.0/2.10.0/immodules/im-ti-et.so
-file path=usr/lib/gtk-2.0/2.10.0/immodules/im-viqr.so
-file path=usr/lib/gtk-2.0/2.10.0/immodules/im-xim.so
-file path=usr/lib/gtk-2.0/2.10.0/printbackends/libprintbackend-file.so
-file path=usr/lib/gtk-2.0/2.10.0/printbackends/libprintbackend-lpr.so
-file path=usr/lib/gtk-2.0/include/gdkconfig.h
-file path=usr/lib/gtk-2.0/modules/libferret.so
-file path=usr/lib/gtk-2.0/modules/libgail.so
-link path=usr/lib/libgailutil.so target=libgailutil.so.18.0.1
-link path=usr/lib/libgailutil.so.18 target=libgailutil.so.18.0.1
-file path=usr/lib/libgailutil.so.18.0.1
-link path=usr/lib/libgdk-x11-2.0.so target=libgdk-x11-2.0.so.0.2400.33
-link path=usr/lib/libgdk-x11-2.0.so.0 target=libgdk-x11-2.0.so.0.2400.33
-file path=usr/lib/libgdk-x11-2.0.so.0.2400.33
-link path=usr/lib/libgtk-x11-2.0.so target=libgtk-x11-2.0.so.0.2400.33
-link path=usr/lib/libgtk-x11-2.0.so.0 target=libgtk-x11-2.0.so.0.2400.33
-file path=usr/lib/libgtk-x11-2.0.so.0.2400.33
-file path=usr/lib/pkgconfig/gail.pc
-file path=usr/lib/pkgconfig/gdk-2.0.pc
-file path=usr/lib/pkgconfig/gdk-x11-2.0.pc
-file path=usr/lib/pkgconfig/gtk+-2.0.pc
-file path=usr/lib/pkgconfig/gtk+-unix-print-2.0.pc
-file path=usr/lib/pkgconfig/gtk+-x11-2.0.pc
file path=usr/share/aclocal/gtk-2.0.m4
file path=usr/share/gir-1.0/Gdk-2.0.gir
file path=usr/share/gir-1.0/GdkX11-2.0.gir
diff --git a/components/library/gtk+/history b/components/library/gtk+/history
new file mode 100644
index 0000000..96edd07
--- /dev/null
+++ b/components/library/gtk+/history
@@ -0,0 +1 @@
+library/desktop/gtk2/gtk-backend-papi@2.24.33,5.11-2023.0.0.1
diff --git a/components/library/gtk+/manifests/sample-manifest.p5m b/components/library/gtk+/manifests/sample-manifest.p5m
index a7d5e34..fdb7630 100644
--- a/components/library/gtk+/manifests/sample-manifest.p5m
+++ b/components/library/gtk+/manifests/sample-manifest.p5m
@@ -23,12 +23,7 @@
license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
-file path=etc/$(MACH64)/gtk-2.0/im-multipress.conf
file path=etc/gtk-2.0/im-multipress.conf
-file path=usr/bin/$(MACH64)/gtk-builder-convert
-file path=usr/bin/$(MACH64)/gtk-demo
-file path=usr/bin/$(MACH64)/gtk-query-immodules-2.0
-file path=usr/bin/$(MACH64)/gtk-update-icon-cache
file path=usr/bin/gtk-builder-convert
file path=usr/bin/gtk-demo
file path=usr/bin/gtk-query-immodules-2.0
@@ -329,43 +324,6 @@
file path=usr/lib/$(MACH64)/pkgconfig/gtk+-2.0.pc
file path=usr/lib/$(MACH64)/pkgconfig/gtk+-unix-print-2.0.pc
file path=usr/lib/$(MACH64)/pkgconfig/gtk+-x11-2.0.pc
-file path=usr/lib/girepository-1.0/Gdk-2.0.typelib
-file path=usr/lib/girepository-1.0/GdkX11-2.0.typelib
-file path=usr/lib/girepository-1.0/Gtk-2.0.typelib
-file path=usr/lib/gtk-2.0/2.10.0/engines/libpixmap.so
-file path=usr/lib/gtk-2.0/2.10.0/immodules/im-am-et.so
-file path=usr/lib/gtk-2.0/2.10.0/immodules/im-cedilla.so
-file path=usr/lib/gtk-2.0/2.10.0/immodules/im-cyrillic-translit.so
-file path=usr/lib/gtk-2.0/2.10.0/immodules/im-inuktitut.so
-file path=usr/lib/gtk-2.0/2.10.0/immodules/im-ipa.so
-file path=usr/lib/gtk-2.0/2.10.0/immodules/im-multipress.so
-file path=usr/lib/gtk-2.0/2.10.0/immodules/im-thai.so
-file path=usr/lib/gtk-2.0/2.10.0/immodules/im-ti-er.so
-file path=usr/lib/gtk-2.0/2.10.0/immodules/im-ti-et.so
-file path=usr/lib/gtk-2.0/2.10.0/immodules/im-viqr.so
-file path=usr/lib/gtk-2.0/2.10.0/immodules/im-xim.so
-file path=usr/lib/gtk-2.0/2.10.0/printbackends/libprintbackend-cups.so
-file path=usr/lib/gtk-2.0/2.10.0/printbackends/libprintbackend-file.so
-file path=usr/lib/gtk-2.0/2.10.0/printbackends/libprintbackend-lpr.so
-file path=usr/lib/gtk-2.0/2.10.0/printbackends/libprintbackend-papi.so
-file path=usr/lib/gtk-2.0/include/gdkconfig.h
-file path=usr/lib/gtk-2.0/modules/libferret.so
-file path=usr/lib/gtk-2.0/modules/libgail.so
-link path=usr/lib/libgailutil.so target=libgailutil.so.18.0.1
-link path=usr/lib/libgailutil.so.18 target=libgailutil.so.18.0.1
-file path=usr/lib/libgailutil.so.18.0.1
-link path=usr/lib/libgdk-x11-2.0.so target=libgdk-x11-2.0.so.0.2400.33
-link path=usr/lib/libgdk-x11-2.0.so.0 target=libgdk-x11-2.0.so.0.2400.33
-file path=usr/lib/libgdk-x11-2.0.so.0.2400.33
-link path=usr/lib/libgtk-x11-2.0.so target=libgtk-x11-2.0.so.0.2400.33
-link path=usr/lib/libgtk-x11-2.0.so.0 target=libgtk-x11-2.0.so.0.2400.33
-file path=usr/lib/libgtk-x11-2.0.so.0.2400.33
-file path=usr/lib/pkgconfig/gail.pc
-file path=usr/lib/pkgconfig/gdk-2.0.pc
-file path=usr/lib/pkgconfig/gdk-x11-2.0.pc
-file path=usr/lib/pkgconfig/gtk+-2.0.pc
-file path=usr/lib/pkgconfig/gtk+-unix-print-2.0.pc
-file path=usr/lib/pkgconfig/gtk+-x11-2.0.pc
file path=usr/share/aclocal/gtk-2.0.m4
file path=usr/share/gir-1.0/Gdk-2.0.gir
file path=usr/share/gir-1.0/GdkX11-2.0.gir
diff --git a/components/library/gtk+/pkg5 b/components/library/gtk+/pkg5
index 3bcd4e3..b084b39 100644
--- a/components/library/gtk+/pkg5
+++ b/components/library/gtk+/pkg5
@@ -8,7 +8,6 @@
"library/desktop/pango",
"library/glib2",
"library/print/cups-libs",
- "library/print/open-printing",
"runtime/python-39",
"system/library",
"system/library/fontconfig",
@@ -25,7 +24,6 @@
],
"fmris": [
"library/desktop/gtk2/gtk-backend-cups",
- "library/desktop/gtk2/gtk-backend-papi",
"library/desktop/gtk2"
],
"name": "gtk+"
diff --git a/components/library/gtk+/test/results-all.master b/components/library/gtk+/test/results-all.master
new file mode 100644
index 0000000..afd24d7
--- /dev/null
+++ b/components/library/gtk+/test/results-all.master
@@ -0,0 +1,56 @@
+Making check in po
+Making check in po-properties
+Making check in gdk
+Making check in x11
+PASS: checksettings
+============================================================================
+Testsuite summary for gtk+ 2.24.33
+============================================================================
+# TOTAL: 1
+# PASS: 1
+# SKIP: 0
+# XFAIL: 0
+# FAIL: 0
+# XPASS: 0
+# ERROR: 0
+============================================================================
+Making check in .
+============================================================================
+Testsuite summary for gtk+ 2.24.33
+============================================================================
+# TOTAL: 0
+# PASS: 0
+# SKIP: 0
+# XFAIL: 0
+# FAIL: 0
+# XPASS: 0
+# ERROR: 0
+============================================================================
+Making check in tests
+============================================================================
+Testsuite summary for gtk+ 2.24.33
+============================================================================
+# TOTAL: 0
+# PASS: 0
+# SKIP: 0
+# XFAIL: 0
+# FAIL: 0
+# XPASS: 0
+# ERROR: 0
+============================================================================
+Making check in gtk
+Making check in theme-bits
+Making check in .
+FAIL: aliasfilescheck.sh
+============================================================================
+Testsuite summary for gtk+ 2.24.33
+============================================================================
+# TOTAL: 1
+# PASS: 0
+# SKIP: 0
+# XFAIL: 0
+# FAIL: 1
+# XPASS: 0
+# ERROR: 0
+============================================================================
+============================================================================
--
Gitblit v1.9.3