diff options
-rw-r--r-- | .SRCINFO | 6 | ||||
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | PKGBUILD | 9 | ||||
-rw-r--r-- | use-pkgconfig-file-for-intl.patch | 23 |
4 files changed, 34 insertions, 5 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Sat May 14 07:18:25 UTC 2016 +# Sat Aug 13 19:10:49 UTC 2016 pkgbase = mingw-w64-glib2 pkgdesc = Common C routines used by GTK+ and other libs (mingw-w64) pkgver = 2.48.1 - pkgrel = 1 + pkgrel = 2 url = http://www.gtk.org/ arch = any license = LGPL @@ -25,6 +25,7 @@ pkgbase = mingw-w64-glib2 source = 0027-no_sys_if_nametoindex.patch source = 0028-inode_directory.patch source = revert-warn-glib-compile-schemas.patch + source = use-pkgconfig-file-for-intl.patch sha256sums = 74411bff489cb2a3527bac743a51018841a56a4d896cc1e0d0d54f8166a14612 sha256sums = ef81e82e15fb3a71bad770be17fe4fea3f4d9cdee238d6caa39807eeea5da3e3 sha256sums = 1b24cc928f69f73599f83269a7b3eb7bf7efbe114109251e6765053a1e1f4cd6 @@ -32,6 +33,7 @@ pkgbase = mingw-w64-glib2 sha256sums = 5cb481295ff86c2802030984d8b2bf6a3b1dcd5e5fe7b0be68b22d9116305837 sha256sums = f7f06a90156fe0a308412512c359072922f7f0d19dd4bed30d863db18e48940b sha256sums = 049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97 + sha256sums = 1991eaa0471ff8d0b3dd3bccccd560ca6cc8c0995c6145b9bc93d5e90755e3f4 pkgname = mingw-w64-glib2 diff --git a/.gitignore b/.gitignore index f46de972b6fc..436a59477780 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ pkg/ src/ +*.tar *.xz @@ -3,7 +3,7 @@ # Contributor: Renato Silva <br.renatosilva@gmail.com> pkgname=mingw-w64-glib2 pkgver=2.48.1 -pkgrel=1 +pkgrel=2 arch=(any) pkgdesc="Common C routines used by GTK+ and other libs (mingw-w64)" depends=(mingw-w64-gettext mingw-w64-zlib mingw-w64-libffi mingw-w64-pcre mingw-w64-freetype2) @@ -17,14 +17,16 @@ source=("http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-$pkgver.t "0004-glib-prefer-constructors-over-DllMain.patch" "0027-no_sys_if_nametoindex.patch" "0028-inode_directory.patch" -"revert-warn-glib-compile-schemas.patch") +"revert-warn-glib-compile-schemas.patch" +"use-pkgconfig-file-for-intl.patch") sha256sums=('74411bff489cb2a3527bac743a51018841a56a4d896cc1e0d0d54f8166a14612' 'ef81e82e15fb3a71bad770be17fe4fea3f4d9cdee238d6caa39807eeea5da3e3' '1b24cc928f69f73599f83269a7b3eb7bf7efbe114109251e6765053a1e1f4cd6' '7b099af0c562f397458542482d6d1debe437f220762aa2ed94b2e6c4d43dd8a6' '5cb481295ff86c2802030984d8b2bf6a3b1dcd5e5fe7b0be68b22d9116305837' 'f7f06a90156fe0a308412512c359072922f7f0d19dd4bed30d863db18e48940b' - '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97') + '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97' + '1991eaa0471ff8d0b3dd3bccccd560ca6cc8c0995c6145b9bc93d5e90755e3f4') _architectures="i686-w64-mingw32 x86_64-w64-mingw32" @@ -36,6 +38,7 @@ prepare() { patch -Np1 -i ../"0027-no_sys_if_nametoindex.patch" patch -Np1 -i ../"0028-inode_directory.patch" patch -Rp1 -i ../revert-warn-glib-compile-schemas.patch + patch -p0 -i ../use-pkgconfig-file-for-intl.patch NOCONFIGURE=1 ./autogen.sh } diff --git a/use-pkgconfig-file-for-intl.patch b/use-pkgconfig-file-for-intl.patch new file mode 100644 index 000000000000..7ef25451d320 --- /dev/null +++ b/use-pkgconfig-file-for-intl.patch @@ -0,0 +1,23 @@ +--- glib-2.0.pc.in.orig 2015-03-23 04:22:18.000000000 +0100 ++++ glib-2.0.pc.in 2016-08-12 21:31:44.654422794 +0200 +@@ -10,7 +10,8 @@ + Name: GLib + Description: C Utility Library + Version: @VERSION@ +-Requires.private: @PCRE_REQUIRES@ ++Requires: @INTL_REQUIRES@ ++Requires.private: @PCRE_REQUIRES@ @INTL_REQUIRES@ + Libs: -L${libdir} -lglib-2.0 @INTLLIBS@ + Libs.private: @G_THREAD_LIBS@ @G_LIBS_EXTRA@ @PCRE_LIBS@ @INTLLIBS@ @ICONV_LIBS@ @CARBON_LIBS@ @COCOA_LIBS@ + Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include @GLIB_EXTRA_CFLAGS@ +--- configure.ac.orig 2016-05-10 11:05:39.000000000 +0200 ++++ configure.ac 2016-08-12 21:39:53.980926453 +0200 +@@ -472,6 +472,8 @@ + fi + + LIBS="$INTLLIBS $LIBS" ++INTL_REQUIRES=intl ++AC_SUBST(INTL_REQUIRES) + + GETTEXT_PACKAGE=glib20 + AC_SUBST(GETTEXT_PACKAGE) |