commit 5a35a4e9731fdc76ba542bbfd76c7e03c39146f5
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Sat Jul 19 19:58:47 2014 +0200
- up to 1.5.0
xorg-lib-libXfont-fontsproto.patch | 31 -------------------------------
xorg-lib-libXfont.spec | 6 ++----
2 files changed, 2 insertions(+), 35 deletions(-)
---
diff --git a/xorg-lib-libXfont.spec b/xorg-lib-libXfont.spec
index 824a8c0..b036904 100644
--- a/xorg-lib-libXfont.spec
+++ b/xorg-lib-libXfont.spec
@@ -1,13 +1,12 @@
Summary: X font library used by the X server
Summary(pl.UTF-8): Używana przez X serwer biblioteka fontów X
Name: xorg-lib-libXfont
-Version: 1.4.8
+Version: 1.5.0
Release: 1
License: MIT
Group: X11/Libraries
Source0:
http://xorg.freedesktop.org/releases/individual/lib/libXfont-%{version}.tar.bz2
-# Source0-md5: a7cbc4128c244d9c54fdf21cd517ac8c
-Patch0: %{name}-fontsproto.patch
+# Source0-md5: 664629bfa7cdf8b984155019fd395dcb
URL: http://xorg.freedesktop.org/
BuildRequires: autoconf >= 2.60
BuildRequires: automake
@@ -90,7 +89,6 @@ Pakiet zawiera statyczną bibliotekę libXfont.
%prep
%setup -q -n libXfont-%{version}
-%patch0 -p1
%build
%{__libtoolize}
diff --git a/xorg-lib-libXfont-fontsproto.patch
b/xorg-lib-libXfont-fontsproto.patch
deleted file mode 100644
index a4e3d99..0000000
--- a/xorg-lib-libXfont-fontsproto.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- libXfont-1.4.8/configure.ac.orig 2014-05-16 04:38:27.000000000 +0200
-+++ libXfont-1.4.8/configure.ac 2014-05-17 09:10:06.899291794 +0200
-@@ -180,7 +180,7 @@
- AC_CHECK_LIB(m, hypot, [MATH_LIBS=-lm
- AC_SUBST(MATH_LIBS)], AC_MSG_ERROR([*** libm is required]))
-
--PKG_CHECK_MODULES(XFONT, [xproto xtrans fontsproto < 2.1.3 fontenc])
-+PKG_CHECK_MODULES(XFONT, [xproto xtrans fontsproto >= 2.1.3 fontenc])
-
- # Transport selection macro from xtrans.m4
- XTRANS_CONNECTION_FLAGS
---- libXfont-1.4.8/src/util/patcache.c.orig 2014-05-16 04:38:27.000000000
+0200
-+++ libXfont-1.4.8/src/util/patcache.c 2014-05-17 09:18:50.082614223 +0200
-@@ -128,7 +128,7 @@
- /* add entry */
- void
- CacheFontPattern (FontPatternCachePtr cache,
-- char *pattern,
-+ const char *pattern,
- int patlen,
- FontPtr pFont)
- {
-@@ -174,7 +174,7 @@
- /* find matching entry */
- FontPtr
- FindCachedFontPattern (FontPatternCachePtr cache,
-- char *pattern,
-+ const char *pattern,
- int patlen)
- {
- int hash;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xorg-lib-libXfont.git/commitdiff/5a35a4e9731fdc76ba542bbfd76c7e03c39146f5
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
