OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=130

includes-fix.diff

@@ -0,0 +1,21 @@
+--- hw/xfree86/common/Makefile.am.orig	2009-06-19 21:06:18.000000000 +0200
++++ hw/xfree86/common/Makefile.am	2009-06-19 21:08:00.000000000 +0200
+@@ -47,7 +47,7 @@
+               xf86PciInfo.h xf86Priv.h xf86Privstr.h xf86Resources.h \
+               xf86cmap.h xf86fbman.h xf86str.h xf86RAC.h xf86Xinput.h xisb.h \
+               $(XVSDKINCS) xorgVersion.h \
+-              xf86sbusBus.h xf86xv.h xf86xvmc.h xf86xvpriv.h
++              xf86sbusBus.h xf86xvpriv.h
+ 
+ DISTCLEANFILES = xf86Build.h
+ CLEANFILES = $(BUILT_SOURCES)
+--- hw/xfree86/parser/Makefile.am.orig	2009-06-19 19:20:14.000000000 +0000
++++ hw/xfree86/parser/Makefile.am	2009-06-19 19:21:53.000000000 +0000
+@@ -35,6 +35,4 @@
+ 	xf86tokens.h
+ 
+ sdk_HEADERS = \
+-	$(LIBHEADERS) \
+-	xf86Parser.h \
+-	xf86Optrec.h
++	$(LIBHEADERS)

truetype_fontpath.diff

@@ -0,0 +1,21 @@
+--- configure.ac.orig	2009-06-19 19:33:07.000000000 +0000
++++ configure.ac	2009-06-19 19:34:00.000000000 +0000
+@@ -466,7 +466,7 @@
+ AC_ARG_WITH(fontdir,         AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to top level dir where fonts are installed (default: ${libdir}/X11/fonts)]),
+                                 [ FONTDIR="$withval" ],
+                                 [ FONTDIR="${libdir}/X11/fonts" ])
+-DEFAULT_FONT_PATH="${FONTDIR}/misc:unscaled,${FONTDIR}/TTF/,${FONTDIR}/OTF,${FONTDIR}/Type1/,${FONTDIR}/100dpi:unscaled,${FONTDIR}/75dpi:unscaled"
++DEFAULT_FONT_PATH="${FONTDIR}/misc:unscaled,${FONTDIR}/truetype/,${FONTDIR}/TTF/,${FONTDIR}/OTF,${FONTDIR}/Type1/,${FONTDIR}/100dpi:unscaled,${FONTDIR}/75dpi:unscaled"
+ case $host_os in
+ 	darwin*)    DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;;
+ esac
+--- hw/xfree86/Makefile.am.orig	2009-06-19 19:31:52.000000000 +0000
++++ hw/xfree86/Makefile.am	2009-06-19 19:32:53.000000000 +0000
+@@ -99,6 +99,7 @@
+ 	-DMISCFONTPATH="\"$(BASE_FONT_PATH)/misc:unscaled\"" \
+ 	-DT1FONTPATH="\"$(BASE_FONT_PATH)/Type1\"" \
+ 	-DTRUETYPEFONTPATH="\"$(BASE_FONT_PATH)/TTF\"" \
++	-DTRUETYPEFONTPATH="\"$(BASE_FONT_PATH)/truetype\"" \
+ 	-DDPI75FONTPATH="\"$(BASE_FONT_PATH)/75dpi:unscaled\"" \
+ 	-DDPI100FONTPATH="\"$(BASE_FONT_PATH)/100dpi:unscaled\"" \
+ 	-DMODULEPATH=\"$(DEFAULT_MODULE_PATH)\"

xorg-x11-server.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Jun 19 21:37:02 CEST 2009 - sndirsch@suse.de
+
+- includes-fix.diff
+  * build fix
+- truetype_fontpath.diff
+  * added /usr/share/fonts/truetype to default font path 
+
 -------------------------------------------------------------------
 Thu Jun 11 03:48:03 CEST 2009 - sndirsch@suse.de
 

xorg-x11-server.spec

@@ -33,8 +33,8 @@ BuildRequires:  libjpeg-devel
 Url:            http://xorg.freedesktop.org/
 %define EXPERIMENTAL 0
 Version:        7.4
-Release:        42
-License:        GPL v2 or later; X11/MIT
+Release:        43
+License:        GPL v2 or later ; MIT License (or similar)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Group:          System/X11/Servers/XF86_4
 %ifnarch s390 s390x
@@ -116,6 +116,8 @@ Patch142:       bug-507190_xorg-x11-server-bnc381139-randr-reprobe-on-unsuspend.
 Patch143:       autoconfig_fallback_fbdev_first.diff
 Patch144:       keyrelease-1.5.2.diff
 Patch145:       driver-autoconfig.diff
+Patch146:       includes-fix.diff
+Patch147:       truetype_fontpath.diff
 Patch160:       libdri_noPanoramiXExtension_symbol.patch
 Patch161:       cache-xkbcomp-output-for-fast-start-up.patch
 Patch162:       xserver-boottime.patch
@@ -131,7 +133,7 @@ This package contains the X.Org Server.
 
 
 %package extra
-License:        GPL v2 or later; X11/MIT
+License:        GPL v2 or later ; MIT License (or similar)
 Summary:        Additional Xservers (Xdmx, Xephyr, Xnest, Xvfb)
 Group:          System/X11/Servers/XF86_4
 Provides:       xorg-x11-Xnest xorg-x11-Xvfb xorg-x11-server:/usr/bin/Xvfb
@@ -145,7 +147,7 @@ This package contains additional Xservers (Xdmx, Xephyr, Xnest, Xvfb).
 
 
 %package sdk
-License:        GPL v2 or later; X11/MIT
+License:        GPL v2 or later ; MIT License (or similar)
 Summary:        X.Org Server SDK
 Group:          System/Libraries
 Provides:       xorg-x11-sdk
@@ -246,6 +248,8 @@ popd
 %patch143 -p0
 %patch144 -p1
 %patch145 -p0
+%patch146 -p0
+%patch147 -p0
 %patch160 -p1
 %patch161 -p1
 %if %moblin
@@ -565,6 +569,11 @@ exit 0
 %endif
 
 %changelog
+* Fri Jun 19 2009 sndirsch@suse.de
+- includes-fix.diff
+  * build fix
+- truetype_fontpath.diff
+  * added /usr/share/fonts/truetype to default font path
 * Thu Jun 11 2009 sndirsch@suse.de
 - use %%moblin define in specfile
 * Wed Jun 10 2009 sndirsch@suse.de