diff --git a/srcpkgs/glib/glib-devel.template b/srcpkgs/glib/glib-devel.template index a909834995e..c26c9b7ea2c 100644 --- a/srcpkgs/glib/glib-devel.template +++ b/srcpkgs/glib/glib-devel.template @@ -1,6 +1,6 @@ # Template file for 'glib-devel'. # -revision=1 +revision=2 short_desc="${short_desc} (development files)" long_desc="${long_desc} diff --git a/srcpkgs/glib/patches/pkgconfig-libpcre-static-linking.patch b/srcpkgs/glib/patches/pkgconfig-libpcre-static-linking.patch new file mode 100644 index 00000000000..85ca3596a93 --- /dev/null +++ b/srcpkgs/glib/patches/pkgconfig-libpcre-static-linking.patch @@ -0,0 +1,21 @@ +From 15437a7e5a89dcb2a812f829bc8e9e1db7ce350b Mon Sep 17 00:00:00 2001 +From: Sam Thursfield +Date: Thu, 01 Dec 2011 15:48:27 +0000 +Subject: Link to libpcre correctly when static linking + +https://bugzilla.gnome.org/show_bug.cgi?id=665298 +--- +diff --git a/glib-2.0.pc.in b/glib-2.0.pc.in +index ec4256d..2e638f6 100644 +--- a/glib-2.0.pc.in ++++ b/glib-2.0.pc.in +@@ -10,6 +10,7 @@ glib_mkenums=glib-mkenums + Name: GLib + Description: C Utility Library + Version: @VERSION@ ++Requires.private: @PCRE_REQUIRES@ + Libs: -L${libdir} -lglib-2.0 @INTLLIBS@ + Libs.private: @ICONV_LIBS@ @GLIB_RT_LIBS@ + Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include @GLIB_EXTRA_CFLAGS@ +-- +cgit v0.9.0.2 diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template index beafac3ff1f..2502396fdc4 100644 --- a/srcpkgs/glib/template +++ b/srcpkgs/glib/template @@ -1,8 +1,9 @@ # Template build file for 'glib' pkgname=glib version=2.30.3 -revision=1 +revision=2 distfiles="${GNOME_SITE}/glib/2.30/glib-$version.tar.xz" +patch_args="-Np1" configure_args="--disable-fam --with-pcre=system --enable-static" build_style=gnu-configure short_desc="The GNU library of C routines"