Re-enable map support
Sjoerd Simons
12 years ago
| 1 | 1 |
|
| 2 | 2 |
* New upstream release (3.3.90)
|
| 3 | 3 |
* Sync from the Ubuntu package by Ken VanDine
|
| 4 | |
|
| 5 | |
-- Sjoerd Simons <sjoerd@debian.org> Sat, 10 Mar 2012 14:30:03 +0100
|
|
4 |
* debian/patches/use_champlain-0.12.patch:
|
|
5 |
- Added. Enabling using libchamplain-0.12
|
|
6 |
* Re-enable building with map support
|
|
7 |
|
|
8 |
-- Sjoerd Simons <sjoerd@debian.org> Sun, 11 Mar 2012 22:44:45 +0100
|
| 6 | 9 |
|
| 7 | 10 |
empathy (3.2.2-2) experimental; urgency=low
|
| 8 | 11 |
|
| 10 | 10 |
Emilio Pozuelo Monfort <pochu@debian.org>
|
| 11 | 11 |
Build-Depends: cdbs (>= 0.4.90),
|
| 12 | 12 |
debhelper (>= 8),
|
|
13 |
dh-autoreconf,
|
| 13 | 14 |
rarian-compat,
|
| 14 | 15 |
librarian-dev,
|
| 15 | 16 |
libglib2.0-dev (>= 2.28),
|
|
| 51 | 52 |
libtelepathy-farstream-dev (>= 0.2.1),
|
| 52 | 53 |
libclutter-gst-dev,
|
| 53 | 54 |
libclutter-1.0-dev (>= 1.7.14),
|
| 54 | |
libclutter-gtk-1.0-dev (>= 0.90.3)
|
|
55 |
libclutter-gtk-1.0-dev (>= 0.90.3),
|
|
56 |
libchamplain-gtk-0.12-dev
|
| 55 | 57 |
Standards-Version: 3.9.2
|
| 56 | 58 |
Vcs-Git: git://git.debian.org/git/pkg-telepathy/empathy.git
|
| 57 | 59 |
Vcs-Browser: http://git.debian.org/?p=pkg-telepathy/empathy.git
|
debian/patches/99_ltmain_as-needed.patch
less
more
| 0 | |
Index: libnotify-0.5.0/ltmain.sh
|
| 1 | |
===================================================================
|
| 2 | |
--- libnotify-0.5.0.orig/ltmain.sh 2010-06-24 10:01:38.000000000 +0200
|
| 3 | |
+++ libnotify-0.5.0/ltmain.sh 2010-06-29 07:27:27.202952725 +0200
|
| 4 | |
@@ -4716,6 +4716,11 @@
|
| 5 | |
arg=$func_stripname_result
|
| 6 | |
;;
|
| 7 | |
|
| 8 | |
+ -Wl,--as-needed)
|
| 9 | |
+ deplibs="$deplibs $arg"
|
| 10 | |
+ continue
|
| 11 | |
+ ;;
|
| 12 | |
+
|
| 13 | |
-Wl,*)
|
| 14 | |
func_stripname '-Wl,' '' "$arg"
|
| 15 | |
args=$func_stripname_result
|
| 16 | |
@@ -5067,6 +5072,15 @@
|
| 17 | |
lib=
|
| 18 | |
found=no
|
| 19 | |
case $deplib in
|
| 20 | |
+ -Wl,--as-needed)
|
| 21 | |
+ if test "$linkmode,$pass" = "prog,link"; then
|
| 22 | |
+ compile_deplibs="$deplib $compile_deplibs"
|
| 23 | |
+ finalize_deplibs="$deplib $finalize_deplibs"
|
| 24 | |
+ else
|
| 25 | |
+ deplibs="$deplib $deplibs"
|
| 26 | |
+ fi
|
| 27 | |
+ continue
|
| 28 | |
+ ;;
|
| 29 | |
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
|
| 30 | |
if test "$linkmode,$pass" = "prog,link"; then
|
| 31 | |
compile_deplibs="$deplib $compile_deplibs"
|
| 0 | |
99_ltmain_as-needed.patch
|
|
0 |
use_champlain-0.12.patch
|
|
0 |
diff --git a/configure.ac b/configure.ac
|
|
1 |
index 3a0c72d..4287601 100644
|
|
2 |
--- a/configure.ac
|
|
3 |
+++ b/configure.ac
|
|
4 |
@@ -293,9 +293,6 @@ fi
|
|
5 |
# -----------------------------------------------------------
|
|
6 |
IT_PROG_INTLTOOL([0.40.0])
|
|
7 |
|
|
8 |
-AM_GNU_GETTEXT_VERSION([0.17])
|
|
9 |
-AM_GNU_GETTEXT([external])
|
|
10 |
-
|
|
11 |
GETTEXT_PACKAGE=empathy
|
|
12 |
AC_SUBST(GETTEXT_PACKAGE)
|
|
13 |
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Gettext package name])
|
|
14 |
@@ -432,8 +429,8 @@ if test "x$enable_map" != "xno"; then
|
|
15 |
PKG_CHECK_MODULES(LIBCHAMPLAIN,
|
|
16 |
[
|
|
17 |
clutter-gtk-1.0
|
|
18 |
- champlain-gtk-0.14
|
|
19 |
- champlain-0.14 >= $CHAMPLAIN_REQUIRED
|
|
20 |
+ champlain-gtk-0.12
|
|
21 |
+ champlain-0.12 >= $CHAMPLAIN_REQUIRED
|
|
22 |
], have_libchamplain="yes", have_libchamplain="no")
|
|
23 |
|
|
24 |
if test "x$have_libchamplain" = "xyes"; then
|
| 0 | 0 |
#!/usr/bin/make -f
|
| 1 | 1 |
|
|
2 |
include /usr/share/cdbs/1/rules/autoreconf.mk
|
| 2 | 3 |
include /usr/share/cdbs/1/rules/debhelper.mk
|
| 3 | 4 |
include /usr/share/cdbs/1/class/gnome.mk
|
| 4 | 5 |
|
|
| 21 | 22 |
--enable-nautilus-sendto=yes \
|
| 22 | 23 |
--enable-empathy-av \
|
| 23 | 24 |
--disable-schemas-compile \
|
| 24 | |
# Waiting for build-depends
|
| 25 | |
# --enable-map=yes \
|
|
25 |
--enable-map=yes \
|
| 26 | 26 |
# --enable-goa=yes \
|
| 27 | 27 |
|
| 28 | 28 |
DEB_BUILD_ARCH_OS := $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
|