X-Git-Url: http://gitweb/?a=blobdiff_plain;f=gtklepin%2FPkgfile;h=4071a03be0f585d76dc80099f0dbbdb1f84b7a1a;hb=0c0500456a6f3b0d934f971d96e7e41565ed1def;hp=5ff88eb19ff4394130865870c6b1247e3db993d5;hpb=b22af9033ed98065b48c20e0a3608f5e8da794d7;p=attic%2Fports%2Fopt-cross.git

diff --git a/gtklepin/Pkgfile b/gtklepin/Pkgfile
index 5ff88eb..4071a03 100644
--- a/gtklepin/Pkgfile
+++ b/gtklepin/Pkgfile
@@ -8,18 +8,19 @@
 name=gtklepin
 version=0.3
 release=1
-source=(http://ordiluc.net/$name/$name-$version.tar.bz2)
+source=(http://ordiluc.net/$name/$name-$version.tar.bz2 \
+        $name-$version-cross_compile.patch)
 
 build() {
   cd $name-$version
 
-  export GTK_LIBS=" -L$CLFS/usr/lib -pthread -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0"
-  export GTK_CFLAGS="-I$CLFS/usr/include -pthread -I$CLFS/usr/include/gtk-2.0 -I$CLFS/usr/lib/gtk-2.0/include -I$CLFS/usr/include/atk-1.0 -I$CLFS/usr/include/cairo -I$CLFS/usr/include/pango-1.0 -I$CLFS/usr/include/glib-2.0 -I$CLFS/usr/lib/glib-2.0/include -I$CLFS/usr/include/pixman-1 -I$CLFS/usr/include/freetype2 -I$CLFS/usr/include/libpng12"
+  patch -p1 -i $SRC/$name-$version-cross_compile.patch
 
-  sed -i configure \
-      -e "s|GTK_LIBS=.*|GTK_LIBS=\"$GTK_LIBS\"|g" \
-      -e "s|GTK_CFLAGS=.*|GTK_CFLAGS=\"$GTK_CFLAGS\"|g" \
-      -e 's|no_gtk=yes|no_gtk=|g'
+  export GLIB_LIBS="-pthread -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0"
+  export GLIB_CFLAGS="-pthread -I$CLFS/usr/include/glib-2.0 -I$CLFS/usr/lib/glib-2.0/include"
+
+  export GTK_LIBS="$GLIB_LIBS -pthread -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig"
+  export GTK_CFLAGS="-I$CLFS/usr/include -pthread -I$CLFS/usr/include/gtk-2.0 -I$CLFS/usr/lib/gtk-2.0/include -I$CLFS/usr/include/atk-1.0 -I$CLFS/usr/include/cairo -I$CLFS/usr/include/pango-1.0 -I$CLFS/usr/include/pixman-1 -I$CLFS/usr/include/freetype2 -I$CLFS/usr/include/libpng12"
 
   ./configure --build=$CHOST \
               --host=$CTARGET \
@@ -31,7 +32,8 @@ build() {
               --without-zlib
 
   # fix previous declaration of 'getline'
-  sed -i src/* -e 's|getline|gstring_getline|g'
+  sed -i src/* \
+      -e 's|getline|gstring_getline|g'
 
   make
   make DESTDIR=$PKG install