- fix build with newer ld

OBS-URL: https://build.opensuse.org/package/show/M17N/uim?expand=0&rev=25
This commit is contained in:
Stephan Kulow 2011-09-05 10:50:06 +00:00 committed by Git OBS Bridge
parent e72027bd13
commit 903464c9af
3 changed files with 32 additions and 0 deletions

25
fix-libs.patch Normal file
View File

@ -0,0 +1,25 @@
Index: uim-1.7.1/uim/Makefile.am
===================================================================
--- uim-1.7.1.orig/uim/Makefile.am 2010-05-28 03:53:01.000000000 +0200
+++ uim-1.7.1/uim/Makefile.am 2011-09-05 12:15:49.355126241 +0200
@@ -278,6 +278,7 @@ libuim_custom_enabler_la_CPPFLAGS = -I$(
libuim_counted_init_la_SOURCES = counted-init.c counted-init.h
libuim_counted_init_la_CPPFLAGS = -I$(top_srcdir)
+libuim_counted_init_la_LIBADD = libuim.la
if LIBUIM_X_UTIL
libuim_x_util_la_SOURCES = uim-x-util.h uim-x-kana-input-hack.c
Index: uim-1.7.1/qt4/pref/uim-pref-qt4.pro.in
===================================================================
--- uim-1.7.1.orig/qt4/pref/uim-pref-qt4.pro.in 2011-03-27 03:48:08.000000000 +0200
+++ uim-1.7.1/qt4/pref/uim-pref-qt4.pro.in 2011-09-05 12:33:56.412743578 +0200
@@ -4,7 +4,7 @@ TEMPLATE = app
# to include qtgettext.h
INCLUDEPATH += @srcdir@/..
-LIBS += -luim-custom -luim-counted-init @LIBINTL@
+LIBS += -luim-custom -luim-counted-init -luim @LIBINTL@
QMAKE_UIC = $$QMAKE_UIC -tr UIC_

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Sep 5 10:49:11 UTC 2011 - coolo@suse.com
- fix build with newer ld
-------------------------------------------------------------------
Mon Sep 5 10:10:11 UTC 2011 - nlminhtl@gmail.com

View File

@ -61,6 +61,7 @@ Source2: xemacs-auto-autoloads.el
Source3: etc-x11-xim.d-uim
Source4: baselibs.conf
Patch10: uim-sigscheme-build-fixes.diff
Patch11: fix-libs.patch
PreReq: %{_bindir}/touch
Provides: locale(xorg-x11:ja)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -141,6 +142,7 @@ Qt4 input module plugin for uim
%prep
%setup0 -q
%patch10 -p1
%patch11 -p1
cp emacs/README README.emacs
iconv -f euc-jp -t utf-8 < emacs/README.ja > README.ja.emacs