diff --git a/srcpkgs/glib/glib-devel.rshlibs b/srcpkgs/glib/glib-devel.rshlibs index dde8ba064e5..933f342031d 100644 --- a/srcpkgs/glib/glib-devel.rshlibs +++ b/srcpkgs/glib/glib-devel.rshlibs @@ -2,3 +2,4 @@ libgobject-2.0.so.0 libglib-2.0.so.0 libc.so.6 libpthread.so.0 +libgio-2.0.so.0 diff --git a/srcpkgs/glib/glib-devel.template b/srcpkgs/glib/glib-devel.template index 835e6db6217..ae02c743536 100644 --- a/srcpkgs/glib/glib-devel.template +++ b/srcpkgs/glib/glib-devel.template @@ -1,6 +1,5 @@ # Template file for 'glib-devel'. # -revision=3 short_desc="${short_desc} (development files)" long_desc="${long_desc} @@ -14,8 +13,7 @@ Add_dependency run libffi-devel Add_dependency run coreutils # required by glib-mkenums /usr/bin/env Add_dependency run perl ">=0" # required by glib-mkenums -do_install() -{ +do_install() { vmkdir usr/bin vmkdir usr/share/man/man1 diff --git a/srcpkgs/glib/patches/pkgconfig-libpcre-static-linking.patch b/srcpkgs/glib/patches/pkgconfig-libpcre-static-linking.patch deleted file mode 100644 index 85ca3596a93..00000000000 --- a/srcpkgs/glib/patches/pkgconfig-libpcre-static-linking.patch +++ /dev/null @@ -1,21 +0,0 @@ -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 8a72c3a6f60..8dd7743aa8d 100644 --- a/srcpkgs/glib/template +++ b/srcpkgs/glib/template @@ -1,16 +1,14 @@ # Template build file for 'glib' pkgname=glib -version=2.30.3 -revision=3 -distfiles="${GNOME_SITE}/glib/2.30/glib-$version.tar.xz" -patch_args="-Np1" -configure_args="--disable-fam --with-pcre=system --enable-static --with-pic=yes" +version=2.31.22 +distfiles="${GNOME_SITE}/glib/2.31/glib-$version.tar.xz" +configure_args="--disable-fam --with-pcre=system --enable-static --with-pic" build_style=gnu-configure short_desc="The GNU library of C routines" maintainer="Juan RP " homepage="http://www.gtk.org/" license="LGPL-2.1" -checksum=e6cbb27c71c445993346e785e8609cc75cea2941e32312e544872feba572dd27 +checksum=0f7dd3f13f23192d78c131bac3fcd8c5e9fe38fd415faa7bfc1d1f178de556d4 long_desc=" GLib is a library containing many useful C routines for things such as trees, hashes, lists and strings. It is a useful general purpose