Commit graph

38 commits

Author SHA1 Message Date
Dan Nicholson
617963c55e glib: Update snapshot to 2.32.4
This gets us to the latest stable release for glib and probably a good
stopping point for a while since the 2.32 series seems to be slowing
down.
2012-08-22 05:53:32 -07:00
Dan Nicholson
f8978af7bf glib: Really force static only building
Making --enable-static --disable-shared the default fixes most cases,
but build environments often pass --enable-shared --disable-static for
all autotooled projects. Force static building by setting the
appropriate variables as if they've come from the command line
parameters.
2012-08-21 06:32:16 -07:00
Dan Nicholson
cf9089f5ec glib: Fix static usage of glib on win32
When glib is built static, the threads and clock code are not
initialized since DllMain is never run. Instead, initialize them from
the glib constructor.

https://bugzilla.gnome.org/show_bug.cgi?id=678387
2012-08-17 11:37:04 -07:00
Dan Nicholson
f0e821fed2 glib: Remove usage of gettext/libintl/iconv
pkg-config doesn't use message translation, so there's no need to build
it into the bundled glib. Furthermore, when not using glibc, this drags
in extra dependencies on gettext, libintl and iconv. Remove their usage
in two steps:

1. Don't include libintl.h directly from code. glibintl.h
conditionalizes the include of libintl.h based on the ENABLE_NLS define
and creates fallback macros when it's unwanted.

2. Remove the usage of the gettext macros in glib's configure.ac. This
ensures that the unwanted dependencies aren't searched for. Two defines
are kept around to keep the code happy.
2012-08-17 09:03:55 -07:00
Dan Nicholson
f95579d268 glib: Ensure only static build is performed
Since we're going to use glib as a convenience library, we need to make
sure it builds as if --enable-static was passed. This only matters on
Windows where a couple extra macros are defined and the DLL machinery is
disabled.
2012-08-17 08:12:49 -07:00
Dan Nicholson
58b6b2d995 glib: Don't install charset.alias file
On non-glibc systems a charset.alias file is installed, but we don't
need this for our purposes.
2012-08-16 09:36:16 -07:00
Dan Nicholson
7178b2e041 glib: Remove check for tracing support
If dtrace or systemtap is installed glib will enable tracing
automatically. Remove the check to always disable tracing.

