Skip to content

Commit

Permalink
upgraded to glib 2.45.4
Browse files Browse the repository at this point in the history
  • Loading branch information
weltling committed Jul 23, 2015
1 parent 1cacb4a commit 11fb967
Show file tree
Hide file tree
Showing 2,188 changed files with 588,060 additions and 380,054 deletions.
47,177 changes: 45,955 additions & 1,222 deletions ChangeLog

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion HACKING
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,5 @@ Note that autogen.sh runs configure for you. If you wish to pass
options like --prefix=/usr to configure you can give those options
to autogen.sh and they will be passed on to configure.

For information about submitting patches see the README file.
For information about submitting patches see the README.commits file. For
information about major design decisions, see the README.rationale file.
14 changes: 9 additions & 5 deletions INSTALL
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Simple install procedure
========================

% tar xf glib-2.34.3.tar.gz # unpack the sources
% cd glib-2.34.3 # change to the toplevel directory
% tar xf glib-2.45.4.tar.gz # unpack the sources
% cd glib-2.45.4 # change to the toplevel directory
% ./configure # run the `configure' script
% make # build GLIB

Expand All @@ -13,6 +13,10 @@ Simple install procedure
Requirements
============

GLib requires a C90-compliant (but not necessarily C99-compliant) C
compiler and libc. On UNIX-like systems, it also assumes compliance
with at least the original 1990 version of POSIX.

GLib-2.0 requires pkg-config, which is tool for tracking the
compilation flags needed for libraries. (For each library, a small .pc
text file is installed in a standard location that contains the
Expand All @@ -21,7 +25,7 @@ information.) Information about pkg-config can be found at:

http://www.freedesktop.org/software/pkgconfig/

GNU make (http://www.gnu.org/software/make) is also recommended.
GNU make (http://www.gnu.org/software/make) is also required.

In order to implement conversions between character sets,
GLib requires an implementation of the standard iconv() routine.
Expand Down Expand Up @@ -79,7 +83,7 @@ in the file:

Or online at:

http://library.gnome.org/devel/glib/stable/glib-building.html
https://developer.gnome.org/glib/stable/glib-building.html


Installation directories
Expand Down Expand Up @@ -119,4 +123,4 @@ in the file:

Or online at:

http://library.gnome.org/devel/glib/stable/glib-cross-compiling.html
https://developer.gnome.org/glib/stable/glib-cross-compiling.html
10 changes: 7 additions & 3 deletions INSTALL.in
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ Simple install procedure
Requirements
============

GLib requires a C90-compliant (but not necessarily C99-compliant) C
compiler and libc. On UNIX-like systems, it also assumes compliance
with at least the original 1990 version of POSIX.

GLib-2.0 requires pkg-config, which is tool for tracking the
compilation flags needed for libraries. (For each library, a small .pc
text file is installed in a standard location that contains the
Expand All @@ -21,7 +25,7 @@ information.) Information about pkg-config can be found at:

http://www.freedesktop.org/software/pkgconfig/

GNU make (http://www.gnu.org/software/make) is also recommended.
GNU make (http://www.gnu.org/software/make) is also required.

In order to implement conversions between character sets,
GLib requires an implementation of the standard iconv() routine.
Expand Down Expand Up @@ -79,7 +83,7 @@ in the file:

Or online at:

http://library.gnome.org/devel/glib/stable/glib-building.html
https://developer.gnome.org/glib/stable/glib-building.html


Installation directories
Expand Down Expand Up @@ -119,4 +123,4 @@ in the file:

Or online at:

http://library.gnome.org/devel/glib/stable/glib-cross-compiling.html
https://developer.gnome.org/glib/stable/glib-cross-compiling.html
35 changes: 18 additions & 17 deletions Makefile.am
Original file line number Diff line number Diff line change
@@ -1,21 +1,20 @@
## Process this file with automake to produce Makefile.in
include $(top_srcdir)/Makefile.decl
include $(top_srcdir)/glib.mk

# http://people.gnome.org/~walters/docs/build-api.txt
.buildapi-allow-builddir:

ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS}

SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs
SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs tests
DIST_SUBDIRS = $(SUBDIRS) build
if BUILD_MODULAR_TESTS
SUBDIRS += tests
else
DIST_SUBDIRS += tests
endif

bin_SCRIPTS = glib-gettextize

if OS_LINUX
TESTS += check-abis.sh
endif

AM_CPPFLAGS = \
-DG_LOG_DOMAIN=g_log_domain_glib \
@GLIB_DEBUG_FLAGS@ \
Expand All @@ -41,12 +40,15 @@ EXTRA_DIST += \
sanity_check \
README.commits \
README.in \
README.rationale \
INSTALL.in \
README.win32 \
HACKING \
autogen.sh \
Makefile.decl \
mkinstalldirs \
glib.mk \
glib-tap.mk \
tap-driver.sh \
tap-test \
makefile.msc \
msvc_recommended_pragmas.h \
config.h.win32.in \
Expand All @@ -59,16 +61,19 @@ EXTRA_DIST += \
gthread-2.0.pc.in \
gio-2.0.pc.in \
gio-unix-2.0.pc.in \
gio-windows-2.0.pc.in
gio-windows-2.0.pc.in \
check-abis.sh \
gtk-doc.make \
$(NULL)


# These may be in the builddir too
BUILT_EXTRA_DIST = \
BUILT_EXTRA_DIST += \
README \
INSTALL \
ChangeLog \
config.h.win32 \
gtk-doc.make
$(NULL)

CONFIGURE_DEPENDENCIES = acglib.m4

Expand Down Expand Up @@ -98,14 +103,10 @@ endif

$(pkgconfig_DATA): config.status

# install mkinstalldirs for glib-gettextize's benefit
gettextdir = $(datadir)/glib-2.0/gettext
gettext_SCRIPTS = mkinstalldirs

# build documentation when doing distcheck
DISTCHECK_CONFIGURE_FLAGS = --enable-debug --enable-gtk-doc --enable-man --disable-maintainer-mode

DISTCLEANFILES = config.lt
DISTCLEANFILES += config.lt

distclean-local: lcov-clean
if test $(srcdir) = .; then :; else \
Expand Down
97 changes: 0 additions & 97 deletions Makefile.decl

This file was deleted.

Loading

0 comments on commit 11fb967

Please sign in to comment.