aboutsummaryrefslogtreecommitdiffstats
path: root/win32
diff options
context:
space:
mode:
Diffstat (limited to 'win32')
-rw-r--r--win32/Makefile7
-rw-r--r--win32/patches/dbus.patch45
-rwxr-xr-xwin32/setup-env7
3 files changed, 41 insertions, 18 deletions
diff --git a/win32/Makefile b/win32/Makefile
index 0d325b8f1a..19c78f7ac6 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -54,7 +54,8 @@ $(BUILD_ROOT_EVO)/lib/pkgconfig/libedataserver-1.2.pc:
@if test ! -f "../../evolution-data-server/gtk-doc.make" ; then \
cp "patches/gtk-doc.make" "../../evolution-data-server/"; \
fi
- @./build acmmi "$(BUILD_ROOT_EVO)" ../../../evolution-data-server "" "--enable-weather --disable-goa --disable-uoa --disable-examples --without-libdb --with-openldap=$(BUILD_ROOT_DEPS) $(DISABLE_GTK_DOC)" $(VERBOSE)
+ @cd "$(BUILD_ROOT_EVO)/libexec" && export WIN32_SERVICELIBEXECDIR=`pwd -W` && cd - >/dev/null && \
+ ./build acmmi "$(BUILD_ROOT_EVO)" ../../../evolution-data-server "" "--enable-weather --disable-goa --disable-uoa --disable-examples --without-libdb --with-openldap=$(BUILD_ROOT_DEPS) $(DISABLE_GTK_DOC)" $(VERBOSE)
evolution-master: env evolution-data-server-master $(BUILD_ROOT_EVO)/lib/pkgconfig/evolution-shell-3.0.pc
@@ -66,7 +67,7 @@ $(BUILD_ROOT_EVO)/lib/pkgconfig/evolution-shell-3.0.pc:
@if test ! -f "../../evolution/gtk-doc.make" ; then \
cp "patches/gtk-doc.make" "../../evolution/"; \
fi
- @./build acmmi "$(BUILD_ROOT_EVO)" ../../../evolution "" "--enable-plugins=all --enable-weather --disable-canberra --disable-contact-maps --disable-goa --disable-libcryptui --disable-bogofilter --disable-spamassassin --disable-text-highlight --disable-pst-import --disable-gnome-desktop --without-clutter --without-help $(DISABLE_GTK_DOC)" $(VERBOSE)
+ @./build acmmi "$(BUILD_ROOT_EVO)" ../../../evolution "" "--enable-plugins=all --enable-weather --disable-canberra --disable-contact-maps --disable-goa --disable-libcryptui --disable-bogofilter --disable-spamassassin --disable-text-highlight --disable-pst-import --disable-gnome-desktop --disable-autoar --without-clutter --without-help $(DISABLE_GTK_DOC)" $(VERBOSE)
evolution-ews-master: env evolution-master $(BUILD_ROOT_EVO)/lib/evolution-data-server/libeews-1.2.dll.a
@@ -586,7 +587,7 @@ gdk-pixbuf: env giflib libpng libjpeg libtiff jasper glib $(BUILD_ROOT_DEPS)/lib
$(BUILD_ROOT_DEPS)/lib/pkgconfig/gdk-pixbuf-2.0.pc:
@./get-src https://download.gnome.org/sources/gdk-pixbuf/2.30 gdk-pixbuf-2.30.2.tar.xz
- @./build cmmi "$(BUILD_ROOT_DEPS)" gdk-pixbuf-2.30.2 "" "--disable-static --with-libjasper" $(VERBOSE)
+ @./build cmmi "$(BUILD_ROOT_DEPS)" gdk-pixbuf-2.30.2 "" "--disable-static --disable-modules --with-libjasper" $(VERBOSE)
libcroco: env glib $(BUILD_ROOT_DEPS)/lib/pkgconfig/libcroco-0.6.pc
diff --git a/win32/patches/dbus.patch b/win32/patches/dbus.patch
index c876f2fce0..6d1bee3678 100644
--- a/win32/patches/dbus.patch
+++ b/win32/patches/dbus.patch
@@ -1,6 +1,6 @@
-diff -upr -x .deps -x .libs -x '*.la' dbus-1.8.0.old/dbus/Makefile.am dbus-1.8.0/dbus/Makefile.am
---- dbus-1.8.0.old/dbus/Makefile.am 2014-01-20 13:40:21 +0000
-+++ dbus-1.8.0/dbus/Makefile.am 2014-08-09 12:50:47 +0000
+diff -upr -x .deps -x .libs -x '*.la' -x '*.lo' dbus-1.8.0.old/dbus/Makefile.am dbus-1.8.0/dbus/Makefile.am
+--- dbus-1.8.0.old/dbus/Makefile.am 2014-09-05 16:09:18 +0000
++++ dbus-1.8.0/dbus/Makefile.am 2014-09-05 16:09:40 +0000
@@ -304,8 +304,8 @@ if DBUS_WIN
# this code is used, we don't actually need libstdc++.
noinst_LTLIBRARIES += libdbus-init-win.la
@@ -12,9 +12,30 @@ diff -upr -x .deps -x .libs -x '*.la' dbus-1.8.0.old/dbus/Makefile.am dbus-1.8.0
endif
noinst_PROGRAMS =
-diff -upr -x .deps -x .libs -x '*.la' dbus-1.8.0.old/dbus/dbus-sysdeps-win.c dbus-1.8.0/dbus/dbus-sysdeps-win.c
---- dbus-1.8.0.old/dbus/dbus-sysdeps-win.c 2014-01-07 11:32:53 +0000
-+++ dbus-1.8.0/dbus/dbus-sysdeps-win.c 2014-08-09 13:35:34 +0000
+diff -upr -x .deps -x .libs -x '*.la' -x '*.lo' dbus-1.8.0.old/dbus/dbus-sysdeps-util-win.c dbus-1.8.0/dbus/dbus-sysdeps-util-win.c
+--- dbus-1.8.0.old/dbus/dbus-sysdeps-util-win.c 2014-09-05 16:09:18 +0000
++++ dbus-1.8.0/dbus/dbus-sysdeps-util-win.c 2014-09-05 16:09:28 +0000
+@@ -1555,13 +1555,12 @@ _dbus_replace_install_prefix (const char
+ if ((!_dbus_get_install_root(runtime_prefix, len) ||
+ strncmp (configure_time_path, DBUS_PREFIX "/",
+ strlen (DBUS_PREFIX) + 1))) {
+- strcat (retval, configure_time_path);
+- return retval;
++ strcpy (retval, configure_time_path);
++ } else {
++ strcpy (retval, runtime_prefix);
++ strcat (retval, configure_time_path + strlen (DBUS_PREFIX) + 1);
+ }
+
+- strcpy (retval, runtime_prefix);
+- strcat (retval, configure_time_path + strlen (DBUS_PREFIX) + 1);
+-
+ /* Somehow, in some situations, backslashes get collapsed in the string.
+ * Since windows C library accepts both forward and backslashes as
+ * path separators, convert all backslashes to forward slashes.
+diff -upr -x .deps -x .libs -x '*.la' -x '*.lo' dbus-1.8.0.old/dbus/dbus-sysdeps-win.c dbus-1.8.0/dbus/dbus-sysdeps-win.c
+--- dbus-1.8.0.old/dbus/dbus-sysdeps-win.c 2014-09-05 16:09:18 +0000
++++ dbus-1.8.0/dbus/dbus-sysdeps-win.c 2014-09-05 16:09:40 +0000
@@ -55,6 +55,7 @@
#include <ws2tcpip.h>
#include <wincrypt.h>
@@ -172,7 +193,7 @@ diff -upr -x .deps -x .libs -x '*.la' dbus-1.8.0.old/dbus/dbus-sysdeps-win.c dbu
_dbus_assert (credentials != NULL);
_dbus_assert (!_dbus_credentials_are_anonymous (credentials));
-@@ -3407,18 +3539,16 @@ _dbus_append_keyring_directory_for_crede
+@@ -3407,18 +3539,12 @@ _dbus_append_keyring_directory_for_crede
if (!_dbus_string_init (&homedir))
return FALSE;
@@ -181,14 +202,10 @@ diff -upr -x .deps -x .libs -x '*.la' dbus-1.8.0.old/dbus/dbus-sysdeps-win.c dbu
- {
- _dbus_string_append(&homedir,homedrive);
- }
-+ _dbus_set_homedir_from_drive_and_path_env(&homedir);
-+ /* It's a default folder, like X:\, try to use a better one, in user's home directory */
-+ if (_dbus_string_get_length(&homedir) <= 3) {
++ _dbus_string_set_length(&homedir, 0);
++ if (!_dbus_set_user_home(&homedir)) {
+ _dbus_string_set_length(&homedir, 0);
-+ if (!_dbus_set_user_home(&homedir)) {
-+ _dbus_string_set_length(&homedir, 0);
-+ _dbus_set_homedir_from_drive_and_path_env(&homedir);
-+ }
++ _dbus_set_homedir_from_drive_and_path_env(&homedir);
+ }
- homepath = _dbus_getenv("HOMEPATH");
diff --git a/win32/setup-env b/win32/setup-env
index 0d18e1496e..ded1ed79a4 100755
--- a/win32/setup-env
+++ b/win32/setup-env
@@ -58,6 +58,7 @@ export LDFLAGS="$LDFLAGS -L$BUILD_ROOT_DEPS/lib -L$BUILD_ROOT_EVO/lib -L/lib"
mkdir -p $BUILD_ROOT_DEPS/bin 2>/dev/null
mkdir -p $BUILD_ROOT_DEPS/include 2>/dev/null
mkdir -p $BUILD_ROOT_DEPS/lib 2>/dev/null
+mkdir -p $BUILD_ROOT_DEPS/libexec 2>/dev/null
mkdir -p $BUILD_ROOT_DEPS/share/aclocal 2>/dev/null
mkdir -p $BUILD_ROOT_DEPS/etc/dbus-1/session.d 2>/dev/null
#mkdir -p $BUILD_ROOT_DEPS/share/dbus-1 2>/dev/null
@@ -65,6 +66,7 @@ mkdir -p $BUILD_ROOT_DEPS/etc/dbus-1/session.d 2>/dev/null
mkdir -p $BUILD_ROOT_EVO/bin 2>/dev/null
mkdir -p $BUILD_ROOT_EVO/include 2>/dev/null
mkdir -p $BUILD_ROOT_EVO/lib 2>/dev/null
+mkdir -p $BUILD_ROOT_EVO/libexec 2>/dev/null
mkdir -p $BUILD_ROOT_EVO/share/aclocal 2>/dev/null
#mkdir -p $BUILD_ROOT_EVO/share/dbus-1 2>/dev/null
@@ -72,5 +74,8 @@ mkdir -p $BUILD_ROOT_EVO/share/aclocal 2>/dev/null
#ln -s $BUILD_ROOT_DEPS/share/dbus-1 /usr/local/share/dbus-1
if [ -f "session-local.conf.in" ] ; then
- cat session-local.conf.in | sed 's|@BUILD_ROOT_EVO@|'$BUILD_ROOT_EVO'/share/dbus-1/services|g' >$BUILD_ROOT_DEPS/etc/dbus-1/session.d/session-local.conf
+ cd $BUILD_ROOT_EVO
+ WLIKE_PWD=`pwd -W | sed 's|/|\\\\\\\\|g'`
+ cd - >/dev/null
+ cat session-local.conf.in | sed 's|@BUILD_ROOT_EVO@|'$WLIKE_PWD'\\share\\dbus-1\\services|g' >$BUILD_ROOT_DEPS/etc/dbus-1/session-local.conf
fi
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-07 19:37:38 +0800