From 509279aa4b3a479d8f681a98d969b17e4c66fbb7 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Oct 30 2018 05:30:02 +0000 Subject: import gucharmap-10.0.4-1.el7 --- diff --git a/.gitignore b/.gitignore index 37143da..17dc15e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -SOURCES/gucharmap-3.18.2.tar.xz +SOURCES/Unihan.zip +SOURCES/gucharmap-10.0.4.tar.xz diff --git a/.gucharmap.metadata b/.gucharmap.metadata index 21f0068..e6cdb16 100644 --- a/.gucharmap.metadata +++ b/.gucharmap.metadata @@ -1 +1,2 @@ -19197dc6216af5499a280402a07b005c8613b804 SOURCES/gucharmap-3.18.2.tar.xz +b6d32a88e55e7839ca864138bd12b3eb18a5a69e SOURCES/Unihan.zip +79df3e44410f807471eaa5dbef85daa78d78b113 SOURCES/gucharmap-10.0.4.tar.xz diff --git a/SOURCES/0001-build-Explicitly-link-to-libdl.patch b/SOURCES/0001-build-Explicitly-link-to-libdl.patch new file mode 100644 index 0000000..1253d2e --- /dev/null +++ b/SOURCES/0001-build-Explicitly-link-to-libdl.patch @@ -0,0 +1,44 @@ +From 4ad97abc893ded93296f7c157631369fbddcf90a Mon Sep 17 00:00:00 2001 +From: Christian Persch +Date: Tue, 13 Mar 2018 12:32:15 +0100 +Subject: [PATCH] build: Explicitly link to libdl + +https://bugzilla.gnome.org/show_bug.cgi?id=794281 +--- + configure.ac | 7 +++++++ + gucharmap/Makefile.am | 1 + + 2 files changed, 8 insertions(+) + +diff --git a/configure.ac b/configure.ac +index edbeafc3edf0..a4aa04a52d5a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -120,6 +120,13 @@ PKG_CHECK_MODULES([GTK],[ + freetype2 + ]) + ++sv_LIBS="$LIBS" ++LIBS= ++AC_SEARCH_LIBS([dlsym],[dl]) ++LIBDL="$LIBS" ++LIBS="$sv_LIBS" ++AC_SUBST([LIBDL]) ++ + GLIB_GENMARSHAL="$($PKG_CONFIG --variable=glib_genmarshal glib-2.0)" + AC_SUBST([GLIB_GENMARSHAL]) + GLIB_MKENUMS="$($PKG_CONFIG --variable=glib_mkenums glib-2.0)" +diff --git a/gucharmap/Makefile.am b/gucharmap/Makefile.am +index e14b9d08b209..86b8b013311f 100644 +--- a/gucharmap/Makefile.am ++++ b/gucharmap/Makefile.am +@@ -156,6 +156,7 @@ gucharmap_LDFLAGS = \ + gucharmap_LDADD = \ + libgucharmap@GUCHARMAP_LIBRARY_SUFFIX_U@.la \ + $(GTK_LIBS) \ ++ $(LIBDL) \ + $(INTL_LIBS) + + dist_noinst_DATA = gucharmap-menus.ui +-- +2.16.2 + diff --git a/SOURCES/fix-locale-unihan.patch b/SOURCES/fix-locale-unihan.patch new file mode 100644 index 0000000..f88cb41 --- /dev/null +++ b/SOURCES/fix-locale-unihan.patch @@ -0,0 +1,12 @@ +diff -urNp gucharmap-10.0.4.old/gucharmap/gen-guch-unicode-tables.pl gucharmap-10.0.4/gucharmap/gen-guch-unicode-tables.pl +--- gucharmap-10.0.4.old/gucharmap/gen-guch-unicode-tables.pl 2018-06-08 16:10:24.627875254 +0100 ++++ gucharmap-10.0.4/gucharmap/gen-guch-unicode-tables.pl 2018-06-08 16:11:01.439753440 +0100 +@@ -54,7 +54,7 @@ opendir (my $dir, $d) or die "Cannot ope + for my $f (readdir ($dir)) + { + $unicodedata_txt = "$d/$f" if ($f =~ /UnicodeData.*\.txt/); +- $unihan_zip = "$d/$f" if ($f =~ /Unihan.*\.zip/); ++ $unihan_zip = "../Unihan.zip"; + $nameslist_txt = "$d/$f" if ($f =~ /NamesList.*\.txt/); + $blocks_txt = "$d/$f" if ($f =~ /Blocks.*\.txt/); + $scripts_txt = "$d/$f" if ($f =~ /Scripts.*\.txt/); diff --git a/SPECS/gucharmap.spec b/SPECS/gucharmap.spec index 655b881..ed23506 100644 --- a/SPECS/gucharmap.spec +++ b/SPECS/gucharmap.spec @@ -1,16 +1,24 @@ %define glib2_version 2.32.0 -%define gtk3_version 3.4.0 +%define gtk3_version 3.15.9 Name: gucharmap -Version: 3.18.2 +Version: 10.0.4 Release: 1%{?dist} Summary: Unicode character picker and font browser License: GPLv3+ and GFDL and MIT # GPL for the source code, GFDL for the docs, MIT for Unicode data URL: https://wiki.gnome.org/Apps/Gucharmap -Source: https://download.gnome.org/sources/gucharmap/3.18/gucharmap-%{version}.tar.xz +Source: https://download.gnome.org/sources/gucharmap/10.0/gucharmap-%{version}.tar.xz +Source1: Unihan.zip +# Backported from upstream +Patch0: 0001-build-Explicitly-link-to-libdl.patch + +# no Unihan in RHEL +Patch1: fix-locale-unihan.patch + +BuildRequires: libappstream-glib BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: gtk3-devel >= %{gtk3_version} BuildRequires: gobject-introspection-devel @@ -19,6 +27,10 @@ BuildRequires: intltool BuildRequires: itstool BuildRequires: /usr/bin/appstream-util BuildRequires: /usr/bin/desktop-file-validate +BuildRequires: unicode-ucd +BuildRequires: perl(Env) +# for patch0 +BuildRequires: autoconf automake yelp-tools Requires: %{name}-libs%{?_isa} = %{version}-%{release} @@ -43,11 +55,16 @@ The gucharmap-devel package contains header files and other resources needed to use the libgucharmap library. %prep -%setup -q +%autosetup -p1 %build +cp %{SOURCE1} %{_builddir}/%{?buildsubdir} +# for patch0 +autoreconf -fi + %configure --with-gtk=3.0 \ - --enable-introspection + --enable-introspection \ + --with-unicode-data=%{_datadir}/unicode/ucd make %{?_smp_mflags} %install @@ -59,7 +76,7 @@ make %{?_smp_mflags} # # See http://people.freedesktop.org/~hughsient/appdata/#screenshots for more details. # -appstream-util replace-screenshots $RPM_BUILD_ROOT%{_datadir}/appdata/gucharmap.appdata.xml \ +appstream-util replace-screenshots $RPM_BUILD_ROOT%{_datadir}/metainfo/gucharmap.appdata.xml \ https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/gucharmap/a.png \ https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/gucharmap/b.png @@ -91,14 +108,14 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %files -f gucharmap.lang %license COPYING -%doc AUTHORS NEWS README +%doc AUTHORS NEWS %{_bindir}/charmap %{_bindir}/gucharmap %{_bindir}/gnome-character-map -%{_datadir}/appdata/gucharmap.appdata.xml %{_datadir}/applications/gucharmap.desktop %{_datadir}/glib-2.0/schemas/org.gnome.Charmap.enums.xml %{_datadir}/glib-2.0/schemas/org.gnome.Charmap.gschema.xml +%{_datadir}/metainfo/gucharmap.appdata.xml %files libs %license COPYING @@ -113,6 +130,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %changelog +* Wed Jun 06 2018 Richard Hughes - 10.0.4-1 +- Update to 10.0.4 +- Resolves: #1569279 + * Fri Mar 10 2017 Kalev Lember - 3.18.2-1 - Update to 3.18.2 - Resolves: #1386984