mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-25 20:34:52 +03:00
* Xft support in gtk+ (for anti-aliased fonts :-) ).
The problem of transitive imports needs to be adressed, though, as evidenced by, e.g., the descriptor for pan. That is, if C depends on library B, and B depends on library A, then C also depends on library A. However, this breaks modularity: C should not have to declare a dependency on A explicitly. The solution is to have B re-export A, e.g., by creating symlinks from B to the files in A. svn path=/nixpkgs/trunk/; revision=68
This commit is contained in:
parent
fec63483b9
commit
9878a15478
12
build/Xft-build.sh
Executable file
12
build/Xft-build.sh
Executable file
@ -0,0 +1,12 @@
|
||||
#! /bin/sh
|
||||
|
||||
export PATH=$freetype/bin:$fontconfig/bin:/bin:/usr/bin
|
||||
|
||||
top=`pwd`
|
||||
tar xvfz $src || exit 1
|
||||
cd fcpackage*/Xft || exit 1
|
||||
./configure --prefix=$top --x-includes=/usr/X11/include --x-libraries=/usr/X11/lib || exit 1
|
||||
make || exit 1
|
||||
make install || exit 1
|
||||
cd $top || exit 1
|
||||
rm -rf fcpackage* || exit 1
|
12
build/fontconfig-build.sh
Executable file
12
build/fontconfig-build.sh
Executable file
@ -0,0 +1,12 @@
|
||||
#! /bin/sh
|
||||
|
||||
export PATH=$freetype/bin:/bin:/usr/bin
|
||||
|
||||
top=`pwd`
|
||||
tar xvfz $src || exit 1
|
||||
cd fcpackage*/fontconfig || exit 1
|
||||
./configure --prefix=$top --with-confdir=$top/etc/fonts --x-includes=/usr/X11/include --x-libraries=/usr/X11/lib || exit 1
|
||||
make || exit 1
|
||||
make install || exit 1
|
||||
cd $top || exit 1
|
||||
rm -rf fcpackage* || exit 1
|
12
build/freetype-build.sh
Executable file
12
build/freetype-build.sh
Executable file
@ -0,0 +1,12 @@
|
||||
#! /bin/sh
|
||||
|
||||
export PATH=/bin:/usr/bin
|
||||
|
||||
top=`pwd`
|
||||
tar xvfj $src || exit 1
|
||||
cd freetype-* || exit 1
|
||||
./configure --prefix=$top || exit 1
|
||||
make || exit 1
|
||||
make install || exit 1
|
||||
cd $top || exit 1
|
||||
rm -rf freetype-* || exit 1
|
@ -1,13 +1,13 @@
|
||||
#! /bin/sh
|
||||
|
||||
export PATH=$pkgconfig/bin:/bin:/usr/bin
|
||||
export PKG_CONFIG_PATH=$glib/lib/pkgconfig:$atk/lib/pkgconfig:$pango/lib/pkgconfig
|
||||
export LD_LIBRARY_PATH=$glib/lib:$atk/lib:$pango/lib
|
||||
export PATH=$pkgconfig/bin:$freetype/bin:/bin:/usr/bin
|
||||
export PKG_CONFIG_PATH=$glib/lib/pkgconfig:$atk/lib/pkgconfig:$pango/lib/pkgconfig:$fontconfig/lib/pkgconfig:$Xft/lib/pkgconfig
|
||||
export LD_LIBRARY_PATH=$glib/lib:$atk/lib:$pango/lib:$fontconfig/lib:$Xft/lib
|
||||
|
||||
top=`pwd`
|
||||
tar xvfj $src || exit 1
|
||||
cd gtk+-* || exit 1
|
||||
./configure --prefix=$top || exit 1
|
||||
./configure --prefix=$top --x-includes=/usr/X11/include --x-libraries=/usr/X11/lib || exit 1
|
||||
make || exit 1
|
||||
make install || exit 1
|
||||
cd $top || exit 1
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
export PATH=$pkgconfig/bin:/bin:/usr/bin
|
||||
export PKG_CONFIG_PATH=$glib/lib/pkgconfig:$atk/lib/pkgconfig:$pango/lib/pkgconfig:$gtk/lib/pkgconfig
|
||||
export LD_LIBRARY_PATH=$glib/lib:$atk/lib:$pango/lib:$gtk/lib:$pspell/lib
|
||||
export LD_LIBRARY_PATH=$glib/lib:$atk/lib:$pango/lib:$gtk/lib:$pspell/lib:$fontconfig/lib:$Xft/lib:$freetype/lib:
|
||||
export C_INCLUDE_PATH=$pspell/include
|
||||
|
||||
top=`pwd`
|
||||
|
@ -1,8 +1,8 @@
|
||||
#! /bin/sh
|
||||
|
||||
export PATH=$pkgconfig/bin:$gnet/bin:/bin:/usr/bin
|
||||
export PKG_CONFIG_PATH=$glib/lib/pkgconfig:$atk/lib/pkgconfig:$pango/lib/pkgconfig:$gtk/lib/pkgconfig:$gtkspell/lib/pkgconfig
|
||||
export LD_LIBRARY_PATH=$glib/lib:$atk/lib:$pango/lib:$gtk/lib:$gnet/lib:$pspell/lib:$gtkspell/lib
|
||||
export PKG_CONFIG_PATH=$glib/lib/pkgconfig:$atk/lib/pkgconfig:$pango/lib/pkgconfig:$gtk/lib/pkgconfig:$gtkspell/lib/pkgconfig:$libxml/lib/pkgconfig
|
||||
export LD_LIBRARY_PATH=$glib/lib:$atk/lib:$pango/lib:$gtk/lib:$gnet/lib:$pspell/lib:$gtkspell/lib:$fontconfig/lib:$Xft/lib:$freetype/lib
|
||||
|
||||
# A bug in gtkspell: the pspell library path is not exported
|
||||
# through pkgconfig.
|
||||
|
@ -1,13 +1,13 @@
|
||||
#! /bin/sh
|
||||
|
||||
export PATH=$pkgconfig/bin:/bin:/usr/bin
|
||||
export PKG_CONFIG_PATH=$glib/lib/pkgconfig
|
||||
export LD_LIBRARY_PATH=$glib/lib
|
||||
export PATH=$pkgconfig/bin:$freetype/bin:/bin:/usr/bin
|
||||
export PKG_CONFIG_PATH=$glib/lib/pkgconfig:$fontconfig/lib/pkgconfig:$Xft/lib/pkgconfig
|
||||
export LD_LIBRARY_PATH=$glib/lib:$fontconfig/lib:$Xft/lib
|
||||
|
||||
top=`pwd` || exit 1
|
||||
tar xvfj $src || exit 1
|
||||
cd pango-* || exit 1
|
||||
./configure --prefix=$top || exit 1
|
||||
./configure --prefix=$top --x-includes=/usr/X11/include --x-libraries=/usr/X11/lib || exit 1
|
||||
make || exit 1
|
||||
make install || exit 1
|
||||
cd $top || exit 1
|
||||
|
11
descriptors/Xft-20021121.fix
Normal file
11
descriptors/Xft-20021121.fix
Normal file
@ -0,0 +1,11 @@
|
||||
Descr(
|
||||
[ Bind("pkgId", "Xft-20021121")
|
||||
, Bind("releaseId", "1")
|
||||
|
||||
, Bind("freetype", Fix("./freetype-2.1.4.fix"))
|
||||
, Bind("fontconfig", Fix("./fontconfig-20021121.fix"))
|
||||
|
||||
, Bind("src", Url("2f2852c80924a9b5356c3037a471c1a1", "http://fontconfig.org/release/fcpackage.2_1.tar.gz"))
|
||||
, Bind("build", Local("../build/Xft-build.sh"))
|
||||
]
|
||||
)
|
10
descriptors/fontconfig-20021121.fix
Normal file
10
descriptors/fontconfig-20021121.fix
Normal file
@ -0,0 +1,10 @@
|
||||
Descr(
|
||||
[ Bind("pkgId", "fontconfig-20021121")
|
||||
, Bind("releaseId", "1")
|
||||
|
||||
, Bind("freetype", Fix("./freetype-2.1.4.fix"))
|
||||
|
||||
, Bind("src", Url("2f2852c80924a9b5356c3037a471c1a1", "http://fontconfig.org/release/fcpackage.2_1.tar.gz"))
|
||||
, Bind("build", Local("../build/fontconfig-build.sh"))
|
||||
]
|
||||
)
|
8
descriptors/freetype-2.1.4.fix
Normal file
8
descriptors/freetype-2.1.4.fix
Normal file
@ -0,0 +1,8 @@
|
||||
Descr(
|
||||
[ Bind("pkgId", "freetype-2.1.4")
|
||||
, Bind("releaseId", "1")
|
||||
|
||||
, Bind("src", Url("1fc0b188f1fe1216776e5855d2da141f", "http://easynews.dl.sourceforge.net/sourceforge/freetype/freetype-2.1.4.tar.bz2"))
|
||||
, Bind("build", Local("../build/freetype-build.sh"))
|
||||
]
|
||||
)
|
@ -1,10 +1,13 @@
|
||||
Descr(
|
||||
[ Bind("pkgId", "gtk+-2.2.1")
|
||||
, Bind("releaseId", "1")
|
||||
, Bind("releaseId", "2")
|
||||
|
||||
, Bind("pkgconfig", Fix("./pkgconfig-0.15.0.fix"))
|
||||
, Bind("glib", Fix("./glib-2.2.1.fix"))
|
||||
, Bind("atk", Fix("./atk-1.2.0.fix"))
|
||||
, Bind("freetype", Fix("./freetype-2.1.4.fix"))
|
||||
, Bind("fontconfig", Fix("./fontconfig-20021121.fix"))
|
||||
, Bind("Xft", Fix("./Xft-20021121.fix"))
|
||||
, Bind("pango", Fix("./pango-1.2.1.fix"))
|
||||
|
||||
, Bind("src", Url("dfd5755fddb26a46c96bfaa813280ac4", "ftp://ftp.gtk.org/pub/gtk/v2.2/gtk+-2.2.1.tar.bz2"))
|
||||
|
@ -5,6 +5,9 @@ Descr(
|
||||
, Bind("pkgconfig", Fix("./pkgconfig-0.15.0.fix"))
|
||||
, Bind("glib", Fix("./glib-2.2.1.fix"))
|
||||
, Bind("atk", Fix("./atk-1.2.0.fix"))
|
||||
, Bind("freetype", Fix("./freetype-2.1.4.fix"))
|
||||
, Bind("fontconfig", Fix("./fontconfig-20021121.fix"))
|
||||
, Bind("Xft", Fix("./Xft-20021121.fix"))
|
||||
, Bind("pango", Fix("./pango-1.2.1.fix"))
|
||||
, Bind("gtk", Fix("./gtk+-2.2.1.fix"))
|
||||
, Bind("pspell", Fix("./pspell-.12.2.fix"))
|
||||
|
@ -3,8 +3,12 @@ Descr(
|
||||
, Bind("releaseId", "1")
|
||||
|
||||
, Bind("pkgconfig", Fix("./pkgconfig-0.15.0.fix"))
|
||||
, Bind("libxml", Fix("./libxml2-2.5.7.fix"))
|
||||
, Bind("glib", Fix("./glib-2.2.1.fix"))
|
||||
, Bind("atk", Fix("./atk-1.2.0.fix"))
|
||||
, Bind("freetype", Fix("./freetype-2.1.4.fix"))
|
||||
, Bind("fontconfig", Fix("./fontconfig-20021121.fix"))
|
||||
, Bind("Xft", Fix("./Xft-20021121.fix"))
|
||||
, Bind("pango", Fix("./pango-1.2.1.fix"))
|
||||
, Bind("gtk", Fix("./gtk+-2.2.1.fix"))
|
||||
, Bind("gnet", Fix("./gnet-1.1.8.fix"))
|
||||
|
@ -1,9 +1,12 @@
|
||||
Descr(
|
||||
[ Bind("pkgId", "pango-1.2.1")
|
||||
, Bind("releaseId", "1")
|
||||
, Bind("releaseId", "2")
|
||||
|
||||
, Bind("pkgconfig", Fix("./pkgconfig-0.15.0.fix"))
|
||||
, Bind("glib", Fix("./glib-2.2.1.fix"))
|
||||
, Bind("freetype", Fix("./freetype-2.1.4.fix"))
|
||||
, Bind("fontconfig", Fix("./fontconfig-20021121.fix"))
|
||||
, Bind("Xft", Fix("./Xft-20021121.fix"))
|
||||
|
||||
, Bind("src", Url("6b354ef14e75739a92b5b78f4ca3165a", "ftp://ftp.gtk.org/pub/gtk/v2.2/pango-1.2.1.tar.bz2"))
|
||||
, Bind("build", Local("../build/pango-build.sh"))
|
||||
|
@ -1,11 +1,15 @@
|
||||
Descr(
|
||||
[ Bind("pkgId", Str("system"))
|
||||
, Bind("releaseId", Str("4"))
|
||||
, Bind("releaseId", Str("5"))
|
||||
|
||||
, Bind("actATerm", Fix("./aterm-2.0.fix"))
|
||||
, Bind("actPkgConfig", Fix("./pkgconfig-0.15.0.fix"))
|
||||
, Bind("actLibxml", Fix("./libxml2-2.5.7.fix"))
|
||||
, Bind("actGlib", Fix("./glib-2.2.1.fix"))
|
||||
, Bind("actAtk", Fix("./atk-1.2.0.fix"))
|
||||
, Bind("actFreetype", Fix("./freetype-2.1.4.fix"))
|
||||
, Bind("actFontconfig", Fix("./fontconfig-20021121.fix"))
|
||||
, Bind("actXft", Fix("./Xft-20021121.fix"))
|
||||
, Bind("actPango", Fix("./pango-1.2.1.fix"))
|
||||
, Bind("actGtk", Fix("./gtk+-2.2.1.fix"))
|
||||
, Bind("actGnet", Fix("./gnet-1.1.8.fix"))
|
||||
|
Loading…
Reference in New Issue
Block a user