From 0a94a7c726036ba4874edf56dfa1275514638044816bb1438ad7d2b3f2621a5d Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 5 Sep 2011 09:55:40 +0000 Subject: [PATCH] Accepting request 80292 from home:elvigia:branches:X11:windowmanagers - Fix linking problems with new gnu ld OBS-URL: https://build.opensuse.org/request/show/80292 OBS-URL: https://build.opensuse.org/package/show/X11:windowmanagers/WindowMaker?expand=0&rev=9 --- WindowMaker.changes | 5 +++++ WindowMaker.spec | 5 ++++- wm-linking.patch | 10 ++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 wm-linking.patch diff --git a/WindowMaker.changes b/WindowMaker.changes index f96182a..1cd2957 100644 --- a/WindowMaker.changes +++ b/WindowMaker.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Aug 31 04:38:04 UTC 2011 - crrodriguez@opensuse.org + +- Fix linking problems with new gnu ld + ------------------------------------------------------------------- Tue Jul 26 19:45:06 UTC 2011 - andrea.turrini@gmail.com diff --git a/WindowMaker.spec b/WindowMaker.spec index d4eda33..962068e 100644 --- a/WindowMaker.spec +++ b/WindowMaker.spec @@ -19,7 +19,7 @@ Name: WindowMaker -BuildRequires: freetype2-devel gcc-c++ giflib-devel libpng-devel libtiff-devel update-desktop-files xorg-x11-devel +BuildRequires: freetype2-devel fontconfig-devel gcc-c++ giflib-devel libpng-devel libtiff-devel update-desktop-files xorg-x11-devel License: GPLv2+ ; LGPLv2.1+ ; Public Domain, Freeware Group: System/GUI/Other Url: http://www.windowmaker.info/ @@ -53,6 +53,8 @@ Patch38: WindowMaker-wmspec.c-findBestIcon.patch Patch39: WindowMaker-dir-specification.patch Patch40: WindowMaker-composite.patch Patch41: WindowMaker-png_check_sig.patch +Patch42: wm-linking.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-build %package devel @@ -101,6 +103,7 @@ cp WindowMaker/{menu.*,plmenu.*} menu.orig %patch39 %patch40 %patch41 +%patch42 cp %{S:4} . cp %{S:6} . rename no nb po/no.* diff --git a/wm-linking.patch b/wm-linking.patch new file mode 100644 index 0000000..0087ca9 --- /dev/null +++ b/wm-linking.patch @@ -0,0 +1,10 @@ +--- WPrefs.app/Makefile.am.orig ++++ WPrefs.app/Makefile.am +@@ -55,5 +55,6 @@ WPrefs_LDADD = \ + $(top_builddir)/WINGs/libWUtil.la\ + $(top_builddir)/wrlib/libwraster.la \ + @XFTLIBS@ \ +- @INTLIBS@ ++ @INTLIBS@ \ ++ -lfontconfig +