summaryrefslogtreecommitdiff
path: root/desktop/Executable_simpress.mk
blob: 7376b7bd3883466a840dc1a9bb7f53d075efd7b6 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#

$(eval $(call gb_Executable_Executable,simpress))

$(eval $(call gb_Executable_set_targettype_gui,simpress,YES))

$(eval $(call gb_Executable_add_defs,simpress,\
    -DUNICODE \
))

$(eval $(call gb_Executable_add_ldflags,simpress,\
    /ENTRY:wWinMainCRTStartup \
))

$(eval $(call gb_Executable_use_static_libraries,simpress,\
    winlauncher \
))

$(eval $(call gb_Executable_add_exception_objects,simpress,\
    desktop/win32/source/applauncher/simpress \
))

$(eval $(call gb_Executable_add_nativeres,simpress,simpress/launcher))

# vim: set ts=4 sw=4 et:
fstat-header'>Diffstat
-rw-r--r--cppunit/ldflags.patch10
-rw-r--r--cppunit/makefile.mk6
-rw-r--r--epm/epm-3.7.patch1454
-rw-r--r--libtextcat/data/new_fingerprints/fpdb.conf1
-rw-r--r--libtextcat/data/new_fingerprints/lm/zulu.lm400
-rw-r--r--libtextcat/libtextcat-2.2.patch2494
-rw-r--r--libxmlsec/makefile.mk17
-rw-r--r--libxmlsec/readme.txt2
-rw-r--r--libxmlsec/xmlsec1-configure.patch705
-rw-r--r--libxmlsec/xmlsec1-customkeymanage.patch428
-rw-r--r--libxmlsec/xmlsec1-mingw-keymgr-mscrypto.patch28
-rw-r--r--libxmlsec/xmlsec1-mingw32.patch191
-rw-r--r--libxmlsec/xmlsec1-noverify.patch10
-rw-r--r--libxmlsec/xmlsec1-nssdisablecallbacks.patch4
-rw-r--r--libxmlsec/xmlsec1-nssmangleciphers.patch4
-rw-r--r--libxmlsec/xmlsec1-olderlibxml2.patch23
-rw-r--r--libxmlsec/xmlsec1-update-config-sub-and-guess.patch2314
-rw-r--r--np_sdk/mozsrc/npunix.c48
-rw-r--r--openssl/makefile.mk14
-rw-r--r--openssl/openssllnx.patch16
20 files changed, 6841 insertions, 1328 deletions
diff --git a/cppunit/ldflags.patch b/cppunit/ldflags.patch
new file mode 100644
index 000000000000..cecd69a4b5ee
--- /dev/null
+++ b/cppunit/ldflags.patch
@@ -0,0 +1,10 @@
+--- misc/cppunit-1.12.1/src/cppunit/Makefile.am Wed Feb 20 06:36:38 2008
++++ misc/build/cppunit-1.12.1/src/cppunit/Makefile.am Mon May 3 17:00:41 2010
+@@ -63,5 +63,6 @@
+
+ libcppunit_la_LDFLAGS= \
+ -no-undefined -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+- -release $(LT_RELEASE)
++ -release $(LT_RELEASE) \
++ @LIBADD_DL@
+
diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk
index b57c341e2a23..5ef6499726e5 100644
--- a/cppunit/makefile.mk
+++ b/cppunit/makefile.mk
@@ -34,7 +34,7 @@ TARFILE_MD5=bd30e9cf5523cdfc019b94f5e1d7fd19
# from <https://sourceforge.net/projects/cppunit/files/cppunit/1.12.1/
# cppunit-1.12.1.tar.gz/download>
-PATCH_FILES = solarisfinite.patch warnings.patch windows.patch
+PATCH_FILES = solarisfinite.patch warnings.patch windows.patch ldflags.patch
# solarisfinite.patch: see <https://sourceforge.net/tracker/?func=detail&
# aid=2912590&group_id=11795&atid=311795>
# warnings.patch: see <https://sourceforge.net/tracker/?func=detail&
@@ -91,13 +91,15 @@ OOO_STLPORT_LIBS = $(LIBSTLPORT)
# reference to `_rtld_global_ro@GLIBC_PRIVATE'" unless -lm is also specified:
.IF "$(OS)" == "LINUX" && "$(COM)" == "GCC" && "$(CPU)" == "I"
OOO_STLPORT_LIBS += -lm
+# #i112124# furthermore, STLPort seems to require libstdc++
+OOO_STLPORT_LIBS += -lstdc++
.END
# And later, when "checking whether the C compiler works" configure tries to
# execute that program; however, the program would fail to locate the STLport
# library (another work-around might be to add something like --as-needed around
# $(LIBSTLPORT)):
-.IF "$(OS)" == "LINUX" || "$(OS)" == "SOLARIS"
+.IF "$(OS)" == "FREEBSD" || "$(OS)" == "LINUX" || "$(OS)" == "SOLARIS"
.IF "$(LD_LIBRARY_PATH)" == ""
LD_LIBRARY_PATH := $(SOLARLIBDIR)
# strictly speaking, this is incorrect if the LD_LIBRARY_PATH environment
diff --git a/epm/epm-3.7.patch b/epm/epm-3.7.patch
index 116aa28f6690..02835bc3e5ce 100644
--- a/epm/epm-3.7.patch
+++ b/epm/epm-3.7.patch
@@ -1,811 +1,657 @@
-*** misc/epm-3.7/bsd.c Tue Jan 14 18:05:01 2003
---- misc/build/epm-3.7/bsd.c Mon Nov 20 14:54:51 2006
-***************
-*** 26,31 ****
---- 26,38 ----
-
- #include "epm.h"
-
-+ void cr2semicolon(char *command)
-+ {
-+ int len, i;
-+ len=strlen(command);
-+ for (i=0;i<len;i++)
-+ if(*(command+i)=='\n') *(command+i)=';';
-+ }
-
+diff -urN epm-3.7-old//bsd.c epm-3.7/bsd.c
+--- misc/epm-3.7/bsd.c 2003-01-14 17:05:01.000000000 +0000
++++ misc/build/epm-3.7/bsd.c 2010-04-19 22:52:32.000000000 +0000
+@@ -26,6 +26,13 @@
+
+ #include "epm.h"
+
++void cr2semicolon(char *command)
++{
++ int len, i;
++ len=strlen(command);
++ for (i=0;i<len;i++)
++ if(*(command+i)=='\n') *(command+i)=';';
++}
+
+ /*
+ * 'make_bsd()' - Make a FreeBSD software distribution package.
+@@ -149,8 +156,17 @@
+
+ for (i = dist->num_depends, d = dist->depends; i > 0; i --, d ++)
+ {
++#ifdef __FreeBSD__
++ if (d->type == DEPEND_REQUIRES) {
++ if (dist->relnumber)
++ fprintf(fp, "@pkgdep %s-%s-%d-%s", d->product, dist->version, dist->relnumber, platname);
++ else
++ fprintf(fp, "@pkgdep %s-%s-%s", d->product, dist->version, platname);
++ }
++#else
+ if (d->type == DEPEND_REQUIRES)
+ fprintf(fp, "@pkgdep %s", d->product);
++#endif
+ else
+ #ifdef __FreeBSD__
+ /*
+@@ -179,9 +195,11 @@
+ " by the BSD packager.\n", stderr);
+ break;
+ case COMMAND_POST_INSTALL :
++ cr2semicolon(c->command);
+ fprintf(fp, "@exec %s\n", c->command);
+ break;
+ case COMMAND_PRE_REMOVE :
++ cr2semicolon(c->command);
+ fprintf(fp, "@unexec %s\n", c->command);
+ break;
+ case COMMAND_POST_REMOVE :
+@@ -199,7 +217,7 @@
+ */
+
+ fprintf(fp, "@exec /bin/mkdir -p %s\n", file->dst);
+- fprintf(fp, "@exec /bin/chown %s:%s %s\n", file->user, file->group,
++ fprintf(fp, "@exec /usr/sbin/chown %s:%s %s\n", file->user, file->group,
+ file->dst);
+ fprintf(fp, "@exec /bin/chmod %04o %s\n", file->mode, file->dst);
+ }
+@@ -326,12 +344,13 @@
+ if (Verbosity)
+ puts("Building FreeBSD pkg binary distribution...");
+
+- if (run_command(NULL, "pkg_create -p / -s %s -c %s -d %s -f %s %s",
++ if (run_command(NULL, "/usr/sbin/pkg_create -p / -s %s -c %s -d %s -f %s %s",
+ current, commentname, descrname, plistname, name))
+ return (1);
+
+- if (run_command(NULL, "mv %s.tgz %s", name, directory))
+- return (1);
++ if (run_command(NULL, "mv %s.tbz %s", name, directory))
++ if (run_command(NULL, "mv %s.tgz %s", name, directory))
++ return (1);
+
/*
- * 'make_bsd()' - Make a FreeBSD software distribution package.
-***************
-*** 149,156 ****
---- 156,172 ----
-
- for (i = dist->num_depends, d = dist->depends; i > 0; i --, d ++)
- {
-+ #ifdef __FreeBSD__
-+ if (d->type == DEPEND_REQUIRES) {
-+ if (dist->relnumber)
-+ fprintf(fp, "@pkgdep %s-%s-%d-%s", d->product, dist->version, dist->relnumber, platname);
-+ else
-+ fprintf(fp, "@pkgdep %s-%s-%s", d->product, dist->version, platname);
-+ }
-+ #else
- if (d->type == DEPEND_REQUIRES)
- fprintf(fp, "@pkgdep %s", d->product);
-+ #endif
- else
- #ifdef __FreeBSD__
- /*
-***************
-*** 179,187 ****
---- 195,205 ----
- " by the BSD packager.\n", stderr);
- break;
- case COMMAND_POST_INSTALL :
-+ cr2semicolon(c->command);
- fprintf(fp, "@exec %s\n", c->command);
- break;
- case COMMAND_PRE_REMOVE :
-+ cr2semicolon(c->command);
- fprintf(fp, "@unexec %s\n", c->command);
- break;
- case COMMAND_POST_REMOVE :
-***************
-*** 199,205 ****
- */
-
- fprintf(fp, "@exec /bin/mkdir -p %s\n", file->dst);
-! fprintf(fp, "@exec /bin/chown %s:%s %s\n", file->user, file->group,
- file->dst);
- fprintf(fp, "@exec /bin/chmod %04o %s\n", file->mode, file->dst);
- }
---- 217,223 ----
- */
-
- fprintf(fp, "@exec /bin/mkdir -p %s\n", file->dst);
-! fprintf(fp, "@exec /usr/sbin/chown %s:%s %s\n", file->user, file->group,
- file->dst);
- fprintf(fp, "@exec /bin/chmod %04o %s\n", file->mode, file->dst);
- }
-***************
-*** 326,337 ****
- if (Verbosity)
- puts("Building FreeBSD pkg binary distribution...");
-
-! if (run_command(NULL, "pkg_create -p / -s %s -c %s -d %s -f %s %s",
- current, commentname, descrname, plistname, name))
- return (1);
-
-! if (run_command(NULL, "mv %s.tgz %s", name, directory))
-! return (1);
-
- /*
- * Remove temporary files...
---- 344,356 ----
- if (Verbosity)
- puts("Building FreeBSD pkg binary distribution...");
-
-! if (run_command(NULL, "/usr/sbin/pkg_create -p / -s %s -c %s -d %s -f %s %s",
- current, commentname, descrname, plistname, name))
- return (1);
-
-! if (run_command(NULL, "mv %s.tbz %s", name, directory))
-! if (run_command(NULL, "mv %s.tgz %s", name, directory))
-! return (1);
-
- /*
- * Remove temporary files...
-*** misc/epm-3.7/configure Thu Jul 24 03:20:54 2003
---- misc/build/epm-3.7/configure Mon Nov 20 15:01:11 2006
-***************
-*** 1238,1244 ****
---- 1238,1249 ----
- fi
- fi;
-
-+ # Check whether --enable-fltk or --disable-fltk was given.
-+ if test "${enable_fltk+set}" = set; then
-+ enableval="$enable_fltk"
-+ fi;
-
-+
- # Check whether --with-docdir or --without-docdir was given.
- if test "${with_docdir+set}" = set; then
- withval="$with_docdir"
-***************
-*** 4904,4939 ****
- fi
-
-
-! # Extract the first word of "fltk-config", so it can be a program name with args.
-! set dummy fltk-config; ac_word=$2
-! echo "$as_me:$LINENO: checking for $ac_word" >&5
-! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-! if test "${ac_cv_path_FLTKCONFIG+set}" = set; then
-! echo $ECHO_N "(cached) $ECHO_C" >&6
-! else
-! case $FLTKCONFIG in
-! [\\/]* | ?:[\\/]*)
-! ac_cv_path_FLTKCONFIG="$FLTKCONFIG" # Let the user override the test with a path.
-! ;;
-! *)
-! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-! for as_dir in $PATH
-! do
-! IFS=$as_save_IFS
-! test -z "$as_dir" && as_dir=.
-! for ac_exec_ext in '' $ac_executable_extensions; do
-! if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-! ac_cv_path_FLTKCONFIG="$as_dir/$ac_word$ac_exec_ext"
-! echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-! break 2
- fi
-! done
-! done
-!
-! ;;
-! esac
- fi
-- FLTKCONFIG=$ac_cv_path_FLTKCONFIG
-
- if test -n "$FLTKCONFIG"; then