Skip to content

Commit

Permalink
libglib2: bump to version 2.40.0
Browse files Browse the repository at this point in the history
Remove patch because it is applied upstream in this version.

Signed-off-by: Hadrien Boutteville <[email protected]>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <[email protected]>
Cc: Thomas Petazzoni <[email protected]>
Cc: "Yann E. MORIN" <[email protected]>
Signed-off-by: Thomas Petazzoni <[email protected]>
  • Loading branch information
hbouttev authored and tpetazzoni committed Jul 15, 2014
1 parent 12687de commit b39abd4
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 58 deletions.

This file was deleted.

25 changes: 25 additions & 0 deletions package/libglib2/libglib2-0002-no-gtk-doc.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
Same patch as for systemd in commit
7144f2f04b705538a893e538a6b851f536f433b6:

Fix deactivation of gtk-doc

The tarball contains the Makefile for building documentation with gtk-doc,
Unfortunately the AM_CONDITIONAL variable is not the correct one, which
results in an error when running autoreconf.

This patch fixes this issue.

Signed-off-by: Eric Le Bihan <[email protected]>
Signed-off-by: Hadrien Boutteville <[email protected]>

--- a/gtk-doc.make
+++ b/gtk-doc.make
@@ -267,7 +267,7 @@
#
# Require gtk-doc when making dist
#
-if HAVE_GTK_DOC
+if ENABLE_GTK_DOC
dist-check-gtkdoc: docs
else
dist-check-gtkdoc:
4 changes: 2 additions & 2 deletions package/libglib2/libglib2.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
#
################################################################################

LIBGLIB2_VERSION_MAJOR = 2.38
LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).2
LIBGLIB2_VERSION_MAJOR = 2.40
LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).0
LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz
LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR)
LIBGLIB2_LICENSE = LGPLv2+
Expand Down

0 comments on commit b39abd4

Please sign in to comment.