[maemo-commits] [maemo-commits] r10909 - projects/haf/jhbuild_modules

[From: subversion at stage.maemo.org]

Author: lucasr
Date: 2007-04-02 17:25:48 +0300 (Mon, 02 Apr 2007)
New Revision: 10909

Modified:
   projects/haf/jhbuild_modules/ChangeLog
   projects/haf/jhbuild_modules/hildon-desktop.jhbuildrc
   projects/haf/jhbuild_modules/hildon-desktop.modules
Log:
2007-04-02  Lucas Rocha <lucas.rocha at nokia.com>

	* hildon-desktop.modules: remove dependency on Maemo GTK+ so that
	everything builds fine with stock GTK+. 
	* hildon-desktop.jhbuildrc: add /usr/share/pkgconfig to
	$PKG_CONFIG_PATH.


Modified: projects/haf/jhbuild_modules/ChangeLog
===================================================================
--- projects/haf/jhbuild_modules/ChangeLog	2007-04-02 14:24:57 UTC (rev 10908)
+++ projects/haf/jhbuild_modules/ChangeLog	2007-04-02 14:25:48 UTC (rev 10909)
@@ -1,3 +1,10 @@
+2007-04-02  Lucas Rocha <lucas.rocha at nokia.com>
+
+	* hildon-desktop.modules: remove dependency on Maemo GTK+ so that
+	everything builds fine with stock GTK+. 
+	* hildon-desktop.jhbuildrc: add /usr/share/pkgconfig to
+	$PKG_CONFIG_PATH.
+
 2007-03-30  Lucas Rocha <lucas.rocha at nokia.com>
 
 	* hildon-desktop.modules: libhildon now resides in trunk.

Modified: projects/haf/jhbuild_modules/hildon-desktop.jhbuildrc
===================================================================
--- projects/haf/jhbuild_modules/hildon-desktop.jhbuildrc	2007-04-02 14:24:57 UTC (rev 10908)
+++ projects/haf/jhbuild_modules/hildon-desktop.jhbuildrc	2007-04-02 14:25:48 UTC (rev 10909)
@@ -8,4 +8,4 @@
 
 prefix = '/opt/maemo'
 
-os.environ['PKG_CONFIG_PATH'] = "/usr/lib/pkgconfig"
+os.environ['PKG_CONFIG_PATH'] = "/usr/lib/pkgconfig:/usr/share/pkgconfig"

Modified: projects/haf/jhbuild_modules/hildon-desktop.modules
===================================================================
--- projects/haf/jhbuild_modules/hildon-desktop.modules	2007-04-02 14:24:57 UTC (rev 10908)
+++ projects/haf/jhbuild_modules/hildon-desktop.modules	2007-04-02 14:25:48 UTC (rev 10909)
@@ -30,10 +30,10 @@
     </dependencies>
   </autotools>
 
-  <autotools id="libhildon">
+  <autotools id="libhildon" autogenargs="--with-maemo-gtk=no">
     <branch repo="maemo.org-haf" module="trunk/hildon-1"/>
     <dependencies>
-      <dep package="gtk+"/>
+      <!--<dep package="gtk+"/>-->
     </dependencies>
   </autotools>