diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2010-03-08 14:12:33 +0100 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2010-03-08 14:12:33 +0100 |
| commit | 3244ba1bcf5c196c922463b5020050092facecba (patch) | |
| tree | 6cea1647fb75c45d0222f61c2772e57a41465d14 /package/x11r7/xlib_xtrans | |
| parent | 73f244d59483dd9dcddf29cb6c92d9bcdc6f7898 (diff) | |
| parent | 3437f2bee3e2adf58eb690e9ff7c493e683d43fa (diff) | |
Merge branch 'x11r75' of git://gitorious.org/takeme-buildroot/takeme-buildroot
Diffstat (limited to 'package/x11r7/xlib_xtrans')
| -rw-r--r-- | package/x11r7/xlib_xtrans/Config.in | 2 | ||||
| -rw-r--r-- | package/x11r7/xlib_xtrans/xlib_xtrans-1.2.5-fix_pkgconfig_dir.patch | 11 | ||||
| -rw-r--r-- | package/x11r7/xlib_xtrans/xlib_xtrans.mk | 3 |
3 files changed, 13 insertions, 3 deletions
diff --git a/package/x11r7/xlib_xtrans/Config.in b/package/x11r7/xlib_xtrans/Config.in index 668ae6308..4b6902074 100644 --- a/package/x11r7/xlib_xtrans/Config.in +++ b/package/x11r7/xlib_xtrans/Config.in @@ -1,5 +1,5 @@ config BR2_PACKAGE_XLIB_XTRANS bool "xtrans" help - xtrans 1.0.3 + xtrans 1.2.5 X.Org xtrans library diff --git a/package/x11r7/xlib_xtrans/xlib_xtrans-1.2.5-fix_pkgconfig_dir.patch b/package/x11r7/xlib_xtrans/xlib_xtrans-1.2.5-fix_pkgconfig_dir.patch new file mode 100644 index 000000000..e8270c9bb --- /dev/null +++ b/package/x11r7/xlib_xtrans/xlib_xtrans-1.2.5-fix_pkgconfig_dir.patch @@ -0,0 +1,11 @@ +--- xlib_xtrans-1.2.5/Makefile.in.orig 2010-01-23 16:24:25.287333323 +0200 ++++ xlib_xtrans-1.2.5/Makefile.in 2010-01-23 16:25:06.336331430 +0200 +@@ -222,7 +222,7 @@ Xtransinclude_HEADERS = \ + + aclocaldir = $(datadir)/aclocal + aclocal_DATA = xtrans.m4 +-pkgconfigdir = $(datadir)/pkgconfig ++pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = xtrans.pc + EXTRA_DIST = xtrans.pc.in ${aclocal_DATA} ChangeLog Xtrans.mm + MAINTAINERCLEANFILES = ChangeLog diff --git a/package/x11r7/xlib_xtrans/xlib_xtrans.mk b/package/x11r7/xlib_xtrans/xlib_xtrans.mk index 6959641b0..0968bdf0a 100644 --- a/package/x11r7/xlib_xtrans/xlib_xtrans.mk +++ b/package/x11r7/xlib_xtrans/xlib_xtrans.mk @@ -4,11 +4,10 @@ # ################################################################################ -XLIB_XTRANS_VERSION = 1.2.1 +XLIB_XTRANS_VERSION = 1.2.5 XLIB_XTRANS_SOURCE = xtrans-$(XLIB_XTRANS_VERSION).tar.bz2 XLIB_XTRANS_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_XTRANS_AUTORECONF = NO XLIB_XTRANS_INSTALL_STAGING = YES -XLIB_XTRANS_CONF_OPT = --enable-shared --disable-static $(eval $(call AUTOTARGETS,package/x11r7,xlib_xtrans)) |