[arch-commits] Commit in gtk3/repos (14 files)
Jan Steffens
heftig at nymeria.archlinux.org
Wed Oct 16 03:42:36 UTC 2013
Date: Wednesday, October 16, 2013 @ 05:42:36
Author: heftig
Revision: 196655
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
gtk3/repos/extra-i686/PKGBUILD
(from rev 196654, gtk3/trunk/PKGBUILD)
gtk3/repos/extra-i686/gtk3.install
(from rev 196654, gtk3/trunk/gtk3.install)
gtk3/repos/extra-i686/settings.ini
(from rev 196654, gtk3/trunk/settings.ini)
gtk3/repos/extra-x86_64/PKGBUILD
(from rev 196654, gtk3/trunk/PKGBUILD)
gtk3/repos/extra-x86_64/gtk3.install
(from rev 196654, gtk3/trunk/gtk3.install)
gtk3/repos/extra-x86_64/settings.ini
(from rev 196654, gtk3/trunk/settings.ini)
Deleted:
gtk3/repos/extra-i686/PKGBUILD
gtk3/repos/extra-i686/gtk3.install
gtk3/repos/extra-i686/gtkicontheme-double-free.patch
gtk3/repos/extra-i686/settings.ini
gtk3/repos/extra-x86_64/PKGBUILD
gtk3/repos/extra-x86_64/gtk3.install
gtk3/repos/extra-x86_64/gtkicontheme-double-free.patch
gtk3/repos/extra-x86_64/settings.ini
---------------------------------------------+
/PKGBUILD | 100 ++++++++++++++++++++++++++
/gtk3.install | 32 ++++++++
/settings.ini | 8 ++
extra-i686/PKGBUILD | 52 -------------
extra-i686/gtk3.install | 16 ----
extra-i686/gtkicontheme-double-free.patch | 32 --------
extra-i686/settings.ini | 4 -
extra-x86_64/PKGBUILD | 52 -------------
extra-x86_64/gtk3.install | 16 ----
extra-x86_64/gtkicontheme-double-free.patch | 32 --------
extra-x86_64/settings.ini | 4 -
11 files changed, 140 insertions(+), 208 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2013-10-16 03:38:40 UTC (rev 196654)
+++ extra-i686/PKGBUILD 2013-10-16 03:42:36 UTC (rev 196655)
@@ -1,52 +0,0 @@
-# $Id$
-# Maintainer: Ionut Biru <ibiru at archlinux.org>
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-
-pkgname=gtk3
-pkgver=3.10.1
-pkgrel=2
-pkgdesc="GObject-based multi-platform GUI toolkit (v3)"
-arch=(i686 x86_64)
-url="http://www.gtk.org/"
-install=gtk3.install
-depends=(atk cairo gtk-update-icon-cache libcups libxcursor libxinerama libxrandr libxi
- libxcomposite libxdamage pango shared-mime-info colord at-spi2-atk wayland libxkbcommon)
-makedepends=(gobject-introspection)
-optdepends=('gnome-themes-standard: Default widget theme'
- 'gnome-icon-theme: Default icon theme')
-options=('!libtool')
-license=(LGPL)
-source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz
- settings.ini gtkicontheme-double-free.patch)
-sha256sums=('c12e6897fb1ec8d8f1a6de6cd0ac1372fee6fd63ee3a5a63813dc5f3473e6ab8'
- '14369dfd1d325c393e17c105d5d5cc5501663277bd4047ea04a50abb3cfbd119'
- '587be357826a386b12758c899b8c47a7906c90585e6ddaddc848537744b36771')
-
-prepare() {
- cd "gtk+-$pkgver"
- patch -Np1 -i ../gtkicontheme-double-free.patch
-}
-
-build() {
- cd "gtk+-$pkgver"
-
- CXX=/bin/false ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --enable-gtk2-dependency \
- --disable-schemas-compile \
- --enable-x11-backend \
- --enable-broadway-backend \
- --enable-wayland-backend
-
- #https://bugzilla.gnome.org/show_bug.cgi?id=655517
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
- make
-}
-
-package() {
- cd "gtk+-$pkgver"
- make DESTDIR="$pkgdir" install
- install -Dm644 ../settings.ini "$pkgdir/usr/share/gtk-3.0/settings.ini"
-}
Copied: gtk3/repos/extra-i686/PKGBUILD (from rev 196654, gtk3/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2013-10-16 03:42:36 UTC (rev 196655)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Ionut Biru <ibiru at archlinux.org>
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+
+pkgname=gtk3
+pkgver=3.10.2
+pkgrel=1
+pkgdesc="GObject-based multi-platform GUI toolkit (v3)"
+arch=(i686 x86_64)
+url="http://www.gtk.org/"
+install=gtk3.install
+depends=(atk cairo gtk-update-icon-cache libcups libxcursor libxinerama libxrandr libxi
+ libxcomposite libxdamage pango shared-mime-info colord at-spi2-atk wayland libxkbcommon)
+makedepends=(gobject-introspection)
+optdepends=('gnome-themes-standard: Default widget theme'
+ 'gnome-icon-theme: Default icon theme')
+options=('!libtool')
+license=(LGPL)
+source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz
+ settings.ini)
+sha256sums=('93af12d28e5f6ccc373ea59f31147e2884c9b3c15dc4841ce3b5cee45b13814c'
+ '14369dfd1d325c393e17c105d5d5cc5501663277bd4047ea04a50abb3cfbd119')
+
+prepare() {
+ cd "gtk+-$pkgver"
+}
+
+build() {
+ cd "gtk+-$pkgver"
+
+ CXX=/bin/false ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --enable-gtk2-dependency \
+ --disable-schemas-compile \
+ --enable-x11-backend \
+ --enable-broadway-backend \
+ --enable-wayland-backend
+
+ #https://bugzilla.gnome.org/show_bug.cgi?id=655517
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+ make
+}
+
+package() {
+ cd "gtk+-$pkgver"
+ make DESTDIR="$pkgdir" install
+ install -Dm644 ../settings.ini "$pkgdir/usr/share/gtk-3.0/settings.ini"
+}
Deleted: extra-i686/gtk3.install
===================================================================
--- extra-i686/gtk3.install 2013-10-16 03:38:40 UTC (rev 196654)
+++ extra-i686/gtk3.install 2013-10-16 03:42:36 UTC (rev 196655)
@@ -1,16 +0,0 @@
-post_install() {
- /usr/bin/gtk-query-immodules-3.0 --update-cache
- /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
- post_install
-}
-
-pre_remove() {
- rm -f /usr/lib/gtk-3.0/3.0.0/immodules.cache
-}
-
-post_remove() {
- /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
-}
Copied: gtk3/repos/extra-i686/gtk3.install (from rev 196654, gtk3/trunk/gtk3.install)
===================================================================
--- extra-i686/gtk3.install (rev 0)
+++ extra-i686/gtk3.install 2013-10-16 03:42:36 UTC (rev 196655)
@@ -0,0 +1,16 @@
+post_install() {
+ /usr/bin/gtk-query-immodules-3.0 --update-cache
+ /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
+}
+
+post_upgrade() {
+ post_install
+}
+
+pre_remove() {
+ rm -f /usr/lib/gtk-3.0/3.0.0/immodules.cache
+}
+
+post_remove() {
+ /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
+}
Deleted: extra-i686/gtkicontheme-double-free.patch
===================================================================
--- extra-i686/gtkicontheme-double-free.patch 2013-10-16 03:38:40 UTC (rev 196654)
+++ extra-i686/gtkicontheme-double-free.patch 2013-10-16 03:42:36 UTC (rev 196655)
@@ -1,32 +0,0 @@
-From a01e33e6db788bb5a3aaf310d3f64aa25c0b842a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sebasti=C3=A1n=20E=2E=20Peyrott?= <pseus7 at gmail.com>
-Date: Tue, 15 Oct 2013 19:35:24 -0300
-Subject: [PATCH] Fixed double-free bug. Fixes bug 709967.
-
----
- gtk/gtkicontheme.c | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
-index fad7ff4..2be0f75 100644
---- a/gtk/gtkicontheme.c
-+++ b/gtk/gtkicontheme.c
-@@ -3873,7 +3873,14 @@ gtk_icon_info_load_icon (GtkIconInfo *icon_info,
- if (!icon_info_ensure_scale_and_pixbuf (icon_info, FALSE))
- {
- if (icon_info->load_error)
-- g_propagate_error (error, icon_info->load_error);
-+ {
-+ /* g_propagate_error would be wrong here as
-+ * icon_info->load_error gets freed in the
-+ * finalizer.
-+ */
-+ if (error)
-+ *error = g_error_copy (icon_info->load_error);
-+ }
- else
- g_set_error_literal (error,
- GTK_ICON_THEME_ERROR,
---
-1.8.4
-
Deleted: extra-i686/settings.ini
===================================================================
--- extra-i686/settings.ini 2013-10-16 03:38:40 UTC (rev 196654)
+++ extra-i686/settings.ini 2013-10-16 03:42:36 UTC (rev 196655)
@@ -1,4 +0,0 @@
-[Settings]
-gtk-icon-theme-name = gnome
-gtk-theme-name = Adwaita
-gtk-font-name = Cantarell 11
Copied: gtk3/repos/extra-i686/settings.ini (from rev 196654, gtk3/trunk/settings.ini)
===================================================================
--- extra-i686/settings.ini (rev 0)
+++ extra-i686/settings.ini 2013-10-16 03:42:36 UTC (rev 196655)
@@ -0,0 +1,4 @@
+[Settings]
+gtk-icon-theme-name = gnome
+gtk-theme-name = Adwaita
+gtk-font-name = Cantarell 11
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2013-10-16 03:38:40 UTC (rev 196654)
+++ extra-x86_64/PKGBUILD 2013-10-16 03:42:36 UTC (rev 196655)
@@ -1,52 +0,0 @@
-# $Id$
-# Maintainer: Ionut Biru <ibiru at archlinux.org>
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-
-pkgname=gtk3
-pkgver=3.10.1
-pkgrel=2
-pkgdesc="GObject-based multi-platform GUI toolkit (v3)"
-arch=(i686 x86_64)
-url="http://www.gtk.org/"
-install=gtk3.install
-depends=(atk cairo gtk-update-icon-cache libcups libxcursor libxinerama libxrandr libxi
- libxcomposite libxdamage pango shared-mime-info colord at-spi2-atk wayland libxkbcommon)
-makedepends=(gobject-introspection)
-optdepends=('gnome-themes-standard: Default widget theme'
- 'gnome-icon-theme: Default icon theme')
-options=('!libtool')
-license=(LGPL)
-source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz
- settings.ini gtkicontheme-double-free.patch)
-sha256sums=('c12e6897fb1ec8d8f1a6de6cd0ac1372fee6fd63ee3a5a63813dc5f3473e6ab8'
- '14369dfd1d325c393e17c105d5d5cc5501663277bd4047ea04a50abb3cfbd119'
- '587be357826a386b12758c899b8c47a7906c90585e6ddaddc848537744b36771')
-
-prepare() {
- cd "gtk+-$pkgver"
- patch -Np1 -i ../gtkicontheme-double-free.patch
-}
-
-build() {
- cd "gtk+-$pkgver"
-
- CXX=/bin/false ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --enable-gtk2-dependency \
- --disable-schemas-compile \
- --enable-x11-backend \
- --enable-broadway-backend \
- --enable-wayland-backend
-
- #https://bugzilla.gnome.org/show_bug.cgi?id=655517
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
- make
-}
-
-package() {
- cd "gtk+-$pkgver"
- make DESTDIR="$pkgdir" install
- install -Dm644 ../settings.ini "$pkgdir/usr/share/gtk-3.0/settings.ini"
-}
Copied: gtk3/repos/extra-x86_64/PKGBUILD (from rev 196654, gtk3/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2013-10-16 03:42:36 UTC (rev 196655)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Ionut Biru <ibiru at archlinux.org>
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+
+pkgname=gtk3
+pkgver=3.10.2
+pkgrel=1
+pkgdesc="GObject-based multi-platform GUI toolkit (v3)"
+arch=(i686 x86_64)
+url="http://www.gtk.org/"
+install=gtk3.install
+depends=(atk cairo gtk-update-icon-cache libcups libxcursor libxinerama libxrandr libxi
+ libxcomposite libxdamage pango shared-mime-info colord at-spi2-atk wayland libxkbcommon)
+makedepends=(gobject-introspection)
+optdepends=('gnome-themes-standard: Default widget theme'
+ 'gnome-icon-theme: Default icon theme')
+options=('!libtool')
+license=(LGPL)
+source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz
+ settings.ini)
+sha256sums=('93af12d28e5f6ccc373ea59f31147e2884c9b3c15dc4841ce3b5cee45b13814c'
+ '14369dfd1d325c393e17c105d5d5cc5501663277bd4047ea04a50abb3cfbd119')
+
+prepare() {
+ cd "gtk+-$pkgver"
+}
+
+build() {
+ cd "gtk+-$pkgver"
+
+ CXX=/bin/false ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --enable-gtk2-dependency \
+ --disable-schemas-compile \
+ --enable-x11-backend \
+ --enable-broadway-backend \
+ --enable-wayland-backend
+
+ #https://bugzilla.gnome.org/show_bug.cgi?id=655517
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+ make
+}
+
+package() {
+ cd "gtk+-$pkgver"
+ make DESTDIR="$pkgdir" install
+ install -Dm644 ../settings.ini "$pkgdir/usr/share/gtk-3.0/settings.ini"
+}
Deleted: extra-x86_64/gtk3.install
===================================================================
--- extra-x86_64/gtk3.install 2013-10-16 03:38:40 UTC (rev 196654)
+++ extra-x86_64/gtk3.install 2013-10-16 03:42:36 UTC (rev 196655)
@@ -1,16 +0,0 @@
-post_install() {
- /usr/bin/gtk-query-immodules-3.0 --update-cache
- /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
- post_install
-}
-
-pre_remove() {
- rm -f /usr/lib/gtk-3.0/3.0.0/immodules.cache
-}
-
-post_remove() {
- /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
-}
Copied: gtk3/repos/extra-x86_64/gtk3.install (from rev 196654, gtk3/trunk/gtk3.install)
===================================================================
--- extra-x86_64/gtk3.install (rev 0)
+++ extra-x86_64/gtk3.install 2013-10-16 03:42:36 UTC (rev 196655)
@@ -0,0 +1,16 @@
+post_install() {
+ /usr/bin/gtk-query-immodules-3.0 --update-cache
+ /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
+}
+
+post_upgrade() {
+ post_install
+}
+
+pre_remove() {
+ rm -f /usr/lib/gtk-3.0/3.0.0/immodules.cache
+}
+
+post_remove() {
+ /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
+}
Deleted: extra-x86_64/gtkicontheme-double-free.patch
===================================================================
--- extra-x86_64/gtkicontheme-double-free.patch 2013-10-16 03:38:40 UTC (rev 196654)
+++ extra-x86_64/gtkicontheme-double-free.patch 2013-10-16 03:42:36 UTC (rev 196655)
@@ -1,32 +0,0 @@
-From a01e33e6db788bb5a3aaf310d3f64aa25c0b842a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sebasti=C3=A1n=20E=2E=20Peyrott?= <pseus7 at gmail.com>
-Date: Tue, 15 Oct 2013 19:35:24 -0300
-Subject: [PATCH] Fixed double-free bug. Fixes bug 709967.
-
----
- gtk/gtkicontheme.c | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
-index fad7ff4..2be0f75 100644
---- a/gtk/gtkicontheme.c
-+++ b/gtk/gtkicontheme.c
-@@ -3873,7 +3873,14 @@ gtk_icon_info_load_icon (GtkIconInfo *icon_info,
- if (!icon_info_ensure_scale_and_pixbuf (icon_info, FALSE))
- {
- if (icon_info->load_error)
-- g_propagate_error (error, icon_info->load_error);
-+ {
-+ /* g_propagate_error would be wrong here as
-+ * icon_info->load_error gets freed in the
-+ * finalizer.
-+ */
-+ if (error)
-+ *error = g_error_copy (icon_info->load_error);
-+ }
- else
- g_set_error_literal (error,
- GTK_ICON_THEME_ERROR,
---
-1.8.4
-
Deleted: extra-x86_64/settings.ini
===================================================================
--- extra-x86_64/settings.ini 2013-10-16 03:38:40 UTC (rev 196654)
+++ extra-x86_64/settings.ini 2013-10-16 03:42:36 UTC (rev 196655)
@@ -1,4 +0,0 @@
-[Settings]
-gtk-icon-theme-name = gnome
-gtk-theme-name = Adwaita
-gtk-font-name = Cantarell 11
Copied: gtk3/repos/extra-x86_64/settings.ini (from rev 196654, gtk3/trunk/settings.ini)
===================================================================
--- extra-x86_64/settings.ini (rev 0)
+++ extra-x86_64/settings.ini 2013-10-16 03:42:36 UTC (rev 196655)
@@ -0,0 +1,4 @@
+[Settings]
+gtk-icon-theme-name = gnome
+gtk-theme-name = Adwaita
+gtk-font-name = Cantarell 11
More information about the arch-commits
mailing list