Skip to contentSkip to conversation

X apps and base utils upgrade, Edwin, Dec3 2010

PATCH In review Zhai Edwin 2 participants 17 messages Dec 3, 2010 – Dec 6, 2010

lore
Share & tools
lore

Zhai Edwin

author
#0 lore raw

cover X apps and base utils upgrade, Edwin, Dec3 2010

Saul,
This is 2nd version of last pull request with some extra info of patch handling.

Thanks,
edwin

Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: gzhai/distro04
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=gzhai/distro04

Thanks,
Zhai Edwin <[email protected]>
---

Zhai Edwin (14):
pointercal: Add license checksum
tidy: Add license checksum
beecrypt: Update to 4.2.1
acpid: update to 1.0.10
consolekit: Update to 0.4.3
eee-acpi-scripts: Update to 1.1.11
ethtool: Update to 2.6.36
puzzles: Update to svn r9023
x11perf: Update to 1.5.2
x11vnc: Update to 0.9.12
web: Update to svn r129
gnome-desktop: Update to 2.32.1
gnome-icon-theme: Update to 2.31.0
gtk-engines: Update to 2.20.2

 .../conf/distro/include/poky-default-revisions.inc |    4 +-
 meta/recipes-bsp/acpid/acpid.inc                   |    7 +-
 meta/recipes-bsp/acpid/acpid_1.0.10.bb             |    6 ++
 meta/recipes-bsp/acpid/acpid_1.0.6.bb              |    3 -
 .../eee-acpi-scripts/eee-acpi-scripts_git.bb       |   15 ++--
 .../eee-acpi-scripts/files/remove-doc-check.patch  |   76 +++++++++----------
 meta/recipes-bsp/pointercal/files/COPYING          |    2 +
 meta/recipes-bsp/pointercal/pointercal_0.0.bb      |    5 +-
 .../{ethtool_2.6.34.bb => ethtool_2.6.36.bb}       |    0
 meta/recipes-gnome/gnome/gnome-desktop.inc         |    2 +-
 .../gnome/gnome-desktop/no-desktop-docs.patch      |   10 ---
 meta/recipes-gnome/gnome/gnome-desktop_2.26.2.bb   |    3 -
 meta/recipes-gnome/gnome/gnome-desktop_2.32.1.bb   |    4 +
 .../gnome/gnome-icon-theme/iconpath-option.patch   |   79 +++++++++----------
 ...-theme_2.22.0.bb => gnome-icon-theme_2.31.0.bb} |   12 ++-
 ...gtk-engines_2.14.0.bb => gtk-engines_2.20.2.bb} |   11 ++-
 meta/recipes-graphics/clutter/tidy.inc             |    2 +-
 meta/recipes-graphics/clutter/tidy_git.bb          |    3 +
 meta/recipes-graphics/x11vnc/x11vnc_0.9.12.bb      |   15 ++++
 meta/recipes-graphics/x11vnc/x11vnc_0.9.3.bb       |   11 ---
 meta/recipes-graphics/xorg-app/x11perf_1.5.2.bb    |   10 +++
 meta/recipes-graphics/xorg-app/x11perf_1.5.bb      |    6 --
 .../recipes-sato/puzzles/files/makedist_hack.patch |   17 ----
 .../puzzles/{puzzles_r7593.bb => puzzles_r9023.bb} |   14 ++--
 meta/recipes-sato/web/web_svn.bb                   |    2 +-
 .../beecrypt/beecrypt/disable-icu-check.patch      |   12 ++--
 .../beecrypt/beecrypt/fix-security.patch           |   51 +++++++------
 .../recipes-support/beecrypt/beecrypt/x64fix.patch |   23 ------
 .../{beecrypt_4.1.2.bb => beecrypt_4.2.1.bb}       |    9 +-
 .../recipes-support/consolekit/consolekit_0.3.0.bb |   16 ----
 .../consolekit/files/nopolkit.patch                |    8 +-
 meta/recipes-tbd/consolekit/consolekit_0.4.3.bb    |   21 +++++
 32 files changed, 224 insertions(+), 235 deletions(-)
 create mode 100644 meta/recipes-bsp/acpid/acpid_1.0.10.bb
 delete mode 100644 meta/recipes-bsp/acpid/acpid_1.0.6.bb
 create mode 100644 meta/recipes-bsp/pointercal/files/COPYING
 rename meta/recipes-extended/ethtool/{ethtool_2.6.34.bb => ethtool_2.6.36.bb} (100%)
 delete mode 100644 meta/recipes-gnome/gnome/gnome-desktop/no-desktop-docs.patch
 delete mode 100644 meta/recipes-gnome/gnome/gnome-desktop_2.26.2.bb
 create mode 100644 meta/recipes-gnome/gnome/gnome-desktop_2.32.1.bb
 rename meta/recipes-gnome/gnome/{gnome-icon-theme_2.22.0.bb => gnome-icon-theme_2.31.0.bb} (55%)
 rename meta/recipes-gnome/gtk-engines/{gtk-engines_2.14.0.bb => gtk-engines_2.20.2.bb} (85%)
 create mode 100644 meta/recipes-graphics/x11vnc/x11vnc_0.9.12.bb
 delete mode 100644 meta/recipes-graphics/x11vnc/x11vnc_0.9.3.bb
 create mode 100644 meta/recipes-graphics/xorg-app/x11perf_1.5.2.bb
 delete mode 100644 meta/recipes-graphics/xorg-app/x11perf_1.5.bb
 delete mode 100644 meta/recipes-sato/puzzles/files/makedist_hack.patch
 rename meta/recipes-sato/puzzles/{puzzles_r7593.bb => puzzles_r9023.bb} (74%)
 delete mode 100644 meta/recipes-support/beecrypt/beecrypt/x64fix.patch
 rename meta/recipes-support/beecrypt/{beecrypt_4.1.2.bb => beecrypt_4.2.1.bb} (65%)
 delete mode 100644 meta/recipes-support/consolekit/consolekit_0.3.0.bb
 create mode 100644 meta/recipes-tbd/consolekit/consolekit_0.4.3.bb
author
#1 lore raw

PATCH 1/14 pointercal: Add license checksum

---
 meta/recipes-bsp/pointercal/files/COPYING     |    2 ++
 meta/recipes-bsp/pointercal/pointercal_0.0.bb |    5 ++++-
 2 files changed, 6 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-bsp/pointercal/files/COPYING
meta/recipes-bsp/pointercal/files/COPYING new file +2 -0
new file mode 100644
index 0000000..63f5293
@@ -0,0 +1,2 @@
+This is a blank COPYING file, and should be filled in by original author in future.
+
meta/recipes-bsp/pointercal/pointercal_0.0.bb +4 -1
index 3112c97..069d850 100644
@@ -2,8 +2,11 @@ DESCRIPTION = "Touchscreen calibration data"
 SECTION = "base"
 PR = "r11"
 LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=4b5fcfc87fb615860d398b5e38685edf"
+
+SRC_URI = "file://pointercal \
+           file://COPYING"
 
