[oe-commits] org.oe.dev merge of '8be6702870d00e547e81f68f3feffa5ba236e7ac'
mickeyl commit
openembedded-commits at lists.openembedded.org
Wed Oct 24 08:47:29 UTC 2007
merge of '8be6702870d00e547e81f68f3feffa5ba236e7ac'
and 'cbec50f53eb6e573a76ee660b0607c64d3e95d99'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: a79d90fb0466aeb7b196175fb36831acfe94c694
ViewMTN: http://monotone.openembedded.org/revision/info/a79d90fb0466aeb7b196175fb36831acfe94c694
Files:
1
packages/openmoko2/libjana
packages/openmoko2/libjana/clockpatch.patch
packages/openmoko2/libjana_svn.bb
packages/openmoko2/openmoko-session2.bb
packages/imagemagick/files/binconfig-fixes.patch
packages/imagemagick/files/makefile-am.patch
Diffs:
#
# mt diff -r8be6702870d00e547e81f68f3feffa5ba236e7ac -ra79d90fb0466aeb7b196175fb36831acfe94c694
#
#
#
# add_dir "packages/openmoko2/libjana"
#
# add_file "packages/openmoko2/libjana/clockpatch.patch"
# content [ec20e543844603240791a4425d47c46b8d39ac75]
#
# patch "packages/openmoko2/libjana_svn.bb"
# from [b12471bf13475d2be894d51e78d8c5c82369ba08]
# to [b2186d3fd749e166dc82acf1684f1bbd0dc23c2b]
#
# patch "packages/openmoko2/openmoko-session2.bb"
# from [348fb600361ca189638aa5f630ea59dd39c5cb85]
# to [9b29d38583ef7d185640dabf6d55da8fb198f056]
#
============================================================
--- packages/openmoko2/libjana/clockpatch.patch ec20e543844603240791a4425d47c46b8d39ac75
+++ packages/openmoko2/libjana/clockpatch.patch ec20e543844603240791a4425d47c46b8d39ac75
@@ -0,0 +1,31 @@
+Index: jana/libjana-gtk/jana-gtk-clock.c
+===================================================================
+--- jana.orig/libjana-gtk/jana-gtk-clock.c
++++ jana/libjana-gtk/jana-gtk-clock.c
+@@ -695,7 +695,7 @@ draw_digital_clock (JanaGtkClock *clock,
+ cairo_fill (cr);
+
+ /* Draw dark outline frame */
+- thickness = width/20;
++ thickness = width/40;
+ cairo_new_path (cr);
+ cairo_rectangle (cr, thickness/2, thickness/2,
+ width - thickness, height - thickness);
+@@ -703,7 +703,7 @@ draw_digital_clock (JanaGtkClock *clock,
+ cairo_set_source_rgb (cr, base_color[0]/2,
+ base_color[1]/2, base_color[2]/2);
+ cairo_stroke (cr);
+-
++#if 0
+ /* Draw main outline frame */
+ cairo_new_path (cr);
+ cairo_rectangle (cr, thickness, thickness,
+@@ -728,7 +728,7 @@ draw_digital_clock (JanaGtkClock *clock,
+ base_color[1]/1.5, base_color[2]/1.5);
+ cairo_set_line_width (cr, thickness/2);
+ cairo_stroke (cr);
+-
++#endif
+ cairo_identity_matrix (cr);
+ }
+
============================================================
--- packages/openmoko2/libjana_svn.bb b12471bf13475d2be894d51e78d8c5c82369ba08
+++ packages/openmoko2/libjana_svn.bb b2186d3fd749e166dc82acf1684f1bbd0dc23c2b
@@ -1,14 +1,14 @@
-DESCRIPTION = "Jana Calendar lib"
-DEPENDS = "libmokoui2 libmokojournal2 gtk+ libglade eds-dbus"
+DESCRIPTION = "O-Hand Jana Library"
+DEPENDS = "libmokojournal2 gtk+ eds-dbus"
PV = "0.1.0+svnr${SRCREV}"
+PR = "r3"
-inherit autotools pkgconfig lib_package
+inherit autotools pkgconfig lib_package
-SRC_URI = "svn://svn.o-hand.com/repos/dates/branches;module=jana;proto=http"
+SRC_URI = "svn://svn.o-hand.com/repos/dates/branches;module=jana;proto=http \
+ file://clockpatch.patch;patch=1"
S = "${WORKDIR}/jana/"
-EXTRA_OECONF = "--with-frontend=openmoko"
-
do_configure_prepend() {
touch gtk-doc.make
}
@@ -18,9 +18,9 @@ PACKAGES = "libjana-ecal libjana-ecal-db
}
PACKAGES = "libjana-ecal libjana-ecal-dbg \
- libjana-gtk libjana-gtk-dbg \
- libjana libjana-dbg libjana-dev\
- "
+ libjana-gtk libjana-gtk-dbg \
+ libjana libjana-dbg libjana-dev \
+"
FILES_libjana-ecal = "${libdir}/libjana.so.*"
FILES_libjana-ecal-dbg = "${libdir}/.debug/libjana-ecal*"
@@ -28,4 +28,3 @@ FILES_libjana-dbg = "${libdir}/.debug/li
FILES_libjana-gtk-dbg = "${libdir}/.debug/libjana-gtk.so.*"
FILES_libjana = "${libdir}/libjana.so.*"
FILES_libjana-dbg = "${libdir}/.debug/libjana.so.*"
-
============================================================
--- packages/openmoko2/openmoko-session2.bb 348fb600361ca189638aa5f630ea59dd39c5cb85
+++ packages/openmoko2/openmoko-session2.bb 9b29d38583ef7d185640dabf6d55da8fb198f056
@@ -1,10 +1,10 @@ RCONFLICTS = "openmoko-session"
DESCRIPTION = "Custom Matchbox session files for OpenMoko"
LICENSE = "GPL"
SECTION = "x11"
RDEPENDS = "matchbox-common matchbox-applet-startup-monitor matchbox-panel-2"
RDEPENDS += "openmoko-common2 openmoko-today2 openmoko-dialer2"
RCONFLICTS = "openmoko-session"
-PR = "r36"
+PR = "r37"
SRC_URI = "file://etc"
S = ${WORKDIR}
@@ -27,6 +27,7 @@ gconftool-2 --config-source=xml::$D${sys
gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/icon_theme openmoko-standard
gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/font_name "Sans 5"
gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/wallpaper ${datadir}/pixmaps/wallpaper.png
+gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type bool --set /desktop/poky/interface/digital_clock 1
gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type int --set /desktop/poky/peripherals/mouse/drag_threshold 8
gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type int --set /desktop/openmoko/neod/power_management 2
# gstreamer audio settings
#
# mt diff -rcbec50f53eb6e573a76ee660b0607c64d3e95d99 -ra79d90fb0466aeb7b196175fb36831acfe94c694
#
#
#
# add_file "packages/imagemagick/files/binconfig-fixes.patch"
# content [0896251677948b88d6322bb9bac6a7bc6bb9fca5]
#
# add_file "packages/imagemagick/files/makefile-am.patch"
# content [e872d29af6c120af876b53535de08d2da6b4df6e]
#
============================================================
--- packages/imagemagick/files/binconfig-fixes.patch 0896251677948b88d6322bb9bac6a7bc6bb9fca5
+++ packages/imagemagick/files/binconfig-fixes.patch 0896251677948b88d6322bb9bac6a7bc6bb9fca5
@@ -0,0 +1,81 @@
+Index: ImageMagick-6.3.5/Magick++/bin/Magick++-config.in
+===================================================================
+--- ImageMagick-6.3.5.orig/Magick++/bin/Magick++-config.in 2007-10-24 08:04:49.000000000 +0100
++++ ImageMagick-6.3.5/Magick++/bin/Magick++-config.in 2007-10-24 08:07:51.000000000 +0100
+@@ -4,6 +4,9 @@
+ # required to use the Magick++ library.
+ #
+ #
++prefix=@PREFIX_DIR@
++exec_prefix=@EXEC_PREFIX_DIR@
++
+ usage='Usage: Magick++-config [--cppflags] [--cxxflags] [--exec-prefix] [--ldflags] [--libs] [--prefix] [--version]
+
+ For example, "magick.cpp" may be compiled to produce "magick" as follows:
+@@ -18,10 +21,10 @@
+ while test $# -gt 0; do
+ case $1 in
+ --prefix)
+- echo @PREFIX_DIR@
++ echo $prefix
+ ;;
+ --exec-prefix)
+- echo @EXEC_PREFIX_DIR@
++ echo $exec_prefix
+ ;;
+ --version)
+ echo @PACKAGE_VERSION@
+Index: ImageMagick-6.3.5/magick/Magick-config.in
+===================================================================
+--- ImageMagick-6.3.5.orig/magick/Magick-config.in 2007-10-24 08:04:49.000000000 +0100
++++ ImageMagick-6.3.5/magick/Magick-config.in 2007-10-24 08:07:19.000000000 +0100
+@@ -3,6 +3,9 @@
+ # Configure options script for re-calling MagickCore compilation options
+ # required to use the MagickCore library.
+ #
++prefix=@PREFIX_DIR@
++exec_prefix=@EXEC_PREFIX_DIR@
++
+ usage="\
+ Usage: Magick-config [--cflags] [--cppflags] [--exec-prefix] [--ldflags] [--libs] [--prefix] [--version]"
+
+@@ -15,10 +18,10 @@
+ while test $# -gt 0; do
+ case $1 in
+ --prefix)
+- echo @PREFIX_DIR@
++ echo $prefix
+ ;;
+ --exec-prefix)
+- echo @EXEC_PREFIX_DIR@
++ echo $exec_prefix
+ ;;
+ --version)
+ echo '@PACKAGE_VERSION@ Q at QuantumDepth@ @MAGICK_HDRI@'
+Index: ImageMagick-6.3.5/wand/Wand-config.in
+===================================================================
+--- ImageMagick-6.3.5.orig/wand/Wand-config.in 2007-10-24 08:04:49.000000000 +0100
++++ ImageMagick-6.3.5/wand/Wand-config.in 2007-10-24 08:06:38.000000000 +0100
+@@ -3,6 +3,9 @@
+ # Configure options script for re-calling MagickWand compilation options
+ # required to use the MagickWand library.
+ #
++prefix=@PREFIX_DIR@
++exec_prefix=@EXEC_PREFIX_DIR@
++
+ usage="\
+ Usage: Wand-config [--cflags] [--cppflags] [--exec-prefix] [--ldflags] [--libs] [--prefix] [--version]"
+
+@@ -15,10 +18,10 @@
+ while test $# -gt 0; do
+ case $1 in
+ --prefix)
+- echo @PREFIX_DIR@
++ echo $prefix
+ ;;
+ --exec-prefix)
+- echo @EXEC_PREFIX_DIR@
++ echo $exec_prefix
+ ;;
+ --version)
+ echo '@PACKAGE_VERSION@ Q at QuantumDepth@ @MAGICK_HDRI@'
============================================================
--- packages/imagemagick/files/makefile-am.patch e872d29af6c120af876b53535de08d2da6b4df6e
+++ packages/imagemagick/files/makefile-am.patch e872d29af6c120af876b53535de08d2da6b4df6e
@@ -0,0 +1,13 @@
+Index: ImageMagick-6.3.5/Makefile.am
+===================================================================
+--- ImageMagick-6.3.5.orig/Makefile.am 2007-10-24 08:03:09.000000000 +0100
++++ ImageMagick-6.3.5/Makefile.am 2007-10-24 08:03:21.000000000 +0100
+@@ -18,7 +18,7 @@
+
+ AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
+
+-ACLOCAL_AMFLAGS = -Iltdl/m4 -I m4
++ACLOCAL_AMFLAGS = -I m4
+
+ MODULECOMMONFLAGS = -no-undefined -export-symbols-regex ".*" -module -avoid-version
+
More information about the Openembedded-commits
mailing list