Skip to content

Commit 6cfd509

Browse files
committed
Merge branch 'auxpow-30.x' into 30.x
2 parents ea504fd + 15e4e84 commit 6cfd509

28 files changed

+1647
-504
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ set(CLIENT_NAME "Namecoin Core")
3030
set(CLIENT_VERSION_MAJOR 30)
3131
set(CLIENT_VERSION_MINOR 0)
3232
set(CLIENT_VERSION_BUILD 0)
33-
set(CLIENT_VERSION_RC 2)
33+
set(CLIENT_VERSION_RC 0)
3434
set(CLIENT_VERSION_IS_RELEASE "true")
3535
set(COPYRIGHT_YEAR "2025")
3636

contrib/guix/symbol-check.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@
112112
'libfontconfig.so.1', # font support
113113
'libfreetype.so.6', # font parsing
114114
'libdl.so.2', # programming interface to dynamic linker
115-
'libxcb-cursor.so.0',
116115
'libxcb-icccm.so.4',
117116
'libxcb-image.so.0',
118117
'libxcb-shm.so.0',

contrib/macdeploy/macdeployqtplus

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -466,18 +466,18 @@ if config.translations_dir:
466466
sys.stderr.write(f"Error: Could not find translation dir \"{config.translations_dir[0]}\"\n")
467467
sys.exit(1)
468468

469-
print("+ Adding Qt translations +")
469+
print("+ Adding Qt translations +")
470470

471-
translations = Path(config.translations_dir[0])
471+
translations = Path(config.translations_dir[0])
472472

473-
regex = re.compile('qt_[a-z]*(.qm|_[A-Z]*.qm)')
473+
regex = re.compile('qt_[a-z]*(.qm|_[A-Z]*.qm)')
474474

475-
lang_files = [x for x in translations.iterdir() if regex.match(x.name)]
475+
lang_files = [x for x in translations.iterdir() if regex.match(x.name)]
476476

477-
for file in lang_files:
478-
if verbose:
479-
print(file.as_posix(), "->", os.path.join(applicationBundle.resourcesPath, file.name))
480-
shutil.copy2(file.as_posix(), os.path.join(applicationBundle.resourcesPath, file.name))
477+
for file in lang_files:
478+
if verbose:
479+
print(file.as_posix(), "->", os.path.join(applicationBundle.resourcesPath, file.name))
480+
shutil.copy2(file.as_posix(), os.path.join(applicationBundle.resourcesPath, file.name))
481481

482482
# ------------------------------------------------
483483

depends/packages/libxcb_util_cursor.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ $(package)_sha256_hash=0e9c5446dc6f3beb8af6ebfcc9e27bcc6da6fe2860f7fc07b99144dfa
66
$(package)_dependencies=libxcb libxcb_util_render libxcb_util_image
77

88
define $(package)_set_vars
9-
$(package)_config_opts = --disable-static
9+
$(package)_config_opts = --disable-shared
1010
$(package)_config_opts += --disable-dependency-tracking --enable-option-checking
1111
endef
1212

doc/build-unix.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,6 @@ the necessary parts of Qt, the libqrencode and pass `-DBUILD_GUI=ON`. Skip if yo
8181

8282
sudo apt-get install qt6-base-dev qt6-tools-dev qt6-l10n-tools qt6-tools-dev-tools libgl-dev
8383

84-
For Qt 6.5 and later, the `libxcb-cursor0` package must be installed at runtime.
85-
8684
Additionally, to support Wayland protocol for modern desktop environments:
8785

8886
sudo apt install qt6-wayland
@@ -133,8 +131,6 @@ the necessary parts of Qt, the libqrencode and pass `-DBUILD_GUI=ON`. Skip if yo
133131

134132
sudo dnf install qt6-qtbase-devel qt6-qttools-devel
135133

136-
For Qt 6.5 and later, the `xcb-util-cursor` package must be installed at runtime.
137-
138134
Additionally, to support Wayland protocol for modern desktop environments:
139135

140136
sudo dnf install qt6-qtwayland
@@ -182,8 +178,6 @@ the necessary parts of Qt, the libqrencode and pass `-DBUILD_GUI=ON`. Skip if yo
182178

183179
apk add qt6-qtbase-dev qt6-qttools-dev
184180

185-
For Qt 6.5 and later, the `xcb-util-cursor` package must be installed at runtime.
186-
187181
The GUI will be able to encode addresses in QR codes unless this feature is explicitly disabled. To install libqrencode, run:
188182

189183
apk add libqrencode-dev

doc/man/namecoin-cli.1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
2-
.TH NAMECOIN-CLI "1" "September 2025" "namecoin-cli v30.0.0rc2" "User Commands"
2+
.TH NAMECOIN-CLI "1" "October 2025" "namecoin-cli v30.0.0" "User Commands"
33
.SH NAME
4-
namecoin-cli \- manual page for namecoin-cli v30.0.0rc2
4+
namecoin-cli \- manual page for namecoin-cli v30.0.0
55
.SH SYNOPSIS
66
.B namecoin-cli
77
[\fI\,options\/\fR] \fI\,<command> \/\fR[\fI\,params\/\fR]
@@ -15,7 +15,7 @@ namecoin-cli \- manual page for namecoin-cli v30.0.0rc2
1515
.B namecoin-cli
1616
[\fI\,options\/\fR] \fI\,help <command>\/\fR
1717
.SH DESCRIPTION
18-
Namecoin Core RPC client version v30.0.0rc2
18+
Namecoin Core RPC client version v30.0.0
1919
.PP
2020
The namecoin\-cli utility provides a command line interface to interact with a Namecoin Core RPC server.
2121
.PP