Freedesktop #53493
2012-08-14 15:16:35 -07:00
Dan Nicholson
40dc57fb41 glib: Don't install m4 macros
Freedesktop #52031
2012-08-13 20:40:27 -07:00
Dan Nicholson
6c27d5051b glib: Restore gettext with libintl support
Until the needed surgery is done to remove gettext support from the
internal glib (since pkg-config doesn't need it), make sure that libintl
is linked in when necessary.
2012-06-04 15:21:25 -07:00
Dan Nicholson
c47c09177f glib: Update snapshot to 2.32.3
There doesn't appear to be any changes in the code pkg-config uses. Just
keeping in sync.
2012-06-04 09:08:33 -07:00
Dan Nicholson
cfaffdc570 glib: Remove check for FAM only needed in GIO
One less thing for people to worry about with bundled glib.
2012-05-14 16:09:39 -07:00
Dan Nicholson
e2e118ec32 Ease glib cross-compiling requirements
Since we're building only glib, we don't need any of the auxiliary
tools.
2012-05-14 15:57:12 -07:00
Dan Nicholson
e8e6ee258e Make sure glib really doesn't need the gdb script
Fixes distcheck.
2012-05-14 14:18:36 -07:00
Dan Nicholson
5745e1ba08 glib: Keep a few more programs from being installed or generated 2012-05-10 09:08:18 -07:00
Dan Nicholson
b32156ab2b glib: Update snapshot to 2.32.2
A libelf pkg-config check creeped in, but it's only used in gio so we
can remove the libelf check completely.
2012-05-10 08:14:11 -07:00
Dan Nicholson
75755ba614 glib: Avoid pkg-config usage in bundled library
The whole exercise of carrying an internal copy of glib to avoid the
circular dependency is moot if it's still using pkg-config.
2012-04-21 12:46:32 -07:00
Dan Nicholson
2664821630 glib: Don't build GRegex or distribute pcre
In order to avoid the bundled pcre in our bundled glib, just remove and
disable the GRegex API. We don't currently need this in pkg-config
anyway.
2012-04-21 12:46:32 -07:00
Dan Nicholson
9ea8a68ccd glib: Set automake to foreign so it doesn't bomb on missing files 2012-04-21 12:46:32 -07:00
Dan Nicholson
f8d5ff5d29 glib: Don't install anything from the bundled library
All we want is the libglib.la convenience library. The -version-info is
removed since it causes warnings.
2012-04-21 12:46:32 -07:00
Dan Nicholson
7c54f7ca1e glib: Remove as many unneeded files as possible
We just want to be able to build glib from the within the pkg-config
tree. Everything else is just extra weight and is better used from an
actual glib checkout. Unnecessary files include:

* documentation
* translations
* tests
* ChangeLogs
* non-autotools win32 build files
* various other build and/or internal files
2012-04-21 12:46:31 -07:00
Dan Nicholson
9961b85d2a glib: Add a script to take a snapshot of glib-2.0
Grab a snapshot of a tag from a local glib checkout, remove a bunch of
files and apply some patches. The idea is to make the snapshot of glib
be repeatable.
2012-04-21 12:46:31 -07:00
Tollef Fog Heen
99964eddb5 Stop shipping an embedded glib
Drop the embedded glib, the associated patches and adjust build
scripts appropriately.
2011-04-13 20:16:23 +02:00
Tollef Fog Heen
4fe6610368 2007-12-29 Tollef Fog Heen <tfheen@err.no>
* Update to glib 1.2.10, adjust lots of the glib patches.  Gnome
	#81847.
2007-12-29 14:40:41 +01:00
Tollef Fog Heen
9c6db22935 Fix typo. 2007-06-18 23:16:51 +02:00
Tollef Fog Heen
ce499699bc * glib-patches/remove-strsignal-prototype.diff: define _GNU_SOURCE
there to get strsignal prototype, addresses the rest of
Freedesktop 10652.
2007-06-18 22:53:52 +02:00
Tollef Fog Heen
1224c055d2 * glib-patches/no-dist-distclean-files.diff: Fix prefix. 2007-06-18 22:03:46 +02:00
Tollef Fog Heen
cfd3a3dd1c Fix automake-warning.diff to not patch on top of another patch from
glib-patches.
2007-06-18 22:01:32 +02:00
Tollef Fog Heen
4ef3fc90d3 Fix path prefix so it applies. 2007-06-18 21:52:25 +02:00
Tollef Fog Heen
3977a8299d 2007-02-25 Tollef Fog Heen <tfheen@err.no>
* Makefile.am: Add support for using the system glib.  Thanks to
	Peter Breitenlohner for the bug and the patch.  Freedesktop #9708

	* configure.in: Add support for using the system glib.

	* glib-patches/no-dist-distclean-files.diff,
	glib-patches/automake-warning.diff,
	glib-patches/autoconf-warning.diff:  Get rid of some warnings when
	configuring glib.
2007-02-25 11:05:01 +01:00
Arch Librarian
18c80f1cbb 2005-06-26 Tollef Fog Heen <tfheen@err.no>
Author: tfheen
Date: 2005-06-26 18:42:54 GMT
2005-06-26  Tollef Fog Heen  <tfheen@err.no>

    * glib-patches/configure.in-fd_set.diff: Patch to grep for fd_set
    rather than fd_mask.  Thanks to David Wolfe for the fix.  This
    should make pkg-config happier on QNX.
2005-07-14 13:07:22 +00:00
Arch Librarian
9fbcebd354 2005-04-02 Tollef Fog Heen <tfheen@err.no>
Author: tfheen
Date: 2005-04-02 17:25:48 GMT
2005-04-02  Tollef Fog Heen  <tfheen@err.no>

    * glib-patches/remove-strsignal-prototype.diff: Remove strsignal
    prototype from gstrfuncs.c, it is included in string.h.  This
    fixes a compilation issue on cygwin. (Freedesktop #2598)
2005-07-14 13:06:51 +00:00
Arch Librarian
8b2511113e 2005-04-02 Tollef Fog Heen <tfheen@err.no>
Author: tfheen
Date: 2005-04-02 17:24:53 GMT
2005-04-02  Tollef Fog Heen  <tfheen@err.no>

    * glib-patches/distcheckfix.diff: Move glibconfig.h.win32 and
    config.h.win32 too.
2005-07-14 13:06:50 +00:00
Arch Librarian
a3d85bb344 2005-04-02 Tollef Fog Heen <tfheen@err.no>
Author: tfheen
Date: 2005-04-02 15:17:09 GMT
2005-04-02  Tollef Fog Heen  <tfheen@err.no>

        * glib-patches/distcheckfix.diff: Move glibconfig-sysdefs.h and
        glibconfig.h to DISTCLEANFILES since they're made by configure.
2005-07-14 13:06:48 +00:00
Arch Librarian
f4361a2704 2005-04-02 Tollef Fog Heen <tfheen@err.no>
Author: tfheen
Date: 2005-04-01 22:06:47 GMT
2005-04-02  Tollef Fog Heen  <tfheen@err.no>

    * glib-patches/mkinstalldirs.update.diff: cvs admin -ko to avoid
    having the Id CVS keyword being expanded, which broke the
    application of the patch.
2005-07-14 13:06:44 +00:00
Arch Librarian
61efa4f6c4 2005-03-28 Tollef Fog Heen <tfheen@err.no>
Author: tfheen
Date: 2005-03-28 15:49:23 GMT
2005-03-28  Tollef Fog Heen  <tfheen@err.no>

        * glib-patches/distcheckfix.diff: Add some files to CLEANFILES so
        make distcheck now works.
2005-07-14 13:06:32 +00:00
Arch Librarian
b8125bf542 2005-03-28 Tollef Fog Heen <tfheen@err.no>
Author: tfheen
Date: 2005-03-28 14:21:23 GMT
2005-03-28  Tollef Fog Heen  <tfheen@err.no>

    * autogen.sh: Extra paranoia -- fail if running auto* fails or if
    patching fails.

    * glib-patches/mkinstalldirs.update.diff: Update patch so it
    applies cleanly

    * glib-patches/pthread-config-fix.diff: adjust offsets so patch is
    quiet again
2005-07-14 13:06:31 +00:00
Arch Librarian
3c5248e621 2005-03-18 Tollef Fog Heen <tfheen@err.no>
Author: tfheen
Date: 2005-03-18 08:04:33 GMT
2005-03-18  Tollef Fog Heen  <tfheen@err.no>

    * glib-patches/pthread-config-fix.diff: Add patch to detect
    pthreads properly on some architectures.  Thanks to Michael
    Haubenwallner for reporting this bug and providing a patch.
2005-07-14 13:06:17 +00:00
Arch Librarian
6610c301f8 bump auto* versions and add patches for glib to work co...
Author: tfheen
Date: 2005-02-21 07:35:17 GMT
bump auto* versions and add patches for glib to work correctly with them
2005-07-14 13:06:12 +00:00