Updated windows gtk build
This commit is contained in:
Yevgen Muntyan
parent
a9d889ac67
commit
d037731d15
@ -27,3 +27,6 @@ aclocal.m4
|
||||
po*/dist
|
||||
po*/pot
|
||||
config.h.in
|
||||
plat/win32/gtk-win/tarballs/
|
||||
plat/win32/gtk-win/debug/
|
||||
plat/win32/gtk-win/release/
|
||||
|
||||
@ -88,6 +88,9 @@ AC_DEFINE_UNQUOTED(MOO_DISPLAY_VERSION,["$MOO_DISPLAY_VERSION"],[MOO_DISPLAY_VER
|
||||
AC_DEFINE_UNQUOTED(MOO_MAJOR_VERSION,[$MOO_MAJOR_VERSION],[MOO_MAJOR_VERSION])
|
||||
AC_DEFINE_UNQUOTED(MOO_MICRO_VERSION,[$MOO_MICRO_VERSION],[MOO_MICRO_VERSION])
|
||||
AC_DEFINE_UNQUOTED(MOO_MINOR_VERSION,[$MOO_MINOR_VERSION],[MOO_MINOR_VERSION])
|
||||
AC_SUBST([MOO_MAJOR_VERSION])
|
||||
AC_SUBST([MOO_MICRO_VERSION])
|
||||
AC_SUBST([MOO_MINOR_VERSION])
|
||||
AC_DEFINE_UNQUOTED(MOO_MODULE_MAJOR_VERSION,[$MOO_MODULE_MAJOR_VERSION],[MOO_MODULE_MAJOR_VERSION])
|
||||
AC_DEFINE_UNQUOTED(MOO_MODULE_MINOR_VERSION,[$MOO_MODULE_MINOR_VERSION],[MOO_MODULE_MINOR_VERSION])
|
||||
|
||||
|
||||
15
plat/win32/gtk-win/Makefile
Normal file
15
plat/win32/gtk-win/Makefile
Normal file
@ -0,0 +1,15 @@
|
||||
top:
|
||||
@echo "What target do you want?"
|
||||
@exit 1
|
||||
|
||||
check-make:
|
||||
@if [ ! -e $(mgwdir)/mjhbuild.sh ]; then echo "use make.sh"; exit 1; fi
|
||||
|
||||
build-gtk: check-make
|
||||
$(mgwdir)/mjhbuild.sh build
|
||||
|
||||
build-data: check-make
|
||||
mkdir -p $(mgwtargetdir)
|
||||
cp -R $(mgwdir)/extra/medit-data/* $(mgwtargetdir)/
|
||||
|
||||
build: build-gtk build-data
|
||||
@ -1,4 +1,4 @@
|
||||
export mgwdestdir=/yevgenm-laptop/c/Home/Projects
|
||||
export mgwdestdir=/tmp/gtk-win
|
||||
|
||||
export mgwdir_s=$mgwdir
|
||||
export mgwdir=`cd $mgwdir && pwd`
|
||||
|
||||
@ -1,20 +0,0 @@
|
||||
#! /bin/sh
|
||||
|
||||
export mgwdir=`dirname $0`
|
||||
. $mgwdir/config.sh || exit 1
|
||||
|
||||
do_or_die()
|
||||
{
|
||||
echo "$@"
|
||||
"$@" || exit 1
|
||||
}
|
||||
|
||||
if [ -d $mgwdir/jhbuild ]; then
|
||||
echo "Directory $mgwdir/jhbuild already exists"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
do_or_die git clone git://git.gnome.org/jhbuild
|
||||
do_or_die cd $mgwdir_s/jhbuild
|
||||
do_or_die patch -p 1 < ../jhbuild.patch
|
||||
do_or_die make -f Makefile.plain install bindir=$mgwdir/jhbuild/bin datarootdir=$mgwdir/jhbuild/share DISABLE_GETTEXT=1
|
||||
@ -1,85 +0,0 @@
|
||||
diff --git a/jhbuild/config.py b/jhbuild/config.py
|
||||
index 4ab415b..fff392f 100644
|
||||
--- a/jhbuild/config.py
|
||||
+++ b/jhbuild/config.py
|
||||
@@ -291,14 +291,11 @@ class Config:
|
||||
except:
|
||||
raise FatalError(_('install prefix (%s) can not be created') % self.prefix)
|
||||
|
||||
- os.environ['UNMANGLED_LD_LIBRARY_PATH'] = os.environ.get('LD_LIBRARY_PATH', '')
|
||||
-
|
||||
# LD_LIBRARY_PATH
|
||||
if self.use_lib64:
|
||||
libdir = os.path.join(self.prefix, 'lib64')
|
||||
else:
|
||||
libdir = os.path.join(self.prefix, 'lib')
|
||||
- addpath('LD_LIBRARY_PATH', libdir)
|
||||
|
||||
# LDFLAGS and C_INCLUDE_PATH are required for autoconf configure
|
||||
# scripts to find modules that do not use pkg-config (such as guile
|
||||
@@ -319,40 +316,22 @@ class Config:
|
||||
|
||||
# PATH
|
||||
bindir = os.path.join(self.prefix, 'bin')
|
||||
- addpath('PATH', bindir)
|
||||
|
||||
# MANPATH
|
||||
manpathdir = os.path.join(self.prefix, 'share', 'man')
|
||||
- addpath('MANPATH', '')
|
||||
- addpath('MANPATH', manpathdir)
|
||||
|
||||
# PKG_CONFIG_PATH
|
||||
- if os.environ.get('PKG_CONFIG_PATH') is None:
|
||||
- # add system pkgconfig lookup-directories by default, as pkg-config
|
||||
- # usage spread and is now used by libraries that are out of jhbuild
|
||||
- # realm; this also helps when building a single module with
|
||||
- # jhbuild. It is possible to avoid this by setting PKG_CONFIG_PATH
|
||||
- # to the empty string.
|
||||
- for dirname in ('share', 'lib', 'lib64'):
|
||||
- full_name = '/usr/%s/pkgconfig' % dirname
|
||||
- if os.path.exists(full_name):
|
||||
- addpath('PKG_CONFIG_PATH', full_name)
|
||||
pkgconfigdatadir = os.path.join(self.prefix, 'share', 'pkgconfig')
|
||||
pkgconfigdir = os.path.join(libdir, 'pkgconfig')
|
||||
- addpath('PKG_CONFIG_PATH', pkgconfigdatadir)
|
||||
- addpath('PKG_CONFIG_PATH', pkgconfigdir)
|
||||
|
||||
# XDG_DATA_DIRS
|
||||
xdgdatadir = os.path.join(self.prefix, 'share')
|
||||
- addpath('XDG_DATA_DIRS', xdgdatadir)
|
||||
|
||||
# XDG_CONFIG_DIRS
|
||||
xdgconfigdir = os.path.join(self.prefix, 'etc', 'xdg')
|
||||
- addpath('XDG_CONFIG_DIRS', xdgconfigdir)
|
||||
|
||||
# XCURSOR_PATH
|
||||
xcursordir = os.path.join(self.prefix, 'share', 'icons')
|
||||
- addpath('XCURSOR_PATH', xcursordir)
|
||||
|
||||
# ACLOCAL_FLAGS
|
||||
aclocaldir = os.path.join(self.prefix, 'share', 'aclocal')
|
||||
diff --git a/jhbuild/modtypes/autotools.py b/jhbuild/modtypes/autotools.py
|
||||
index 4d95ba1..5a06a00 100644
|
||||
--- a/jhbuild/modtypes/autotools.py
|
||||
+++ b/jhbuild/modtypes/autotools.py
|
||||
@@ -126,7 +126,7 @@ class AutogenModule(Package, DownloadableModule):
|
||||
template = self.autogen_template
|
||||
else:
|
||||
template = ("%(srcdir)s/%(autogen-sh)s --prefix %(prefix)s"
|
||||
- " --libdir %(libdir)s %(autogenargs)s ")
|
||||
+ " %(autogenargs)s ")
|
||||
|
||||
autogenargs = self.autogenargs + ' ' + self.config.module_autogenargs.get(
|
||||
self.name, self.config.autogenargs)
|
||||
@@ -140,11 +140,6 @@ class AutogenModule(Package, DownloadableModule):
|
||||
else:
|
||||
vars['srcdir'] = '.'
|
||||
|
||||
- if buildscript.config.use_lib64:
|
||||
- vars['libdir'] = "'${exec_prefix}/lib64'"
|
||||
- else:
|
||||
- vars['libdir'] = "'${exec_prefix}/lib'"
|
||||
-
|
||||
cmd = template % vars
|
||||
|
||||
if self.autogen_sh == 'autoreconf':
|
||||
@ -1,24 +1,27 @@
|
||||
<?xml version="1.0" ?><!-- -%- indent-width:2; use-tabs:0 -%- -->
|
||||
<moduleset>
|
||||
|
||||
<tarball id="zlib" version="1.2.4" supports-non-srcdir-builds="no">
|
||||
<source href="http://zlib.net/zlib-1.2.4.tar.gz"
|
||||
md5sum="47f6ed51b3c83a8534f9228531effa18"/>
|
||||
<!-- good -->
|
||||
<tarball id="zlib" version="1.2.5" supports-non-srcdir-builds="no">
|
||||
<source href="http://zlib.net/zlib-1.2.5.tar.gz"
|
||||
md5sum="c735eab2d659a96e5a594c9e8541ad63"/>
|
||||
<patches>
|
||||
<patch file="zlib.patch" strip="1"/>
|
||||
<patch file="zlib-1.2.5.patch" strip="1"/>
|
||||
</patches>
|
||||
</tarball>
|
||||
|
||||
<!-- good -->
|
||||
<tarball id="libiconv" version="1.13.1">
|
||||
<source href="http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.13.1.tar.gz"
|
||||
md5sum="7ab33ebd26687c744a37264a330bbe9a"/>
|
||||
</tarball>
|
||||
|
||||
|
||||
<!-- good -->
|
||||
<tarball id="gettext" version="0.17">
|
||||
<source href="http://ftp.gnu.org/pub/gnu/gettext/gettext-0.17.tar.gz"
|
||||
md5sum="58a2bc6d39c0ba57823034d55d65d606"/>
|
||||
<patches>
|
||||
<patch file="gettext.patch" strip="1"/>
|
||||
<patch file="gettext-0.17.patch" strip="1"/>
|
||||
</patches>
|
||||
<dependencies>
|
||||
<dep package="libiconv"/>
|
||||
@ -35,8 +38,9 @@
|
||||
</dependencies>
|
||||
</tarball>
|
||||
|
||||
<!-- good -->
|
||||
<tarball id="libpng" version="1.4.1">
|
||||
<source href="ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-1.4.1.tar.gz"
|
||||
<source href="http://download.sourceforge.net/libpng/libpng-1.4.1.tar.gz"
|
||||
md5sum="fa0b2a84733463f90d3ac9f43ccafabc"/>
|
||||
<dependencies>
|
||||
<dep package="zlib"/>
|
||||
@ -45,7 +49,8 @@
|
||||
<patch file="libpng.patch" strip="1"/>
|
||||
</patches>
|
||||
</tarball>
|
||||
|
||||
|
||||
<!-- good -->
|
||||
<tarball id="libxml2" version="2.6.30">
|
||||
<source href="http://ftp.gnome.org/pub/gnome/sources/libxml2/2.6/libxml2-2.6.30.tar.bz2"
|
||||
md5sum="cbc6d381daaa836b90a7ab449c1bc1ae"/>
|
||||
@ -54,7 +59,8 @@
|
||||
</dependencies>
|
||||
</tarball>
|
||||
|
||||
<tarball id="glib">
|
||||
<!-- good -->
|
||||
<tarball id="glib-2.24.0">
|
||||
<source href="http://ftp.gnome.org/pub/GNOME/sources/glib/2.24/glib-2.24.0.tar.bz2"
|
||||
sha256sum="7b6aa2cf21e734a6092a711bf196b8d2ddc589b971f93337610c10fa4f23400d"/>
|
||||
<dependencies>
|
||||
@ -67,6 +73,26 @@
|
||||
</patches>
|
||||
</tarball>
|
||||
|
||||
<tarball id="glib-2.24.2">
|
||||
<source href="http://ftp.gnome.org/pub/GNOME/sources/glib/2.24/glib-2.24.2.tar.bz2"
|
||||
sha256sum="3aeb521abd3642dd1224379f0e54915957e5010f888a4ae74afa0ad54da0160c"/>
|
||||
<dependencies>
|
||||
<dep package="libiconv"/>
|
||||
<dep package="gettext"/>
|
||||
<dep package="zlib"/>
|
||||
</dependencies>
|
||||
<patches>
|
||||
<patch file="glib-2.24.patch" strip="1"/>
|
||||
</patches>
|
||||
</tarball>
|
||||
|
||||
<metamodule id="glib">
|
||||
<dependencies>
|
||||
<dep package="glib-2.24.2"/>
|
||||
</dependencies>
|
||||
</metamodule>
|
||||
|
||||
<!-- good -->
|
||||
<tarball id="pkgconfig" version="0.23">
|
||||
<source href="http://pkgconfig.freedesktop.org/releases/pkg-config-0.23.tar.gz"
|
||||
md5sum="d922a88782b64441d06547632fd85744"/>
|
||||
@ -78,15 +104,28 @@
|
||||
</patches>
|
||||
</tarball>
|
||||
|
||||
<tarball id="pixman" version="0.17.14">
|
||||
<!-- good -->
|
||||
<tarball id="pixman-0.17.14">
|
||||
<source href="http://cairographics.org/releases/pixman-0.17.14.tar.gz"
|
||||
md5sum="b0ad87c2cc9346056698eaf6af1933a6"/>
|
||||
<patches>
|
||||
<patch file="pixman.patch" strip="1"/>
|
||||
<patch file="pixman-0.17.patch" strip="1"/>
|
||||
</patches>
|
||||
</tarball>
|
||||
|
||||
<tarball id="cairo" version="1.8.4" supports-non-srcdir-builds="no">
|
||||
<tarball id="pixman-0.19.2">
|
||||
<source href="http://cairographics.org/releases/pixman-0.19.2.tar.gz"
|
||||
md5sum="dfb84c9f402fbba5047f0e0a69c17518"/>
|
||||
</tarball>
|
||||
|
||||
<metamodule id="pixman">
|
||||
<dependencies>
|
||||
<dep package="pixman-0.17.4"/>
|
||||
</dependencies>
|
||||
</metamodule>
|
||||
|
||||
<!-- good -->
|
||||
<tarball id="cairo-1.8" supports-non-srcdir-builds="no">
|
||||
<source href="http://cairographics.org/releases/cairo-1.8.4.tar.gz"
|
||||
md5sum="a5067e355e78294db2485aa97afd1115"/>
|
||||
<dependencies>
|
||||
@ -96,6 +135,24 @@
|
||||
</dependencies>
|
||||
</tarball>
|
||||
|
||||
<!-- does not build -->
|
||||
<tarball id="cairo-1.10" supports-non-srcdir-builds="no">
|
||||
<source href="http://cairographics.org/releases/cairo-1.10.0.tar.gz"
|
||||
md5sum="70a2ece66cf473d976e2db0f75bf199e"/>
|
||||
<dependencies>
|
||||
<dep package="pixman"/>
|
||||
<dep package="gettext"/>
|
||||
<dep package="libpng"/>
|
||||
</dependencies>
|
||||
</tarball>
|
||||
|
||||
<metamodule id="cairo">
|
||||
<dependencies>
|
||||
<dep package="cairo-1.8"/>
|
||||
</dependencies>
|
||||
</metamodule>
|
||||
|
||||
<!-- good -->
|
||||
<tarball id="pango">
|
||||
<source href="http://ftp.acc.umu.se/pub/GNOME/sources/pango/1.28/pango-1.28.0.tar.bz2"
|
||||
sha256sum="68480485b714e3570a58c270add9e9785fa78068f7410949b478e8a9d3f5bc40"/>
|
||||
@ -108,6 +165,7 @@
|
||||
</dependencies>
|
||||
</tarball>
|
||||
|
||||
<!-- good -->
|
||||
<tarball id="atk" supports-non-srcdir-builds="no">
|
||||
<source href="http://ftp.gnome.org/pub/GNOME/sources/atk/1.30/atk-1.30.0.tar.bz2"
|
||||
sha256sum="92b9b1213cafc68fe9c3806273b968c26423237d7b1f631dd83dc5270b8c268c"/>
|
||||
@ -116,6 +174,7 @@
|
||||
</dependencies>
|
||||
</tarball>
|
||||
|
||||
<!-- good -->
|
||||
<tarball id="gtk+-2.16">
|
||||
<source href="http://ftp.gnome.org/pub/GNOME/sources/gtk+/2.16/gtk+-2.16.6.tar.bz2"
|
||||
sha256sum="18e0f9792028e6cc5108447678f17d396f9a2cdfec1e6ab5dca98cb844f954af"/>
|
||||
@ -161,6 +220,21 @@
|
||||
</patches>
|
||||
</tarball>
|
||||
|
||||
<repository type="git" name="git.gnome.org" href="git://git.gnome.org/"/>
|
||||
<autotools id="gtk-2-20">
|
||||
<branch repo="git.gnome.org" module="gtk+" revision="gtk-2-20"/>
|
||||
<dependencies>
|
||||
<dep package="cairo"/>
|
||||
<dep package="pango"/>
|
||||
<dep package="atk"/>
|
||||
<dep package="glib"/>
|
||||
<dep package="libpng"/>
|
||||
</dependencies>
|
||||
<!-- <patches>
|
||||
<patch file="gtk-2.20.patch" strip="1"/>
|
||||
</patches>-->
|
||||
</autotools>
|
||||
|
||||
<tarball id="gtk-engines">
|
||||
<source href="http://ftp.gnome.org/pub/GNOME/sources/gtk-engines/2.20/gtk-engines-2.20.0.tar.bz2"
|
||||
sha256sum="69b2e6798cfdcf7366b025b8f59fc63f658474f823d185473e94f969bae8cad1"/>
|
||||
@ -204,6 +278,7 @@
|
||||
</patches>
|
||||
</tarball>
|
||||
|
||||
<!-- good -->
|
||||
<tarball id="intltool">
|
||||
<source href="http://launchpadlibrarian.net/41841194/intltool-0.41.1.tar.gz"
|
||||
sha256sum="06d02133a85b9d6f29cd763050dc9267a6d73ef3008993f5b917cafc7ece96c0"/>
|
||||
|
||||
@ -12,7 +12,9 @@ assert _gtkwinconfig in ['debug', 'release']
|
||||
|
||||
_mingw_tool_prefix = '/usr/bin/i586-mingw32msvc-'
|
||||
|
||||
makeargs = '-j 2'
|
||||
moduleset = os.path.join(_gtkwinjhbuilddir, 'gtk.moduleset')
|
||||
use_lib64 = False
|
||||
|
||||
modules = ['medit-gtk-win']
|
||||
|
||||
@ -37,15 +39,15 @@ _mingw_tools = {
|
||||
'GCOV': 'gcov',
|
||||
'LD': 'ld',
|
||||
'NM': 'nm',
|
||||
'OBJCOPY': 'objcopy',
|
||||
'OBJCOPY': 'objcopy',
|
||||
'OBJDUMP': 'objdump',
|
||||
'READELF': 'readelf',
|
||||
'SIZE': 'size',
|
||||
'STRINGS': 'strings',
|
||||
'STRINGS': 'strings',
|
||||
'WINDRES': 'windres',
|
||||
'RC': 'windres',
|
||||
'AR': 'ar',
|
||||
'RANLIB': 'ranlib',
|
||||
'RANLIB': 'ranlib',
|
||||
'STRIP': 'strip',
|
||||
}
|
||||
|
||||
@ -81,7 +83,7 @@ autogenargs += ' --host=' + _configure_target
|
||||
autogenargs += ' --target=' + _configure_target
|
||||
autogenargs += ' --disable-docs --disable-gtk-doc --disable-scrollkeeper'
|
||||
autogenargs += ' --enable-maintainer-mode --enable-shared --disable-static'
|
||||
autogenargs += ' --enable-relocatable --disable-glibtest'
|
||||
autogenargs += ' --enable-relocatable --enable-silent-rules --disable-glibtest'
|
||||
for _var in ['AR', 'RANLIB', 'STRIP', 'AS', 'DLLTOOL', 'OBJDUMP', 'NM', 'WINDRES', 'RC']:
|
||||
autogenargs += ' ' + _var + '="' + os.environ[_var] + '" '
|
||||
|
||||
@ -110,10 +112,14 @@ module_autogenargs['glib'] = autogenargs + " --cache-file=" + _glib_win32_cac
|
||||
+ " --with-threads=win32" \
|
||||
+ " --disable-fam" \
|
||||
+ " --disable-selinux"
|
||||
module_autogenargs['glib-2.24.0'] = module_autogenargs['glib']
|
||||
module_autogenargs['glib-2.24.2'] = module_autogenargs['glib']
|
||||
|
||||
module_autogenargs['cairo'] = autogenargs + " --without-x" \
|
||||
+ " --disable-ft" \
|
||||
+ " png_REQUIRES=libpng"
|
||||
module_autogenargs['cairo-1.8'] = module_autogenargs['cairo']
|
||||
module_autogenargs['cairo-1.10'] = module_autogenargs['cairo']
|
||||
|
||||
module_autogenargs['pango'] = autogenargs + " --with-included-modules"
|
||||
|
||||
@ -142,3 +148,4 @@ module_autogenargs['gtk+-2.20'] = autogenargs \
|
||||
+ " --with-included-loaders=ani,icns,pcx,ras,tga,png,pnm,wbmp,xbm,xpm,bmp,gif,ico" \
|
||||
+ " --with-included-immodules" \
|
||||
+ " --disable-introspection"
|
||||
module_autogenargs['gtk-2-20'] = module_autogenargs['gtk+-2.20']
|
||||
|
||||
68
plat/win32/gtk-win/jhbuildrc/patches/gettext-0.17.patch
Normal file
68
plat/win32/gtk-win/jhbuildrc/patches/gettext-0.17.patch
Normal file
@ -0,0 +1,68 @@
|
||||
diff -r 6b03b8e866f5 gettext-runtime/intl/Makefile.in
|
||||
--- a/gettext-runtime/intl/Makefile.in Wed Sep 08 23:54:37 2010 -0700
|
||||
+++ b/gettext-runtime/intl/Makefile.in Wed Sep 08 23:55:38 2010 -0700
|
||||
@@ -280,15 +280,11 @@
|
||||
# so that they work with the sed-3.02 that is shipped with MSYS. We can use
|
||||
# GNU bash's $'\n' syntax to obtain such a newline.
|
||||
libintl.res: $(srcdir)/libintl.rc
|
||||
- nl=$$'\n'; \
|
||||
- sed_extract_major='/^[0-9]/{'$${nl}'s/^\([0-9]*\).*/\1/p'$${nl}q$${nl}'}'$${nl}'c\'$${nl}0$${nl}q; \
|
||||
- sed_extract_minor='/^[0-9][0-9]*[.][0-9]/{'$${nl}'s/^[0-9]*[.]\([0-9]*\).*/\1/p'$${nl}q$${nl}'}'$${nl}'c\'$${nl}0$${nl}q; \
|
||||
- sed_extract_subminor='/^[0-9][0-9]*[.][0-9][0-9]*[.][0-9]/{'$${nl}'s/^[0-9]*[.][0-9]*[.]\([0-9]*\).*/\1/p'$${nl}q$${nl}'}'$${nl}'c\'$${nl}0$${nl}q; \
|
||||
$(WINDRES) \
|
||||
"-DPACKAGE_VERSION_STRING=\\\"$(VERSION)\\\"" \
|
||||
- "-DPACKAGE_VERSION_MAJOR="`echo '$(VERSION)' | sed -n -e "$$sed_extract_major"` \
|
||||
- "-DPACKAGE_VERSION_MINOR="`echo '$(VERSION)' | sed -n -e "$$sed_extract_minor"` \
|
||||
- "-DPACKAGE_VERSION_SUBMINOR="`echo '$(VERSION)' | sed -n -e "$$sed_extract_subminor"` \
|
||||
+ "-DPACKAGE_VERSION_MAJOR="`echo '$(VERSION)' | sed -r -e 's/([0-9]+)[.]([0-9]+)/\1/'` \
|
||||
+ "-DPACKAGE_VERSION_MINOR="`echo '$(VERSION)' | sed -r -e 's/([0-9]+)[.]([0-9]+)/\1/'` \
|
||||
+ "-DPACKAGE_VERSION_SUBMINOR="0 \
|
||||
-i $(srcdir)/libintl.rc -o libintl.res --output-format=coff
|
||||
|
||||
ref-add.sed: $(srcdir)/ref-add.sin
|
||||
diff -r 6b03b8e866f5 gettext-tools/Makefile.in
|
||||
--- a/gettext-tools/Makefile.in Wed Sep 08 23:54:37 2010 -0700
|
||||
+++ b/gettext-tools/Makefile.in Wed Sep 08 23:55:38 2010 -0700
|
||||
@@ -724,7 +724,7 @@
|
||||
top_srcdir = @top_srcdir@
|
||||
AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
|
||||
ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../autoconf-lib-link/m4 -I ../m4 -I gnulib-m4 -I libgettextpo/gnulib-m4
|
||||
-SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4 tests gnulib-tests examples
|
||||
+SUBDIRS = intl gnulib-lib libgrep src libgettextpo po misc m4
|
||||
|
||||
# Allow users to use "gnulib-tool --update".
|
||||
|
||||
diff -r 6b03b8e866f5 gettext-tools/configure
|
||||
--- a/gettext-tools/configure Wed Sep 08 23:54:37 2010 -0700
|
||||
+++ b/gettext-tools/configure Wed Sep 08 23:55:38 2010 -0700
|
||||
@@ -1261,7 +1261,7 @@
|
||||
FFLAGS
|
||||
EMACS
|
||||
EMACSLOADPATH'
|
||||
-ac_subdirs_all='examples'
|
||||
+ac_subdirs_all=
|
||||
|
||||
# Initialize some variables set by options.
|
||||
ac_init_help=
|
||||
@@ -65980,7 +65980,7 @@
|
||||
|
||||
EOF
|
||||
|
||||
-subdirs="$subdirs examples"
|
||||
+subdirs="$subdirs"
|
||||
|
||||
|
||||
ac_config_files="$ac_config_files Makefile"
|
||||
diff -r 6b03b8e866f5 gettext-tools/woe32dll/gettextlib-exports.c
|
||||
--- a/gettext-tools/woe32dll/gettextlib-exports.c Wed Sep 08 23:54:37 2010 -0700
|
||||
+++ b/gettext-tools/woe32dll/gettextlib-exports.c Wed Sep 08 23:55:38 2010 -0700
|
||||
@@ -26,7 +26,7 @@
|
||||
VARIABLE(gl_array_list_implementation)
|
||||
VARIABLE(gl_linkedhash_list_implementation)
|
||||
VARIABLE(program_name)
|
||||
-VARIABLE(rpl_optarg)
|
||||
-VARIABLE(rpl_optind)
|
||||
+// VARIABLE(rpl_optarg)
|
||||
+// VARIABLE(rpl_optind)
|
||||
VARIABLE(simple_backup_suffix)
|
||||
VARIABLE(styled_ostream_typeinfo)
|
||||
98
plat/win32/gtk-win/jhbuildrc/patches/zlib-1.2.5.patch
Normal file
98
plat/win32/gtk-win/jhbuildrc/patches/zlib-1.2.5.patch
Normal file
@ -0,0 +1,98 @@
|
||||
diff -r e32d18cbb6e3 Makefile
|
||||
--- a/Makefile Wed Sep 08 23:31:13 2010 -0700
|
||||
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
|
||||
@@ -1,5 +0,0 @@
|
||||
-all:
|
||||
- -@echo "Please use ./configure first. Thank you."
|
||||
-
|
||||
-distclean:
|
||||
- make -f Makefile.in distclean
|
||||
diff -r e32d18cbb6e3 Makefile.in
|
||||
--- a/Makefile.in Wed Sep 08 23:31:13 2010 -0700
|
||||
+++ b/Makefile.in Wed Sep 08 23:33:15 2010 -0700
|
||||
@@ -39,7 +39,7 @@
|
||||
AR=ar rc
|
||||
RANLIB=ranlib
|
||||
LDCONFIG=ldconfig
|
||||
-LDSHAREDLIBC=-lc
|
||||
+LDSHAREDLIBC=
|
||||
TAR=tar
|
||||
SHELL=/bin/sh
|
||||
EXE=
|
||||
@@ -67,7 +67,7 @@
|
||||
|
||||
PIC_OBJS = $(PIC_OBJC) $(PIC_OBJA)
|
||||
|
||||
-all: static shared
|
||||
+all: dll
|
||||
|
||||
static: example$(EXE) minigzip$(EXE)
|
||||
|
||||
@@ -119,7 +119,7 @@
|
||||
|
||||
match.lo: match.S
|
||||
$(CPP) match.S > _match.s
|
||||
- $(CC) -c -fPIC _match.s
|
||||
+ $(CC) -c _match.s
|
||||
mv _match.o match.lo
|
||||
rm -f _match.s
|
||||
|
||||
@@ -185,12 +185,12 @@
|
||||
# The ranlib in install is needed on NeXTSTEP which checks file times
|
||||
# ldconfig is for Linux
|
||||
|
||||
-install: install-libs
|
||||
+install: install-dll
|
||||
-@if [ ! -d $(DESTDIR)$(includedir) ]; then mkdir -p $(DESTDIR)$(includedir); fi
|
||||
cp zlib.h zconf.h $(DESTDIR)$(includedir)
|
||||
chmod 644 $(DESTDIR)$(includedir)/zlib.h $(DESTDIR)$(includedir)/zconf.h
|
||||
|
||||
-uninstall:
|
||||
+uninstall: uninstall-dll
|
||||
cd $(DESTDIR)$(includedir); rm -f zlib.h zconf.h
|
||||
cd $(DESTDIR)$(libdir); rm -f libz.a; \
|
||||
if test "$(SHAREDLIBV)" -a -f $(SHAREDLIBV); then \
|
||||
@@ -234,6 +234,23 @@
|
||||
depend:
|
||||
makedepend -- $(CFLAGS) -- *.[ch]
|
||||
|
||||
+# begin muntyan additions
|
||||
+dlldir = $(exec_prefix)/bin
|
||||
+DLL = zlib1-m314.dll
|
||||
+DLL_A = libz.dll.a
|
||||
+$(DLL): $(OBJS)
|
||||
+ $(CC) -shared -o $(DLL) -Wl,--out-implib=$(DLL_A) $(OBJS)
|
||||
+dll: $(DLL)
|
||||
+install-dll: dll
|
||||
+ -@if [ ! -d $(DESTDIR)$(dlldir) ]; then mkdir -p $(DESTDIR)$(dlldir); fi
|
||||
+ -@if [ ! -d $(DESTDIR)$(libdir) ]; then mkdir -p $(DESTDIR)$(libdir); fi
|
||||
+ cp $(DLL) $(DESTDIR)$(dlldir)
|
||||
+ cp $(DLL_A) $(DESTDIR)$(libdir)
|
||||
+ rm -f $(DESTDIR)$(libdir)/$(STATICLIB)
|
||||
+uninstall-dll:
|
||||
+ rm -f $(DESTDIR)$(dlldir)/$(DLL) $(DESTDIR)$(libdir)/$(DLL_A)
|
||||
+# end muntyan additions
|
||||
+
|
||||
# DO NOT DELETE THIS LINE -- make depend depends on it.
|
||||
|
||||
adler32.o zutil.o: zutil.h zlib.h zconf.h
|
||||
diff -r e32d18cbb6e3 configure
|
||||
--- a/configure Wed Sep 08 23:31:13 2010 -0700
|
||||
+++ b/configure Wed Sep 08 23:33:15 2010 -0700
|
||||
@@ -105,7 +105,7 @@
|
||||
|
||||
if test "$gcc" -eq 1 && ($cc -c $cflags $test.c) 2>/dev/null; then
|
||||
CC="$cc"
|
||||
- SFLAGS="${CFLAGS--O3} -fPIC"
|
||||
+ SFLAGS="${CFLAGS--O3}"
|
||||
CFLAGS="${CFLAGS--O3}"
|
||||
if test $build64 -eq 1; then
|
||||
CFLAGS="${CFLAGS} -m64"
|
||||
@@ -568,7 +568,6 @@
|
||||
/^sharedlibdir *=/s#=.*#=$sharedlibdir#
|
||||
/^includedir *=/s#=.*#=$includedir#
|
||||
/^mandir *=/s#=.*#=$mandir#
|
||||
-/^all: */s#:.*#: $ALL#
|
||||
/^test: */s#:.*#: $TEST#
|
||||
" > Makefile
|
||||
|
||||
@ -1,5 +1,10 @@
|
||||
#! /bin/sh
|
||||
|
||||
if [ "$1" = "--help" -o "$1" = "-h" ]; then
|
||||
echo "Usage: $0 [--debug|--release|--all] <make arguments...>"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
if [ "$1" = "--all" ]; then
|
||||
shift
|
||||
echo $0 --debug "$@"
|
||||
|
||||
@ -1,12 +1,17 @@
|
||||
#! /bin/sh
|
||||
|
||||
# Usage: mjhbuild.sh [--debug|--release] <jhbuild arguments...>
|
||||
|
||||
export mgwdir=`dirname $0`
|
||||
. $mgwdir/config.sh || exit 1
|
||||
|
||||
export _GTKWINDIR=`cd $mgwdir && pwd`
|
||||
export _GTKWINCONFIG=$mgwconfig
|
||||
|
||||
# JHBUILD=$mgwdir_s/jhbuild/bin/jhbuild
|
||||
JHBUILD=jhbuild
|
||||
|
||||
chmod a-w $mgwdir/jhbuildrc/glib-win32.cache
|
||||
|
||||
echo $mgwdir_s/jhbuild/bin/jhbuild -f $mgwdir_s/jhbuildrc/jhbuildrc "$@"
|
||||
exec $mgwdir_s/jhbuild/bin/jhbuild -f $mgwdir_s/jhbuildrc/jhbuildrc "$@"
|
||||
echo $JHBUILD -f $mgwdir_s/jhbuildrc/jhbuildrc "$@"
|
||||
exec $JHBUILD -f $mgwdir_s/jhbuildrc/jhbuildrc "$@"
|
||||
|
||||
66
plat/win32/mingw-configure
Executable file
66
plat/win32/mingw-configure
Executable file
@ -0,0 +1,66 @@
|
||||
#! /bin/sh
|
||||
|
||||
builddir=`pwd`
|
||||
srcdir=`dirname $0`/../..
|
||||
srcdir=`cd $srcdir && pwd`
|
||||
if [ ! -e $srcdir/configure ]; then
|
||||
echo "configure script not found"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
_mingw_tool_prefix='/usr/bin/i586-mingw32msvc'
|
||||
|
||||
export mgwdir=`dirname $0`/gtk-win
|
||||
. $mgwdir/config.sh || exit 1
|
||||
|
||||
if [ "$mgwconfig" = "debug" ]; then
|
||||
_def_cflags='-gstabs'
|
||||
else
|
||||
_def_cflags='-O2'
|
||||
fi
|
||||
|
||||
export ADDR2LINE=$_mingw_tool_prefix-addr2line
|
||||
export AS=$_mingw_tool_prefix-as
|
||||
export CC=$_mingw_tool_prefix-gcc
|
||||
export CPP=$_mingw_tool_prefix-cpp
|
||||
export CPPFILT=$_mingw_tool_prefix-c++filt
|
||||
export CXX=$_mingw_tool_prefix-g++
|
||||
export DLLTOOL=$_mingw_tool_prefix-dlltool
|
||||
export DLLWRAP=$_mingw_tool_prefix-dllwrap
|
||||
export GCOV=$_mingw_tool_prefix-gcov
|
||||
export LD=$_mingw_tool_prefix-ld
|
||||
export NM=$_mingw_tool_prefix-nm
|
||||
export OBJCOPY=$_mingw_tool_prefix-objcopy
|
||||
export OBJDUMP=$_mingw_tool_prefix-objdump
|
||||
export READELF=$_mingw_tool_prefix-readelf
|
||||
export SIZE=$_mingw_tool_prefix-size
|
||||
export STRINGS=$_mingw_tool_prefix-strings
|
||||
export WINDRES=$_mingw_tool_prefix-windres
|
||||
export RC=$_mingw_tool_prefix-windres
|
||||
export AR=$_mingw_tool_prefix-ar
|
||||
export RANLIB=$_mingw_tool_prefix-ranlib
|
||||
export STRIP=$_mingw_tool_prefix-strip
|
||||
|
||||
export LDFLAGS="-L$mgwtargetdir/lib"
|
||||
export CPPFLAGS="-I$mgwtargetdir/include"
|
||||
export CFLAGS="-mms-bitfields -march=i686 $_def_cflags"
|
||||
export CXXFLAGS="-mms-bitfields -march=i686 $_def_cflags"
|
||||
export OBJCFLAGS="-mms-bitfields -march=i686 $_def_cflags"
|
||||
|
||||
export PKG_CONFIG_LIBDIR="$mgwtargetdir/lib/pkgconfig"
|
||||
export PKG_CONFIG_PATH="$mgwtargetdir/lib/pkgconfig"
|
||||
|
||||
export INSTALL=install-check
|
||||
|
||||
configure_args="--build=i686-pc-linux-gnu --host=i586-pc-mingw32msvc --target=i586-pc-mingw32msvc \
|
||||
AR=$AR RANLIB=$RANLIB STRIP=$STRIP AS=$AS DLLTOOL=$DLLTOOL OBJDUMP=$OBJDUMP NM=$NM WINDRES=$WINDRES RC=$RC \
|
||||
--prefix=$mgwtargetdir --enable-silent-rules"
|
||||
|
||||
if [ "$mgwconfig" = "debug" ]; then
|
||||
moo_configure_args='--enable-debug'
|
||||
else
|
||||
moo_configure_args='--enable-dev-mode'
|
||||
fi
|
||||
|
||||
echo $srcdir/configure $configure_args $moo_configure_args "$@"
|
||||
exec $srcdir/configure $configure_args $moo_configure_args "$@"
|
||||
Loading…
x
Reference in New Issue
Block a user