Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] gnumeric #31

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
From c2cb0991fd03a5eeceb84edb797d035de8009281 Mon Sep 17 00:00:00 2001
From: Tim Stahlhut <[email protected]>
Date: Sun, 6 Dec 2020 01:33:20 -0500
Subject: msys remove g_option_context_set_delocalize

glib goption.c has been patched to no longer need this fix.

---
src/main-application.c | 6 ------
1 file changed, 6 deletions(-)

diff --git a/src/main-application.c b/src/main-application.c
index ae8beaccd..a00eed642 100644
--- a/src/main-application.c
+++ b/src/main-application.c
@@ -111,12 +111,6 @@ gnumeric_arg_parse (int argc, char **argv)
g_option_context_add_main_entries (ocontext, gnumeric_options, GETTEXT_PACKAGE);
g_option_context_add_group (ocontext, gnm_get_option_group ());

-#if defined(G_OS_WIN32)
- /* we have already translated to utf8, do not do it again.
- * http://bugzilla.gnome.org/show_bug.cgi?id=361321 */
- g_option_context_set_delocalize (ocontext, FALSE);
-#endif
-
g_option_context_add_group (ocontext, gtk_get_option_group (TRUE));
g_option_context_parse (ocontext, &argc, &argv, &error);

--
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
From 88514a390d7352a31f71e6059a59268cfa39e17f Mon Sep 17 00:00:00 2001
From: Tim Stahlhut <[email protected]>
Date: Sat, 19 Dec 2020 14:09:06 -0500
Subject: Add extern prefix to GNM_VAR_DECL

---
src/libgnumeric.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libgnumeric.h b/src/libgnumeric.h
index 36957b41f..bf21798e3 100644
--- a/src/libgnumeric.h
+++ b/src/libgnumeric.h
@@ -8,7 +8,7 @@ G_BEGIN_DECLS
#ifndef GNM_VAR_DECL
# ifdef WIN32
# ifdef GNUMERIC_INTERNAL
-# define GNM_VAR_DECL __declspec(dllexport)
+# define GNM_VAR_DECL extern __declspec(dllexport)
# else
# define GNM_VAR_DECL extern __declspec(dllimport)
# endif
--
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
From 4a165e41740c35a98151d28d3ac80e8c87628fd5 Mon Sep 17 00:00:00 2001
From: Tim Stahlhut <[email protected]>
Date: Sat, 5 Dec 2020 22:32:10 -0500
Subject: msys export sheet_style_apply_border

---
src/Makefile.am | 1 +
1 file changed, 1 insertion(+)

diff --git a/src/Makefile.am b/src/Makefile.am
index 8b9d88980..f2cf34184 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -685,6 +685,6 @@ endif
if WITH_WIN32
libspreadsheet.def: local.def
echo EXPORTS > $@ && \
- cat $^ | sort >> $@
+ echo sheet_style_apply_border | cat - $^ | sort >> $@

local.def: stamp-local.def
--
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
From a5b01dfca9d1f7491ead11142371c759db3b766c Mon Sep 17 00:00:00 2001
From: Tim Stahlhut <[email protected]>
Date: Mon, 21 Dec 2020 09:48:32 -0500
Subject: win32: comment out build using hhc.exe

---
doc/Makefile.am | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 1287c17ff..b056e2070 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -603,14 +603,14 @@ EXTRA_DIST += $(manpage_DATA)

winhelp_DATA =
winhelpdir=$(gnumeric_datadir)/$(subdir)
-if WITH_WIN32
-winhelp_DATA += gnumeric.chm gnumeric.hhmap
-
-gnumeric.hhmap: chm-stamp
- -(cd C/chm && wine 'C:\Program Files\HTML Help Workshop\hhc.exe' gnumeric.hhp)
- cp C/chm/gnumeric.hhmap .
-
-gnumeric.chm: gnumeric.hhmap
- cp C/chm/gnumeric.chm .
-
-endif
+#if WITH_WIN32
+#winhelp_DATA += gnumeric.chm gnumeric.hhmap
+#
+#gnumeric.hhmap: chm-stamp
+# -(cd C/chm && wine 'C:\Program Files\HTML Help Workshop\hhc.exe' gnumeric.hhp)
+# cp C/chm/gnumeric.hhmap .
+#
+#gnumeric.chm: gnumeric.hhmap
+# cp C/chm/gnumeric.chm .
+#
+#endif
--
13 changes: 13 additions & 0 deletions mingw-w64-gnumeric/005-GNM-1.12.x-patch-icon-Makefile.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
--- icons/Makefile.orig 2020-12-10 16:07:28.080018600 -0500
+++ icons/Makefile 2020-12-10 16:11:56.029344500 -0500
@@ -840,8 +840,8 @@
.PRECIOUS: Makefile


