[oe-commits] org.oe.dev merge of '1e1adf51dc9360eaaa91db46f1ad5ca664d7a0cc'
crofton commit
openembedded-commits at lists.openembedded.org
Tue Oct 2 17:18:44 UTC 2007
merge of '1e1adf51dc9360eaaa91db46f1ad5ca664d7a0cc'
and 'a0d6cd0bb1fc7d9eba19c1ed2eb1b84f6eb001c9'
Author: crofton at openembedded.org
Branch: org.openembedded.dev
Revision: 9e681c12effd8b11df4c8d54536e246b45578b60
ViewMTN: http://monotone.openembedded.org/revision/info/9e681c12effd8b11df4c8d54536e246b45578b60
Files:
1
packages/wifistix/wifistix-modules/wifistix.conf
packages/wifistix/wifistix-modules_5.0.16.p0.bb
packages/gtk-webcore/midori
packages/gtk-webcore/midori/midori.desktop
packages/gtk-webcore/midori_0.0.6.bb
packages/xorg-xserver/xserver-kdrive-1.2.0/kdrive-imageon.patch
packages/maemo3/libhildonfm
packages/gtk-webcore/midori_0.0.8.bb
packages/maemo3/libhildonfm/hildonfm-ifdef-maemogtk.diff
packages/maemo3/libhildonfm_1.9.41.bb
packages/mtd/mtd-utils-tests_1.0.0+git.bb
conf/distro/include/sane-srcrevs.inc
conf/machine/htcblueangel.conf
conf/machine/hx4700.conf
packages/atk/atk_1.19.3.bb
packages/fontconfig/fontconfig_2.4.1.bb
packages/gtk+/gtk-2.10.inc
packages/libgcrypt/libgcrypt_1.2.3.bb
packages/maemo3/hildon-1_svn.bb
packages/maemo3/libhildonhelp_1.9.1.bb
packages/openmoko2/openmoko-dates2_svn.bb
Diffs:
#
# mt diff -r1e1adf51dc9360eaaa91db46f1ad5ca664d7a0cc -r9e681c12effd8b11df4c8d54536e246b45578b60
#
#
#
# add_file "packages/wifistix/wifistix-modules/wifistix.conf"
# content [4f54c69eb79183559844c1a626d6423719ac141f]
#
# patch "packages/wifistix/wifistix-modules_5.0.16.p0.bb"
# from [535b62f61c51533c64150e1f87508b01aca14e7e]
# to [1cc3c7cd23d0d7b0c59ba5d938b92f448c360c11]
#
============================================================
--- packages/wifistix/wifistix-modules/wifistix.conf 4f54c69eb79183559844c1a626d6423719ac141f
+++ packages/wifistix/wifistix-modules/wifistix.conf 4f54c69eb79183559844c1a626d6423719ac141f
@@ -0,0 +1,4 @@
+install pcmcia /sbin/modprobe --ignore-install pcmcia && modprobe pxa2xx-cs
+
+alias mwlan0 mcf25
+
============================================================
--- packages/wifistix/wifistix-modules_5.0.16.p0.bb 535b62f61c51533c64150e1f87508b01aca14e7e
+++ packages/wifistix/wifistix-modules_5.0.16.p0.bb 1cc3c7cd23d0d7b0c59ba5d938b92f448c360c11
@@ -8,6 +8,7 @@ SRC_URI = "http://files.gumstix.com/cf83
PR = "r0"
SRC_URI = "http://files.gumstix.com/cf8385-5.0.16.p0-26306.tbz \
+ file://wifistix.conf \
file://marvell-devicename.patch;patch=1 \
file://marvell-devicetable.patch;patch=1 \
file://marvell-gumstix.patch;patch=1 \
@@ -24,21 +25,26 @@ inherit module-base
inherit module-base
+EXTRA_OEMAKE = "CONFIG_GUMSTIX=y CONFIG_DEBUG=n KVER=2.6 \
+ KERNELDIR=${KERNEL_SOURCE} ARCH=${TARGET_ARCH} \
+ CC=${KERNEL_CC} EXTRA_CFLAGS=${CFLAGS} \
+ INSTALL_MOD_PATH="${D}"
+
do_compile() {
unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
- make CONFIG_GUMSTIX=y CONFIG_DEBUG=n KVER=2.6 KERNELDIR="${KERNEL_SOURCE}" \
- ARCH="${TARGET_ARCH}" CC="${KERNEL_CC}" EXTRA_CFLAGS="${CFLAGS}"
+ oe_runmake
}
do_install() {
unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
- make CONFIG_GUMSTIX=y CONFIG_DEBUG=n KVER=2.6 KERNELDIR="${KERNEL_SOURCE}" \
- ARCH="${TARGET_ARCH}" CC="${KERNEL_CC}" EXTRA_CFLAGS="${CFLAGS}" INSTALL_MOD_PATH="${D}" install
-# (grep -q mcf25 ${D}/etc/modprobe.conf || \
-# echo -e 'alias mwlan0 mcf25\n' >> ${D}/etc/modprobe.conf)
-# (grep -q mwlan0 ${D}/etc/network/interfaces || \
-# echo -e '\nauto mwlan0\niface mwlan0 inet dhcp\n pre-up /sbin/iwconfig $$IFACE essid any txpower 100mW\n' >> $(TARGET_DIR)/etc/network/interfaces)
+ oe_runmake install
+
+ install -m 0755 -d ${D}${sysconfdir}/modprobe.d
+ install -m 0644 ${WORKDIR}/wifistix.conf ${D}${sysconfdir}/modprobe.d/wifistix.conf
}
PACKAGES = "${PN}"
+FILES_${PN} = "${base_libdir}/modules/"
+FILES_${PN} += "${sysconfdir}/modprobe.d/"
+CONFFILES_${PN} = "${sysconfdir}/modprobe.d/wifistix.conf"
+
-FILES_${PN} = "/lib/modules/"
#
# mt diff -ra0d6cd0bb1fc7d9eba19c1ed2eb1b84f6eb001c9 -r9e681c12effd8b11df4c8d54536e246b45578b60
#
#
#
# delete "packages/gtk-webcore/midori"
#
# delete "packages/gtk-webcore/midori/midori.desktop"
#
# delete "packages/gtk-webcore/midori_0.0.6.bb"
#
# delete "packages/xorg-xserver/xserver-kdrive-1.2.0/kdrive-imageon.patch"
#
# add_dir "packages/maemo3/libhildonfm"
#
# add_file "packages/gtk-webcore/midori_0.0.8.bb"
# content [248eb3a40d4c7bdb50c581812cdbeaeb356a89fd]
#
# add_file "packages/maemo3/libhildonfm/hildonfm-ifdef-maemogtk.diff"
# content [ee4fc470a3d819f5721c7acacfee0452817dcf8e]
#
# add_file "packages/maemo3/libhildonfm_1.9.41.bb"
# content [28bd888a778dcd453876624cbdc43e8650ebcd59]
#
# add_file "packages/mtd/mtd-utils-tests_1.0.0+git.bb"
# content [03523cf6fd286f903f70fec99e153ed50f356c6d]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [17f28a36948bf26950e4e783b1b5935187bfe68d]
# to [5d252a434632ec2bd023dab3ea432972270f3467]
#
# patch "conf/machine/htcblueangel.conf"
# from [e65ecf996a1d84af3f34a86f70afe617dec9e302]
# to [0c19233d7062948ae1fec57ba52f8627716d1dd2]
#
# patch "conf/machine/hx4700.conf"
# from [ff48628632c761276f1e19ddd62582b88b0b19ef]
# to [8bd11bb54cb42e00dabf0bf4bdd4387aced4c0a5]
#
# patch "packages/atk/atk_1.19.3.bb"
# from [656b768718fa0fb3c29376f5b6d2cecb01f2f4c1]
# to [e94d8f3fd021065300ad78c840ea3acacdb490d8]
#
# patch "packages/fontconfig/fontconfig_2.4.1.bb"
# from [868e4f599ca1566fbb69670fe3438b55be3102e1]
# to [72b20501701af3510e5f8a1d9644dd7748b52169]
#
# patch "packages/gtk+/gtk-2.10.inc"
# from [2047151920b91f2368752f4cc49b73a3992106a0]
# to [162cf297e438ae9441b397783b38eb85d188382d]
#
# patch "packages/libgcrypt/libgcrypt_1.2.3.bb"
# from [e276a08d0c5be389810c76df1d581dbc07ac6eb8]
# to [b1dae0759fc4781ccd62f97bbf98ed78f9053815]
#
# patch "packages/maemo3/hildon-1_svn.bb"
# from [a3c930f472ff7778ca8ec08ae57d1087310b54d3]
# to [6024377620c35f410873bffd7b553a6ddb28bbb3]
#
# patch "packages/maemo3/libhildonhelp_1.9.1.bb"
# from [794cf71da9f0589bdd9c513647e1875421c19e81]
# to [cd086e94da64dcf8c822f1ee0eb56e18c2526ab5]
#
# patch "packages/openmoko2/openmoko-dates2_svn.bb"
# from [3be39f7f10cdcd32b56ee3135d4c0ce268a14ea5]
# to [c0b82b2d1232131cff214e735e422d252a154e6d]
#
============================================================
--- packages/gtk-webcore/midori_0.0.8.bb 248eb3a40d4c7bdb50c581812cdbeaeb356a89fd
+++ packages/gtk-webcore/midori_0.0.8.bb 248eb3a40d4c7bdb50c581812cdbeaeb356a89fd
@@ -0,0 +1,11 @@
+DESCRIPTION = "Midori is a lightweight web browser."
+LICENSE = "GPLv2"
+
+DEPENDS = "webkit-gtk libsexy"
+
+inherit autotools pkgconfig
+
+SRC_URI = "http://software.twotoasts.de/media/midori/midori-${PV}.tar.gz \
+ "
+
+
============================================================
--- packages/maemo3/libhildonfm/hildonfm-ifdef-maemogtk.diff ee4fc470a3d819f5721c7acacfee0452817dcf8e
+++ packages/maemo3/libhildonfm/hildonfm-ifdef-maemogtk.diff ee4fc470a3d819f5721c7acacfee0452817dcf8e
@@ -0,0 +1,132 @@
+--- /tmp/hildon-file-selection.c 2007-10-02 10:08:17.000000000 +0200
++++ 1_1.9.41/hildon-fm/hildon-file-selection.c 2007-10-02 11:26:58.292045000 +0200
+@@ -2036,6 +2036,7 @@
+ g_object_set(cell, "text", buffer, "sensitive", sensitive, NULL);
+ }
+
++#ifdef USE_MAEMO_GTK
+ static void hildon_file_selection_navigation_pane_context(GtkWidget *
+ widget,
+ gpointer data)
+@@ -2052,6 +2053,7 @@
+ ULOG_DEBUG(__FUNCTION__);
+ g_signal_emit(data, signal_content_pane_context_menu, 0);
+ }
++#endif /* USE_MAEMO_GTK */
+
+ static gboolean hildon_file_selection_on_content_pane_key(GtkWidget *
+ widget,
+@@ -2200,6 +2202,7 @@
+ }
+ }
+
++#ifdef USE_MAEMO_GTK
+ static gboolean
+ tap_and_hold_query (gpointer self, guint signal_id)
+ {
+@@ -2225,6 +2228,8 @@
+ return tap_and_hold_query (self, signal_navigation_pane_context_menu);
+ }
+
++#endif /* USE_MAEMO_GTK */
++
+ static void hildon_file_selection_create_thumbnail_view(HildonFileSelection
+ * self)
+ {
+@@ -2277,7 +2282,7 @@
+ g_signal_connect_object(tree, "key-press-event",
+ G_CALLBACK(hildon_file_selection_on_content_pane_key),
+ self, 0);
+-
++#ifdef USE_MAEMO_GTK
+ gtk_widget_tap_and_hold_setup(GTK_WIDGET(tree), NULL, NULL,
+ GTK_TAP_AND_HOLD_NONE | GTK_TAP_AND_HOLD_NO_INTERNALS);
+ g_signal_connect_object (tree, "tap-and-hold-query",
+@@ -2286,6 +2291,7 @@
+ g_signal_connect_object(tree, "tap-and-hold",
+ G_CALLBACK
+ (hildon_file_selection_content_pane_context), self, 0);
++#endif /* USE_MAEMO_GTK */
+
+ g_signal_connect_object(tree, "notify::has-focus",
+ G_CALLBACK(content_pane_focus), self, 0);
+@@ -2397,7 +2403,7 @@
+ (selection, "changed",
+ G_CALLBACK (hildon_file_selection_content_pane_selection_changed),
+ self, 0);
+-
++#ifdef USE_MAEMO_GTK
+ gtk_widget_tap_and_hold_setup(GTK_WIDGET(tree), NULL, NULL,
+ GTK_TAP_AND_HOLD_NONE | GTK_TAP_AND_HOLD_NO_INTERNALS);
+ g_signal_connect_object (tree, "tap-and-hold-query",
+@@ -2406,7 +2412,7 @@
+ g_signal_connect_object(tree, "tap-and-hold",
+ G_CALLBACK
+ (hildon_file_selection_content_pane_context), self, 0);
+-
++#endif /* USE_MAEMO_GTK */
+ g_signal_connect_object(tree, "key-press-event",
+ G_CALLBACK(hildon_file_selection_on_content_pane_key),
+ self, 0);
+@@ -2492,7 +2498,7 @@
+ g_signal_connect_object(selection, "changed",
+ G_CALLBACK(hildon_file_selection_selection_changed),
+ self, 0);
+-
++#ifdef USE_MAEMO_GTK
+ gtk_widget_tap_and_hold_setup(GTK_WIDGET(self->priv->dir_tree), NULL,
+ NULL, GTK_TAP_AND_HOLD_NONE | GTK_TAP_AND_HOLD_NO_INTERNALS);
+ g_signal_connect_object (self->priv->dir_tree, "tap-and-hold-query",
+@@ -2502,7 +2508,7 @@
+ G_CALLBACK
+ (hildon_file_selection_navigation_pane_context),
+ self, 0);
+-
++#endif /* USE_MAEMO_GTK */
+ g_signal_connect_object(self->priv->dir_tree, "key-press-event",
+ G_CALLBACK
+ (hildon_file_selection_on_navigation_pane_key), self, 0);
+--- /tmp/hildon-file-chooser-dialog.c 2007-10-02 10:14:05.000000000 +0200
++++ 1_1.9.41/hildon-fm/hildon-file-chooser-dialog.c 2007-10-02 11:33:43.132045000 +0200
+@@ -191,7 +191,7 @@
+
+ return (first_digit << 4) | second_digit;
+ }
+-
++#ifdef USE_MAEMO_GTK
+ static void chooser_entry_invalid_input_cb (GtkEntry *entry,
+ GtkInvalidInputType inv_type,
+ gpointer user_data)
+@@ -202,7 +202,7 @@
+ HCS("ckdg_ib_maximum_characters_reached"));
+ }
+ }
+-
++#endif /* USE_MAEMO_GTK */
+ static gchar *
+ g_unescape_uri_string (const char *escaped,
+ int len,
+@@ -1837,8 +1837,9 @@
+ G_PARAM_READWRITE);
+ g_object_class_install_property(gobject_class, PROP_SELECTION_MODE, pspec);
+
+-
++#ifdef USE_MAEMO_GTK
+ hildon_gtk_file_chooser_install_properties(gobject_class);
++#endif
+ }
+
+ static void hildon_file_chooser_dialog_sort_changed(GtkWidget * item,
+@@ -1975,10 +1976,10 @@
+ g_signal_connect( priv->entry_name, "changed",
+ G_CALLBACK( hildon_file_chooser_entry_changed ),
+ self );
+-
++#ifdef USE_MAEMO_GTK
+ g_signal_connect(priv->entry_name, "invalid-input",
+ G_CALLBACK(chooser_entry_invalid_input_cb), self);
+-
++#endif /* USE_MAEMO_GTK */
+ priv->hbox_location = gtk_hbox_new(FALSE, HILDON_MARGIN_DEFAULT);
+ priv->hbox_items = gtk_hbox_new(FALSE, HILDON_MARGIN_DEFAULT);
+ priv->image_location = gtk_image_new();
============================================================
--- packages/maemo3/libhildonfm_1.9.41.bb 28bd888a778dcd453876624cbdc43e8650ebcd59
+++ packages/maemo3/libhildonfm_1.9.41.bb 28bd888a778dcd453876624cbdc43e8650ebcd59
@@ -0,0 +1,29 @@
+LICENSE = "LGPL"
+DESCRIPTION = "Nokia hildon filemanager library"
+
+DEPENDS = "hildon-thumbnail mce-dev libhildonmime osso-gwconnect hildon-libs osso-thumbnail"
+
+PR = "r0"
+
+SRC_URI = "http://repository.maemo.org/pool/sardine/main/source/libh/libhildonfm/libhildonfm_${PV}.tar.gz \
+ file://hildonfm-ifdef-maemogtk.diff;patch=1 \
+ "
+
+inherit autotools pkgconfig lib_package
+
+S = "${WORKDIR}/1_${PV}"
+
+do_configure_prepend() {
+ # remove Werror from OSSO_CFLAGS
+ sed -i s:-Werror::g configure.ac
+ touch gtk-doc.make
+}
+
+
+PARALLEL_MAKE = ""
+
+do_stage() {
+ autotools_stage_all
+}
+
+
============================================================
--- packages/mtd/mtd-utils-tests_1.0.0+git.bb 03523cf6fd286f903f70fec99e153ed50f356c6d
+++ packages/mtd/mtd-utils-tests_1.0.0+git.bb 03523cf6fd286f903f70fec99e153ed50f356c6d
@@ -0,0 +1,59 @@
+require mtd-utils_1.0.0+git.bb
+
+# this can probably be integrated into the main mtd-utils package
+# but I did not want to risk breakage -- but would be glad to
+# integrate them if that is best -- cbrake
+
+SRC_URI = "git://git.infradead.org/mtd-utils.git;protocol=git;tag=${TAG}"
+
+PR = "r1"
+
+S = "${WORKDIR}/git/tests/fs-tests"
+
+FILES_${PN} = "${datadir}/mtd-utils"
+
+do_compile () {
+ make || die "Make failed"
+}
+
+do_stage () {
+}
+
+INHIBIT_PACKAGE_STRIP = "1"
+
+mtd_utils_tests = " \
+ help_all.sh \
+ run_all.sh \
+ integrity/integck \
+ simple/ftrunc \
+ simple/test_1 \
+ simple/test_2 \
+ stress/stress00.sh \
+ stress/stress01.sh \
+ stress/atoms/fwrite00 \
+ stress/atoms/gcd_hupper \
+ stress/atoms/pdfrun \
+ stress/atoms/rmdir00 \
+ stress/atoms/rndrm00 \
+ stress/atoms/rndrm99 \
+ stress/atoms/rndwrite00 \
+ stress/atoms/stress_1 \
+ stress/atoms/stress_2 \
+ stress/atoms/stress_3 \
+ utils/free_space \
+ utils/fstest_monitor \
+ "
+
+do_install () {
+ install -d ${D}${datadir}/mtd-utils/tests
+ install -d ${D}${datadir}/mtd-utils/tests/integrity
+ install -d ${D}${datadir}/mtd-utils/tests/simple
+ install -d ${D}${datadir}/mtd-utils/tests/stress
+ install -d ${D}${datadir}/mtd-utils/tests/stress/atoms
+ install -d ${D}${datadir}/mtd-utils/tests/utils
+ for app in ${mtd_utils_tests}; do
+ install -m 0755 $app ${D}${datadir}/mtd-utils/tests/$app
+ done
+}
+
+
============================================================
--- conf/distro/include/sane-srcrevs.inc 17f28a36948bf26950e4e783b1b5935187bfe68d
+++ conf/distro/include/sane-srcrevs.inc 5d252a434632ec2bd023dab3ea432972270f3467
@@ -17,12 +17,12 @@ SRCREV_pn-gnuradio ?= "6377"
SRCREV_pn-fstests ?= "204"
SRCREV_pn-gconf-dbus ?= "606"
SRCREV_pn-gnuradio ?= "6377"
-SRCREV_pn-hildon-1 ?= "13708"
+SRCREV_pn-hildon-1 ?= "14173"
SRCREV_pn-libgsmd ?= "2957"
SRCREV_pn-libmokogsmd2 ?= "2950"
SRCREV_pn-libmokojournal2 ?= "2780"
SRCREV_pn-libmokopanelui2 ?= "2958"
-SRCREV_pn-libmokoui2 ?= "3053"
+SRCREV_pn-libmokoui2 ?= "3064"
SRCREV_pn-libowl ?= "277"
SRCREV_pn-libxosd ?= "627"
SRCREV_pn-linux-hackndev-2.6 ?= "1308"
@@ -47,9 +47,9 @@ SRCREV_pn-openmoko-contacts ?= "2298"
SRCREV_pn-openmoko-common ?= "397"
SRCREV_pn-openmoko-common2 ?= "2679"
SRCREV_pn-openmoko-contacts ?= "2298"
-SRCREV_pn-openmoko-contacts2 ?= "335"
+SRCREV_pn-openmoko-contacts2 ?= "350"
SRCREV_pn-openmoko-dates ?= "467"
-SRCREV_pn-openmoko-dates2 ?= "563"
+SRCREV_pn-openmoko-dates2 ?= "617"
SRCREV_pn-openmoko-dialer ?= "2811"
SRCREV_pn-openmoko-dialer2 ?= "2976"
SRCREV_pn-openmoko-feedreader2 ?= "3060"
@@ -57,11 +57,11 @@ SRCREV_pn-openmoko-icon-theme-standard ?
SRCREV_pn-openmoko-firststart2 ?= "2873"
SRCREV_pn-openmoko-footer ?= "2354"
SRCREV_pn-openmoko-icon-theme-standard ?= "2232"
-SRCREV_pn-openmoko-icon-theme-standard2 ?= "3055"
-SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "2967"
+SRCREV_pn-openmoko-icon-theme-standard2 ?= "3066"
+SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "3066"
SRCREV_pn-openmoko-keyboard ?= "1631"
SRCREV_pn-openmoko-libs ?= "2367"
-SRCREV_pn-openmoko-mediaplayer2 ?= "2952"
+SRCREV_pn-openmoko-mediaplayer2 ?= "3057"
SRCREV_pn-openmoko-messages ?= "2276"
SRCREV_pn-openmoko-panel-battery ?= "2897"
SRCREV_pn-openmoko-panel-bt ?= "2896"
@@ -79,14 +79,14 @@ SRCREV_pn-openmoko-tasks ?= "320"
SRCREV_pn-openmoko-stylus-demo-simple ?= "1818"
SRCREV_pn-openmoko-taskmanager ?= "1663"
SRCREV_pn-openmoko-tasks ?= "320"
-SRCREV_pn-openmoko-tasks2 ?= "320"
+SRCREV_pn-openmoko-tasks2 ?= "343"
SRCREV_pn-openmoko-terminal2 ?= "2972"
SRCREV_pn-openmoko-theme-standard ?= "2370"
SRCREV_pn-openmoko-theme-standard-qvga ?= "2370"
-SRCREV_pn-openmoko-theme-standard2 ?= "2964"
+SRCREV_pn-openmoko-theme-standard2 ?= "3044"
SRCREV_pn-openmoko-theme-standard2-qvga ?= "2964"
SRCREV_pn-openmoko-today ?= "3056"
-SRCREV_pn-openmoko-today2 ?= "2955"
+SRCREV_pn-openmoko-today2 ?= "3056"
SRCREV_pn-openmoko-today2-folders ?= "2680"
SRCREV_pn-openocd ?= "206"
SRCREV_pn-openocd-native ?= "206"
============================================================
--- conf/machine/htcblueangel.conf e65ecf996a1d84af3f34a86f70afe617dec9e302
+++ conf/machine/htcblueangel.conf 0c19233d7062948ae1fec57ba52f8627716d1dd2
@@ -21,7 +21,6 @@ PREFERRED_PROVIDER_virtual/kernel = "lin
# Software/packages selection
#
PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
-PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.19-hh8"
PCMCIA_MANAGER = "pcmciautils"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
============================================================
--- conf/machine/hx4700.conf ff48628632c761276f1e19ddd62582b88b0b19ef
+++ conf/machine/hx4700.conf 8bd11bb54cb42e00dabf0bf4bdd4387aced4c0a5
@@ -30,7 +30,6 @@ XSERVER = "xserver-kdrive-w100"
MODUTILS = "26"
XSERVER = "xserver-kdrive-w100"
-PREFERRED_VERSION_xserver-kdrive = "1.2.0"
PREFERRED_VERSION_orinoco-modules = "0.15rc1"
============================================================
--- packages/atk/atk_1.19.3.bb 656b768718fa0fb3c29376f5b6d2cecb01f2f4c1
+++ packages/atk/atk_1.19.3.bb e94d8f3fd021065300ad78c840ea3acacdb490d8
@@ -1,7 +1,5 @@ require atk.inc
require atk.inc
-DEFAULT_PREFERENCE = "-1"
-
SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/atk/1.19/atk-${PV}.tar.bz2"
do_stage () {
============================================================
--- packages/fontconfig/fontconfig_2.4.1.bb 868e4f599ca1566fbb69670fe3438b55be3102e1
+++ packages/fontconfig/fontconfig_2.4.1.bb 72b20501701af3510e5f8a1d9644dd7748b52169
@@ -1,12 +1,12 @@ DEPENDS = "expat freetype freetype-nativ
SECTION = "libs"
LICENSE = "BSD"
DESCRIPTION = "A library for configuring and customizing font access."
DEPENDS = "expat freetype freetype-native zlib"
-SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz"
+SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \
+ https://stage.maemo.org/svn/maemo/projects/haf/trunk/fontconfig/device_symbols.h"
+PR = "r1"
-PR = "r0"
-
PACKAGES =+ "fontconfig-utils-dbg fontconfig-utils "
FILES_fontconfig-utils-dbg = "${bindir}/*.dbg"
FILES_fontconfig-utils = "${bindir}/*"
@@ -39,6 +39,7 @@ do_stage () {
}
do_stage () {
+ cp ${WORKDIR}/device_symbols.h ${S}/fontconfig/
oe_libinstall -so -a -C src libfontconfig ${STAGING_LIBDIR}
install -d ${STAGING_INCDIR}/fontconfig
for i in ${S}/fontconfig/*.h; do install -m 0644 $i ${STAGING_INCDIR}/fontconfig/; done
============================================================
--- packages/gtk+/gtk-2.10.inc 2047151920b91f2368752f4cc49b73a3992106a0
+++ packages/gtk+/gtk-2.10.inc 162cf297e438ae9441b397783b38eb85d188382d
@@ -52,7 +52,8 @@ do_stage () {
mkdir -p ${STAGING_LIBDIR}/gtk-2.0/include
install -m 0644 gdk/gdkconfig.h ${STAGING_LIBDIR}/gtk-2.0/include/gdkconfig.h
-
+ # Copy over all headers, since the maemo stuff needs access to the private api. *sigh*
+ cp gtk/*.h ${STAGING_INCDIR}/gtk-2.0/gtk/
install -m 0644 m4macros/gtk-2.0.m4 ${STAGING_DATADIR}/aclocal/
}
=========%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list