-SRC_URI = "file://pointercal"
 S = "${WORKDIR}"
 
 do_install() {
Signature · 1 line
1.7.0.4
author
#3 lore raw

PATCH 3/14 beecrypt: Update to 4.2.1

In reply to Zhai Edwin

Rebased disable-icu-check.patch & fix-security.patch. Removed x64fix.patch as it is already in upstream. Also some configure changes: removing "--with-arch" as it can't cowork with expert mode, adding "--disable-openmp" to avoid unnecessary dependency.

---
 .../beecrypt/beecrypt/disable-icu-check.patch      |   12 ++--
 .../beecrypt/beecrypt/fix-security.patch           |   51 ++++++++++----------
 .../recipes-support/beecrypt/beecrypt/x64fix.patch |   23 ---------
 .../{beecrypt_4.1.2.bb => beecrypt_4.2.1.bb}       |    9 ++--
 4 files changed, 37 insertions(+), 58 deletions(-)
 delete mode 100644 meta/recipes-support/beecrypt/beecrypt/x64fix.patch
 rename meta/recipes-support/beecrypt/{beecrypt_4.1.2.bb => beecrypt_4.2.1.bb} (65%)
meta/recipes-support/beecrypt/beecrypt/disable-icu-check.patch +6 -6
index 3e18a87..4a2f414 100644
@@ -2,11 +2,11 @@ We are unable to run code at configure time in a cross environemnt, but as we
 control the build we can be fairly certain this dependency is met.
 
 JL 05/07/10
-Index: beecrypt-4.1.2/configure.ac
+Index: beecrypt-4.2.1/configure.ac
 ===================================================================
---- beecrypt-4.1.2.orig/configure.ac	2004-12-21 11:37:56.000000000 +0000
-+++ beecrypt-4.1.2/configure.ac	2010-07-05 16:09:50.390083494 +0100
-@@ -243,32 +243,6 @@
+--- beecrypt-4.2.1.orig/configure.ac	2010-11-26 17:12:25.000000000 +0800
++++ beecrypt-4.2.1/configure.ac	2010-11-26 17:12:30.000000000 +0800
+@@ -292,32 +292,6 @@
  # Predefines and checks for C++ API support
  AH_TEMPLATE([CPPGLUE],[Define to 1 if you want to include the C++ code])
  
@@ -36,6 +36,6 @@ Index: beecrypt-4.1.2/configure.ac
 -  AC_LANG_POP(C)
 -fi
 -
+ AM_CONDITIONAL([WITH_CPLUSPLUS],[test "$ac_with_cplusplus" = yes])
+ 
  if test "$ac_with_cplusplus" = yes ; then
-   AC_DEFINE([CPPGLUE],1)
- fi
meta/recipes-support/beecrypt/beecrypt/fix-security.patch +26 -25

66 lines not on this page · raw message

meta/recipes-support/beecrypt/beecrypt/x64fix.patch deleted +0 -23
deleted file mode 100644
index ac02425..0000000
@@ -1,23 +0,0 @@
-Don't have 64 appended to the libdir for 64bit platforms.
-
-JL 05/07/10
-Index: beecrypt-4.1.2/configure.ac
-===================================================================
---- beecrypt-4.1.2.orig/configure.ac	2010-07-05 16:39:43.000000000 +0100
-+++ beecrypt-4.1.2/configure.ac	2010-07-05 16:40:27.521082866 +0100
-@@ -585,15 +585,6 @@
- 
- # Check where to install the libraries
- bc_libalt=
--case $target_os in
--linux*)
--  case $bc_target_arch in
--  powerpc64 | s390x | x86_64)
--    bc_libalt="64"
--    ;;
--  esac
--  ;;
--esac
- AC_SUBST(LIBALT,$bc_libalt)
- 
- # Generate output files.
meta/recipes-support/beecrypt/beecrypt_4.2.1.bb renamed from meta/recipes-support/beecrypt/beecrypt_4.1.2.bb +5 -4
similarity index 65%
rename from meta/recipes-support/beecrypt/beecrypt_4.1.2.bb
rename to meta/recipes-support/beecrypt/beecrypt_4.2.1.bb
index 0da36d9..8f2ffc6 100644
@@ -5,12 +5,13 @@
 DESCRIPTION="Beecrypt is a general-purpose cryptography library."
 HOMEPAGE="http://sourceforge.net/projects/beecrypt"
 SRC_URI="${SOURCEFORGE_MIRROR}/beecrypt/beecrypt-${PV}.tar.gz \
-	 file://x64fix.patch \
 	 file://disable-icu-check.patch \
 	 file://fix-security.patch"
-LICENSE = "GPLv2&LGPLv2.1"
+LICENSE = "GPLv2 & LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=9894370afd5dfe7d02b8d14319e729a1 \
-	            file://COPYING.LIB;md5=dcf3c825659e82539645da41a7908589"
+                    file://COPYING.LIB;md5=dcf3c825659e82539645da41a7908589 \
+                    file://include/beecrypt/beecrypt.h;endline=20;md5=47a93eef539aac237eef86297a4d71c1"
+
 DEPENDS = "icu"
 
 PR = "r0"
@@ -18,6 +19,6 @@ PR = "r0"
 inherit autotools
 acpaths=""
 
-EXTRA_OECONF="--with-arch=${TARGET_ARCH} --without-python --enable-shared --enable-static"
+EXTRA_OECONF="--without-python --enable-shared --enable-static --disable-openmp"
 
 BBCLASSEXTEND = "native"
Signature · 1 line
1.7.0.4
author
#6 lore raw

PATCH 4/14 acpid: update to 1.0.10

In reply to Zhai Edwin
---
 meta/recipes-bsp/acpid/acpid.inc       |    7 +++++--
 meta/recipes-bsp/acpid/acpid_1.0.10.bb |    6 ++++++
 meta/recipes-bsp/acpid/acpid_1.0.6.bb  |    3 ---
 3 files changed, 11 insertions(+), 5 deletions(-)
 create mode 100644 meta/recipes-bsp/acpid/acpid_1.0.10.bb
 delete mode 100644 meta/recipes-bsp/acpid/acpid_1.0.6.bb
meta/recipes-bsp/acpid/acpid.inc +5 -2
index 8ac523d..3c0219f 100644
@@ -1,7 +1,10 @@
-SECTION = "base"
 DESCRIPTION = "A daemon for delivering ACPI events."
-LICENSE="GPL"
+HOMEPAGE = "http://sourceforge.net/projects/acpid/"
+BUGTRACKER = "http://sourceforge.net/tracker/?group_id=33140&atid=407341"
+
+LICENSE="GPLv2+"
 
+SECTION = "base"
 SRC_URI = "${SOURCEFORGE_MIRROR}/acpid/acpid-${PV}.tar.gz \
            file://init"
 
meta/recipes-bsp/acpid/acpid_1.0.10.bb new file +6 -0
new file mode 100644
index 0000000..ab4b582
@@ -0,0 +1,6 @@
+require acpid.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \
+                    file://acpid.h;endline=24;md5=324a9cf225ae69ddaad1bf9d942115b5"
+
+PR = "r0"
meta/recipes-bsp/acpid/acpid_1.0.6.bb deleted +0 -3
deleted file mode 100644
index a95cb54..0000000
@@ -1,3 +0,0 @@
-require acpid.inc
-LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
-PR = "r5"
Signature · 1 line
1.7.0.4
author
#7 lore raw

PATCH 5/14 consolekit: Update to 0.4.3

In reply to Zhai Edwin

Rebased nopolkit.patch.

---
 .../recipes-support/consolekit/consolekit_0.3.0.bb |   16 ---------------
 .../consolekit/files/nopolkit.patch                |    8 +++---
 meta/recipes-tbd/consolekit/consolekit_0.4.3.bb    |   21 ++++++++++++++++++++
 3 files changed, 25 insertions(+), 20 deletions(-)
 delete mode 100644 meta/recipes-support/consolekit/consolekit_0.3.0.bb
 create mode 100644 meta/recipes-tbd/consolekit/consolekit_0.4.3.bb
