[arch-commits] Commit in libgnome/repos (10 files)
Jan de Groot
jgc at nymeria.archlinux.org
Mon Apr 28 08:26:10 UTC 2014
Date: Monday, April 28, 2014 @ 10:26:09
Author: jgc
Revision: 211849
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
libgnome/repos/extra-i686/0001-Don-t-use-G_DISABLE_DEPRECATED.patch
(from rev 211848, libgnome/trunk/0001-Don-t-use-G_DISABLE_DEPRECATED.patch)
libgnome/repos/extra-i686/PKGBUILD
(from rev 211848, libgnome/trunk/PKGBUILD)
libgnome/repos/extra-i686/libgnome.install
(from rev 211848, libgnome/trunk/libgnome.install)
libgnome/repos/extra-x86_64/0001-Don-t-use-G_DISABLE_DEPRECATED.patch
(from rev 211848, libgnome/trunk/0001-Don-t-use-G_DISABLE_DEPRECATED.patch)
libgnome/repos/extra-x86_64/PKGBUILD
(from rev 211848, libgnome/trunk/PKGBUILD)
libgnome/repos/extra-x86_64/libgnome.install
(from rev 211848, libgnome/trunk/libgnome.install)
Deleted:
libgnome/repos/extra-i686/PKGBUILD
libgnome/repos/extra-i686/libgnome.install
libgnome/repos/extra-x86_64/PKGBUILD
libgnome/repos/extra-x86_64/libgnome.install
--------------------------------------------------------+
/PKGBUILD | 112 +++++++++++++++
/libgnome.install | 34 ++++
extra-i686/0001-Don-t-use-G_DISABLE_DEPRECATED.patch | 26 +++
extra-i686/PKGBUILD | 49 ------
extra-i686/libgnome.install | 17 --
extra-x86_64/0001-Don-t-use-G_DISABLE_DEPRECATED.patch | 26 +++
extra-x86_64/PKGBUILD | 49 ------
extra-x86_64/libgnome.install | 17 --
8 files changed, 198 insertions(+), 132 deletions(-)
Copied: libgnome/repos/extra-i686/0001-Don-t-use-G_DISABLE_DEPRECATED.patch (from rev 211848, libgnome/trunk/0001-Don-t-use-G_DISABLE_DEPRECATED.patch)
===================================================================
--- extra-i686/0001-Don-t-use-G_DISABLE_DEPRECATED.patch (rev 0)
+++ extra-i686/0001-Don-t-use-G_DISABLE_DEPRECATED.patch 2014-04-28 08:26:09 UTC (rev 211849)
@@ -0,0 +1,26 @@
+From 64a0443e26a50745c8fdc02eddf60985a977275f Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters at verbum.org>
+Date: Thu, 2 May 2013 17:58:00 -0400
+Subject: [PATCH] Don't use G_DISABLE_DEPRECATED
+
+Because really, no one cares about this code, we're not going to
+stay on the GLib treadmill.
+---
+ libgnome/Makefile.am | 1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/libgnome/Makefile.am b/libgnome/Makefile.am
+index 9c8cd3e..aa01f6c 100644
+--- a/libgnome/Makefile.am
++++ b/libgnome/Makefile.am
+@@ -17,7 +17,6 @@ INCLUDES = \
+ -I$(srcdir)/.. \
+ $(WARN_CFLAGS) \
+ $(LIBGNOME_CFLAGS) \
+- -DG_DISABLE_DEPRECATED \
+ -DLIBGNOME_PREFIX=\""$(prefix)"\" \
+ -DLIBGNOME_LIBDIR=\""$(libdir)"\" \
+ -DLIBGNOME_DATADIR=\""$(datadir)"\" \
+--
+1.7.1
+
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2014-04-28 08:25:48 UTC (rev 211848)
+++ extra-i686/PKGBUILD 2014-04-28 08:26:09 UTC (rev 211849)
@@ -1,49 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgbase=libgnome
-pkgname=('libgnome' 'libgnome-data')
-pkgver=2.32.1
-pkgrel=4
-arch=('i686' 'x86_64')
-license=('LGPL')
-makedepends=('intltool' 'gnome-vfs' 'libbonobo' 'gconf' 'gvfs' 'libcanberra')
-options=('!emptydirs')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/2.32/${pkgbase}-${pkgver}.tar.bz2)
-sha256sums=('b2c63916866485793b87398266dd7778548c1734923c272a94d84ee011b6f7a4')
-
-build() {
- cd "${srcdir}/${pkgbase}-${pkgver}"
-
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-static --disable-esd
- make
-}
-
-package_libgnome() {
- pkgdesc="Common libraries for GNOME"
- depends=("libgnome-data=${pkgver}" 'gnome-vfs' 'libbonobo' 'gconf' 'gvfs' 'libcanberra')
-
- cd "${srcdir}/${pkgbase}-${pkgver}"
-
- make -C libgnome DESTDIR="${pkgdir}" install
- make -C monikers DESTDIR="${pkgdir}" install
-}
-
-package_libgnome-data() {
- pkgdesc="Common data from libgnome"
- depends=('gconf')
- install=libgnome.install
-
- cd "${srcdir}/${pkgbase}-${pkgver}"
-
- for dir in doc gnome-data po schemas
- do
- make -C $dir GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
- done
-
- install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
- gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgbase}.schemas" --domain libgnome-2.0 ${pkgdir}/etc/gconf/schemas/*.schemas
- rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
Copied: libgnome/repos/extra-i686/PKGBUILD (from rev 211848, libgnome/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2014-04-28 08:26:09 UTC (rev 211849)
@@ -0,0 +1,56 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgbase=libgnome
+pkgname=('libgnome' 'libgnome-data')
+pkgver=2.32.1
+pkgrel=5
+arch=('i686' 'x86_64')
+license=('LGPL')
+makedepends=('intltool' 'gnome-vfs' 'libbonobo' 'gconf' 'gvfs' 'libcanberra')
+options=('!emptydirs')
+url="http://www.gnome.org"
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/2.32/${pkgbase}-${pkgver}.tar.bz2
+ 0001-Don-t-use-G_DISABLE_DEPRECATED.patch)
+sha256sums=('b2c63916866485793b87398266dd7778548c1734923c272a94d84ee011b6f7a4'
+ 'c2521ed5985159b33a0a5bf53b89012abd9521391fc8ce4c9c73289ca18eb147')
+
+prepare() {
+ cd $pkgbase-$pkgver
+ patch -Np1 -i ../0001-Don-t-use-G_DISABLE_DEPRECATED.patch
+}
+
+build() {
+ cd $pkgbase-$pkgver
+ autoreconf -fi
+ ./configure --prefix=/usr --sysconfdir=/etc \
+ --localstatedir=/var --disable-static --disable-esd
+ make
+}
+
+package_libgnome() {
+ pkgdesc="Common libraries for GNOME"
+ depends=("libgnome-data=${pkgver}" 'gnome-vfs' 'libbonobo' 'gconf' 'gvfs' 'libcanberra')
+
+ cd $pkgbase-$pkgver
+
+ make -C libgnome DESTDIR="${pkgdir}" install
+ make -C monikers DESTDIR="${pkgdir}" install
+}
+
+package_libgnome-data() {
+ pkgdesc="Common data from libgnome"
+ depends=('gconf')
+ install=libgnome.install
+
+ cd $pkgbase-$pkgver
+
+ for dir in doc gnome-data po schemas
+ do
+ make -C $dir GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
+ done
+
+ install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
+ gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgbase}.schemas" --domain libgnome-2.0 ${pkgdir}/etc/gconf/schemas/*.schemas
+ rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas
+}
Deleted: extra-i686/libgnome.install
===================================================================
--- extra-i686/libgnome.install 2014-04-28 08:25:48 UTC (rev 211848)
+++ extra-i686/libgnome.install 2014-04-28 08:26:09 UTC (rev 211849)
@@ -1,17 +0,0 @@
-pkgname=libgnome
-
-post_install() {
- usr/sbin/gconfpkg --install ${pkgname}
-}
-
-pre_upgrade() {
- pre_remove $1
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- usr/sbin/gconfpkg --uninstall ${pkgname}
-}
Copied: libgnome/repos/extra-i686/libgnome.install (from rev 211848, libgnome/trunk/libgnome.install)
===================================================================
--- extra-i686/libgnome.install (rev 0)
+++ extra-i686/libgnome.install 2014-04-28 08:26:09 UTC (rev 211849)
@@ -0,0 +1,17 @@
+pkgname=libgnome
+
+post_install() {
+ usr/sbin/gconfpkg --install ${pkgname}
+}
+
+pre_upgrade() {
+ pre_remove $1
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ usr/sbin/gconfpkg --uninstall ${pkgname}
+}
Copied: libgnome/repos/extra-x86_64/0001-Don-t-use-G_DISABLE_DEPRECATED.patch (from rev 211848, libgnome/trunk/0001-Don-t-use-G_DISABLE_DEPRECATED.patch)
===================================================================
--- extra-x86_64/0001-Don-t-use-G_DISABLE_DEPRECATED.patch (rev 0)
+++ extra-x86_64/0001-Don-t-use-G_DISABLE_DEPRECATED.patch 2014-04-28 08:26:09 UTC (rev 211849)
@@ -0,0 +1,26 @@
+From 64a0443e26a50745c8fdc02eddf60985a977275f Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters at verbum.org>
+Date: Thu, 2 May 2013 17:58:00 -0400
+Subject: [PATCH] Don't use G_DISABLE_DEPRECATED
+
+Because really, no one cares about this code, we're not going to
+stay on the GLib treadmill.
+---
+ libgnome/Makefile.am | 1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/libgnome/Makefile.am b/libgnome/Makefile.am
+index 9c8cd3e..aa01f6c 100644
+--- a/libgnome/Makefile.am
++++ b/libgnome/Makefile.am
+@@ -17,7 +17,6 @@ INCLUDES = \
+ -I$(srcdir)/.. \
+ $(WARN_CFLAGS) \
+ $(LIBGNOME_CFLAGS) \
+- -DG_DISABLE_DEPRECATED \
+ -DLIBGNOME_PREFIX=\""$(prefix)"\" \
+ -DLIBGNOME_LIBDIR=\""$(libdir)"\" \
+ -DLIBGNOME_DATADIR=\""$(datadir)"\" \
+--
+1.7.1
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2014-04-28 08:25:48 UTC (rev 211848)
+++ extra-x86_64/PKGBUILD 2014-04-28 08:26:09 UTC (rev 211849)
@@ -1,49 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgbase=libgnome
-pkgname=('libgnome' 'libgnome-data')
-pkgver=2.32.1
-pkgrel=4
-arch=('i686' 'x86_64')
-license=('LGPL')
-makedepends=('intltool' 'gnome-vfs' 'libbonobo' 'gconf' 'gvfs' 'libcanberra')
-options=('!emptydirs')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/2.32/${pkgbase}-${pkgver}.tar.bz2)
-sha256sums=('b2c63916866485793b87398266dd7778548c1734923c272a94d84ee011b6f7a4')
-
-build() {
- cd "${srcdir}/${pkgbase}-${pkgver}"
-
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-static --disable-esd
- make
-}
-
-package_libgnome() {
- pkgdesc="Common libraries for GNOME"
- depends=("libgnome-data=${pkgver}" 'gnome-vfs' 'libbonobo' 'gconf' 'gvfs' 'libcanberra')
-
- cd "${srcdir}/${pkgbase}-${pkgver}"
-
- make -C libgnome DESTDIR="${pkgdir}" install
- make -C monikers DESTDIR="${pkgdir}" install
-}
-
-package_libgnome-data() {
- pkgdesc="Common data from libgnome"
- depends=('gconf')
- install=libgnome.install
-
- cd "${srcdir}/${pkgbase}-${pkgver}"
-
- for dir in doc gnome-data po schemas
- do
- make -C $dir GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
- done
-
- install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
- gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgbase}.schemas" --domain libgnome-2.0 ${pkgdir}/etc/gconf/schemas/*.schemas
- rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
Copied: libgnome/repos/extra-x86_64/PKGBUILD (from rev 211848, libgnome/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2014-04-28 08:26:09 UTC (rev 211849)
@@ -0,0 +1,56 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgbase=libgnome
+pkgname=('libgnome' 'libgnome-data')
+pkgver=2.32.1
+pkgrel=5
+arch=('i686' 'x86_64')
+license=('LGPL')
+makedepends=('intltool' 'gnome-vfs' 'libbonobo' 'gconf' 'gvfs' 'libcanberra')
+options=('!emptydirs')
+url="http://www.gnome.org"
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/2.32/${pkgbase}-${pkgver}.tar.bz2
+ 0001-Don-t-use-G_DISABLE_DEPRECATED.patch)
+sha256sums=('b2c63916866485793b87398266dd7778548c1734923c272a94d84ee011b6f7a4'
+ 'c2521ed5985159b33a0a5bf53b89012abd9521391fc8ce4c9c73289ca18eb147')
+
+prepare() {
+ cd $pkgbase-$pkgver
+ patch -Np1 -i ../0001-Don-t-use-G_DISABLE_DEPRECATED.patch
+}
+
+build() {
+ cd $pkgbase-$pkgver
+ autoreconf -fi
+ ./configure --prefix=/usr --sysconfdir=/etc \
+ --localstatedir=/var --disable-static --disable-esd
+ make
+}
+
+package_libgnome() {
+ pkgdesc="Common libraries for GNOME"
+ depends=("libgnome-data=${pkgver}" 'gnome-vfs' 'libbonobo' 'gconf' 'gvfs' 'libcanberra')
+
+ cd $pkgbase-$pkgver
+
+ make -C libgnome DESTDIR="${pkgdir}" install
+ make -C monikers DESTDIR="${pkgdir}" install
+}
+
+package_libgnome-data() {
+ pkgdesc="Common data from libgnome"
+ depends=('gconf')
+ install=libgnome.install
+
+ cd $pkgbase-$pkgver
+
+ for dir in doc gnome-data po schemas
+ do
+ make -C $dir GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
+ done
+
+ install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
+ gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgbase}.schemas" --domain libgnome-2.0 ${pkgdir}/etc/gconf/schemas/*.schemas
+ rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas
+}
Deleted: extra-x86_64/libgnome.install
===================================================================
--- extra-x86_64/libgnome.install 2014-04-28 08:25:48 UTC (rev 211848)
+++ extra-x86_64/libgnome.install 2014-04-28 08:26:09 UTC (rev 211849)
@@ -1,17 +0,0 @@
-pkgname=libgnome
-
-post_install() {
- usr/sbin/gconfpkg --install ${pkgname}
-}
-
-pre_upgrade() {
- pre_remove $1
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- usr/sbin/gconfpkg --uninstall ${pkgname}
-}
Copied: libgnome/repos/extra-x86_64/libgnome.install (from rev 211848, libgnome/trunk/libgnome.install)
===================================================================
--- extra-x86_64/libgnome.install (rev 0)
+++ extra-x86_64/libgnome.install 2014-04-28 08:26:09 UTC (rev 211849)
@@ -0,0 +1,17 @@
+pkgname=libgnome
+
+post_install() {
+ usr/sbin/gconfpkg --install ${pkgname}
+}
+
+pre_upgrade() {
+ pre_remove $1
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ usr/sbin/gconfpkg --uninstall ${pkgname}
+}
More information about the arch-commits
mailing list