[arch-commits] Commit in glib/repos (18 files)
Eric Bélanger
eric at nymeria.archlinux.org
Mon Jul 22 06:31:52 UTC 2013
Date: Monday, July 22, 2013 @ 08:31:51
Author: eric
Revision: 191242
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
glib/repos/extra-i686/PKGBUILD
(from rev 191241, glib/trunk/PKGBUILD)
glib/repos/extra-i686/aclocal-fixes.patch
(from rev 191241, glib/trunk/aclocal-fixes.patch)
glib/repos/extra-i686/gcc340.patch
(from rev 191241, glib/trunk/gcc340.patch)
glib/repos/extra-i686/glib.install
(from rev 191241, glib/trunk/glib.install)
glib/repos/extra-i686/glib1-autotools.patch
(from rev 191241, glib/trunk/glib1-autotools.patch)
glib/repos/extra-x86_64/PKGBUILD
(from rev 191241, glib/trunk/PKGBUILD)
glib/repos/extra-x86_64/aclocal-fixes.patch
(from rev 191241, glib/trunk/aclocal-fixes.patch)
glib/repos/extra-x86_64/gcc340.patch
(from rev 191241, glib/trunk/gcc340.patch)
glib/repos/extra-x86_64/glib.install
(from rev 191241, glib/trunk/glib.install)
glib/repos/extra-x86_64/glib1-autotools.patch
(from rev 191241, glib/trunk/glib1-autotools.patch)
Deleted:
glib/repos/extra-i686/PKGBUILD
glib/repos/extra-i686/aclocal-fixes.patch
glib/repos/extra-i686/gcc340.patch
glib/repos/extra-i686/glib.install
glib/repos/extra-x86_64/PKGBUILD
glib/repos/extra-x86_64/aclocal-fixes.patch
glib/repos/extra-x86_64/gcc340.patch
glib/repos/extra-x86_64/glib.install
------------------------------------+
/PKGBUILD | 100 +++++++++++++++++++++++++++++++++++
/aclocal-fixes.patch | 22 +++++++
/gcc340.patch | 30 ++++++++++
/glib.install | 40 ++++++++++++++
extra-i686/PKGBUILD | 37 ------------
extra-i686/aclocal-fixes.patch | 11 ---
extra-i686/gcc340.patch | 15 -----
extra-i686/glib.install | 20 -------
extra-i686/glib1-autotools.patch | 33 +++++++++++
extra-x86_64/PKGBUILD | 37 ------------
extra-x86_64/aclocal-fixes.patch | 11 ---
extra-x86_64/gcc340.patch | 15 -----
extra-x86_64/glib.install | 20 -------
extra-x86_64/glib1-autotools.patch | 33 +++++++++++
14 files changed, 258 insertions(+), 166 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2013-07-22 06:31:01 UTC (rev 191241)
+++ extra-i686/PKGBUILD 2013-07-22 06:31:51 UTC (rev 191242)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-
-pkgname=glib
-pkgver=1.2.10
-pkgrel=9
-pkgdesc="Common C routines used by Gtk+ and other libs"
-arch=('i686' 'x86_64')
-url="http://www.gtk.org/"
-license=('LGPL')
-depends=('glibc')
-options=('!libtool')
-install=glib.install
-source=(ftp://ftp.gtk.org/pub/gtk/v1.2/${pkgname}-${pkgver}.tar.gz \
- gcc340.patch aclocal-fixes.patch)
-md5sums=('6fe30dad87c77b91b632def29dd69ef9'
- '877b3330e822a4be69a0f8a8c268cfd7'
- 'e52c4b88427b9785bb8049dbdc9ff6fb')
-sha1sums=('e5a9361c594608d152d5d9650154c2e3260b87fa'
- 'a2cc224a66aeffdcac16ebd9e8af18143cf54918'
- 'ae4438cf56c0c9264ee36f6973fb445f9a820be0')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -Np1 -i ../gcc340.patch
- patch -Np0 -i ../aclocal-fixes.patch
-
- [ "$CARCH" = 'x86_64' ] && CONFIGFLAG='--host=x86_64-unknown-linux-gnu --target=x86_64-unknown-linux-gnu'
- ./configure --prefix=/usr --mandir=/usr/share/man \
- --infodir=/usr/share/info $CONFIGFLAG
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
Copied: glib/repos/extra-i686/PKGBUILD (from rev 191241, glib/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2013-07-22 06:31:51 UTC (rev 191242)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=glib
+pkgver=1.2.10
+pkgrel=10
+pkgdesc="Common C routines used by Gtk+ and other libs"
+arch=('i686' 'x86_64')
+url="http://www.gtk.org/"
+license=('LGPL')
+depends=('glibc' 'sh')
+options=('!libtool' '!makeflags')
+install=glib.install
+source=(ftp://ftp.gtk.org/pub/gtk/v1.2/${pkgname}-${pkgver}.tar.gz
+ gcc340.patch aclocal-fixes.patch glib1-autotools.patch)
+sha1sums=('e5a9361c594608d152d5d9650154c2e3260b87fa'
+ 'a2cc224a66aeffdcac16ebd9e8af18143cf54918'
+ 'ae4438cf56c0c9264ee36f6973fb445f9a820be0'
+ '8a25fde3c79567262b3024f4e74c9ca4ee8a6279')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ patch -Np1 -i "${srcdir}/gcc340.patch"
+ patch -Np0 -i "${srcdir}/aclocal-fixes.patch"
+ patch -Np1 -i "${srcdir}/glib1-autotools.patch"
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ if [[ $CARCH = "i686" ]]; then
+ CONFIGFLAG='--host=i686-pc-linux-gnu --target=i686-pc-linux-gnu'
+ elif [[ $CARCH = "x86_64" ]]; then
+ CONFIGFLAG='--host=x86_64-unknown-linux-gnu --target=x86_64-unknown-linux-gnu'
+ fi
+
+ autoreconf --force --install
+ ./configure --prefix=/usr --mandir=/usr/share/man \
+ --infodir=/usr/share/info $CONFIGFLAG
+ make
+}
+
+check() {
+ cd ${pkgname}-${pkgver}
+ make check
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+}
Deleted: extra-i686/aclocal-fixes.patch
===================================================================
--- extra-i686/aclocal-fixes.patch 2013-07-22 06:31:01 UTC (rev 191241)
+++ extra-i686/aclocal-fixes.patch 2013-07-22 06:31:51 UTC (rev 191242)
@@ -1,11 +0,0 @@
---- glib.m4.orig 2006-03-05 13:13:24.000000000 +0000
-+++ glib.m4 2006-03-05 13:13:35.000000000 +0000
-@@ -5,7 +5,7 @@
- dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or
- dnl gthread is specified in MODULES, pass to glib-config
- dnl
--AC_DEFUN(AM_PATH_GLIB,
-+AC_DEFUN([AM_PATH_GLIB],
- [dnl
- dnl Get the cflags and libraries from the glib-config script
- dnl
Copied: glib/repos/extra-i686/aclocal-fixes.patch (from rev 191241, glib/trunk/aclocal-fixes.patch)
===================================================================
--- extra-i686/aclocal-fixes.patch (rev 0)
+++ extra-i686/aclocal-fixes.patch 2013-07-22 06:31:51 UTC (rev 191242)
@@ -0,0 +1,11 @@
+--- glib.m4.orig 2006-03-05 13:13:24.000000000 +0000
++++ glib.m4 2006-03-05 13:13:35.000000000 +0000
+@@ -5,7 +5,7 @@
+ dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or
+ dnl gthread is specified in MODULES, pass to glib-config
+ dnl
+-AC_DEFUN(AM_PATH_GLIB,
++AC_DEFUN([AM_PATH_GLIB],
+ [dnl
+ dnl Get the cflags and libraries from the glib-config script
+ dnl
Deleted: extra-i686/gcc340.patch
===================================================================
--- extra-i686/gcc340.patch 2013-07-22 06:31:01 UTC (rev 191241)
+++ extra-i686/gcc340.patch 2013-07-22 06:31:51 UTC (rev 191242)
@@ -1,15 +0,0 @@
-diff -Naur glib-1.2.10.orig/glib.h glib-1.2.10/glib.h
---- glib-1.2.10.orig/glib.h 2001-02-27 04:44:38.000000000 +0100
-+++ glib-1.2.10/glib.h 2004-05-27 15:50:32.436527848 +0200
-@@ -271,8 +271,10 @@
-
- /* Wrap the gcc __PRETTY_FUNCTION__ and __FUNCTION__ variables with
- * macros, so we can refer to them as strings unconditionally.
-+ *
-+ * Unfortunately these are _not_ treated as strings anymore in GCC3.4.
- */
--#ifdef __GNUC__
-+#if defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ < 4)
- #define G_GNUC_FUNCTION __FUNCTION__
- #define G_GNUC_PRETTY_FUNCTION __PRETTY_FUNCTION__
- #else /* !__GNUC__ */
Copied: glib/repos/extra-i686/gcc340.patch (from rev 191241, glib/trunk/gcc340.patch)
===================================================================
--- extra-i686/gcc340.patch (rev 0)
+++ extra-i686/gcc340.patch 2013-07-22 06:31:51 UTC (rev 191242)
@@ -0,0 +1,15 @@
+diff -Naur glib-1.2.10.orig/glib.h glib-1.2.10/glib.h
+--- glib-1.2.10.orig/glib.h 2001-02-27 04:44:38.000000000 +0100
++++ glib-1.2.10/glib.h 2004-05-27 15:50:32.436527848 +0200
+@@ -271,8 +271,10 @@
+
+ /* Wrap the gcc __PRETTY_FUNCTION__ and __FUNCTION__ variables with
+ * macros, so we can refer to them as strings unconditionally.
++ *
++ * Unfortunately these are _not_ treated as strings anymore in GCC3.4.
+ */
+-#ifdef __GNUC__
++#if defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ < 4)
+ #define G_GNUC_FUNCTION __FUNCTION__
+ #define G_GNUC_PRETTY_FUNCTION __PRETTY_FUNCTION__
+ #else /* !__GNUC__ */
Deleted: extra-i686/glib.install
===================================================================
--- extra-i686/glib.install 2013-07-22 06:31:01 UTC (rev 191241)
+++ extra-i686/glib.install 2013-07-22 06:31:51 UTC (rev 191242)
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(glib.info.gz)
-
-post_install() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info $infodir/$file $infodir/dir 2> /dev/null
- done
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info --delete $infodir/$file $infodir/dir 2> /dev/null
- done
-}
Copied: glib/repos/extra-i686/glib.install (from rev 191241, glib/trunk/glib.install)
===================================================================
--- extra-i686/glib.install (rev 0)
+++ extra-i686/glib.install 2013-07-22 06:31:51 UTC (rev 191242)
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(glib.info.gz)
+
+post_install() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+ install-info $infodir/$file $infodir/dir 2> /dev/null
+ done
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+ install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+ done
+}
Copied: glib/repos/extra-i686/glib1-autotools.patch (from rev 191241, glib/trunk/glib1-autotools.patch)
===================================================================
--- extra-i686/glib1-autotools.patch (rev 0)
+++ extra-i686/glib1-autotools.patch 2013-07-22 06:31:51 UTC (rev 191242)
@@ -0,0 +1,33 @@
+diff -Naur glib-1.2.10-orig/configure.in glib-1.2.10/configure.in
+--- glib-1.2.10-orig/configure.in 2013-07-22 01:33:26.930091236 -0400
++++ glib-1.2.10/configure.in 2013-07-22 01:35:19.988776415 -0400
+@@ -17,7 +17,7 @@
+
+ dnl we need to AC_DIVERT_PUSH/AC_DIVERT_POP these variable definitions so they
+ dnl are available for $ac_help expansion (don't we all *love* autoconf?)
+-AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
++AC_DIVERT_PUSH()dnl
+ #
+ # The following version number definitions apply to GLib, GModule and GThread
+ # as a whole, so if changes occoured in any of them, they are all
+@@ -81,7 +81,7 @@
+
+ dnl figure debugging default, prior to $ac_help setup
+ dnl
+-AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
++AC_DIVERT_PUSH()dnl
+ if test `expr $GLIB_MINOR_VERSION \% 2` = 1 ; then
+ debug_default=yes
+ else
+diff -Naur glib-1.2.10-orig/gmodule/Makefile.am glib-1.2.10/gmodule/Makefile.am
+--- glib-1.2.10-orig/gmodule/Makefile.am 2013-07-22 01:33:26.933424531 -0400
++++ glib-1.2.10/gmodule/Makefile.am 2013-07-22 01:38:46.553041607 -0400
+@@ -42,7 +42,7 @@
+ libgplugin_b_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
+
+ noinst_PROGRAMS = testgmodule
+-testgmodule_LDFLAGS += @G_MODULE_LDFLAGS@
++testgmodule_LDFLAGS = @G_MODULE_LDFLAGS@
+ testgmodule_LDADD = libgmodule.la $(libglib) @G_MODULE_LIBS@
+
+ .PHONY: files release
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2013-07-22 06:31:01 UTC (rev 191241)
+++ extra-x86_64/PKGBUILD 2013-07-22 06:31:51 UTC (rev 191242)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-
-pkgname=glib
-pkgver=1.2.10
-pkgrel=9
-pkgdesc="Common C routines used by Gtk+ and other libs"
-arch=('i686' 'x86_64')
-url="http://www.gtk.org/"
-license=('LGPL')
-depends=('glibc')
-options=('!libtool')
-install=glib.install
-source=(ftp://ftp.gtk.org/pub/gtk/v1.2/${pkgname}-${pkgver}.tar.gz \
- gcc340.patch aclocal-fixes.patch)
-md5sums=('6fe30dad87c77b91b632def29dd69ef9'
- '877b3330e822a4be69a0f8a8c268cfd7'
- 'e52c4b88427b9785bb8049dbdc9ff6fb')
-sha1sums=('e5a9361c594608d152d5d9650154c2e3260b87fa'
- 'a2cc224a66aeffdcac16ebd9e8af18143cf54918'
- 'ae4438cf56c0c9264ee36f6973fb445f9a820be0')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -Np1 -i ../gcc340.patch
- patch -Np0 -i ../aclocal-fixes.patch
-
- [ "$CARCH" = 'x86_64' ] && CONFIGFLAG='--host=x86_64-unknown-linux-gnu --target=x86_64-unknown-linux-gnu'
- ./configure --prefix=/usr --mandir=/usr/share/man \
- --infodir=/usr/share/info $CONFIGFLAG
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
Copied: glib/repos/extra-x86_64/PKGBUILD (from rev 191241, glib/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2013-07-22 06:31:51 UTC (rev 191242)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=glib
+pkgver=1.2.10
+pkgrel=10
+pkgdesc="Common C routines used by Gtk+ and other libs"
+arch=('i686' 'x86_64')
+url="http://www.gtk.org/"
+license=('LGPL')
+depends=('glibc' 'sh')
+options=('!libtool' '!makeflags')
+install=glib.install
+source=(ftp://ftp.gtk.org/pub/gtk/v1.2/${pkgname}-${pkgver}.tar.gz
+ gcc340.patch aclocal-fixes.patch glib1-autotools.patch)
+sha1sums=('e5a9361c594608d152d5d9650154c2e3260b87fa'
+ 'a2cc224a66aeffdcac16ebd9e8af18143cf54918'
+ 'ae4438cf56c0c9264ee36f6973fb445f9a820be0'
+ '8a25fde3c79567262b3024f4e74c9ca4ee8a6279')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ patch -Np1 -i "${srcdir}/gcc340.patch"
+ patch -Np0 -i "${srcdir}/aclocal-fixes.patch"
+ patch -Np1 -i "${srcdir}/glib1-autotools.patch"
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ if [[ $CARCH = "i686" ]]; then
+ CONFIGFLAG='--host=i686-pc-linux-gnu --target=i686-pc-linux-gnu'
+ elif [[ $CARCH = "x86_64" ]]; then
+ CONFIGFLAG='--host=x86_64-unknown-linux-gnu --target=x86_64-unknown-linux-gnu'
+ fi
+
+ autoreconf --force --install
+ ./configure --prefix=/usr --mandir=/usr/share/man \
+ --infodir=/usr/share/info $CONFIGFLAG
+ make
+}
+
+check() {
+ cd ${pkgname}-${pkgver}
+ make check
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+}
Deleted: extra-x86_64/aclocal-fixes.patch
===================================================================
--- extra-x86_64/aclocal-fixes.patch 2013-07-22 06:31:01 UTC (rev 191241)
+++ extra-x86_64/aclocal-fixes.patch 2013-07-22 06:31:51 UTC (rev 191242)
@@ -1,11 +0,0 @@
---- glib.m4.orig 2006-03-05 13:13:24.000000000 +0000
-+++ glib.m4 2006-03-05 13:13:35.000000000 +0000
-@@ -5,7 +5,7 @@
- dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or
- dnl gthread is specified in MODULES, pass to glib-config
- dnl
--AC_DEFUN(AM_PATH_GLIB,
-+AC_DEFUN([AM_PATH_GLIB],
- [dnl
- dnl Get the cflags and libraries from the glib-config script
- dnl
Copied: glib/repos/extra-x86_64/aclocal-fixes.patch (from rev 191241, glib/trunk/aclocal-fixes.patch)
===================================================================
--- extra-x86_64/aclocal-fixes.patch (rev 0)
+++ extra-x86_64/aclocal-fixes.patch 2013-07-22 06:31:51 UTC (rev 191242)
@@ -0,0 +1,11 @@
+--- glib.m4.orig 2006-03-05 13:13:24.000000000 +0000
++++ glib.m4 2006-03-05 13:13:35.000000000 +0000
+@@ -5,7 +5,7 @@
+ dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or
+ dnl gthread is specified in MODULES, pass to glib-config
+ dnl
+-AC_DEFUN(AM_PATH_GLIB,
++AC_DEFUN([AM_PATH_GLIB],
+ [dnl
+ dnl Get the cflags and libraries from the glib-config script
+ dnl
Deleted: extra-x86_64/gcc340.patch
===================================================================
--- extra-x86_64/gcc340.patch 2013-07-22 06:31:01 UTC (rev 191241)
+++ extra-x86_64/gcc340.patch 2013-07-22 06:31:51 UTC (rev 191242)
@@ -1,15 +0,0 @@
-diff -Naur glib-1.2.10.orig/glib.h glib-1.2.10/glib.h
---- glib-1.2.10.orig/glib.h 2001-02-27 04:44:38.000000000 +0100
-+++ glib-1.2.10/glib.h 2004-05-27 15:50:32.436527848 +0200
-@@ -271,8 +271,10 @@
-
- /* Wrap the gcc __PRETTY_FUNCTION__ and __FUNCTION__ variables with
- * macros, so we can refer to them as strings unconditionally.
-+ *
-+ * Unfortunately these are _not_ treated as strings anymore in GCC3.4.
- */
--#ifdef __GNUC__
-+#if defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ < 4)
- #define G_GNUC_FUNCTION __FUNCTION__
- #define G_GNUC_PRETTY_FUNCTION __PRETTY_FUNCTION__
- #else /* !__GNUC__ */
Copied: glib/repos/extra-x86_64/gcc340.patch (from rev 191241, glib/trunk/gcc340.patch)
===================================================================
--- extra-x86_64/gcc340.patch (rev 0)
+++ extra-x86_64/gcc340.patch 2013-07-22 06:31:51 UTC (rev 191242)
@@ -0,0 +1,15 @@
+diff -Naur glib-1.2.10.orig/glib.h glib-1.2.10/glib.h
+--- glib-1.2.10.orig/glib.h 2001-02-27 04:44:38.000000000 +0100
++++ glib-1.2.10/glib.h 2004-05-27 15:50:32.436527848 +0200
+@@ -271,8 +271,10 @@
+
+ /* Wrap the gcc __PRETTY_FUNCTION__ and __FUNCTION__ variables with
+ * macros, so we can refer to them as strings unconditionally.
++ *
++ * Unfortunately these are _not_ treated as strings anymore in GCC3.4.
+ */
+-#ifdef __GNUC__
++#if defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ < 4)
+ #define G_GNUC_FUNCTION __FUNCTION__
+ #define G_GNUC_PRETTY_FUNCTION __PRETTY_FUNCTION__
+ #else /* !__GNUC__ */
Deleted: extra-x86_64/glib.install
===================================================================
--- extra-x86_64/glib.install 2013-07-22 06:31:01 UTC (rev 191241)
+++ extra-x86_64/glib.install 2013-07-22 06:31:51 UTC (rev 191242)
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(glib.info.gz)
-
-post_install() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info $infodir/$file $infodir/dir 2> /dev/null
- done
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info --delete $infodir/$file $infodir/dir 2> /dev/null
- done
-}
Copied: glib/repos/extra-x86_64/glib.install (from rev 191241, glib/trunk/glib.install)
===================================================================
--- extra-x86_64/glib.install (rev 0)
+++ extra-x86_64/glib.install 2013-07-22 06:31:51 UTC (rev 191242)
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(glib.info.gz)
+
+post_install() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+ install-info $infodir/$file $infodir/dir 2> /dev/null
+ done
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+ install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+ done
+}
Copied: glib/repos/extra-x86_64/glib1-autotools.patch (from rev 191241, glib/trunk/glib1-autotools.patch)
===================================================================
--- extra-x86_64/glib1-autotools.patch (rev 0)
+++ extra-x86_64/glib1-autotools.patch 2013-07-22 06:31:51 UTC (rev 191242)
@@ -0,0 +1,33 @@
+diff -Naur glib-1.2.10-orig/configure.in glib-1.2.10/configure.in
+--- glib-1.2.10-orig/configure.in 2013-07-22 01:33:26.930091236 -0400
++++ glib-1.2.10/configure.in 2013-07-22 01:35:19.988776415 -0400
+@@ -17,7 +17,7 @@
+
+ dnl we need to AC_DIVERT_PUSH/AC_DIVERT_POP these variable definitions so they
+ dnl are available for $ac_help expansion (don't we all *love* autoconf?)
+-AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
++AC_DIVERT_PUSH()dnl
+ #
+ # The following version number definitions apply to GLib, GModule and GThread
+ # as a whole, so if changes occoured in any of them, they are all
+@@ -81,7 +81,7 @@
+
+ dnl figure debugging default, prior to $ac_help setup
+ dnl
+-AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
++AC_DIVERT_PUSH()dnl
+ if test `expr $GLIB_MINOR_VERSION \% 2` = 1 ; then
+ debug_default=yes
+ else
+diff -Naur glib-1.2.10-orig/gmodule/Makefile.am glib-1.2.10/gmodule/Makefile.am
+--- glib-1.2.10-orig/gmodule/Makefile.am 2013-07-22 01:33:26.933424531 -0400
++++ glib-1.2.10/gmodule/Makefile.am 2013-07-22 01:38:46.553041607 -0400
+@@ -42,7 +42,7 @@
+ libgplugin_b_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
+
+ noinst_PROGRAMS = testgmodule
+-testgmodule_LDFLAGS += @G_MODULE_LDFLAGS@
++testgmodule_LDFLAGS = @G_MODULE_LDFLAGS@
+ testgmodule_LDADD = libgmodule.la $(libglib) @G_MODULE_LIBS@
+
+ .PHONY: files release
More information about the arch-commits
mailing list