PR#1: Fixes for unicode-ucd and Unicode 12.1 (adapted from Debian) - rpms/gucharmap

rpms / gucharmap

#1 Fixes for unicode-ucd and Unicode 12.1 (adapted from Debian)

Merged 4 years ago by kalev. Opened 4 years ago by alexpl.

Unknown source fix-for-unicode-12.1 into master

Fixes for unicode-ucd and Unicode 12.1 (adapted from Debian)

Alexander Ploumistos • 4 years ago

0e7bd9c

gucharmap-update_to_unicode_12.1.patch

file added

+37

		`@@ -0,0 +1,37 @@`
		`+ diff -Naur gucharmap-12.0.1-orig/gucharmap/gucharmap-unicode-info.h gucharmap-12.0.1/gucharmap/gucharmap-unicode-info.h`
		`+ --- gucharmap-12.0.1-orig/gucharmap/gucharmap-unicode-info.h 2019-03-07 21:21:27.000000000 +0100`
		`+ +++ gucharmap-12.0.1/gucharmap/gucharmap-unicode-info.h 2019-11-14 17:43:55.007583238 +0100`
		`+ @@ -51,7 +51,8 @@`
		`+ GUCHARMAP_UNICODE_VERSION_10_0,`
		`+ GUCHARMAP_UNICODE_VERSION_11_0,`
		`+ GUCHARMAP_UNICODE_VERSION_12_0,`
		`+ - GUCHARMAP_UNICODE_VERSION_LATEST = GUCHARMAP_UNICODE_VERSION_12_0 /* private, will move forward with each revision */`
		`+ + GUCHARMAP_UNICODE_VERSION_12_1,`
		`+ + GUCHARMAP_UNICODE_VERSION_LATEST = GUCHARMAP_UNICODE_VERSION_12_1 /* private, will move forward with each revision */`
		`+ } GucharmapUnicodeVersion;`
		`+`
		`+ /* return values are read-only */`
		`+ diff -Naur gucharmap-12.0.1-orig/gucharmap/gucharmap-window.c gucharmap-12.0.1/gucharmap/gucharmap-window.c`
		`+ --- gucharmap-12.0.1-orig/gucharmap/gucharmap-window.c 2019-03-07 21:21:27.000000000 +0100`
		`+ +++ gucharmap-12.0.1/gucharmap/gucharmap-window.c 2019-11-14 17:45:11.145809820 +0100`
		`+ @@ -454,7 +454,7 @@`
		`+ gtk_show_about_dialog (GTK_WINDOW (guw),`
		`+ "program-name", _("GNOME Character Map"),`
		`+ "version", VERSION,`
		`+ - "comments", _("Based on the Unicode Character Database 12.0.0"),`
		`+ + "comments", _("Based on the Unicode Character Database 12.1.0"),`
		`+ "copyright", "Copyright © 2004 Noah Levitt\n"`
		`+ "Copyright © 1991–2019 Unicode, Inc.\n"`
		`+ "Copyright © 2007–2019 Christian Persch\n"`
		`+ diff -Naur gucharmap-12.0.1-orig/gucharmap/Makefile.am gucharmap-12.0.1/gucharmap/Makefile.am`
		`+ --- gucharmap-12.0.1-orig/gucharmap/Makefile.am 2019-03-07 21:21:27.000000000 +0100`
		`+ +++ gucharmap-12.0.1/gucharmap/Makefile.am 2019-11-14 17:42:37.532370238 +0100`
		`+ @@ -205,7 +205,7 @@`
		`+`
		`+ WGETFLAGS = --timestamping --timeout=300 --tries=8 --no-directories --directory-prefix="$(builddir)"`
		`+`
		`+ -unicode_version = 12.0.0`
		`+ +unicode_version = 12.1.0`
		`+`
		`+ unicode_files = \`
		`+ Blocks.txt \`

gucharmap.spec

file modified

+9 -3

		`@@ -3,7 +3,7 @@`

		`Name: gucharmap`
		`Version: 12.0.1`
		`- Release: 2%{?dist}`
		`+ Release: 3%{?dist}`
		`Summary: Unicode character picker and font browser`

		`License: GPLv3+ and GFDL and MIT`
		`@@ -11,6 +11,8 @@`
		`URL: https://wiki.gnome.org/Apps/Gucharmap`
		`Source: https://download.gnome.org/sources/gucharmap/12.0/gucharmap-%{version}.tar.xz`

		`+ Patch0: gucharmap-update_to_unicode_12.1.patch`
		`+`
		`BuildRequires: appdata-tools`
		`BuildRequires: glib2-devel >= %{glib2_version}`
		`BuildRequires: gtk3-devel >= %{gtk3_version}`
		`@@ -20,8 +22,8 @@`
		`BuildRequires: itstool`
		`BuildRequires: /usr/bin/appstream-util`
		`BuildRequires: /usr/bin/desktop-file-validate`
		`- BuildRequires: unicode-ucd = 11.0.0`
		`- BuildRequires: unicode-ucd-unihan = 11.0.0`
		`+ BuildRequires: unicode-ucd`
		`+ BuildRequires: unicode-ucd-unihan`
		`BuildRequires: perl(Env)`

		`Requires: %{name}-libs%{?_isa} = %{version}-%{release}`
		`@@ -98,6 +100,10 @@`
		`%{_datadir}/gir-1.0`

		`%changelog`
		`+ * Thu Nov 14 2019 Alexander Ploumistos <alexpl@fedoraproject.org> - 12.0.1-3`
		`+ - Build against newer unicode-ucd - fix RHBZ#1735327`
		`+ - Add Debian patch for Unicode 12.1`
		`+`
		`* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 12.0.1-2`
		`- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild`