-install-fake-index-theme: fake-index-theme
- install -D -m 0644 fake-index-theme $(datadir)/icons/hicolor/index.theme
+install-fake-index-theme: $(top_srcdir)/icons/fake-index-theme
+ install -D -m 0644 $(top_srcdir)/icons/fake-index-theme $(datadir)/icons/hicolor/index.theme

install-data-hook: update-icon-cache $(fake_index_theme_target)
uninstall-hook: update-icon-cache
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
From 28e684e5a3e76c82023920037218983869ac2103 Mon Sep 17 00:00:00 2001
From: Tim Stahlhut <[email protected]>
Date: Thu, 10 Dec 2020 04:18:41 -0500
Subject: gcc asm comment out asm code

---
plugins/excelplugins/xlcall32_emulation.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/plugins/excelplugins/xlcall32_emulation.c b/plugins/excelplugins/xlcall32_emulation.c
index ede716d8f..1415d9cf3 100644
--- a/plugins/excelplugins/xlcall32_emulation.c
+++ b/plugins/excelplugins/xlcall32_emulation.c
@@ -82,7 +82,9 @@ int far pascal XLCallVer(void){
return 1280;
}

+/*
#ifdef WIN32
asm (".section .drectve");
asm (".ascii \"-export:Excel4v=Excel4v@16,XLCallVer=XLCallVer@0\"");
#endif
+*/
--
2.29.2.windows.2

30 changes: 30 additions & 0 deletions mingw-w64-gnumeric/010-GNM-1.12.8-msys-add-ExcHndlInit.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
From 1cce1d11fcf9f651bc3368a187ad1b637ccc53d3 Mon Sep 17 00:00:00 2001
From: Tim Stahlhut <[email protected]>
Date: Sat, 12 Dec 2020 15:29:02 -0500
Subject: msys add ExcHndlInit

---
src/main-application.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/src/main-application.c b/src/main-application.c
index ae8beaccd..5ddb52585 100644
--- a/src/main-application.c
+++ b/src/main-application.c
@@ -16,6 +16,7 @@
#ifdef G_OS_WIN32
#define _WIN32_WINNT 0x0501
#include <windows.h>
+#include <exchndl.h> /* crash/exception handler */
#include <io.h>
#endif

@@ -229,6 +230,7 @@ main (int argc, char const **argv)
}
}
}
+ ExcHndlInit();
#endif

gnumeric_arg_parse (argc, (char **)argv);
--
37 changes: 37 additions & 0 deletions mingw-w64-gnumeric/011-GNM-1.12.x-win32-add-srcdir-prefix.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
From 6c23dadedbbc25628e5c83bfbaca864056a382f5 Mon Sep 17 00:00:00 2001
From: Tim Stahlhut <[email protected]>
Date: Mon, 21 Dec 2020 12:48:27 -0500
Subject: win32 add "$(srcdir)/" prefix

---
doc/Makefile.am | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 1287c17ff..6f36df5b9 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -530,7 +530,7 @@ install-exec-hook:
helpdir="$(DESTDIR)$(HELP_DIR)/$$d/$(HELP_ID)"; \
install -d $$helpdir; \
$(RM) $$helpdir/index.docbook; \
- $(LN_S) gnumeric.xml $$helpdir/index.docbook; \
+ $(LN_S) $(srcdir)/C/gnumeric.xml $$helpdir/index.docbook; \
done

uninstall-hook:
@@ -543,11 +543,11 @@ functions_xml_parts = C/func.defs C/func-header.xml C/func-footer.xml

C/functions.xml: $(srcdir)/make-func-list.pl $(functions_xml_parts)
(cat $(srcdir)/C/func-header.xml ; \
- $(PERL) $(srcdir)/make-func-list.pl C/func.defs ; \
+ $(PERL) $(srcdir)/make-func-list.pl $(srcdir)/C/func.defs ; \
cat $(srcdir)/C/func-footer.xml \
) >functions.tmp ; \
if xmllint -noent --nonet --format --encode "UTF-8" functions.tmp >functions.out ; then \
- mv functions.out $@; rm functions.tmp; \
+ mv functions.out $(srcdir)/$@; rm functions.tmp; \
fi

C/func.defs: # $(top_builddir)/src/gnumeric$(EXEEXT)
--
Loading