security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

speedo: Revamped speedo and include a w32 installer. 

* build-aux/speedo/: New.
* build-aux/speedo/w32/: New.
--

The new installer uses some code from Gpg4win but is much smaller and
easier to maintain.  To build an installer, unpack GnuPG and then run

  make -f build-aux/speedo.mk  TARBALLS=~/mytarballs installer

~/mytarballs is a directory with tarballs of external libraries.  See
speedo.mk for a list of them.

WARNING: The installed W32 version does not correctly work right now.
This commit is contained in:
Werner Koch 2014-06-10 19:42:34 +02:00
parent 0399d87f7a
commit e06d5d1a3b
13 changed files with 4148 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -21,6 +21,7 @@ keyserver/gpg2keys_test
tools/gpg-zip
# Files created by make when not using a VPATH build
play/
*.o
po/en@boldquot.insert-header
po/en@boldquot.po

584
build-aux/speedo.mk
View File

@ -19,7 +19,7 @@
# speedo does only work with GNU make. The build system is similar to
# that of gpg4win. The following commands are supported:
#
# make -f speedo.mk all
# make -f speedo.mk all pkg2rep=/dir/with/tarballs
# or
# make -f speedo.mk
#
@ -42,47 +42,113 @@
# Lists packages and versions.
#
# We need to know our own name.
SPEEDO_MK := $(realpath $(lastword $(MAKEFILE_LIST)))
# Set this to "git" or "release".
WHAT=release
WHAT=git
# Set target to "native" or "w32"
TARGETOS=native
TARGETOS=w32
# Set to the location of the directory with traballs of
# external packages.
TARBALLS=$(shell pwd)/../tarballs
# Number of parallel make jobs
MAKE_J=3
# =====BEGIN LIST OF PACKAGES=====
# The packages that should be built. The order is also the build order.
speedo_spkgs = libgpg-error npth libgcrypt libassuan libksba gnupg gpgme
# Fixme: Do we need to build pkg-config for cross-building?
ifneq ($(TARGETOS),w32)
speedo_spkgs += gpa
endif
speedo_spkgs = \
libgpg-error npth libgcrypt
ifeq ($(TARGETOS),w32)
speedo_spkgs += gpgex
speedo_spkgs += \
zlib libiconv gettext
endif
speedo_spkgs += \
libassuan libksba gnupg
ifeq ($(TARGETOS),w32)
speedo_spkgs += \
libffi glib pkg-config
endif
speedo_spkgs += \
gpgme
ifeq ($(TARGETOS),w32)
speedo_spkgs += \
libpng \
gdk-pixbuf atk pixman cairo pango gtk+
endif
speedo_spkgs += \
pinentry gpa
ifeq ($(TARGETOS),w32)
speedo_spkgs += \
gpgex
endif
# =====END LIST OF PACKAGES=====
# Packages which are additionally build for 64 bit Windows
speedo_w64_spkgs = \
libgpg-error libiconv gettext libassuan gpgex
# Packages which use the gnupg autogen.sh build style
speedo_gnupg_style = \
libgpg-error npth libgcrypt \
libassuan libksba gnupg gpgme \
pinentry gpa gpgex
# Packages which use only make and no build directory
speedo_make_only_style = \
zlib
# Version numbers of the released packages
# Fixme: Take the version numbers from gnupg-doc/web/swdb.mac
libgpg_error_ver = 1.12
libgpg_error_ver = 1.13
npth_ver = 0.91
libgcrypt_ver = 1.6.0
libgcrypt_ver = 1.6.1
libassuan_ver = 2.1.1
libksba_ver = 1.3.0
gnupg_ver = 2.0.22
gpgme_ver = 1.5.0
pinentry_ver = 0.8.4
gpa_ver = 0.9.5
gpgex_ver = 1.0.0
# Version number for external packages
pkg_config_ver = 0.23
zlib_ver = 1.2.8
libiconv_ver = 1.14
gettext_ver = 0.18.2.1
libffi_ver = 3.0.13
glib_ver = 2.34.3
libpng_ver = 1.4.12
gdk_pixbuf_ver = 2.26.5
atk_ver = 1.32.0
pango_ver = 1.29.4
pixman_ver = 0.32.4
cairo_ver = 1.12.16
gtk__ver = 2.24.17
# The GIT repository. Using a local repo is much faster.
#gitrep = git://git.gnupg.org
gitrep = ${HOME}/s
# The tarball directory
# The tarball directories
pkgrep = ftp://ftp.gnupg.org/gcrypt
pkg2rep = $(TARBALLS)
# For each package, the following variables can be defined:
#
@ -117,10 +183,10 @@ ifeq ($(WHAT),git)
speedo_pkg_libgcrypt_gitref = LIBGCRYPT-1-6-BRANCH
speedo_pkg_libksba_git = $(gitrep)/libksba
speedo_pkg_libksba_gitref = master
speedo_pkg_gnupg_git = $(gitrep)/gnupg
speedo_pkg_gnupg_gitref = master
speedo_pkg_gpgme_git = $(gitrep)/gpgme
speedo_pkg_gpgme_gitref = master
speedo_pkg_pinentry_git = $(gitrep)/pinentry
speedo_pkg_pinentry_gitref = master
speedo_pkg_gpa_git = $(gitrep)/gpa
speedo_pkg_gpa_gitref = master
speedo_pkg_gpgex_git = $(gitrep)/gpgex
@ -136,57 +202,182 @@ else
$(pkgrep)/libgcrypt/libgcrypt-$(libgcrypt_ver).tar.bz2
speedo_pkg_libksba_tar = \
$(pkgrep)/libksba/libksba-$(libksba_ver).tar.bz2
speedo_pkg_gnupg_tar = \
$(pkgrep)/gnupg/gnupg-$(gnupg_ver).tar.bz2
speedo_pkg_gpgme_tar = \
$(pkgrep)/gpgme/gpgme-$(gpgme_ver).tar.bz2
speedo_pkg_pinentry_tar = \
$(pkgrep)/pinentry/pinentry-$(pinentry_ver).tar.bz2
speedo_pkg_gpa_tar = \
$(pkgrep)/gpa/gpa-$(gpa_ver).tar.bz2
speedo_pkg_gpex_tar = \
speedo_pkg_gpgex_tar = \
$(pkgrep)/gpex/gpgex-$(gpa_ver).tar.bz2
endif
speedo_pkg_pkg_config_tar = $(pkg2rep)/pkg-config-$(pkg_config_ver).tar.gz
speedo_pkg_zlib_tar = $(pkg2rep)/zlib-$(zlib_ver).tar.gz
speedo_pkg_libiconv_tar = $(pkg2rep)/libiconv-$(libiconv_ver).tar.gz
speedo_pkg_gettext_tar = $(pkg2rep)/gettext-$(gettext_ver).tar.gz
speedo_pkg_libffi_tar = $(pkg2rep)/libffi-$(libffi_ver).tar.gz
speedo_pkg_glib_tar = $(pkg2rep)/glib-$(glib_ver).tar.xz
speedo_pkg_libpng_tar = $(pkg2rep)/libpng-$(libpng_ver).tar.bz2
speedo_pkg_gdk_pixbuf_tar = $(pkg2rep)/gdk-pixbuf-$(gdk_pixbuf_ver).tar.xz
speedo_pkg_atk_tar = $(pkg2rep)/atk-$(atk_ver).tar.bz2
speedo_pkg_pango_tar = $(pkg2rep)/pango-$(pango_ver).tar.bz2
speedo_pkg_pixman_tar = $(pkg2rep)/pixman-$(pixman_ver).tar.gz
speedo_pkg_cairo_tar = $(pkg2rep)/cairo-$(cairo_ver).tar.xz
speedo_pkg_gtk__tar = $(pkg2rep)/gtk+-$(gtk__ver).tar.xz
#
# Package build options
#
speedo_pkg_libgpg_error_configure = --enable-static
speedo_pkg_w64_libgpg_error_configure = --enable-static
speedo_pkg_libassuan_configure = --enable-static
speedo_pkg_w64_libassuan_configure = --enable-static
speedo_pkg_libgcrypt_configure = --disable-static
speedo_pkg_libksba_configure = --disable-static
speedo_pkg_gnupg_configure = --enable-gpg2-is-gpg --disable-g13
speedo_pkg_gnupg_extracflags = -g
define speedo_pkg_gnupg_post_install
(set -e; \
sed -n 's/.*PACKAGE_VERSION "\(.*\)"/\1/p' config.h >$(idir)/INST_VERSION; \
sed -n 's/.*W32INFO_VI_PRODUCTVERSION \(.*\)/\1/p' common/w32info-rc.h \
|sed 's/,/./g' >$(idir)/INST_PROD_VERSION )
endef
# The LDFLAGS is needed for -lintl for glib.
speedo_pkg_gpgme_configure = \
--enable-static --enable-w32-glib --disable-w32-qt \
--with-gpg-error-prefix=$(idir) \
LDFLAGS=-L$(idir)/lib
speedo_pkg_pinentry_configure = \
--disable-pinentry-qt --disable-pinentry-qt4 --disable-pinentry-gtk \
--enable-pinentry-gtk2 \
--with-glib-prefix=$(idir) --with-gtk-prefix=$(idir) \
CPPFLAGS=-I$(idir)/include \
LDFLAGS=-L$(idir)/lib \
CXXFLAGS=-static-libstdc++
speedo_pkg_gpa_configure = \
--with-libiconv-prefix=$(idir) --with-libintl-prefix=$(idir) \
--with-gpgme-prefix=$(idir) --with-zlib=$(idir) \
--with-libassuan-prefix=$(idir) --with-gpg-error-prefix=$(idir)
speedo_pkg_gpgex_configure = \
--with-gpg-error-prefix=$(idir) \
--with-libassuan-prefix=$(idir)
speedo_pkg_w64_gpgex_configure = \
--with-gpg-error-prefix=$(idir6) \
--with-libassuan-prefix=$(idir6)
#
# External packages
#
speedo_pkg_zlib_make_args = \
-fwin32/Makefile.gcc PREFIX=$(host)- IMPLIB=libz.dll.a
speedo_pkg_zlib_make_args_inst = \
-fwin32/Makefile.gcc \
BINARY_PATH=$(idir)/bin INCLUDE_PATH=$(idir)/include \
LIBRARY_PATH=$(idir)/lib SHARED_MODE=1 IMPLIB=libz.dll.a
# Zlib needs some special magic to generate a libtool file.
# We also install the pc file here.
define speedo_pkg_zlib_post_install
(set -e; mkdir $(idir)/lib/pkgconfig || true; \
cp $(auxsrc)/zlib.pc $(idir)/lib/pkgconfig/; \
cd $(idir); \
echo "# Generated by libtool" > lib/libz.la \
echo "dlname='../bin/zlib1.dll'" >> lib/libz.la; \
echo "library_names='libz.dll.a'" >> lib/libz.la; \
echo "old_library='libz.a'" >> lib/libz.la; \
echo "dependency_libs=''" >> lib/libz.la; \
echo "current=1" >> lib/libz.la; \
echo "age=2" >> lib/libz.la; \
echo "revision=5" >> lib/libz.la; \
echo "installed=yes" >> lib/libz.la; \
echo "shouldnotlink=no" >> lib/libz.la; \
echo "dlopen=''" >> lib/libz.la; \
echo "dlpreopen=''" >> lib/libz.la; \
echo "libdir=\"$(idir)/lib\"" >> lib/libz.la)
endef
speedo_pkg_w64_libiconv_configure = \
--enable-shared=no --enable-static=yes
speedo_pkg_gettext_configure = \
--with-lib-prefix=$(idir) --with-libiconv-prefix=$(idir) \
CPPFLAGS=-I$(idir)/include LDFLAGS=-L$(idir)/lib
speedo_pkg_w64_gettext_configure = \
--with-lib-prefix=$(idir) --with-libiconv-prefix=$(idir) \
CPPFLAGS=-I$(idir6)/include LDFLAGS=-L$(idir6)/lib
speedo_pkg_gettext_extracflags = -O2
# We only need gettext-runtime and there is sadly no top level
# configure option for this
speedo_pkg_gettext_make_dir = gettext-runtime
speedo_pkg_glib_configure = \
--disable-modular-tests \
--with-lib-prefix=$(idir) --with-libiconv-prefix=$(idir) \
CPPFLAGS=-I$(idir)/include \
LDFLAGS=-L$(idir)/lib \
CCC=$(host)-g++ \
LIBFFI_CFLAGS=-I$(idir)/lib/libffi-$(libffi_ver)/include \
LIBFFI_LIBS=\"-L$(idir)/lib -lffi\"
speedo_pkg_glib_extracflags = -march=i486
speedo_pkg_libpng_configure = \
CPPFLAGS=\"-I$(idir)/include -DPNG_BUILD_DLL\" \
LDFLAGS=\"-L$(idir)/lib\" LIBPNG_DEFINES=\"-DPNG_BUILD_DLL\"
speedo_pkg_pixman_configure = \
CPPFLAGS=-I$(idir)/include \
LDFLAGS=-L$(idir)/lib
speedo_pkg_cairo_configure = \
--disable-qt --disable-ft --disable-fc \
--enable-win32 --enable-win32-font \
CPPFLAGS=-I$(idir)/include \
LDFLAGS=-L$(idir)/lib
speedo_pkg_pango_configure = \
--disable-gtk-doc \
CPPFLAGS=-I$(idir)/include \
LDFLAGS=-L$(idir)/lib
speedo_pkg_gtk__configure = \
--disable-cups \
CPPFLAGS=-I$(idir)/include \
LDFLAGS=-L$(idir)/lib
# ---------
all: all-speedo
@echo export PATH=\"$(idir)/bin\":\$$PATH
@echo export LD_LIBRARY_PATH=\"$(idir)/lib\":\$$LD_LIBRARY_PATH
@echo hash -r
report: report-speedo
clean: clean-speedo
# Fixme: The dist target does not work anymore.
ifeq ($(TARGETOS),w32)
STRIP = i686-w64-mingw32-strip
dist: all
set -e; date=$$(date -u +%Y%m%d); pkgname=gpg-w32-dev-$$date; \
rm -rf $$pkgname $${pkgname}.zip || true; \
cp -rL playground/install $${pkgname}; \
rm -r $${pkgname}/share/info || true; \
mkdir -p $${pkgname}/share/doc/gpg-w32-dev ;\
echo "Included versions:" > $${pkgname}/README.txt ; \
echo "" >> $${pkgname}/README.txt ; \
$(MAKE) --no-print-directory report \
| awk '{print $$2}' >> $${pkgname}/README.txt ; \
cp GNUmakefile speedo.mk $${pkgname}/README.txt \
$${pkgname}/share/doc/gpg-w32-dev/ ; \
$(STRIP) $${pkgname}/bin/*.dll ; \
zip -r9 $${pkgname}.zip $${pkgname} >/dev/null ; \
rm -rf $$pkgname; \
echo "$$pkgname.zip ready for distribution" >&2
else
STRIP = strip
endif
W32CC = i686-w64-mingw32-gcc
-include config.mk
@ -195,21 +386,45 @@ dist: all
#
MKDIR=mkdir
MAKENSIS=makensis
BUILD_ISODATE=$(shell date -u +%Y-%m-%d)
# These paths must be absolute, as we switch directories pretty often.
root := $(shell pwd)/play
stampdir := $(root)/stamps
sdir := $(root)/src
bdir := $(root)/build
bdir6:= $(root)/build-w64
idir := $(root)/inst
idir6:= $(root)/inst-w64
stampdir := $(root)/stamps
topsrc := $(shell cd $(dir $(SPEEDO_MK)).. && pwd)
auxsrc := $(topsrc)/build-aux/speedo
patdir := $(topsrc)/build-aux/speedo/patches
w32src := $(topsrc)/build-aux/speedo/w32
# The next two macros will work only after gnupg has been build.
INST_VERSION=$(shell head -1 $(idir)/INST_VERSION)
INST_PROD_VERSION=$(shell head -1 $(idir)/INST_PROD_VERSION)
# List with packages
speedo_build_list = $(speedo_spkgs)
speedo_w64_build_list = $(speedo_w64_spkgs)
# Determine build and host system
build := $(shell $(topsrc)/autogen.sh --silent --print-build)
ifeq ($(TARGETOS),w32)
speedo_autogen_buildopt="--build-w32"
speedo_autogen_buildopt := --build-w32
speedo_autogen_buildopt6 := --build-w64
host := $(shell $(topsrc)/autogen.sh --silent --print-host --build-w32)
host6:= $(shell $(topsrc)/autogen.sh --silent --print-host --build-w64)
speedo_host_build_option := --host=$(host) --build=$(build)
speedo_host_build_option6 := --host=$(host6) --build=$(build)
speedo_w32_cflags := -mms-bitfields
else
speedo_autogen_buildopt=
speedo_autogen_buildopt :=
host :=
speedo_host_build_option :=
speedo_w32_cflags :=
endif
ifeq ($(MAKE_J),)
@ -219,14 +434,20 @@ else
endif
# The playground area is our scratch area, where we unpack, build and
# install the packages.
$(stampdir)/stamp-directories:
$(MKDIR) $(root)
$(MKDIR) $(stampdir)
$(MKDIR) $(sdir)
$(MKDIR) $(bdir)
$(MKDIR) $(idir)
$(MKDIR) $(root) || true
$(MKDIR) $(stampdir) || true
$(MKDIR) $(sdir) || true
$(MKDIR) $(bdir) || true
$(MKDIR) $(idir) || true
ifeq ($(TARGETOS),w32)
$(MKDIR) $(bdir6) || true
$(MKDIR) $(idir6) || true
endif
touch $(stampdir)/stamp-directories
# Frob the name $1 by converting all '-' and '+' characters to '_'.
@ -246,17 +467,60 @@ define SETVARS
gitref="$(call GETVAR,speedo_pkg_$(1)_gitref)"; \
tar="$(call GETVAR,speedo_pkg_$(1)_tar)"; \
pkgsdir="$(sdir)/$(1)"; \
if [ "$(1)" = "gnupg" ]; then \
git=''; \
gitref=''; \
tar=''; \
pkgsdir="$(topsrc)"; \
fi; \
pkgbdir="$(bdir)/$(1)"; \
pkgcfg="$(call GETVAR,speedo_pkg_$(1)_configure)"; \
pkgextracflags="$(call GETVAR,speedo_pkg_$(1)_extracflags)"; \
pkgmkdir="$(call GETVAR,speedo_pkg_$(1)_make_dir)"; \
pkgmkargs="$(call GETVAR,speedo_pkg_$(1)_make_args)"; \
pkgmkargs_inst="$(call GETVAR,speedo_pkg_$(1)_make_args_inst)"; \
export PKG_CONFIG="/usr/bin/pkg-config"; \
export PKG_CONFIG_PATH="$(idir)/lib/pkgconfig"; \
export PKG_CONFIG_LIBDIR=""; \
export SYSROOT="$(idir)"; \
export PATH="$(idir)/bin:$${PATH}"; \
export LD_LIBRARY_PATH="$(idir)/lib:$${LD_LIBRARY_PATH}"
endef
define SETVARS_W64
pkg="$(1)"; \
git="$(call GETVAR,speedo_pkg_$(1)_git)"; \
gitref="$(call GETVAR,speedo_pkg_$(1)_gitref)"; \
tar="$(call GETVAR,speedo_pkg_$(1)_tar)"; \
pkgsdir="$(sdir)/$(1)"; \
if [ "$(1)" = "gnupg" ]; then \
git=''; \
gitref=''; \
tar=''; \
pkgsdir="$(topsrc)"; \
fi; \
pkgbdir="$(bdir6)/$(1)"; \
pkgcfg="$(call GETVAR,speedo_pkg_w64_$(1)_configure)"; \
pkgextracflags="$(call GETVAR,speedo_pkg_$(1)_extracflags)"; \
pkgmkdir="$(call GETVAR,speedo_pkg_$(1)_make_dir)"; \
pkgmkargs="$(call GETVAR,speedo_pkg_$(1)_make_args)"; \
pkgmkargs_inst="$(call GETVAR,speedo_pkg_$(1)_make_args_inst)"; \
export PKG_CONFIG="/usr/bin/pkg-config"; \
export PKG_CONFIG_PATH="$(idir6)/lib/pkgconfig"; \
export PKG_CONFIG_LIBDIR=""; \
export SYSROOT="$(idir6)"; \
export PATH="$(idir6)/bin:$${PATH}"; \
export LD_LIBRARY_PATH="$(idir6)/lib:$${LD_LIBRARY_PATH}"
endef
# Template for source packages.
#
# Note that the gnupg package is special: The package source dir is
# the same as the topsrc dir and thus we need to detect the gnupg
# package and cd to that directory. We also test that no in-source build
# has been done. autogen.sh is not run for gnupg.
#
define SPKG_template
$(stampdir)/stamp-$(1)-00-unpack: $(stampdir)/stamp-directories
@ -265,7 +529,15 @@ $(stampdir)/stamp-$(1)-00-unpack: $(stampdir)/stamp-directories
@echo "speedo: */"
@(set -e; cd $(sdir); \
$(call SETVARS,$(1)); \
if [ -n "$$$${git}" ]; then \
if [ "$(1)" = "gnupg" ]; then \
cd $$$${pkgsdir}; \
if [ -f config.log ]; then \
echo "GnuPG has already been build in-source" >&2 ;\
echo "Please run \"make distclean\" and retry" >&2 ;\
exit 1 ; \
fi; \
echo "speedo: unpacking gnupg not needed"; \
elif [ -n "$$$${git}" ]; then \
echo "speedo: unpacking $(1) from $$$${git}:$$$${gitref}"; \
git clone -b "$$$${gitref}" "$$$${git}" "$$$${pkg}"; \
cd "$$$${pkg}"; \
@ -275,6 +547,7 @@ $(stampdir)/stamp-$(1)-00-unpack: $(stampdir)/stamp-directories
case "$$$${tar}" in \
*.gz) opt=z ;; \
*.bz2) opt=j ;; \
*.xz) opt=J ;; \
*) opt= ;; \
esac; \
case "$$$${tar}" in \
@ -285,6 +558,13 @@ $(stampdir)/stamp-$(1)-00-unpack: $(stampdir)/stamp-directories
base=`echo "$$$${tar}" | sed -e 's,^.*/,,' \
| sed -e 's,\.tar.*$$$$,,'`; \
mv $$$${base} $(1); \
patch="$(patdir)/$(1)-$$$${base#$(1)-}.patch";\
if [ -x "$$$${patch}" ]; then \
echo "speedo: applying patch $$$${patch}"; \
cd $(1); "$$$${patch}"; \
elif [ -f "$$$${patch}" ]; then \
echo "speedo: warning: $$$${patch} is not executable"; \
fi; \
else \
echo "speedo: unpacking $(1) from UNKNOWN"; \
fi)
@ -292,43 +572,152 @@ $(stampdir)/stamp-$(1)-00-unpack: $(stampdir)/stamp-directories
$(stampdir)/stamp-$(1)-01-configure: $(stampdir)/stamp-$(1)-00-unpack
@echo "speedo: configuring $(1)"
ifneq ($(findstring $(1),$(speedo_make_only_style)),)
@echo "speedo: configure run not required"
else ifneq ($(findstring $(1),$(speedo_gnupg_style)),)
@($(call SETVARS,$(1)); \
mkdir "$$$${pkgbdir}"; \
cd "$$$${pkgbdir}"; \
if [ -n "$(speedo_autogen_buildopt)" ]; then \
eval AUTOGEN_SH_SILENT=1 w32root="$(idir)" \
"$$$${pkgsdir}/autogen.sh" \
$(speedo_autogen_buildopt) \
$$$${pkgcfg}; \
else \
cd "$$$${pkgbdir}"; \
if [ -n "$(speedo_autogen_buildopt)" ]; then \
eval AUTOGEN_SH_SILENT=1 w32root="$(idir)" \
"$$$${pkgsdir}/autogen.sh" \
$(speedo_autogen_buildopt) \
$$$${pkgcfg} \
CFLAGS=\"$(speedo_w32_cflags) $$$${pkgextracflags}\";\
else \
eval "$$$${pkgsdir}/configure" \
--silent \
--enable-maintainer-mode \
--prefix="$(idir)" \
$$$${pkgcfg}; \
--silent \
--enable-maintainer-mode \
--prefix="$(idir)" \
$$$${pkgcfg} \
CFLAGS=\"$(speedo_w32_cflags) $$$${pkgextracflags}\";\
fi)
else
@($(call SETVARS,$(1)); \
mkdir "$$$${pkgbdir}"; \
cd "$$$${pkgbdir}"; \
eval "$$$${pkgsdir}/configure" \
--silent $(speedo_host_build_option) \
--prefix="$(idir)" \
$$$${pkgcfg} \
CFLAGS=\"$(speedo_w32_cflags) $$$${pkgextracflags}\";\
)
endif
@touch $(stampdir)/stamp-$(1)-01-configure
# Note that unpack has no 64 bit version becuase it is just the source.
# Fixme: We should use templates to create the standard and w64
# version of these rules.
$(stampdir)/stamp-w64-$(1)-01-configure: $(stampdir)/stamp-$(1)-00-unpack
@echo "speedo: configuring $(1) (64 bit)"
ifneq ($(findstring $(1),$(speedo_make_only_style)),)
@echo "speedo: configure run not required"
else ifneq ($(findstring $(1),$(speedo_gnupg_style)),)
@($(call SETVARS_W64,$(1)); \
mkdir "$$$${pkgbdir}"; \
cd "$$$${pkgbdir}"; \
if [ -n "$(speedo_autogen_buildopt)" ]; then \
eval AUTOGEN_SH_SILENT=1 w64root="$(idir6)" \
"$$$${pkgsdir}/autogen.sh" \
$(speedo_autogen_buildopt6) \
$$$${pkgcfg} \
CFLAGS=\"$(speedo_w32_cflags) $$$${pkgextracflags}\";\
else \
eval "$$$${pkgsdir}/configure" \
--silent \
--enable-maintainer-mode \
--prefix="$(idir6)" \
$$$${pkgcfg} \
CFLAGS=\"$(speedo_w32_cflags) $$$${pkgextracflags}\";\
fi)
else
@($(call SETVARS_W64,$(1)); \
mkdir "$$$${pkgbdir}"; \
cd "$$$${pkgbdir}"; \
eval "$$$${pkgsdir}/configure" \
--silent $(speedo_host_build_option6) \
--prefix="$(idir6)" \
$$$${pkgcfg} \
CFLAGS=\"$(speedo_w32_cflags) $$$${pkgextracflags}\";\
)
endif
@touch $(stampdir)/stamp-w64-$(1)-01-configure
$(stampdir)/stamp-$(1)-02-make: $(stampdir)/stamp-$(1)-01-configure
@echo "speedo: making $(1)"
ifneq ($(findstring $(1),$(speedo_make_only_style)),)
@($(call SETVARS,$(1)); \
cd "$$$${pkgbdir}"; \
cd "$$$${pkgsdir}"; \
test -n "$$$${pkgmkdir}" && cd "$$$${pkgmkdir}"; \
$(MAKE) --no-print-directory $(speedo_makeopt) $$$${pkgmkargs} V=0)
else
@($(call SETVARS,$(1)); \
cd "$$$${pkgbdir}"; \
test -n "$$$${pkgmkdir}" && cd "$$$${pkgmkdir}"; \
$(MAKE) --no-print-directory $(speedo_makeopt) $$$${pkgmkargs} V=1)
endif
@touch $(stampdir)/stamp-$(1)-02-make
$(stampdir)/stamp-w64-$(1)-02-make: $(stampdir)/stamp-w64-$(1)-01-configure
@echo "speedo: making $(1) (64 bit)"
ifneq ($(findstring $(1),$(speedo_make_only_style)),)
@($(call SETVARS_W64,$(1)); \
cd "$$$${pkgsdir}"; \
test -n "$$$${pkgmkdir}" && cd "$$$${pkgmkdir}"; \
$(MAKE) --no-print-directory $(speedo_makeopt) $$$${pkgmkargs} V=0)
else
@($(call SETVARS_W64,$(1)); \
cd "$$$${pkgbdir}"; \
test -n "$$$${pkgmkdir}" && cd "$$$${pkgmkdir}"; \
$(MAKE) --no-print-directory $(speedo_makeopt) $$$${pkgmkargs} V=1)
endif
@touch $(stampdir)/stamp-w64-$(1)-02-make
# Note that post_install must come last because it may be empty and
# "; ;" is a syntax error.
$(stampdir)/stamp-$(1)-03-install: $(stampdir)/stamp-$(1)-02-make
@echo "speedo: installing $(1)"
ifneq ($(findstring $(1),$(speedo_make_only_style)),)
@($(call SETVARS,$(1)); \
cd "$$$${pkgbdir}"; \
cd "$$$${pkgsdir}"; \
test -n "$$$${pkgmkdir}" && cd "$$$${pkgmkdir}"; \
$(MAKE) --no-print-directory $$$${pkgmkargs_inst} install V=1;\
$(call speedo_pkg_$(call FROB_macro,$(1))_post_install))
else
@($(call SETVARS,$(1)); \
cd "$$$${pkgbdir}"; \
test -n "$$$${pkgmkdir}" && cd "$$$${pkgmkdir}"; \
$(MAKE) --no-print-directory $$$${pkgmkargs_inst} install-strip V=0;\
$(call gpg4win_pkg_$(call FROB_macro,$(1))_post_install))
@touch $(stampdir)/stamp-$(1)-03-install
$(call speedo_pkg_$(call FROB_macro,$(1))_post_install))
endif
touch $(stampdir)/stamp-$(1)-03-install
$(stampdir)/stamp-w64-$(1)-03-install: $(stampdir)/stamp-w64-$(1)-02-make
@echo "speedo: installing $(1) (64 bit)"
ifneq ($(findstring $(1),$(speedo_make_only_style)),)
@($(call SETVARS_W64,$(1)); \
cd "$$$${pkgsdir}"; \
test -n "$$$${pkgmkdir}" && cd "$$$${pkgmkdir}"; \
$(MAKE) --no-print-directory $$$${pkgmkargs_inst} install V=1;\
$(call speedo_pkg_$(call FROB_macro,$(1))_post_install))
else
@($(call SETVARS_W64,$(1)); \
cd "$$$${pkgbdir}"; \
test -n "$$$${pkgmkdir}" && cd "$$$${pkgmkdir}"; \
$(MAKE) --no-print-directory $$$${pkgmkargs_inst} install-strip V=0;\
$(call speedo_pkg_$(call FROB_macro,$(1))_post_install))
endif
touch $(stampdir)/stamp-w64-$(1)-03-install
$(stampdir)/stamp-final-$(1): $(stampdir)/stamp-$(1)-03-install
@echo "speedo: $(1) done"
@touch $(stampdir)/stamp-final-$(1)
$(stampdir)/stamp-w64-final-$(1): $(stampdir)/stamp-w64-$(1)-03-install
@echo "speedo: $(1) (64 bit) done"
@touch $(stampdir)/stamp-w64-final-$(1)
.PHONY : clean-$(1)
clean-$(1):
@echo "speedo: uninstalling $(1)"
@ -339,6 +728,11 @@ clean-$(1):
rm -fR "$$$${pkgsdir}" "$$$${pkgbdir}" || true)
-rm -f $(stampdir)/stamp-final-$(1) $(stampdir)/stamp-$(1)-*
.PHONY : build-$(1)
build-$(1): $(stampdir)/stamp-final-$(1)
.PHONY : report-$(1)
report-$(1):
@($(call SETVARS,$(1)); \
@ -363,6 +757,9 @@ endef
$(foreach spkg, $(speedo_spkgs), $(eval $(call SPKG_template,$(spkg))))
$(stampdir)/stamp-final: $(stampdir)/stamp-directories
ifeq ($(TARGETOS),w32)
$(stampdir)/stamp-final: $(addprefix $(stampdir)/stamp-w64-final-,$(speedo_w64_build_list))
endif
$(stampdir)/stamp-final: $(addprefix $(stampdir)/stamp-final-,$(speedo_build_list))
touch $(stampdir)/stamp-final
@ -377,4 +774,55 @@ clean-stamps:
clean-speedo:
$(RM) -fR play
.PHONY : all-speedo report-speedo clean-stamps clean-speedo
#
# Windows installer
#
dist-source: all
for i in 00 01 02 03; do sleep 1;touch play/stamps/stamp-*-${i}-*;done
tar -cvJf gnupg-$(INST_VERSION)_$(BUILD_ISODATE).tar.xz \
--exclude-backups --exclude-vc \
patches play/stamps/stamp-*-00-unpack play/src
$(bdir)/NEWS.tmp: $(topsrc)/NEWS
sed -e '/^#/d' <$(topsrc)/NEWS >$(bdir)/NEWS.tmp
$(bdir)/README.txt: $(bdir)/NEWS.tmp $(w32src)/README.txt \
$(w32src)/pkg-copyright.txt
sed -e '/^;.*/d;' \
-e '/!NEWSFILE!/{r NEWS.tmp' -e 'd;}' \
-e '/!PKG-COPYRIGHT!/{r $(w32src)/pkg-copyright.txt' -e 'd;}' \
-e 's,!VERSION!,$(INST_VERSION),g' \
< $(w32src)/README.txt \
| awk '{printf "%s\r\n", $$0}' >$(bdir)/README.txt
$(bdir)/g4wihelp.dll: $(w32src)/g4wihelp.c $(w32src)/exdll.h
(set -e; cd $(bdir); \
$(W32CC) -I. -shared -O2 -o g4wihelp.dll $(w32src)/g4wihelp.c \
-lwinmm -lgdi32; \
$(STRIP) g4wihelp.dll)
w32_insthelpers: $(bdir)/g4wihelp.dll
$(bdir)/inst-options.ini: $(w32src)/inst-options.ini
cat $(w32src)/inst-options.ini >$(bdir)/inst-options.ini
installer: all w32_insthelpers $(bdir)/inst-options.ini $(bdir)/README.txt
$(MAKENSIS) -V2 \
-DINST_DIR=$(idir) \
-DINST6_DIR=$(idir6) \
-DBUILD_DIR=$(bdir) \
-DTOP_SRCDIR=$(topsrc) \
-DW32_SRCDIR=$(w32src) \
-DBUILD_ISODATE=$(BUILD_ISODATE) \
-DVERSION=$(INST_VERSION) \
-DPROD_VERSION=$(INST_PROD_VERSION) \
$(w32src)/inst.nsi
#
# Mark phony targets
#
.PHONY: all-speedo report-speedo clean-stamps clean-speedo installer \
w32_insthelpers

671
build-aux/speedo/patches/atk-1.32.0.patch Executable file
View File

@ -0,0 +1,671 @@
#! /bin/sh
patch -p1 -l -f $* < $0
exit $?
diff -urpb orig/atk-1.32.0/atk/atkaction.c atk/atk/atkaction.c
--- orig/atk-1.32.0/atk/atkaction.c 2010-09-06 08:45:45.000000000 +0200
+++ atk/atk/atkaction.c 2014-02-17 12:30:53.263192763 +0100
@@ -101,7 +101,7 @@ atk_action_get_n_actions (AtkAction *ob
* Returns a description string, or %NULL
* if @action does not implement this interface.
**/
-G_CONST_RETURN gchar*
+const gchar*
atk_action_get_description (AtkAction *obj,
gint i)
{
@@ -140,7 +140,7 @@ atk_action_get_description (AtkAction *o
* Returns a name string, or %NULL
* if @action does not implement this interface.
**/
-G_CONST_RETURN gchar*
+const gchar*
atk_action_get_name (AtkAction *obj,
gint i)
{
@@ -166,7 +166,7 @@ atk_action_get_name (AtkAction *obj,
* Returns a name string, or %NULL
* if @action does not implement this interface.
**/
-G_CONST_RETURN gchar*
+const gchar*
atk_action_get_localized_name (AtkAction *obj,
gint i)
{
@@ -203,7 +203,7 @@ atk_action_get_localized_name (AtkAction
* if there is no keybinding for this action.
*
**/
-G_CONST_RETURN gchar*
+const gchar*
atk_action_get_keybinding (AtkAction *obj,
gint i)
{
Only in atk/atk: atkaction.c~
diff -urpb orig/atk-1.32.0/atk/atkaction.h atk/atk/atkaction.h
--- orig/atk-1.32.0/atk/atkaction.h 2010-09-06 08:45:45.000000000 +0200
+++ atk/atk/atkaction.h 2014-02-17 12:30:58.907192071 +0100
@@ -55,16 +55,16 @@ struct _AtkActionIface
gboolean (*do_action) (AtkAction *action,
gint i);
gint (*get_n_actions) (AtkAction *action);
- G_CONST_RETURN gchar* (*get_description) (AtkAction *action,
+ const gchar* (*get_description) (AtkAction *action,
gint i);
- G_CONST_RETURN gchar* (*get_name) (AtkAction *action,
+ const gchar* (*get_name) (AtkAction *action,
gint i);
- G_CONST_RETURN gchar* (*get_keybinding) (AtkAction *action,
+ const gchar* (*get_keybinding) (AtkAction *action,
gint i);
gboolean (*set_description) (AtkAction *action,
gint i,
const gchar *desc);
- G_CONST_RETURN gchar* (*get_localized_name)(AtkAction *action,
+ const gchar* (*get_localized_name)(AtkAction *action,
gint i);
AtkFunction pad2;
};
@@ -85,11 +85,11 @@ GType atk_action_get_type (void);
gboolean atk_action_do_action (AtkAction *action,
gint i);
gint atk_action_get_n_actions (AtkAction *action);
-G_CONST_RETURN gchar* atk_action_get_description (AtkAction *action,
+const gchar* atk_action_get_description (AtkAction *action,
gint i);
-G_CONST_RETURN gchar* atk_action_get_name (AtkAction *action,
+const gchar* atk_action_get_name (AtkAction *action,
gint i);
-G_CONST_RETURN gchar* atk_action_get_keybinding (AtkAction *action,
+const gchar* atk_action_get_keybinding (AtkAction *action,
gint i);
gboolean atk_action_set_description (AtkAction *action,
gint i,
@@ -97,7 +97,7 @@ gboolean atk_action_set_des
/* NEW in ATK 1.1: */
-G_CONST_RETURN gchar* atk_action_get_localized_name (AtkAction *action,
+const gchar* atk_action_get_localized_name (AtkAction *action,
gint i);
/*
Only in atk/atk: atkaction.h~
diff -urpb orig/atk-1.32.0/atk/atkdocument.c atk/atk/atkdocument.c
--- orig/atk-1.32.0/atk/atkdocument.c 2010-09-06 08:45:45.000000000 +0200
+++ atk/atk/atkdocument.c 2014-02-17 12:30:58.535192391 +0100
@@ -93,7 +93,7 @@ atk_document_base_init (AtkDocumentIface
*
* Returns: a string indicating the document type
**/
-G_CONST_RETURN gchar*
+const gchar*
atk_document_get_document_type (AtkDocument *document)
{
AtkDocumentIface *iface;
@@ -155,7 +155,7 @@ atk_document_get_document (AtkDocument *
* locale of the document content as a whole, or NULL if
* the document content does not specify a locale.
**/
-G_CONST_RETURN gchar *
+const gchar *
atk_document_get_locale (AtkDocument *document)
{
AtkDocumentIface *iface;
@@ -219,7 +219,7 @@ atk_document_get_attributes (AtkDocument
* document, or NULL if a value for #attribute_name has not been specified
* for this document.
*/
-G_CONST_RETURN gchar *
+const gchar *
atk_document_get_attribute_value (AtkDocument *document,
const gchar *attribute_name)
{
Only in atk/atk: atkdocument.c~
diff -urpb orig/atk-1.32.0/atk/atkdocument.h atk/atk/atkdocument.h
--- orig/atk-1.32.0/atk/atkdocument.h 2010-09-06 08:45:45.000000000 +0200
+++ atk/atk/atkdocument.h 2014-02-17 12:31:31.691190631 +0100
@@ -49,12 +49,12 @@ typedef struct _AtkDocumentIface AtkDocu
struct _AtkDocumentIface
{
GTypeInterface parent;
- G_CONST_RETURN gchar* ( *get_document_type) (AtkDocument *document);
+ const gchar* ( *get_document_type) (AtkDocument *document);
gpointer ( *get_document) (AtkDocument *document);
- G_CONST_RETURN gchar* ( *get_document_locale) (AtkDocument *document);
+ const gchar* ( *get_document_locale) (AtkDocument *document);
AtkAttributeSet * ( *get_document_attributes) (AtkDocument *document);
- G_CONST_RETURN gchar* ( *get_document_attribute_value) (AtkDocument *document,
+ const gchar* ( *get_document_attribute_value) (AtkDocument *document,
const gchar *attribute_name);
gboolean ( *set_document_attribute) (AtkDocument *document,
const gchar *attribute_name,
@@ -68,11 +68,11 @@ struct _AtkDocumentIface
GType atk_document_get_type (void);
-G_CONST_RETURN gchar* atk_document_get_document_type (AtkDocument *document);
+const gchar* atk_document_get_document_type (AtkDocument *document);
gpointer atk_document_get_document (AtkDocument *document);
-G_CONST_RETURN gchar* atk_document_get_locale (AtkDocument *document);
+const gchar* atk_document_get_locale (AtkDocument *document);
AtkAttributeSet* atk_document_get_attributes (AtkDocument *document);
-G_CONST_RETURN gchar* atk_document_get_attribute_value (AtkDocument *document,
+const gchar* atk_document_get_attribute_value (AtkDocument *document,
const gchar *attribute_name);
gboolean atk_document_set_attribute_value (AtkDocument *document,
const gchar *attribute_name,
Only in atk/atk: atkdocument.h~
diff -urpb orig/atk-1.32.0/atk/atkimage.c atk/atk/atkimage.c
--- orig/atk-1.32.0/atk/atkimage.c 2010-09-06 08:45:45.000000000 +0200
+++ atk/atk/atkimage.c 2014-02-17 12:30:58.119192299 +0100
@@ -46,7 +46,7 @@ atk_image_get_type (void)
*
* Returns: a string representing the image description
**/
-G_CONST_RETURN gchar*
+const gchar*
atk_image_get_image_description (AtkImage *image)
{
AtkImageIface *iface;
@@ -192,7 +192,7 @@ atk_image_get_image_position (AtkImage *
* Returns a string corresponding to the POSIX LC_MESSAGES locale used by the image description, or NULL if the image does not specify a locale.
*
*/
-G_CONST_RETURN gchar*
+const gchar*
atk_image_get_image_locale (AtkImage *image)
{
Only in atk/atk: atkimage.c~
diff -urpb orig/atk-1.32.0/atk/atkimage.h atk/atk/atkimage.h
--- orig/atk-1.32.0/atk/atkimage.h 2010-09-06 08:45:45.000000000 +0200
+++ atk/atk/atkimage.h 2014-02-17 12:28:31.599200223 +0100
@@ -53,13 +53,13 @@ struct _AtkImageIface
gint *x,
gint *y,
AtkCoordType coord_type);
- G_CONST_RETURN gchar* ( *get_image_description) (AtkImage *image);
+ const gchar* ( *get_image_description) (AtkImage *image);
void ( *get_image_size) (AtkImage *image,
gint *width,
gint *height);
gboolean ( *set_image_description) (AtkImage *image,
const gchar *description);
- G_CONST_RETURN gchar* ( *get_image_locale) (AtkImage *image);
+ const gchar* ( *get_image_locale) (AtkImage *image);
AtkFunction pad1;
@@ -67,7 +67,7 @@ struct _AtkImageIface
GType atk_image_get_type (void);
-G_CONST_RETURN gchar* atk_image_get_image_description (AtkImage *image);
+const gchar* atk_image_get_image_description (AtkImage *image);
void atk_image_get_image_size (AtkImage *image,
gint *width,
@@ -80,7 +80,7 @@ void atk_image_get_image_position
gint *y,
AtkCoordType coord_type);
-G_CONST_RETURN gchar* atk_image_get_image_locale (AtkImage *image);
+const gchar* atk_image_get_image_locale (AtkImage *image);
G_END_DECLS
Only in atk/atk: atkimage.h~
diff -urpb orig/atk-1.32.0/atk/atkobject.c atk/atk/atkobject.c
--- orig/atk-1.32.0/atk/atkobject.c 2010-09-06 08:45:45.000000000 +0200
+++ atk/atk/atkobject.c 2014-02-17 12:28:39.467199803 +0100
@@ -285,9 +285,9 @@ static void atk_object_real_g
GValue *value,
GParamSpec *pspec);
static void atk_object_finalize (GObject *object);
-static G_CONST_RETURN gchar*
+static const gchar*
atk_object_real_get_name (AtkObject *object);
-static G_CONST_RETURN gchar*
+static const gchar*
atk_object_real_get_description
(AtkObject *object);
static AtkObject* atk_object_real_get_parent (AtkObject *object);
@@ -692,7 +692,7 @@ atk_implementor_get_type (void)
*
* Returns: a character string representing the accessible name of the object.
**/
-G_CONST_RETURN gchar*
+const gchar*
atk_object_get_name (AtkObject *accessible)
{
AtkObjectClass *klass;
@@ -716,7 +716,7 @@ atk_object_get_name (AtkObject *accessib
* of the accessible.
*
**/
-G_CONST_RETURN gchar*
+const gchar*
atk_object_get_description (AtkObject *accessible)
{
AtkObjectClass *klass;
@@ -1123,7 +1123,7 @@ atk_object_notify_state_change (AtkObjec
AtkState state,
gboolean value)
{
- G_CONST_RETURN gchar* name;
+ const gchar* name;
g_return_if_fail (ATK_IS_OBJECT (accessible));
@@ -1319,13 +1319,13 @@ atk_object_finalize (GObject *object)
G_OBJECT_CLASS (parent_class)->finalize (object);
}
-static G_CONST_RETURN gchar*
+static const gchar*
atk_object_real_get_name (AtkObject *object)
{
return object->name;
}
-static G_CONST_RETURN gchar*
+static const gchar*
atk_object_real_get_description (AtkObject *object)
{
return object->description;
@@ -1487,7 +1487,7 @@ atk_object_notify (GObject *obj,
*
* Returns: the string describing the AtkRole
*/
-G_CONST_RETURN gchar*
+const gchar*
atk_role_get_name (AtkRole role)
{
if (role >= 0 && role < ATK_ROLE_LAST_DEFINED)
@@ -1514,7 +1514,7 @@ atk_role_get_name (AtkRole role)
*
* Returns: the localized string describing the AtkRole
**/
-G_CONST_RETURN gchar*
+const gchar*
atk_role_get_localized_name (AtkRole role)
{
gettext_initialization ();
Only in atk/atk: atkobject.c~
diff -urpb orig/atk-1.32.0/atk/atkobject.h atk/atk/atkobject.h
--- orig/atk-1.32.0/atk/atkobject.h 2010-09-06 08:45:45.000000000 +0200
+++ atk/atk/atkobject.h 2014-02-17 12:28:48.851199302 +0100
@@ -381,11 +381,11 @@ struct _AtkObjectClass
/*
* Gets the accessible name of the object
*/
- G_CONST_RETURN gchar* (* get_name) (AtkObject *accessible);
+ const gchar* (* get_name) (AtkObject *accessible);
/*
* Gets the accessible description of the object
*/
- G_CONST_RETURN gchar* (* get_description) (AtkObject *accessible);
+ const gchar* (* get_description) (AtkObject *accessible);
/*
* Gets the accessible parent of the object
*/
@@ -535,8 +535,8 @@ AtkObject* atk_implementor_
* Properties directly supported by AtkObject
*/
-G_CONST_RETURN gchar* atk_object_get_name (AtkObject *accessible);
-G_CONST_RETURN gchar* atk_object_get_description (AtkObject *accessible);
+const gchar* atk_object_get_name (AtkObject *accessible);
+const gchar* atk_object_get_description (AtkObject *accessible);
AtkObject* atk_object_get_parent (AtkObject *accessible);
gint atk_object_get_n_accessible_children (AtkObject *accessible);
AtkObject* atk_object_ref_accessible_child (AtkObject *accessible,
@@ -571,7 +571,7 @@ void atk_object_notify_s
void atk_object_initialize (AtkObject *accessible,
gpointer data);
-G_CONST_RETURN gchar* atk_role_get_name (AtkRole role);
+const gchar* atk_role_get_name (AtkRole role);
AtkRole atk_role_for_name (const gchar *name);
@@ -582,7 +582,7 @@ gboolean atk_object_add_rel
gboolean atk_object_remove_relationship (AtkObject *object,
AtkRelationType relationship,
AtkObject *target);
-G_CONST_RETURN gchar* atk_role_get_localized_name (AtkRole role);
+const gchar* atk_role_get_localized_name (AtkRole role);
/* */
Only in atk/atk: atkobject.h~
diff -urpb orig/atk-1.32.0/atk/atkrelation.c atk/atk/atkrelation.c
--- orig/atk-1.32.0/atk/atkrelation.c 2010-09-06 08:45:45.000000000 +0200
+++ atk/atk/atkrelation.c 2014-02-17 12:29:04.307198532 +0100
@@ -130,7 +130,7 @@ atk_relation_type_register (const gchar
*
* Returns: the string describing the AtkRelationType
*/
-G_CONST_RETURN gchar*
+const gchar*
atk_relation_type_get_name (AtkRelationType type)
{
GTypeClass *type_class;
Only in atk/atk: atkrelation.c~
diff -urpb orig/atk-1.32.0/atk/atkrelation.h atk/atk/atkrelation.h
--- orig/atk-1.32.0/atk/atkrelation.h 2010-09-06 08:45:45.000000000 +0200
+++ atk/atk/atkrelation.h 2014-02-17 12:29:12.167198142 +0100
@@ -61,7 +61,7 @@ struct _AtkRelationClass
GType atk_relation_get_type (void);
AtkRelationType atk_relation_type_register (const gchar *name);
-G_CONST_RETURN gchar* atk_relation_type_get_name (AtkRelationType type);
+const gchar* atk_relation_type_get_name (AtkRelationType type);
AtkRelationType atk_relation_type_for_name (const gchar *name);
/*
Only in atk/atk: atkrelation.h~
diff -urpb orig/atk-1.32.0/atk/atkstate.c atk/atk/atkstate.c
--- orig/atk-1.32.0/atk/atkstate.c 2010-09-06 08:45:45.000000000 +0200
+++ atk/atk/atkstate.c 2014-02-17 12:29:19.023197754 +0100
@@ -57,7 +57,7 @@ atk_state_type_register (const gchar *na
*
* Returns: the string describing the AtkStateType
*/
-G_CONST_RETURN gchar*
+const gchar*
atk_state_type_get_name (AtkStateType type)
{
GTypeClass *type_class;
Only in atk/atk: atkstate.c~
diff -urpb orig/atk-1.32.0/atk/atkstate.h atk/atk/atkstate.h
--- orig/atk-1.32.0/atk/atkstate.h 2010-09-06 08:45:45.000000000 +0200
+++ atk/atk/atkstate.h 2014-02-17 12:26:44.459205944 +0100
@@ -170,7 +170,7 @@ typedef guint64 AtkState;
AtkStateType atk_state_type_register (const gchar *name);
-G_CONST_RETURN gchar* atk_state_type_get_name (AtkStateType type);
+const gchar* atk_state_type_get_name (AtkStateType type);
AtkStateType atk_state_type_for_name (const gchar *name);
G_END_DECLS
Only in atk/atk: atkstate.h~
diff -urpb orig/atk-1.32.0/atk/atkstreamablecontent.c atk/atk/atkstreamablecontent.c
--- orig/atk-1.32.0/atk/atkstreamablecontent.c 2010-09-06 08:45:45.000000000 +0200
+++ atk/atk/atkstreamablecontent.c 2014-02-17 12:30:57.659192412 +0100
@@ -73,7 +73,7 @@ atk_streamable_content_get_n_mime_types
* Returns : a gchar* representing the specified mime type; the caller
* should not free the character string.
**/
-G_CONST_RETURN gchar*
+const gchar*
atk_streamable_content_get_mime_type (AtkStreamableContent *streamable,
gint i)
{
Only in atk/atk: atkstreamablecontent.c~
diff -urpb orig/atk-1.32.0/atk/atkstreamablecontent.h atk/atk/atkstreamablecontent.h
--- orig/atk-1.32.0/atk/atkstreamablecontent.h 2010-09-06 08:45:45.000000000 +0200
+++ atk/atk/atkstreamablecontent.h 2014-02-17 12:29:49.487196042 +0100
@@ -54,11 +54,11 @@ struct _AtkStreamableContentIface
* at index 0 should be considered the "default" data type for the stream.
*
* This assumes that the strings for the mime types are stored in the
- * AtkStreamableContent. Alternatively the G_CONST_RETURN could be removed
+ * AtkStreamableContent. Alternatively the const could be removed
* and the caller would be responsible for calling g_free() on the
* returned value.
*/
- G_CONST_RETURN gchar* (* get_mime_type) (AtkStreamableContent *streamable,
+ const gchar* (* get_mime_type) (AtkStreamableContent *streamable,
gint i);
/*
* One possible implementation for this method is that it constructs the
@@ -80,7 +80,7 @@ struct _AtkStreamableContentIface
* constructed. Note that it is possible for get_uri to return NULL but for
* get_stream to work nonetheless, since not all GIOChannels connect to URIs.
*/
- G_CONST_RETURN gchar* (* get_uri) (AtkStreamableContent *streamable,
+ const gchar* (* get_uri) (AtkStreamableContent *streamable,
const gchar *mime_type);
@@ -92,7 +92,7 @@ GType atk_streamable_co
gint atk_streamable_content_get_n_mime_types (AtkStreamableContent *streamable);
-G_CONST_RETURN gchar* atk_streamable_content_get_mime_type (AtkStreamableContent *streamable,
+const gchar* atk_streamable_content_get_mime_type (AtkStreamableContent *streamable,
gint i);
GIOChannel* atk_streamable_content_get_stream (AtkStreamableContent *streamable,
const gchar *mime_type);
Only in atk/atk: atkstreamablecontent.h~
diff -urpb orig/atk-1.32.0/atk/atktable.c atk/atk/atktable.c
--- orig/atk-1.32.0/atk/atktable.c 2010-09-06 08:45:45.000000000 +0200
+++ atk/atk/atktable.c 2014-02-17 12:30:57.319192444 +0100
@@ -300,7 +300,7 @@ atk_table_get_n_columns (AtkTable *table
* Returns: a gchar* representing the column description, or %NULL
* if value does not implement this interface.
**/
-G_CONST_RETURN gchar*
+const gchar*
atk_table_get_column_description (AtkTable *table,
gint column)
{
@@ -404,7 +404,7 @@ atk_table_get_n_rows (AtkTable *table)
* Returns: a gchar* representing the row description, or %NULL
* if value does not implement this interface.
**/
-G_CONST_RETURN gchar*
+const gchar*
atk_table_get_row_description (AtkTable *table,
gint row)
{
Only in atk/atk: atktable.c~
diff -urpb orig/atk-1.32.0/atk/atktable.h atk/atk/atktable.h
--- orig/atk-1.32.0/atk/atktable.h 2010-09-06 08:45:45.000000000 +0200
+++ atk/atk/atktable.h 2014-02-17 12:30:08.035195073 +0100
@@ -69,12 +69,12 @@ struct _AtkTableIface
gint column);
AtkObject*
(* get_caption) (AtkTable *table);
- G_CONST_RETURN gchar*
+ const gchar*
(* get_column_description) (AtkTable *table,
gint column);
AtkObject* (* get_column_header) (AtkTable *table,
gint column);
- G_CONST_RETURN gchar*
+ const gchar*
(* get_row_description) (AtkTable *table,
gint row);
AtkObject* (* get_row_header) (AtkTable *table,
@@ -163,12 +163,12 @@ gint atk_table_get_row_exte
gint column);
AtkObject*
atk_table_get_caption (AtkTable *table);
-G_CONST_RETURN gchar*
+const gchar*
atk_table_get_column_description (AtkTable *table,
gint column);
AtkObject* atk_table_get_column_header (AtkTable *table,
gint column);
-G_CONST_RETURN gchar*
+const gchar*
atk_table_get_row_description (AtkTable *table,
gint row);
AtkObject* atk_table_get_row_header (AtkTable *table,
Only in atk/atk: atktable.h~
diff -urpb orig/atk-1.32.0/atk/atktext.c atk/atk/atktext.c
--- orig/atk-1.32.0/atk/atktext.c 2010-09-27 09:07:09.000000000 +0200
+++ atk/atk/atktext.c 2014-02-17 12:30:56.871192495 +0100
@@ -1054,7 +1054,7 @@ atk_text_attribute_register (const gchar
*
* Returns: a string containing the name; this string should not be freed
**/
-G_CONST_RETURN gchar*
+const gchar*
atk_text_attribute_get_name (AtkTextAttribute attr)
{
GTypeClass *type_class;
@@ -1150,7 +1150,7 @@ atk_text_attribute_for_name (const gchar
* Returns: a string containing the value; this string should not be freed;
* NULL is returned if there are no values maintained for the attr value.
**/
-G_CONST_RETURN gchar*
+const gchar*
atk_text_attribute_get_value (AtkTextAttribute attr,
gint index)
{
Only in atk/atk: atktext.c~
diff -urpb orig/atk-1.32.0/atk/atktext.h atk/atk/atktext.h
--- orig/atk-1.32.0/atk/atktext.h 2010-09-27 09:07:09.000000000 +0200
+++ atk/atk/atktext.h 2014-02-17 12:30:56.475192626 +0100
@@ -355,9 +355,9 @@ AtkTextRange** atk_text_get_bounded_ran
AtkTextClipType y_clip_type);
void atk_text_free_ranges (AtkTextRange **ranges);
void atk_attribute_set_free (AtkAttributeSet *attrib_set);
-G_CONST_RETURN gchar* atk_text_attribute_get_name (AtkTextAttribute attr);
+const gchar* atk_text_attribute_get_name (AtkTextAttribute attr);
AtkTextAttribute atk_text_attribute_for_name (const gchar *name);
-G_CONST_RETURN gchar* atk_text_attribute_get_value (AtkTextAttribute attr,
+const gchar* atk_text_attribute_get_value (AtkTextAttribute attr,
gint index_);
G_END_DECLS
Only in atk/atk: atktext.h~
diff -urpb orig/atk-1.32.0/atk/atkutil.c atk/atk/atkutil.c
--- orig/atk-1.32.0/atk/atkutil.c 2010-09-06 08:45:45.000000000 +0200
+++ atk/atk/atkutil.c 2014-02-17 12:30:33.651193705 +0100
@@ -340,7 +340,7 @@ atk_get_focus_object (void)
*
* Returns: name string for the GUI toolkit implementing ATK for this application
**/
-G_CONST_RETURN gchar*
+const gchar*
atk_get_toolkit_name (void)
{
const gchar *retval;
@@ -365,7 +365,7 @@ atk_get_toolkit_name (void)
*
* Returns: version string for the GUI toolkit implementing ATK for this application
**/
-G_CONST_RETURN gchar*
+const gchar*
atk_get_toolkit_version (void)
{
const gchar *retval;
@@ -391,7 +391,7 @@ atk_get_toolkit_version (void)
* Returns: version string for ATK
**/
-G_CONST_RETURN gchar *
+const gchar *
atk_get_version (void)
{
return VERSION;
Only in atk/atk: atkutil.c~
diff -urpb orig/atk-1.32.0/atk/atkutil.h atk/atk/atkutil.h
--- orig/atk-1.32.0/atk/atkutil.h 2010-09-06 08:45:45.000000000 +0200
+++ atk/atk/atkutil.h 2014-02-17 12:30:40.635193333 +0100
@@ -147,8 +147,8 @@ struct _AtkUtilClass
gpointer data);
void (* remove_key_event_listener) (guint listener_id);
AtkObject* (* get_root) (void);
- G_CONST_RETURN gchar* (* get_toolkit_name) (void);
- G_CONST_RETURN gchar* (* get_toolkit_version) (void);
+ const gchar* (* get_toolkit_name) (void);
+ const gchar* (* get_toolkit_version) (void);
};
GType atk_util_get_type (void);
@@ -229,17 +229,17 @@ AtkObject* atk_get_focus_object (void);
/*
* Returns name string for the GUI toolkit.
*/
-G_CONST_RETURN gchar *atk_get_toolkit_name (void);
+const gchar *atk_get_toolkit_name (void);
/*
* Returns version string for the GUI toolkit.
*/
-G_CONST_RETURN gchar *atk_get_toolkit_version (void);
+const gchar *atk_get_toolkit_version (void);
/*
* Gets the current version of ATK
*/
-G_CONST_RETURN gchar *atk_get_version (void);
+const gchar *atk_get_version (void);
/* --- GType boilerplate --- */
/* convenience macros for atk type implementations, which for a type GtkGadgetAccessible will:
Only in atk/atk: atkutil.h~
diff -urpb orig/atk-1.32.0/tests/testrelation.c atk/tests/testrelation.c
--- orig/atk-1.32.0/tests/testrelation.c 2010-09-06 08:45:45.000000000 +0200
+++ atk/tests/testrelation.c 2014-02-17 12:53:42.095119569 +0100
@@ -28,7 +28,7 @@ static gboolean
test_relation (void)
{
AtkRelationType type1, type2;
- G_CONST_RETURN gchar *name;
+ const gchar *name;
AtkObject *obj;
gboolean ret_value;
AtkRelationSet *set;
@@ -169,7 +169,7 @@ static gboolean
test_role (void)
{
AtkRole role1, role2;
- G_CONST_RETURN gchar *name;
+ const gchar *name;
name = atk_role_get_name (ATK_ROLE_PAGE_TAB);
g_return_val_if_fail (name, FALSE);
@@ -230,7 +230,7 @@ static gboolean
test_text_attr (void)
{
AtkTextAttribute attr1, attr2;
- G_CONST_RETURN gchar *name;
+ const gchar *name;
name = atk_text_attribute_get_name (ATK_TEXT_ATTR_PIXELS_INSIDE_WRAP);
g_return_val_if_fail (name, FALSE);
Only in atk/tests/: testrelation.c~
diff -urpb orig/atk-1.32.0/tests/teststateset.c atk/tests/teststateset.c
--- orig/atk-1.32.0/tests/teststateset.c 2010-09-06 08:45:45.000000000 +0200
+++ atk/tests/teststateset.c 2014-02-17 12:53:55.675118832 +0100
@@ -208,7 +208,7 @@ static gboolean
test_state (void)
{
AtkStateType type1, type2;
- G_CONST_RETURN gchar *name;
+ const gchar *name;
name = atk_state_type_get_name (ATK_STATE_VISIBLE);
g_return_val_if_fail (name, FALSE);
--- orig/atk-1.32.0/atk/Makefile.in 2010-09-27 09:53:57.000000000 +0200
+++ atk/atk/Makefile.in 2014-02-17 12:52:40.443122866 +0100
@@ -40,7 +40,7 @@ host_triplet = @host@
@HAVE_INTROSPECTION_TRUE@am__append_2 = $(gir_DATA) $(typelibs_DATA)
# ---------- Win32 stuff ----------
-@OS_WIN32_TRUE@am__append_3 = -export-symbols $(srcdir)/atk.def -no-undefined -Wl,atk-win32-res.o
+@OS_WIN32_TRUE@am__append_3 = -export-symbols atk.def -no-undefined -Wl,atk-win32-res.o
@OS_WIN32_FALSE@libatk_1_0_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
@OS_WIN32_FALSE@ $(am__DEPENDENCIES_1)
subdir = atk
@@ -861,7 +861,7 @@ s-enum-types-c: @REBUILD@ $(atk_headers)
@HAVE_INTROSPECTION_TRUE@Atk-1.0.gir: libatk-1.0.la Makefile
@OS_WIN32_TRUE@install-def-file:
-@OS_WIN32_TRUE@ $(INSTALL) $(srcdir)/atk.def $(DESTDIR)$(libdir)/atk-1.0.def
+@OS_WIN32_TRUE@ $(INSTALL) atk.def $(DESTDIR)$(libdir)/atk-1.0.def
@OS_WIN32_TRUE@uninstall-def-file:
@OS_WIN32_TRUE@ -rm $(DESTDIR)$(libdir)/atk-1.0.def
@OS_WIN32_FALSE@install-def-file:

27
build-aux/speedo/patches/pango-1.29.4.patch Executable file
View File

@ -0,0 +1,27 @@
#! /bin/sh
patch -p0 -l -f $* < $0
exit $?
Without that patch the module is build with wrong symbols and thus
can't be loaded by pango. I don't know why they have this defines
just in this module. It entirely defeats the feature of loading
modules dynamically - maybe this was just a quick hack for including
the code directly - however, I was not able to make that work either.
--- modules/basic/basic-win32.c~ 2011-09-28 16:34:33.000000000 +0200
+++ modules/basic/basic-win32.c 2014-02-20 20:01:10.107723565 +0100
@@ -33,9 +33,10 @@
extern HFONT _pango_win32_font_get_hfont (PangoFont *font);
-#ifndef PANGO_MODULE_PREFIX
-#define PANGO_MODULE_PREFIX _pango_basic_win32
-#endif
+/* #ifndef PANGO_MODULE_PREFIX */
+/* #define PANGO_MODULE_PREFIX _pango_basic_win32 */
+/* #endif */
+#undef PANGO_MODULE_PREFIX
#include "pango-engine.h"
#include "pango-utils.h"

54
build-aux/speedo/w32/README.txt Normal file
View File

@ -0,0 +1,54 @@
;; README.txt -*- coding: latin-1; -*-
;; This is the README installed with megacryption. Lines with a
;; semicolon in the first column are considered a comment and not
;; included in the actually installed version. Certain keywords are
;; replaced by the Makefile; those words are enclosed by exclamation
;; marks.
GNUPG for Windows
===================
This is GnuPG for Windows, version !VERSION!.
Content:
1. Important notes
2. Changes
3. Legal notices
1. Important Notes
==================
HTML versions of the manuals have been installed on the desktop.
Check out https://gnupg.org for latest news.
2. Record of Changes (NEWS file)
================================
Below you find the raw NEWS file:
!NEWSFILE!
3. Legal notices pertaining to the individual packets
=====================================================
GnuPG for Windows consist of several independent developed packages,
available under different license conditions. Most of these packages
are however available under the GNU General Public License (GNU GPL).
Common to all is that they are free to use without restrictions, may
be modified and that modifications may be distributed. If the source
file (i.e. gnupg-src-k.m.n.zip) is distributed along with the binaries
and the use of the GNU GPL has been pointed out, distribution is in
all cases possible.
What follows is a list of copyright statements.
!PKG-COPYRIGHT!
***end of file ***

151
build-aux/speedo/w32/exdll.h Normal file
View File

@ -0,0 +1,151 @@
/* exdll.h for use with gpg4win
* Copyright (C) 1999-2005 Nullsoft, Inc.
*
* This license applies to everything in the NSIS package, except
* where otherwise noted.
*
* This software is provided 'as-is', without any express or implied
* warranty. In no event will the authors be held liable for any
* damages arising from the use of this software.
*
* Permission is granted to anyone to use this software for any
* purpose, including commercial applications, and to alter it and
* redistribute it freely, subject to the following restrictions:
*
* 1. The origin of this software must not be misrepresented; you must
* not claim that you wrote the original software. If you use this
* software in a product, an acknowledgment in the product
* documentation would be appreciated but is not required.
*
* 2. Altered source versions must be plainly marked as such, and must
* not be misrepresented as being the original software.
*
* 3. This notice may not be removed or altered from any source
* distribution.
************************************************************
* 2005-11-14 wk Applied license text to orginal exdll.h file from
* NSIS 2.0.4 and did some formatting changes.
*/
#ifndef _EXDLL_H_
#define _EXDLL_H_
/* only include this file from one place in your DLL. (it is all
static, if you use it in two places it will fail) */
#define EXDLL_INIT() { \
g_stringsize=string_size; \
g_stacktop=stacktop; \
g_variables=variables; }
/* For page showing plug-ins */
#define WM_NOTIFY_OUTER_NEXT (WM_USER+0x8)
#define WM_NOTIFY_CUSTOM_READY (WM_USER+0xd)
#define NOTIFY_BYE_BYE 'x'
typedef struct _stack_t {
struct _stack_t *next;
char text[1]; /* This should be the length of string_size. */
} stack_t;
static unsigned int g_stringsize;
static stack_t **g_stacktop;
static char *g_variables;
static int __stdcall popstring(char *str, size_t maxlen); /* 0 on success, 1 on empty stack */
static void __stdcall pushstring(const char *str);
enum
{
INST_0, // $0
INST_1, // $1
INST_2, // $2
INST_3, // $3
INST_4, // $4
INST_5, // $5
INST_6, // $6
INST_7, // $7
INST_8, // $8
INST_9, // $9
INST_R0, // $R0
INST_R1, // $R1
INST_R2, // $R2
INST_R3, // $R3
INST_R4, // $R4
INST_R5, // $R5
INST_R6, // $R6
INST_R7, // $R7
INST_R8, // $R8
INST_R9, // $R9
INST_CMDLINE, // $CMDLINE
INST_INSTDIR, // $INSTDIR
INST_OUTDIR, // $OUTDIR
INST_EXEDIR, // $EXEDIR
INST_LANG, // $LANGUAGE
__INST_LAST
};
typedef struct {
int autoclose;
int all_user_var;
int exec_error;
int abort;
int exec_reboot;
int reboot_called;
int XXX_cur_insttype; /* deprecated */
int XXX_insttype_changed; /* deprecated */
int silent;
int instdir_error;
int rtl;
int errlvl;
} exec_flags_t;
typedef struct {
exec_flags_t *exec_flags;
int (__stdcall *ExecuteCodeSegment)(int, HWND);
} extra_parameters_t;
/* Utility functions (not required but often useful). */
static int __stdcall
popstring(char *str, size_t maxlen)
{
stack_t *th;
if (!g_stacktop || !*g_stacktop)
return 1;
th=(*g_stacktop);
lstrcpyn (str, th->text, maxlen);
*g_stacktop = th->next;
GlobalFree((HGLOBAL)th);
return 0;
}
static void __stdcall
pushstring(const char *str)
{
stack_t *th;
if (!g_stacktop) return;
th=(stack_t*)GlobalAlloc(GPTR,sizeof(stack_t)+g_stringsize);
lstrcpyn(th->text,str,g_stringsize);
th->next=*g_stacktop;
*g_stacktop=th;
}
static char * __stdcall
getuservariable(const int varnum)
{
if (varnum < 0 || varnum >= __INST_LAST) return NULL;
return g_variables+varnum*g_stringsize;
}
static void __stdcall
setuservariable(const int varnum, const char *var)
{
if (var != NULL && varnum >= 0 && varnum < __INST_LAST)
lstrcpy(g_variables + varnum*g_stringsize, var);
}
#endif/*_EXDLL_H_*/

1136
build-aux/speedo/w32/g4wihelp.c Normal file
View File

File diff suppressed because it is too large Load Diff

135
build-aux/speedo/w32/gdk-pixbuf-loaders.cache Executable file
View File

@ -0,0 +1,135 @@
# GdkPixbuf Image Loader Modules file
# Automatically generated file, do not edit
# Created by gdk-pixbuf-query-loaders.exe from gdk-pixbuf-2.26.5
#
# LoaderDir = ../lib/gdk-pixbuf-2.0/2.10.0/loaders
#
"../lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ani.dll"
"ani" 4 "gdk-pixbuf" "The ANI image format" "LGPL"
"application/x-navi-animation" ""
"ani" ""
"RIFF ACON" " xxxx " 100
"../lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-gdip-bmp.dll"
"bmp" 5 "gdk-pixbuf" "The BMP image format" "LGPL"
"image/bmp" "image/x-bmp" "image/x-MS-bmp" ""
"bmp" ""
"BM" "" 100
"../lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-gdip-emf.dll"
"emf" 4 "gdk-pixbuf" "The EMF image format" "LGPL"
"application/emf" "application/x-emf" "image/x-emf" "image/x-mgx-emf" ""
"emf" ""
"\001" "" 100
"../lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-gdip-gif.dll"
"gif" 5 "gdk-pixbuf" "The GIF image format" "LGPL"
"image/gif" ""
"gif" ""
"GIF8" "" 100
"../lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-gdip-ico.dll"
"ico" 4 "gdk-pixbuf" "The ICO image format" "LGPL"
"image/x-icon" "image/x-ico" ""
"ico" "cur" ""
" \001 " "zz znz" 100
" \002 " "zz znz" 100
"../lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-gdip-jpeg.dll"
"jpeg" 5 "gdk-pixbuf" "The JPEG image format" "LGPL"
"image/jpeg" ""
"jpeg" "jpe" "jpg" ""
"\377\330" "" 100
"../lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-gdip-tiff.dll"
"tiff" 5 "gdk-pixbuf" "The TIFF image format" "LGPL"
"image/tiff" ""
"tiff" "tif" ""
"MM *" " z " 100
"II* " " z" 100
"../lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-gdip-wmf.dll"
"wmf" 4 "gdk-pixbuf" "The WMF image format" "LGPL"
"image/x-wmf" ""
"wmf" "apm" ""
"\327\315\306\232" "" 100
"\001" "" 100
"../lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-icns.dll"
"icns" 4 "gdk-pixbuf" "The ICNS image format" "GPL"
"image/x-icns" ""
"icns" ""
"icns" "" 100
"../lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-pcx.dll"
"pcx" 4 "gdk-pixbuf" "The PCX image format" "LGPL"
"image/x-pcx" ""
"pcx" ""
"\n \001" "" 100
"\n\002\001" "" 100
"\n\003\001" "" 100
"\n\004\001" "" 100
"\n\005\001" "" 100
"../lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-png.dll"
"png" 5 "gdk-pixbuf" "The PNG image format" "LGPL"
"image/png" ""
"png" ""
"\211PNG\r\n\032\n" "" 100
"../lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-pnm.dll"
"pnm" 4 "gdk-pixbuf" "The PNM/PBM/PGM/PPM image format family" "LGPL"
"image/x-portable-anymap" "image/x-portable-bitmap" "image/x-portable-graymap" "image/x-portable-pixmap" ""
"pnm" "pbm" "pgm" "ppm" ""
"P1" "" 100
"P2" "" 100
"P3" "" 100
"P4" "" 100
"P5" "" 100
"P6" "" 100
"../lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-qtif.dll"
"qtif" 4 "gdk-pixbuf" "The QTIF image format" "LGPL"
"image/x-quicktime" "image/qtif" ""
"qtif" "qif" ""
"abcdidsc" "xxxx " 100
"abcdidat" "xxxx " 100
"../lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ras.dll"
"ras" 4 "gdk-pixbuf" "The Sun raster image format" "LGPL"
"image/x-cmu-raster" "image/x-sun-raster" ""
"ras" ""
"Y\246j\225" "" 100
"../lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-tga.dll"
"tga" 4 "gdk-pixbuf" "The Targa image format" "LGPL"
"image/x-tga" ""
"tga" "targa" ""
" \001\001" "x " 100
" \001\t" "x " 100
" \002" "xz " 99
" \003" "xz " 100
" \n" "xz " 100
" \v" "xz " 100
"../lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-wbmp.dll"
"wbmp" 4 "gdk-pixbuf" "The WBMP image format" "LGPL"
"image/vnd.wap.wbmp" ""
"wbmp" ""
" " "zz" 1
" `" "z " 1
" @" "z " 1
" " "z " 1
"../lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-xbm.dll"
"xbm" 4 "gdk-pixbuf" "The XBM image format" "LGPL"
"image/x-xbitmap" ""
"xbm" ""
"#define " "" 100
"/*" "" 50
"../lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-xpm.dll"
"xpm" 4 "gdk-pixbuf" "The XPM image format" "LGPL"
"image/x-xpixmap" ""
"xpm" ""
"/* XPM */" "" 100

46
build-aux/speedo/w32/inst-options.ini Normal file
View File

@ -0,0 +1,46 @@
[Settings]
NumFields=5
; The number of the fields here is known in w32inst.nsi.
; The tags must be "[Field N]" with N=1..NumFields
[Field 1]
Type=Label
Left=0
Right=-1
Top=0
Bottom=20
[Field 2]
Type=Checkbox
Left=0
Right=-1
Top=30
Bottom=40
;Text=Start Menu
State=1
[Field 3]
Type=Checkbox
Left=0
Right=-1
Top=50
Bottom=60
;Text=Desktop
State=0
[Field 4]
Type=Checkbox
Left=0
Right=-1
Top=70
Bottom=80
;Text=Quick Launch Bar
State=0
[Field 5]
Type=Label
Left=0
Right=-1
Top=90
Bottom=130

1233
build-aux/speedo/w32/inst.nsi Normal file
View File

File diff suppressed because it is too large Load Diff

3
build-aux/speedo/w32/pango.modules Executable file
View File

@ -0,0 +1,3 @@
# Pango Modules file
#
"../lib/pango/1.6.0/modules/pango-basic-win32.dll" BasicScriptEngineWin32 PangoEngineShape PangoRenderWin32 common:

165
build-aux/speedo/w32/pkg-copyright.txt Normal file
View File

@ -0,0 +1,165 @@
Here is a list with collected copyright notices. For details see the
description of each individual package. [Compiled by wk FIXME]
GnuPG is
Copyright (C) 1997-1998, 2013-2014 Werner Koch
Copyright (C) 1998-2013 Free Software Foundation, Inc.
Copyright (C) 2003-2013 g10 Code GmbH
Copyright (C) 2002 Klarälvdalens Datakonsult AB
Copyright (C) 1995-1997, 2000-2007 Ulrich Drepper <drepper@gnu.ai.mit.edu>
Copyright (C) 1994 X Consortium
Copyright (C) 1998 by The Internet Society.
Copyright (C) 1998-2004 The OpenLDAP Foundation
Copyright (C) 1998-2004 Kurt D. Zeilenga.
Copyright (C) 1998-2004 Net Boolean Incorporated.
Copyright (C) 2001-2004 IBM Corporation.
Copyright (C) 1999-2003 Howard Y.H. Chu.
Copyright (C) 1999-2003 Symas Corporation.
Copyright (C) 1998-2003 Hallvard B. Furuseth.
Copyright (C) 1992-1996 Regents of the University of Michigan.
GnuPG is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
GnuPG is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA
GPA is
Copyright (C) 2000-2002 G-N-U GmbH (http://www.g-n-u.de)
Copyright (C) 2002-2003 Miguel Coca.
Copyright (C) 2005, 2006, 2008, 2012, 2014 g10 Code GmbH.
Copyright (C) 1998-2000 Free Software Foundation, Inc.
Copyright (C) 2000-2001 Werner Koch
Copyright (C) 2000-2002 Timo Schulz
GPA is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
GPA is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>.
GPGME is
Copyright (C) 2000 Werner Koch (dd9jn)
Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 g10 Code GmbH
GPGME is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of
the License, or (at your option) any later version.
GPGME is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>.
LIBGPG-ERROR is
Copyright (C) 2003, 2004 g10 Code GmbH
libgpg-error is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public License
as published by the Free Software Foundation; either version 2.1 of
the License, or (at your option) any later version.
libgpg-error is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>.
GLIB is
Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the
Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
Modified by the GLib Team and others 1997-2000. See the AUTHORS
file for a list of people on the GLib Team. See the ChangeLog
files for a list of changes. These files are distributed with
GLib at ftp://ftp.gtk.org/pub/gtk/.
Pthreads-win32 is
Copyright(C) 1998 John E. Bossom
Copyright(C) 1999,2002 Pthreads-win32 contributors
Most of this is work available under the GNU Lesser General Public
License as published by the Free Software Foundation version 2.1 of
the License. The detailed terms are given in the file COPYING in
the source distribution; that very file may not be modified and thus
it is not possible to include it here.
NSIS is
Copyright (C) 1999-2005 Nullsoft, Inc.
This license applies to everything in the NSIS package, except where
otherwise noted.
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any
damages arising from the use of this software.
Permission is granted to anyone to use this software for any
purpose, including commercial applications, and to alter it and
redistribute it freely, subject to the following restrictions:
1. The origin of this software must not be misrepresented; you must
not claim that you wrote the original software. If you use this
software in a product, an acknowledgment in the product
documentation would be appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must
not be misrepresented as being the original software.
3. This notice may not be removed or altered from any source
distribution.
The user interface used with the installer is
Copyright (C) 2002-2005 Joost Verburg
[It is distributed along with NSIS and the same conditions as stated
above apply]

10
build-aux/speedo/zlib.pc Normal file
View File

@ -0,0 +1,10 @@
prefix=/usr
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
includedir=${prefix}/include
Name: zlib
Description: zlib compression library
Version: 1.2.5
Libs: -L${libdir} -lz
Cflags: -I${includedir}