alexpl commented 4 years ago

Signed-off-by: Alexander Ploumistos alexpl@fedoraproject.org
I'm not sure why the hardcoded versions were needed in the BuildRequires:, but in any case, it should be trivial to add them back.

kalev commented 4 years ago

Thanks!

Pull-Request has been merged by kalev

4 years ago

catanzaro commented 4 years ago

Hi, thanks for working on this.

Normally I'd like to see a link to an upstream (gitlab.gnome.org) merge request, but it looks like gucharmap doesn't accept merge requests? I suppose a link to an issue report would do, at least in the patch file and optionally also in the spec. Without a link it's too hard to check up on the upstream status.

alexpl commented 4 years ago

Hi, thanks for working on this.

You are very welcome. Are you or another one of the co-maintainers willing to adopt the package? I filed a releng ticket[1] to take it, but mostly because I didn't want to see it go, I don't think I am qualified for the job.

Normally I'd like to see a link to an upstream (gitlab.gnome.org) merge request, but it looks like gucharmap doesn't accept merge requests? I suppose a link to an issue report would do, at least in the patch file and optionally also in the spec. Without a link it's too hard to check up on the upstream status.

Well, first I found the Debian bug report[2] and from there a link to an upstream issue[3].

catanzaro commented 4 years ago

Sadly it looks like the patch has not been submitted upstream, so it's almost certain upstream does not know a fix is available. It would be good to leave a comment in the issue pointing to the patch. Then you can add a link to the issue at the top of our copy of the patch.

I didn't realize this package was orphaned. There's no reason for it to go away. Thanks for requesting ownership! I wouldn't worry about being unqualified for the job, since it should be pretty easy: there's not exactly a ton of development going on. Feel free to ping if you have questions.

alexpl commented 4 years ago

Sadly it looks like the patch has not been submitted upstream, so it's almost certain upstream does not know a fix is available. It would be good to leave a comment in the issue pointing to the patch. Then you can add a link to the issue at the top of our copy of the patch.

I've just left a comment with the patch added to it.