[oe-commits] org.oe.dev merge of '93e88a1c0fbbb69dbad706857468d431d612b9c9'
pb commit
oe at amethyst.openembedded.net
Mon Sep 1 17:47:28 UTC 2008
merge of '93e88a1c0fbbb69dbad706857468d431d612b9c9'
and 'f7aee16bb45052647fd1a8b8b1d5617ec91b95a9'
Author: pb at openembedded.org
Branch: org.openembedded.dev
Revision: 73170af476006d016ba876d29a5bc2f845921d05
ViewMTN: http://monotone.openembedded.org/revision/info/73170af476006d016ba876d29a5bc2f845921d05
Files:
1
packages/libstroke
packages/libstroke/libstroke-0.5.1
packages/libstroke/libstroke-0.5.1/Makefile.am.patch
packages/libstroke/libstroke-0.5.1/configure.in.patch
packages/libstroke/libstroke-0.5.1/libgstroke-Makefile.am.patch
packages/libstroke/libstroke-0.5.1/libstroke-Makefile.am.patch
packages/libstroke/libstroke-0.5.1/tests-Makefile.am.patch
packages/libstroke/libstroke_0.5.1.bb
packages/lrzsz/lrzsz_0.12.20.bb
packages/qt4/qt-embedded-4.4.0
packages/qt4/qt-embedded-4.4.1
packages/qt4/qt-embedded_4.4.0.bb
packages/qt4/qt-embedded_4.4.1.bb
packages/qt4/qt4-x11-free-4.4.0
packages/qt4/qt4-x11-free-4.4.1
packages/qt4/qt4-x11-free_4.4.0.bb
packages/qt4/qt4-x11-free_4.4.1.bb
packages/qt4/qtopia-core_4.4.0.bb
packages/qt4/qtopia-core_4.4.1.bb
packages/oneko
packages/oneko/files
packages/otpcalc
packages/otpcalc/otpcalc-0.97
packages/expat/expat-1.95.7/expat-XMLCALL.patch
packages/oneko/files/kill-oneko.desktop
packages/oneko/files/kill-oneko.png
packages/oneko/files/oneko.desktop
packages/oneko/files/oneko.png
packages/oneko/files/remove-bsd-daemon-logo.patch
packages/oneko/oneko_1.2.sakura.5.bb
packages/otpcalc/otpcalc-0.97/otpcalc-0.97-badindex.diff
packages/otpcalc/otpcalc-0.97/otpcalc-0.97-gtk2-gentoo.patch
packages/otpcalc/otpcalc-0.97/otpcalc-crypto-proto.diff
packages/otpcalc/otpcalc-0.97/otpcalc-man-table-format.diff
packages/otpcalc/otpcalc_0.97.bb
packages/tangogps/tangogps_0.9.2.bb
packages/busybox/busybox-static_1.2.1.bb
packages/busybox/busybox.inc
packages/busybox/busybox_1.11.1.bb
packages/busybox/busybox_1.2.1.bb
packages/busybox/busybox_1.2.2.bb
packages/busybox/busybox_1.3.1.bb
packages/busybox/busybox_1.7.2.bb
packages/busybox/busybox_1.9.2.bb
packages/busybox/slingbox_1.3.1.bb
packages/eglibc/eglibc.inc
packages/eglibc/eglibc_svn.bb
packages/expat/expat_1.95.7.bb
packages/gcc/gcc-cross-intermediate.inc
packages/glibc/glibc.inc
packages/glibc/glibc_2.2.5.bb
packages/glibc/glibc_2.3.2+cvs20040726.bb
packages/glibc/glibc_2.3.2.bb
packages/glibc/glibc_2.3.3+cvs20041128.bb
packages/glibc/glibc_2.3.3+cvs20050221.bb
packages/glibc/glibc_2.3.3+cvs20050420.bb
packages/glibc/glibc_2.3.3.bb
packages/glibc/glibc_2.3.5+cvs20050627.bb
packages/glibc/glibc_2.3.6.bb
packages/glibc/glibc_2.4.bb
packages/glibc/glibc_2.5.bb
packages/glibc/glibc_2.6.1.bb
packages/glibc/glibc_2.7.bb
packages/glibc/glibc_cvs.bb
packages/gpe-scap/gpe-scap_1.3.bb
packages/qt4/qt-embedded-4.4.1/0001-cross-compile.patch
packages/qt4/qt4-x11-free-4.4.1/0001-cross-compile.patch
packages/tangogps/tangogps.inc
packages/tangogps/tangogps_0.9.0.3.bb
mtn:manual_merge
true
Diffs:
#
# mt diff -r93e88a1c0fbbb69dbad706857468d431d612b9c9 -r73170af476006d016ba876d29a5bc2f845921d05
#
#
#
# add_dir "packages/libstroke"
#
# add_dir "packages/libstroke/libstroke-0.5.1"
#
# add_file "packages/libstroke/libstroke-0.5.1/Makefile.am.patch"
# content [0d31c2b4f24d24091f8db2e809984aae7c05630d]
#
# add_file "packages/libstroke/libstroke-0.5.1/configure.in.patch"
# content [ad7c4997bb5340e40d976a7b8b6e79d9215d46e6]
#
# add_file "packages/libstroke/libstroke-0.5.1/libgstroke-Makefile.am.patch"
# content [a0c3bd9e894650475ba3049b0ef3d7f9580c203d]
#
# add_file "packages/libstroke/libstroke-0.5.1/libstroke-Makefile.am.patch"
# content [ee5a3635c31dba00b070a942c512cc0d53056188]
#
# add_file "packages/libstroke/libstroke-0.5.1/tests-Makefile.am.patch"
# content [d024749d2025c6654cc32246b047cf903d6fafb8]
#
# add_file "packages/libstroke/libstroke_0.5.1.bb"
# content [0e5d2b9d0b97f55f25927f7f47ea298d989e6e13]
#
# patch "packages/lrzsz/lrzsz_0.12.20.bb"
# from [4c771d259843948276398299a1a208d819a6a46b]
# to [11d3eb1494638e5f3c2f31b24709140d2c564353]
#
============================================================
--- packages/libstroke/libstroke-0.5.1/Makefile.am.patch 0d31c2b4f24d24091f8db2e809984aae7c05630d
+++ packages/libstroke/libstroke-0.5.1/Makefile.am.patch 0d31c2b4f24d24091f8db2e809984aae7c05630d
@@ -0,0 +1,11 @@
+--- libstroke-0.5.1/Makefile.am.orig 2008-06-11 14:10:49.000000000 +0400
++++ libstroke-0.5.1/Makefile.am 2008-06-11 14:12:06.000000000 +0400
+@@ -5,7 +5,7 @@
+ GSTROKE_SUBDS =
+ endif
+
+-SUBDIRS = libstroke $(GSTROKE_SUBDS) tests doc javastroke
++SUBDIRS = libstroke $(GSTROKE_SUBDS) doc
+
+ EXTRA_DIST = COPYRIGHT CREDITS README.javastroke README.libgstroke
+
============================================================
--- packages/libstroke/libstroke-0.5.1/configure.in.patch ad7c4997bb5340e40d976a7b8b6e79d9215d46e6
+++ packages/libstroke/libstroke-0.5.1/configure.in.patch ad7c4997bb5340e40d976a7b8b6e79d9215d46e6
@@ -0,0 +1,24 @@
+--- libstroke-0.5.1/configure.in.orig 2008-06-11 12:54:29.000000000 +0400
++++ libstroke-0.5.1/configure.in 2008-06-11 12:54:35.000000000 +0400
+@@ -83,14 +83,14 @@
+
+ dnl check for GTK
+ dnl we won't build libgstroke if it's not found
+-AC_MSG_CHECKING(gtk+ library)
+-AM_PATH_GTK(1.2.7, HAVE_LIBGTK=yes
+- AC_DEFINE(HAVE_LIBGTK, 1, [Define if libgtk is available]),
+- AC_MSG_WARN(
+-***** NOTE: The GNOME stroke support won't be built
+-)
++dnl AC_MSG_CHECKING(gtk+ library)
++dnl AM_PATH_GTK(1.2.7, HAVE_LIBGTK=yes
++dnl AC_DEFINE(HAVE_LIBGTK, 1, [Define if libgtk is available]),
++dnl AC_MSG_WARN(
++dnl ***** NOTE: The GNOME stroke support won't be built
++dnl )
+ HAVE_LIBGTK=no,
+-)
++dnl )
+ AM_CONDITIONAL(HAVE_LIBGTK, test "x$HAVE_LIBGTK" = "xyes")
+
+
============================================================
--- packages/libstroke/libstroke-0.5.1/libgstroke-Makefile.am.patch a0c3bd9e894650475ba3049b0ef3d7f9580c203d
+++ packages/libstroke/libstroke-0.5.1/libgstroke-Makefile.am.patch a0c3bd9e894650475ba3049b0ef3d7f9580c203d
@@ -0,0 +1,11 @@
+--- libstroke-0.5.1/libgstroke/Makefile.am.orig 2008-06-11 13:01:29.000000000 +0400
++++ libstroke-0.5.1/libgstroke/Makefile.am 2008-06-11 13:01:44.000000000 +0400
+@@ -21,7 +21,7 @@
+ INCLUDES = @GTK_CFLAGS@
+ LDADD = @GTK_LIBS@
+
+-EXTRA_DIST =
++#EXTRA_DIST =
+
+ MOSTLYCLEANFILES = core *~
+ CLEANFILES = core *~
============================================================
--- packages/libstroke/libstroke-0.5.1/libstroke-Makefile.am.patch ee5a3635c31dba00b070a942c512cc0d53056188
+++ packages/libstroke/libstroke-0.5.1/libstroke-Makefile.am.patch ee5a3635c31dba00b070a942c512cc0d53056188
@@ -0,0 +1,15 @@
+--- libstroke-0.5.1/libstroke/Makefile.am.orig 2008-06-11 13:01:54.000000000 +0400
++++ libstroke-0.5.1/libstroke/Makefile.am 2008-06-11 13:02:02.000000000 +0400
+@@ -5,10 +5,10 @@
+ # level Makefile.
+ AUTOMAKE_OPTIONS = foreign
+
+-EXTRA_DIST =
++#EXTRA_DIST =
+
+ #tclpath::
+- #echo ${ENABLE_TCL}
++# echo ${ENABLE_TCL}
+
+ #if ENABLE_TCL
+ #SEL_BIB = libstroke.la libstroke_tcl.la
============================================================
--- packages/libstroke/libstroke-0.5.1/tests-Makefile.am.patch d024749d2025c6654cc32246b047cf903d6fafb8
+++ packages/libstroke/libstroke-0.5.1/tests-Makefile.am.patch d024749d2025c6654cc32246b047cf903d6fafb8
@@ -0,0 +1,15 @@
+--- libstroke-0.5.1/tests/Makefile.am.orig 2008-06-11 13:46:40.000000000 +0400
++++ libstroke-0.5.1/tests/Makefile.am 2008-06-11 13:47:23.000000000 +0400
+@@ -14,7 +14,11 @@
+ gnome_stroke_test_SOURCES = gnome_stroke_test.c
+
+ INCLUDES = -I$(top_srcdir)/libstroke -I$(top_srcdir)/libgstroke \
+- @X_CFLAGS@ @GTK_CFLAGS@
++ @X_CFLAGS@
++
++if HAVE_LIBGTK
++INCLUDES += @GTK_CFLAGS@
++endif
+
+ stroke_test_LDADD = ../libstroke/libstroke.la @X_LDFLAGS@
+ gnome_stroke_test_LDADD = ../libgstroke/libgstroke.la @GTK_LIBS@
============================================================
--- packages/libstroke/libstroke_0.5.1.bb 0e5d2b9d0b97f55f25927f7f47ea298d989e6e13
+++ packages/libstroke/libstroke_0.5.1.bb 0e5d2b9d0b97f55f25927f7f47ea298d989e6e13
@@ -0,0 +1,20 @@
+DESCRIPTION = "LibStroke - a stroke translation library"
+LICENSE = "GPL"
+SECTION = "x11"
+PRIORITY = "optional"
+#DEPENDS = "virtual/libx11 libxau libxdmcp"
+DEPENDS = "virtual/libx11"
+
+SRC_URI = "http://www.etla.net/libstroke/${P}.tar.gz \
+ file://configure.in.patch;patch=1 \
+ file://libstroke-Makefile.am.patch;patch=1 \
+ file://tests-Makefile.am.patch;patch=1 \
+ "
+# file://Makefile.am.patch;patch=1 \
+# file://libgstroke-Makefile.am.patch;patch=1 \
+
+inherit autotools pkgconfig
+
+do_stage () {
+ autotools_stage_all
+}
============================================================
--- packages/lrzsz/lrzsz_0.12.20.bb 4c771d259843948276398299a1a208d819a6a46b
+++ packages/lrzsz/lrzsz_0.12.20.bb 11d3eb1494638e5f3c2f31b24709140d2c564353
@@ -3,7 +3,7 @@ DEPENDS = ""
PRIORITY = "standard"
DESCRIPTION = "Tools for zmodem/xmodem/ymodem file transfer"
DEPENDS = ""
-PR = "r3"
+PR = "r4"
SRC_URI = "http://www.ohse.de/uwe/releases/lrzsz-${PV}.tar.gz \
file://autotools.patch;patch=1 \
@@ -18,13 +18,19 @@ pkg_postinst() {
}
pkg_postinst() {
- for util in rz rx rb sz sx sb; do
+ for util in rz rx rb; do
update-alternatives --install ${bindir}/$util $util lrz 100
done
+ for util in sz sx sb; do
+ update-alternatives --install ${bindir}/$util $util lsz 100
+ done
}
pkg_postrm() {
- for util in rz rx rb sz sx sb; do
+ for util in rz rx rb; do
update-alternatives --remove $util ${bindir}/lrz
done
+ for util in sz sx sb; do
+ update-alternatives --remove $util ${bindir}/lsz
+ done
}
#
# mt diff -rf7aee16bb45052647fd1a8b8b1d5617ec91b95a9 -r73170af476006d016ba876d29a5bc2f845921d05
#
#
#
# rename "packages/qt4/qt-embedded-4.4.0"
# to "packages/qt4/qt-embedded-4.4.1"
#
# rename "packages/qt4/qt-embedded_4.4.0.bb"
# to "packages/qt4/qt-embedded_4.4.1.bb"
#
# rename "packages/qt4/qt4-x11-free-4.4.0"
# to "packages/qt4/qt4-x11-free-4.4.1"
#
# rename "packages/qt4/qt4-x11-free_4.4.0.bb"
# to "packages/qt4/qt4-x11-free_4.4.1.bb"
#
# rename "packages/qt4/qtopia-core_4.4.0.bb"
# to "packages/qt4/qtopia-core_4.4.1.bb"
#
# add_dir "packages/oneko"
#
# add_dir "packages/oneko/files"
#
# add_dir "packages/otpcalc"
#
# add_dir "packages/otpcalc/otpcalc-0.97"
#
# add_file "packages/expat/expat-1.95.7/expat-XMLCALL.patch"
# content [e07a8ca785a8e34a2046a9e1c6c149678c075099]
#
# add_file "packages/oneko/files/kill-oneko.desktop"
# content [2fa782d089cd8f2121ae60742ac13793c4041a20]
#
# add_file "packages/oneko/files/kill-oneko.png"
# content [1c94357d588d63dd474a71dbd86ef9606ecf3751]
#
# add_file "packages/oneko/files/oneko.desktop"
# content [96d1336cfe351e712695858358c6f3d01dc6e721]
#
# add_file "packages/oneko/files/oneko.png"
# content [e6cc5d212650ea950afb752915abe8e68b8d25bb]
#
# add_file "packages/oneko/files/remove-bsd-daemon-logo.patch"
# content [c240a8b42d97b6f52c7900612a92d934072965bc]
#
# add_file "packages/oneko/oneko_1.2.sakura.5.bb"
# content [7325cfcdad50c65cbe9090aef455595901932292]
#
# add_file "packages/otpcalc/otpcalc-0.97/otpcalc-0.97-badindex.diff"
# content [75eac280bcd42ed4625ece67690914edc77f3e58]
#
# add_file "packages/otpcalc/otpcalc-0.97/otpcalc-0.97-gtk2-gentoo.patch"
# content [6e3cd7c4f32aded93700bb02b6788905deb3a3a2]
#
# add_file "packages/otpcalc/otpcalc-0.97/otpcalc-crypto-proto.diff"
# content [ed720a3bbb91a3c653f101822388b68b6c41e3cf]
#
# add_file "packages/otpcalc/otpcalc-0.97/otpcalc-man-table-format.diff"
# content [af22a96fed2718c7ecfdfd19d7eb3efe832dd945]
#
# add_file "packages/otpcalc/otpcalc_0.97.bb"
# content [53c0c060006d6a65c1ca1f03f90de81b52b1ffd9]
#
# add_file "packages/tangogps/tangogps_0.9.2.bb"
# content [b8a8a504b548a56537cb3607687bfd6248a4cbb5]
#
# patch "packages/busybox/busybox-static_1.2.1.bb"
# from [964734881c9c473a4514d47484b493b41dfd98c8]
# to [c32c52c7c5bcb9d533c69cd98af6f1a918b8f81d]
#
# patch "packages/busybox/busybox.inc"
# from [e17706ff0f8357569cffa7704fe0c16990b62121]
# to [99fe4e1235f3e8d6f57649a3b0c84a1fd120d775]
#
# patch "packages/busybox/busybox_1.11.1.bb"
# from [e55447ddfd5f9bcfbaa83e05a77b4079037f4649]
# to [5f76d90d00b196b8def5acc8f2fafcd8bf4aab8d]
#
# patch "packages/busybox/busybox_1.2.1.bb"
# from [ed6ba775d0a82f9355ab82f0adfc2a97c840c9d7]
# to [e948db887d57d3fe7353eb349f027afbea9bb373]
#
# patch "packages/busybox/busybox_1.2.2.bb"
# from [aabc3559e3dbf6202246fa76ec81735688a94a39]
# to [fc9adccf12695a63a446e7d9856e79032bf81d56]
#
# patch "packages/busybox/busybox_1.3.1.bb"
# from [796375007e59d3356bee97868ee4a9484607272b]
# to [5e499f83328550beac68463baaa84a6f1fabef58]
#
# patch "packages/busybox/busybox_1.7.2.bb"
# from [61b05f11ad827e5fe65f8b8140b7933dd41d915b]
# to [61a905bc6c00b1a8212ad0482f9f929c7b664184]
#
# patch "packages/busybox/busybox_1.9.2.bb"
# from [a3a8f0f9c2f172464f5e3746ae507d0845fd473f]
# to [d57bfa894a3e0caf97bd34c841fbe24ab3b167fd]
#
# patch "packages/busybox/slingbox_1.3.1.bb"
# from [f78be6906d6bb6a58789c13ef0e1593450784152]
# to [7f1f87ae505480c02d92987b2ae97787be32db18]
#
# patch "packages/eglibc/eglibc.inc"
# from [08b9b1f3b71d0ea992ad8a5b349c51348b11f917]
# to [b63e688acb3b4c647d0e8d4107b5534b4c325bb9]
#
# patch "packages/eglibc/eglibc_svn.bb"
# from [17bc96153f4c89522834fb62626b509064db5c9f]
# to [175848d8e38b548d456707101f14158a0aef0c9f]
#
# patch "packages/expat/expat_1.95.7.bb"
# from [b363541991ae6ef17a3b808ae6aca538792d0e86]
# to [4f7e003b18ab3fdac5996dea79ad59280959c533]
#
# patch "packages/gcc/gcc-cross-intermediate.inc"
# from [3fd758b824b19229a3f6e7df95246f0d382bc7ea]
# to [f9fd7b7bd527b6a3bd2760f51051b083e23cfc8d]
#
# patch "packages/glibc/glibc.inc"
# from [927e40aea451df01896552dc6d4aeafb51256604]
# to [616d34fb71075168d558a2c23652b0847b62e379]
#
# patch "packages/glibc/glibc_2.2.5.bb"
# from [ba51bec78b675855eb7116970581ad0dfdcdb96d]
# to [977307ad86a4d08e111fe20347de026e2ea0240f]
#
# patch "packages/glibc/glibc_2.3.2+cvs20040726.bb"
# from [a32da8f1be170e6519b62b6293fb148aeb82115a]
# to [57c46b4138a561db517e401f964a383cb7264da6]
#
# patch "packages/glibc/glibc_2.3.2.bb"
# from [4f6b05a32c535fce34cdba7e735283f3df97cc25]
# to [712d4e8a0c79d9f1d1046e8c2f1ac0443f3a1c01]
#
# patch "packages/glibc/glibc_2.3.3+cvs20041128.bb"
# from [df07870e2108f0e1f8052678a72335e56f8fd9aa]
# to [2100cd4883f247821514a1a1bbc1097ddf5e56ac]
#
# patch "packages/glibc/glibc_2.3.3+cvs20050221.bb"
# from [a952adc9414b47b8206832f0d75d585c3e43fbe2]
# to [580e95687b174a0e82711332575e2b3e75f11922]
#
# patch "packages/glibc/glibc_2.3.3+cvs20050420.bb"
# from [ba380ebe857f50552686909fcd13bbcef6f79539]
# to [2d618404bbf66b0c82d29ba1068fc61e4dae8c3e]
#
# patch "packages/glibc/glibc_2.3.3.bb"
# from [8e9b799b018652d09ef1fc4f2b4b6be852cf6d27]
# to [056f8f59b965ad32152cd543d185284dae6fc45e]
#
# patch "packages/glibc/glibc_2.3.5+cvs20050627.bb"
# from [08d38bef97b465bdbbd9988c3d75ff83cf44f0f2]
# to [897918d6077f8b2a3aed92dbda0adbb3958d2a30]
#
# patch "packages/glibc/glibc_2.3.6.bb"
# from [fab77d02c64d34ef4ef3c628ae712ad0135f0e51]
# to [b4091984d04a099c1dc19a92f029d78daa37824a]
#
# patch "packages/glibc/glibc_2.4.bb"
# from [f68ade6f61a11d4095c2ba68793e93ff94386717]
# to [ca1c1e1eb83235e2490efc63381e20537e48092b]
#
# patch "packages/glibc/glibc_2.5.bb"
# from [f6b52e6b6d1513de5433a1a2c19635a6be187917]
# to [28f2f9a3a57828b85bdecaf06acd329fee9c0b86]
#
# patch "packages/glibc/glibc_2.6.1.bb"
# from [99f15a0f7f70175af2348206ce4d9af3cbd90e4c]
# to [77cf632ae1fc1464c20204d36e370aa655ffa09a]
#
# patch "packages/glibc/glibc_2.7.bb"
# from [1af6eb49cf20c7ff14c284e68d6b956d049ca292]
# to [e91e43390c8241eaa333acc59cfd49359d7979fe]
#
# patch "packages/glibc/glibc_cvs.bb"
# from [0b88b80c48ad29d479a89c81290ce09e7a009b13]
# to [102b99ab5ea2ce6a348a4ae833c77880609f5412]
#
# patch "packages/gpe-scap/gpe-scap_1.3.bb"
# from [73e961b984f8eaea1c3a6678341b1484dd688c22]
# to [bba29c02e98ae96df9d5ff3e90e336d8b1814d22]
#
# patch "packages/qt4/qt-embedded-4.4.1/0001-cross-compile.patch"
# from [2efe9cfa1a60cd53e732b11c53b902203fd7049c]
# to [26d8a55edd82f434fd9c5dad007ac1e833f1cbb5]
#
# patch "packages/qt4/qt-embedded_4.4.1.bb"
# from [b18569128b0fbec67fb005585e346a2e604cf533]
# to [459a2f77d308beb98a0a3259ec15a4cfa47968f9]
#
# patch "packages/qt4/qt4-x11-free-4.4.1/0001-cross-compile.patch"
# from [2efe9cfa1a60cd53e732b11c53b902203fd7049c]
# to [26d8a55edd82f434fd9c5dad007ac1e833f1cbb5]
#
# patch "packages/qt4/qtopia-core_4.4.1.bb"
# from [1bd65f7336a5b9896b56d4d721d8dec8bcf8129a]
# to [35c0f0cd78346ba1b921705dc2d93c32a3ec463d]
#
# patch "packages/tangogps/tangogps.inc"
# from [97b25ecc7023d4936767623dc36d5816ad40d54b]
# to [de7d80f65e318ef9e683909557fcc644a5db46ab]
#
# patch "packages/tangogps/tangogps_0.9.0.3.bb"
# from [2b0676072dcb31c2e8e6893bc89f5d69d6011670]
# to [aa95ac32f06554fc4042e4edba0aa061a99b5b03]
#
# set "packages/oneko/files/kill-oneko.png"
# attr "mtn:manual_merge"
# value "true"
#
# set "packages/oneko/files/oneko.png"
# attr "mtn:manual_merge"
# value "true"
#
============================================================
--- packages/expat/expat-1.95.7/expat-XMLCALL.patch e07a8ca785a8e34a2046a9e1c6c149678c075099
+++ packages/expat/expat-1.95.7/expat-XMLCALL.patch e07a8ca785a8e34a2046a9e1c6c149678c075099
@@ -0,0 +1,17 @@
+---
+ lib/expat.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: expat-1.95.7/lib/expat.h
+===================================================================
+--- expat-1.95.7.orig/lib/expat.h 2008-07-31 15:56:39.000000000 -0700
++++ expat-1.95.7/lib/expat.h 2008-07-31 15:58:38.000000000 -0700
+@@ -45,7 +45,7 @@
+ #ifndef XMLCALL
+ #if defined(XML_USE_MSC_EXTENSIONS)
+ #define XMLCALL __cdecl
+-#elif defined(__GNUC__)
++#elif defined(__GNUC__) && defined(__i386) && !defined(__INTEL_COMPILER)
+ #define XMLCALL __attribute__((cdecl))
+ #else
+ /* For any platform which uses this definition and supports more than
============================================================
--- packages/oneko/files/kill-oneko.desktop 2fa782d089cd8f2121ae60742ac13793c4041a20
+++ packages/oneko/files/kill-oneko.desktop 2fa782d089cd8f2121ae60742ac13793c4041a20
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Kill oneko
+Comment=Kills cute cat chasing mouse cursor
+Icon=kill-oneko.png
+Exec=killall oneko
+Type=Application
+Categories=Game;Amusement;
+Terminal=false
+
============================================================
# packages/oneko/files/kill-oneko.png is binary
============================================================
--- packages/oneko/files/oneko.desktop 96d1336cfe351e712695858358c6f3d01dc6e721
+++ packages/oneko/files/oneko.desktop 96d1336cfe351e712695858358c6f3d01dc6e721
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Oneko
+Comment=Cute cat chasing around your mouse cursor.
+Icon=oneko.png
+Exec=/usr/bin/oneko
+Type=Application
+Categories=Game;Amusement;
+Terminal=false
+
============================================================
# packages/oneko/files/oneko.png is binary
============================================================
--- packages/oneko/files/remove-bsd-daemon-logo.patch c240a8b42d97b6f52c7900612a92d934072965bc
+++ packages/oneko/files/remove-bsd-daemon-logo.patch c240a8b42d97b6f52c7900612a92d934072965bc
@@ -0,0 +1,250 @@
+--- oneko-1.2.sakura.5.orig/cursors/cursor.include
++++ oneko-1.2.sakura.5/cursors/cursor.include
+@@ -2,8 +2,6 @@
+ #include "mouse_cursor_mask.xbm"
+ #include "bone_cursor.xbm"
+ #include "bone_cursor_mask.xbm"
+-#include "bsd_cursor.xbm"
+-#include "bsd_cursor_mask.xbm"
+ #include "card_cursor.xbm"
+ #include "card_cursor_mask.xbm"
+ #include "petal_cursor.xbm"
+--- oneko-1.2.sakura.5.orig/oneko.h
++++ oneko-1.2.sakura.5/oneko.h
+@@ -36,7 +36,6 @@
+ #include "bitmaps/neko/neko.include"
+ #include "bitmaps/tora/tora.include"
+ #include "bitmaps/dog/dog.include"
+-#include "bitmaps/bsd/bsd.include"
+ #include "bitmaps/sakura/sakura.include"
+ #include "bitmaps/tomoyo/tomoyo.include"
+
+@@ -44,7 +43,6 @@
+
+ #include "bitmasks/neko/neko.mask.include"
+ #include "bitmasks/dog/dog.mask.include"
+-#include "bitmasks/bsd/bsd.mask.include"
+ #include "bitmasks/sakura/sakura.mask.include"
+ #include "bitmasks/tomoyo/tomoyo.mask.include"
+
+--- oneko-1.2.sakura.5.orig/oneko.c
++++ oneko-1.2.sakura.5/oneko.c
+@@ -33,7 +33,7 @@
+
+ int Synchronous = False;
+ /* Types of animals */
+-#define BITMAPTYPES 6
++#define BITMAPTYPES 5
+ typedef struct _AnimalDefaults {
+ char *name;
+ int speed, idle, bitmap_width, bitmap_height;
+@@ -51,8 +51,6 @@
+ mouse_cursor_width,mouse_cursor_height, mouse_cursor_x_hot,mouse_cursor_y_hot },
+ { "dog" , 10, 6, 32, 32, 125000L, 0, 0, bone_cursor_bits,bone_cursor_mask_bits,
+ bone_cursor_width,bone_cursor_height, bone_cursor_x_hot,bone_cursor_y_hot },
+- { "bsd_daemon" , 16, 6, 32, 32, 300000L, 22, 20, bsd_cursor_bits,bsd_cursor_mask_bits,
+- bsd_cursor_width,bsd_cursor_height, bsd_cursor_x_hot,bsd_cursor_y_hot },
+ { "sakura" , 13, 6, 32, 32, 125000L, 0, 0, card_cursor_bits,card_cursor_mask_bits,
+ card_cursor_width,card_cursor_height, card_cursor_x_hot,card_cursor_y_hot },
+ { "tomoyo" , 10, 6, 32, 32, 125000L, 32, 32, petal_cursor_bits,petal_cursor_mask_bits,
+@@ -154,70 +152,70 @@
+
+ BitmapGCData BitmapGCDataTable[] =
+ {
+- { &Mati2GC, &Mati2Xbm, mati2_bits, mati2_tora_bits, mati2_dog_bits, mati2_bsd_bits, mati2_sakura_bits, mati2_tomoyo_bits,
+- &Mati2Msk, mati2_mask_bits, mati2_mask_bits, mati2_dog_mask_bits, mati2_bsd_mask_bits, mati2_sakura_mask_bits, mati2_tomoyo_mask_bits },
+- { &Jare2GC, &Jare2Xbm, jare2_bits, jare2_tora_bits, jare2_dog_bits, jare2_bsd_bits, jare2_sakura_bits, jare2_tomoyo_bits,
+- &Jare2Msk, jare2_mask_bits, jare2_mask_bits, jare2_dog_mask_bits, jare2_bsd_mask_bits, jare2_sakura_mask_bits, jare2_tomoyo_mask_bits },
+- { &Kaki1GC, &Kaki1Xbm, kaki1_bits, kaki1_tora_bits, kaki1_dog_bits, kaki1_bsd_bits, kaki1_sakura_bits, kaki1_tomoyo_bits,
+- &Kaki1Msk, kaki1_mask_bits, kaki1_mask_bits, kaki1_dog_mask_bits, kaki1_bsd_mask_bits, kaki1_sakura_mask_bits, kaki1_tomoyo_mask_bits },
+- { &Kaki2GC, &Kaki2Xbm, kaki2_bits, kaki2_tora_bits, kaki2_dog_bits, kaki2_bsd_bits, kaki2_sakura_bits, kaki2_tomoyo_bits,
+- &Kaki2Msk, kaki2_mask_bits, kaki2_mask_bits, kaki2_dog_mask_bits, kaki2_bsd_mask_bits, kaki2_sakura_mask_bits, kaki2_tomoyo_mask_bits },
+- { &Mati3GC, &Mati3Xbm, mati3_bits, mati3_tora_bits, mati3_dog_bits, mati3_bsd_bits, mati3_sakura_bits, mati3_tomoyo_bits,
+- &Mati3Msk, mati3_mask_bits, mati3_mask_bits, mati3_dog_mask_bits, mati3_bsd_mask_bits, mati3_sakura_mask_bits, mati3_tomoyo_mask_bits },
+- { &Sleep1GC, &Sleep1Xbm, sleep1_bits, sleep1_tora_bits, sleep1_dog_bits, sleep1_bsd_bits, sleep1_sakura_bits, sleep1_tomoyo_bits,
+- &Sleep1Msk, sleep1_mask_bits, sleep1_mask_bits, sleep1_dog_mask_bits, sleep1_bsd_mask_bits, sleep1_sakura_mask_bits, sleep1_tomoyo_mask_bits },
+- { &Sleep2GC, &Sleep2Xbm, sleep2_bits, sleep2_tora_bits, sleep2_dog_bits, sleep2_bsd_bits, sleep2_sakura_bits, sleep2_tomoyo_bits,
+- &Sleep2Msk, sleep2_mask_bits, sleep2_mask_bits, sleep2_dog_mask_bits, sleep2_bsd_mask_bits, sleep2_sakura_mask_bits, sleep2_tomoyo_mask_bits },
+- { &AwakeGC, &AwakeXbm, awake_bits, awake_tora_bits, awake_dog_bits, awake_bsd_bits, awake_sakura_bits, awake_tomoyo_bits,
+- &AwakeMsk, awake_mask_bits, awake_mask_bits, awake_dog_mask_bits, awake_bsd_mask_bits, awake_sakura_mask_bits, awake_tomoyo_mask_bits },
+- { &Up1GC, &Up1Xbm, up1_bits, up1_tora_bits, up1_dog_bits, up1_bsd_bits, up1_sakura_bits, up1_tomoyo_bits,
+- &Up1Msk, up1_mask_bits, up1_mask_bits, up1_dog_mask_bits, up1_bsd_mask_bits, up1_sakura_mask_bits, up1_tomoyo_mask_bits },
+- { &Up2GC, &Up2Xbm, up2_bits, up2_tora_bits, up2_dog_bits, up2_bsd_bits, up2_sakura_bits, up2_tomoyo_bits,
+- &Up2Msk, up2_mask_bits, up2_mask_bits, up2_dog_mask_bits, up2_bsd_mask_bits, up2_sakura_mask_bits, up2_tomoyo_mask_bits },
+- { &Down1GC, &Down1Xbm, down1_bits, down1_tora_bits, down1_dog_bits, down1_bsd_bits, down1_sakura_bits, down1_tomoyo_bits,
+- &Down1Msk, down1_mask_bits, down1_mask_bits, down1_dog_mask_bits, down1_bsd_mask_bits, down1_sakura_mask_bits, down1_tomoyo_mask_bits },
+- { &Down2GC, &Down2Xbm, down2_bits, down2_tora_bits, down2_dog_bits, down2_bsd_bits, down2_sakura_bits, down2_tomoyo_bits,
+- &Down2Msk, down2_mask_bits, down2_mask_bits, down2_dog_mask_bits, down2_bsd_mask_bits, down2_sakura_mask_bits, down2_tomoyo_mask_bits },
+- { &Left1GC, &Left1Xbm, left1_bits, left1_tora_bits, left1_dog_bits, left1_bsd_bits, left1_sakura_bits, left1_tomoyo_bits,
+- &Left1Msk, left1_mask_bits, left1_mask_bits, left1_dog_mask_bits, left1_bsd_mask_bits, left1_sakura_mask_bits, left1_tomoyo_mask_bits },
+- { &Left2GC, &Left2Xbm, left2_bits, left2_tora_bits, left2_dog_bits, left2_bsd_bits, left2_sakura_bits, left2_tomoyo_bits,
+- &Left2Msk, left2_mask_bits, left2_mask_bits, left2_dog_mask_bits, left2_bsd_mask_bits, left2_sakura_mask_bits, left2_tomoyo_mask_bits },
+- { &Right1GC, &Right1Xbm, right1_bits, right1_tora_bits, right1_dog_bits, right1_bsd_bits, right1_sakura_bits, right1_tomoyo_bits,
+- &Right1Msk, right1_mask_bits, right1_mask_bits,right1_dog_mask_bits, right1_bsd_mask_bits, right1_sakura_mask_bits, right1_tomoyo_mask_bits },
+- { &Right2GC, &Right2Xbm, right2_bits, right2_tora_bits, right2_dog_bits, right2_bsd_bits, right2_sakura_bits, right2_tomoyo_bits,
+- &Right2Msk, right2_mask_bits, right2_mask_bits, right2_dog_mask_bits, right2_bsd_mask_bits, right2_sakura_mask_bits, right2_tomoyo_mask_bits },
+- { &UpLeft1GC, &UpLeft1Xbm, upleft1_bits, upleft1_tora_bits, upleft1_dog_bits, upleft1_bsd_bits, upleft1_sakura_bits, upleft1_tomoyo_bits,
+- &UpLeft1Msk, upleft1_mask_bits, upleft1_mask_bits, upleft1_dog_mask_bits, u%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list