doc/man/namecoin-qt.1

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
2-
.TH NAMECOIN-QT "1" "September 2025" "namecoin-qt v30.0.0rc2" "User Commands"
2+
.TH NAMECOIN-QT "1" "October 2025" "namecoin-qt v30.0.0" "User Commands"
33
.SH NAME
4-
namecoin-qt \- manual page for namecoin-qt v30.0.0rc2
4+
namecoin-qt \- manual page for namecoin-qt v30.0.0
55
.SH SYNOPSIS
66
.B namecoin-qt
77
[\fI\,options\/\fR] [\fI\,URI\/\fR]
88
.SH DESCRIPTION
9-
Namecoin Core version v30.0.0rc2
9+
Namecoin Core version v30.0.0
1010
.PP
1111
The namecoin\-qt application provides a graphical interface for interacting with Namecoin Core.
1212
.PP
@@ -707,13 +707,13 @@ Equivalent bytes per sigop in transactions for relay and mining
707707
.HP
708708
\fB\-datacarrier\fR
709709
.IP
710-
(DEPRECATED) Relay and mine data carrier transactions (default: 1)
710+
Relay and mine data carrier transactions (default: 1)
711711
.HP
712712
\fB\-datacarriersize\fR
713713
.IP
714-
(DEPRECATED) Relay and mine transactions whose data\-carrying raw
715-
scriptPubKeys in aggregate are of this size or less, allowing
716-
multiple outputs (default: 100000)
714+
Relay and mine transactions whose data\-carrying raw scriptPubKeys in
715+
aggregate are of this size or less, allowing multiple outputs
716+
(default: 100000)
717717
.HP
718718
\fB\-minrelaytxfee=\fR<amt>
719719
.IP

doc/man/namecoin-tx.1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
2-
.TH NAMECOIN-TX "1" "September 2025" "namecoin-tx v30.0.0rc2" "User Commands"
2+
.TH NAMECOIN-TX "1" "October 2025" "namecoin-tx v30.0.0" "User Commands"
33
.SH NAME
4-
namecoin-tx \- manual page for namecoin-tx v30.0.0rc2
4+
namecoin-tx \- manual page for namecoin-tx v30.0.0
55
.SH SYNOPSIS
66
.B namecoin-tx
77
[\fI\,options\/\fR] \fI\,<hex-tx> \/\fR[\fI\,commands\/\fR]
88
.br
99
.B namecoin-tx
1010
[\fI\,options\/\fR] \fI\,-create \/\fR[\fI\,commands\/\fR]
1111
.SH DESCRIPTION
12-
Namecoin Core namecoin\-tx utility version v30.0.0rc2
12+
Namecoin Core namecoin\-tx utility version v30.0.0
1313
.PP
1414
The namecoin\-tx tool is used for creating and modifying transactions.
1515
.PP

doc/man/namecoin-util.1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
2-
.TH NAMECOIN-UTIL "1" "September 2025" "namecoin-util v30.0.0rc2" "User Commands"
2+
.TH NAMECOIN-UTIL "1" "October 2025" "namecoin-util v30.0.0" "User Commands"
33
.SH NAME
4-
namecoin-util \- manual page for namecoin-util v30.0.0rc2
4+
namecoin-util \- manual page for namecoin-util v30.0.0
55
.SH SYNOPSIS
66
.B bitcoin-util
77
[\fI\,options\/\fR] [\fI\,command\/\fR]
88
.br
99
.B bitcoin-util
1010
[\fI\,options\/\fR] \fI\,grind <hex-block-header>\/\fR
1111
.SH DESCRIPTION
12-
Namecoin Core bitcoin\-util utility version v30.0.0rc2
12+
Namecoin Core bitcoin\-util utility version v30.0.0
1313
.PP
1414
The bitcoin\-util tool provides bitcoin related functionality that does not rely on the ability to access a running node. Available [commands] are listed below.
1515
.SH OPTIONS

doc/man/namecoin-wallet.1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
2-
.TH NAMECOIN-WALLET "1" "September 2025" "namecoin-wallet v30.0.0rc2" "User Commands"
2+
.TH NAMECOIN-WALLET "1" "October 2025" "namecoin-wallet v30.0.0" "User Commands"
33
.SH NAME
4-
namecoin-wallet \- manual page for namecoin-wallet v30.0.0rc2
4+
namecoin-wallet \- manual page for namecoin-wallet v30.0.0
55
.SH SYNOPSIS
66
.B namecoin-wallet
77
[\fI\,options\/\fR] \fI\,<command>\/\fR
88
.SH DESCRIPTION
9-
Namecoin Core namecoin\-wallet utility version v30.0.0rc2
9+
Namecoin Core namecoin\-wallet utility version v30.0.0
1010
.PP
1111
namecoin\-wallet is an offline tool for creating and interacting with Namecoin Core wallet files.
1212
.PP

0 commit comments

Comments
 (0)