Overview
Comment: | Merge trunk into 1.1 branch |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | 1.1 | 1.1-release |
Files: | files | file ages | folders |
SHA3-256: |
eba7f9f3d90f409920c20cfdb1e0066c |
User & Date: | js on 2024-04-14 16:18:15 |
Other Links: | branch diff | manifest | tags |
Context
2024-04-14
| ||
17:44 | Merge trunk into 1.1 branch check-in: cbaf97fbb8 user: js tags: 1.1 | |
16:18 | Merge trunk into 1.1 branch check-in: eba7f9f3d9 user: js tags: 1.1, 1.1-release | |
16:10 | Fix a missed copyright update check-in: 4383931c76 user: js tags: trunk | |
11:54 | configure: Default to no -Werror check-in: 86e618dd4a user: js tags: 1.1 | |
Changes
Modified README.md from [ac4c5c8908] to [e80110edc6].
︙ | ︙ | |||
420 421 422 423 424 425 426 | <h1 id="commercial-use">Commercial use</h1> If for whatever reason the terms of GNU Lesser General Public License version 3.0 don't work for you, a proprietary license for ObjFW including support is available upon request. Just write a mail to js@nil.im and we can find a | | | 420 421 422 423 424 425 426 427 | <h1 id="commercial-use">Commercial use</h1> If for whatever reason the terms of GNU Lesser General Public License version 3.0 don't work for you, a proprietary license for ObjFW including support is available upon request. Just write a mail to js@nil.im and we can find a reasonable solution for both parties. |
Modified src/Makefile from [2ac3433b66] to [6c32b29930].
︙ | ︙ | |||
221 222 223 224 225 226 227 228 229 230 231 232 233 234 | OFRangeCharacterSet.m \ OFSandbox.m \ OFStrFTime.m \ OFStrPTime.m \ OFSubarray.m \ OFSubdata.m \ OFUTF8String.m \ ${RUNTIME_ASSOCIATION_M} \ ${RUNTIME_AUTORELEASE_M} \ ${RUNTIME_INSTANCE_M} \ ${UNICODE_M} \ ${USE_SRCS_TAGGED_POINTERS} SRCS_FILES += OFFileIRIHandler.m SRCS_SOCKETS += OFAsyncIPSocketConnector.m \ | > | 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 | OFRangeCharacterSet.m \ OFSandbox.m \ OFStrFTime.m \ OFStrPTime.m \ OFSubarray.m \ OFSubdata.m \ OFUTF8String.m \ ${LIBBASES_M} \ ${RUNTIME_ASSOCIATION_M} \ ${RUNTIME_AUTORELEASE_M} \ ${RUNTIME_INSTANCE_M} \ ${UNICODE_M} \ ${USE_SRCS_TAGGED_POINTERS} SRCS_FILES += OFFileIRIHandler.m SRCS_SOCKETS += OFAsyncIPSocketConnector.m \ |
︙ | ︙ |
Modified src/OFStream.h from [0ff1cfaec5] to [bfdbdea6e5].
︙ | ︙ | |||
1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 | * @brief Returns whether the lowlevel has data in the read buffer. * * @warning Do not call this directly! * * @note Override this method in case your stream can buffer data itself, such * as when implementing @ref OFTLSStream. If not overridden, it always * returns false. * @return Whether the lowlevel has data in the read buffer */ - (bool)lowlevelHasDataInReadBuffer; @end OF_ASSUME_NONNULL_END | > | 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 | * @brief Returns whether the lowlevel has data in the read buffer. * * @warning Do not call this directly! * * @note Override this method in case your stream can buffer data itself, such * as when implementing @ref OFTLSStream. If not overridden, it always * returns false. * * @return Whether the lowlevel has data in the read buffer */ - (bool)lowlevelHasDataInReadBuffer; @end OF_ASSUME_NONNULL_END |
Modified src/bridge/Makefile from [6d656556e0] to [e23d178b68].
︙ | ︙ | |||
40 41 42 43 44 45 46 | includesubdir = ObjFWBridge include ../../buildsys.mk install-extra: i=ObjFWBridge.oc; \ ${INSTALL_STATUS}; \ | | > | 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 | includesubdir = ObjFWBridge include ../../buildsys.mk install-extra: i=ObjFWBridge.oc; \ ${INSTALL_STATUS}; \ if ${MKDIR_P} ${libdir}/objfw-config && \ ${INSTALL} -m 644 $$i ${libdir}/objfw-config/$$i; then \ ${INSTALL_OK}; \ else \ ${INSTALL_FAILED}; \ fi uninstall-extra: i=ObjFWBridge.oc; \ |
︙ | ︙ |
Modified src/test/Makefile from [80d3fa3595] to [fe624a0383].
︙ | ︙ | |||
30 31 32 33 34 35 36 | ${RUNTIME_FRAMEWORK_LIBS} \ ${LIBS} LIBS := -L.. -lobjfw -L../runtime ${RUNTIME_LIBS} ${LIBS} install-extra: i=ObjFWTest.oc; \ ${INSTALL_STATUS}; \ | | > | 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 | ${RUNTIME_FRAMEWORK_LIBS} \ ${LIBS} LIBS := -L.. -lobjfw -L../runtime ${RUNTIME_LIBS} ${LIBS} install-extra: i=ObjFWTest.oc; \ ${INSTALL_STATUS}; \ if ${MKDIR_P} ${libdir}/objfw-config && \ ${INSTALL} -m 644 $$i ${libdir}/objfw-config/$$i; then \ ${INSTALL_OK}; \ else \ ${INSTALL_FAILED}; \ fi uninstall-extra: i=ObjFWTest.oc; \ |
︙ | ︙ |
Modified src/tls/Makefile from [2b06076497] to [c40aaaa53e].
︙ | ︙ | |||
18 19 20 21 22 23 24 | includesubdir = ObjFWTLS include ../../buildsys.mk install-extra: i=ObjFWTLS.oc; \ ${INSTALL_STATUS}; \ | | > | 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 | includesubdir = ObjFWTLS include ../../buildsys.mk install-extra: i=ObjFWTLS.oc; \ ${INSTALL_STATUS}; \ if ${MKDIR_P} ${libdir}/objfw-config && \ ${INSTALL} -m 644 $$i ${libdir}/objfw-config/$$i; then \ ${INSTALL_OK}; \ else \ ${INSTALL_FAILED}; \ fi uninstall-extra: i=ObjFWTLS.oc; \ |
︙ | ︙ |
Modified utils/Makefile from [66810ae4c9] to [ba4530b9f8].
︙ | ︙ | |||
9 10 11 12 13 14 15 | include ../buildsys.mk DISTCLEAN = objfw-config install-extra: objfw-config objfw-compile objfw-embed for i in objfw-config objfw-compile objfw-embed; do \ ${INSTALL_STATUS}; \ | | > | 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 | include ../buildsys.mk DISTCLEAN = objfw-config install-extra: objfw-config objfw-compile objfw-embed for i in objfw-config objfw-compile objfw-embed; do \ ${INSTALL_STATUS}; \ if ${MKDIR_P} ${DESTDIR}${bindir} && ${INSTALL} -m 755 $$i \ ${DESTDIR}${bindir}/${BIN_PREFIX}$$i; then \ ${INSTALL_OK}; \ else \ ${INSTALL_FAILED}; \ fi \ done uninstall-extra: |
︙ | ︙ |
Modified utils/objfw-config.in from [812d7fc1ec] to [b9613126d3].
1 2 3 4 5 6 7 8 9 | #!/bin/sh # # Copyright (c) 2008-2024 Jonathan Schleifer <js@nil.im> # # All rights reserved. # # This program is free software: you can redistribute it and/or modify it # under the terms of the GNU Lesser General Public License version 3.0 only, # as published by the Free Software Foundation. | | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 | #!/bin/sh # # Copyright (c) 2008-2024 Jonathan Schleifer <js@nil.im> # # All rights reserved. # # This program is free software: you can redistribute it and/or modify it # under the terms of the GNU Lesser General Public License version 3.0 only, # as published by the Free Software Foundation. # # This program is distributed in the hope that it will be useful, but WITHOUT # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License # version 3.0 for more details. # # You should have received a copy of the GNU Lesser General Public License # version 3.0 along with this program. If not, see # <https://www.gnu.org/licenses/>. # prefix="@prefix@" exec_prefix="@exec_prefix@" |
︙ | ︙ |
Modified utils/ofhash/localization/de.json from [0ac3e79d5c] to [af38785614].
1 2 3 | /* * German localization for ofhash. * | | | 1 2 3 4 5 6 7 8 9 10 11 | /* * German localization for ofhash. * * Copyright (c) 2017-2024 Jonathan Schleifer <js@nil.im> * * Permission to use, copy, modify, and/or distribute this localization for * any purpose with or without fee is hereby granted. */ /* vim: se ft=javascript sw=4 et: */ |
︙ | ︙ |