Package: xfree86v3
Version: unavailable; reported 2002-11-29
Followup-For: Bug #137752
This is a dirty patch that enables xfree86v3 to build on powerpc, the first
part is to correct one of the patches to make it put the configuration for
xfree68 on the correct place, this was done on xfree86 but not on 68. The
second part is the dirty one and solves in a dirty way the problem that this
bug addresses, so it should not be applied like that to the package, but may
allow somebody to build it.
diff -r -u
v3standard/xfree86v3-3.3.6/debian/patches/077_xfree68_common_Imakefile_resync.diff
xfree86v3-3.3.6/debian/patches/077_xfree68_common_Imakefile_resync.diff
--- v3standard/xfree86v3-3.3.6/debian/patches/077_xfree68_common_Imakefile_resync.diff
Wed Nov 27 23:16:20 2002
+++ xfree86v3-3.3.6/debian/patches/077_xfree68_common_Imakefile_resync.diff Thu
+Nov 28 01:15:19 2002
@@ -153,7 +153,7 @@
# if MicroTouchSupport
SpecialObjectRule(xf86MuTouch.o,xf86MuTouch.c,$(SHARED_CFLAGS))
DynamicModuleTarget(xf86MuTouch.so,xf86MuTouch.o)
-@@ -287,6 +302,11 @@
+@@ -287,10 +302,15 @@
DynamicModuleTarget(xf86Dial.so,xf86Dial.o)
InstallDynamicModule(xf86Dial.so,$(MODULEDIR))
# endif
@@ -164,7 +164,13 @@
+# endif
# endif
#endif
-
SpecialObjectRule($(XCONFIGSRC).o,$(XCONFIGSRC).c,'-DSERVER_CONFIG_FILE="$(LIBDIR)/$(XCONFIGFILE)"'
$(MODULEDEFINES) $(EXT_DEFINES))
+-SpecialObjectRule($(XCONFIGSRC).o,$(XCONFIGSRC).c,'-DSERVER_CONFIG_FILE="$(LIBDIR)/$(XCONFIGFILE)"'
+ $(MODULEDEFINES) $(EXT_DEFINES))
+-SpecialObjectRule(xf86DCConf.o,xf86DCConf.c,'-DSERVER_CONFIG_FILE="$(LIBDIR)/$(XCONFIGFILE)"'
+ $(MODULEDEFINES) $(EXT_DEFINES))
++SpecialObjectRule($(XCONFIGSRC).o,$(XCONFIGSRC).c,'-DSERVER_CONFIG_FILE="/etc/X11/$(XCONFIGFILE)"'
+ $(MODULEDEFINES) $(EXT_DEFINES))
++SpecialObjectRule(xf86DCConf.o,xf86DCConf.c,'-DSERVER_CONFIG_FILE="/etc/X11/$(XCONFIGFILE)"'
+ $(MODULEDEFINES) $(EXT_DEFINES))
+ SpecialObjectRule(xf86Init.o,xf86Init.c $(ICONFIGFILES),$(OSNAMEDEF) $(EXT_DEFINES)
+$(BETADEFS))
+ SpecialCObjectRule(xf86Events,$(ICONFIGFILES),$(EXT_DEFINES) $(KEYB_DEFINES))
+ SpecialCObjectRule($(KBD),$(ICONFIGFILES),$(KEYB_DEFINES))
@@ -323,6 +343,8 @@
LinkSourceFile(xf86Summa.c,$(XF86SRC)/common)
LinkSourceFile(xf86AceCad.c,$(XF86SRC)/common)
diff -r -u v3standard/xfree86v3-3.3.6/debian/rules xfree86v3-3.3.6/debian/rules
--- v3standard/xfree86v3-3.3.6/debian/rules Wed Nov 27 23:16:19 2002
+++ xfree86v3-3.3.6/debian/rules Thu Nov 28 01:15:19 2002
@@ -286,6 +286,9 @@
done
dh_installdebconf
dh_installdirs
+ cp build-tree/xc/programs/Xserver/hw/xfree86/doc/*
+debian/tmp/usr/X11R6/lib/X11/doc/ | true
+ cp build-tree/xc/programs/Xserver/hw/xfree86/VGADriverDoc/*
+debian/tmp/usr/X11R6/lib/X11/doc/ | true
+ cp build-tree/xc/programs/Xserver/hw/xfree86/etc/*
+debian/tmp/usr/X11R6/lib/X11/etc/ | true
dh_installdocs
dh_installexamples
dh_installmenu
Hope this helps a bit.
Regards!
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
