Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

package updates #1591

Merged
merged 13 commits into from
Mar 16, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build/emacs/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
# http://www.illumos.org/license/CDDL.
# }}}

# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
# Copyright 2025 OmniOS Community Edition (OmniOSce) Association.

. ../../lib/build.sh

PROG=emacs
VER=29.4
VER=30.1
PKG=ooce/editor/emacs
SUMMARY="Emacs editor"
DESC="An extensible, customizable, free/libre text editor - and more."
Expand Down
2 changes: 1 addition & 1 deletion build/emacs/patches/01-gnu-find.patch
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
diff -wpruN --no-dereference '--exclude=*.orig' a~/lisp/progmodes/grep.el a/lisp/progmodes/grep.el
--- a~/lisp/progmodes/grep.el 1970-01-01 00:00:00
+++ a/lisp/progmodes/grep.el 1970-01-01 00:00:00
@@ -506,7 +506,7 @@ This gets tacked on the end of the gener
@@ -548,7 +548,7 @@ This gets tacked on the end of the gener
This variable's value takes effect when `grep-compute-defaults' is called.")

;;;###autoload
Expand Down
2 changes: 1 addition & 1 deletion build/ffmpeg/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
. ../../lib/build.sh

PROG=ffmpeg
VER=7.1
VER=7.1.1
PKG=ooce/multimedia/ffmpeg
SUMMARY="ffmpeg"
DESC="A complete, cross-platform solution to record, "
Expand Down
2 changes: 1 addition & 1 deletion build/ffmpeg/patches-6.1/clang-no-mimpure-text.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
diff -wpruN --no-dereference '--exclude=*.orig' a~/configure a/configure
--- a~/configure 1970-01-01 00:00:00
+++ a/configure 1970-01-01 00:00:00
@@ -5567,7 +5567,7 @@ case $target_os in
@@ -5570,7 +5570,7 @@ case $target_os in
;;
sunos)
SHFLAGS='-shared -Wl,-h,$$(@F)'
Expand Down
4 changes: 2 additions & 2 deletions build/gdb/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
# http://www.illumos.org/license/CDDL.
# }}}

# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
# Copyright 2025 OmniOS Community Edition (OmniOSce) Association.

. ../../lib/build.sh

PROG=gdb
PKG=ooce/developer/gdb
VER=15.2
VER=16.2
SUMMARY="$PROG - GNU Debugger"
DESC="The GNU debugger"