meta/recipes-support/consolekit/consolekit_0.3.0.bb deleted +0 -16
deleted file mode 100644
index 0d0dfea..0000000
@@ -1,16 +0,0 @@
-DESCRIPTION = "ConsoleKit is a framework for defining and tracking users, login sessions, and seats."
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
-DEPENDS = "dbus"
-
-inherit gnome
-
-SRC_URI = "http://people.freedesktop.org/~mccann/dist/ConsoleKit-${PV}.tar.bz2 \
-           file://nopolkit.patch;patch=1"
-S = "${WORKDIR}/ConsoleKit-${PV}"
-
-FILES_${PN} += "${libdir}/ConsoleKit ${datadir}/dbus-1 ${datadir}/PolicyKit"
-
-
-
-
meta/recipes-support/consolekit/files/nopolkit.patch +4 -4
index bebbcaf..7a1f02a 100644
@@ -1,13 +1,13 @@
-Index: ConsoleKit-0.3.0/configure.ac
+Index: ConsoleKit-0.4.3/configure.ac
 ===================================================================
---- ConsoleKit-0.3.0.orig/configure.ac	2009-05-22 12:53:27.000000000 +0100
-+++ ConsoleKit-0.3.0/configure.ac	2009-05-22 12:53:56.000000000 +0100
+--- ConsoleKit-0.4.3.orig/configure.ac	2010-10-26 22:34:03.000000000 +0800
++++ ConsoleKit-0.4.3/configure.ac	2010-11-28 15:28:26.000000000 +0800
 @@ -55,10 +55,7 @@
    gthread-2.0 >= $GLIB_REQUIRED_VERSION
  )
  
 -PKG_CHECK_MODULES(POLKIT,
--  polkit >= $POLKIT_REQUIRED_VERSION,
+-  polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION,
 -  have_polkit=yes,
 -  have_polkit=no)
 +have_polkit=no
meta/recipes-tbd/consolekit/consolekit_0.4.3.bb new file +21 -0
new file mode 100644
index 0000000..f1da72b
@@ -0,0 +1,21 @@
+DESCRIPTION = "ConsoleKit is a framework for defining and tracking users, login sessions, and seats."
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/ConsoleKit"
+BUGTRACKER="https://bugs.freedesktop.org/buglist.cgi?query_format=specific&product=ConsoleKit"
+
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
+                    file://src/main.c;endline=21;md5=0a994e09769780220163255d8f9071c3"
+
+DEPENDS = "dbus"
+
+inherit gnome
+
+SRC_URI = "http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-0.4.3.tar.bz2 \
+           file://nopolkit.patch;patch=1"
+S = "${WORKDIR}/ConsoleKit-${PV}"
+
+FILES_${PN} += "${libdir}/ConsoleKit ${datadir}/dbus-1 ${datadir}/PolicyKit"
+
+
+
+
Signature · 1 line
1.7.0.4
author
#8 lore raw

PATCH 6/14 eee-acpi-scripts: Update to 1.1.11

In reply to Zhai Edwin

Rebased remove-doc-check.patch

---
 .../conf/distro/include/poky-default-revisions.inc |    2 +-
 .../eee-acpi-scripts/eee-acpi-scripts_git.bb       |   15 +++--
 .../eee-acpi-scripts/files/remove-doc-check.patch  |   76 ++++++++++----------
 3 files changed, 47 insertions(+), 46 deletions(-)
meta/conf/distro/include/poky-default-revisions.inc +1 -1
index eb0eda6..015df5a 100644
@@ -35,7 +35,7 @@ SRCREV_pn-dtc ??= "73dca9ae0b9abe6924ba640164ecce9f8df69c5a"
 SRCREV_pn-dtc-native ??= "73dca9ae0b9abe6924ba640164ecce9f8df69c5a"
 SRCREV_pn-eds-dbus ??= "3c9933541d722c0b17a95a23d5f518745d4aad27"
 SRCREV_pn-eds-tools ??= "2008-02-04"
-SRCREV_pn-eee-acpi-scripts ??= "df785afdacedf869b20fb88a793c13b539819270"
+SRCREV_pn-eee-acpi-scripts ??= "e224937ba51165e2a52252f9a113c8a82c01bb36"
 EGLIBCREV = "11982"
 SRCREV_pn-eglibc ??= "${EGLIBCREV}"
 SRCREV_pn-eglibc-initial ??= "${EGLIBCREV}"
meta/recipes-bsp/eee-acpi-scripts/eee-acpi-scripts_git.bb +9 -6
index 4c26504..d186727 100644
@@ -1,8 +1,11 @@
-SECTION = "base"
 DESCRIPTION = "eeePC specific ACPI scripts"
+HOMEPAGE = "http://alioth.debian.org/projects/debian-eeepc/"
+SECTION = "base"
+
 LICENSE="GPL"
+LIC_FILES_CHKSUM = "file://debian/copyright;md5=77ef83ab5f4af938a93edb61f7b74f2c"
 
-PV = "0.0+git${SRCREV}"
+PV = "1.1.11+git${SRCREV}"
 PR = "r3"
 
 RDEPENDS = "pm-utils"
