Updated `fribidi` to version 1.0.13. (#6941)

This commit is contained in:
Pawel Winogrodzki 2023-12-07 11:54:32 -08:00 коммит произвёл GitHub
Родитель fb8943759f
Коммит b5be22631f
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
4 изменённых файлов: 55 добавлений и 40 удалений

Просмотреть файл

@ -1,23 +1,26 @@
diff -pruN fribidi-1.0.10.orig/bin/Makefile.am fribidi-1.0.10/bin/Makefile.am
--- fribidi-1.0.10.orig/bin/Makefile.am 2020-07-06 04:17:23.000000000 +0900
+++ fribidi-1.0.10/bin/Makefile.am 2020-07-07 21:09:49.076237457 +0900
diff --git a/bin/Makefile.am b/bin/Makefile.am
index 5993577..0c4a1c6 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -2,11 +2,9 @@ bin_PROGRAMS = fribidi
noinst_PROGRAMS = fribidi-benchmark fribidi-bidi-types fribidi-caprtl2utf8
-getopt_SOURCES = getopt.c getopt1.c getopt_int.h getopt.h gettext.h
+fribidi_SOURCES = fribidi-main.c
-fribidi_SOURCES = fribidi-main.c $(getopt_SOURCES)
-
-fribidi_benchmark_SOURCES = fribidi-benchmark.c $(getopt_SOURCES)
+fribidi_benchmark_SOURCES = fribidi-benchmark.c
AM_CPPFLAGS = \
@FRIBIDI_CPPFLAGS@ \
diff -pruN fribidi-1.0.10.orig/bin/getopt.c fribidi-1.0.10/bin/getopt.c
--- fribidi-1.0.10.orig/bin/getopt.c 2015-08-05 03:49:07.000000000 +0900
+++ fribidi-1.0.10/bin/getopt.c 1970-01-01 09:00:00.000000000 +0900
diff --git a/bin/getopt.c b/bin/getopt.c
deleted file mode 100644
index fad1f5d..0000000
--- a/bin/getopt.c
+++ /dev/null
@@ -1,1268 +0,0 @@
-/* Getopt for GNU.
- NOTE: getopt is now part of the C library, so if you don't know what
@ -1287,9 +1290,11 @@ diff -pruN fribidi-1.0.10.orig/bin/getopt.c fribidi-1.0.10/bin/getopt.c
-}
-
-#endif /* TEST */
diff -pruN fribidi-1.0.10.orig/bin/getopt.h fribidi-1.0.10/bin/getopt.h
--- fribidi-1.0.10.orig/bin/getopt.h 2015-08-05 03:49:07.000000000 +0900
+++ fribidi-1.0.10/bin/getopt.h 1970-01-01 09:00:00.000000000 +0900
diff --git a/bin/getopt.h b/bin/getopt.h
deleted file mode 100644
index 51f5635..0000000
--- a/bin/getopt.h
+++ /dev/null
@@ -1,187 +0,0 @@
-/* Declarations for getopt.
- Copyright (C) 1989-1994,1996-1999,2001,2003,2004
@ -1478,9 +1483,11 @@ diff -pruN fribidi-1.0.10.orig/bin/getopt.h fribidi-1.0.10/bin/getopt.h
-#undef __need_getopt
-
-#endif /* getopt.h */
diff -pruN fribidi-1.0.10.orig/bin/getopt1.c fribidi-1.0.10/bin/getopt1.c
--- fribidi-1.0.10.orig/bin/getopt1.c 2015-08-05 03:49:07.000000000 +0900
+++ fribidi-1.0.10/bin/getopt1.c 1970-01-01 09:00:00.000000000 +0900
diff --git a/bin/getopt1.c b/bin/getopt1.c
deleted file mode 100644
index c205c50..0000000
--- a/bin/getopt1.c
+++ /dev/null
@@ -1,213 +0,0 @@
-/* getopt_long and getopt_long_only entry points for GNU getopt.
- Copyright (C) 1987,88,89,90,91,92,93,94,96,97,98,2004
@ -1695,9 +1702,11 @@ diff -pruN fribidi-1.0.10.orig/bin/getopt1.c fribidi-1.0.10/bin/getopt1.c
-}
-
-#endif /* TEST */
diff -pruN fribidi-1.0.10.orig/bin/getopt_int.h fribidi-1.0.10/bin/getopt_int.h
--- fribidi-1.0.10.orig/bin/getopt_int.h 2015-08-05 03:49:07.000000000 +0900
+++ fribidi-1.0.10/bin/getopt_int.h 1970-01-01 09:00:00.000000000 +0900
diff --git a/bin/getopt_int.h b/bin/getopt_int.h
deleted file mode 100644
index 24fcc2a..0000000
--- a/bin/getopt_int.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/* Internal declarations for getopt.
- Copyright (C) 1989-1994,1996-1999,2001,2003,2004
@ -1844,27 +1853,30 @@ diff -pruN fribidi-1.0.10.orig/bin/getopt_int.h fribidi-1.0.10/bin/getopt_int.h
-);
-
-#endif /* getopt_int.h */
diff -pruN fribidi-1.0.10.orig/bin/gettext.h fribidi-1.0.10/bin/gettext.h
--- fribidi-1.0.10.orig/bin/gettext.h 2015-08-05 03:49:07.000000000 +0900
+++ fribidi-1.0.10/bin/gettext.h 1970-01-01 09:00:00.000000000 +0900
diff --git a/bin/gettext.h b/bin/gettext.h
deleted file mode 100644
index 6ecfb91..0000000
--- a/bin/gettext.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#undef gettext
-#define gettext
diff -pruN fribidi-1.0.10.orig/bin/meson.build fribidi-1.0.10/bin/meson.build
--- fribidi-1.0.10.orig/bin/meson.build 2020-07-06 04:17:23.000000000 +0900
+++ fribidi-1.0.10/bin/meson.build 2020-07-07 21:10:30.931408884 +0900
diff --git a/bin/meson.build b/bin/meson.build
index e4faa33..480d2b9 100644
--- a/bin/meson.build
+++ b/bin/meson.build
@@ -1,12 +1,12 @@
fribidi = executable('fribidi',
- 'fribidi-main.c', 'getopt.c', 'getopt1.c', fribidi_unicode_version_h,
+ 'fribidi-main.c', fribidi_unicode_version_h,
c_args: ['-DHAVE_CONFIG_H'] + fribidi_static_cargs + visibility_args,
c_args: ['-DHAVE_CONFIG_H'] + fribidi_static_cargs,
include_directories: incs,
link_with: libfribidi,
install: true)
executable('fribidi-benchmark',
- 'fribidi-benchmark.c', 'getopt.c', 'getopt1.c', fribidi_unicode_version_h,
+ 'fribidi-benchmark.c', fribidi_unicode_version_h,
c_args: ['-DHAVE_CONFIG_H'] + fribidi_static_cargs + visibility_args,
c_args: ['-DHAVE_CONFIG_H'] + fribidi_static_cargs,
include_directories: incs,
link_with: libfribidi,

Просмотреть файл

@ -1,5 +1,5 @@
{
"Signatures": {
"fribidi-1.0.12.tar.xz": "0cd233f97fc8c67bb3ac27ce8440def5d3ffacf516765b91c2cc654498293495"
"fribidi-1.0.13.tar.xz": "7fa16c80c81bd622f7b198d31356da139cc318a63fc7761217af4130903f54a2"
}
}
}

Просмотреть файл

@ -1,6 +1,6 @@
Summary: Library implementing the Unicode Bidirectional Algorithm
Name: fribidi
Version: 1.0.12
Version: 1.0.13
Release: 1%{?dist}
License: LGPLv2+ AND UCD
Vendor: Microsoft Corporation
@ -52,6 +52,9 @@ find %{buildroot} -type f -name "*.la" -delete -print
%{_libdir}/pkgconfig/*.pc
%changelog
* Thu Dec 07 2023 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.0.13-1
- Upgrade to 1.0.13.
* Mon Sep 19 2022 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 1.0.12-1
- Upgrade to 1.0.12
@ -241,7 +244,7 @@ find %{buildroot} -type f -name "*.la" -delete -print
- put devel .so symlink in the right subpackage
* Tue May 23 2006 Caolan McNamara <caolanm@redhat.com> 0.10.7-3
- rh#192669# clearly I didn't actually get around to basing fribidi-config
- rh#192669# clearly I didn't actually get around to basing fribidi-config
of pkg-config output
* Tue May 02 2006 Caolan McNamara <caolanm@redhat.com> 0.10.7-2

Просмотреть файл

@ -3880,8 +3880,8 @@
"type": "other",
"other": {
"name": "fribidi",
"version": "1.0.12",
"downloadUrl": "https://github.com/fribidi/fribidi/releases/download/v1.0.12/fribidi-1.0.12.tar.xz"
"version": "1.0.13",
"downloadUrl": "https://github.com/fribidi/fribidi/releases/download/v1.0.13/fribidi-1.0.13.tar.xz"
}
}
},
@ -8360,9 +8360,9 @@
"component": {
"type": "other",
"other": {
"name": "kubernetes",
"version": "1.28.3",
"downloadUrl": "https://dl.k8s.io/v1.28.3/kubernetes-src.tar.gz"
"name": "kube-vip-cloud-provider",
"version": "0.0.7",
"downloadUrl": "https://github.com/kube-vip/kube-vip-cloud-provider/archive/refs/tags/v0.0.7.tar.gz"
}
}
},
@ -8370,9 +8370,9 @@
"component": {
"type": "other",
"other": {
"name": "kube-vip-cloud-provider",
"version": "0.0.7",
"downloadUrl": "https://github.com/kube-vip/kube-vip-cloud-provider/archive/refs/tags/v0.0.7.tar.gz"
"name": "kubernetes",
"version": "1.28.3",
"downloadUrl": "https://dl.k8s.io/v1.28.3/kubernetes-src.tar.gz"
}
}
},