mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-11 02:50:24 +00:00
Remove upstreamed patches also, remove files/cws-npower7.diff
as this cws has been integrated into SRC680_m227.
This commit is contained in:
parent
e27d4ba892
commit
0f517b5501
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=199017
@ -6,7 +6,6 @@ CONFIGURE_ARGS+= --with-jdk-home="${JAVA_HOME}" --with-ant-home="${LOCALBASE}/sh
|
||||
|
||||
.if defined(WITH_VBA)
|
||||
CONFIGURE_ARGS+= --enable-vba --with-vba-package-format="builtin"
|
||||
EXTRA_PATCHES+= ${FILESDIR}/cws-npower7.diff
|
||||
.endif
|
||||
|
||||
.if defined(WITH_KDE)
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -1,30 +0,0 @@
|
||||
--- config_office/configure~ Sat Mar 4 16:12:31 2006
|
||||
+++ config_office/configure Sat Mar 4 16:12:45 2006
|
||||
@@ -7544,7 +7544,7 @@
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
-LIBS="-lgcjawt $LIBS"
|
||||
+LIBS="-lgcjawt -pthread $LIBS"
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
#line $LINENO "configure"
|
||||
/* confdefs.h. */
|
||||
|
||||
http://qa.openoffice.org/issues/show_bug.cgi?id=63095
|
||||
Index: stoc/source/javaloader/makefile.mk
|
||||
===================================================================
|
||||
RCS file: /cvs/udk/stoc/source/javaloader/makefile.mk,v
|
||||
retrieving revision 1.16
|
||||
diff -u -r1.16 makefile.mk
|
||||
--- stoc/source/javaloader/makefile.mk 8 Sep 2005 07:57:58 -0000 1.16
|
||||
+++ stoc/source/javaloader/makefile.mk 13 Mar 2006 00:54:46 -0000
|
||||
@@ -59,7 +59,8 @@
|
||||
$(CPPUHELPERLIB) \
|
||||
$(CPPULIB) \
|
||||
$(SALLIB) \
|
||||
- $(JVMACCESSLIB)
|
||||
+ $(JVMACCESSLIB) \
|
||||
+ -L/usr/local/lib -liconv
|
||||
|
||||
SHL1VERSIONMAP = javaloader.map
|
||||
SHL1DEPN=
|
@ -1,22 +0,0 @@
|
||||
correct patch by jkim
|
||||
http://www.openoffice.org/nonav/issues/showattachment.cgi/47084/patch-i80003
|
||||
will be go into cws obo15.
|
||||
|
||||
Index: libxslt/makefile.mk
|
||||
===================================================================
|
||||
RCS file: /cvs/external/libxslt/makefile.mk,v
|
||||
retrieving revision 1.7
|
||||
diff -u -r1.7 makefile.mk
|
||||
--- libxslt/makefile.mk 19 Jul 2007 11:21:19 -0000 1.7
|
||||
+++ libxslt/makefile.mk 24 Jul 2007 20:33:55 -0000
|
||||
@@ -96,6 +96,10 @@
|
||||
BUILD_DIR=$(CONFIGURE_DIR)
|
||||
.ENDIF
|
||||
|
||||
+.IF "$(OS)"=="FREEBSD"
|
||||
+xslt_LDFLAGS+=-L$(SOLARLIBDIR)
|
||||
+.ENDIF
|
||||
+
|
||||
OUT2INC=libxslt$/*.h
|
||||
|
||||
.IF "$(OS)"=="MACOSX"
|
@ -1,20 +0,0 @@
|
||||
Index: svx/source/dialog/cuifmsearch.hxx
|
||||
===================================================================
|
||||
RCS file: /cvs/graphics/svx/source/dialog/cuifmsearch.hxx,v
|
||||
retrieving revision 1.6
|
||||
diff -u -r1.6 cuifmsearch.hxx
|
||||
--- svx/source/dialog/cuifmsearch.hxx 31 Jul 2007 13:56:33 -0000 1.6
|
||||
+++ svx/source/dialog/cuifmsearch.hxx 3 Aug 2007 05:35:05 -0000
|
||||
@@ -93,10 +93,10 @@
|
||||
|
||||
struct FmSearchProgress;
|
||||
|
||||
+class FmSearchEngine;
|
||||
+
|
||||
class FmSearchDialog : public ModalDialog
|
||||
{
|
||||
- friend class FmSearchEngine;
|
||||
-
|
||||
// meine ganzen Controls
|
||||
FixedLine m_flSearchFor;
|
||||
RadioButton m_rbSearchForText;
|
@ -6,7 +6,6 @@ CONFIGURE_ARGS+= --with-jdk-home="${JAVA_HOME}" --with-ant-home="${LOCALBASE}/sh
|
||||
|
||||
.if defined(WITH_VBA)
|
||||
CONFIGURE_ARGS+= --enable-vba --with-vba-package-format="builtin"
|
||||
EXTRA_PATCHES+= ${FILESDIR}/cws-npower7.diff
|
||||
.endif
|
||||
|
||||
.if defined(WITH_KDE)
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -1,30 +0,0 @@
|
||||
--- config_office/configure~ Sat Mar 4 16:12:31 2006
|
||||
+++ config_office/configure Sat Mar 4 16:12:45 2006
|
||||
@@ -7544,7 +7544,7 @@
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
-LIBS="-lgcjawt $LIBS"
|
||||
+LIBS="-lgcjawt -pthread $LIBS"
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
#line $LINENO "configure"
|
||||
/* confdefs.h. */
|
||||
|
||||
http://qa.openoffice.org/issues/show_bug.cgi?id=63095
|
||||
Index: stoc/source/javaloader/makefile.mk
|
||||
===================================================================
|
||||
RCS file: /cvs/udk/stoc/source/javaloader/makefile.mk,v
|
||||
retrieving revision 1.16
|
||||
diff -u -r1.16 makefile.mk
|
||||
--- stoc/source/javaloader/makefile.mk 8 Sep 2005 07:57:58 -0000 1.16
|
||||
+++ stoc/source/javaloader/makefile.mk 13 Mar 2006 00:54:46 -0000
|
||||
@@ -59,7 +59,8 @@
|
||||
$(CPPUHELPERLIB) \
|
||||
$(CPPULIB) \
|
||||
$(SALLIB) \
|
||||
- $(JVMACCESSLIB)
|
||||
+ $(JVMACCESSLIB) \
|
||||
+ -L/usr/local/lib -liconv
|
||||
|
||||
SHL1VERSIONMAP = javaloader.map
|
||||
SHL1DEPN=
|
@ -1,22 +0,0 @@
|
||||
correct patch by jkim
|
||||
http://www.openoffice.org/nonav/issues/showattachment.cgi/47084/patch-i80003
|
||||
will be go into cws obo15.
|
||||
|
||||
Index: libxslt/makefile.mk
|
||||
===================================================================
|
||||
RCS file: /cvs/external/libxslt/makefile.mk,v
|
||||
retrieving revision 1.7
|
||||
diff -u -r1.7 makefile.mk
|
||||
--- libxslt/makefile.mk 19 Jul 2007 11:21:19 -0000 1.7
|
||||
+++ libxslt/makefile.mk 24 Jul 2007 20:33:55 -0000
|
||||
@@ -96,6 +96,10 @@
|
||||
BUILD_DIR=$(CONFIGURE_DIR)
|
||||
.ENDIF
|
||||
|
||||
+.IF "$(OS)"=="FREEBSD"
|
||||
+xslt_LDFLAGS+=-L$(SOLARLIBDIR)
|
||||
+.ENDIF
|
||||
+
|
||||
OUT2INC=libxslt$/*.h
|
||||
|
||||
.IF "$(OS)"=="MACOSX"
|
@ -1,20 +0,0 @@
|
||||
Index: svx/source/dialog/cuifmsearch.hxx
|
||||
===================================================================
|
||||
RCS file: /cvs/graphics/svx/source/dialog/cuifmsearch.hxx,v
|
||||
retrieving revision 1.6
|
||||
diff -u -r1.6 cuifmsearch.hxx
|
||||
--- svx/source/dialog/cuifmsearch.hxx 31 Jul 2007 13:56:33 -0000 1.6
|
||||
+++ svx/source/dialog/cuifmsearch.hxx 3 Aug 2007 05:35:05 -0000
|
||||
@@ -93,10 +93,10 @@
|
||||
|
||||
struct FmSearchProgress;
|
||||
|
||||
+class FmSearchEngine;
|
||||
+
|
||||
class FmSearchDialog : public ModalDialog
|
||||
{
|
||||
- friend class FmSearchEngine;
|
||||
-
|
||||
// meine ganzen Controls
|
||||
FixedLine m_flSearchFor;
|
||||
RadioButton m_rbSearchForText;
|
@ -6,7 +6,6 @@ CONFIGURE_ARGS+= --with-jdk-home="${JAVA_HOME}" --with-ant-home="${LOCALBASE}/sh
|
||||
|
||||
.if defined(WITH_VBA)
|
||||
CONFIGURE_ARGS+= --enable-vba --with-vba-package-format="builtin"
|
||||
EXTRA_PATCHES+= ${FILESDIR}/cws-npower7.diff
|
||||
.endif
|
||||
|
||||
.if defined(WITH_KDE)
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -1,30 +0,0 @@
|
||||
--- config_office/configure~ Sat Mar 4 16:12:31 2006
|
||||
+++ config_office/configure Sat Mar 4 16:12:45 2006
|
||||
@@ -7544,7 +7544,7 @@
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
-LIBS="-lgcjawt $LIBS"
|
||||
+LIBS="-lgcjawt -pthread $LIBS"
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
#line $LINENO "configure"
|
||||
/* confdefs.h. */
|
||||
|
||||
http://qa.openoffice.org/issues/show_bug.cgi?id=63095
|
||||
Index: stoc/source/javaloader/makefile.mk
|
||||
===================================================================
|
||||
RCS file: /cvs/udk/stoc/source/javaloader/makefile.mk,v
|
||||
retrieving revision 1.16
|
||||
diff -u -r1.16 makefile.mk
|
||||
--- stoc/source/javaloader/makefile.mk 8 Sep 2005 07:57:58 -0000 1.16
|
||||
+++ stoc/source/javaloader/makefile.mk 13 Mar 2006 00:54:46 -0000
|
||||
@@ -59,7 +59,8 @@
|
||||
$(CPPUHELPERLIB) \
|
||||
$(CPPULIB) \
|
||||
$(SALLIB) \
|
||||
- $(JVMACCESSLIB)
|
||||
+ $(JVMACCESSLIB) \
|
||||
+ -L/usr/local/lib -liconv
|
||||
|
||||
SHL1VERSIONMAP = javaloader.map
|
||||
SHL1DEPN=
|
@ -1,22 +0,0 @@
|
||||
correct patch by jkim
|
||||
http://www.openoffice.org/nonav/issues/showattachment.cgi/47084/patch-i80003
|
||||
will be go into cws obo15.
|
||||
|
||||
Index: libxslt/makefile.mk
|
||||
===================================================================
|
||||
RCS file: /cvs/external/libxslt/makefile.mk,v
|
||||
retrieving revision 1.7
|
||||
diff -u -r1.7 makefile.mk
|
||||
--- libxslt/makefile.mk 19 Jul 2007 11:21:19 -0000 1.7
|
||||
+++ libxslt/makefile.mk 24 Jul 2007 20:33:55 -0000
|
||||
@@ -96,6 +96,10 @@
|
||||
BUILD_DIR=$(CONFIGURE_DIR)
|
||||
.ENDIF
|
||||
|
||||
+.IF "$(OS)"=="FREEBSD"
|
||||
+xslt_LDFLAGS+=-L$(SOLARLIBDIR)
|
||||
+.ENDIF
|
||||
+
|
||||
OUT2INC=libxslt$/*.h
|
||||
|
||||
.IF "$(OS)"=="MACOSX"
|
@ -1,20 +0,0 @@
|
||||
Index: svx/source/dialog/cuifmsearch.hxx
|
||||
===================================================================
|
||||
RCS file: /cvs/graphics/svx/source/dialog/cuifmsearch.hxx,v
|
||||
retrieving revision 1.6
|
||||
diff -u -r1.6 cuifmsearch.hxx
|
||||
--- svx/source/dialog/cuifmsearch.hxx 31 Jul 2007 13:56:33 -0000 1.6
|
||||
+++ svx/source/dialog/cuifmsearch.hxx 3 Aug 2007 05:35:05 -0000
|
||||
@@ -93,10 +93,10 @@
|
||||
|
||||
struct FmSearchProgress;
|
||||
|
||||
+class FmSearchEngine;
|
||||
+
|
||||
class FmSearchDialog : public ModalDialog
|
||||
{
|
||||
- friend class FmSearchEngine;
|
||||
-
|
||||
// meine ganzen Controls
|
||||
FixedLine m_flSearchFor;
|
||||
RadioButton m_rbSearchForText;
|
@ -6,7 +6,6 @@ CONFIGURE_ARGS+= --with-jdk-home="${JAVA_HOME}" --with-ant-home="${LOCALBASE}/sh
|
||||
|
||||
.if defined(WITH_VBA)
|
||||
CONFIGURE_ARGS+= --enable-vba --with-vba-package-format="builtin"
|
||||
EXTRA_PATCHES+= ${FILESDIR}/cws-npower7.diff
|
||||
.endif
|
||||
|
||||
.if defined(WITH_KDE)
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -1,30 +0,0 @@
|
||||
--- config_office/configure~ Sat Mar 4 16:12:31 2006
|
||||
+++ config_office/configure Sat Mar 4 16:12:45 2006
|
||||
@@ -7544,7 +7544,7 @@
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
-LIBS="-lgcjawt $LIBS"
|
||||
+LIBS="-lgcjawt -pthread $LIBS"
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
#line $LINENO "configure"
|
||||
/* confdefs.h. */
|
||||
|
||||
http://qa.openoffice.org/issues/show_bug.cgi?id=63095
|
||||
Index: stoc/source/javaloader/makefile.mk
|
||||
===================================================================
|
||||
RCS file: /cvs/udk/stoc/source/javaloader/makefile.mk,v
|
||||
retrieving revision 1.16
|
||||
diff -u -r1.16 makefile.mk
|
||||
--- stoc/source/javaloader/makefile.mk 8 Sep 2005 07:57:58 -0000 1.16
|
||||
+++ stoc/source/javaloader/makefile.mk 13 Mar 2006 00:54:46 -0000
|
||||
@@ -59,7 +59,8 @@
|
||||
$(CPPUHELPERLIB) \
|
||||
$(CPPULIB) \
|
||||
$(SALLIB) \
|
||||
- $(JVMACCESSLIB)
|
||||
+ $(JVMACCESSLIB) \
|
||||
+ -L/usr/local/lib -liconv
|
||||
|
||||
SHL1VERSIONMAP = javaloader.map
|
||||
SHL1DEPN=
|
@ -1,22 +0,0 @@
|
||||
correct patch by jkim
|
||||
http://www.openoffice.org/nonav/issues/showattachment.cgi/47084/patch-i80003
|
||||
will be go into cws obo15.
|
||||
|
||||
Index: libxslt/makefile.mk
|
||||
===================================================================
|
||||
RCS file: /cvs/external/libxslt/makefile.mk,v
|
||||
retrieving revision 1.7
|
||||
diff -u -r1.7 makefile.mk
|
||||
--- libxslt/makefile.mk 19 Jul 2007 11:21:19 -0000 1.7
|
||||
+++ libxslt/makefile.mk 24 Jul 2007 20:33:55 -0000
|
||||
@@ -96,6 +96,10 @@
|
||||
BUILD_DIR=$(CONFIGURE_DIR)
|
||||
.ENDIF
|
||||
|
||||
+.IF "$(OS)"=="FREEBSD"
|
||||
+xslt_LDFLAGS+=-L$(SOLARLIBDIR)
|
||||
+.ENDIF
|
||||
+
|
||||
OUT2INC=libxslt$/*.h
|
||||
|
||||
.IF "$(OS)"=="MACOSX"
|
@ -1,20 +0,0 @@
|
||||
Index: svx/source/dialog/cuifmsearch.hxx
|
||||
===================================================================
|
||||
RCS file: /cvs/graphics/svx/source/dialog/cuifmsearch.hxx,v
|
||||
retrieving revision 1.6
|
||||
diff -u -r1.6 cuifmsearch.hxx
|
||||
--- svx/source/dialog/cuifmsearch.hxx 31 Jul 2007 13:56:33 -0000 1.6
|
||||
+++ svx/source/dialog/cuifmsearch.hxx 3 Aug 2007 05:35:05 -0000
|
||||
@@ -93,10 +93,10 @@
|
||||
|
||||
struct FmSearchProgress;
|
||||
|
||||
+class FmSearchEngine;
|
||||
+
|
||||
class FmSearchDialog : public ModalDialog
|
||||
{
|
||||
- friend class FmSearchEngine;
|
||||
-
|
||||
// meine ganzen Controls
|
||||
FixedLine m_flSearchFor;
|
||||
RadioButton m_rbSearchForText;
|
Loading…
Reference in New Issue
Block a user