Skip to content

Commit

Permalink
Use conda-forge X.org packages
Browse files Browse the repository at this point in the history
  • Loading branch information
pkgw committed Nov 1, 2018
1 parent bcbcfa7 commit 63dbab6
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 12 deletions.
4 changes: 1 addition & 3 deletions recipe/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,7 @@ if [ $(uname) == Linux ]; then
CXXFLAGS="$CXXFLAGS -Wno-expansion-to-defined"
fi

# /usr stuff needed to get system X11
export LDFLAGS="$LDFLAGS -L/usr/lib64 -Wl,-rpath-link,$PREFIX/lib -Wl,-rpath-link,/usr/lib64"
export CPPFLAGS="$CPPFLAGS -I/usr/include"
export LDFLAGS="$LDFLAGS -Wl,-rpath-link,$PREFIX/lib"
export CPPFLAGS="$CPPFLAGS -DXK_dead_currency=0xfe6f -DXK_ISO_Level5_Lock=0xfe13"
export CPPFLAGS="$CPPFLAGS -DFC_WEIGHT_EXTRABLACK=215 -DFC_WEIGHT_ULTRABLACK=FC_WEIGHT_EXTRABLACK"
export CPPFLAGS="$CPPFLAGS -DGLX_GLXEXT_PROTOTYPES"
Expand Down
15 changes: 15 additions & 0 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,14 @@ requirements:
- sqlite
- libxcb # [linux]
- dbus # [linux]
- xorg-libice # [linux]
- xorg-libsm # [linux]
- xorg-libx11 # [linux]
- xorg-libxext # [linux]
- xorg-libxrender # [linux]
- xorg-libxt # [linux]
- xorg-inputproto # [linux]
- gtk2 # [linux]
run:
- freetype # [linux]
- fontconfig # [linux]
Expand All @@ -65,6 +73,13 @@ requirements:
- sqlite
- libxcb # [linux]
- dbus # [linux]
- xorg-libice # [linux]
- xorg-libsm # [linux]
- xorg-libx11 # [linux]
- xorg-libxext # [linux]
- xorg-libxrender # [linux]
- xorg-libxt # [linux]
- gtk2 # [linux]

test:
requires:
Expand Down
9 changes: 0 additions & 9 deletions recipe/yum_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,2 @@
libX11-devel
libXt-devel
libXext-devel
chrpath
libXrender-devel
gtk2-devel
dbus-devel
libSM-devel
libICE-devel
xorg-x11-server-Xvfb
ruby

0 comments on commit 63dbab6

Please sign in to comment.