ooo-build r11707 - in trunk: . patches/src680 src src/icons src/icons/tango
- From: pmladek svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r11707 - in trunk: . patches/src680 src src/icons src/icons/tango
- Date: Tue, 26 Feb 2008 16:53:31 +0000 (GMT)
Author: pmladek
Date: Tue Feb 26 16:53:31 2008
New Revision: 11707
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11707&view=rev
Log:
2008-02-26 Petr Mladek <pmladek suse cz>
* patches/src680/webdav-locking-serve-dav-uri.diff: add missing
#include <string.h>; caused build error with 4.3
* src/Makefile.am, src/icons/tango/Makefile.am, src/icons/Makefile.am,
configure.in: add the new icons to the released ooo-build tarball
Added:
trunk/src/icons/Makefile.am
trunk/src/icons/tango/Makefile.am
Modified:
trunk/ChangeLog
trunk/configure.in
trunk/patches/src680/webdav-locking-serve-dav-uri.diff
trunk/src/Makefile.am
trunk/src/icons/ (props changed)
trunk/src/icons/tango/ (props changed)
Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in (original)
+++ trunk/configure.in Tue Feb 26 16:53:31 2008
@@ -1201,6 +1201,8 @@
po/Makefile
doc/Makefile
src/Makefile
+src/icons/Makefile
+src/icons/tango/Makefile
src/layout/Makefile
src/sdf/Makefile
stamp/Makefile
Modified: trunk/patches/src680/webdav-locking-serve-dav-uri.diff
==============================================================================
--- trunk/patches/src680/webdav-locking-serve-dav-uri.diff (original)
+++ trunk/patches/src680/webdav-locking-serve-dav-uri.diff Tue Feb 26 16:53:31 2008
@@ -204,6 +204,15 @@
index 9790870..6b219ef 100644
--- ucb/source/ucp/webdav/webdavprovider.cxx
+++ ucb/source/ucp/webdav/webdavprovider.cxx
+@@ -42,6 +42,8 @@
+
+ *************************************************************************/
+
++#include <string.h>
++
+ #ifndef _UCBHELPER_CONTENTIDENTIFIER_HXX
+ #include <ucbhelper/contentidentifier.hxx>
+ #endif
@@ -146,10 +146,17 @@ ContentProvider::queryContent(
!aScheme.equalsAsciiL(
RTL_CONSTASCII_STRINGPARAM( HTTPS_URL_SCHEME ) ) &&
Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am (original)
+++ trunk/src/Makefile.am Tue Feb 26 16:53:31 2008
@@ -1,4 +1,4 @@
-SUBDIRS=layout sdf
+SUBDIRS=layout sdf icons
EXTRA_DIST=\
Draft.jpg \
Added: trunk/src/icons/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/src/icons/Makefile.am Tue Feb 26 16:53:31 2008
@@ -0,0 +1,3 @@
+SUBDIRS=tango
+
+EXTRA_DIST = $(wildcard *.png)
Added: trunk/src/icons/tango/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/src/icons/tango/Makefile.am Tue Feb 26 16:53:31 2008
@@ -0,0 +1 @@
+EXTRA_DIST = $(wildcard *.png)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]