[oe-commits] org.oe.dev merge of '3587630593a79216e232d374599557752a9f4599'
thebohemian commit
oe at amethyst.openembedded.net
Sun Jul 13 12:42:23 UTC 2008
merge of '3587630593a79216e232d374599557752a9f4599'
and '7c8aefb2dc76eb1b63e431ae3f5f37dbafad3425'
Author: thebohemian at openembedded.org
Branch: org.openembedded.dev
Revision: e0f1f9bc5dd648488bd0c935a9b9ee33a518f15d
ViewMTN: http://monotone.openembedded.org/revision/info/e0f1f9bc5dd648488bd0c935a9b9ee33a518f15d
Files:
1
packages/epdfview/epdfview_0.1.2.bb
packages/epdfview/epdfview_0.1.3.bb
packages/epdfview/epdfview_0.1.4.bb
packages/epdfview/epdfview_0.1.5.bb
packages/epdfview/files
packages/epdfview/files/poppler8.diff
packages/poppler/poppler_0.8.4.bb
packages/epdfview/epdfview_0.1.6.bb
packages/swfdec/swfdec-mozilla_0.7.2.bb
packages/cacao/files/cacao-0.99.1-build-java-runtime-library-classes.patch
packages/cacao/cacao-native_0.99.1.bb
packages/cacao/cacao-native_0.99.2.bb
packages/cacao/cacao_0.99.1.bb
packages/cacao/cacao_0.99.2.bb
packages/cacao/cacaoh-native_0.99.1.bb
packages/cacao/cacaoh-native_0.99.2.bb
packages/cacao/cacao-native.inc
packages/cacao/cacao-native_0.98+hg20071001.bb
packages/classpath/classpath_0.97.2.bb
Diffs:
#
# mt diff -r3587630593a79216e232d374599557752a9f4599 -re0f1f9bc5dd648488bd0c935a9b9ee33a518f15d
#
#
#
# delete "packages/epdfview/epdfview_0.1.2.bb"
#
# delete "packages/epdfview/epdfview_0.1.3.bb"
#
# delete "packages/epdfview/epdfview_0.1.4.bb"
#
# delete "packages/epdfview/epdfview_0.1.5.bb"
#
# add_dir "packages/epdfview/files"
#
# add_file "packages/epdfview/files/poppler8.diff"
# content [a689e7ecd2eb96297da67182d90023c0c658575e]
#
# add_file "packages/poppler/poppler_0.8.4.bb"
# content [5051018c95108165af0a9b9d2a66681132cac581]
#
# patch "packages/epdfview/epdfview_0.1.6.bb"
# from [d69520dd4a8189f45fe661be6cbdd872fc0243a2]
# to [50d81d822117bcc77f1bba303bf94b88f59e4881]
#
# patch "packages/swfdec/swfdec-mozilla_0.7.2.bb"
# from [476a536d65a42dc84c8bb188f0b086df54ef315a]
# to [941e21548d2bf8b6a5e08554b0d9d784265940da]
#
============================================================
--- packages/epdfview/files/poppler8.diff a689e7ecd2eb96297da67182d90023c0c658575e
+++ packages/epdfview/files/poppler8.diff a689e7ecd2eb96297da67182d90023c0c658575e
@@ -0,0 +1,10395 @@
+diff -Nurd epdfview-0.1.6-svn/configure.ac epdfview/configure.ac
+--- epdfview-0.1.6-svn/configure.ac 2008-07-13 12:57:47.593198000 +0200
++++ epdfview/configure.ac 2008-07-13 12:55:55.143198000 +0200
+@@ -27,7 +27,7 @@
+
+ dnl Check for libraries
+ POPPLER_REQUIRED=0.5.0
+-GLIB_REQUIRED=2.6.0
++GLIB_REQUIRED=2.8.0
+ GTK2_REQUIRED=2.6.0
+
+ PKG_CHECK_MODULES([GLIB], [gthread-2.0 >= $GLIB_REQUIRED])
+@@ -44,6 +44,14 @@
+ if test "x$have_poppler_052" = "xyes"; then
+ AC_DEFINE([HAVE_POPPLER_0_5_2], [1], [Define to 1 if you have Poppler version 0.5.2 or higher.])
+ fi
++PKG_CHECK_EXISTS([poppler-glib >= 0.6], [have_poppler_060=yes])
++if test "x$have_poppler_060" = "xyes"; then
++ AC_DEFINE([HAVE_POPPLER_0_6_0], [1], [Define to 1 if you have Poppler version 0.6.0 or higher.])
++fi
++PKG_CHECK_EXISTS([poppler-glib >= 0.8], [have_poppler_080=yes])
++if test "x$have_poppler_080" = "xyes"; then
++ AC_DEFINE([HAVE_POPPLER_0_8_0], [1], [Define to 1 if you have Poppler version 0.8.0 or higher.])
++fi
+
+ EPDFVIEW_PATH_CUPS([CUPS], [have_cups=yes])
+ AM_CONDITIONAL(cups_printing, test "x$have_cups" = "xyes")
+diff -Nurd epdfview-0.1.6-svn/data/epdfview-ui.xml epdfview/data/epdfview-ui.xml
+--- epdfview-0.1.6-svn/data/epdfview-ui.xml 2008-07-13 12:57:47.093198000 +0200
++++ epdfview/data/epdfview-ui.xml 2008-07-13 12:55:54.263198000 +0200
+@@ -11,6 +11,9 @@
+ <menu action="EditMenu">
+ <menuitem name="Find" action="Find"/>
+ <separator />
++ <menuitem name="PageModeScroll" action="PageModeScroll"/>
++ <menuitem name="PageModeText" action="PageModeText"/>
++ <separator />
+ <menuitem name="Preferences" action="Preferences"/>
+ </menu>
+ <menu action="ViewMenu">
+@@ -38,7 +41,7 @@
+ <menuitem name="About" action="About"/>
+ </menu>
+ </menubar>
+-
++
+ <toolbar name="ToolBar">
+ <toolitem name="OpenFile" action="OpenFile"/>
+ <separator/>
+@@ -49,7 +52,12 @@
+ <toolitem name="ZoomOut" action="ZoomOut"/>
+ <toolitem name="ZoomFit" action="ZoomFit"/>
+ <toolitem name="ZoomWidth" action="ZoomWidth"/>
++ <separator/>
++ <toolitem name="PageModeScroll" action="PageModeScroll"/>
++ <toolitem name="PageModeText" action="PageModeText"/>
+ </toolbar>
+
+ <accelerator name="SlashAccelerator" action="Slash"/>
++ <accelerator name="KPAddAccelerator" action="KPAdd"/>
++ <accelerator name="KPSubtractAccelerator" action="KPSubtract"/>
+ </ui>
+diff -Nurd epdfview-0.1.6-svn/m4/Makefile.am epdfview/m4/Makefile.am
+--- epdfview-0.1.6-svn/m4/Makefile.am 2008-07-13 12:57:43.883198000 +0200
++++ epdfview/m4/Makefile.am 2008-07-13 12:55:50.603198000 +0200
+@@ -1,2 +1,2 @@
+ # Process this file with automake to produce a Makefile.in file.
+-EXTRA_DIST = codeset.m4 gettext.m4 glibc2.m4 glibc21.m4 iconv.m4 intdiv0.m4 intmax.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 longdouble.m4 longlong.m4 nls.m4 po.m4 printf-posix.m4 progtest.m4 signed.m4 size_max.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4 wchar_t.m4 wint_t.m4 xsize.m4 cppunit.m4 cups.m4
++EXTRA_DIST = codeset.m4 gettext.m4 glibc2.m4 glibc21.m4 iconv.m4 intdiv0.m4 intmax.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 longdouble.m4 longlong.m4 nls.m4 pkg.m4 po.m4 printf-posix.m4 progtest.m4 signed.m4 size_max.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4 wchar_t.m4 wint_t.m4 xsize.m4 cppunit.m4 cups.m4
+diff -Nurd epdfview-0.1.6-svn/m4/pkg.m4 epdfview/m4/pkg.m4
+--- epdfview-0.1.6-svn/m4/pkg.m4 1970-01-01 01:00:00.000000000 +0100
++++ epdfview/m4/pkg.m4 2008-07-13 12:55:50.593198000 +0200
+@@ -0,0 +1,157 @@
++# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
++#
++# Copyright © 2004 Scott James Remnant <scott at netsplit.com>.
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++# General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++#
++# As a special exception to the GNU General Public License, if you
++# distribute this file as part of a program that contains a
++# configuration script generated by Autoconf, you may include it under
++# the same distribution terms that you use for the rest of that program.
++
++# PKG_PROG_PKG_CONFIG([MIN-VERSION])
++# ----------------------------------
++AC_DEFUN([PKG_PROG_PKG_CONFIG],
++[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
++m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
++AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
++if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
++ AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
++fi
++if test -n "$PKG_CONFIG"; then
++ _pkg_min_version=m4_default([$1], [0.9.0])
++ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
++ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
++ AC_MSG_RESULT([yes])
++ else
++ AC_MSG_RESULT([no])
++ PKG_CONFIG=""
++ fi
++
++fi[]dnl
++])# PKG_PROG_PKG_CONFIG
++
++# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
++#
++# Check to see whether a particular set of modules exists. Similar
++# to PKG_CHECK_MODULES(), but does not set variables or print errors.
++#
++#
++# Similar to PKG_CHECK_MODULES, make sure that the first instance of
++# this or PKG_CHECK_MODULES is called, or make sure to call
++# PKG_CHECK_EXISTS manually
++# --------------------------------------------------------------
++AC_DEFUN([PKG_CHECK_EXISTS],
++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
++if test -n "$PKG_CONFIG" && \
++ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
++ m4_ifval([$2], [$2], [:])
++m4_ifvaln([$3], [else
++ $3])dnl
++fi])
++
++
++# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
++# ---------------------------------------------
++m4_define([_PKG_CONFIG],
++[if test -n "$PKG_CONFIG"; then
++ if test -n "$$1"; then
++ pkg_cv_[]$1="$$1"
++ else
++ PKG_CHECK_EXISTS([$3],
++ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
++ [pkg_failed=yes])
++ fi
++else
++ pkg_failed=untried
++fi[]dnl
++])# _PKG_CONFIG
++
++# _PKG_SHORT_ERRORS_SUPPORTED
++# -----------------------------
++AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi[]dnl
++])# _PKG_SHORT_ERRORS_SUPPORTED
++
++
++# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
++# [ACTION-IF-NOT-FOUND])
++#
++#
++# Note that if there is a possibility the first call to
++# PKG_CHECK_MODULES might not happen, you should be sure to include an
++# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
++#
++#
++# --------------------------------------------------------------
++AC_DEFUN([PKG_CHECK_MODULES],
++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
++AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
++AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
++
++pkg_failed=no
++AC_MSG_CHECKING([for $1])
++
++_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
++_PKG_CONFIG([$1][_LIBS], [libs], [$2])
++
++m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
++and $1[]_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.])
++
++if test $pkg_failed = yes; then
++ _PKG_SHORT_ERRORS_SUPPORTED
++ if test $_pkg_short_errors_supported = yes; then
++ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
++ else
++ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
++
++ ifelse([$4], , [AC_MSG_ERROR(dnl
++[Package requirements ($2) were not met:
++
++$$1_PKG_ERRORS
++
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
++
++_PKG_TEXT
++])],
++ [AC_MSG_RESULT([no])
++ $4])
++elif test $pkg_failed = untried; then
++ ifelse([$4], , [AC_MSG_FAILURE(dnl
++[The pkg-config script could not be found or is too old. Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
++
++_PKG_TEXT
++
++To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
++ [$4])
++else
++ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
++ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
++ AC_MSG_RESULT([yes])
++ ifelse([$3], , :, [$3])
++fi[]dnl
++])# PKG_CHECK_MODULES
+diff -Nurd epdfview-0.1.6-svn/po/ca.po epdfview/po/ca.po
+--- epdfview-0.1.6-svn/po/ca.po 2008-07-13 12:57:47.543198000 +0200
++++ epdfview/po/ca.po 2008-07-13 12:55:55.073198000 +0200
+@@ -8,7 +8,7 @@
+ msgstr ""
+ "Project-Id-Version: ePDFView 0.1.4\n"
+ "Report-Msgid-Bugs-To: jordi at emma-soft.com\n"
+-"POT-Creation-Date: 2007-02-26 17:47+0100\n"
++"POT-Creation-Date: 2008-04-14 13:27+0200\n"
+ "PO-Revision-Date: 2006-04-12 21:17+0200\n"
+ "Last-Translator: Jordi Fita <jordi at emma-soft.com>\n"
+ "Language-Team: Catalan <ca at dodds.net>\n"
+@@ -76,11 +76,11 @@
+ msgid "Unknown error (%d)."
+ msgstr "Error desconegut (%d)."
+
+-#: src/main.cxx:38
++#: src/main.cxx:59
+ msgid "[FILE] - view PDF documents"
+ msgstr "[FITXER] - mostra documents PDF"
+
+-#: src/main.cxx:51 src/MainPter.cxx:153
++#: src/main.cxx:72 src/MainPter.cxx:153
+ msgid "PDF Viewer"
+ msgstr "Viso de PDF"
+
+@@ -94,7 +94,7 @@
+ msgid "Loading file %s..."
+ msgstr "Obrint fitxer %s..."
+
+-#: src/MainPter.cxx:413 src/MainPter.cxx:886
++#: src/MainPter.cxx:413 src/MainPter.cxx:892
+ #, c-format
+ msgid "of %d"
+ msgstr "de %d"
+@@ -104,39 +104,47 @@
+ msgid "Saving document to %s..."
+ msgstr "Desant el document a %s..."
+
+-#: src/MainPter.cxx:826 src/MainPter.cxx:865
++#: src/MainPter.cxx:832 src/MainPter.cxx:871
+ msgid "Error Loading File"
+ msgstr "Error carregant fitxer"
+
+-#: src/MainPter.cxx:866
++#: src/MainPter.cxx:872
+ msgid "The password you have supplied is not a valid password for this file."
+ msgstr "La contrsenya que heu donat no és và lida per aquest fitxer."
+
+-#: src/MainPter.cxx:947
++#: src/MainPter.cxx:953
+ msgid "Error Saving File"
+ msgstr "Error desant fitxer"
+
+-#: src/PagePter.cxx:292
++#: src/PagePter.cxx:338
+ msgid "Loading..."
+ msgstr "Carregant..."
+
+-#: src/PrintPter.cxx:295
++#: src/PrintPter.cxx:252
++msgid "A4"
++msgstr ""
++
++#: src/PrintPter.cxx:280
++msgid "300 DPI"
++msgstr ""
++
++#: src/PrintPter.cxx:308
+ msgid "Grayscale"
+ msgstr "Escala de gris"
+
+-#: src/PrintPter.cxx:395
++#: src/PrintPter.cxx:409
+ msgid "Idle"
+ msgstr "Desocupada"
+
+-#: src/PrintPter.cxx:398
++#: src/PrintPter.cxx:412
+ msgid "Stopped"
+ msgstr "Parada"
+
+-#: src/PrintPter.cxx:401
++#: src/PrintPter.cxx:415
+ msgid "Processing"
+ msgstr "Processada"
+
+-#: src/PrintPter.cxx:404
++#: src/PrintPter.cxx:418
+ msgid "Unknown"
+ msgstr "Desconegut"
+
+@@ -153,246 +161,262 @@
+ msgid "Find:"
+ msgstr "Cercar:"
+
+-#: src/gtk/MainView.cxx:87
++#: src/gtk/MainView.cxx:89
+ msgid "_File"
+ msgstr "_Fitxer"
+
+-#: src/gtk/MainView.cxx:88
++#: src/gtk/MainView.cxx:90
+ msgid "_Edit"
+ msgstr "_Edita"
+
+-#: src/gtk/MainView.cxx:89
++#: src/gtk/MainView.cxx:91
+ msgid "_View"
+ msgstr "_Visualitza"
+
+-#: src/gtk/MainView.cxx:90
++#: src/gtk/MainView.cxx:92
+ msgid "_Go"
+ msgstr "Vé_s"
+
+-#: src/gtk/MainView.cxx:91
++#: src/gtk/MainView.cxx:93
+ msgid "_Help"
+ msgstr "A_juda"
+
+-#: src/gtk/MainView.cxx:93
++#: src/gtk/MainView.cxx:95
+ msgid "_Open"
+ msgstr "_Obre"
+
+-#: src/gtk/MainView.cxx:94
++#: src/gtk/MainView.cxx:96
+ msgid "Open a PDF document"
+ msgstr "Obre un document PDF"
+
+-#: src/gtk/MainView.cxx:97
++#: src/gtk/MainView.cxx:99
+ msgid "_Reload"
+ msgstr "_Actualitza"
+
+-#: src/gtk/MainView.cxx:98
++#: src/gtk/MainView.cxx:100
+ msgid "Reload the current document"
+ msgstr "Torna a obrir el document actual"
+
+-#: src/gtk/MainView.cxx:101
++#: src/gtk/MainView.cxx:103
+ msgid "_Save a Copy..."
+ msgstr "_Desa una còpia..."
+
+-#: src/gtk/MainView.cxx:102
++#: src/gtk/MainView.cxx:104
+ msgid "Save a copy of the current document"
+ msgstr "Desa una còpia del document actual"
+
+-#: src/gtk/MainView.cxx:106
++#: src/gtk/MainView.cxx:108
+ msgid "_Print..."
+ msgstr "_Imprimeix"
+
+-#: src/gtk/MainView.cxx:107
++#: src/gtk/MainView.cxx:109
+ msgid "Print the current document"
+ msgstr "Imprimeix el document actual"
+
+-#: src/gtk/MainView.cxx:111
++#: src/gtk/MainView.cxx:113
+ msgid "_Close"
+ msgstr "_Tanca"
+
+-#: src/gtk/MainView.cxx:112
++#: src/gtk/MainView.cxx:114
+ msgid "Close this window"
+ msgstr "Tanca aquesta finestra"
+
+-#: src/gtk/MainView.cxx:115
++#: src/gtk/MainView.cxx:117
+ msgid "_Find"
+ msgstr "_Cerca"
+
+-#: src/gtk/MainView.cxx:116
++#: src/gtk/MainView.cxx:118
+ msgid "Find a word in the document"
+ msgstr "Cerca una paraula en el document"
+
+-#: src/gtk/MainView.cxx:119
++#: src/gtk/MainView.cxx:121
+ msgid "Preferences..."
+ msgstr "Preferències"
+
+-#: src/gtk/MainView.cxx:120
++#: src/gtk/MainView.cxx:122
+ msgid "Change the application's preferences"
+ msgstr "Canvia les preferències de l'aplicació"
+
+-#: src/gtk/MainView.cxx:123
++#: src/gtk/MainView.cxx:125
+ msgid "Zoom _In"
+ msgstr "_Amplia"
+
+-#: src/gtk/MainView.cxx:124
++#: src/gtk/MainView.cxx:126
+ msgid "Enlarge the document"
+ msgstr "Amplia el document"
+
+-#: src/gtk/MainView.cxx:127
++#: src/gtk/MainView.cxx:129
+ msgid "Zoom _Out"
+ msgstr "_Redueix"
+
+-#: src/gtk/MainView.cxx:128
++#: src/gtk/MainView.cxx:130
+ msgid "Shrink the document"
+ msgstr "Redueix el document"
+
+-#: src/gtk/MainView.cxx:131 src/gtk/StockIcons.cxx:43
++#: src/gtk/MainView.cxx:133 src/gtk/StockIcons.cxx:43
+ msgid "Rotate _Right"
+ msgstr "Gira a la _dreta"
+
+-#: src/gtk/MainView.cxx:132
++#: src/gtk/MainView.cxx:134
+ msgid "Rotate the document 90 degrees clockwise"
+ msgstr "Gira el document 90 graus en el sentit de les agulles del rellotge"
+
+-#: src/gtk/MainView.cxx:135 src/gtk/StockIcons.cxx:42
++#: src/gtk/MainView.cxx:137 src/gtk/StockIcons.cxx:42
+ msgid "Rotate _Left"
+ msgstr "Gira a l'es_querra"
+
+-#: src/gtk/MainView.cxx:136
++#: src/gtk/MainView.cxx:138
+ msgid "Rotate the document 90 degrees counter-clockwise"
+ msgstr ""
+ "Gira el document 90 grays en el sentit contrari al de les agulles del "
+ "rellotge"
+
+-#: src/gtk/MainView.cxx:139
++#: src/gtk/MainView.cxx:141
+ msgid "_First Page"
+ msgstr "_Primera pà gina"
+
+-#: src/gtk/MainView.cxx:140
++#: src/gtk/MainView.cxx:142
+ msgid "Go to the first page"
+ msgstr "Va a la primera pà gina"
+
+-#: src/gtk/M%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -r7c8aefb2dc76eb1b63e431ae3f5f37dbafad3425 -re0f1f9bc5dd648488bd0c935a9b9ee33a518f15d
#
#
#
# delete "packages/cacao/files/cacao-0.99.1-build-java-runtime-library-classes.patch"
#
# rename "packages/cacao/cacao-native_0.99.1.bb"
# to "packages/cacao/cacao-native_0.99.2.bb"
#
# rename "packages/cacao/cacao_0.99.1.bb"
# to "packages/cacao/cacao_0.99.2.bb"
#
# rename "packages/cacao/cacaoh-native_0.99.1.bb"
# to "packages/cacao/cacaoh-native_0.99.2.bb"
#
# patch "packages/cacao/cacao-native.inc"
# from [07b702fccb42b3216ccbc83f1e71c7ef63a0c5bc]
# to [01518adc1a5be594a1b7a0745fbe809fe9c32e37]
#
# patch "packages/cacao/cacao-native_0.98+hg20071001.bb"
# from [b087b9a24b9593dfff241d8dbafef831492c316b]
# to [8929611fd90eb4fdcb23fe53d68ecbb8c33008a2]
#
# patch "packages/cacao/cacao-native_0.99.2.bb"
# from [99b2a0554ed0083d21e60e8b10e7d9bf9f96ea22]
# to [ec6694c3440d7213e55f7fc7aa9401c8252419a2]
#
# patch "packages/cacao/cacao_0.99.2.bb"
# from [77d2dd2b46672fce71c875cb18b3294166d240cd]
# to [c37006a6c2daf29f28f7a3af6c18f2546da63545]
#
# patch "packages/classpath/classpath_0.97.2.bb"
# from [278cb300abf8c1fd2c84992aad5b9a71d2f050e5]
# to [950979b9546b09b411c3a41c14bf06b8450bd8bd]
#
============================================================
--- packages/cacao/cacao-native.inc 07b702fccb42b3216ccbc83f1e71c7ef63a0c5bc
+++ packages/cacao/cacao-native.inc 01518adc1a5be594a1b7a0745fbe809fe9c32e37
@@ -17,13 +17,13 @@ EXTRA_OECONF = "\
--with-vm-zip=${datadir}/cacao/vm.zip \
\
--with-classpath-libdir=${libdir_jni}:${libdir} \
- --with-classpath-includedir=${incdir}/classpath \
+ --with-classpath-includedir=${includedir}/classpath \
--with-classpath-classes=${datadir}/classpath/glibj.zip \
\
--with-java-runtime-library-classes=${datadir}/classpath/glibj.zip \
--with-java-runtime-library-libdir=${libdir_jni}:${libdir} \
- --with-jni_md_h=${incdir}/classpath \
- --with-jni_h=${incdir}/classpath \
+ --with-jni_md_h=${includedir}/classpath \
+ --with-jni_h=${includedir}/classpath \
"
# force usage of ecj-initial
============================================================
--- packages/cacao/cacao-native_0.98+hg20071001.bb b087b9a24b9593dfff241d8dbafef831492c316b
+++ packages/cacao/cacao-native_0.98+hg20071001.bb 8929611fd90eb4fdcb23fe53d68ecbb8c33008a2
@@ -3,3 +3,7 @@ SRC_URI = "http://jalimo.evolvis.org/rep
PR = "r1"
SRC_URI = "http://jalimo.evolvis.org/repository/sources/cacao-${PV}.tar.bz2;md5sum=9ff10c929bd0cbf15909107c1aff7518"
+
+# force usage of ecj-initial (but Java5-compatible class library)
+export JAVAC = "${STAGING_BINDIR_NATIVE}/ecj-initial -bootclasspath ${STAGING_DATADIR_NATIVE}/classpath/glibj.zip"
+
============================================================
--- packages/cacao/cacao-native_0.99.1.bb 99b2a0554ed0083d21e60e8b10e7d9bf9f96ea22
+++ packages/cacao/cacao-native_0.99.2.bb ec6694c3440d7213e55f7fc7aa9401c8252419a2
@@ -2,6 +2,6 @@ PR = "r0"
PR = "r0"
-SRC_URI = "http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2;md5sum=a5641452c7ba173060c99ed700950b3d \
- "
+SRC_URI = "http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2;md5sum=a5641452c7ba173060c99ed700950b3d"
+
============================================================
--- packages/cacao/cacao_0.99.1.bb 77d2dd2b46672fce71c875cb18b3294166d240cd
+++ packages/cacao/cacao_0.99.2.bb c37006a6c2daf29f28f7a3af6c18f2546da63545
@@ -3,7 +3,6 @@ SRC_URI = "http://www.complang.tuwien.ac
PR = "r0"
SRC_URI = "http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2;md5sum=a5641452c7ba173060c99ed700950b3d \
- file://cacao-${PV}-build-java-runtime-library-classes.patch;patch=1 \
"
# Quirks for Nokia N800:
============================================================
--- packages/classpath/classpath_0.97.2.bb 278cb300abf8c1fd2c84992aad5b9a71d2f050e5
+++ packages/classpath/classpath_0.97.2.bb 950979b9546b09b411c3a41c14bf06b8450bd8bd
@@ -3,7 +3,7 @@ SRC_URI += "\
SRC_URI += "\
file://netif_16.patch;patch=1;pnum=0 \
file://SimpleName.diff;patch=1;pnum=0 \
- file://javanet-local;patch=1;pnum=0 \
+ file://javanet-local.patch;patch=1;pnum=0 \
"
PR = "r1"
More information about the Openembedded-commits
mailing list