@@ -23,13 +26,13 @@ do_install () {
 	install -d ${D}${sysconfdir}/default/
 	install -d ${D}${sysconfdir}/acpi/actions/
 	install -d ${D}${sysconfdir}/acpi/events/
-	install -d ${D}${sysconfdir}/acpi/lib/
+	install -d ${D}${sysconfdir}/acpi/lib/udev/rules.d
 	install -d ${D}${datadir}/eeepc-acpi-scripts/
 	install -d ${D}${datadir}/acpi-support/
 	install -m 644 ${S}/events/* ${D}${sysconfdir}/acpi/events/
-	install -m 644 ${S}/lib/* ${D}${sysconfdir}/acpi/lib/
+	install -m 644 ${S}/lib/udev/rules.d/* ${D}${sysconfdir}/acpi/lib/udev/rules.d/
 	install ${S}/actions/* ${D}${sysconfdir}/acpi/actions/
-	install -m 0644 ${S}/functions.sh ${D}${datadir}/eeepc-acpi-scripts/
+	install -m 0644 ${S}/acpilib/functions.sh ${D}${datadir}/eeepc-acpi-scripts/
 	install -m 0644 ${WORKDIR}/policy-funcs ${D}${datadir}/acpi-support/
-	install -m 0644 ${S}/debian/eeepc-acpi-scripts.default ${D}${sysconfdir}/default/
+	install -m 0644 ${S}/debian/eeepc-acpi-scripts.default* ${D}${sysconfdir}/default/
 }
meta/recipes-bsp/eee-acpi-scripts/files/remove-doc-check.patch +37 -39

93 lines not on this page · raw message

Signature · 1 line
1.7.0.4
author
#9 lore raw

PATCH 7/14 ethtool: Update to 2.6.36

In reply to Zhai Edwin
---
 .../{ethtool_2.6.34.bb => ethtool_2.6.36.bb}       |    0
 1 files changed, 0 insertions(+), 0 deletions(-)
 rename meta/recipes-extended/ethtool/{ethtool_2.6.34.bb => ethtool_2.6.36.bb} (100%)
meta/recipes-extended/ethtool/ethtool_2.6.36.bb renamed from meta/recipes-extended/ethtool/ethtool_2.6.34.bb +0 -0
similarity index 100%
rename from meta/recipes-extended/ethtool/ethtool_2.6.34.bb
rename to meta/recipes-extended/ethtool/ethtool_2.6.36.bb
Signature · 1 line
1.7.0.4
author
#11 lore raw

PATCH 9/14 x11perf: Update to 1.5.2

In reply to Zhai Edwin
---
 meta/recipes-graphics/xorg-app/x11perf_1.5.2.bb |   10 ++++++++++
 meta/recipes-graphics/xorg-app/x11perf_1.5.bb   |    6 ------
 2 files changed, 10 insertions(+), 6 deletions(-)
 create mode 100644 meta/recipes-graphics/xorg-app/x11perf_1.5.2.bb
 delete mode 100644 meta/recipes-graphics/xorg-app/x11perf_1.5.bb
meta/recipes-graphics/xorg-app/x11perf_1.5.2.bb new file +10 -0
new file mode 100644
index 0000000..eaa83ac
@@ -0,0 +1,10 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "X11 server performance test program"
+DEPENDS += "libxmu libxrender libxft libxext fontconfig"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=428ca4d67a41fcd4fc3283dce9bbda7e \
+                    file://x11perf.h;endline=24;md5=29555066baf406a105ff917ac25b2d01"
+
+PR = "r0"
+PE = "1"
meta/recipes-graphics/xorg-app/x11perf_1.5.bb deleted +0 -6
deleted file mode 100644
index 35680e7..0000000
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-DESCRIPTION = "X11 server performance test program"
-DEPENDS += "libxmu libxrender libxft libxext fontconfig"
-PR = "r1"
-PE = "1"
Signature · 1 line
1.7.0.4
author
#15 lore raw

PATCH 13/14 gnome-icon-theme: Update to 2.31.0

In reply to Zhai Edwin

Rebased the patch iconpath-option.patch

---
 .../gnome/gnome-icon-theme/iconpath-option.patch   |   79 +++++++++----------
 ...-theme_2.22.0.bb => gnome-icon-theme_2.31.0.bb} |   12 ++-
 2 files changed, 46 insertions(+), 45 deletions(-)
 rename meta/recipes-gnome/gnome/{gnome-icon-theme_2.22.0.bb => gnome-icon-theme_2.31.0.bb} (55%)
meta/recipes-gnome/gnome/gnome-icon-theme/iconpath-option.patch +37 -42
index 935b358..8a16d00 100644
@@ -4,48 +4,43 @@ pkg-config will only search the target sysroot and we want the native script. Th
 patch adds an option to allow the path to the tool to be specified.
 
 RP - 12/8/10"
-Index: gnome-icon-theme-2.22.0/configure.in
+Index: gnome-icon-theme-2.31.0/configure.ac
 ===================================================================
---- gnome-icon-theme-2.22.0.orig/configure.in
-+++ gnome-icon-theme-2.22.0/configure.in
-@@ -28,20 +28,28 @@ AC_SUBST(themedir, "\${datadir}/icons/gn
+--- gnome-icon-theme-2.31.0.orig/configure.ac	2010-12-01 11:00:22.000000000 +0800
++++ gnome-icon-theme-2.31.0/configure.ac	2010-12-01 11:02:16.000000000 +0800
+@@ -38,18 +38,24 @@
+ ICONMAP="true"
+ if test "x$enable_mapping" != "xno"; then
+    UTILS_REQUIRED=0.8.7
++   PKG_PROG_PKG_CONFIG()
  
- UTILS_REQUIRED=0.8.1
- 
--AC_MSG_CHECKING([icon-naming-utils >= $UTILS_REQUIRED])
--PKG_CHECK_EXISTS(icon-naming-utils >= $UTILS_REQUIRED,
--                 have_utils=yes, have_utils=no)
--if test "x$have_utils" = "xyes"; then
--   UTILS_PATH="`$PKG_CONFIG --variable=program_path icon-naming-utils`"
--   ICONMAP="$UTILS_PATH/icon-name-mapping"
--   AC_SUBST(ICONMAP)
--   AC_MSG_RESULT([yes])
--else
--   AC_MSG_RESULT([no])
--   AC_MSG_ERROR([icon-naming-utils >= $UTILS_REQUIRED is required to build
--                 and install gnome-icon-theme])
-+PKG_PROG_PKG_CONFIG()
-+
-+AC_ARG_WITH(iconmap,
-+	    AC_HELP_STRING([--with-iconmap=<dir>], [The location of the icon-name-mapping script to use]),
-+	    ICONMAP=$withval, ICONMAP="")
-+if test "x$ICONMAP" = "x"; then
-+   AC_MSG_CHECKING([icon-naming-utils >= $UTILS_REQUIRED])
-+   PKG_CHECK_EXISTS(icon-naming-utils >= $UTILS_REQUIRED,
-+   		    have_utils=yes, have_utils=no)
-+   if test "x$have_utils" = "xyes"; then
-+      UTILS_PATH="`$PKG_CONFIG --variable=program_path icon-naming-utils`"
-+      ICONMAP="$UTILS_PATH/icon-name-mapping"
-+
-+      AC_MSG_RESULT([yes])
-+    else
-+      AC_MSG_RESULT([no])
-+      AC_MSG_ERROR([icon-naming-utils >= $UTILS_REQUIRED is required to build and install sato-icon-theme"])
-+    fi
- fi
- 
-+AC_SUBST(ICONMAP)
+-   AC_MSG_CHECKING([icon-naming-utils >= $UTILS_REQUIRED])
+-   PKG_CHECK_EXISTS(icon-naming-utils >= $UTILS_REQUIRED,
+-                    have_utils=yes, have_utils=no)
+-   if test "x$have_utils" = "xyes"; then
+-      UTILS_PATH="`$PKG_CONFIG --variable=program_path icon-naming-utils`"
+-      ICONMAP="$UTILS_PATH/icon-name-mapping"
+-      AC_MSG_RESULT([yes])
+-   else
+-      AC_MSG_RESULT([no])
+-      AC_MSG_ERROR([icon-naming-utils >= $UTILS_REQUIRED is required to build
+-                    and install gnome-icon-theme])
++   AC_ARG_WITH(iconmap,
++   	    AC_HELP_STRING([--with-iconmap=<dir>], [The location of the icon-name-mapping script to use]),
++   	    ICONMAP=$withval, ICONMAP="")
++   if test "x$ICONMAP" = "x"; then
++      AC_MSG_CHECKING([icon-naming-utils >= $UTILS_REQUIRED])
++      PKG_CHECK_EXISTS(icon-naming-utils >= $UTILS_REQUIRED,
++      		    have_utils=yes, have_utils=no)
++      if test "x$have_utils" = "xyes"; then
++         UTILS_PATH="`$PKG_CONFIG --variable=program_path icon-naming-utils`"
++         ICONMAP="$UTILS_PATH/icon-name-mapping"
 +
- AC_CONFIG_FILES([
- Makefile
- gnome-icon-theme.pc
++         AC_MSG_RESULT([yes])
++      else
++         AC_MSG_RESULT([no])
++         AC_MSG_ERROR([icon-naming-utils >= $UTILS_REQUIRED is required to build and install sato-icon-theme"])
++      fi
+    fi
+ else
+    ICONMAP="false"
meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb renamed from meta/recipes-gnome/gnome/gnome-icon-theme_2.22.0.bb +9 -3
similarity index 55%
rename from meta/recipes-gnome/gnome/gnome-icon-theme_2.22.0.bb
rename to meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb
index bdf5ee4..c8a2db7 100644
@@ -1,13 +1,19 @@
-LICENSE = "GPL"
+DESCRIPTION = "GNOME 2 default icon themes"
+HOMEPAGE = "http://www.gnome.org/"
+BUGTRACKER = "https://bugzilla.gnome.org/"
+
+LICENSE = "LGPLv3 | BY-SAv3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=e7e289d90fc8bdceed5e3f142f98229e"
+
 SECTION = "x11/gnome"
 DEPENDS = "icon-naming-utils-native glib-2.0 intltool-native"
 RDEPENDS = "hicolor-icon-theme"
 RRECOMMENDS = "librsvg-gtk"
-PR = "r2"
+PR = "r0"
 
 FILES_${PN} += "${datadir}/*"
 
-SRC_URI = "${GNOME_MIRROR}/${PN}/2.22/${PN}-${PV}.tar.bz2 \
+SRC_URI = "${GNOME_MIRROR}/${PN}/2.31/${PN}-${PV}.tar.bz2 \
            file://iconpath-option.patch"
 
 EXTRA_OECONF = "--disable-hicolor-check --with-iconmap=${STAGING_LIBDIR_NATIVE}/../libexec/icon-name-mapping"
Signature · 1 line
1.7.0.4
author
#16 lore raw

PATCH 14/14 gtk-engines: Update to 2.20.2

In reply to Zhai Edwin
---
 ...gtk-engines_2.14.0.bb => gtk-engines_2.20.2.bb} |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)
 rename meta/recipes-gnome/gtk-engines/{gtk-engines_2.14.0.bb => gtk-engines_2.20.2.bb} (85%)
meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb renamed from meta/recipes-gnome/gtk-engines/gtk-engines_2.14.0.bb +8 -3
similarity index 85%
rename from meta/recipes-gnome/gtk-engines/gtk-engines_2.14.0.bb
rename to meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb
index d711f07..3cbc4d7 100644
@@ -1,9 +1,14 @@
-LICENSE = "GPL"
-SECTION = "x11/base"
 DESCRIPTION = "GTK theme engines"
+HOMEPAGE = "http://www.gnome.org/"
+BUGTRACKER = "https://bugzilla.gnome.org/"
+
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
+
+SECTION = "x11/base"
 DEPENDS = "gtk+"
 
-PR = "r1"
+PR = "r0"
 
 PACKAGES_DYNAMIC = "gtk-engine-* gtk-theme-*"
 
Signature · 1 line
1.7.0.4
author
#2 lore raw

PATCH 2/14 tidy: Add license checksum

In reply to Zhai Edwin
---
 meta/recipes-graphics/clutter/tidy.inc    |    2 +-
 meta/recipes-graphics/clutter/tidy_git.bb |    3 +++
 2 files changed, 4 insertions(+), 1 deletions(-)
meta/recipes-graphics/clutter/tidy.inc +1 -1
index 7d5862b..1968591 100644
@@ -1,6 +1,6 @@
 DESCRIPTION = "Tidy library"
 HOMEPAGE = "http://www.clutter-project.org/"
-LICENSE = "LGPL"
+LICENSE = "LGPLv2.1+"
 
 STDDEPENDS = "clutter-1.0"
 BASE_CONF = "--disable-gtk-doc"
meta/recipes-graphics/clutter/tidy_git.bb +3 -0
index 1785260..222ac6e 100644
@@ -1,5 +1,8 @@
 require tidy.inc
 
+LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 \
+                    file://tidy/tidy.h;endline=21;md5=ac342e7aac55849bf0755d79967fa3e8"
+
 PV = "0.1.0+git${SRCPV}"
 PR = "r7"
 
Signature · 1 line
1.7.0.4
author
#14 lore raw

PATCH 12/14 gnome-desktop: Update to 2.32.1

In reply to Zhai Edwin

Removed no-desktop-docs.patch, as it is already in upstream.

---
 meta/recipes-gnome/gnome/gnome-desktop.inc         |    2 +-
 .../gnome/gnome-desktop/no-desktop-docs.patch      |   10 ----------
 meta/recipes-gnome/gnome/gnome-desktop_2.26.2.bb   |    3 ---
 meta/recipes-gnome/gnome/gnome-desktop_2.32.1.bb   |    4 ++++
 4 files changed, 5 insertions(+), 14 deletions(-)
 delete mode 100644 meta/recipes-gnome/gnome/gnome-desktop/no-desktop-docs.patch
 delete mode 100644 meta/recipes-gnome/gnome/gnome-desktop_2.26.2.bb
 create mode 100644 meta/recipes-gnome/gnome/gnome-desktop_2.32.1.bb
meta/recipes-gnome/gnome/gnome-desktop.inc +1 -1
index de3f751..fb330a5 100644
@@ -1,6 +1,6 @@
 DESCRIPTION = "GNOME library for reading .desktop files"
 SECTION = "x11/gnome"
-LICENSE = "GPL"
+LICENSE = "GPLv2 & LGPLv2"
 DEPENDS = "gconf-dbus libxrandr virtual/libx11 gtk+ glib-2.0 gnome-doc-utils"
 
 EXTRA_OECONF = "--disable-scrollkeeper"
meta/recipes-gnome/gnome/gnome-desktop/no-desktop-docs.patch deleted +0 -10
deleted file mode 100644
index c132341..0000000
@@ -1,10 +0,0 @@
---- Makefile.am~	2007-05-22 16:50:35.000000000 +0200
-+++ Makefile.am	2007-05-22 16:50:35.000000000 +0200
-@@ -3,7 +3,6 @@
- 	libgnome-desktop 	\
- 	gnome-about 		\
- 	pixmaps			\
--	desktop-docs		\
- 	docs			\
- 	man
- 
meta/recipes-gnome/gnome/gnome-desktop_2.26.2.bb deleted +0 -3
deleted file mode 100644
index f4184a4..0000000
@@ -1,3 +0,0 @@
-require gnome-desktop.inc
-
-SRC_URI += "file://no-desktop-docs.patch;patch=1;pnum=0"
meta/recipes-gnome/gnome/gnome-desktop_2.32.1.bb new file +4 -0
new file mode 100644
index 0000000..fa3ffb2
@@ -0,0 +1,4 @@
+require gnome-desktop.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+                    file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2"
Signature · 1 line
1.7.0.4
author
#10 lore raw

PATCH 8/14 puzzles: Update to svn r9023

In reply to Zhai Edwin

Removed makedist_hack.patch, as makedist.sh is no longer exist in upstream and mkfiles.pl is called directly now.

---
 .../recipes-sato/puzzles/files/makedist_hack.patch |   17 -----------------
 .../puzzles/{puzzles_r7593.bb => puzzles_r9023.bb} |   14 ++++++++------
 2 files changed, 8 insertions(+), 23 deletions(-)
 delete mode 100644 meta/recipes-sato/puzzles/files/makedist_hack.patch
 rename meta/recipes-sato/puzzles/{puzzles_r7593.bb => puzzles_r9023.bb} (74%)
meta/recipes-sato/puzzles/files/makedist_hack.patch deleted +0 -17
deleted file mode 100644
index d07e066..0000000
@@ -1,17 +0,0 @@
----
- makedist.sh |    2 ++
- 1 file changed, 2 insertions(+)
-
-Index: puzzles/makedist.sh
-===================================================================
---- puzzles.orig/makedist.sh	2007-05-17 11:49:59.000000000 +0100
-+++ puzzles/makedist.sh	2007-05-17 12:07:39.000000000 +0100
-@@ -30,6 +30,8 @@ fi
- 
- perl mkfiles.pl
- 
-+exit 0
-+
- mkdir tmp.$$
- mkdir tmp.$$/puzzles$arcsuffix
- 
meta/recipes-sato/puzzles/puzzles_r9023.bb renamed from meta/recipes-sato/puzzles/puzzles_r7593.bb +8 -6
similarity index 74%
rename from meta/recipes-sato/puzzles/puzzles_r7593.bb
rename to meta/recipes-sato/puzzles/puzzles_r9023.bb
index 7471352..e51bd7a 100644
@@ -1,18 +1,20 @@
+DESCRIPTION="Simon Tatham's Portable Puzzle Collection"
+HOMEPAGE="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/"
 
 DEPENDS = "gtk+ libxt"
-PR = "r8"
+PR = "r0"
 MOD_PV = "${@bb.data.getVar('PV',d,1)[1:]}"
 
 LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENCE;md5=9928b60f3b78be315b7ab699c1b03ff5"
 
-#SRC_URI = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.tar.gz"
-SRC_URI = "svn://ixion.tartarus.org/main;module=puzzles;rev=${MOD_PV} \
-           file://makedist_hack.patch;patch=1"
+SRC_URI = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.tar.gz"
+#SRC_URI = "svn://ixion.tartarus.org/main;module=puzzles;rev=${MOD_PV}"
 
-S = "${WORKDIR}/${PN}"
+S = "${WORKDIR}/${PN}-${PV}"
 
 do_configure () {
-	./makedist.sh ${MOD_PV}
+	./mkfiles.pl
 }
 
 do_compile_prepend = " \
Signature · 1 line
1.7.0.4
author
#12 lore raw

PATCH 10/14 x11vnc: Update to 0.9.12

In reply to Zhai Edwin
---
 meta/recipes-graphics/x11vnc/x11vnc_0.9.12.bb |   15 +++++++++++++++
 meta/recipes-graphics/x11vnc/x11vnc_0.9.3.bb  |   11 -----------
 2 files changed, 15 insertions(+), 11 deletions(-)
 create mode 100644 meta/recipes-graphics/x11vnc/x11vnc_0.9.12.bb
 delete mode 100644 meta/recipes-graphics/x11vnc/x11vnc_0.9.3.bb
meta/recipes-graphics/x11vnc/x11vnc_0.9.12.bb new file +15 -0
new file mode 100644
index 0000000..af21786
@@ -0,0 +1,15 @@
+DESCRIPTION = "Export your X session on-the-fly via VNC"
+HOMEPAGE = "http://www.karlrunge.com/x11vnc/"
+
+SECTION = "x11/utils"
+AUTHOR = "Karl Runge"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=361b6b837cad26c6900a926b62aada5f \
+                    file://x11vnc/x11vnc.h;endline=33;md5=ee4946e57bb73ecf93d7d98a3d48c6be"
+
+DEPENDS = "openssl virtual/libx11 libxext avahi jpeg zlib"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/x11vnc-${PV}.tar.gz"
+
+inherit autotools
+
meta/recipes-graphics/x11vnc/x11vnc_0.9.3.bb deleted +0 -11
deleted file mode 100644
index 5269ff3..0000000
@@ -1,11 +0,0 @@
-DESCRIPTION = "Export your X session on-the-fly via VNC"
-SECTION = "x11/utils"
-HOMEPAGE = "http://www.karlrunge.com/x11vnc/"
-AUTHOR = "Karl Runge"
-LICENSE = "GPL"
-DEPENDS = "openssl virtual/libx11 libxext avahi jpeg zlib"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/x11vnc-${PV}.tar.gz"
-
-inherit autotools
-
Signature · 1 line
1.7.0.4
author
#13 lore raw

PATCH 11/14 web: Update to svn r129

In reply to Zhai Edwin
---
 .../conf/distro/include/poky-default-revisions.inc |    2 +-
 meta/recipes-sato/web/web_svn.bb                   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
meta/conf/distro/include/poky-default-revisions.inc +1 -1
index 015df5a..fb510af 100644
@@ -160,7 +160,7 @@ SRCREV_pn-u-boot-omap3 ??= "f40f6db278f602b55820693634a7256b0b4e4b80"
 SRCREV_pn-ubootchart ??= "10"
 SRCREV_pn-webkit-gtk ??= "62027"
 SRCREV_pn-web-webkit ??= "110"
-SRCREV_pn-web ??= "97"
+SRCREV_pn-web ??= "129"
 SRCREV_pn-xcb-proto ??= "d81ca233e98be8fa59e8c90d262c0516944c5a66"
 SRCREV_pn-xcb-proto-native ??= "d81ca233e98be8fa59e8c90d262c0516944c5a66"
 SRCREV_pn-xf86-video-intel ??= "87ea531c5dc5b39809395b277c330854aaaaf019"
meta/recipes-sato/web/web_svn.bb +1 -1
index 09840ae..79838ce 100644
@@ -10,7 +10,7 @@ SRC_URI = 	"svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \
 		file://owl-window-menu.patch \
 		"
 
-LIB_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
 S = "${WORKDIR}/trunk"
 
Signature · 1 line
1.7.0.4
#4 lore raw

Re: [PATCH 03/14] beecrypt: Update to 4.2.1

In reply to Zhai Edwin
Quoted 5 lines · Zhai Edwin

Rebased disable-icu-check.patch& fix-security.patch. Removed x64fix.patch as it is already in upstream. Also some configure changes: removing "--with-arch" as it can't cowork with expert mode, adding "--disable-openmp" to avoid unnecessary dependency.

Edwin:

I am not taking this patch

The --with-arch is needed for correct cross-compilation, please review this change and resubmit. Did you test on cross-compiling?

Is openmp a newly supported option to beecrypt? What are the dependencies?

Sau!

Quoted 172 lines
---
  .../beecrypt/beecrypt/disable-icu-check.patch      |   12 ++--
  .../beecrypt/beecrypt/fix-security.patch           |   51 ++++++++++----------
  .../recipes-support/beecrypt/beecrypt/x64fix.patch |   23 ---------
  .../{beecrypt_4.1.2.bb =>  beecrypt_4.2.1.bb}       |    9 ++--
  4 files changed, 37 insertions(+), 58 deletions(-)

delete mode 100644 meta/recipes-support/beecrypt/beecrypt/x64fix.patch rename meta/recipes-support/beecrypt/{beecrypt_4.1.2.bb => beecrypt_4.2.1.bb} (65%)

meta/recipes-support/beecrypt/beecrypt/disable-icu-check.patch +6 -6
index 3e18a87..4a2f414 100644
@@ -2,11 +2,11 @@ We are unable to run code at configure time in a cross environemnt, but as we
  control the build we can be fairly certain this dependency is met.
 
  JL 05/07/10
-Index: beecrypt-4.1.2/configure.ac
+Index: beecrypt-4.2.1/configure.ac
  ===================================================================
---- beecrypt-4.1.2.orig/configure.ac	2004-12-21 11:37:56.000000000 +0000
-+++ beecrypt-4.1.2/configure.ac	2010-07-05 16:09:50.390083494 +0100
-@@ -243,32 +243,6 @@
+--- beecrypt-4.2.1.orig/configure.ac	2010-11-26 17:12:25.000000000 +0800
++++ beecrypt-4.2.1/configure.ac	2010-11-26 17:12:30.000000000 +0800
+@@ -292,32 +292,6 @@
   # Predefines and checks for C++ API support
   AH_TEMPLATE([CPPGLUE],[Define to 1 if you want to include the C++ code])
 
@@ -36,6 +36,6 @@ Index: beecrypt-4.1.2/configure.ac
  -  AC_LANG_POP(C)
  -fi
  -
+ AM_CONDITIONAL([WITH_CPLUSPLUS],[test "$ac_with_cplusplus" = yes])
+
   if test "$ac_with_cplusplus" = yes ; then
-   AC_DEFINE([CPPGLUE],1)
- fi
meta/recipes-support/beecrypt/beecrypt/fix-security.patch +26 -25
index 6103562..f28e393 100644
@@ -3,20 +3,38 @@ project:
  http://www.mail-archive.com/[email protected]/msg75742.html
 
  JL 05/07/10
-Index: beecrypt-4.1.2/c++/security/Security.h
+Index: beecrypt-4.2.1/include/beecrypt/c++/beeyond/BeeCertificate.h
  ===================================================================
---- beecrypt-4.1.2.orig/c++/security/Security.h	2010-07-05 17:15:34.811273306 +0100
-+++ beecrypt-4.1.2/c++/security/Security.h	2010-07-05 17:15:38.696388531 +0100
-@@ -75,8 +75,6 @@
+--- beecrypt-4.2.1.orig/include/beecrypt/c++/beeyond/BeeCertificate.h	2010-11-26 17:22:57.000000000 +0800
++++ beecrypt-4.2.1/include/beecrypt/c++/beeyond/BeeCertificate.h	2010-11-26 17:23:01.000000000 +0800
+@@ -147,13 +147,13 @@
+ 			mutable bytearray* enc;
+
+ 			BeeCertificate();
+-			BeeCertificate(InputStream&  in) throw (IOException);
+
+ 			void encodeTBS(DataOutputStream&  out) const throw (IOException);
+
+ 			bytearray* encodeTBS() const throw (CertificateEncodingException);
+
   		public:
- 			typedef vector<const Provider*>  provider_vector;
- 			typedef provider_vector::iterator provider_vector_iterator;
--
++			BeeCertificate(InputStream&  in) throw (IOException);
+ 			BeeCertificate(const BeeCertificate&) throw (CloneNotSupportedException);
+ 			virtual ~BeeCertificate();
+
+Index: beecrypt-4.2.1/include/beecrypt/c++/security/Security.h
+===================================================================
+--- beecrypt-4.2.1.orig/include/beecrypt/c++/security/Security.h	2010-11-26 17:20:55.000000000 +0800
++++ beecrypt-4.2.1/include/beecrypt/c++/security/Security.h	2010-11-26 17:21:36.000000000 +0800
+@@ -61,7 +61,6 @@
+ 			friend class SecureRandom;
+ 			friend class Signature;
+
  -		private:
   			struct spi
   			{
   				Object* cspi;
-@@ -91,6 +89,7 @@
+@@ -76,6 +75,7 @@
   			static spi* getSpi(const String&  algo, const String&  type, const Provider&) throw (NoSuchAlgorithmException);
   			static spi* getFirstSpi(const String&  type);
 
@@ -24,20 +42,3 @@ Index: beecrypt-4.1.2/c++/security/Security.h
   			static const String&  getKeyStoreDefault();
 
   			static bool _init;
-Index: beecrypt-4.1.2/c++/beeyond/BeeCertificate.h
-===================================================================
---- beecrypt-4.1.2.orig/c++/beeyond/BeeCertificate.h	2004-11-03 09:37:27.000000000 +0000
-+++ beecrypt-4.1.2/c++/beeyond/BeeCertificate.h	2010-07-05 17:16:25.216332324 +0100
-@@ -150,11 +150,11 @@
- 			mutable String* str;
-
- 			BeeCertificate();
--			BeeCertificate(InputStream&  in) throw (IOException);
-
- 			bytearray* encodeTBS() const;
-
- 		public:
-+			BeeCertificate(InputStream&  in) throw (IOException);
- 			BeeCertificate(const BeeCertificate&);
- 			virtual ~BeeCertificate();
-
meta/recipes-support/beecrypt/beecrypt/x64fix.patch deleted +0 -23
deleted file mode 100644
index ac02425..0000000
@@ -1,23 +0,0 @@
-Don't have 64 appended to the libdir for 64bit platforms.
-
-JL 05/07/10
-Index: beecrypt-4.1.2/configure.ac
-===================================================================
---- beecrypt-4.1.2.orig/configure.ac	2010-07-05 16:39:43.000000000 +0100
-+++ beecrypt-4.1.2/configure.ac	2010-07-05 16:40:27.521082866 +0100
-@@ -585,15 +585,6 @@
-
- # Check where to install the libraries
- bc_libalt=
--case $target_os in
--linux*)
--  case $bc_target_arch in
--  powerpc64 | s390x | x86_64)
--    bc_libalt="64"
--    ;;
--  esac
--  ;;
--esac
- AC_SUBST(LIBALT,$bc_libalt)
-
- # Generate output files.
meta/recipes-support/beecrypt/beecrypt_4.2.1.bb renamed from meta/recipes-support/beecrypt/beecrypt_4.1.2.bb +5 -4
similarity index 65%
rename from meta/recipes-support/beecrypt/beecrypt_4.1.2.bb
rename to meta/recipes-support/beecrypt/beecrypt_4.2.1.bb
index 0da36d9..8f2ffc6 100644
@@ -5,12 +5,13 @@
  DESCRIPTION="Beecrypt is a general-purpose cryptography library."
  HOMEPAGE="http://sourceforge.net/projects/beecrypt"
  SRC_URI="${SOURCEFORGE_MIRROR}/beecrypt/beecrypt-${PV}.tar.gz \
-	 file://x64fix.patch \
  	 file://disable-icu-check.patch \
  	 file://fix-security.patch"
-LICENSE = "GPLv2&LGPLv2.1"
+LICENSE = "GPLv2&  LGPLv2.1"
  LIC_FILES_CHKSUM = "file://COPYING;md5=9894370afd5dfe7d02b8d14319e729a1 \
-	            file://COPYING.LIB;md5=dcf3c825659e82539645da41a7908589"
+                    file://COPYING.LIB;md5=dcf3c825659e82539645da41a7908589 \
+                    file://include/beecrypt/beecrypt.h;endline=20;md5=47a93eef539aac237eef86297a4d71c1"
+
  DEPENDS = "icu"
 
  PR = "r0"
@@ -18,6 +19,6 @@ PR = "r0"
  inherit autotools
  acpaths=""
 
-EXTRA_OECONF="--with-arch=${TARGET_ARCH} --without-python --enable-shared --enable-static"
+EXTRA_OECONF="--without-python --enable-shared --enable-static --disable-openmp"
 
  BBCLASSEXTEND = "native"
#5 lore raw

Re: [PATCH 03/14] beecrypt: Update to 4.2.1

Quoted 9 lines · Saul
Quoted 6 lines · Zhai Edwin

Rebased disable-icu-check.patch& fix-security.patch. Removed x64fix.patch as it is already in upstream. Also some configure changes: removing "--with-arch" as it can't cowork with expert mode, adding "--disable-openmp" to avoid unnecessary dependency.

Quoted 6 lines

Edwin:

I am not taking this patch

The --with-arch is needed for correct cross-compilation, please review this change and resubmit. Did you test on cross-compiling?

Yes, cross-compile with arm/x86 works well. Without "--with-arch", poky still can figure out the build/host/target for beecrypt. "-enable-expert-mode" is one new configure option that allow customized CFLAGS, and is enabled by default as poky always set CFLAGS.

Quoted 1 line

Is openmp a newly supported option to beecrypt?

Yes

Quoted 2 lines

What are the dependencies?

Without "--disable-openmp", beecrypt would be linked with some *so from openmp(absent). Then rpm configure get failed as it found libbeecrypt.so linked with missing *so.

Quoted 179 lines

Sau!

Quoted 173 lines
---
  .../beecrypt/beecrypt/disable-icu-check.patch      |   12 ++--
  .../beecrypt/beecrypt/fix-security.patch           |   51 ++++++++++----------
  .../recipes-support/beecrypt/beecrypt/x64fix.patch |   23 ---------
  .../{beecrypt_4.1.2.bb =>  beecrypt_4.2.1.bb}       |    9 ++--
  4 files changed, 37 insertions(+), 58 deletions(-)

delete mode 100644 meta/recipes-support/beecrypt/beecrypt/x64fix.patch rename meta/recipes-support/beecrypt/{beecrypt_4.1.2.bb => beecrypt_4.2.1.bb} (65%)

meta/recipes-support/beecrypt/beecrypt/disable-icu-check.patch +6 -6
index 3e18a87..4a2f414 100644
@@ -2,11 +2,11 @@ We are unable to run code at configure time in a cross environemnt, but as we
  control the build we can be fairly certain this dependency is met.
 
  JL 05/07/10
-Index: beecrypt-4.1.2/configure.ac
+Index: beecrypt-4.2.1/configure.ac
  ===================================================================
---- beecrypt-4.1.2.orig/configure.ac	2004-12-21 11:37:56.000000000 +0000
-+++ beecrypt-4.1.2/configure.ac	2010-07-05 16:09:50.390083494 +0100
-@@ -243,32 +243,6 @@
+--- beecrypt-4.2.1.orig/configure.ac	2010-11-26 17:12:25.000000000 +0800
++++ beecrypt-4.2.1/configure.ac	2010-11-26 17:12:30.000000000 +0800
+@@ -292,32 +292,6 @@
   # Predefines and checks for C++ API support
   AH_TEMPLATE([CPPGLUE],[Define to 1 if you want to include the C++ code])
 
@@ -36,6 +36,6 @@ Index: beecrypt-4.1.2/configure.ac
  -  AC_LANG_POP(C)
  -fi
  -
+ AM_CONDITIONAL([WITH_CPLUSPLUS],[test "$ac_with_cplusplus" = yes])
+
   if test "$ac_with_cplusplus" = yes ; then
-   AC_DEFINE([CPPGLUE],1)
- fi
meta/recipes-support/beecrypt/beecrypt/fix-security.patch +26 -25
index 6103562..f28e393 100644
@@ -3,20 +3,38 @@ project:
  http://www.mail-archive.com/[email protected]/msg75742.html
 
  JL 05/07/10
-Index: beecrypt-4.1.2/c++/security/Security.h
+Index: beecrypt-4.2.1/include/beecrypt/c++/beeyond/BeeCertificate.h
  ===================================================================
---- beecrypt-4.1.2.orig/c++/security/Security.h	2010-07-05 17:15:34.811273306 +0100
-+++ beecrypt-4.1.2/c++/security/Security.h	2010-07-05 17:15:38.696388531 +0100
-@@ -75,8 +75,6 @@
+--- beecrypt-4.2.1.orig/include/beecrypt/c++/beeyond/BeeCertificate.h	2010-11-26 17:22:57.000000000 +0800
++++ beecrypt-4.2.1/include/beecrypt/c++/beeyond/BeeCertificate.h	2010-11-26 17:23:01.000000000 +0800
+@@ -147,13 +147,13 @@
+ 			mutable bytearray* enc;
+
+ 			BeeCertificate();
+-			BeeCertificate(InputStream&  in) throw (IOException);
+
+ 			void encodeTBS(DataOutputStream&  out) const throw (IOException);
+
+ 			bytearray* encodeTBS() const throw (CertificateEncodingException);
+
   		public:
- 			typedef vector<const Provider*>  provider_vector;
- 			typedef provider_vector::iterator provider_vector_iterator;
--
++			BeeCertificate(InputStream&  in) throw (IOException);
+ 			BeeCertificate(const BeeCertificate&) throw (CloneNotSupportedException);
+ 			virtual ~BeeCertificate();
+
+Index: beecrypt-4.2.1/include/beecrypt/c++/security/Security.h
+===================================================================
+--- beecrypt-4.2.1.orig/include/beecrypt/c++/security/Security.h	2010-11-26 17:20:55.000000000 +0800
++++ beecrypt-4.2.1/include/beecrypt/c++/security/Security.h	2010-11-26 17:21:36.000000000 +0800
+@@ -61,7 +61,6 @@
+ 			friend class SecureRandom;
+ 			friend class Signature;
+
  -		private:
   			struct spi
   			{
   				Object* cspi;
-@@ -91,6 +89,7 @@
+@@ -76,6 +75,7 @@
   			static spi* getSpi(const String&  algo, const String&  type, const Provider&) throw (NoSuchAlgorithmException);
   			static spi* getFirstSpi(const String&  type);
 
@@ -24,20 +42,3 @@ Index: beecrypt-4.1.2/c++/security/Security.h
   			static const String&  getKeyStoreDefault();
 
   			static bool _init;
-Index: beecrypt-4.1.2/c++/beeyond/BeeCertificate.h
-===================================================================
---- beecrypt-4.1.2.orig/c++/beeyond/BeeCertificate.h	2004-11-03 09:37:27.000000000 +0000
-+++ beecrypt-4.1.2/c++/beeyond/BeeCertificate.h	2010-07-05 17:16:25.216332324 +0100
-@@ -150,11 +150,11 @@
- 			mutable String* str;
-
- 			BeeCertificate();
--			BeeCertificate(InputStream&  in) throw (IOException);
-
- 			bytearray* encodeTBS() const;
-
- 		public:
-+			BeeCertificate(InputStream&  in) throw (IOException);
- 			BeeCertificate(const BeeCertificate&);
- 			virtual ~BeeCertificate();
-
meta/recipes-support/beecrypt/beecrypt/x64fix.patch deleted +0 -23
deleted file mode 100644
index ac02425..0000000
@@ -1,23 +0,0 @@
-Don't have 64 appended to the libdir for 64bit platforms.
-
-JL 05/07/10
-Index: beecrypt-4.1.2/configure.ac
-===================================================================
---- beecrypt-4.1.2.orig/configure.ac	2010-07-05 16:39:43.000000000 +0100
-+++ beecrypt-4.1.2/configure.ac	2010-07-05 16:40:27.521082866 +0100
-@@ -585,15 +585,6 @@
-
- # Check where to install the libraries
- bc_libalt=
--case $target_os in
--linux*)
--  case $bc_target_arch in
--  powerpc64 | s390x | x86_64)
--    bc_libalt="64"
--    ;;
--  esac
--  ;;
--esac
- AC_SUBST(LIBALT,$bc_libalt)
-
- # Generate output files.
meta/recipes-support/beecrypt/beecrypt_4.2.1.bb renamed from meta/recipes-support/beecrypt/beecrypt_4.1.2.bb +5 -4
similarity index 65%
rename from meta/recipes-support/beecrypt/beecrypt_4.1.2.bb
rename to meta/recipes-support/beecrypt/beecrypt_4.2.1.bb
index 0da36d9..8f2ffc6 100644
@@ -5,12 +5,13 @@
  DESCRIPTION="Beecrypt is a general-purpose cryptography library."
  HOMEPAGE="http://sourceforge.net/projects/beecrypt"
  SRC_URI="${SOURCEFORGE_MIRROR}/beecrypt/beecrypt-${PV}.tar.gz \
-	 file://x64fix.patch \
  	 file://disable-icu-check.patch \
  	 file://fix-security.patch"
-LICENSE = "GPLv2&LGPLv2.1"
+LICENSE = "GPLv2&  LGPLv2.1"
  LIC_FILES_CHKSUM = "file://COPYING;md5=9894370afd5dfe7d02b8d14319e729a1 \
-	            file://COPYING.LIB;md5=dcf3c825659e82539645da41a7908589"
+                    file://COPYING.LIB;md5=dcf3c825659e82539645da41a7908589 \
+                    file://include/beecrypt/beecrypt.h;endline=20;md5=47a93eef539aac237eef86297a4d71c1"
+
  DEPENDS = "icu"
 
  PR = "r0"
@@ -18,6 +19,6 @@ PR = "r0"
  inherit autotools
  acpaths=""
 
-EXTRA_OECONF="--with-arch=${TARGET_ARCH} --without-python --enable-shared --enable-static"
+EXTRA_OECONF="--without-python --enable-shared --enable-static --disable-openmp"
 
  BBCLASSEXTEND = "native"