packages: urxvt/urxvt.spec, urxvt/urxvt-fontconfig.patch (NEW) - fontconfig...

[atler]

Author: atler                        Date: Thu Nov 25 13:28:33 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fontconfig linking patch (fixes TODO)
- run aclocal to properly regenerate configure
- remove unneeded BR: fontconfig-libs
- rel 1

---- Files affected:
packages/urxvt:
   urxvt.spec (1.54 -> 1.55) , urxvt-fontconfig.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/urxvt/urxvt.spec
diff -u packages/urxvt/urxvt.spec:1.54 packages/urxvt/urxvt.spec:1.55
--- packages/urxvt/urxvt.spec:1.54	Sat Nov 13 16:46:16 2010
+++ packages/urxvt/urxvt.spec	Thu Nov 25 14:28:28 2010
@@ -1,27 +1,19 @@
 # $Revision$, $Date$
-# TODO:
-# - Build fails on all platforms, same error for previous TH/TI built version 9.07
-#		/usr/bin/ld: rxvtfont.o: undefined reference to symbol 'FcPatternDel'
-#		/usr/bin/ld: note: 'FcPatternDel' is defined in DSO /usr/lib64/libfontconfig.so so try adding it to the linker command line
-#		/usr/lib64/libfontconfig.so: could not read symbols: Invalid operation
-#
-# Conditional build:
-#
 %include	/usr/lib/rpm/macros.perl
 Summary:	Rxvt terminal with unicode support and some improvements
 Summary(pl.UTF-8):	Terminal Rxvt z obsługą unicode i kilkoma usprawnieniami
 Name:		urxvt
 Version:	9.09
-Release:	0.1
+Release:	1
 License:	GPL v2+
 Group:		X11/Applications
 Source0:	http://dist.schmorp.de/rxvt-unicode/rxvt-unicode-%{version}.tar.bz2
 # Source0-md5:	3505887adae710382edee90ed5538a01
 Source1:	%{name}.desktop
+Patch0:		%{name}-fontconfig.patch
 URL:		http://software.schmorp.de/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	fontconfig-devel
-BuildRequires:	fontconfig-libs
 BuildRequires:	libev >= 4.0
 BuildRequires:	libstdc++-devel
 BuildRequires:	perl-devel
@@ -53,8 +45,10 @@
 
 %prep
 %setup -q -n rxvt-unicode-%{version}
+%patch0 -p1
 
 %build
+%{__aclocal} -I.
 %{__autoheader}
 %{__autoconf}
 %configure \
@@ -99,6 +93,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.55  2010/11/25 13:28:28  atler
+- fontconfig linking patch (fixes TODO)
+- run aclocal to properly regenerate configure
+- remove unneeded BR: fontconfig-libs
+- rel 1
+
 Revision 1.54  2010/11/13 15:46:16  caleb
 - Up to 9.09, NFY
 - TODO: Fix build errors, fontconfig dependency?

================================================================
Index: packages/urxvt/urxvt-fontconfig.patch
diff -u /dev/null packages/urxvt/urxvt-fontconfig.patch:1.1
--- /dev/null	Thu Nov 25 14:28:33 2010
+++ packages/urxvt/urxvt-fontconfig.patch	Thu Nov 25 14:28:28 2010
@@ -0,0 +1,25 @@
+diff -ur rxvt-unicode-9.09.orig/configure.ac rxvt-unicode-9.09/configure.ac
+--- rxvt-unicode-9.09.orig/configure.ac	2010-11-25 14:08:18.762064681 +0100
++++ rxvt-unicode-9.09/configure.ac	2010-11-25 14:13:31.892064488 +0100
+@@ -651,6 +651,7 @@
+     AC_DEFINE(XFT, 1, Define to enable xft support)
+   fi
+ fi
++PKG_CHECK_MODULES([FC], [fontconfig])
+ if test x$support_inheritpixmap = xyes; then
+   support_xrender=yes
+   AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+diff -ur rxvt-unicode-9.09.orig/src/Makefile.in rxvt-unicode-9.09/src/Makefile.in
+--- rxvt-unicode-9.09.orig/src/Makefile.in	2010-11-25 14:08:18.745397691 +0100
++++ rxvt-unicode-9.09/src/Makefile.in	2010-11-25 14:13:05.218731267 +0100
+@@ -19,8 +19,8 @@
+ LDFLAGS = @LDFLAGS@
+ DEFS = @DEFS@
+ LIBS = @LIBS@
+-XINC = @X_CFLAGS@ @AFTERIMAGE_CFLAGS@ @PIXBUF_CFLAGS@
+-XLIB = @X_LIBS@ @AFTERIMAGE_LIBS@ -lX11 @X_EXTRA_LIBS@ @PIXBUF_LIBS@
++XINC = @X_CFLAGS@ @AFTERIMAGE_CFLAGS@ @PIXBUF_CFLAGS@ @FC_CFLAGS@
++XLIB = @X_LIBS@ @AFTERIMAGE_LIBS@ -lX11 @X_EXTRA_LIBS@ @PIXBUF_LIBS@ @FC_LIBS@
+ COMPILE = $(CXX) -I.. -I$(srcdir) -I. -I$(srcdir)/../libev $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(XINC)
+ LINK = @LINKER@ $(LDFLAGS)
+ EXEEXT = @EXEEXT@
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/urxvt/urxvt.spec?r1=1.54&r2=1.55&f=u