* [PATCH 04/14] acpid: update to 1.0.10
2010-12-03 5:35 [PATCH 00/14] X apps and base utils upgrade, Edwin, Dec3 2010 Zhai Edwin
@ 2010-11-26 5:56 ` Zhai Edwin
2010-11-26 8:57 ` [PATCH 03/14] beecrypt: Update to 4.2.1 Zhai Edwin
` (12 subsequent siblings)
13 siblings, 0 replies; 18+ messages in thread
From: Zhai Edwin @ 2010-11-26 5:56 UTC (permalink / raw)
To: poky
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
---
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
diff --git a/meta/recipes-bsp/acpid/acpid.inc b/meta/recipes-bsp/acpid/acpid.inc
index 8ac523d..3c0219f 100644
--- a/meta/recipes-bsp/acpid/acpid.inc
+++ b/meta/recipes-bsp/acpid/acpid.inc
@@ -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"
diff --git a/meta/recipes-bsp/acpid/acpid_1.0.10.bb b/meta/recipes-bsp/acpid/acpid_1.0.10.bb
new file mode 100644
index 0000000..ab4b582
--- /dev/null
+++ b/meta/recipes-bsp/acpid/acpid_1.0.10.bb
@@ -0,0 +1,6 @@
+require acpid.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \
+ file://acpid.h;endline=24;md5=324a9cf225ae69ddaad1bf9d942115b5"
+
+PR = "r0"
diff --git a/meta/recipes-bsp/acpid/acpid_1.0.6.bb b/meta/recipes-bsp/acpid/acpid_1.0.6.bb
deleted file mode 100644
index a95cb54..0000000
--- a/meta/recipes-bsp/acpid/acpid_1.0.6.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require acpid.inc
-LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
-PR = "r5"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 03/14] beecrypt: Update to 4.2.1
2010-12-03 5:35 [PATCH 00/14] X apps and base utils upgrade, Edwin, Dec3 2010 Zhai Edwin
2010-11-26 5:56 ` [PATCH 04/14] acpid: update to 1.0.10 Zhai Edwin
@ 2010-11-26 8:57 ` Zhai Edwin
2010-12-03 19:22 ` Saul Wold
2010-11-26 15:10 ` [PATCH 02/14] tidy: Add license checksum Zhai Edwin
` (11 subsequent siblings)
13 siblings, 1 reply; 18+ messages in thread
From: Zhai Edwin @ 2010-11-26 8:57 UTC (permalink / raw)
To: poky
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.
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
---
.../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%)
diff --git a/meta/recipes-support/beecrypt/beecrypt/disable-icu-check.patch b/meta/recipes-support/beecrypt/beecrypt/disable-icu-check.patch
index 3e18a87..4a2f414 100644
--- a/meta/recipes-support/beecrypt/beecrypt/disable-icu-check.patch
+++ b/meta/recipes-support/beecrypt/beecrypt/disable-icu-check.patch
@@ -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
diff --git a/meta/recipes-support/beecrypt/beecrypt/fix-security.patch b/meta/recipes-support/beecrypt/beecrypt/fix-security.patch
index 6103562..f28e393 100644
--- a/meta/recipes-support/beecrypt/beecrypt/fix-security.patch
+++ b/meta/recipes-support/beecrypt/beecrypt/fix-security.patch
@@ -3,20 +3,38 @@ project:
http://www.mail-archive.com/fink-commits@lists.sourceforge.net/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();
-
diff --git a/meta/recipes-support/beecrypt/beecrypt/x64fix.patch b/meta/recipes-support/beecrypt/beecrypt/x64fix.patch
deleted file mode 100644
index ac02425..0000000
--- a/meta/recipes-support/beecrypt/beecrypt/x64fix.patch
+++ /dev/null
@@ -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.
diff --git a/meta/recipes-support/beecrypt/beecrypt_4.1.2.bb b/meta/recipes-support/beecrypt/beecrypt_4.2.1.bb
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
--- a/meta/recipes-support/beecrypt/beecrypt_4.1.2.bb
+++ b/meta/recipes-support/beecrypt/beecrypt_4.2.1.bb
@@ -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"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 02/14] tidy: Add license checksum
2010-12-03 5:35 [PATCH 00/14] X apps and base utils upgrade, Edwin, Dec3 2010 Zhai Edwin
2010-11-26 5:56 ` [PATCH 04/14] acpid: update to 1.0.10 Zhai Edwin
2010-11-26 8:57 ` [PATCH 03/14] beecrypt: Update to 4.2.1 Zhai Edwin
@ 2010-11-26 15:10 ` Zhai Edwin
2010-11-26 15:53 ` [PATCH 01/14] pointercal: " Zhai Edwin
` (10 subsequent siblings)
13 siblings, 0 replies; 18+ messages in thread
From: Zhai Edwin @ 2010-11-26 15:10 UTC (permalink / raw)
To: poky
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
---
meta/recipes-graphics/clutter/tidy.inc | 2 +-
meta/recipes-graphics/clutter/tidy_git.bb | 3 +++
2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-graphics/clutter/tidy.inc b/meta/recipes-graphics/clutter/tidy.inc
index 7d5862b..1968591 100644
--- a/meta/recipes-graphics/clutter/tidy.inc
+++ b/meta/recipes-graphics/clutter/tidy.inc
@@ -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"
diff --git a/meta/recipes-graphics/clutter/tidy_git.bb b/meta/recipes-graphics/clutter/tidy_git.bb
index 1785260..222ac6e 100644
--- a/meta/recipes-graphics/clutter/tidy_git.bb
+++ b/meta/recipes-graphics/clutter/tidy_git.bb
@@ -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"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 01/14] pointercal: Add license checksum
2010-12-03 5:35 [PATCH 00/14] X apps and base utils upgrade, Edwin, Dec3 2010 Zhai Edwin
` (2 preceding siblings ...)
2010-11-26 15:10 ` [PATCH 02/14] tidy: Add license checksum Zhai Edwin
@ 2010-11-26 15:53 ` Zhai Edwin
2010-11-28 7:24 ` [PATCH 05/14] consolekit: Update to 0.4.3 Zhai Edwin
` (9 subsequent siblings)
13 siblings, 0 replies; 18+ messages in thread
From: Zhai Edwin @ 2010-11-26 15:53 UTC (permalink / raw)
To: poky
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
---
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
diff --git a/meta/recipes-bsp/pointercal/files/COPYING b/meta/recipes-bsp/pointercal/files/COPYING
new file mode 100644
index 0000000..63f5293
--- /dev/null
+++ b/meta/recipes-bsp/pointercal/files/COPYING
@@ -0,0 +1,2 @@
+This is a blank COPYING file, and should be filled in by original author in future.
+
diff --git a/meta/recipes-bsp/pointercal/pointercal_0.0.bb b/meta/recipes-bsp/pointercal/pointercal_0.0.bb
index 3112c97..069d850 100644
--- a/meta/recipes-bsp/pointercal/pointercal_0.0.bb
+++ b/meta/recipes-bsp/pointercal/pointercal_0.0.bb
@@ -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() {
--
1.7.0.4
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 05/14] consolekit: Update to 0.4.3
2010-12-03 5:35 [PATCH 00/14] X apps and base utils upgrade, Edwin, Dec3 2010 Zhai Edwin
` (3 preceding siblings ...)
2010-11-26 15:53 ` [PATCH 01/14] pointercal: " Zhai Edwin
@ 2010-11-28 7:24 ` Zhai Edwin
2010-11-28 7:48 ` [PATCH 06/14] eee-acpi-scripts: Update to 1.1.11 Zhai Edwin
` (8 subsequent siblings)
13 siblings, 0 replies; 18+ messages in thread
From: Zhai Edwin @ 2010-11-28 7:24 UTC (permalink / raw)
To: poky
Rebased nopolkit.patch.
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
---
.../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
diff --git a/meta/recipes-support/consolekit/consolekit_0.3.0.bb b/meta/recipes-support/consolekit/consolekit_0.3.0.bb
deleted file mode 100644
index 0d0dfea..0000000
--- a/meta/recipes-support/consolekit/consolekit_0.3.0.bb
+++ /dev/null
@@ -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"
-
-
-
-
diff --git a/meta/recipes-support/consolekit/files/nopolkit.patch b/meta/recipes-support/consolekit/files/nopolkit.patch
index bebbcaf..7a1f02a 100644
--- a/meta/recipes-support/consolekit/files/nopolkit.patch
+++ b/meta/recipes-support/consolekit/files/nopolkit.patch
@@ -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
diff --git a/meta/recipes-tbd/consolekit/consolekit_0.4.3.bb b/meta/recipes-tbd/consolekit/consolekit_0.4.3.bb
new file mode 100644
index 0000000..f1da72b
--- /dev/null
+++ b/meta/recipes-tbd/consolekit/consolekit_0.4.3.bb
@@ -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"
+
+
+
+
--
1.7.0.4
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 06/14] eee-acpi-scripts: Update to 1.1.11
2010-12-03 5:35 [PATCH 00/14] X apps and base utils upgrade, Edwin, Dec3 2010 Zhai Edwin
` (4 preceding siblings ...)
2010-11-28 7:24 ` [PATCH 05/14] consolekit: Update to 0.4.3 Zhai Edwin
@ 2010-11-28 7:48 ` Zhai Edwin
2010-11-28 8:57 ` [PATCH 07/14] ethtool: Update to 2.6.36 Zhai Edwin
` (7 subsequent siblings)
13 siblings, 0 replies; 18+ messages in thread
From: Zhai Edwin @ 2010-11-28 7:48 UTC (permalink / raw)
To: poky
Rebased remove-doc-check.patch
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
---
.../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(-)
diff --git a/meta/conf/distro/include/poky-default-revisions.inc b/meta/conf/distro/include/poky-default-revisions.inc
index eb0eda6..015df5a 100644
--- a/meta/conf/distro/include/poky-default-revisions.inc
+++ b/meta/conf/distro/include/poky-default-revisions.inc
@@ -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}"
diff --git a/meta/recipes-bsp/eee-acpi-scripts/eee-acpi-scripts_git.bb b/meta/recipes-bsp/eee-acpi-scripts/eee-acpi-scripts_git.bb
index 4c26504..d186727 100644
--- a/meta/recipes-bsp/eee-acpi-scripts/eee-acpi-scripts_git.bb
+++ b/meta/recipes-bsp/eee-acpi-scripts/eee-acpi-scripts_git.bb
@@ -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/
}
diff --git a/meta/recipes-bsp/eee-acpi-scripts/files/remove-doc-check.patch b/meta/recipes-bsp/eee-acpi-scripts/files/remove-doc-check.patch
index 8f6c4fc..3e80b7f 100644
--- a/meta/recipes-bsp/eee-acpi-scripts/files/remove-doc-check.patch
+++ b/meta/recipes-bsp/eee-acpi-scripts/files/remove-doc-check.patch
@@ -5,56 +5,54 @@
actions/volume.sh | 3 ---
4 files changed, 12 deletions(-)
-Index: git/actions/hotkey.sh
+Index: git/eeepc-acpi-scripts/hotkey.sh
===================================================================
---- git.orig/actions/hotkey.sh 2008-09-25 11:00:58.000000000 +0200
-+++ git/actions/hotkey.sh 2008-09-25 11:01:04.000000000 +0200
-@@ -1,8 +1,5 @@
+--- git.orig/eeepc-acpi-scripts/hotkey.sh 2010-11-28 16:02:17.000000000 +0800
++++ git/eeepc-acpi-scripts/hotkey.sh 2010-11-28 16:02:44.000000000 +0800
+@@ -1,12 +1,10 @@
#!/bin/sh
+ test -d /sys/bus/platform/devices/eeepc || exit 0
-# do nothing if package is removed
--[ -d /usr/share/doc/eeepc-acpi-scripts ] || exit 0
--
- . /etc/default/eeepc-acpi-scripts
- . /usr/share/eeepc-acpi-scripts/functions.sh
- . /etc/acpi/lib/notify.sh
-Index: git/actions/suspend.sh
-===================================================================
---- git.orig/actions/suspend.sh 2008-09-25 11:00:32.000000000 +0200
-+++ git/actions/suspend.sh 2008-09-25 11:00:37.000000000 +0200
-@@ -1,8 +1,5 @@
- #!/bin/sh
+ PKG=eeepc-acpi-scripts
+ PKG_DIR=/usr/share/acpi-support/$PKG
+ FUNC_LIB=$PKG_DIR/lib/functions.sh
+ DEFAULT=/etc/default/$PKG
+-[ -e "$FUNC_LIB" ] || exit 0
--# do nothing if package is removed
--[ -d /usr/share/doc/eeepc-acpi-scripts ] || exit 0
--
- if (runlevel | grep -q [06]) || (pidof '/sbin/shutdown' > /dev/null); then
- exit 0
- fi
-Index: git/actions/vga-toggle.sh
+ case $(runlevel) in
+ *0|*6)
+Index: git/eeepc-acpi-scripts/vga-toggle.sh
===================================================================
---- git.orig/actions/vga-toggle.sh 2008-09-25 11:02:00.000000000 +0200
-+++ git/actions/vga-toggle.sh 2008-09-25 11:02:06.000000000 +0200
-@@ -1,8 +1,5 @@
+--- git.orig/eeepc-acpi-scripts/vga-toggle.sh 2010-11-28 16:03:57.000000000 +0800
++++ git/eeepc-acpi-scripts/vga-toggle.sh 2010-11-28 16:04:03.000000000 +0800
+@@ -1,12 +1,10 @@
#!/bin/sh
+ test -d /sys/bus/platform/devices/eeepc || exit 0
-# do nothing if package is removed
--[ -d /usr/share/doc/eeepc-acpi-scripts ] || exit 0
--
- . /etc/default/eeepc-acpi-scripts
+ PKG=eeepc-acpi-scripts
+ PKG_DIR=/usr/share/acpi-support/$PKG
+ FUNC_LIB=$PKG_DIR/lib/functions.sh
+ DEFAULT=/etc/default/$PKG
+-[ -e "$FUNC_LIB" ] || exit 0
- # return: 0 on disconnect, 1 on connected vga, 2 else
-Index: git/actions/volume.sh
+ if [ -e "$DEFAULT" ]; then . "$DEFAULT"; fi
+ . $FUNC_LIB
+Index: git/eeepc-acpi-scripts/volume.sh
===================================================================
---- git.orig/actions/volume.sh 2008-09-25 11:02:13.000000000 +0200
-+++ git/actions/volume.sh 2008-09-25 11:02:19.000000000 +0200
-@@ -2,9 +2,6 @@
-
+--- git.orig/eeepc-acpi-scripts/volume.sh 2010-11-28 16:04:34.000000000 +0800
++++ git/eeepc-acpi-scripts/volume.sh 2010-11-28 16:04:40.000000000 +0800
+@@ -3,12 +3,10 @@
+ test -d /sys/bus/platform/devices/eeepc || exit 0
# Volume controls
-# do nothing if package is removed
--[ -d /usr/share/doc/eeepc-acpi-scripts ] || exit 0
--
- . /etc/default/eeepc-acpi-scripts
- . /usr/share/eeepc-acpi-scripts/functions.sh
- . /etc/acpi/lib/notify.sh
+ PKG=eeepc-acpi-scripts
+ PKG_DIR=/usr/share/acpi-support/$PKG
+ FUNC_LIB=$PKG_DIR/lib/functions.sh
+ DEFAULT=/etc/default/$PKG
+-[ -e "$FUNC_LIB" ] || exit 0
+
+ . $FUNC_LIB
+ . $PKG_DIR/lib/sound.sh
--
1.7.0.4
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 07/14] ethtool: Update to 2.6.36
2010-12-03 5:35 [PATCH 00/14] X apps and base utils upgrade, Edwin, Dec3 2010 Zhai Edwin
` (5 preceding siblings ...)
2010-11-28 7:48 ` [PATCH 06/14] eee-acpi-scripts: Update to 1.1.11 Zhai Edwin
@ 2010-11-28 8:57 ` Zhai Edwin
2010-11-30 5:25 ` [PATCH 11/14] web: Update to svn r129 Zhai Edwin
` (6 subsequent siblings)
13 siblings, 0 replies; 18+ messages in thread
From: Zhai Edwin @ 2010-11-28 8:57 UTC (permalink / raw)
To: poky
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
---
.../{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%)
diff --git a/meta/recipes-extended/ethtool/ethtool_2.6.34.bb b/meta/recipes-extended/ethtool/ethtool_2.6.36.bb
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
--
1.7.0.4
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 11/14] web: Update to svn r129
2010-12-03 5:35 [PATCH 00/14] X apps and base utils upgrade, Edwin, Dec3 2010 Zhai Edwin
` (6 preceding siblings ...)
2010-11-28 8:57 ` [PATCH 07/14] ethtool: Update to 2.6.36 Zhai Edwin
@ 2010-11-30 5:25 ` Zhai Edwin
2010-11-30 8:34 ` [PATCH 08/14] puzzles: Update to svn r9023 Zhai Edwin
` (5 subsequent siblings)
13 siblings, 0 replies; 18+ messages in thread
From: Zhai Edwin @ 2010-11-30 5:25 UTC (permalink / raw)
To: poky
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
---
.../conf/distro/include/poky-default-revisions.inc | 2 +-
meta/recipes-sato/web/web_svn.bb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/conf/distro/include/poky-default-revisions.inc b/meta/conf/distro/include/poky-default-revisions.inc
index 015df5a..fb510af 100644
--- a/meta/conf/distro/include/poky-default-revisions.inc
+++ b/meta/conf/distro/include/poky-default-revisions.inc
@@ -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"
diff --git a/meta/recipes-sato/web/web_svn.bb b/meta/recipes-sato/web/web_svn.bb
index 09840ae..79838ce 100644
--- a/meta/recipes-sato/web/web_svn.bb
+++ b/meta/recipes-sato/web/web_svn.bb
@@ -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"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 08/14] puzzles: Update to svn r9023
2010-12-03 5:35 [PATCH 00/14] X apps and base utils upgrade, Edwin, Dec3 2010 Zhai Edwin
` (7 preceding siblings ...)
2010-11-30 5:25 ` [PATCH 11/14] web: Update to svn r129 Zhai Edwin
@ 2010-11-30 8:34 ` Zhai Edwin
2010-11-30 9:17 ` [PATCH 09/14] x11perf: Update to 1.5.2 Zhai Edwin
` (4 subsequent siblings)
13 siblings, 0 replies; 18+ messages in thread
From: Zhai Edwin @ 2010-11-30 8:34 UTC (permalink / raw)
To: poky
Removed makedist_hack.patch, as makedist.sh is no longer exist in upstream and
mkfiles.pl is called directly now.
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
---
.../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%)
diff --git a/meta/recipes-sato/puzzles/files/makedist_hack.patch b/meta/recipes-sato/puzzles/files/makedist_hack.patch
deleted file mode 100644
index d07e066..0000000
--- a/meta/recipes-sato/puzzles/files/makedist_hack.patch
+++ /dev/null
@@ -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
-
diff --git a/meta/recipes-sato/puzzles/puzzles_r7593.bb b/meta/recipes-sato/puzzles/puzzles_r9023.bb
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
--- a/meta/recipes-sato/puzzles/puzzles_r7593.bb
+++ b/meta/recipes-sato/puzzles/puzzles_r9023.bb
@@ -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 = " \
--
1.7.0.4
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 09/14] x11perf: Update to 1.5.2
2010-12-03 5:35 [PATCH 00/14] X apps and base utils upgrade, Edwin, Dec3 2010 Zhai Edwin
` (8 preceding siblings ...)
2010-11-30 8:34 ` [PATCH 08/14] puzzles: Update to svn r9023 Zhai Edwin
@ 2010-11-30 9:17 ` Zhai Edwin
2010-11-30 9:53 ` [PATCH 10/14] x11vnc: Update to 0.9.12 Zhai Edwin
` (3 subsequent siblings)
13 siblings, 0 replies; 18+ messages in thread
From: Zhai Edwin @ 2010-11-30 9:17 UTC (permalink / raw)
To: poky
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
---
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
diff --git a/meta/recipes-graphics/xorg-app/x11perf_1.5.2.bb b/meta/recipes-graphics/xorg-app/x11perf_1.5.2.bb
new file mode 100644
index 0000000..eaa83ac
--- /dev/null
+++ b/meta/recipes-graphics/xorg-app/x11perf_1.5.2.bb
@@ -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"
diff --git a/meta/recipes-graphics/xorg-app/x11perf_1.5.bb b/meta/recipes-graphics/xorg-app/x11perf_1.5.bb
deleted file mode 100644
index 35680e7..0000000
--- a/meta/recipes-graphics/xorg-app/x11perf_1.5.bb
+++ /dev/null
@@ -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"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 10/14] x11vnc: Update to 0.9.12
2010-12-03 5:35 [PATCH 00/14] X apps and base utils upgrade, Edwin, Dec3 2010 Zhai Edwin
` (9 preceding siblings ...)
2010-11-30 9:17 ` [PATCH 09/14] x11perf: Update to 1.5.2 Zhai Edwin
@ 2010-11-30 9:53 ` Zhai Edwin
2010-12-01 0:42 ` [PATCH 12/14] gnome-desktop: Update to 2.32.1 Zhai Edwin
` (2 subsequent siblings)
13 siblings, 0 replies; 18+ messages in thread
From: Zhai Edwin @ 2010-11-30 9:53 UTC (permalink / raw)
To: poky
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
---
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
diff --git a/meta/recipes-graphics/x11vnc/x11vnc_0.9.12.bb b/meta/recipes-graphics/x11vnc/x11vnc_0.9.12.bb
new file mode 100644
index 0000000..af21786
--- /dev/null
+++ b/meta/recipes-graphics/x11vnc/x11vnc_0.9.12.bb
@@ -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
+
diff --git a/meta/recipes-graphics/x11vnc/x11vnc_0.9.3.bb b/meta/recipes-graphics/x11vnc/x11vnc_0.9.3.bb
deleted file mode 100644
index 5269ff3..0000000
--- a/meta/recipes-graphics/x11vnc/x11vnc_0.9.3.bb
+++ /dev/null
@@ -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
-
--
1.7.0.4
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 12/14] gnome-desktop: Update to 2.32.1
2010-12-03 5:35 [PATCH 00/14] X apps and base utils upgrade, Edwin, Dec3 2010 Zhai Edwin
` (10 preceding siblings ...)
2010-11-30 9:53 ` [PATCH 10/14] x11vnc: Update to 0.9.12 Zhai Edwin
@ 2010-12-01 0:42 ` Zhai Edwin
2010-12-01 1:04 ` [PATCH 13/14] gnome-icon-theme: Update to 2.31.0 Zhai Edwin
2010-12-01 5:45 ` [PATCH 14/14] gtk-engines: Update to 2.20.2 Zhai Edwin
13 siblings, 0 replies; 18+ messages in thread
From: Zhai Edwin @ 2010-12-01 0:42 UTC (permalink / raw)
To: poky
Removed no-desktop-docs.patch, as it is already in upstream.
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
---
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
diff --git a/meta/recipes-gnome/gnome/gnome-desktop.inc b/meta/recipes-gnome/gnome/gnome-desktop.inc
index de3f751..fb330a5 100644
--- a/meta/recipes-gnome/gnome/gnome-desktop.inc
+++ b/meta/recipes-gnome/gnome/gnome-desktop.inc
@@ -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"
diff --git a/meta/recipes-gnome/gnome/gnome-desktop/no-desktop-docs.patch b/meta/recipes-gnome/gnome/gnome-desktop/no-desktop-docs.patch
deleted file mode 100644
index c132341..0000000
--- a/meta/recipes-gnome/gnome/gnome-desktop/no-desktop-docs.patch
+++ /dev/null
@@ -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
-
diff --git a/meta/recipes-gnome/gnome/gnome-desktop_2.26.2.bb b/meta/recipes-gnome/gnome/gnome-desktop_2.26.2.bb
deleted file mode 100644
index f4184a4..0000000
--- a/meta/recipes-gnome/gnome/gnome-desktop_2.26.2.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require gnome-desktop.inc
-
-SRC_URI += "file://no-desktop-docs.patch;patch=1;pnum=0"
diff --git a/meta/recipes-gnome/gnome/gnome-desktop_2.32.1.bb b/meta/recipes-gnome/gnome/gnome-desktop_2.32.1.bb
new file mode 100644
index 0000000..fa3ffb2
--- /dev/null
+++ b/meta/recipes-gnome/gnome/gnome-desktop_2.32.1.bb
@@ -0,0 +1,4 @@
+require gnome-desktop.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+ file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 13/14] gnome-icon-theme: Update to 2.31.0
2010-12-03 5:35 [PATCH 00/14] X apps and base utils upgrade, Edwin, Dec3 2010 Zhai Edwin
` (11 preceding siblings ...)
2010-12-01 0:42 ` [PATCH 12/14] gnome-desktop: Update to 2.32.1 Zhai Edwin
@ 2010-12-01 1:04 ` Zhai Edwin
2010-12-01 5:45 ` [PATCH 14/14] gtk-engines: Update to 2.20.2 Zhai Edwin
13 siblings, 0 replies; 18+ messages in thread
From: Zhai Edwin @ 2010-12-01 1:04 UTC (permalink / raw)
To: poky
Rebased the patch iconpath-option.patch
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
---
.../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%)
diff --git a/meta/recipes-gnome/gnome/gnome-icon-theme/iconpath-option.patch b/meta/recipes-gnome/gnome/gnome-icon-theme/iconpath-option.patch
index 935b358..8a16d00 100644
--- a/meta/recipes-gnome/gnome/gnome-icon-theme/iconpath-option.patch
+++ b/meta/recipes-gnome/gnome/gnome-icon-theme/iconpath-option.patch
@@ -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"
diff --git a/meta/recipes-gnome/gnome/gnome-icon-theme_2.22.0.bb b/meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb
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
--- a/meta/recipes-gnome/gnome/gnome-icon-theme_2.22.0.bb
+++ b/meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb
@@ -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"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 14/14] gtk-engines: Update to 2.20.2
2010-12-03 5:35 [PATCH 00/14] X apps and base utils upgrade, Edwin, Dec3 2010 Zhai Edwin
` (12 preceding siblings ...)
2010-12-01 1:04 ` [PATCH 13/14] gnome-icon-theme: Update to 2.31.0 Zhai Edwin
@ 2010-12-01 5:45 ` Zhai Edwin
13 siblings, 0 replies; 18+ messages in thread
From: Zhai Edwin @ 2010-12-01 5:45 UTC (permalink / raw)
To: poky
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
---
...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%)
diff --git a/meta/recipes-gnome/gtk-engines/gtk-engines_2.14.0.bb b/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb
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
--- a/meta/recipes-gnome/gtk-engines/gtk-engines_2.14.0.bb
+++ b/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb
@@ -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-*"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 00/14] X apps and base utils upgrade, Edwin, Dec3 2010
@ 2010-12-03 5:35 Zhai Edwin
2010-11-26 5:56 ` [PATCH 04/14] acpid: update to 1.0.10 Zhai Edwin
` (13 more replies)
0 siblings, 14 replies; 18+ messages in thread
From: Zhai Edwin @ 2010-12-03 5:35 UTC (permalink / raw)
To: poky
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 <edwin.zhai@intel.com>
---
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
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 03/14] beecrypt: Update to 4.2.1
2010-11-26 8:57 ` [PATCH 03/14] beecrypt: Update to 4.2.1 Zhai Edwin
@ 2010-12-03 19:22 ` Saul Wold
2010-12-06 6:49 ` Zhai, Edwin
0 siblings, 1 reply; 18+ messages in thread
From: Saul Wold @ 2010-12-03 19:22 UTC (permalink / raw)
To: Zhai Edwin; +Cc: poky
On 11/26/2010 12:57 AM, Zhai Edwin wrote:
> 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!
> Signed-off-by: Zhai Edwin<edwin.zhai@intel.com>
> ---
> .../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%)
>
> diff --git a/meta/recipes-support/beecrypt/beecrypt/disable-icu-check.patch b/meta/recipes-support/beecrypt/beecrypt/disable-icu-check.patch
> index 3e18a87..4a2f414 100644
> --- a/meta/recipes-support/beecrypt/beecrypt/disable-icu-check.patch
> +++ b/meta/recipes-support/beecrypt/beecrypt/disable-icu-check.patch
> @@ -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
> diff --git a/meta/recipes-support/beecrypt/beecrypt/fix-security.patch b/meta/recipes-support/beecrypt/beecrypt/fix-security.patch
> index 6103562..f28e393 100644
> --- a/meta/recipes-support/beecrypt/beecrypt/fix-security.patch
> +++ b/meta/recipes-support/beecrypt/beecrypt/fix-security.patch
> @@ -3,20 +3,38 @@ project:
> http://www.mail-archive.com/fink-commits@lists.sourceforge.net/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();
> -
> diff --git a/meta/recipes-support/beecrypt/beecrypt/x64fix.patch b/meta/recipes-support/beecrypt/beecrypt/x64fix.patch
> deleted file mode 100644
> index ac02425..0000000
> --- a/meta/recipes-support/beecrypt/beecrypt/x64fix.patch
> +++ /dev/null
> @@ -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.
> diff --git a/meta/recipes-support/beecrypt/beecrypt_4.1.2.bb b/meta/recipes-support/beecrypt/beecrypt_4.2.1.bb
> 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
> --- a/meta/recipes-support/beecrypt/beecrypt_4.1.2.bb
> +++ b/meta/recipes-support/beecrypt/beecrypt_4.2.1.bb
> @@ -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"
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 03/14] beecrypt: Update to 4.2.1
2010-12-03 19:22 ` Saul Wold
@ 2010-12-06 6:49 ` Zhai, Edwin
0 siblings, 0 replies; 18+ messages in thread
From: Zhai, Edwin @ 2010-12-06 6:49 UTC (permalink / raw)
To: Wold, Saul; +Cc: poky
Wold, Saul wrote:
> On 11/26/2010 12:57 AM, Zhai Edwin wrote:
>
>> 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?
>
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.
> Is openmp a newly supported option to beecrypt?
Yes
> 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.
> Sau!
>
>
>
>> Signed-off-by: Zhai Edwin<edwin.zhai@intel.com>
>> ---
>> .../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%)
>>
>> diff --git a/meta/recipes-support/beecrypt/beecrypt/disable-icu-check.patch b/meta/recipes-support/beecrypt/beecrypt/disable-icu-check.patch
>> index 3e18a87..4a2f414 100644
>> --- a/meta/recipes-support/beecrypt/beecrypt/disable-icu-check.patch
>> +++ b/meta/recipes-support/beecrypt/beecrypt/disable-icu-check.patch
>> @@ -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
>> diff --git a/meta/recipes-support/beecrypt/beecrypt/fix-security.patch b/meta/recipes-support/beecrypt/beecrypt/fix-security.patch
>> index 6103562..f28e393 100644
>> --- a/meta/recipes-support/beecrypt/beecrypt/fix-security.patch
>> +++ b/meta/recipes-support/beecrypt/beecrypt/fix-security.patch
>> @@ -3,20 +3,38 @@ project:
>> http://www.mail-archive.com/fink-commits@lists.sourceforge.net/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();
>> -
>> diff --git a/meta/recipes-support/beecrypt/beecrypt/x64fix.patch b/meta/recipes-support/beecrypt/beecrypt/x64fix.patch
>> deleted file mode 100644
>> index ac02425..0000000
>> --- a/meta/recipes-support/beecrypt/beecrypt/x64fix.patch
>> +++ /dev/null
>> @@ -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.
>> diff --git a/meta/recipes-support/beecrypt/beecrypt_4.1.2.bb b/meta/recipes-support/beecrypt/beecrypt_4.2.1.bb
>> 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
>> --- a/meta/recipes-support/beecrypt/beecrypt_4.1.2.bb
>> +++ b/meta/recipes-support/beecrypt/beecrypt_4.2.1.bb
>> @@ -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"
>>
>
>
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 12/14] gnome-desktop: Update to 2.32.1
2010-12-02 5:57 [PATCH 00/14] X apps and base utils upgrade, Edwin, Dec2, 2010 Zhai Edwin
@ 2010-12-01 0:42 ` Zhai Edwin
0 siblings, 0 replies; 18+ messages in thread
From: Zhai Edwin @ 2010-12-01 0:42 UTC (permalink / raw)
To: poky
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
---
meta/recipes-gnome/gnome/gnome-desktop.inc | 4 ++--
.../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, 6 insertions(+), 15 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
diff --git a/meta/recipes-gnome/gnome/gnome-desktop.inc b/meta/recipes-gnome/gnome/gnome-desktop.inc
index de3f751..db827b9 100644
--- a/meta/recipes-gnome/gnome/gnome-desktop.inc
+++ b/meta/recipes-gnome/gnome/gnome-desktop.inc
@@ -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"
@@ -11,4 +11,4 @@ do_configure_prepend () {
FILES_${PN} += "${datadir}/gnome-about"
-inherit gnome pkgconfig
\ No newline at end of file
+inherit gnome pkgconfig
diff --git a/meta/recipes-gnome/gnome/gnome-desktop/no-desktop-docs.patch b/meta/recipes-gnome/gnome/gnome-desktop/no-desktop-docs.patch
deleted file mode 100644
index c132341..0000000
--- a/meta/recipes-gnome/gnome/gnome-desktop/no-desktop-docs.patch
+++ /dev/null
@@ -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
-
diff --git a/meta/recipes-gnome/gnome/gnome-desktop_2.26.2.bb b/meta/recipes-gnome/gnome/gnome-desktop_2.26.2.bb
deleted file mode 100644
index f4184a4..0000000
--- a/meta/recipes-gnome/gnome/gnome-desktop_2.26.2.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require gnome-desktop.inc
-
-SRC_URI += "file://no-desktop-docs.patch;patch=1;pnum=0"
diff --git a/meta/recipes-gnome/gnome/gnome-desktop_2.32.1.bb b/meta/recipes-gnome/gnome/gnome-desktop_2.32.1.bb
new file mode 100644
index 0000000..fa3ffb2
--- /dev/null
+++ b/meta/recipes-gnome/gnome/gnome-desktop_2.32.1.bb
@@ -0,0 +1,4 @@
+require gnome-desktop.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+ file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 18+ messages in thread
end of thread, other threads:[~2010-12-06 6:48 UTC | newest]
Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-12-03 5:35 [PATCH 00/14] X apps and base utils upgrade, Edwin, Dec3 2010 Zhai Edwin
2010-11-26 5:56 ` [PATCH 04/14] acpid: update to 1.0.10 Zhai Edwin
2010-11-26 8:57 ` [PATCH 03/14] beecrypt: Update to 4.2.1 Zhai Edwin
2010-12-03 19:22 ` Saul Wold
2010-12-06 6:49 ` Zhai, Edwin
2010-11-26 15:10 ` [PATCH 02/14] tidy: Add license checksum Zhai Edwin
2010-11-26 15:53 ` [PATCH 01/14] pointercal: " Zhai Edwin
2010-11-28 7:24 ` [PATCH 05/14] consolekit: Update to 0.4.3 Zhai Edwin
2010-11-28 7:48 ` [PATCH 06/14] eee-acpi-scripts: Update to 1.1.11 Zhai Edwin
2010-11-28 8:57 ` [PATCH 07/14] ethtool: Update to 2.6.36 Zhai Edwin
2010-11-30 5:25 ` [PATCH 11/14] web: Update to svn r129 Zhai Edwin
2010-11-30 8:34 ` [PATCH 08/14] puzzles: Update to svn r9023 Zhai Edwin
2010-11-30 9:17 ` [PATCH 09/14] x11perf: Update to 1.5.2 Zhai Edwin
2010-11-30 9:53 ` [PATCH 10/14] x11vnc: Update to 0.9.12 Zhai Edwin
2010-12-01 0:42 ` [PATCH 12/14] gnome-desktop: Update to 2.32.1 Zhai Edwin
2010-12-01 1:04 ` [PATCH 13/14] gnome-icon-theme: Update to 2.31.0 Zhai Edwin
2010-12-01 5:45 ` [PATCH 14/14] gtk-engines: Update to 2.20.2 Zhai Edwin
-- strict thread matches above, loose matches on Subject: below --
2010-12-02 5:57 [PATCH 00/14] X apps and base utils upgrade, Edwin, Dec2, 2010 Zhai Edwin
2010-12-01 0:42 ` [PATCH 12/14] gnome-desktop: Update to 2.32.1 Zhai Edwin
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.