[oe-commits] org.oe.dev merge of '6d9979f4d29d1dff2350a558f25813ce7f2c8c9e'
rpurdie commit
openembedded-commits at lists.openembedded.org
Fri Feb 29 19:25:44 UTC 2008
merge of '6d9979f4d29d1dff2350a558f25813ce7f2c8c9e'
and '9d51ade6b4318612931d9e49436a802f6c1fa43f'
Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 8cfccf7d76cedeebb5fc468a8aa4943a21baf0bc
ViewMTN: http://monotone.openembedded.org/revision/info/8cfccf7d76cedeebb5fc468a8aa4943a21baf0bc
Files:
1
packages/gsm/files/fic-gta01
packages/gsm/files/fic-gta01/gsmd
contrib/oe.svg
contrib/artwork/oe.svg
contrib/powered-by-oe.svg
contrib/artwork/powered-by-oe.svg
contrib/artwork
packages/gpsdrive/gpsdrive-2.10pre4
packages/multitap-pad
packages/multitap-pad/files
packages/openmoko2/openmoko-dialer2/fic-gta01
packages/openmoko2/openmoko-dialer2/fic-gta02
packages/freesmartphone/enter_0.0.2.bb
packages/gnash/gnash.inc
packages/gnash/gnash_0.8.1.bb
packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch
packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch
packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch
packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop
packages/gpsdrive/gpsdrive_2.10pre4.bb
packages/multitap-pad/files/80multitappad
packages/multitap-pad/multitap-pad_svn.bb
packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb
packages/openmoko2/openmoko-dialer2/fic-gta01/kernel-2.6.24.patch
packages/openmoko2/openmoko-dialer2/fic-gta02/kernel-2.6.24.patch
packages/perl/libwww-perl-native_5.808.bb
packages/perl/libwww-perl_5.808.bb
conf/checksums.ini
conf/distro/include/moko-autorev.inc
conf/distro/include/preferred-om-2008-versions.inc
conf/distro/include/sane-srcrevs.inc
conf/distro/openmoko.conf
packages/asterisk/asterisk_1.4.17.bb
packages/busybox/busybox-1.9.1/defconfig
packages/busybox/busybox_1.9.1.bb
packages/freesmartphone/pyneod_svn.bb
packages/gnash/gnash_0.8.0.bb
packages/gsm/files/gsmd
packages/images/moko-underground-image.bb
packages/openmoko2/openmoko-dialer2_svn.bb
packages/openmoko2/openmoko-session2/etc/matchbox/session
packages/openmoko2/openmoko-session2.bb
packages/python/python_2.5.2.bb
packages/tasks/task-base.bb
packages/tasks/task-openmoko-base.bb
packages/tasks/task-openmoko-phone.bb
packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb
packages/libmatchbox/libmatchbox_1.2.bb
packages/libmatchbox/libmatchbox_1.3.bb
packages/libmatchbox/libmatchbox_1.4.bb
packages/libmatchbox/libmatchbox_1.5.bb
packages/libmatchbox/libmatchbox_1.6.bb
packages/matchbox-wm/matchbox-wm_0.8.3.bb
packages/matchbox-wm/matchbox-wm_0.8.4.bb
packages/matchbox-wm/matchbox-wm_0.9.2.bb
packages/matchbox-wm/matchbox-wm_0.9.3.bb
packages/matchbox-wm/matchbox-wm_0.9.4.bb
packages/matchbox-wm/matchbox-wm_0.9.bb
packages/curl/files
packages/dtnrg/files
packages/gtk-webcore/osb-nrcit
packages/curl/files/pkgconfig_fix.patch
packages/dtnrg/files/configure_fix.patch
packages/gtk-webcore/files/path_fixes.patch
packages/gtk-webcore/osb-nrcit/pkgconfig_fix.patch
packages/libmatchbox/files/configure_fixes.patch
packages/matchbox-desktop/matchbox-desktop-0.9.1/pkgconfig_fix.patch
packages/matchbox-wm/matchbox-wm/configure_fix.patch
packages/pango/pango-1.18.3/pkgconfig_fixes.patch
packages/xorg-xserver/xserver-kdrive-1.4/pkgconfig_fix.patch
packages/curl/curl_7.16.4.bb
packages/gnutls/gnutls-1.6.3/configure_madness.patch
packages/gnutls/gnutls_1.6.3.bb
packages/gtk-webcore/osb-nrcit_svn.bb
packages/gtk-webcore/osb-nrcore.inc
packages/gtk-webcore/osb-nrcore_svn.bb
packages/libmatchbox/libmatchbox_1.9.bb
packages/matchbox-desktop/matchbox-desktop_0.9.1.bb
packages/matchbox-wm/matchbox-wm_1.2.bb
packages/pango/pango_1.18.3.bb
packages/xorg-xserver/xserver-kdrive_1.4.bb
Diffs:
#
# mt diff -r6d9979f4d29d1dff2350a558f25813ce7f2c8c9e -r8cfccf7d76cedeebb5fc468a8aa4943a21baf0bc
#
#
#
# delete "packages/gsm/files/fic-gta01"
#
# delete "packages/gsm/files/fic-gta01/gsmd"
#
# rename "contrib/oe.svg"
# to "contrib/artwork/oe.svg"
#
# rename "contrib/powered-by-oe.svg"
# to "contrib/artwork/powered-by-oe.svg"
#
# add_dir "contrib/artwork"
#
# add_dir "packages/gpsdrive/gpsdrive-2.10pre4"
#
# add_dir "packages/multitap-pad"
#
# add_dir "packages/multitap-pad/files"
#
# add_dir "packages/openmoko2/openmoko-dialer2/fic-gta01"
#
# add_dir "packages/openmoko2/openmoko-dialer2/fic-gta02"
#
# add_file "packages/freesmartphone/enter_0.0.2.bb"
# content [046cc1b2280bca6d06a2423b1f4c5cc5634a9430]
#
# add_file "packages/gnash/gnash.inc"
# content [bc7ce0bb9d022a74c35eff388b180d174a1a2eef]
#
# add_file "packages/gnash/gnash_0.8.1.bb"
# content [50014de2c3904a6950c775be0eda4815399cb573]
#
# add_file "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch"
# content [f7d05fac53703548b59b528f752366847140744e]
#
# add_file "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch"
# content [47e014d89d9957ea970e01aced2dc553d3722236]
#
# add_file "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch"
# content [b9c3b9e051b269ab097c36a70c58b6d218e0d55d]
#
# add_file "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop"
# content [6ef8f7d5db97dd3541a0bfe44325bd07296baf1b]
#
# add_file "packages/gpsdrive/gpsdrive_2.10pre4.bb"
# content [8019316f995c6928f922a1b2412b7393fe8599f3]
#
# add_file "packages/multitap-pad/files/80multitappad"
# content [b613cc7c89d800c205b89dd7013c4b3ba309b319]
#
# add_file "packages/multitap-pad/multitap-pad_svn.bb"
# content [8f2b626f58690dd52e509cacab5977c5f52270e2]
#
# add_file "packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb"
# content [4e424e0c74d42282c80ac2738e417b8dc7014e80]
#
# add_file "packages/openmoko2/openmoko-dialer2/fic-gta01/kernel-2.6.24.patch"
# content [43b8c9925bee93d59e2aefd4c7eec71d0b796197]
#
# add_file "packages/openmoko2/openmoko-dialer2/fic-gta02/kernel-2.6.24.patch"
# content [d1c708f7f915fa250e20a84fa9d4512440442a4f]
#
# add_file "packages/perl/libwww-perl-native_5.808.bb"
# content [66723b8808de2c5758435a88b9640bc8777d89be]
#
# add_file "packages/perl/libwww-perl_5.808.bb"
# content [c76a162b7e6844022d4b9826386bfeed71c6328e]
#
# patch "conf/checksums.ini"
# from [eb9de8f37d459cdc0493e46911c3d815b00b240f]
# to [a348d30bb084b1bbe9081b873ccbbfdb7d14baae]
#
# patch "conf/distro/include/moko-autorev.inc"
# from [0f982aea482507652b58a95c90dfbd0d307bacac]
# to [8693d3caf1c49ddccfce7c158c5cec881d623a58]
#
# patch "conf/distro/include/preferred-om-2008-versions.inc"
# from [7ff18c73f3dc06bcaf921d9ab443d383a6a12a93]
# to [e76b4f1d90a877c2f946524c27d7e7035df3d66b]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [66423fdd2da04384c51e77181591011dce4180fa]
# to [ab67ae7855b44ff82646cc1c031cb6cafafea1f9]
#
# patch "conf/distro/openmoko.conf"
# from [02896609234a09af5537fbcaf494e70d8a9addba]
# to [64b9c6cbbb1815a759c997aaeb8d81669260e963]
#
# patch "packages/asterisk/asterisk_1.4.17.bb"
# from [2f04528dd5495d5de7fee0972edafd159d0453b6]
# to [4201407db7eeb035f2425af4b62122970e4e0dd4]
#
# patch "packages/busybox/busybox-1.9.1/defconfig"
# from [ff25ec81c1351231f97bffc1ee90939e562137a4]
# to [183a1034704ae8119a3b8348768ba35a162e96b8]
#
# patch "packages/busybox/busybox_1.9.1.bb"
# from [611d61a446d2bd0678cce14f4d7f8a7e916ebf9d]
# to [4ce3286b8b9f17817880e467425ec28de58ea3f4]
#
# patch "packages/freesmartphone/pyneod_svn.bb"
# from [4667d9e21c38f533f4c43794339cdd5b33f9759e]
# to [e2cfd358134a04c53da8ea003424b74e390ddf66]
#
# patch "packages/gnash/gnash_0.8.0.bb"
# from [bc7ce0bb9d022a74c35eff388b180d174a1a2eef]
# to [50014de2c3904a6950c775be0eda4815399cb573]
#
# patch "packages/gsm/files/gsmd"
# from [e5dbf3447ec499f1ef19adeb6230fe87e713ad8f]
# to [7f2f07eee1fb5bb619f6b15e537a70b9ba9c8107]
#
# patch "packages/images/moko-underground-image.bb"
# from [e3d712c4f1771ae91a8a413966252fb17a92eee9]
# to [ad083e5de4d9af34be740450b02baa05b9066159]
#
# patch "packages/openmoko2/openmoko-dialer2_svn.bb"
# from [5ebf0c7982f702f7e54cd30c62e54e213188d939]
# to [07798651132cae433e354258858b87a1702cbf1c]
#
# patch "packages/openmoko2/openmoko-session2/etc/matchbox/session"
# from [1455e724ba6335f63471c0c3d4a4117393aff80b]
# to [3691fcca6739571b69289159cfa7eddd6f68be04]
#
# patch "packages/openmoko2/openmoko-session2.bb"
# from [cc58c28564075391245e716a991d21f7ead4d3f4]
# to [ec58d62219eb5fa1b3bed5608b3790a16aaba3cd]
#
# patch "packages/python/python_2.5.2.bb"
# from [9fdacadcb9bca69d259d6ac4233adaced691d170]
# to [404be2bec68ba8a044eec85af90dcf7f63213c6c]
#
# patch "packages/tasks/task-base.bb"
# from [0cd29b3c066d3479d8e51bf7737d5674bec79deb]
# to [47914cc275060af9ade4a3f8bec2034b23a9e7c6]
#
# patch "packages/tasks/task-openmoko-base.bb"
# from [7cc94ad51a45aff256cb5eda29ac54bd28236c4b]
# to [bf1b387ba3df340fb32571681d0aa5de8ffec64a]
#
# patch "packages/tasks/task-openmoko-phone.bb"
# from [e581df871797084f3feefe30f1c18d23db7cdc61]
# to [c8eb10190de69dd401cfbfe5a42fd8191f60073a]
#
# patch "packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb"
# from [de2a6e1fced0d942ccf99957f28a7b6df646c687]
# to [db78f04c96cb5d27ad12ca8a87b74256bfcbe02d]
#
============================================================
--- packages/freesmartphone/enter_0.0.2.bb 046cc1b2280bca6d06a2423b1f4c5cc5634a9430
+++ packages/freesmartphone/enter_0.0.2.bb 046cc1b2280bca6d06a2423b1f4c5cc5634a9430
@@ -0,0 +1,10 @@
+DESCRIPTION="A easy-to-use virtual keyboard for small touchscreen displays"
+SECTION = "openmoko/inputmethods"
+DEPENDS = "ecore evas edje"
+PR = "r0"
+
+inherit autotools
+
+SRC_URI = "http://gstaedtner.net/projects/enter/enter.tar.gz"
+
+FILES_${PN} += "${datadir}"
============================================================
--- packages/gnash/gnash.inc bc7ce0bb9d022a74c35eff388b180d174a1a2eef
+++ packages/gnash/gnash.inc bc7ce0bb9d022a74c35eff388b180d174a1a2eef
@@ -0,0 +1,79 @@
+DESCRIPTION = "Gnash is a GNU Flash movie player that supports many SWF v7 features"
+
+LICENSE = "GPL-2"
+HOMEPAGE = "http://www.gnu.org/software/gnash"
+
+DEPENDS = "gtk+ cairo libxml2 libmad libsdl-mixer zlib boost jpeg pango curl"
+
+SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2"
+
+
+EXTRA_OECONF = "--enable-gui=gtk \
+ --enable-renderer=cairo \
+ --enable-media=none \
+ --disable-klash \
+ --enable-z \
+ --enable-jpeg \
+ --disable-glext \
+ --enable-Xft \
+ --enable-expat \
+ --enable-mad \
+ --enable-cairo \
+ --disable-plugin \
+ --disable-cygnal \
+ --with-boost-incl=${STAGING_INCDIR} \
+ --with-boost-lib=${STAGING_LIBDIR} \
+ --with-libxml-incl=${STAGING_INCDIR}/libxml2 \
+ --with-libxml-lib=${STAGING_LIBDIR} \
+ --with-glib-incl=${STAGING_INCDIR}/glib-2.0 \
+# --with-glib-lib=${STAGING_LIBDIR} \
+ --with-gtk2-incl=${STAGING_INCDIR}/gtk-2.0 \
+ --with-pango-incl=${STAGING_INCDIR}/pango-1.0 \
+# --with-pango-lib=${STAGING_LIBDIR} \
+ --with-sdl-incl=${STAGING_INCDIR}/SDL \
+ --with-atk-incl=${STAGING_INCDIR}/atk-1.0 \
+ --with-Xft-incl=${STAGING_INCDIR}/X11 \
+ --with-expat-incl=${STAGING_INCDIR} \
+ --with-mad-incl=${STAGING_INCDIR} \
+ --with-cairo-incl=${STAGING_INCDIR}/cairo \
+ --with-curl-incl=${STAGING_INCDIR} \
+ --with-curl-lib=${STAGING_LIBDIR} \
+ "
+
+inherit autotools pkgconfig
+
+LDFLAGS += " -L${STAGING_LIBDIR} -lcurl -lboost_date_time -lboost_filesystem -lboost_iostreams -lboost_signals -lboost_thread-mt "
+CFLAGS += " -I${STAGING_INCDIR} -I${STAGING_LIBDIR}/gtk-2.0/include/ "
+
+do_configure_append() {
+ for i in `find . -name Makefile` ; do
+ sed -i s:I/usr/include:I${STAGING_INCDIR}:g $i
+ done
+}
+
+
+PARALLEL_MAKE = ""
+
+do_compile() {
+ oe_runmake 'CC=${CC}' 'LD=${LD}' 'CFLAGS=${CFLAGS}' \
+ 'ZLIB_INCLUDE=${STAGING_INCDIR}' \
+ 'ZLIB_LIBS=${STAGING_LIBDIR}' \
+ 'PNG_INCLUDE=${STAGING_INCDIR}' \
+ 'PNG_LIBS=${STAGING_LIBDIR}'
+}
+
+
+PACKAGES =+ " libgnashamf libgnashbackend libgnashbase libgnashgeo libgnashgui libgnashplayer libgnashserver "
+
+FILES_libgnashamf = "${libdir}/libgnashamf-${PV}.so"
+FILES_libgnashbackend = "${libdir}/libgnashbackend-${PV}.so"
+FILES_libgnashbase = "${libdir}/libgnashbase-${PV}.so"
+FILES_libgnashgeo = "${libdir}/libgnashgeo-${PV}.so"
+FILES_libgnashgui = "${libdir}/libgnashgui-${PV}.so"
+FILES_libgnashplayer = "${libdir}/libgnashplayer-${PV}.so"
+FILES_libgnashserver = "${libdir}/libgnashserver-${PV}.so"
+
+do_stage() {
+ autotools_stage_all
+}
+
============================================================
--- packages/gnash/gnash_0.8.1.bb 50014de2c3904a6950c775be0eda4815399cb573
+++ packages/gnash/gnash_0.8.1.bb 50014de2c3904a6950c775be0eda4815399cb573
@@ -0,0 +1 @@
+require gnash.inc
============================================================
--- packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch f7d05fac53703548b59b528f752366847140744e
+++ packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch f7d05fac53703548b59b528f752366847140744e
@@ -0,0 +1,128 @@
+diff -ur gpsdrive-2.10pre4.orig/scripts/gpsfetchmap.pl gpsdrive-2.10pre4/scripts/gpsfetchmap.pl
+--- gpsdrive-2.10pre4.orig/scripts/gpsfetchmap.pl 2007-12-28 18:49:44.000000000 +0100
++++ gpsdrive-2.10pre4/scripts/gpsfetchmap.pl 2008-01-04 19:01:35.000000000 +0100
+@@ -35,6 +35,7 @@
+ modified (Jul 2005) by Jaroslaw Zachwieja <grok\@filippa.org.uk>
+ modified (Dec 2005) by David Pollard <david dot pollard\@optusnet.com.au>
+ modified (Jul 2007) by Maciek Kaliszewski <mkalkal\@interia.pl>
++modified (Jan 2008) by Gernot Hillier <gernot\@hillier.de> (added Openstreetmap support)
+ Version svn-$Version
+ ";
+
+@@ -176,6 +177,25 @@
+ 15812 => 3 ,
+ 7906 => 2,
+ 3953 => 1
++ },
++ openstreetmap_tah => {
++ 256*576000 => 1,
++ 128*576000 => 2,
++ 64*576000 => 3,
++ 32*576000 => 4,
++ 16*576000 => 5,
++ 8*576000 => 6,
++ 4*576000 => 7,
++ 2*576000 => 8,
++ 576000 => 9,
++ 288000 => 10,
++ 144000 => 11,
++ 72000 => 12,
++ 36000 => 13,
++ 18000 => 14,
++ 9000 => 15,
++ 4500 => 16,
++ 2250 => 17
+ }
+ };
+
+@@ -331,7 +351,6 @@
+ exit();
+ }
+
+-
+ # Verify that we have the options that we need
+ pod2usage(1) if (&error_check);
+
+@@ -417,6 +436,13 @@
+ print "+-----------------------------------------------------------+\n";
+ print "| Landsat Maps are Copyright, ..... |\n";
+ print "| They are free for non commercial use. |\n";
++}elsif ( $mapserver eq 'openstreetmap_tah' ){
++ print "+-----------------------------------------------------------+\n";
++ print "| OpenStreetmap Maps are Copyright by the OpenStreetmap |\n";
++ print "| project. |\n";
++ print "| They are free for use under the terms of the |\n";
++ print "| Creative Commons \"Attribution-Share Alike 2.0 Generic\" |\n";
++ print "| license. See http://www.openstreetmap.org for details. |\n";
+ } elsif ( ! $force) {
+ print "You are violating the map servers copyright!\n";
+ print "Are you sure you want to continue? [y|n] ";
+@@ -700,6 +726,11 @@
+ {
+ ($url,$mapscale)=googlemap_url($lati,$long,$scale);
+ }
++ elsif ( $mapserver eq 'openstreetmap_tah')
++ {
++ $filename=~s/\.gif/.png/;
++ ($url,$mapscale)=openstreetmap_tah_url($lati,$long,$scale);
++ }
+ else
+ {
+ print "Unknown map sever :", $mapserver, "\n";
+@@ -935,6 +966,37 @@
+ return ($url,$mapscale);
+ }
+
++#############################################################################
++sub openstreetmap_tah_url($$$){
++ my $lati = shift;
++ my $long = shift;
++ my $scale = shift;
++
++ my $mapscale = $scale;
++ my $zoom = undef;
++ for my $s ( sort keys %{$Scale2Zoom->{openstreetmap_tah}} ) {
++ next unless $s == $scale;
++ $zoom = $Scale2Zoom->{openstreetmap_tah}->{$s};
++ $mapscale = $s;
++ last;
++ }
++
++ unless ( $zoom ) {
++ print "Error calculating Zoomlevel for Scale: $scale\n";
++ return (undef,undef);
++ }
++
++ if ($debug) {
++ print "\n";
++ print "Using openstreetmap_tah zoom ", $zoom, " for requested scale ", $scale, ":1 actual scale ", $mapscale, ":1\n";
++ print "lat: $lati\n";
++ print "lon: $long\n";
++ }
++
++ my $url = "http://tah.openstreetmap.org/MapOf/?lat=$lati&long=$long&z=$zoom&w=1280&h=1024&format=png";
++# print "$url\n";
++ return ($url,$mapscale);
++}
+
+ #############################################################################
+ sub eniro_url($$$){
+@@ -2284,7 +2346,7 @@
+ =item B<--mapserver <MAPSERVER>>
+
+ Mapserver to download from. Default: 'expedia'.
+-Currently can use: landsat or expedia.
++Currently usable: landsat, expedia or openstreetmap_tah.
+
+ geoscience, gov_au, incrementp, googlesat, googlemap and eniro have download stubs,
+ but they are !!!NOT!!!! in the right scale.
+@@ -2294,6 +2356,9 @@
+
+ landsat covers the whole world with satelite Photos
+
++openstreetmap_tah: Free maps from the OpenStreetmap Tiles at Home project, see
++ http://www.openstreetmap.org and http://tah.openstreetmap.org.
++
+ gov_au is for Australia
+
+ incrementp for japanese Maps
============================================================
--- packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch 47e014d89d9957ea970e01aced2dc553d3722236
+++ packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch 47e014d89d9957ea970e01aced2dc553d3722236
@@ -0,0 +1,18 @@
+Index: src/map_handler.c
+===================================================================
+--- aa/src/map_handler.c (Revision 1699)
++++ aa/src/map_handler.c (Revision 1700)
+@@ -660,9 +660,12 @@
+ if (maploaded)
+ gdk_pixbuf_unref (image);
+
++#ifdef MAPNIK
+ if ( !strcmp (filename,"mapnik") ) {
+ limage = gdk_pixbuf_new_from_data(get_mapnik_imagedata(), GDK_COLORSPACE_RGB, FALSE, 8, 1280, 1024, 1280 * 3, NULL, NULL);
+- } else {
++ } else
++#endif
++ {
+ limage = gdk_pixbuf_new_from_file (filename, NULL);
+ if (limage == NULL)
+ {
============================================================
--- packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch b9c3b9e051b269ab097c36a70c58b6d218e0d55d
+++ packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch b9c3b9e051b269ab097c36a70c58b6d218e0d55d
@@ -0,0 +1,96 @@
+diff -ur gpsdrive-2.10pre4.orig/src/Makefile.am gpsdrive-2.10pre4/src/Makefile.am
+--- gpsdrive-2.10pre4.orig/src/Makefile.am 2007-12-28 18:49:44.000000000 +0100
++++ gpsdrive-2.10pre4/src/Makefile.am 2007-12-28 18:50:29.000000000 +0100
+@@ -14,14 +14,14 @@
+ -DLOCALEDIR=\"${localedir}\" -DDATADIR=\"${datadir}\" \
+ -DLIBDIR=\"${libdir}\" \
+ -DFRIENDSSERVERVERSION=\"${FRIENDSSERVERVERSION}\" \
+- ${NOGARMIN} ${NOPLUGINS} ${AMAPNIK}\
+- -I/usr/include/ \
+- -I/usr/local/include \
+- -I/opt/boost_1_35/include/boost-1_35 \
+- -I/usr/local/include/freetype2 \
+- -I/usr/include/freetype2 \
++ ${NOGARMIN} ${NOPLUGINS} ${AMAPNIK}
++# -I/usr/include/ \
++# -I/usr/local/include \
++# -I/opt/boost_1_35/include/boost-1_35 \
++# -I/usr/local/include/freetype2 \
++# -I/usr/include/freetype2 \
+ -I. \
+- -L/usr/local/lib
++# -L/usr/local/lib
+
+ # -I/usr/include/dbus-1.0/
+
+diff -ur gpsdrive-2.10pre4.orig/configure gpsdrive-2.10pre4/configure
+--- gpsdrive-2.10pre4.orig/configure 2007-12-28 18:49:44.000000000 +0100
++++ gpsdrive-2.10pre4/configure 2008-01-06 14:49:11.000000000 +0100
+@@ -35950,10 +35950,13 @@
+ # Yep, its ebil, but I does not know better...
+ #PERL_PACKAGE_DIR=`perl -V:installsitearch | sed "s/installsitearch='//" | sed "s/';//"`
+ # default on debian should be: /usr/share/perl5/
+-PERL_VENDORLIB=`perl -V:vendorlib | sed "s,vendorlib=',," | sed "s/';//"`
++#PERL_VENDORLIB=`perl -V:vendorlib | sed "s,vendorlib=',," | sed "s/';//"`
+ #PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr,-${prefix}-,"`
+-PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr/sh%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -r9d51ade6b4318612931d9e49436a802f6c1fa43f -r8cfccf7d76cedeebb5fc468a8aa4943a21baf0bc
#
#
#
# delete "packages/libmatchbox/libmatchbox_1.2.bb"
#
# delete "packages/libmatchbox/libmatchbox_1.3.bb"
#
# delete "packages/libmatchbox/libmatchbox_1.4.bb"
#
# delete "packages/libmatchbox/libmatchbox_1.5.bb"
#
# delete "packages/libmatchbox/libmatchbox_1.6.bb"
#
# delete "packages/matchbox-wm/matchbox-wm_0.8.3.bb"
#
# delete "packages/matchbox-wm/matchbox-wm_0.8.4.bb"
#
# delete "packages/matchbox-wm/matchbox-wm_0.9.2.bb"
#
# delete "packages/matchbox-wm/matchbox-wm_0.9.3.bb"
#
# delete "packages/matchbox-wm/matchbox-wm_0.9.4.bb"
#
# delete "packages/matchbox-wm/matchbox-wm_0.9.bb"
#
# add_dir "packages/curl/files"
#
# add_dir "packages/dtnrg/files"
#
# add_dir "packages/gtk-webcore/osb-nrcit"
#
# add_file "packages/curl/files/pkgconfig_fix.patch"
# content [d105999ef214e4616999e1d0accd284640974dc7]
#
# add_file "packages/dtnrg/files/configure_fix.patch"
# content [a89048eadd0ea582a6513bcb61d08df848026021]
#
# add_file "packages/gtk-webcore/files/path_fixes.patch"
# content [716a0950c604514677a0eae118da7da04d070344]
#
# add_file "packages/gtk-webcore/osb-nrcit/pkgconfig_fix.patch"
# content [0edb164c34530db60d690707bef73b3594b510aa]
#
# add_file "packages/libmatchbox/files/configure_fixes.patch"
# content [4de1e878c64796aab614df79cf5ee0753caa5fec]
#
# add_file "packages/matchbox-desktop/matchbox-desktop-0.9.1/pkgconfig_fix.patch"
# content [d199870bd1e6ba594504a9c421480b264394799b]
#
# add_file "packages/matchbox-wm/matchbox-wm/configure_fix.patch"
# content [bae834deeca2d5f8f79cc2ac7ad96dac873df15a]
#
# add_file "packages/pango/pango-1.18.3/pkgconfig_fixes.patch"
# content [a74df0506a1afcf11eea21107f6caa8e7b5bc8da]
#
# add_file "packages/xorg-xserver/xserver-kdrive-1.4/pkgconfig_fix.patch"
# content [c63f18a7b52ed2a806647ca314ea5f8e3bcf08f2]
#
# patch "packages/curl/curl_7.16.4.bb"
# from [e059af19afea35121903c9bfbda21700cbf38c07]
# to [75efc99de6c7cc702a277bad7d10afc175e42621]
#
# patch "packages/gnutls/gnutls-1.6.3/configure_madness.patch"
# from [2998e7642de3c93def273f07b105f57b61a9f9c9]
# to [87f410ef8fb3b49faf09767ddad9b5adfeb02b69]
#
# patch "packages/gnutls/gnutls_1.6.3.bb"
# from [00f6ee42f807520ea4255904e757ed8cd210a4da]
# to [d9680357a147ffbb532b44d35e0ba188e067e902]
#
# patch "packages/gtk-webcore/osb-nrcit_svn.bb"
# from [d70113c981456053b3eb81fb001830ff3a66089b]
# to [f392ca94c652f0b2e0199720b3ca1891caa1e84d]
#
# patch "packages/gtk-webcore/osb-nrcore.inc"
# from [a81dab6970cf3f620379e415339da87027c19963]
# to [a2d1b24a35197d99ed9f2238f7e7694386f7ba8e]
#
# patch "packages/gtk-webcore/osb-nrcore_svn.bb"
# from [ab839622392a9399df985a1c3d43b212da7e0e56]
# to [6b4a5f5331023113b0b94f5a20f172c0144f3b20]
#
# patch "packages/libmatchbox/libmatchbox_1.9.bb"
# from [365c3dda341f2c4325bd84ab2891014107edcd0a]
# to [a9b28c50f482c7cd7c7ca85bc68e492f6fad9611]
#
# patch "packages/matchbox-desktop/matchbox-desktop_0.9.1.bb"
# from [bf560c49408f0a25330af4a37ec9f44da53a7cdc]
# to [a4667d6f77aa846c3dce0a8ed91e57d6acd68929]
#
# patch "packages/matchbox-wm/matchbox-wm_1.2.bb"
# from [98095f550f8c77883c44c40c96ff2b2161a07c87]
# to [12502c8a947c859da87bc31d714b44edeec78784]
#
# patch "packages/pango/pango_1.18.3.bb"
# from [24af597bfe27e33d9b2bb47c39d625d95e8eecc2]
# to [cb8809c85a8afc05d221451e591e5b5421dedb24]
#
# patch "packages/xorg-xserver/xserver-kdrive_1.4.bb"
# from [e924574025f2310b2e6051f3aeef14fd3082d730]
# to [809878de21fa1d0beaae670608e46b5918205067]
#
============================================================
--- packages/curl/files/pkgconfig_fix.patch d105999ef214e4616999e1d0accd284640974dc7
+++ packages/curl/files/pkgconfig_fix.patch d105999ef214e4616999e1d0accd284640974dc7
@@ -0,0 +1,14 @@
+Index: curl-7.16.4/libcurl.pc.in
+===================================================================
+--- curl-7.16.4.orig/libcurl.pc.in 2007-02-18 09:41:27.000000000 +0000
++++ curl-7.16.4/libcurl.pc.in 2008-02-29 12:19:32.000000000 +0000
+@@ -33,6 +33,7 @@
+ URL: http://curl.haxx.se/
+ Description: Library to transfer files with ftp, http, etc.
+ Version: @VERSION@
+-Libs: -L${libdir} -lcurl @LDFLAGS@ @LIBS@
+-Libs.private: @LIBCURL_LIBS@ @LIBS@
++Requires.private: gnutls
++Libs: -L${libdir} -lcurl
++Libs.private: -ldl -lz
+ Cflags: -I${includedir}
============================================================
--- packages/dtnrg/files/configure_fix.patch a89048eadd0ea582a6513bcb61d08df848026021
+++ packages/dtnrg/files/configure_fix.patch a89048eadd0ea582a6513bcb61d08df848026021
@@ -0,0 +1,22 @@
+head no longer supports "-1" syntax
+
+Index: dtn-2.5.0/oasys/aclocal/gcc.ac
+===================================================================
+--- dtn-2.5.0.orig/oasys/aclocal/gcc.ac 2008-02-27 22:38:22.000000000 +0000
++++ dtn-2.5.0/oasys/aclocal/gcc.ac 2008-02-27 22:39:05.000000000 +0000
+@@ -83,13 +83,13 @@
+ dnl Figure out the version and set version-specific options
+ dnl
+ AC_CACHE_CHECK(for the version of the GNU C compiler, oasys_cv_prog_gccver, [
+- oasys_cv_prog_gccver=`$CC --version | head -1`
++ oasys_cv_prog_gccver=`$CC --version | head -n 1`
+ oasys_cv_prog_gccver=`echo $oasys_cv_prog_gccver | sed 's/.*gcc.*(GCC) //'`
+ oasys_cv_prog_gccver=`echo $oasys_cv_prog_gccver | sed 's/ .*//'`
+ ])
+
+ AC_CACHE_CHECK(for the version of the GNU C++ compiler, oasys_cv_prog_gxxver, [
+- oasys_cv_prog_gxxver=`$CXX --version | head -1`
++ oasys_cv_prog_gxxver=`$CXX --version | head -n 1`
+ oasys_cv_prog_gxxver=`echo $oasys_cv_prog_gxxver | sed 's/.*g++.*(GCC) //'`
+ oasys_cv_prog_gxxver=`echo $oasys_cv_prog_gxxver | sed 's/ .*//'`
+ ])
============================================================
--- packages/gtk-webcore/files/path_fixes.patch 716a0950c604514677a0eae118da7da04d070344
+++ packages/gtk-webcore/files/path_fixes.patch 716a0950c604514677a0eae118da7da04d070344
@@ -0,0 +1,15 @@
+Index: NRCore/configure.in
+===================================================================
+--- NRCore.orig/configure.in 2008-02-29 11:01:14.000000000 +0000
++++ NRCore/configure.in 2008-02-29 12:45:18.000000000 +0000
+@@ -67,8 +67,8 @@
+ AC_MSG_RESULT([found. Using prefix $jscore_prefix])
+ JSCORE_ENABLE=yes
+ AC_SUBST(JSCORE_ENABLE)
+- JSCORE_LIBS="-L$jscore_prefix/lib -ljscore"
+- JSCORE_CFLAGS="-I$jscore_prefix/include/gtk-webcore-jscore/"
++ JSCORE_LIBS="-L$jscore_prefix/lib -lgtk_webcore_jscore"
++ JSCORE_CFLAGS="-I$jscore_prefix/include/gtk-webcore/"
+ jscore_pkgdatadir="$jscore_prefix/share/gtk-webcore-jscore"
+ else
+ AC_MSG_ERROR([JavaScriptCore not found. Use --with-javascriptcore-prefix=PREFIX])
============================================================
--- packages/gtk-webcore/osb-nrcit/pkgconfig_fix.patch 0edb164c34530db60d690707bef73b3594b510aa
+++ packages/gtk-webcore/osb-nrcit/pkgconfig_fix.patch 0edb164c34530db60d690707bef73b3594b510aa
@@ -0,0 +1,13 @@
+Index: NRCit/gtk-webcore-nrcit.pc.in
+===================================================================
+--- NRCit.orig/gtk-webcore-nrcit.pc.in 2008-02-29 13:46:41.000000000 +0000
++++ NRCit/gtk-webcore-nrcit.pc.in 2008-02-29 13:46:51.000000000 +0000
+@@ -6,6 +6,6 @@
+ Name: gtk-webcore-nrcit
+ Description: Gtk+-WebCore HTML rendering engine, browser interface
+ Version: @VERSION@
+-Requires: gtk-webcore-jscore gtk-webcore-nrcore xft fontconfig gdk-2.0 gtk+-2.0 glib-2.0
+-Libs: -L${libdir} -lgtk_webcore_nrcore -lgtk_webcore_nrcit -lgthread-2.0 -lgobject-2.0 @LIBCURL_LIBS@
++Requires: gtk-webcore-jscore gtk-webcore-nrcore xft fontconfig gdk-2.0 gtk+-2.0 glib-2.0 libcurl
++Libs: -L${libdir} -lgtk_webcore_nrcore -lgtk_webcore_nrcit -lgthread-2.0 -lgobject-2.0
+ Cflags: -I${includedir}/gtk-webcore/webi -I${includedir}/gtk-webcore
============================================================
--- packages/libmatchbox/files/configure_fixes.patch 4de1e878c64796aab614df79cf5ee0753caa5fec
+++ packages/libmatchbox/files/configure_fixes.patch 4de1e878c64796aab614df79cf5ee0753caa5fec
@@ -0,0 +1,79 @@
+---
+ configure.ac | 15 +++++++--------
+ libmb.pc.in | 2 +-
+ 2 files changed, 8 insertions(+), 9 deletions(-)
+
+Index: libmatchbox-1.9/configure.ac
+===================================================================
+--- libmatchbox-1.9.orig/configure.ac 2007-11-11 22:26:43.000000000 +0000
++++ libmatchbox-1.9/configure.ac 2007-11-11 22:52:09.000000000 +0000
+@@ -84,6 +84,7 @@ if test $have_libx11pc = yes; then
+ xft_pkg=xft
+ SUPPORTS_XFT=1
+ AC_DEFINE(USE_XFT, [1], [Use Xft])
++ XFT_REQUIRED="xft"
+ fi
+ # XXX : xau is missing from x11.pc - workaround is too add here
+ PKG_CHECK_MODULES(XLIBS, x11 xext $xft_pkg)
+@@ -108,6 +109,7 @@ if test x$enable_xft != xno; then
+ AC_DEFINE(USE_XFT, [1], [Use Xft])
+ SUPPORTS_XFT=1
+ AC_MSG_RESULT(yes)
++ XFT_REQUIRED="xft"
+ else
+
+ AC_PATH_PROG(XFT_CONFIG, xft-config, no)
+@@ -122,21 +124,17 @@ if test x$enable_xft != xno; then
+ AC_DEFINE(USE_XFT, [1], [Use Xft])
+ SUPPORTS_XFT=1
+ AC_MSG_RESULT(yes)
++ MB_EXTRA_CFLAGS="$MB_EXTRA_CFLAGS $XFT_CFLAGS"
++ MB_EXTRA_LIBS="$MB_EXTRA_LIBS $XFT_LIBS"
+ fi
+ fi
+ fi
+
+ XLIBS_CFLAGS="$XLIBS_CLAGS $XFT_CFLAGS"
+-XLIBS_LIBS="$X_LIBS $XFT_LIBS -lX11 -lXext"
+-
+-MB_EXTRA_LIBS="$MB_EXTRA_LIBS $XLIBS_LIBS"
++XLIBS_LIBS="$XLIBS_LIBS $XFT_LIBS -lX11 -lXext"
+
+ fi
+
+-# do this here for freetype include
+-MB_EXTRA_CFLAGS="$MB_EXTRA_CFLAGS $XLIBS_CFLAGS"
+-
+-
+ dnl ------ Check for Pango ---------------------------------------------------
+
+ if test x$enable_pango != xno; then
+@@ -172,7 +170,7 @@ if test x$enable_png != xno; then
+ AC_DEFINE(USE_PNG, [1], [Use Png])
+ SUPPORTS_PNG=1
+ PNG_LIBS="-lpng -lz"
+- MB_EXTRA_LIBS="$MB_EXTRA_LIBS $XLIBS_LIBS $PNG_LIBS"
++ MB_EXTRA_LIBS="$MB_EXTRA_LIBS $PNG_LIBS"
+ else
+ AC_MSG_WARN([*** Cannot find PNG, disabling support])
+ enable_png=no
+@@ -340,6 +338,7 @@ AC_SUBST(MB_EXTRA_CFLAGS)
+ AC_SUBST(XLIBS_REQUIRED)
+ AC_SUBST(PANGO_REQUIRED)
+ AC_SUBST(PNG_REQUIRED)
++AC_SUBST(XFT_REQUIRED)
+
+ dnl ------ Below used for mbconfig.h ----------------------------------------
+
+Index: libmatchbox-1.9/libmb.pc.in
+===================================================================
+--- libmatchbox-1.9.orig/libmb.pc.in 2007-11-11 22:30:47.000000000 +0000
++++ libmatchbox-1.9/libmb.pc.in 2007-11-11 22:31:01.000000000 +0000
+@@ -7,6 +7,6 @@ Name: libmb
+ Description: Utility Library used by Matchbox utilities.
+ Version: @VERSION@
+
+-Requires: @XLIBS_REQUIRED@ @PANGO_REQUIRED@ @PNG_REQUIRED@
++Requires: @XLIBS_REQUIRED@ @PANGO_REQUIRED@ @PNG_REQUIRED@ @XFT_REQUIRED@
+ Libs: -L${libdir} -lmb @MB_EXTRA_LIBS@
+ Cflags: -I${includedir} @MB_EXTRA_CFLAGS@
============================================================
--- packages/matchbox-desktop/matchbox-desktop-0.9.1/pkgconfig_fix.patch d199870bd1e6ba594504a9c421480b264394799b
+++ packages/matchbox-desktop/matchbox-desktop-0.9.1/pkgconfig_fix.patch d199870bd1e6ba594504a9c421480b264394799b
@@ -0,0 +1,15 @@
+Index: matchbox-desktop-0.9.1/matchbox-desktop.pc.in
+===================================================================
+--- matchbox-desktop-0.9.1.orig/matchbox-desktop.pc.in 2008-02-29 13:48:39.000000000 +0000
++++ matchbox-desktop-0.9.1/matchbox-desktop.pc.in 2008-02-29 13:49:07.000000000 +0000
+@@ -6,5 +6,6 @@
+ Name: matchbox-desktop
+ Description: Matchbox Desktop module dependencies.
+ Version: @VERSION@
+-Libs: -L${libdir} @LIBMB_LIBS@
+-Cflags: -I${includedir}/matchbox-desktop @LIBMB_CFLAGS@
+\ No newline at end of file
++Requires: libmb
++Libs: -L${libdir}
++Cflags: -I${includedir}/matchbox-desktop
+\ No newline at end of file
============================================================
--- packages/matchbox-wm/matchbox-wm/configure_fix.patch bae834deeca2d5f8f79cc2ac7ad96dac873df15a
+++ packages/matchbox-wm/matchbox-wm/configure_fix.patch bae834deeca2d5f8f79cc2ac7ad96dac873df15a
@@ -0,0 +1,13 @@
+Index: matchbox-window-manager/configure.ac
+===================================================================
+--- matchbox-window-manager.orig/configure.ac 2007-11-14 12:02:28.000000000 +0000
++++ matchbox-window-manager/configure.ac 2007-11-14 12:18:55.000000000 +0000
+@@ -283,7 +283,7 @@
+ yes)
+
+ case "$expat" in
+- yes)
++ yes|"")
+ EXPAT_LIBS="-lexpat"
+ ;;
+ *)
============================================================
--- packages/pango/pango-1.18.3/pkgconfig_fixes.patch a74df0506a1afcf11eea21107f6caa8e7b5bc8da
+++ packages/pango/pango-1.18.3/pkgconfig_fixes.patch a74df0506a1afcf11eea21107f6caa8e7b5bc8da
@@ -0,0 +1,79 @@
+Index: pango-1.18.1/configure.in
+===================================================================
+--- pango-1.18.1.orig/configure.in 2007-08-28 00:29:54.000000000 +0000
++++ pango-1.18.1/configure.in 2007-11-12 19:21:22.000000000 +0000
+@@ -226,13 +226,9 @@
+ #
+ # Checks for FreeType
+ #
+- FREETYPE_LIBS=
+- FREETYPE_CFLAGS=
+- AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no)
+- if test "x$FREETYPE_CONFIG" != "xno" ; then
+- FREETYPE_CFLAGS=`$FREETYPE_CONFIG --cflags`
+- FREETYPE_LIBS=`$FREETYPE_CONFIG --libs`
++ PKG_CHECK_MODULES(FREETYPE, freetype2 >= 1.0.1, have_freetype=true, AC_MSG_RESULT([no]))
+
++ if $have_freetype ; then
+ pango_save_ldflags=$LDFLAGS
+ LDFLAGS="$LDFLAGS $FREETYPE_LIBS"
+ AC_CHECK_LIB(freetype, FT_Get_Next_Char, have_freetype=true, :)
+Index: pango-1.18.1/pangoft2-uninstalled.pc.in
+===================================================================
+--- pango-1.18.1.orig/pangoft2-uninstalled.pc.in 2007-07-05 21:30:28.000000000 +0000
++++ pango-1.18.1/pangoft2-uninstalled.pc.in 2007-11-12 19:23:44.000000000 +0000
+@@ -1,7 +1,7 @@
+ Name: Pango FT2 Uninstalled
+ Description: Freetype 2.0 font support for Pango, Not Installed
+ Version: @VERSION@
+-Requires: pango
+-Libs: ${pc_top_builddir}/${pcfiledir}/pango/libpangoft2- at PANGO_API_VERSION@.la @FREETYPE_LIBS@
+-Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@ @FREETYPE_CFLAGS@
++Requires: pango freetype2
++Libs: ${pc_top_builddir}/${pcfiledir}/pango/libpangoft2- at PANGO_API_VERSION@.la
++Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@
+
+Index: pango-1.18.1/pangoft2.pc.in
+===================================================================
+--- pango-1.18.1.orig/pangoft2.pc.in 2007-07-05 21:30:28.000000000 +0000
++++ pango-1.18.1/pangoft2.pc.in 2007-11-12 19:27:05.000000000 +0000
+@@ -6,7 +6,7 @@
+ Name: Pango FT2
+ Description: Freetype 2.0 font support for Pango
+ Version: @VERSION@
+-Requires: pango
+-Libs: -L${libdir} -lpangoft2- at PANGO_API_VERSION@ @PKGCONFIG_FREETYPE_LIBS@
+-Cflags: -I${includedir}/pango-1.0 @FONTCONFIG_CFLAGS@ @FREETYPE_CFLAGS@
++Requires: pango freetype2 fontconfig
++Libs: -L${libdir} -lpangoft2- at PANGO_API_VERSION@
++Cflags: -I${includedir}/pango-1.0
+
+Index: pango-1.18.1/pangoxft-uninstalled.pc.in
+===================================================================
+--- pango-1.18.1.orig/pangoxft-uninstalled.pc.in 2007-07-05 21:30:28.000000000 +0000
++++ pango-1.18.1/pangoxft-uninstalled.pc.in 2007-11-12 19:22:24.000000000 +0000
+@@ -1,7 +1,7 @@
+ Name: Pango Xft Uninstalled
+ Description: Xft font support for Pango, Not Installed
+ Version: @VERSION@
+-Requires: pango
+-Libs: ${pc_top_builddir}/${pcfiledir}/pango/libpangoxft- at PANGO_API_VERSION@.la @XFT_LIBS@
+-Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@ @X_CFLAGS@ @FREETYPE_CFLAGS@
++Requires: pango xft
++Libs: ${pc_top_builddir}/${pcfiledir}/pango/libpangoxft- at PANGO_API_VERSION@.la
++Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@ @X_CFLAGS@
+
+Index: pango-1.18.1/pangoxft.pc.in
+===================================================================
+--- pango-1.18.1.orig/pangoxft.pc.in 2007-07-05 21:30:28.000000000 +0000
++++ pango-1.18.1/pangoxft.pc.in 2007-11-12 19:21:57.000000000 +0000
+@@ -6,6 +6,6 @@
+ Name: Pango Xft
+ Description: Xft font support for Pango
+ Version: @VERSION@
+-Requires: pango pangoft2
+-Libs: -L${libdir} -lpangoxft- at PANGO_API_VERSION@ @PKGCONFIG_XFT_LIBS@
+-Cflags: -I${includedir}/pango-1.0 @XFT_CFLAGS@
++Requires: pango pangoft2 xft
++Libs: -L${libdir} -lpangoxft- at PANGO_API_VERSION@
++Cflags: %s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list