Mailinglist Archive: opensuse-commit (1318 mails)
| < Previous | Next > |
commit xorg-x11
- From: root@xxxxxxx (h_root)
- Date: Tue, 15 Aug 2006 18:36:38 +0200 (CEST)
- Message-id: <20060815163638.E210495158@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package xorg-x11
checked in at Tue Aug 15 18:36:38 CEST 2006.
--------
--- xorg-x11/xorg-x11.changes 2006-08-07 16:31:49.000000000 +0200
+++ xorg-x11/xorg-x11.changes 2006-08-15 12:14:50.000000000 +0200
@@ -1,0 +2,5 @@
+Tue Aug 15 12:11:42 CEST 2006 - sndirsch@xxxxxxx
+
+- fixed build of fonttosfnt for new freetype2 (build enabled again)
+
+-------------------------------------------------------------------
New:
----
fonttosfnt.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11.spec ++++++
--- /var/tmp/diff_new_pack.Xu1Pqd/_old 2006-08-15 18:35:56.000000000 +0200
+++ /var/tmp/diff_new_pack.Xu1Pqd/_new 2006-08-15 18:35:56.000000000 +0200
@@ -11,10 +11,10 @@
# norootforbuild
Name: xorg-x11
-BuildRequires: fontconfig-devel freetype2-devel libpng-devel pam-devel pkgconfig rsh update-desktop-files xorg-x11-devel xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXext-devel xorg-x11-libXfixes-devel xorg-x11-libXmu-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXprintUtil-devel xorg-x11-libXrender-devel xorg-x11-libXt-devel xorg-x11-libXv-devel xorg-x11-libfontenc-devel xorg-x11-libxkbfile-devel xorg-x11-proto-devel xorg-x11-xtrans-devel
+BuildRequires: cpp fontconfig-devel freetype2-devel libpng-devel pam-devel pkgconfig rsh update-desktop-files xorg-x11-devel xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXext-devel xorg-x11-libXfixes-devel xorg-x11-libXmu-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXprintUtil-devel xorg-x11-libXrender-devel xorg-x11-libXt-devel xorg-x11-libXv-devel xorg-x11-libfontenc-devel xorg-x11-libxkbfile-devel xorg-x11-proto-devel xorg-x11-xtrans-devel
URL: http://xorg.freedesktop.org/
Version: 7.1
-Release: 10
+Release: 11
License: X11/MIT, Other License(s), see package
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Utilities
@@ -135,6 +135,7 @@
Patch15: p_xrdb.diff
Patch16: p_twm_sig11.diff
Patch17: x11r6.9.0-setuid.diff
+Patch18: fonttosfnt.diff
%description
This package contains the X.Org core and sample applications.
@@ -237,13 +238,15 @@
%patch16 -p2
popd
%patch17
+pushd fonttosfnt-*
+%patch18
+popd
%build
%install
export PATH=${PATH}:$RPM_BUILD_ROOT/usr/bin
-for dir in xcursorgen-* xinit-* $(ls | grep -v -e fonttosfnt \
- -e suse \
+for dir in xcursorgen-* xinit-* $(ls | grep -v -e suse \
-e xcursorgen \
-e xinit \
-e xdriinfo); do
@@ -382,6 +385,8 @@
/var/lib/xdm/authdir/
%changelog -n xorg-x11
+* Tue Aug 15 2006 - sndirsch@xxxxxxx
+- fixed build of fonttosfnt for new freetype2 (build enabled again)
* Mon Aug 07 2006 - sndirsch@xxxxxxx
- p_xrdb.diff:
* fix xrdb when hostname is set to "(none)" (Bug #149007)
++++++ fonttosfnt.diff ++++++
--- util.c.orig 2006-08-15 12:02:34.000000000 +0200
+++ util.c 2006-08-15 12:02:43.000000000 +0200
@@ -35,7 +35,6 @@
#include <ft2build.h>
#include FT_FREETYPE_H
-#include FT_INTERNAL_OBJECTS_H
#include FT_BDF_H
#include "X11/Xos.h"
#include "fonttosfnt.h"
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |