[Pkg-jed-commit] r336 - in trunk/packages/jed/debian: . patches

[Jörg Sommer]

Author: jo-guest
Date: 2006-06-30 20:26:14 +0000 (Fri, 30 Jun 2006)
New Revision: 336

Modified:
   trunk/packages/jed/debian/control
   trunk/packages/jed/debian/patches/50_enable-xrenderfont.dpatch
Log:
* jed/debian/control jed/debian/patches/50_enable-xrenderfont.dpatch
  + We never really enabled Xft, because a preprocessor variable was
    missing. John added it in 0.99.19-2. I've changed the patch for
    xrender to set the variable and added the include path for xft to the
    cflags. To be more generic I've used pkg-config and added a
    build-dependency for it.


Modified: trunk/packages/jed/debian/control
===================================================================
--- trunk/packages/jed/debian/control	2006-06-20 22:05:59 UTC (rev 335)
+++ trunk/packages/jed/debian/control	2006-06-30 20:26:14 UTC (rev 336)
@@ -5,7 +5,7 @@
 Uploaders: Rafael Laboissiere <rafael at debian.org>
 Standards-Version: 3.7.2
 Build-Depends-Indep: hevea
-Build-Depends: debhelper (>= 4.1.16), dpatch, libgpmg1-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], libslang2-dev, libxft-dev, libxt-dev
+Build-Depends: debhelper (>= 4.1.16), dpatch, libgpmg1-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], libslang2-dev, libxft-dev, libxt-dev, pkg-config
 
 Package: jed
 Architecture: any

Modified: trunk/packages/jed/debian/patches/50_enable-xrenderfont.dpatch
===================================================================
--- trunk/packages/jed/debian/patches/50_enable-xrenderfont.dpatch	2006-06-20 22:05:59 UTC (rev 335)
+++ trunk/packages/jed/debian/patches/50_enable-xrenderfont.dpatch	2006-06-30 20:26:14 UTC (rev 336)
@@ -4,15 +4,35 @@
 ## DP: Use X Render extensions in xjed
 
 @DPATCH@
-
---- jed-0.99.16.pre.0.99.17.84.orig/src/Makefile.in
-+++ jed-0.99.16.pre.0.99.17.84/src/Makefile.in
-@@ -59,7 +59,7 @@
+diff -urNad jed~/src/Makefile.in jed/src/Makefile.in
+--- jed~/src/Makefile.in	2006-02-16 04:09:50.000000000 +0100
++++ jed/src/Makefile.in	2006-06-29 16:40:37.681900088 +0200
+@@ -60,7 +60,7 @@
   
  # 2. XFree86 XRENDERFONT (Anti-aliased font) support for XJED
  #    Also modify "XJED_HAS_XRENDERFONT" in jed-feat.h
 -#XRENDERFONTLIBS = -lXft -lXrender -lfreetype -lXext
-+XRENDERFONTLIBS = -lXft -lXrender -lfreetype -lXext
++XRENDERFONTLIBS = $(shell pkg-config --libs xft) # -lXft -lXrender -lfreetype -lXext
  
  #---------------------------------------------------------------------------
  # S-Lang library location
+@@ -81,7 +81,7 @@
+ XLIBDIR = @X_LIBS@
+ 
+ # X Include directory
+-XINCLUDE = @X_CFLAGS@
++XINCLUDE = @X_CFLAGS@ $(shell pkg-config --cflags xft)
+ 
+ # Extra libraries needed by X and Network support on some systems
+ X_XTRA_LIBS = @X_EXTRA_LIBS@
+diff -urNad jed~/src/jed-feat.h jed/src/jed-feat.h
+--- jed~/src/jed-feat.h	2006-02-13 18:51:58.000000000 +0100
++++ jed/src/jed-feat.h	2006-06-29 16:40:27.810838088 +0200
+@@ -93,4 +93,7 @@
+ # define JED_HAS_IMPORT	0
+ #endif
+ 
++/* Set XJED_HAS_XRENDERFONT if you want anti-aliased font support in XJed. */
++#define XJED_HAS_XRENDERFONT 1
++
+ #endif