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

Core package updates #3869

Merged
merged 4 commits into from
Mar 3, 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
2 changes: 1 addition & 1 deletion build/dbus/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
. ../../lib/build.sh

PROG=dbus
VER=1.16.0
VER=1.16.2
PKG=dbus ##IGNORE##
SUMMARY="filled in below"
DESC="$SUMMARY"
Expand Down
10 changes: 5 additions & 5 deletions build/dbus/patches/inline.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
diff -wpruN --no-dereference '--exclude=*.orig' a~/dbus/dbus-address.h a/dbus/dbus-address.h
--- a~/dbus/dbus-address.h 1970-01-01 00:00:00
+++ a/dbus/dbus-address.h 1970-01-01 00:00:00
@@ -71,12 +71,9 @@ char* dbus_address_unescape_value (const
@@ -73,12 +73,9 @@ char* dbus_address_unescape_value (const
* pointer_to_entries must not be #NULL, but *pointer_to_entries
* may be #NULL.
*/
Expand All @@ -20,7 +20,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/dbus/dbus-address.h a/dbus/db
diff -wpruN --no-dereference '--exclude=*.orig' a~/dbus/dbus-connection.h a/dbus/dbus-connection.h
--- a~/dbus/dbus-connection.h 1970-01-01 00:00:00
+++ a/dbus/dbus-connection.h 1970-01-01 00:00:00
@@ -461,12 +461,9 @@ dbus_bool_t dbus_connection_get_socket
@@ -466,12 +466,9 @@ dbus_bool_t dbus_connection_get_socket
* pointer_to_connection must not be #NULL, but *pointer_to_connection
* may be #NULL.
*/
Expand All @@ -39,7 +39,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/dbus/dbus-connection.h a/dbus
diff -wpruN --no-dereference '--exclude=*.orig' a~/dbus/dbus-message.h a/dbus/dbus-message.h
--- a~/dbus/dbus-message.h 1970-01-01 00:00:00
+++ a/dbus/dbus-message.h 1970-01-01 00:00:00
@@ -369,12 +369,8 @@ dbus_bool_t dbus_message_get_allow_inter
@@ -387,12 +387,8 @@ dbus_bool_t dbus_message_get_allow_inter
* pointer_to_message must not be #NULL, but *pointer_to_message
* may be #NULL.
*/
Expand All @@ -57,7 +57,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/dbus/dbus-message.h a/dbus/db
diff -wpruN --no-dereference '--exclude=*.orig' a~/dbus/dbus-pending-call.h a/dbus/dbus-pending-call.h
--- a~/dbus/dbus-pending-call.h 1970-01-01 00:00:00
+++ a/dbus/dbus-pending-call.h 1970-01-01 00:00:00
@@ -84,12 +84,9 @@ void* dbus_pending_call_get_data
@@ -86,12 +86,9 @@ void* dbus_pending_call_get_data
* pointer_to_pending_call must not be #NULL, but *pointer_to_pending_call
* may be #NULL.
*/
Expand All @@ -76,7 +76,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/dbus/dbus-pending-call.h a/db
diff -wpruN --no-dereference '--exclude=*.orig' a~/dbus/dbus-server.h a/dbus/dbus-server.h
--- a~/dbus/dbus-server.h 1970-01-01 00:00:00
+++ a/dbus/dbus-server.h 1970-01-01 00:00:00
@@ -112,11 +112,8 @@ void* dbus_server_get_data
@@ -114,11 +114,8 @@ void* dbus_server_get_data
* pointer_to_server must not be #NULL, but *pointer_to_server
* may be #NULL.
*/
Expand Down
7 changes: 3 additions & 4 deletions build/dbus/patches/installdir.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
diff --git a/bus/meson.build b/bus/meson.build
index 176894d..6f2b15f 100644
--- a/bus/meson.build
+++ b/bus/meson.build
diff -wpruN --no-dereference '--exclude=*.orig' a~/bus/meson.build a/bus/meson.build
--- a~/bus/meson.build 1970-01-01 00:00:00
+++ a/bus/meson.build 1970-01-01 00:00:00
@@ -139,6 +139,7 @@ dbus_daemon = executable('dbus-daemon',
include_directories: root_include,
link_with: libdbus_daemon_internal,
Expand Down
4 changes: 2 additions & 2 deletions build/dbus/testsuite.log
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
18/28 dbus:dbus / userdb OK 1 subtests passed
19/28 dbus:dbus / variant OK 2 subtests passed
20/28 dbus:dbus / sysdeps OK 3 subtests passed
21/28 dbus:dbus / hash OK 1 subtests passed
22/28 dbus:runs-dbus-daemon+slow / header-fields OK 5 subtests passed
21/28 dbus:runs-dbus-daemon+slow / header-fields OK 5 subtests passed
22/28 dbus:dbus / hash OK 1 subtests passed
23/28 dbus:dbus / relay OK 6 subtests passed
24/28 dbus:dbus / test-dbus-daemon-fork.sh OK
25/28 dbus:runs-dbus-daemon / sd-activation OK 8 subtests passed
Expand Down
3 changes: 2 additions & 1 deletion build/gettext/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
. ../../lib/build.sh

PROG=gettext
VER=0.23.1
VER=0.24
PKG=text/gnu-gettext
SUMMARY="gettext - GNU gettext utility"
DESC="GNU gettext - GNU gettext utility"
Expand Down Expand Up @@ -49,6 +49,7 @@ PKGDIFF_HELPER='
init
download_source $PROG $PROG $VER
patch_source
run_autoreconf -fi
prep_build
build
run_testsuite check
Expand Down
12 changes: 12 additions & 0 deletions build/gettext/patches/configure.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff -wpruN --no-dereference '--exclude=*.orig' a~/gettext-tools/gnulib-m4/getaddrinfo.m4 a/gettext-tools/gnulib-m4/getaddrinfo.m4
--- a~/gettext-tools/gnulib-m4/getaddrinfo.m4 1970-01-01 00:00:00
+++ a/gettext-tools/gnulib-m4/getaddrinfo.m4 1970-01-01 00:00:00
@@ -108,7 +108,7 @@ int getaddrinfo (const char *, const cha
#include <string.h>
]], [[
struct addrinfo hints;
- struct addrinfo ai;
+ struct addrinfo *ai;
memset (&hints, 0, sizeof (hints));
hints.ai_flags = AI_NUMERICSERV;
return getaddrinfo ("www.gnu.org", "http", &hints, &ai) != EAI_NONAME;
1 change: 1 addition & 0 deletions build/gettext/patches/series
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
configure.patch
Loading