Expand Down
4 changes: 2 additions & 2 deletions build/gdb/patches/features-i386.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
diff -wpruN --no-dereference '--exclude=*.orig' a~/gdb/features/Makefile a/gdb/features/Makefile
--- a~/gdb/features/Makefile 1970-01-01 00:00:00
+++ a/gdb/features/Makefile 1970-01-01 00:00:00
@@ -100,6 +100,11 @@ OUTPUTS = $(patsubst %,$(outdir)/%.dat,$
@@ -98,6 +98,11 @@ OUTPUTS = $(patsubst %,$(outdir)/%.dat,$
# --enable-targets=all GDB. You can override this by passing XMLTOC
# to make on the command line.
XMLTOC = \
Expand All @@ -13,7 +13,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/gdb/features/Makefile a/gdb/f
microblaze-with-stack-protect.xml \
microblaze.xml \
mips-dsp-linux.xml \
@@ -234,6 +239,8 @@ FEATURE_XMLFILES = aarch64-core.xml \
@@ -231,6 +236,8 @@ FEATURE_XMLFILES = aarch64-core.xml \
i386/64bit-sse.xml \
i386/pkeys.xml \
i386/x32-core.xml \
Expand Down
2 changes: 1 addition & 1 deletion build/gdb/patches/fix-attach.patch
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Will be sent to upstream.
diff -wpruN --no-dereference '--exclude=*.orig' a~/gdb/procfs.c a/gdb/procfs.c
--- a~/gdb/procfs.c 1970-01-01 00:00:00
+++ a/gdb/procfs.c 1970-01-01 00:00:00
@@ -1862,7 +1862,7 @@ do_attach (ptid_t ptid)
@@ -1863,7 +1863,7 @@ do_attach (ptid_t ptid)

/* Add it to gdb's thread list. */
ptid = ptid_t (pi->pid, lwpid, 0);
Expand Down
12 changes: 0 additions & 12 deletions build/gdb/patches/fix-null-ptr.patch

This file was deleted.

2 changes: 1 addition & 1 deletion build/gdb/patches/force-bash.patch
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Not suitable for upstream.
diff -wpruN --no-dereference '--exclude=*.orig' a~/gdbsupport/pathstuff.cc a/gdbsupport/pathstuff.cc
--- a~/gdbsupport/pathstuff.cc 1970-01-01 00:00:00
+++ a/gdbsupport/pathstuff.cc 1970-01-01 00:00:00
@@ -372,11 +372,7 @@ find_gdb_home_config_file (const char *n
@@ -378,11 +378,7 @@ find_gdb_home_config_file (const char *n
const char *
get_shell ()
{
Expand Down
2 changes: 1 addition & 1 deletion build/gdb/patches/remove-core-warning.patch
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
diff -wpruN --no-dereference '--exclude=*.orig' a~/gdb/corelow.c a/gdb/corelow.c
--- a~/gdb/corelow.c 1970-01-01 00:00:00
+++ a/gdb/corelow.c 1970-01-01 00:00:00
@@ -869,11 +869,14 @@ core_target::get_core_register_section (
@@ -1318,11 +1318,14 @@ core_target::get_core_register_section (
section_name.c_str ());
return;
}
Expand Down
1 change: 0 additions & 1 deletion build/gdb/patches/series
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
features-i386.patch
syscalls.patch
#
fix-null-ptr.patch
remove-core-warning.patch
force-bash.patch
fix-attach.patch
2 changes: 1 addition & 1 deletion build/go/build-123.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

PROG=go
PKG=ooce/developer/go-123
VER=1.23.6
VER=1.23.7
SUMMARY="The Go Programming Language"
DESC="An open source programming language that makes it easy to build simple, "
DESC+="reliable, and efficient software."
Expand Down
2 changes: 1 addition & 1 deletion build/go/build-124.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

PROG=go
PKG=ooce/developer/go-124
VER=1.24.0
VER=1.24.1
SUMMARY="The Go Programming Language"
DESC="An open source programming language that makes it easy to build simple, "
DESC+="reliable, and efficient software."
Expand Down
6 changes: 3 additions & 3 deletions build/htop/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
# http://www.illumos.org/license/CDDL.
# }}}

# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
# Copyright 2025 OmniOS Community Edition (OmniOSce) Association.

. ../../lib/build.sh

PROG=htop
PKG=ooce/system/htop
VER=3.3.0
VER=3.4.0
SUMMARY="htop"
DESC="An interactive process viewer for Unix"

Expand All @@ -45,7 +45,7 @@ pre_configure() {
init
download_source $PROG $PROG $VER
patch_source
prep_build
prep_build autoconf -autoreconf
build
make_package
clean_up
Expand Down
157 changes: 0 additions & 157 deletions build/htop/patches/illumos.patch

This file was deleted.

2 changes: 1 addition & 1 deletion build/htop/patches/series
Original file line number Diff line number Diff line change
@@ -1 +1 @@
illumos.patch
version.patch
12 changes: 12 additions & 0 deletions build/htop/patches/version.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff -wpruN --no-dereference '--exclude=*.orig' a~/configure.ac a/configure.ac
--- a~/configure.ac 1970-01-01 00:00:00
+++ a/configure.ac 1970-01-01 00:00:00
@@ -14,7 +14,7 @@ m4_define([htop_release_version], [3.4.0
# ----------------------------------------------------------------------

AC_PREREQ([2.69])
-AC_INIT([htop], [m4_join([-],m4_defn([htop_release_version]),m4_defn([htop_git_version]))], [[email protected]], [], [https://htop.dev/])
+AC_INIT([htop], [3.4.0], [[email protected]], [], [https://htop.dev/])

AC_CONFIG_SRCDIR([htop.c])
AC_CONFIG_AUX_DIR([build-aux])
2 changes: 1 addition & 1 deletion build/libheif/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
. ../../lib/build.sh

PROG=libheif
VER=1.19.5
VER=1.19.7
PKG=ooce/library/libheif
SUMMARY="HEIF and AVIF encoder"
DESC="ISO/IEC 23008-12:2017 HEIF and AVIF (AV1 Image File Format) "
Expand Down
2 changes: 1 addition & 1 deletion build/libpng/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
. ../../lib/build.sh

PROG=libpng
VER=1.6.45
VER=1.6.47
PKG=ooce/library/libpng
SUMMARY="libpng"
DESC="libpng is the official PNG reference library"
Expand Down
2 changes: 1 addition & 1 deletion build/libpng/testsuite.log
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ PASS: tests/pngunknown-vpAg
PASS: tests/pngimage-quick
PASS: tests/pngimage-full
============================================================================
Testsuite summary for libpng 1.6.45
Testsuite summary for libpng 1.6.47
============================================================================
# TOTAL: 32
# PASS: 32
Expand Down
12 changes: 8 additions & 4 deletions build/mc/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
# http://www.illumos.org/license/CDDL.
# }}}

# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
# Copyright 2025 OmniOS Community Edition (OmniOSce) Association.

. ../../lib/build.sh

PROG=mc
PKG=ooce/application/mc
VER=4.8.32
VER=4.8.33
SUMMARY="Midnight Commander"
DESC="A feature rich full-screen text mode application that allows you to copy, "
DESC+="move and delete files and whole directory trees, search for files and run "
Expand All @@ -45,8 +45,12 @@ CONFIGURE_OPTS="
--prefix=$PREFIX
--sysconfdir=/etc/$PREFIX
"
LDFLAGS[amd64]+=" -Wl,-R$OPREFIX/lib/amd64"
LDFLAGS[aarch64]+=" -Wl,-R$OPREFIX/lib"

pre_configure() {
typeset arch=$1

LDFLAGS[$arch]+=" -Wl,-R$OPREFIX/${LIBDIRS[$arch]}"
}

init
download_source $PROG $PROG $VER
Expand Down
Loading