diff options
| author | Florian Boor <florian.boor@kernelconcepts.de> | 2005-07-03 17:14:55 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-07-03 17:14:55 +0000 |
| commit | dbf68f5a1ec89042fbed9e8a8990f1dd93047757 (patch) | |
| tree | 1e116a81bcd864b89f8ad5e31d092128ad616ec2 | |
| parent | 063bddde698a5d99995ceaa5de2f89b89417f67d (diff) | |
| parent | b94e7321bc49e8a6187e19478d32af1165f92941 (diff) | |
merge of 0e4f20b5f73c66a8b0ff442658306eb24666a628
and aa37801871f021c37b88d43fee5f45ca91367b15
| -rw-r--r-- | packages/maemo/hildon-control-panel/noWerror.patch | 11 | ||||
| -rw-r--r-- | packages/maemo/hildon-control-panel_0.9.1-1.2.bb | 5 | ||||
| -rw-r--r-- | packages/meta/meta-maemo.bb | 4 |
3 files changed, 16 insertions, 4 deletions
diff --git a/packages/maemo/hildon-control-panel/noWerror.patch b/packages/maemo/hildon-control-panel/noWerror.patch new file mode 100644 index 0000000000..4cbb744fd4 --- /dev/null +++ b/packages/maemo/hildon-control-panel/noWerror.patch @@ -0,0 +1,11 @@ +--- configure.ac~ 2005-07-03 18:54:13.000000000 +0200 ++++ configure.ac 2005-07-03 18:54:13.000000000 +0200 +@@ -33,7 +33,7 @@ + # D-BUS headers do not compile with -pedantic. Once they are fixed, + #return the flag + #CFLAGS="$CFLAGS -Wall -ansi -pedantic -Wmissing-prototypes -Wmissing-declarations -Werror" +-CFLAGS="$CFLAGS -Wall -ansi -Wmissing-prototypes -Wmissing-declarations -Werror -lcrypt" ++CFLAGS="$CFLAGS -Wall -ansi -Wmissing-prototypes -Wmissing-declarations -lcrypt" + AC_SUBST(CFLAGS) + + PKG_CHECK_MODULES(OSSO,libosso >= 0.0.3) diff --git a/packages/maemo/hildon-control-panel_0.9.1-1.2.bb b/packages/maemo/hildon-control-panel_0.9.1-1.2.bb index 6806af988a..fe6d69e8f9 100644 --- a/packages/maemo/hildon-control-panel_0.9.1-1.2.bb +++ b/packages/maemo/hildon-control-panel_0.9.1-1.2.bb @@ -1,11 +1,12 @@ -PR = "r1" +PR = "r2" LICENSE = "GPL" MAINTAINER = "Florian Boor <florian@kernelconcepts.de>" DEPENDS = "hildon-lgpl hildon-base-lib osso-af-settings libosso hildon-libs osso-af-settings libosso-help" SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/h/${PN}/${PN}_${PV}.tar.gz \ - file://config-path.patch;patch=1;pnum=0" + file://config-path.patch;patch=1;pnum=0 \ + file://noWerror.patch;patch=1;pnum=0" S = "${WORKDIR}/hildon-control-panel-0.9.1" diff --git a/packages/meta/meta-maemo.bb b/packages/meta/meta-maemo.bb index 2482be0351..6f8e886a22 100644 --- a/packages/meta/meta-maemo.bb +++ b/packages/meta/meta-maemo.bb @@ -1,5 +1,5 @@ -PR = "r5" +PR = "r6" PACKAGES = maemo-task-base maemo-task-apps maemo-task-libs-install maemo-task-theme DESCRIPTION = "Meta-package for maemo environment" MAINTAINER = "Florian Boor <florian@kernelconcepts.de>" @@ -84,7 +84,7 @@ maemo-task-apps = "\ osso-app-killer \ osso-screenshot-tool \ gpe-todo-hildon \ - gpe-contacts-maemo" + gpe-contacts-hildon" RDEPENDS_maemo-task-apps := "${maemo-task-apps}" DEPENDS += " ${maemo-task-apps}" |