[Commits] [SCM] claws branch, master, updated. 3.18.0-149-g633a2de84
jonathan at claws-mail.org
jonathan at claws-mail.org
Tue Sep 21 11:20:17 CEST 2021
The branch, master has been updated
via 633a2de84d5ff3a3c91171f86a54cdce17e9eca7 (commit)
via 56c42d195b134ac7fc1661fa08f3a7ad4f926b8e (commit)
via 8192036d0c6d2d3daaf1435fc7d81b579fc31150 (commit)
via 00145c3aaea2801f922d5c7bbb30ab4a8bf93a8d (commit)
from 3bf1a29835ea753597ccab93919a41a2f195422a (commit)
Summary of changes:
configure.ac | 1 +
src/plugins/notification/Makefile.am | 2 +-
src/plugins/pdf_viewer/Makefile.am | 61 ++++++++++++++++++----
src/plugins/pdf_viewer/claws.def | 37 +++++++++++++
.../{address_keeper => pdf_viewer}/plugin.def | 0
src/plugins/pdf_viewer/poppler_viewer.h | 2 +
.../{fetchinfo => pdf_viewer}/version.rc.in | 6 +--
7 files changed, 94 insertions(+), 15 deletions(-)
create mode 100644 src/plugins/pdf_viewer/claws.def
copy src/plugins/{address_keeper => pdf_viewer}/plugin.def (100%)
copy src/plugins/{fetchinfo => pdf_viewer}/version.rc.in (86%)
- Log -----------------------------------------------------------------
commit 633a2de84d5ff3a3c91171f86a54cdce17e9eca7
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Mon Sep 20 03:38:51 2021 -0700
Fix missing line continuation
diff --git a/src/plugins/notification/Makefile.am b/src/plugins/notification/Makefile.am
index 0c48a020b..f382bb881 100644
--- a/src/plugins/notification/Makefile.am
+++ b/src/plugins/notification/Makefile.am
@@ -75,7 +75,7 @@ notification_la_CPPFLAGS = \
$(ENCHANT_CFLAGS) \
$(libnotify_CFLAGS) \
$(unity_CFLAGS) \
- $(libcanberra_gtk_CFLAGS)
+ $(libcanberra_gtk_CFLAGS) \
-Wall
notification_la_SOURCES = \
commit 56c42d195b134ac7fc1661fa08f3a7ad4f926b8e
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Mon Sep 20 03:18:44 2021 -0700
Update plugin makefiles for Windows
diff --git a/src/plugins/pdf_viewer/Makefile.am b/src/plugins/pdf_viewer/Makefile.am
index 54688d849..a20918f28 100644
--- a/src/plugins/pdf_viewer/Makefile.am
+++ b/src/plugins/pdf_viewer/Makefile.am
@@ -3,51 +3,39 @@
# terms of the General Public License version 3 (or later).
# See COPYING file for license details.
-EXTRA_DIST = claws.def plugin.def version.rc
+EXTRA_DIST = claws.def plugin.def
IFLAGS = \
-I$(top_builddir)/src \
+ -I$(top_builddir)/src/common \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/common \
- -I$(top_builddir)/src/common \
-I$(top_srcdir)/src/gtk
-if OS_WIN32
-
-LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RC) \
- `echo $(DEFS) $(DEFAULT_INCLUDES) $(IFLAGS) | \
- sed -e 's/-I/--include-dir /g;s/-D/--define /g'`
-
-%.lo: %.rc
- $(LTRCCOMPILE) -i $< -o $@
+plugin_ldflags =
+plugin_extra_deps =
+plugin_libadd =
-plugin_res = version.lo
-plugin_res_ldflag = -Wl,.libs/version.o
-export_symbols = -export-symbols $(srcdir)/plugin.def
-plugin_deps = libclaws.a $(plugin_res) plugin.def
-plugin_ldadd = -L. -lclaws
+if OS_WIN32
libclaws.a: claws.def
$(DLLTOOL) --output-lib $@ --def $<
-else
-plugin_res =
-plugin_res_ldflag =
-export_symbols =
-plugin_deps =
-plugin_ldadd =
-endif
+%.lo : %.rc
+ $(LIBTOOL) --mode=compile --tag=RC $(RC) -i $< -o $@
+
+plugin_ldflags += \
+ -Wl,.libs/version.o \
+ -no-undefined \
+ -export-symbols $(srcdir)/plugin.def
+plugin_extra_deps += libclaws.a version.lo plugin.def
+plugin_libadd += -L. -lclaws
-if PLATFORM_WIN32
-no_undefined = -no-undefined
-else
-no_undefined =
endif
if CYGWIN
-cygwin_export_lib = -L$(top_builddir)/src -lclaws-mail
-else
-cygwin_export_lib =
+plugin_ldflags += -no-undefined
+plugin_libadd += -L$(top_builddir)/src -lclaws-mail
endif
plugindir = $(pkglibdir)/plugins
@@ -56,17 +44,13 @@ if BUILD_PDF_VIEWER_PLUGIN
plugin_LTLIBRARIES = pdf_viewer.la
endif
-pdf_viewer_la_SOURCES = \
- poppler_viewer.c \
- poppler_viewer.h
-
pdf_viewer_la_LDFLAGS = \
- $(plugin_res_ldflag) $(no_undefined) $(export_symbols) \
+ $(plugin_ldflags) \
-avoid-version -module
-pdf_viewer_la_DEPENDENCIES = $(plugin_deps)
+EXTRA_pdf_viewer_la_DEPENDENCIES = $(plugin_extra_deps)
-pdf_viewer_la_LIBADD = $(plugin_ldadd) $(cygwin_export_lib) \
+pdf_viewer_la_LIBADD = $(plugin_libadd) \
$(GTK_LIBS) \
$(POPPLER_LIBS)
@@ -77,4 +61,11 @@ pdf_viewer_la_CPPFLAGS = \
$(ENCHANT_CFLAGS) \
$(POPPLER_CFLAGS)
+pdf_viewer_la_SOURCES = \
+ poppler_viewer.c \
+ poppler_viewer.h
+
+clean-local:
+ rm -f libclaws.a
+
.PHONY: test
commit 8192036d0c6d2d3daaf1435fc7d81b579fc31150
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Mon Sep 20 03:17:06 2021 -0700
Update Windows VERSIONINFO resource for plugins
diff --git a/configure.ac b/configure.ac
index 04a3d7ffb..facf5d700 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2172,6 +2172,7 @@ src/plugins/notification/Makefile
src/plugins/notification/version.rc
src/plugins/notification/gtkhotkey/Makefile
src/plugins/pdf_viewer/Makefile
+src/plugins/pdf_viewer/version.rc
src/plugins/perl/Makefile
src/plugins/perl/tools/Makefile
src/plugins/python/Makefile
diff --git a/src/plugins/pdf_viewer/version.rc b/src/plugins/pdf_viewer/version.rc
deleted file mode 100644
index 907e22c28..000000000
--- a/src/plugins/pdf_viewer/version.rc
+++ /dev/null
@@ -1,36 +0,0 @@
-1 VERSIONINFO
- FILEVERSION 0, 0, 0, 0
- PRODUCTVERSION 0, 0, 0, 0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "000004b0"
- BEGIN
- VALUE "FileDescription", "Claws Mail PDF Viewer Plugin\0"
- VALUE "FileVersion", "0.0.0.0\0"
- VALUE "ProductVersion", "0.0.0.0 Win32\0"
- VALUE "LegalCopyright", "GPL / © 1999-2021 Hiroyuki Yamamoto & The Claws Mail Team\0"
- VALUE "CompanyName", "GNU / Free Software Foundation\0"
- VALUE "ProductName", "Claws Mail\0"
-// VALUE "Comments", "\0"
-// VALUE "InternalName", "\0"
-// VALUE "LegalTrademarks", "\0"
-// VALUE "OriginalFilename", "\0"
-// VALUE "PrivateBuild", "\0"
-// VALUE "SpecialBuild", "\0"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x0, 1200
- END
-END
diff --git a/src/plugins/pdf_viewer/version.rc.in b/src/plugins/pdf_viewer/version.rc.in
new file mode 100644
index 000000000..a7631d986
--- /dev/null
+++ b/src/plugins/pdf_viewer/version.rc.in
@@ -0,0 +1,34 @@
+#include <winver.h>
+
+VS_VERSION_INFO VERSIONINFO
+FILEVERSION @MAJOR_VERSION@, at MINOR_VERSION@, at MICRO_VERSION@, at EXTRA_VERSION@
+PRODUCTVERSION @MAJOR_VERSION@, at MINOR_VERSION@, at MICRO_VERSION@, at EXTRA_VERSION@
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+FILEFLAGS 0x0L
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_DLL
+FILESUBTYPE 0x0L
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904b0"
+ BEGIN
+// VALUE "Comments", ""
+ VALUE "CompanyName", "The Claws Mail Team"
+ VALUE "FileDescription", "Claws Mail PDF Viewer Plugin"
+ VALUE "FileVersion", "@VERSION@"
+ VALUE "InternalName", "pdf_viewer"
+ VALUE "LegalCopyright", "GPL-3.0-or-later / © 1999-2021 The Claws Mail Team & Hiroyuki Yamamoto"
+// VALUE "LegalTrademarks", ""
+ VALUE "OriginalFilename", "pdf_viewer.dll"
+// VALUE "PrivateBuild", ""
+ VALUE "ProductName", "Claws Mail"
+ VALUE "ProductVersion", "@GIT_VERSION@ for Windows"
+// VALUE "SpecialBuild", ""
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x0409, 1200
+ END
+END
commit 00145c3aaea2801f922d5c7bbb30ab4a8bf93a8d
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sun Aug 22 17:04:29 2021 -0700
port pdf viewer plugin to windows
diff --git a/src/plugins/pdf_viewer/Makefile.am b/src/plugins/pdf_viewer/Makefile.am
index d5ce4b22e..54688d849 100644
--- a/src/plugins/pdf_viewer/Makefile.am
+++ b/src/plugins/pdf_viewer/Makefile.am
@@ -1,8 +1,55 @@
-# Copyright 1999-2014 the Claws Mail team.
+# Copyright 1999-2021 the Claws Mail team.
# This file is part of Claws Mail package, and distributed under the
# terms of the General Public License version 3 (or later).
# See COPYING file for license details.
+EXTRA_DIST = claws.def plugin.def version.rc
+
+IFLAGS = \
+ -I$(top_builddir)/src \
+ -I$(top_srcdir)/src \
+ -I$(top_srcdir)/src/common \
+ -I$(top_builddir)/src/common \
+ -I$(top_srcdir)/src/gtk
+
+if OS_WIN32
+
+LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RC) \
+ `echo $(DEFS) $(DEFAULT_INCLUDES) $(IFLAGS) | \
+ sed -e 's/-I/--include-dir /g;s/-D/--define /g'`
+
+%.lo: %.rc
+ $(LTRCCOMPILE) -i $< -o $@
+
+plugin_res = version.lo
+plugin_res_ldflag = -Wl,.libs/version.o
+export_symbols = -export-symbols $(srcdir)/plugin.def
+plugin_deps = libclaws.a $(plugin_res) plugin.def
+plugin_ldadd = -L. -lclaws
+
+libclaws.a: claws.def
+ $(DLLTOOL) --output-lib $@ --def $<
+
+else
+plugin_res =
+plugin_res_ldflag =
+export_symbols =
+plugin_deps =
+plugin_ldadd =
+endif
+
+if PLATFORM_WIN32
+no_undefined = -no-undefined
+else
+no_undefined =
+endif
+
+if CYGWIN
+cygwin_export_lib = -L$(top_builddir)/src -lclaws-mail
+else
+cygwin_export_lib =
+endif
+
plugindir = $(pkglibdir)/plugins
if BUILD_PDF_VIEWER_PLUGIN
@@ -10,20 +57,21 @@ plugin_LTLIBRARIES = pdf_viewer.la
endif
pdf_viewer_la_SOURCES = \
- poppler_viewer.c \
- poppler_viewer.h
+ poppler_viewer.c \
+ poppler_viewer.h
pdf_viewer_la_LDFLAGS = \
- -avoid-version -module \
+ $(plugin_res_ldflag) $(no_undefined) $(export_symbols) \
+ -avoid-version -module
+
+pdf_viewer_la_DEPENDENCIES = $(plugin_deps)
+
+pdf_viewer_la_LIBADD = $(plugin_ldadd) $(cygwin_export_lib) \
$(GTK_LIBS) \
$(POPPLER_LIBS)
pdf_viewer_la_CPPFLAGS = \
- -I$(top_builddir)/src \
- -I$(top_srcdir)/src \
- -I$(top_srcdir)/src/common \
- -I$(top_builddir)/src/common \
- -I$(top_srcdir)/src/gtk \
+ $(IFLAGS) \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
$(ENCHANT_CFLAGS) \
diff --git a/src/plugins/pdf_viewer/claws.def b/src/plugins/pdf_viewer/claws.def
new file mode 100644
index 000000000..7cd57d3b1
--- /dev/null
+++ b/src/plugins/pdf_viewer/claws.def
@@ -0,0 +1,37 @@
+LIBRARY CLAWS-MAIL.EXE
+EXPORTS
+alertpanel_error
+alertpanel_full
+alertpanel_warning
+check_plugin_version
+claws_unlink
+compose_new
+conv_get_locale_charset_str
+debug_print_real
+execute_command_line
+get_tmp_file
+gtkutils_scroll_one_line
+gtkutils_scroll_page
+input_dialog_with_invisible
+main_window_cursor_normal
+main_window_cursor_wait
+mainwindow_get_mainwindow
+mimeview_register_viewer_factory
+mimeview_unregister_viewer_factory
+open_uri
+prefs_common_get_uri_cmd
+printing_get_renderer_data
+printing_get_zoom
+printing_print_full
+printing_set_n_pages
+procmime_get_content_type_str
+procmime_get_mime_type
+procmime_get_part
+procmime_get_part_file_name
+procmime_get_tmp_file_name
+procmime_mimeinfo_get_parameter
+stock_pixbuf_gdk
+stock_pixmap_widget
+strretchomp
+summary_print
+to_human_readable
diff --git a/src/plugins/pdf_viewer/plugin.def b/src/plugins/pdf_viewer/plugin.def
new file mode 100644
index 000000000..8916a5d7c
--- /dev/null
+++ b/src/plugins/pdf_viewer/plugin.def
@@ -0,0 +1,10 @@
+EXPORTS
+ plugin_desc
+ plugin_done
+ plugin_init
+ plugin_licence
+ plugin_name
+ plugin_type
+ plugin_provides
+ plugin_version
+
diff --git a/src/plugins/pdf_viewer/poppler_viewer.h b/src/plugins/pdf_viewer/poppler_viewer.h
index 029f345ec..af1d97a27 100644
--- a/src/plugins/pdf_viewer/poppler_viewer.h
+++ b/src/plugins/pdf_viewer/poppler_viewer.h
@@ -26,7 +26,9 @@
//#include <unistd.h>
#include <stdio.h>
#include <gtk/gtk.h>
+#ifndef G_OS_WIN32
#include <gdk/gdkx.h>
+#endif
#include <gdk/gdkkeysyms.h>
#include <poppler.h>
#include <version.h>
diff --git a/src/plugins/pdf_viewer/version.rc b/src/plugins/pdf_viewer/version.rc
new file mode 100644
index 000000000..907e22c28
--- /dev/null
+++ b/src/plugins/pdf_viewer/version.rc
@@ -0,0 +1,36 @@
+1 VERSIONINFO
+ FILEVERSION 0, 0, 0, 0
+ PRODUCTVERSION 0, 0, 0, 0
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "000004b0"
+ BEGIN
+ VALUE "FileDescription", "Claws Mail PDF Viewer Plugin\0"
+ VALUE "FileVersion", "0.0.0.0\0"
+ VALUE "ProductVersion", "0.0.0.0 Win32\0"
+ VALUE "LegalCopyright", "GPL / © 1999-2021 Hiroyuki Yamamoto & The Claws Mail Team\0"
+ VALUE "CompanyName", "GNU / Free Software Foundation\0"
+ VALUE "ProductName", "Claws Mail\0"
+// VALUE "Comments", "\0"
+// VALUE "InternalName", "\0"
+// VALUE "LegalTrademarks", "\0"
+// VALUE "OriginalFilename", "\0"
+// VALUE "PrivateBuild", "\0"
+// VALUE "SpecialBuild", "\0"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x0, 1200
+ END
+END
-----------------------------------------------------------------------
hooks/post-receive
--
Claws Mail
More information about the Commits
mailing list