The following commit has been merged in the debian-experimental-3.5 branch:
commit 14e1d3f948d3d8cf7fb0f8d7b24a82e9e31aa91c
Author: Rene Engelhard <[email protected]>
Date: Wed Nov 2 23:38:16 2011 +0000
update; adapt for new nss configure switches; temporarily use internal
np_sdk
diff --git a/changelog b/changelog
index 04e41e9..c83121a 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:3.5.0~alpha0~git20111025-1) UNRELEASED; urgency=low
+libreoffice (1:3.5.0~alpha0~git20111102-1) UNRELEASED; urgency=low
* new upstream snapshot
diff --git a/control b/control
index b7dd425..32a5cb9 100644
--- a/control
+++ b/control
@@ -3,8 +3,8 @@ Section: editors
Priority: optional
Maintainer: Debian LibreOffice Maintainers <[email protected]>
Uploaders: Rene Engelhard <[email protected]>
-Build-Depends: dpkg-dev (>= 1.16.1), lsb-release, bzip2, bison, flex |
flex-old, libxaw7-dev, unzip, zip, autoconf, automake, sharutils, pkg-config,
libfontconfig1-dev, libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64],
zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev, libxext-dev,
libxtst-dev, libice-dev, libcups2-dev, libarchive-zip-perl, fastjar, xsltproc,
libxkbfile-dev, libxinerama-dev, x11proto-render-dev, libxml-parser-perl,
gperf, po-debconf, bc, wget | curl, git, rsync, libgl1-mesa-dev [!armel !mips
!mipsel], libglu1-mesa-dev [!armel !mips !mipsel], libpoppler-dev (>= 0.8.0),
libpoppler-cpp-dev, libpoppler-cpp-dev, libgraphite2-dev (>= 0.9.3) [!armel
!sparc], libexttextcat-dev (>= 3.1.1), libjpeg-dev, libxml2-dev, libexpat1-dev,
unixodbc-dev (>= 2.2.11), libsane-dev, libxrender-dev, libpng12-dev,
libssl-dev, librsvg2-dev, libdb-dev, python (>= 2.6.6-3+squeeze4), python-dev
(>= 2.6), python3-dev, debhelper (>= 7.2.3~), libcppunit-dev (>= 1.12), openj
dk-6-jdk (>= 6b23~pre8-2) [alpha amd64 armel armhf i386 mips mipsel powerpc
powerpcspe ppc64 s390 s390x sparc], openjdk-7-jdk [ia64], gcj-jdk [hppa
kfreebsd-i386 kfreebsd-amd64], gcj-native-helper [hppa kfreebsd-amd64
kfreebsd-i386], libgcj-common (>= 1:4.4.1) [hppa kfreebsd-amd64 kfreebsd-i386],
ant (>= 1.7.0), ant-optional (>= 1.7.0), mingw-w64 (>= 1.0),
libcommons-codec-java, libcommons-httpclient-java, libcommons-lang-java,
libcommons-logging-java, libservlet2.5-java, libbase-java [!armel], libsac-java
[!armel], libxml-java (>= 1.1.6) [!armel], libflute-java (>= 1.1.6) [!armel],
libpentaho-reporting-flow-engine-java (>= 0.9.4) [!armel], liblayout-java (>=
0.2.10) [!armel], libloader-java (>= 1.1.6) [!armel], libformula-java (>=
1.1.7) [!armel], librepository-java (>= 1.1.6) [!armel], libfonts-java (>=
1.1.6) [!armel], libserializer-java (>= 1.1.6) [!armel],
libcommons-logging-java, libservlet2.5-java, javahelper (>= 0.37~),
xulrunner-dev, libnss3-dev (>= 3.12.3), dmake (
>= 1:4.11), libhunspell-dev (>= 1.1.5-2), libhyphen-dev (>= 2.4),
>libstlport4.6-dev (>= 4.6.2-3) [i386], libboost-dev (>= 1.38), libmdds-dev
>(>= 0.5.0), libvigraimpex-dev, libwpd-dev (>= 0.9.0), libmythes-dev (>=
>2:1.2), libwps-dev (>= 0.2.0), libwpg-dev (>= 0.2.0), libvisio-dev,
>libcmis-dev, libicu-dev (>= 4.0), libxslt1-dev, libcairo2-dev, kdelibs5-dev
>(>= 4:4.3.4), libqt4-dev (>= 4.5), libmysqlclient-dev, libmysqlcppconn-dev
>(>= 1.1.0~r791), libgtk-3-dev, libebook1.2-dev [!armel], libpq-dev (>= 9.0~),
>libxrandr-dev, liblucene2-java (>= 2.3.2), libhsqldb-java (>> 1.8.0.10), bsh
>(>= 2.0b4), liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>= 5.5.0.13-5+b1),
>libsuitesparse-dev (>= 1:3.4.0), libdbus-glib-1-dev (>= 0.60),
>libgstreamer-plugins-base0.10-dev, libneon27-gnutls-dev, librdf0-dev (>=
>1.0.8), libgtk2.0-dev (>= 2.10), libgnomevfs2-dev, libgconf2-dev,
>liborbit2-dev, gettext, libldap2-dev
-Build-Depends-Indep: fdupes, xml-core, imagemagick, fontforge,
translate-toolkit (>= 1.9)
+Build-Depends: dpkg-dev (>= 1.16.1), lsb-release, bzip2, bison, flex |
flex-old, libxaw7-dev, unzip, zip, autoconf, automake, sharutils, pkg-config,
libfontconfig1-dev, libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64],
zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev, libxext-dev,
libxtst-dev, libice-dev, libcups2-dev, libarchive-zip-perl, fastjar, xsltproc,
libxkbfile-dev, libxinerama-dev, x11proto-render-dev, libxml-parser-perl,
gperf, po-debconf, bc, wget | curl, git, rsync, libgl1-mesa-dev [!armel !mips
!mipsel], libglu1-mesa-dev [!armel !mips !mipsel], libpoppler-dev (>= 0.8.0),
libpoppler-cpp-dev, libpoppler-cpp-dev, libgraphite2-dev (>= 0.9.3) [!armel
!sparc], libexttextcat-dev (>= 3.1.1), libjpeg-dev, libxml2-dev, libexpat1-dev,
unixodbc-dev (>= 2.2.11), libsane-dev, libxrender-dev, libpng12-dev,
libssl-dev, librsvg2-dev, libdb-dev, python (>= 2.6.6-3+squeeze4), python-dev
(>= 2.6), python3-dev, debhelper (>= 7.2.3~), epm, libcppunit-dev (>= 1.12),
tcsh, openjdk-6-jdk (>= 6b23~pre8-2) [alpha amd64 armel armhf i386 mips mipsel
powerpc powerpcspe ppc64 s390 s390x sparc], openjdk-7-jdk [ia64], gcj-jdk [hppa
kfreebsd-i386 kfreebsd-amd64], gcj-native-helper [hppa kfreebsd-amd64
kfreebsd-i386], libgcj-common (>= 1:4.4.1) [hppa kfreebsd-amd64 kfreebsd-i386],
ant (>= 1.7.0), ant-optional (>= 1.7.0), mingw-w64 (>= 1.0),
libcommons-codec-java, libcommons-httpclient-java, libcommons-lang-java,
libcommons-logging-java, libservlet2.5-java, libbase-java [!armel], libsac-java
[!armel], libxml-java (>= 1.1.6) [!armel], libflute-java (>= 1.1.6) [!armel],
libpentaho-reporting-flow-engine-java (>= 0.9.4) [!armel], liblayout-java (>=
0.2.10) [!armel], libloader-java (>= 1.1.6) [!armel], libformula-java (>=
1.1.7) [!armel], librepository-java (>= 1.1.6) [!armel], libfonts-java (>=
1.1.6) [!armel], libserializer-java (>= 1.1.6) [!armel],
libcommons-logging-java, libservlet2.5-java, javahelper (>= 0.37~), libnss3-dev
(>= 3.12.3), dmake (>= 1
:4.11), libhunspell-dev (>= 1.1.5-2), libhyphen-dev (>= 2.4),
libstlport4.6-dev (>= 4.6.2-3) [i386], libboost-dev (>= 1.38), libmdds-dev (>=
0.5.0), libvigraimpex-dev, libwpd-dev (>= 0.9.0), libmythes-dev (>= 2:1.2),
libwps-dev (>= 0.2.0), libwpg-dev (>= 0.2.0), libvisio-dev, libcmis-dev,
libicu-dev (>= 4.0), libxslt1-dev, libcairo2-dev, kdelibs5-dev (>= 4:4.3.4),
libqt4-dev (>= 4.5), libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791),
libgtk-3-dev, libebook1.2-dev [!armel], libpq-dev (>= 9.0~), libxrandr-dev,
liblucene2-java (>= 2.3.2), libhsqldb-java (>> 1.8.0.10), bsh (>= 2.0b4),
liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>= 5.5.0.13-5+b1),
libsuitesparse-dev (>= 1:3.4.0), libdbus-glib-1-dev (>= 0.60),
libgstreamer-plugins-base0.10-dev, libneon27-gnutls-dev, librdf0-dev (>=
1.0.8), libgtk2.0-dev (>= 2.10), libgnomevfs2-dev, libgconf2-dev,
liborbit2-dev, gettext, libldap2-dev
+Build-Depends-Indep: fdupes, xml-core, imagemagick, fontforge
Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (=
1.8.0.13~pre070720-0etch1), gjdoc (= 0.7.8-2), libc6-dev (= 2.6.1-3) [i386
amd64], libc6-dev (= 2.6.1-4) [i386 amd64], nvidia-glx-dev,
nvidia-glx-legacy-dev, libmono-dev (= 1.2.6+dfsg-1), libmono-dev (=
1.2.6+dfsg-2), libmono-dev (= 1.2.6+dfsg-3), libmono-dev (= 1.2.6+dfsg-4),
libmono-dev (= 2.4+dfsg-2) [sparc], gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1)
[amd64], libboost1.39-dev (<< 1.39.0-2), graphicsmagick-imagemagick-compat (<<
1.3.9~), qt3-dev-tools, ant (= 1.8.0-1) [hppa kfreebsd-i386 kfreebsd-amd64],
ant (= 1.8.0-2) [hppa kfreebsd-i386 kfreebsd-amd64], ant (= 1.8.0-3) [hppa
kfreebsd-i386 kfreebsd-amd64], g++-4.6 (= 4.6.1-10), g++-4.6 (= 4.6.1-11),
base-files (= 6.0), base-files (= 6.0squeeze1), libhsqldb-java (>= 1.8.1~)
Standards-Version: 3.9.1
XS-Python-Version: current
diff --git a/patches/fix-system-lpsolve-build.diff
b/patches/fix-system-lpsolve-build.diff
index d86f2df..425b93d 100644
--- a/patches/fix-system-lpsolve-build.diff
+++ b/patches/fix-system-lpsolve-build.diff
@@ -30,7 +30,7 @@ index 91161f1..eb9885e 100644
+.ENDIF
SOFFICELIB=-lsofficeapp
UNOPKGAPPLIB=-lunopkgapp
- TESTLIB=-lunotest
+ TESTLIB=-ltest
diff --git a/sccomp/Library_solver.mk b/sccomp/Library_solver.mk
index ba9493a..93874b4 100644
--- libreoffice-3.5.0/sccomp/Library_solver.mk
diff --git a/patches/rhino-build-optional.diff
b/patches/rhino-build-optional.diff
index e297403..a53d32d 100644
--- a/patches/rhino-build-optional.diff
+++ b/patches/rhino-build-optional.diff
@@ -64,6 +64,6 @@ index 2bd4c61..f874898 100644
--- libreoffice-3.5.0/tail_build/prj/build.lst-old 2011-10-20
22:44:37.000000000 +0000
+++ libreoffice-3.5.0/tail_build/prj/build.lst 2011-10-20
22:44:49.000000000 +0000
@@ -1,2 +1,2 @@
--tb tail_build : APACHE_COMMONS:apache-commons BSH:beanshell
BERKELEYDB:berkeleydb BOOST:boost l10ntools LIBXML2:libxml2 LIBXMLSEC:libxmlsec
LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio
LPSOLVE:lpsolve MDDS:mdds NEON:neon NSS:nss OPENSSL:openssl PYTHON:python
REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf avmedia basegfx
basic bridges canvas comphelper DESKTOP:connectivity cppcanvas cppu cppuhelper
fpicker javaunohelper jurt jvmaccess offapi officecfg oovbaapi qadevOOo
DESKTOP:rdbmaker readlicense_oo rhino ridljar sal sax sfx2 solenv soltools sot
stoc svtools svx sysui test toolkit tools ucbhelper udkapi unoil unotools ure
vcl xmlhelp xmloff xmlscript xsltml NULL
-+tb tail_build : APACHE_COMMONS:apache-commons BSH:beanshell
BERKELEYDB:berkeleydb BOOST:boost l10ntools LIBXML2:libxml2 LIBXMLSEC:libxmlsec
LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio
LPSOLVE:lpsolve MDDS:mdds NEON:neon NSS:nss OPENSSL:openssl PYTHON:python
REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf avmedia basegfx
basic bridges canvas comphelper DESKTOP:connectivity cppcanvas cppu cppuhelper
fpicker javaunohelper jurt jvmaccess offapi officecfg oovbaapi qadevOOo
DESKTOP:rdbmaker readlicense_oo RHINO:rhino ridljar sal sax sfx2 solenv
soltools sot stoc svtools svx sysui test toolkit tools ucbhelper udkapi unoil
unotools ure vcl xmlhelp xmloff xmlscript xsltml NULL
+-tb tail_build : APACHE_COMMONS:apache-commons BSH:beanshell
BERKELEYDB:berkeleydb BOOST:boost l10ntools LIBXML2:libxml2 LIBXMLSEC:libxmlsec
LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio
LPSOLVE:lpsolve MDDS:mdds NEON:neon NSS:nss OPENSSL:openssl PYTHON:python
REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf avmedia basegfx
basic bridges canvas comphelper connectivity cppcanvas cppu cppuhelper fpicker
javaunohelper jurt jvmaccess offapi officecfg oovbaapi qadevOOo
DESKTOP:rdbmaker readlicense_oo rhino ridljar sal sax sfx2 solenv soltools sot
stoc svtools svx sysui test toolkit tools ucbhelper udkapi unoil unotools ure
vcl xmlhelp xmloff xmlscript xsltml NULL
++tb tail_build : APACHE_COMMONS:apache-commons BSH:beanshell
BERKELEYDB:berkeleydb BOOST:boost l10ntools LIBXML2:libxml2 LIBXMLSEC:libxmlsec
LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio
LPSOLVE:lpsolve MDDS:mdds NEON:neon NSS:nss OPENSSL:openssl PYTHON:python
REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf avmedia basegfx
basic bridges canvas comphelper connectivity cppcanvas cppu cppuhelper fpicker
javaunohelper jurt jvmaccess offapi officecfg oovbaapi qadevOOo
DESKTOP:rdbmaker readlicense_oo RHINO:rhino ridljar sal sax sfx2 solenv
soltools sot stoc svtools svx sysui test toolkit tools ucbhelper udkapi unoil
unotools ure vcl xmlhelp xmloff xmlscript xsltml NULL
tb tail_build\prj nmake - all tb_prj NULL
diff --git a/rules b/rules
index d6f0eb5..1adedb6 100755
--- a/rules
+++ b/rules
@@ -279,6 +279,7 @@ SYSTEM_STUFF += mesa-headers
SYSTEM_STUFF += db
SYSTEM_STUFF += poppler
SYSTEM_STUFF += libpng
+SYSTEM_STUFF += nss
# Default flags to pass to configure of ooo-build
CONFIGURE_FLAGS= \
@@ -295,7 +296,8 @@ CONFIGURE_FLAGS= \
--disable-online-update \
--disable-fetch-external \
--enable-release-build \
- --disable-linkoo
+ --disable-linkoo \
+ --disable-build-mozilla
ifneq ($(ON_BUILDD),y)
CONFIGURE_FLAGS += --enable-verbose
@@ -839,29 +841,12 @@ else
DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-officebean
-Nlibreoffice$(VER)-java-common -Nlibreoffice$(VER)-filter-mobiledev
-Nlibreoffice$(VER)-gcj -Nlibreoffice$(VER)-script-provider-bsh
-Nlibreoffice$(VER)-script-provider-js
endif
-ifneq "$(MOZILLA)" ""
- ifneq "$(OOO_MOZILLA_ARCHS)" ""
- ifeq "$(MOZILLA)" "xulrunner"
- BUILD_DEPS+= , libxul-dev$(OOO_NO_MOZILLA_ARCHS), libnss3-dev (>=
3.12.3)$(OOO_NO_MOZILLA_ARCHS)
- DBG_DBG_SUGGESTS+= , libnss3-1d-dbg, libnspr4-0d-dbg
- else
- ifeq "$(MOZILLA)" "libxul"
- BUILD_DEPS+= , xulrunner-dev$(OOO_NO_MOZILLA_ARCHS), libnss3-dev (>=
3.12.3)$(OOO_NO_MOZILLA_ARCHS)
- else
- ifeq "$(MOZILLA)" "iceape"
- BUILD_DEPS += , $(MOZILLA)-dev (>= 1.1.9-5)$(OOO_NO_MOZILLA_ARCHS),
libnss3-dev (>= 3.12.3)$(OOO_NO_MOZILLA_ARCHS)]
- else
- BUILD_DEPS += , $(MOZILLA)-dev$(OOO_NO_MOZILLA_ARCHS)
- endif
- endif
- DBG_DBG_SUGGESTS+= , libnss3-1d-dbg, libnspr4-0d-dbg
- endif
- endif
+ifneq (,$(filter nss, $(SYSTEM_STUFF)))
+ BUILD_DEPS+= , libnss3-dev (>= 3.12.3)
+ DBG_DBG_SUGGESTS+= , libnss3-1d-dbg
endif
-ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_MOZILLA_ARCHS)))
- CONFIGURE_FLAGS += --with-system-mozilla=$(MOZILLA)
-else
- CONFIGURE_FLAGS += --disable-mozilla --without-system-mozilla
+ifeq (,$(findstring $(DEB_HOST_ARCH),$(OOO_MOZILLA_ARCHS)))
+ CONFIGURE_FLAGS += --disable-mozilla
PACKAGE_NPSOPLUGIN=n
endif
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
