Author: ishikawa
Date: 2003-06-06 01:10:20 -0500 (Fri, 06 Jun 2003)
New Revision: 155

Added:
   people/ishikawa/memo.freetype
Modified:
   people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/changelog
   people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/rules
Log:
add -DFontLibSharedFreeType=NO to SERVERDEBUG_IMAKE_DEFINES in debian/rules



Modified: people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/changelog
==============================================================================
--- people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/changelog       
2003-06-06 04:16:38 UTC (rev 154)
+++ people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/changelog       
2003-06-06 06:10:20 UTC (rev 155)
@@ -13,6 +13,9 @@
     - New xlibmesa-drm-src package. (closes: #139817)
     - remove description about libXrender              [ISHIKAWA Mutsumi]
     - add Build-Depends: libxcursor-dev, libxrender-dev        [ISHIKAWA 
Mutsumi]
+    - add `-DFontLibSharedFreeType=NO' to SERVERDEBUG_IMAKE_DEFINES,
+      to build workaround for xserver-xfree86-dbg (with FreeType2
+      interface change)                                        [ISHIKAWA 
Mutsumi]
 
   * patch #003_linux.cf_and_xfree86.cf:                        [ISHIKAWA 
Mutsumi]
     - add `#define Has{Xft,Render,Xcursor}Library YES'

Modified: people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/rules
==============================================================================
--- people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/rules   2003-06-06 
04:16:38 UTC (rev 154)
+++ people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/rules   2003-06-06 
06:10:20 UTC (rev 155)
@@ -67,7 +67,7 @@
 # lines. Ever.
 TIMESTAMP:=$(shell env TZ=UTC date +%Y%m%d%H%M%S)
 IMAKE_DEFINES:=-DXFree86CustomVersion='\"Debian $(SOURCE_VERSION) $(TIMESTAMP) 
$(BUILDER)\"'
-SERVERDEBUG_IMAKE_DEFINES:=-DXFree86CustomVersion='\"Debian (static) 
$(SOURCE_VERSION) $(TIMESTAMP) $(BUILDER)\"' -DBuildServersOnly=YES 
-DDoLoadableServer=NO -DXnestServer=NO -DXVirtualFramebufferServer=NO 
-DXprtServer=NO $(DEBUGFLAGS)
+SERVERDEBUG_IMAKE_DEFINES:=-DXFree86CustomVersion='\"Debian (static) 
$(SOURCE_VERSION) $(TIMESTAMP) $(BUILDER)\"' -DBuildServersOnly=YES 
-DDoLoadableServer=NO -DFontLibSharedFreeType=NO -DXnestServer=NO 
-DXVirtualFramebufferServer=NO -DXprtServer=NO $(DEBUGFLAGS)
 
 # If this is an official build, set the BuilderEMailAddr that gets displayed in
 # some error messages.
@@ -283,8 +283,19 @@
                       debian/tmp/usr/X11R6/bin/XFree86-debug
        mkdir -p $(DEBTREEDIR)/etc/X11/cursors
        install -m 644 debian/local/cursors/*.theme 
$(DEBTREEDIR)/etc/X11/cursors
+
+       # Create the xlibmesa-drm-src package.
+       mkdir $(DEBTREEDIR)/usr/src
+       mkdir -p $(DRM_DST_DIR)
+       -cp -R $(DRM_SRC_DIR)/* $(DRM_DST_DIR) 
+       $(M4) -DOURVERSION="$(SOURCE_VERSION)" 
$(DRM_DST_DIR)/debian/module-changelog.m4 > $(DRM_DST_DIR)/debian/changelog.m4
+       rm $(DRM_DST_DIR)/debian/module-changelog.m4
+       chmod +x $(DRM_DST_DIR)/debian/rules
+       -cp -L 
build-tree/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/* 
$(DRM_DST_DIR)/
+       rm -f $(DRM_DST_DIR)/Makefile $(DRM_DST_DIR)/Imakefile 
$(DRM_DST_DIR)/Makefile.kernel
+       cd $(DRM_SRC_DIR) && tar -zcvf 
$(DEBTREEDIR)/usr/src/xlibmesa-drm.tar.gz modules/xlibmesa-drm
+  endif
        rm -f $(DEBTREEDIR)/usr/X11R6/lib/X11/icons/default/index.theme
-  endif
        # remove the upstream symlink X -> XFree86
        rm -f $(DEBTREEDIR)/usr/X11R6/bin/X
        # install Debian's X server wrapper
@@ -297,17 +308,6 @@
        # install the Python/GNOME based configlet
        install -m 755 -d $(DEBTREEDIR)/usr/share/configlets/xserver-common
        install -m 644 debian/local/dexlet/* 
$(DEBTREEDIR)/usr/share/configlets/xserver-common
-
-       # Create the xlibmesa-drm-src package.
-       mkdir $(DEBTREEDIR)/usr/src
-       mkdir -p $(DRM_DST_DIR)
-       -cp -R $(DRM_SRC_DIR)/* $(DRM_DST_DIR) 
-       $(M4) -DOURVERSION="$(SOURCE_VERSION)" 
$(DRM_DST_DIR)/debian/module-changelog.m4 > $(DRM_DST_DIR)/debian/changelog.m4
-       rm $(DRM_DST_DIR)/debian/module-changelog.m4
-       chmod +x $(DRM_DST_DIR)/debian/rules
-       -cp -L 
build-tree/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/* 
$(DRM_DST_DIR)/
-       rm $(DRM_DST_DIR)/Makefile $(DRM_DST_DIR)/Imakefile 
$(DRM_DST_DIR)/Makefile.kernel
-       cd $(DRM_SRC_DIR) && tar -zcvf 
$(DEBTREEDIR)/usr/src/xlibmesa-drm.tar.gz modules/xlibmesa-drm
  endif
 
        # other stuff

Added: people/ishikawa/memo.freetype
==============================================================================
--- people/ishikawa/memo.freetype       2003-06-06 04:16:38 UTC (rev 154)
+++ people/ishikawa/memo.freetype       2003-06-06 06:10:20 UTC (rev 155)
@@ -0,0 +1 @@
+writing...please wait.

Reply via email to