From 391bbcf64f4dc98beea4943c819532e8eed1cdc3 Mon Sep 17 00:00:00 2001 From: "Shencb@123" <1944340417@qq.com> Date: Thu, 29 Aug 2024 10:29:48 +0800 Subject: [PATCH 1/5] support clang --- 0001-modify-perl-libxml-mm.c.patch | 33 ++++++++++++++++++++++++++++++ rarian.spec | 9 +++++++- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 0001-modify-perl-libxml-mm.c.patch diff --git a/0001-modify-perl-libxml-mm.c.patch b/0001-modify-perl-libxml-mm.c.patch new file mode 100644 index 0000000..15672b2 --- /dev/null +++ b/0001-modify-perl-libxml-mm.c.patch @@ -0,0 +1,33 @@ +From 5799da176777ad3aefb851f23df6232c6f21d0b3 Mon Sep 17 00:00:00 2001 +From: "Shencb@123" <1944340417@qq.com> +Date: Mon, 26 Aug 2024 23:10:01 +0800 +Subject: [PATCH] modify perl-libxml-mm.c + +--- + util/rarian-example.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/util/rarian-example.c b/util/rarian-example.c +index d203a19..714d69c 100644 +--- a/util/rarian-example.c ++++ b/util/rarian-example.c +@@ -76,7 +76,7 @@ for_each_cb (RrnReg *reg, void * user_data) + + return TRUE; + } +- ++int + info_for_each (RrnInfoEntry *entry, void *data) + { + if (entry->section) +@@ -89,7 +89,7 @@ info_for_each (RrnInfoEntry *entry, void *data) + entry->comment); + return TRUE; + } +- ++int + man_for_each (RrnManEntry *entry, void *data) + { + printf ("Man page %s\n", entry->name); +-- +2.45.2.windows.1 \ No newline at end of file diff --git a/rarian.spec b/rarian.spec index 2e46649..dd691a0 100644 --- a/rarian.spec +++ b/rarian.spec @@ -1,6 +1,6 @@ Name: rarian Version: 0.8.1 -Release: 24 +Release: 25 License: LGPLv2+ Summary: Documentation meta-data library URL: http://rarian.freedesktop.org/ @@ -9,6 +9,7 @@ Source: http://download.gnome.org/sources/rarian/0.8/rarian-%{version}.tar.bz2 Source1: scrollkeeper-omf.dtd Patch1: rarian-0.8.1-categories.patch +Patch2:0001-modify-perl-libxml-mm.c Requires(post): libxml2 Requires(postun): libxml2 @@ -110,6 +111,12 @@ fi %{_datadir}/help %changelog +* Tue Aug 27 2024 shenchenbangs <1944340417@qq.com> - 0.8.1-25 +- Fix the function does not define a return value + +* Wed Sep 08 2021 shixuantong - 0.8.1-24 +- remove rpath + * Wed Sep 08 2021 shixuantong - 0.8.1-24 - remove rpath From 6b21128bc5da68ac987fa543bbd4973ca517407a Mon Sep 17 00:00:00 2001 From: "Shencb@123" <1944340417@qq.com> Date: Thu, 29 Aug 2024 11:17:11 +0800 Subject: [PATCH 2/5] support clang --- 0001-modify-perl-libxml-mm.c.patch => 0001-rarian.patch | 0 rarian.spec | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename 0001-modify-perl-libxml-mm.c.patch => 0001-rarian.patch (100%) diff --git a/0001-modify-perl-libxml-mm.c.patch b/0001-rarian.patch similarity index 100% rename from 0001-modify-perl-libxml-mm.c.patch rename to 0001-rarian.patch diff --git a/rarian.spec b/rarian.spec index dd691a0..9d5ea45 100644 --- a/rarian.spec +++ b/rarian.spec @@ -9,7 +9,7 @@ Source: http://download.gnome.org/sources/rarian/0.8/rarian-%{version}.tar.bz2 Source1: scrollkeeper-omf.dtd Patch1: rarian-0.8.1-categories.patch -Patch2:0001-modify-perl-libxml-mm.c +Patch2:0001-rarian.patch Requires(post): libxml2 Requires(postun): libxml2 From 4b653b9f61555100aa3c221ea4ed4cc779cd5673 Mon Sep 17 00:00:00 2001 From: "Shencb@123" <1944340417@qq.com> Date: Thu, 29 Aug 2024 12:23:11 +0800 Subject: [PATCH 3/5] support clang --- rarian.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rarian.spec b/rarian.spec index 9d5ea45..2213dd2 100644 --- a/rarian.spec +++ b/rarian.spec @@ -111,7 +111,7 @@ fi %{_datadir}/help %changelog -* Tue Aug 27 2024 shenchenbangs <1944340417@qq.com> - 0.8.1-25 +* Tue Aug 27 2024 shenchenbang <1944340417@qq.com> - 0.8.1-25 - Fix the function does not define a return value * Wed Sep 08 2021 shixuantong - 0.8.1-24 From d6f1954346fdf35c57efcf384c478eb89d1847fb Mon Sep 17 00:00:00 2001 From: "Shencb@123" <1944340417@qq.com> Date: Thu, 29 Aug 2024 12:40:05 +0800 Subject: [PATCH 4/5] support clang --- 0001-rarian.patch | 33 --------------------------------- rarian.spec | 6 +----- 2 files changed, 1 insertion(+), 38 deletions(-) delete mode 100644 0001-rarian.patch diff --git a/0001-rarian.patch b/0001-rarian.patch deleted file mode 100644 index 15672b2..0000000 --- a/0001-rarian.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 5799da176777ad3aefb851f23df6232c6f21d0b3 Mon Sep 17 00:00:00 2001 -From: "Shencb@123" <1944340417@qq.com> -Date: Mon, 26 Aug 2024 23:10:01 +0800 -Subject: [PATCH] modify perl-libxml-mm.c - ---- - util/rarian-example.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/util/rarian-example.c b/util/rarian-example.c -index d203a19..714d69c 100644 ---- a/util/rarian-example.c -+++ b/util/rarian-example.c -@@ -76,7 +76,7 @@ for_each_cb (RrnReg *reg, void * user_data) - - return TRUE; - } -- -+int - info_for_each (RrnInfoEntry *entry, void *data) - { - if (entry->section) -@@ -89,7 +89,7 @@ info_for_each (RrnInfoEntry *entry, void *data) - entry->comment); - return TRUE; - } -- -+int - man_for_each (RrnManEntry *entry, void *data) - { - printf ("Man page %s\n", entry->name); --- -2.45.2.windows.1 \ No newline at end of file diff --git a/rarian.spec b/rarian.spec index 2213dd2..ce6f8c7 100644 --- a/rarian.spec +++ b/rarian.spec @@ -1,6 +1,6 @@ Name: rarian Version: 0.8.1 -Release: 25 +Release: 24 License: LGPLv2+ Summary: Documentation meta-data library URL: http://rarian.freedesktop.org/ @@ -9,7 +9,6 @@ Source: http://download.gnome.org/sources/rarian/0.8/rarian-%{version}.tar.bz2 Source1: scrollkeeper-omf.dtd Patch1: rarian-0.8.1-categories.patch -Patch2:0001-rarian.patch Requires(post): libxml2 Requires(postun): libxml2 @@ -111,9 +110,6 @@ fi %{_datadir}/help %changelog -* Tue Aug 27 2024 shenchenbang <1944340417@qq.com> - 0.8.1-25 -- Fix the function does not define a return value - * Wed Sep 08 2021 shixuantong - 0.8.1-24 - remove rpath From 255d0b5a8e529a34e1710c0aa010bba8d7bfadee Mon Sep 17 00:00:00 2001 From: "Shencb@123" <1944340417@qq.com> Date: Thu, 29 Aug 2024 12:44:34 +0800 Subject: [PATCH 5/5] support clang --- 0001-rarian.patch | 33 +++++++++++++++++++++++++++++++++ rarian.spec | 6 +++++- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 0001-rarian.patch diff --git a/0001-rarian.patch b/0001-rarian.patch new file mode 100644 index 0000000..15672b2 --- /dev/null +++ b/0001-rarian.patch @@ -0,0 +1,33 @@ +From 5799da176777ad3aefb851f23df6232c6f21d0b3 Mon Sep 17 00:00:00 2001 +From: "Shencb@123" <1944340417@qq.com> +Date: Mon, 26 Aug 2024 23:10:01 +0800 +Subject: [PATCH] modify perl-libxml-mm.c + +--- + util/rarian-example.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/util/rarian-example.c b/util/rarian-example.c +index d203a19..714d69c 100644 +--- a/util/rarian-example.c ++++ b/util/rarian-example.c +@@ -76,7 +76,7 @@ for_each_cb (RrnReg *reg, void * user_data) + + return TRUE; + } +- ++int + info_for_each (RrnInfoEntry *entry, void *data) + { + if (entry->section) +@@ -89,7 +89,7 @@ info_for_each (RrnInfoEntry *entry, void *data) + entry->comment); + return TRUE; + } +- ++int + man_for_each (RrnManEntry *entry, void *data) + { + printf ("Man page %s\n", entry->name); +-- +2.45.2.windows.1 \ No newline at end of file diff --git a/rarian.spec b/rarian.spec index ce6f8c7..2da2fd8 100644 --- a/rarian.spec +++ b/rarian.spec @@ -1,6 +1,6 @@ Name: rarian Version: 0.8.1 -Release: 24 +Release: 25 License: LGPLv2+ Summary: Documentation meta-data library URL: http://rarian.freedesktop.org/ @@ -9,6 +9,7 @@ Source: http://download.gnome.org/sources/rarian/0.8/rarian-%{version}.tar.bz2 Source1: scrollkeeper-omf.dtd Patch1: rarian-0.8.1-categories.patch +Patch2: 0001-rarian.patch Requires(post): libxml2 Requires(postun): libxml2 @@ -110,6 +111,9 @@ fi %{_datadir}/help %changelog +* Tue Aug 27 2024 shenchenbang <1944340417@qq.com> - 0.8.1-25 +- Fix the function does not define a return value + * Wed Sep 08 2021 shixuantong - 0.8.1-24 - remove rpath