Commit a11364fe authored by Jeremy Bicha's avatar Jeremy Bicha

Cherry-pick patch to fix undefined reference

parent 4a7ed554
gucharmap (1:10.0.4-1) UNRELEASED; urgency=medium
* New upstream release
* Minor update to debian/copyright
* Update Vcs fields for migration to https://salsa.debian.org/
* Add fix-invalid-AppStream-metadata.patch:
- Adjust the AppStream metadata file so that it works with GNOME Software
* Minor update to debian/copyright
* Cherry-pick build-Explicitly-link-to-libdl.patch:
- Fix undefined reference
-- Jeremy Bicha <jbicha@debian.org> Fri, 19 Jan 2018 22:14:14 -0500
......@@ -445,7 +447,7 @@ gucharmap (1:2.26.3.1-1) unstable; urgency=low
gucharmap (1:2.26.2-1) unstable; urgency=low
[ Josselin Mouette ]
* Add libglib2.0-doc and libgtk2.0-doc to build-deps to ensure proper
* Add libglib2.0-doc and libgtk2.0-doc to build-deps to ensure proper
xrefs.
[ Luca Bruno ]
......@@ -653,7 +655,7 @@ gucharmap (1:1.4.4-2) unstable; urgency=low
[ Loic Minier ]
* Update watch file. [debian/watch]
[ J.H.M. Dassen (Ray) ]
* [debian/patches/00_relibtoolise.patch] Added, does away with unneeded
direct dependencies.
......@@ -716,7 +718,7 @@ gucharmap (1:1.4.2-1) unstable; urgency=low
gucharmap (1:1.4.0-1) unstable; urgency=low
* New upstream release (Closes: #257957).
* debian/control.in:
* debian/control.in:
- soname 3 -> 4, library's name change.
- Conflicts/Replaces libgucharmap3-dev.
* debian/*.install:
......@@ -725,12 +727,12 @@ gucharmap (1:1.4.0-1) unstable; urgency=low
- lib name change .
* debian/patches/remove-immodules-at-build-time.patch:
- removed.
-- Sebastien Bacher <seb128@debian.org> Sun, 11 Jul 2004 01:10:10 +0200
gucharmap (1:1.2.0-6) unstable; urgency=low
* debian/control.in:
* debian/control.in:
+ gucharmap Depends on libgtk2.0-bin (Closes: #248790).
-- Sebastien Bacher <seb128@debian.org> Thu, 13 May 2004 08:22:44 +0200
......@@ -775,7 +777,7 @@ gucharmap (1:1.0.0-2) unstable; urgency=low
-- Sebastien Bacher <seb128@debian.org> Wed, 17 Sep 2003 14:56:36 +0200
gucharmap (1:1.0.0-1) unstable; urgency=low
* New maintainer.
* New upstream release.
* Build-Depends on libgucharmap0 (= ${Source-Version}) (Closes: #205432).
......@@ -817,7 +819,7 @@ gucharmap (0.6.0-2) unstable; urgency=low
you'll have another beer." release.
* debian/gucharmap.install:
- Install gucharmap GTK+ input method.
* debian/rocks:
* debian/rocks:
- Disable GNOME support from package for now, by request of author.
* debian/control:
- Don't Build-Depend on libgnomeui-dev.
......
# This file is autogenerated. DO NOT EDIT!
#
#
# Modifications should be made to debian/control.in instead.
# This file is regenerated automatically in the clean target.
Source: gucharmap
......
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
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