From 200e7bcec7c8fa9ebd96d59bb526c4617f527f45 Mon Sep 17 00:00:00 2001 From: ctrlaltca Date: Thu, 9 May 2024 10:26:16 +0200 Subject: [PATCH] Include debian patches (#2639) * enable optimisation with debug; credits to wRAR * Switch RFC2812 links from internal to external. Credits to wRAR * admin/gendoc.pl: Ease the creation of reproducible builds by removing user and timestamp from generated documentation. Credits to Vagrant Cascadian * Remove patches from dist/debian --- CMakeLists.txt | 4 +- admin/gendoc.pl | 2 +- .../enable-optimisation-with-debug.patch | 20 ------ dist/debian/patches/fix-rfc-links.patch | 63 ------------------- dist/debian/patches/series | 2 - src/kvirc/kvs/KviKvsCoreSimpleCommands.cpp | 4 +- src/kvirc/kvs/KviKvsCoreSimpleCommands_sz.cpp | 4 +- src/modules/objects/libkviobjects.cpp | 2 +- 8 files changed, 8 insertions(+), 93 deletions(-) delete mode 100644 dist/debian/patches/enable-optimisation-with-debug.patch delete mode 100644 dist/debian/patches/fix-rfc-links.patch diff --git a/CMakeLists.txt b/CMakeLists.txt index d5b9b0bbda..67ca6f2592 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -209,8 +209,8 @@ else() # CMAKE_CXX_FLAGS_DEBUG before finalizing. This results in the # default DEBUG flag of '-g' being appended, and therefore # overriding what you specify here - set(CMAKE_CXX_FLAGS_DEBUG "-O0 -ggdb -pipe --exec-charset=UTF-8 --input-charset=UTF-8 --no-implement-inlines --unit-at-a-time --fast-math") - set(CMAKE_C_FLAGS_DEBUG "-O0 -ggdb -pipe --exec-charset=UTF-8 --input-charset=UTF-8 --no-implement-inlines --unit-at-a-time --fast-math") + set(CMAKE_CXX_FLAGS_DEBUG "-ggdb -pipe --exec-charset=UTF-8 --input-charset=UTF-8 --no-implement-inlines --unit-at-a-time --fast-math") + set(CMAKE_C_FLAGS_DEBUG "-ggdb -pipe --exec-charset=UTF-8 --input-charset=UTF-8 --no-implement-inlines --unit-at-a-time --fast-math") include(CheckCXXCompilerFlag) CHECK_CXX_COMPILER_FLAG("-fvisibility=hidden" CXX_HAS_VH_FLAG) CHECK_CXX_COMPILER_FLAG("-fvisibility-inlines-hidden" CXX_HAS_VIH_FLAG) diff --git a/admin/gendoc.pl b/admin/gendoc.pl index 6ee09592c7..2576da10ac 100755 --- a/admin/gendoc.pl +++ b/admin/gendoc.pl @@ -203,7 +203,7 @@ sub print_header sub print_footer { - print $g_filehandle "
KVIrc $g_version Documentation - generated by $g_currentuser on $g_currenttime
\n"; + print $g_filehandle "
KVIrc $g_version Documentation
\n"; print $g_filehandle "\n"; print $g_filehandle "\n"; } diff --git a/dist/debian/patches/enable-optimisation-with-debug.patch b/dist/debian/patches/enable-optimisation-with-debug.patch deleted file mode 100644 index b830f95782..0000000000 --- a/dist/debian/patches/enable-optimisation-with-debug.patch +++ /dev/null @@ -1,20 +0,0 @@ -Description: Remove -O0 from CFLAGS/CXXFLAGS -Author: Andrey Rakhmatullin -Forwarded: not-needed -Last-Update: 2017-10-13 - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 96659b5..0b0c2b8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -220,8 +220,8 @@ else() - # CMAKE_CXX_FLAGS_DEBUG before finalizing. This results in the - # default DEBUG flag of '-g' being appended, and therefore - # overriding what you specify here -- set(CMAKE_CXX_FLAGS_DEBUG "-O0 -ggdb -pipe --exec-charset=UTF-8 --input-charset=UTF-8 --no-implement-inlines --unit-at-a-time --fast-math") -- set(CMAKE_C_FLAGS_DEBUG "-O0 -ggdb -pipe --exec-charset=UTF-8 --input-charset=UTF-8 --no-implement-inlines --unit-at-a-time --fast-math") -+ set(CMAKE_CXX_FLAGS_DEBUG "-ggdb -pipe --exec-charset=UTF-8 --input-charset=UTF-8 --no-implement-inlines --unit-at-a-time --fast-math") -+ set(CMAKE_C_FLAGS_DEBUG "-ggdb -pipe --exec-charset=UTF-8 --input-charset=UTF-8 --no-implement-inlines --unit-at-a-time --fast-math") - include(CheckCXXCompilerFlag) - CHECK_CXX_COMPILER_FLAG("-fvisibility=hidden" CXX_HAS_VH_FLAG) - CHECK_CXX_COMPILER_FLAG("-fvisibility-inlines-hidden" CXX_HAS_VIH_FLAG) diff --git a/dist/debian/patches/fix-rfc-links.patch b/dist/debian/patches/fix-rfc-links.patch deleted file mode 100644 index efda061627..0000000000 --- a/dist/debian/patches/fix-rfc-links.patch +++ /dev/null @@ -1,63 +0,0 @@ -Description: Switch RFC2812 links from internal to external. - As we don't ship the RFC in the format of a help page. -Author: Andrey Rakhmatullin -Forwarded: not-needed -Last-Update: 2017-10-14 - -diff --git a/src/kvirc/kvs/KviKvsCoreSimpleCommands.cpp b/src/kvirc/kvs/KviKvsCoreSimpleCommands.cpp -index f250701..8fc77ef 100644 ---- a/src/kvirc/kvs/KviKvsCoreSimpleCommands.cpp -+++ b/src/kvirc/kvs/KviKvsCoreSimpleCommands.cpp -@@ -246,7 +246,7 @@ namespace KviKvsCoreSimpleCommands - Wrappers for RFC2812 commands - @body: - Some less used KVIrc commands are implemented as simple wrappers -- around the standard [doc]rfc2812[/doc] commands.[br] -+ around the standard [anchorlink:https://tools.ietf.org/html/rfc2812]rfc2812[/anchorlink] commands.[br] - For example, the /[cmd:oper]OPER[/cmd] command will be used only by server operators - and probably only once per connection.[br] - These commands should only be needed by experienced IRC users. -@@ -258,7 +258,7 @@ namespace KviKvsCoreSimpleCommands - The exact parameter syntax/semantic checking is left to you.[br] - This also means that if some of these commands accept parameters with spaces, - it is left to you to add the leading ':' before the last parameter.[br] -- You should refer to [doc]rfc2812[/doc] if any of these commands do not work properly for you.[br] -+ You should refer to [anchorlink:https://tools.ietf.org/html/rfc2812]rfc2812[/anchorlink] if any of these commands do not work properly for you.[br] - */ - - KVSCSC(rfc2812wrapper) -diff --git a/src/kvirc/kvs/KviKvsCoreSimpleCommands_sz.cpp b/src/kvirc/kvs/KviKvsCoreSimpleCommands_sz.cpp -index d624f3e..f6e5b77 100644 ---- a/src/kvirc/kvs/KviKvsCoreSimpleCommands_sz.cpp -+++ b/src/kvirc/kvs/KviKvsCoreSimpleCommands_sz.cpp -@@ -603,7 +603,7 @@ namespace KviKvsCoreSimpleCommands - @description: - Requests the stats information from the specified server or the current server if no [target server] is specified.[br] - The query parameter is usually a letter indicating the type of the query requested: some query letters -- are defined by [doc]RFC2812[/doc] and some others are server implementation dependent.[br] -+ are defined by [anchorlink:https://tools.ietf.org/html/rfc2812]RFC2812[/anchorlink] and some others are server implementation dependent.[br] - This command is an [doc:rfc2812wrappers]RFC2812 command wrapper[/doc]; see that document for more information.[br] - */ - // RFC2812 wrapper -@@ -1112,7 +1112,7 @@ namespace KviKvsCoreSimpleCommands - Requests user information - @description: - Requests information about an IRC user specified by .[br] -- WHOWAS requests [i]history[/i] records. See [doc:rfc2812]RFC2812[/doc] for more info.[br] -+ WHOWAS requests [i]history[/i] records. See [anchorlink:https://tools.ietf.org/html/rfc2812]RFC2812[/anchorlink] for more info.[br] - This command is [doc:connection_dependent_commands]connection dependent[/doc]. - @examples: - [example] -diff --git a/src/modules/objects/libkviobjects.cpp b/src/modules/objects/libkviobjects.cpp -index 12d9e6c..e319705 100644 ---- a/src/modules/objects/libkviobjects.cpp -+++ b/src/modules/objects/libkviobjects.cpp -@@ -247,7 +247,7 @@ static bool objects_kvs_cmd_connect(KviKvsModuleCommandCall * c) - 's slot . - When one of the two objects is destroyed, the signal/slot - connection is automatically removed.[br] -- WARNING: this command name collides with the [doc:RFC2812]RFC2812[/doc] -+ WARNING: this command name collides with the [anchorlink:https://tools.ietf.org/html/rfc2812]RFC2812[/anchorlink] - CONNECT IRC Op command: this IRC command is available to operators only - and is rather rarely used: you can use it by the means of [doc:raw]raw[/doc]. - @seealso: diff --git a/dist/debian/patches/series b/dist/debian/patches/series index 08f96aea18..e69de29bb2 100644 --- a/dist/debian/patches/series +++ b/dist/debian/patches/series @@ -1,2 +0,0 @@ -enable-optimisation-with-debug.patch -fix-rfc-links.patch diff --git a/src/kvirc/kvs/KviKvsCoreSimpleCommands.cpp b/src/kvirc/kvs/KviKvsCoreSimpleCommands.cpp index e68fb9a2c8..bdefeff8ad 100644 --- a/src/kvirc/kvs/KviKvsCoreSimpleCommands.cpp +++ b/src/kvirc/kvs/KviKvsCoreSimpleCommands.cpp @@ -244,7 +244,7 @@ namespace KviKvsCoreSimpleCommands Wrappers for RFC2812 commands @body: Some less used KVIrc commands are implemented as simple wrappers - around the standard [doc]rfc2812[/doc] commands.[br] + around the standard [anchorlink:https://tools.ietf.org/html/rfc2812]rfc2812[/anchorlink] commands.[br] For example, the /[cmd:oper]OPER[/cmd] command will be used only by server operators and probably only once per connection.[br] These commands should only be needed by experienced IRC users. @@ -256,7 +256,7 @@ namespace KviKvsCoreSimpleCommands The exact parameter syntax/semantic checking is left to you.[br] This also means that if some of these commands accept parameters with spaces, it is left to you to add the leading ':' before the last parameter.[br] - You should refer to [doc]rfc2812[/doc] if any of these commands do not work properly for you.[br] + You should refer to [anchorlink:https://tools.ietf.org/html/rfc2812]rfc2812[/anchorlink] if any of these commands do not work properly for you.[br] */ KVSCSC(rfc2812wrapper) diff --git a/src/kvirc/kvs/KviKvsCoreSimpleCommands_sz.cpp b/src/kvirc/kvs/KviKvsCoreSimpleCommands_sz.cpp index f91970ccb9..11d5d91c26 100644 --- a/src/kvirc/kvs/KviKvsCoreSimpleCommands_sz.cpp +++ b/src/kvirc/kvs/KviKvsCoreSimpleCommands_sz.cpp @@ -596,7 +596,7 @@ namespace KviKvsCoreSimpleCommands @description: Requests the stats information from the specified server or the current server if no [target server] is specified.[br] The query parameter is usually a letter indicating the type of the query requested: some query letters - are defined by [doc]RFC2812[/doc] and some others are server implementation dependent.[br] + are defined by [anchorlink:https://tools.ietf.org/html/rfc2812]RFC2812[/anchorlink] and some others are server implementation dependent.[br] This command is an [doc:rfc2812wrappers]RFC2812 command wrapper[/doc]; see that document for more information.[br] */ // RFC2812 wrapper @@ -1095,7 +1095,7 @@ namespace KviKvsCoreSimpleCommands Requests user information @description: Requests information about an IRC user specified by .[br] - WHOWAS requests [i]history[/i] records. See [doc:rfc2812]RFC2812[/doc] for more info.[br] + WHOWAS requests [i]history[/i] records. See [anchorlink:https://tools.ietf.org/html/rfc2812]RFC2812[/anchorlink] for more info.[br] This command is [doc:connection_dependent_commands]connection dependent[/doc]. @examples: [example] diff --git a/src/modules/objects/libkviobjects.cpp b/src/modules/objects/libkviobjects.cpp index 091eff6aee..40b6d0ded4 100644 --- a/src/modules/objects/libkviobjects.cpp +++ b/src/modules/objects/libkviobjects.cpp @@ -247,7 +247,7 @@ static bool objects_kvs_cmd_connect(KviKvsModuleCommandCall * c) 's slot . When one of the two objects is destroyed, the signal/slot connection is automatically removed.[br] - WARNING: this command name collides with the [doc:RFC2812]RFC2812[/doc] + WARNING: this command name collides with the [anchorlink:https://tools.ietf.org/html/rfc2812]RFC2812[/anchorlink] CONNECT IRC Op command: this IRC command is available to operators only and is rather rarely used: you can use it by the means of [doc:raw]raw[/doc]. @seealso: