← Back to branch summary

~ubuntu-branches/ubuntu/precise/uim/precise

« back to all changes in this revision

Viewing changes to debian/patches/fix_build_with_ld_as_needed.patch

  • Committer: Package Import Robot
  • Author(s): Ilya Barygin
  • Date: 2011-12-18 16:35:38 UTC
  • mfrom: (1.1.13) (15.1.7 sid)
  • Revision ID: package-import@ubuntu.com-20111218163538-8ktir39z2mjpii8z
Tags: 1:1.7.1-3ubuntu1
https://launchpad.net/bugs/818199
* Merge from Debian testing (LP: #818199).
* Remaining changes:
  - debian/uim-qt.install: Fix plugin path for multiarch location.
* Dropped changes:
  - uim-applet-gnome removal (GNOME 3 applet is available)
  - 19_as-needed_compile_fix.dpatch (accepted into Debian package)
* translations.patch: add several files to POTFILE.in to prevent
  intltool-update failure.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/fix_build_with_ld_as_needed.patch
 
1
Description: fix build with ld --as-needed
 
2
 uim-counted-init is a static library which needs symbols from libuim
 
3
 which it must be placed behind it on the command line so it is not
 
4
 dropped by ld --as-needed
 
5
Author: Julian Taylor <jtaylor.debian@googlemail.com>
 
6
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/uim/+bug/832939
 
7
Index: uim-1.7.1/qt4/pref/uim-pref-qt4.pro.in
 
8
===================================================================
 
9
--- uim-1.7.1.orig/qt4/pref/uim-pref-qt4.pro.in 2011-08-25 23:31:03.080564183 +0200
 
10
+++ uim-1.7.1/qt4/pref/uim-pref-qt4.pro.in      2011-08-25 23:31:01.170564166 +0200
 
11
@@ -4,7 +4,7 @@
 
12
 
 
13
 # to include qtgettext.h
 
14
 INCLUDEPATH += @srcdir@/..
 
15
-LIBS += -luim-custom -luim-counted-init @LIBINTL@
 
16
+LIBS += -luim-custom -luim-counted-init -luim @LIBINTL@
 
17
 
 
18
 QMAKE_UIC = $$QMAKE_UIC -tr UIC_
 
19