Commit a3fc3435 authored by Jeremy Bicha's avatar Jeremy Bicha

Drop obsolete patches

- build-Explicitly-link-to-libdl.patch: Applied
- fix-invalid-AppStream-metadata.patch: No longer needed

Gbp-Dch: Full
parent 00901b16
From: Christian Persch <chpe@src.gnome.org>
Date: Tue, 13 Mar 2018 12:32:15 +0100
Subject: 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 447c953..3991583 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 e14b9d0..86b8b01 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
From: Jeremy Bicha <jbicha@ubuntu.com>
Date: Fri, 16 Mar 2018 17:56:09 -0400
Subject: fix invalid AppStream metadata
AppStream tools don't handle that syntax yet
so let's simplify it
https://github.com/hughsie/appstream-glib/issues/225
https://github.com/hughsie/appstream-glib/issues/226
https://github.com/ximion/appstream/issues/181
---
data/gucharmap.appdata.xml.in | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/data/gucharmap.appdata.xml.in b/data/gucharmap.appdata.xml.in
index 255c3ac..b033802 100644
--- a/data/gucharmap.appdata.xml.in
+++ b/data/gucharmap.appdata.xml.in
@@ -32,7 +32,8 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:its="http://www.w3.org/2005/11/its">
<id>gucharmap.desktop</id>
- <metadata_license>GPL-3.0+ or GFDL-1.3-only</metadata_license>
+ <metadata_license>GFDL-1.3</metadata_license>
+ <!--Metadata is also licensed as GPL-3.0+-->
<project_license>GPL-3.0+</project_license>
<_name>Character Map</_name>
<_summary>Insert special characters into documents</_summary>
unicode-source-generation.patch
fix-invalid-AppStream-metadata.patch
build-Explicitly-link-to-libdl.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment