[ooo-build-commit] .: patches/dev300
Fridrich Strba
fridrich at kemper.freedesktop.org
Tue Sep 14 03:40:29 PDT 2010
patches/dev300/apply | 10 --
patches/dev300/cairo-cairo-makefile-mk.diff | 32 ------
patches/dev300/cairo-pixman-makefile-mk.diff | 47 ----------
patches/dev300/internal-cairo-configure.diff | 23 ----
patches/dev300/package-pixman-scp2-source-ooo-file_library_ooo_scp.diff | 33 -------
5 files changed, 1 insertion(+), 144 deletions(-)
New commits:
commit fdb812c8a06c5eec8cf19926dd7956854391ee70
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Tue Sep 14 12:39:47 2010 +0200
Migrate InternalCairo section to git.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 580efd4..653d25a 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -16,8 +16,7 @@ Common : PreprocessPatches, BuildBits, TemporaryHacks, FixesNotForUpstream, \
GStreamer, CWSBackports, Cleanups, WMF, GnomeVFS, WebDAV, \
Layout, VBABits, VBAObjects, CalcErrors, CJK, GCJ, Lwp, \
OOXML, OOXMLExportDevel, OOXMLExport, FrameworkFeature, UnitTesting, \
- PopupRemoval, InternalCairo, \
- FedoraCommonFixes, LayoutDialogs, Fuzz, \
+ PopupRemoval, FedoraCommonFixes, LayoutDialogs, Fuzz, \
CalcRowLimit, Gcc44, Gcc45, BuildFix, WriterDocComparison, \
Toolbars, MySQL, BorderTypes, WriterNavigation
@@ -2615,13 +2614,6 @@ lockfile-dont-do-dns-lookup.diff, n#389257, jholesov
# TODO file up-stream
lockfile-less-symbols.diff, jholesov
-[ InternalCairo ]
-cairo-pixman-makefile-mk.diff
-cairo-cairo-makefile-mk.diff
-internal-cairo-configure.diff
-package-pixman-scp2-source-ooo-file_library_ooo_scp.diff
-
-
[ WWInProgress ]
sw_layout_in_table_cell_fix.diff, n#367341, flr
sw-team-pane.diff
diff --git a/patches/dev300/cairo-cairo-makefile-mk.diff b/patches/dev300/cairo-cairo-makefile-mk.diff
deleted file mode 100644
index af545c1..0000000
--- a/patches/dev300/cairo-cairo-makefile-mk.diff
+++ /dev/null
@@ -1,32 +0,0 @@
----
- cairo/cairo/makefile.mk | 7 ++++++-
- 1 files changed, 6 insertions(+), 1 deletions(-)
-
-diff --git cairo/cairo/makefile.mk cairo/cairo/makefile.mk
-index e0b12cc..04e5af3 100644
---- cairo/cairo/makefile.mk
-+++ cairo/cairo/makefile.mk
-@@ -122,7 +122,7 @@ OUT2INC+=src$/cairo-quartz.h
- .ELSE
- # ----------- Unix ---------------------------------------------------------
- .IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
--cairo_LDFLAGS+=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec -Wl,-z,noexecstack
-+cairo_LDFLAGS+=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-z,noexecstack
- .ELIF "$(OS)$(COM)"=="SOLARISC52"
- cairo_LDFLAGS+=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib'
- .ENDIF # "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
-@@ -171,6 +171,11 @@ OUT2INC+=src$/cairo-xlib.h \
- CONFIGURE_FLAGS+=pixman_CFLAGS="-I$(SRC_ROOT)$/$(PRJNAME)$/$(INPATH)$/inc" pixman_LIBS="-L$(SRC_ROOT)$/$(PRJNAME)$/$(INPATH)$/lib -lpixman-1"
- .ENDIF
-
-+.IF "$(debug)"!=""
-+cairo_CFLAGS+=-g
-+CONFIGURE_FLAGS+= STRIP=" "
-+.ENDIF
-+
- CONFIGURE_FLAGS+=CFLAGS="-I$(SRC_ROOT)$/$(PRJNAME)$/$(INPATH)$/inc $(cairo_CFLAGS)" LDFLAGS="-L$(SRC_ROOT)$/$(PRJNAME)$/$(INPATH)$/lib $(cairo_LDFLAGS)" CPPFLAGS="$(cairo_CPPFLAGS)"
-
- .ENDIF
---
-1.7.0.1
-
diff --git a/patches/dev300/cairo-pixman-makefile-mk.diff b/patches/dev300/cairo-pixman-makefile-mk.diff
deleted file mode 100644
index 2883882..0000000
--- a/patches/dev300/cairo-pixman-makefile-mk.diff
+++ /dev/null
@@ -1,47 +0,0 @@
----
- cairo/pixman/makefile.mk | 14 ++------------
- 1 files changed, 2 insertions(+), 12 deletions(-)
-
-diff --git cairo/pixman/makefile.mk cairo/pixman/makefile.mk
-index 20773c7..c4f62e8 100644
---- cairo/pixman/makefile.mk
-+++ cairo/pixman/makefile.mk
-@@ -92,7 +92,7 @@ BUILD_DIR=$(CONFIGURE_DIR)
- .ELSE
- # ----------- Unix ---------------------------------------------------------
- .IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
--LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec -Wl,-z,noexecstack
-+LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-z,noexecstack
- .ENDIF # "$(OS)$(COM)"=="LINUXGCC"
-
- .IF "$(OS)$(COM)"=="SOLARISC52"
-@@ -120,13 +120,7 @@ pixman_CFLAGS+=-fPIC
-
- CONFIGURE_DIR=
- CONFIGURE_ACTION=.$/configure
--.IF "$(CPUNAME)"=="X86_64"
--# static builds tend to fail on 64bit
- CONFIGURE_FLAGS=--enable-static=no --enable-shared=yes
--.ELSE
--# use static lib to avoid linking problems with older system pixman libs
--CONFIGURE_FLAGS=--enable-static=yes --enable-shared=no
--.ENDIF
- CONFIGURE_FLAGS+=CFLAGS="$(pixman_CFLAGS)"
- BUILD_ACTION=$(GNUMAKE)
- BUILD_FLAGS+= -j$(EXTMAXPROCESS)
-@@ -149,11 +143,7 @@ OUT2LIB+=pixman$/.libs$/*.a
- OUT2LIB+=pixman$/release$/*.lib
- .ENDIF
- .ELSE
--.IF "$(CPUNAME)"=="X86_64"
--OUT2LIB+=pixman$/.libs$/libpixman-1.so
--.ELSE
--OUT2LIB+=pixman$/.libs$/libpixman-1.a
--.ENDIF
-+OUT2LIB+=pixman$/.libs$/libpixman-1.so*
- .ENDIF
-
- # --- Targets ------------------------------------------------------
---
-1.7.0.1
-
diff --git a/patches/dev300/internal-cairo-configure.diff b/patches/dev300/internal-cairo-configure.diff
deleted file mode 100644
index 2d131a4..0000000
--- a/patches/dev300/internal-cairo-configure.diff
+++ /dev/null
@@ -1,23 +0,0 @@
----
- configure.in | 5 +----
- 1 files changed, 1 insertions(+), 4 deletions(-)
-
-diff --git configure.in configure.in
-index 411e922..071bb8f 100644
---- configure.in
-+++ configure.in
-@@ -6000,10 +6000,7 @@ int main(int argc, char **argv) {
- fi
- else
- BUILD_TYPE="$BUILD_TYPE CAIRO"
-- dnl === compiler fails on pixman with 64bit architectures...===
-- if test "$build_cpu" != "x86_64"; then
-- BUILD_PIXMAN=YES
-- fi
-+ BUILD_PIXMAN=YES
- AC_MSG_RESULT([internal])
- fi
- else
---
-1.7.0.1
-
diff --git a/patches/dev300/package-pixman-scp2-source-ooo-file_library_ooo_scp.diff b/patches/dev300/package-pixman-scp2-source-ooo-file_library_ooo_scp.diff
deleted file mode 100644
index a243df3..0000000
--- a/patches/dev300/package-pixman-scp2-source-ooo-file_library_ooo_scp.diff
+++ /dev/null
@@ -1,33 +0,0 @@
----
- scp2/source/ooo/file_library_ooo.scp | 15 +++++++++++++++
- 1 files changed, 15 insertions(+), 0 deletions(-)
-
-diff --git scp2/source/ooo/file_library_ooo.scp scp2/source/ooo/file_library_ooo.scp
-index 83399a7..acaea04 100644
---- scp2/source/ooo/file_library_ooo.scp
-+++ scp2/source/ooo/file_library_ooo.scp
-@@ -659,6 +659,21 @@ File gid_File_Lib_Cairo
- #endif
- End
-
-+File gid_File_Lib_Pixman
-+ TXT_FILE_BODY;
-+ Styles = (PACKED);
-+ Dir = gid_Dir_Program;
-+ #ifdef UNX
-+ #ifdef MACOSX
-+ Name = STRING(CONCAT3(libpixman-1,.0,UNXSUFFIX));
-+ #else
-+ Name = STRING(CONCAT3(libpixman-1,UNXSUFFIX,.0));
-+ #endif
-+ #elif defined(WNT)
-+ Name = "libpixman-1-0.dll";
-+ #endif
-+End
-+
- #endif
-
- STD_UNO_LIB_FILE( gid_File_Lib_Frm , frm)
---
-1.7.0.1
-
More information about the ooo-build-commit
mailing list