From 5f10a5262f27e16b2c6565e501d18b416933f5b9 Mon Sep 17 00:00:00 2001
From: hoewweken <44616757+hoewweken@users.noreply.github.com>
Date: Fri, 04 Aug 2023 12:21:38 +0200
Subject: [PATCH] rebuild geany, dosbox, mosh for gcc-10-deps
---
components/shell/mosh/pkg5 | 5 ++---
components/runtime/dosbox/pkg5 | 5 ++---
components/runtime/dosbox/manifests/sample-manifest.p5m | 3 ++-
components/runtime/dosbox/dosbox.p5m | 1 +
components/editor/geany/Makefile | 4 +---
components/runtime/dosbox/Makefile | 1 +
components/editor/geany/pkg5 | 6 ++----
components/shell/mosh/Makefile | 1 +
8 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/components/editor/geany/Makefile b/components/editor/geany/Makefile
index 3919365..1962edb 100644
--- a/components/editor/geany/Makefile
+++ b/components/editor/geany/Makefile
@@ -19,7 +19,7 @@
COMPONENT_NAME= geany
COMPONENT_VERSION= 1.38
-COMPONENT_REVISION= 3
+COMPONENT_REVISION= 4
COMPONENT_CLASSIFICATION=System/Text Tools
COMPONENT_FMRI= editor/geany
COMPONENT_SUMMARY= A fast and lightweight IDE
@@ -54,10 +54,8 @@
REQUIRED_PACKAGES += library/graphics/pixman
REQUIRED_PACKAGES += library/libffi
REQUIRED_PACKAGES += library/zlib
-REQUIRED_PACKAGES += system/library
REQUIRED_PACKAGES += system/library/fontconfig
REQUIRED_PACKAGES += system/library/freetype-2
-REQUIRED_PACKAGES += system/library/math
REQUIRED_PACKAGES += x11/library/libx11
REQUIRED_PACKAGES += x11/library/libxau
REQUIRED_PACKAGES += x11/library/libxcb
diff --git a/components/editor/geany/pkg5 b/components/editor/geany/pkg5
index 4b43ab0..a23d8b0 100644
--- a/components/editor/geany/pkg5
+++ b/components/editor/geany/pkg5
@@ -1,6 +1,5 @@
{
"dependencies": [
- "SUNWcs",
"compress/bzip2",
"developer/documentation-tool/doxygen",
"image/library/libpng16",
@@ -16,12 +15,11 @@
"library/graphics/pixman",
"library/libffi",
"library/zlib",
- "shell/ksh93",
"system/library",
"system/library/fontconfig",
"system/library/freetype-2",
- "system/library/g++-7-runtime",
- "system/library/gcc-7-runtime",
+ "system/library/g++-10-runtime",
+ "system/library/gcc-10-runtime",
"system/library/math",
"x11/library/libx11",
"x11/library/libxau",
diff --git a/components/runtime/dosbox/Makefile b/components/runtime/dosbox/Makefile
index 12bf9cf..c3c97c0 100644
--- a/components/runtime/dosbox/Makefile
+++ b/components/runtime/dosbox/Makefile
@@ -18,6 +18,7 @@
COMPONENT_NAME= dosbox
COMPONENT_VERSION= 0.74-3
+COMPONENT_REVISION= 1
IPS_COMPONENT_VERSION= 0.74.3
COMPONENT_PROJECT_URL= https://www.dosbox.com/
COMPONENT_SUMMARY= DosBox - DOS Emulator
diff --git a/components/runtime/dosbox/dosbox.p5m b/components/runtime/dosbox/dosbox.p5m
index 10bcac9..f62fbbf 100644
--- a/components/runtime/dosbox/dosbox.p5m
+++ b/components/runtime/dosbox/dosbox.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)
diff --git a/components/runtime/dosbox/manifests/sample-manifest.p5m b/components/runtime/dosbox/manifests/sample-manifest.p5m
index d9d544c..efbf286 100644
--- a/components/runtime/dosbox/manifests/sample-manifest.p5m
+++ b/components/runtime/dosbox/manifests/sample-manifest.p5m
@@ -10,10 +10,11 @@
#
#
-# Copyright 2016 <contributor>
+# Copyright 2023 <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)
diff --git a/components/runtime/dosbox/pkg5 b/components/runtime/dosbox/pkg5
index 57de4a0..8d72500 100644
--- a/components/runtime/dosbox/pkg5
+++ b/components/runtime/dosbox/pkg5
@@ -1,13 +1,12 @@
{
"dependencies": [
- "SUNWcs",
"image/library/libpng16",
"library/audio/sdl-sound",
"library/sdl",
"library/zlib",
"system/library",
- "system/library/g++-7-runtime",
- "system/library/gcc-7-runtime",
+ "system/library/g++-10-runtime",
+ "system/library/gcc-10-runtime",
"system/library/math",
"x11/library/libx11"
],
diff --git a/components/shell/mosh/Makefile b/components/shell/mosh/Makefile
index 3270d5e..36f5524 100644
--- a/components/shell/mosh/Makefile
+++ b/components/shell/mosh/Makefile
@@ -26,6 +26,7 @@
COMPONENT_NAME= mosh
COMPONENT_VERSION= 1.4.0
+COMPONENT_REVISION= 1
COMPONENT_SUMMARY= Mosh (mobile shell) - Remote terminal application that allows roaming, supports intermittent connectivity, and provides intelligent local echo and line editing of user keystrokes (replacement for SSH).
COMPONENT_PROJECT_URL= https://mosh.org
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
diff --git a/components/shell/mosh/pkg5 b/components/shell/mosh/pkg5
index 36ab566..b092c55 100644
--- a/components/shell/mosh/pkg5
+++ b/components/shell/mosh/pkg5
@@ -5,10 +5,9 @@
"library/ncurses",
"library/security/openssl-11",
"library/zlib",
- "shell/ksh93",
"system/library",
- "system/library/g++-7-runtime",
- "system/library/gcc-7-runtime",
+ "system/library/g++-10-runtime",
+ "system/library/gcc-10-runtime",
"system/library/libutempter",
"system/library/math",
"utility/bash-completion"
--
Gitblit v1.9.3