X-Git-Url: http://gitweb/?a=blobdiff_plain;f=conky%2FPkgfile;h=27d72455b0a9d112bcb8c32ba0effe575bc7e68a;hb=c88a192196df4d9fbc1002b05c2d1fb4982256c9;hp=08defe7de233312b98ebc64ceeee2faf612d1ff3;hpb=fb728c42861fa82552f4fafa0cf0f1872fc97475;p=attic%2Fports%2Fopt-cross.git

diff --git a/conky/Pkgfile b/conky/Pkgfile
index 08defe7..27d7245 100644
--- a/conky/Pkgfile
+++ b/conky/Pkgfile
@@ -1,11 +1,11 @@
 # Description: Light-weight system monitor
 # URL: http://conky.sourceforge.net/
 # Maintainer: Juergen Daubert, juergen dot daubert at t-online dot de
-# Arch Maintainer: CRUX-ARM System Team, crux-arm at mikeux dot dyndns dot org
+# Arch Maintainer: CRUX-ARM System Team, devel at crux-arm dot nu
 # Depends on: glib xorg-libxdamage xorg-libxext xorg-libxft
 
 name=conky
-version=1.7.2
+version=1.8.0
 release=1
 source=(http://dl.sourceforge.net/sourceforge/conky/$name-$version.tar.bz2)
 
@@ -24,8 +24,8 @@ build() {
   export XFixes_CFLAGS="$DEFAULT_CFLAGS"
   export Xft_LIBS="$DEFAULT_LIBS -lXft"
   export Xft_CFLAGS="$DEFAULT_CFLAGS"
-  export glib2_LIBS="$DEFAULT_LIBS -lglib-2.0"
-  export glib2_CFLAGS="$DEFAULT_CFLAGS -I$CLFS/usr/include/glib-2.0 -I$CLFS/usr/lib/glib-2.0/include"
+  export GLib2_LIBS="$DEFAULT_LIBS -lglib-2.0"
+  export GLib2_CFLAGS="$DEFAULT_CFLAGS -I$CLFS/usr/include/glib-2.0 -I$CLFS/usr/lib/glib-2.0/include"
   export libcurl_LIBS="$DEFAULT_LIBS -lcurl"
   export libcurl_CFLAGS="$DEFAULT_CFLAGS"
   export FREETYPE_LIBS="$DEFAULT_LIBS -lfreetype -lz"
@@ -33,6 +33,8 @@ build() {
   export conky_LIBS="$X11_LIBS $Xext_LIBS $XDamage_LIBS $XFixes_LIBS $Xft_LIBS $glib2_LIBS $libcurl_LIBS $FREETYPE_LIBS"
   export conky_CFLAGS="$X11_CFLAGS $Xext_CFLAGS $XDamage_CFLAGS $XFixes_CFLAGS $Xft_CFLAGS $glib2_CFLAGS $libcurl_CFLAGS $FREETYPE_CFLAGS"
 
+  echo "ac_cv_lib_Xdamage_XDamageQueryExtension=yes" > config.cache
+
   ./configure --build=$CHOST \
               --host=$CTARGET \
               --prefix=/usr \
@@ -40,7 +42,8 @@ build() {
               --disable-lua \
               --enable-xft  \
               --enable-portmon \
-              --enable-mpd
+              --enable-mpd \
+              --cache-file=config.cache
 
   make
   make DESTDIR=$PKG install