From b6da5426e6bc9beb4b15ff803671596a4f45581f Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Wed, 21 Sep 2016 10:41:09 +0200 Subject: [PATCH] libgsf: updated to 1.14.40. --- mingw-w64-libgsf/001-win.patch | 76 ---------------------------------- mingw-w64-libgsf/PKGBUILD | 7 +--- 2 files changed, 2 insertions(+), 81 deletions(-) delete mode 100644 mingw-w64-libgsf/001-win.patch diff --git a/mingw-w64-libgsf/001-win.patch b/mingw-w64-libgsf/001-win.patch deleted file mode 100644 index a980dae4b2..0000000000 --- a/mingw-w64-libgsf/001-win.patch +++ /dev/null @@ -1,76 +0,0 @@ ---- ./gsf/Makefile.am.orig 2014-12-15 05:31:48.000000000 +0100 -+++ ./gsf/Makefile.am 2015-03-28 16:52:56.424200300 +0100 -@@ -150,6 +150,8 @@ - - if HAVE_INTROSPECTION - -+INTROSPECTION_SCANNER_ENV = CC="$(CC)" -+ - INTROSPECTION_GIRS += Gsf-1.gir - - Gsf-1.gir: $(INTROSPECTION_SCANNER) libgsf-1.la Makefile ---- ./m4/intltool.m4.orig 2015-02-05 00:40:27.000000000 +0100 -+++ ./m4/intltool.m4 2015-03-28 16:52:56.434201100 +0100 -@@ -155,31 +155,6 @@ - # Substitute ALL_LINGUAS so we can use it in po/Makefile - AC_SUBST(ALL_LINGUAS) - --# Set DATADIRNAME correctly if it is not set yet --# (copied from glib-gettext.m4) --if test -z "$DATADIRNAME"; then -- AC_LINK_IFELSE( -- [AC_LANG_PROGRAM([[]], -- [[extern int _nl_msg_cat_cntr; -- return _nl_msg_cat_cntr]])], -- [DATADIRNAME=share], -- [case $host in -- *-*-solaris*) -- dnl On Solaris, if bind_textdomain_codeset is in libc, -- dnl GNU format message catalog is always supported, -- dnl since both are added to the libc all together. -- dnl Hence, we'd like to go with DATADIRNAME=share -- dnl in this case. -- AC_CHECK_FUNC(bind_textdomain_codeset, -- [DATADIRNAME=share], [DATADIRNAME=lib]) -- ;; -- *) -- [DATADIRNAME=lib] -- ;; -- esac]) --fi --AC_SUBST(DATADIRNAME) -- - IT_PO_SUBDIR([po]) - - ]) ---- ./po/Makefile.in.in.orig 2015-03-28 16:53:16.017219400 +0100 -+++ ./po/Makefile.in.in 2015-03-28 16:53:42.228125500 +0100 -@@ -34,7 +34,7 @@ - datarootdir = @datarootdir@ - libdir = @libdir@ - DATADIRNAME = @DATADIRNAME@ --itlocaledir = $(prefix)/$(DATADIRNAME)/locale -+localedir = @localedir@ - subdir = po - install_sh = @install_sh@ - # Automake >= 1.8 provides @mkdir_p@. -@@ -108,7 +108,7 @@ - install-data-yes: all - linguas="$(USE_LINGUAS)"; \ - for lang in $$linguas; do \ -- dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \ -+ dir=$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \ - $(mkdir_p) $$dir; \ - if test -r $$lang.gmo; then \ - $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ -@@ -142,8 +142,8 @@ - uninstall: - linguas="$(USE_LINGUAS)"; \ - for lang in $$linguas; do \ -- rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \ -- rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \ -+ rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \ -+ rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \ - done - - check: all $(GETTEXT_PACKAGE).pot diff --git a/mingw-w64-libgsf/PKGBUILD b/mingw-w64-libgsf/PKGBUILD index 2b8e07e683..23fc881509 100644 --- a/mingw-w64-libgsf/PKGBUILD +++ b/mingw-w64-libgsf/PKGBUILD @@ -3,7 +3,7 @@ _realname=libgsf pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=1.14.37 +pkgver=1.14.40 pkgrel=1 arch=('any') pkgdesc="An extensible I/O abstraction library for dealing with structured file formats (mingw-w64)" @@ -19,16 +19,13 @@ options=('strip' 'staticlibs') license=("LGPL 2.1") url="https://www.gnome.org/" source=(https://download.gnome.org/sources/${_realname}/${pkgver%.*}/${_realname}-${pkgver}.tar.xz - 001-win.patch 002-get-unix-path-for-git.patch) -sha256sums=('9cfb98224b40fefa85606255ee194d58c38f129bf99443d759eaab7eb6dec055' - 'a6408ee4cca51afb8c910d467d0036c7aa5520e0486366aad47a5a39b5ecdc1b' +sha256sums=('350638894b5e324d8880b50e4bc43daabaf9f3f43a66010af080ffa2d32d51e0' 'f08db8333d2b4a369737a77969b5896d408a4d9992fab6f1c9c44ddeae25c516') prepare() { cd ${_realname}-${pkgver} - patch -b -V simple -p1 -i ${srcdir}/001-win.patch patch -b -V simple -p1 -i ${srcdir}/002-get-unix-path-for-git.patch autoreconf -fiv