Patch: fixes and disabling mozembed debian packages for maemo
- From: Jose Dapena Paz <jdapena igalia com>
- To: tinymail-devel-list <tinymail-devel-list gnome org>
- Subject: Patch: fixes and disabling mozembed debian packages for maemo
- Date: Mon, 15 Oct 2007 17:50:57 +0200
Hi,
This patch fixes some issues with mozembed support, but mainly it
disables mozembed debian package generation for maemo platform (it's not
working yet).
--
Jose Dapena Paz <jdapena igalia com>
Igalia
Index: debian/rules.maemo
===================================================================
--- debian/rules.maemo (revision 2836)
+++ debian/rules.maemo (working copy)
@@ -31,7 +31,7 @@
if [ ! -x configure ]; then ./autogen.sh --with-platform=maemo --with-ssl=nss; fi
dh_testdir
# Add here commands to configure the package.
- CFLAGS="$(CFLAGS) -fPIC" ./configure --with-platform=maemo --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --with-ssl=nss --sysconfdir=/etc --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --with-html-component=mozembed
+ CFLAGS="$(CFLAGS) -fPIC" ./configure --with-platform=maemo --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --with-ssl=nss --sysconfdir=/etc --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
build: build-stamp
Index: debian/control.maemo1
===================================================================
--- debian/control.maemo1 (revision 2836)
+++ debian/control.maemo1 (working copy)
@@ -2,7 +2,7 @@
Section: libs
Priority: optional
Maintainer: Oystein Gisnas <oystein gisnas net>
-Build-Depends: debhelper (>=4), cdbs, dpkg-dev (>= 1.13.18), libglib2.0-dev (>= 2.6), libgtk2.0-dev, libosso-gnomevfs2-dev, libgconf2-dev, libosso-dev, libconic0-dev, gnome-common, gtk-doc-tools, microb-engine-dev, libgtkmozembed-dev
+Build-Depends: debhelper (>=4), cdbs, dpkg-dev (>= 1.13.18), libglib2.0-dev (>= 2.6), libgtk2.0-dev, libosso-gnomevfs2-dev, libgconf2-dev, libosso-dev, libconic0-dev, gnome-common, gtk-doc-tools
Standards-Version: 3.7.2
Package: libtinymail-1.0-0
@@ -223,26 +223,26 @@
.
This package contains the debug symbol files for libtinymail-gnomevfs.
-Package: libtinymailui-mozembed-1.0-0
-Architecture: any
-Depends: ${shlibs:Depends}
-Description: memory-effective framework for accessing e-mail - Camel library
- Tinymail is a development framework for accessing E-mail services using
- devices with few memory resources.
- .
- It supports local mail storage (Maildir,mh,spool & mbox), IMAP, Exchange
- and NNTP. It can be used to send messages over SMTP and by using sendmail.
- .
- This package contains the library for rendering HTML.
+# Package: libtinymailui-mozembed-1.0-0
+# Architecture: any
+# Depends: ${shlibs:Depends}
+# Description: memory-effective framework for accessing e-mail - Camel library
+# Tinymail is a development framework for accessing E-mail services using
+# devices with few memory resources.
+# .
+# It supports local mail storage (Maildir,mh,spool & mbox), IMAP, Exchange
+# and NNTP. It can be used to send messages over SMTP and by using sendmail.
+# .
+# This package contains the library for rendering HTML.
-Package: libtinymailui-mozembed-1.0-0-dev
-Architecture: any
-Depends: libtinymailui-mozembed-1.0-0 (= ${binary:Version})
-Description: memory-effective framework for accessing e-mail - development files
- Tinymail is a development framework for accessing E-mail services using
- devices with few memory resources.
- .
- It supports local mail storage (Maildir,mh,spool & mbox), IMAP, Exchange
- and NNTP. It can be used to send messages over SMTP and by using sendmail.
- .
- This package contains the development files for libtinymailui-mozembed.
+# Package: libtinymailui-mozembed-1.0-0-dev
+# Architecture: any
+# Depends: libtinymailui-mozembed-1.0-0 (= ${binary:Version})
+# Description: memory-effective framework for accessing e-mail - development files
+# Tinymail is a development framework for accessing E-mail services using
+# devices with few memory resources.
+# .
+# It supports local mail storage (Maildir,mh,spool & mbox), IMAP, Exchange
+# and NNTP. It can be used to send messages over SMTP and by using sendmail.
+# .
+# This package contains the development files for libtinymailui-mozembed.
Index: tests/c-demo/Makefile.am
===================================================================
--- tests/c-demo/Makefile.am (revision 2836)
+++ tests/c-demo/Makefile.am (working copy)
@@ -21,7 +21,7 @@
endif
if BUILD_MOZEMBED
-INCLUDES += -DMOZEMBED
+INCLUDES += -DMOZEMBED -I$(top_srcdir)/libtinymailui-mozembed $(LIBTINYMAILUI_MOZEMBED_CFLAGS)
endif
bin_PROGRAMS = tny-demoui
@@ -49,3 +49,8 @@
$(LIBTINYMAIL_ASYNCWORKER_LIBS)
endif
+if BUILD_MOZEMBED
+tny_demoui_LDADD += $(top_builddir)/libtinymailui-mozembed/libtinymailui-mozembed-$(API_VERSION).la \
+ $(LIBTINYMAILUI_MOZEMBED_LIBS)
+endif
+
Index: configure.ac
===================================================================
--- configure.ac (revision 2836)
+++ configure.ac (working copy)
@@ -374,14 +374,6 @@
AC_TNY_MOZ_CHECK
- if test x$mozilla_nspr = xno; then
- AC_MSG_ERROR("You need Mozilla's NSPR")
- fi
-
- if test x$mozilla_nss = xno; then
- AC_MSG_ERROR("You need Mozilla's NSS")
- fi
-
if test x$mozilla_xpcom = xno; then
AC_MSG_ERROR("You need Mozilla's XPCOM")
fi
@@ -390,7 +382,7 @@
AC_MSG_ERROR("You need Mozilla's GtkMozEmbed")
fi
- extraplatpkgs="$mozilla_nspr $mozilla_nss $mozilla_xpcom $mozilla_gtkmozembed"
+ extraplatpkgs="$mozilla_xpcom $mozilla_gtkmozembed"
extratnypkgs="$extratnypkgs $extraplatpkgs"
PKG_CHECK_MODULES(LIBTINYMAILUI_MOZEMBED, $extraplatpkgs glib-2.0 >= 2.8 gobject-2.0 gtk+-2.0 $extragtkpkgs)
MOZILLA_HOME="$mozilla_home"
Index: ChangeLog
===================================================================
--- ChangeLog (revision 2836)
+++ ChangeLog (working copy)
@@ -1,3 +1,8 @@
+2007-10-15 Jose Dapena Paz <jdapena igalia com>
+
+ * Some fixes to mozembed build.
+ * Disable mozembed packages build in maemo.
+
2007-10-12 Philip Van Hoof <pvanhoof gnome org>
* Regression on yesterday's summary related patch. Fixed
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]