[arch-commits] Commit in gtk3/repos (14 files)
Jan Steffens
heftig at archlinux.org
Sun Oct 26 00:22:12 UTC 2014
Date: Sunday, October 26, 2014 @ 02:22:12
Author: heftig
Revision: 225352
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
gtk3/repos/extra-i686/PKGBUILD
(from rev 225351, gtk3/trunk/PKGBUILD)
gtk3/repos/extra-i686/gtk3.install
(from rev 225351, gtk3/trunk/gtk3.install)
gtk3/repos/extra-i686/settings.ini
(from rev 225351, gtk3/trunk/settings.ini)
gtk3/repos/extra-x86_64/PKGBUILD
(from rev 225351, gtk3/trunk/PKGBUILD)
gtk3/repos/extra-x86_64/gtk3.install
(from rev 225351, gtk3/trunk/gtk3.install)
gtk3/repos/extra-x86_64/settings.ini
(from rev 225351, gtk3/trunk/settings.ini)
Deleted:
gtk3/repos/extra-i686/PKGBUILD
gtk3/repos/extra-i686/git-fixes.patch
gtk3/repos/extra-i686/gtk3.install
gtk3/repos/extra-i686/settings.ini
gtk3/repos/extra-x86_64/PKGBUILD
gtk3/repos/extra-x86_64/git-fixes.patch
gtk3/repos/extra-x86_64/gtk3.install
gtk3/repos/extra-x86_64/settings.ini
------------------------------+
/PKGBUILD | 88 +++++++++++++++++++++++++++++++++++++++++
/gtk3.install | 36 ++++++++++++++++
/settings.ini | 8 +++
extra-i686/PKGBUILD | 47 ---------------------
extra-i686/git-fixes.patch | 68 -------------------------------
extra-i686/gtk3.install | 18 --------
extra-i686/settings.ini | 4 -
extra-x86_64/PKGBUILD | 47 ---------------------
extra-x86_64/git-fixes.patch | 68 -------------------------------
extra-x86_64/gtk3.install | 18 --------
extra-x86_64/settings.ini | 4 -
11 files changed, 132 insertions(+), 274 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2014-10-26 00:18:57 UTC (rev 225351)
+++ extra-i686/PKGBUILD 2014-10-26 00:22:12 UTC (rev 225352)
@@ -1,47 +0,0 @@
-# $Id$
-# Maintainer: Ionut Biru <ibiru at archlinux.org>
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-
-pkgname=gtk3
-pkgver=3.14.3
-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 adwaita-icon-theme)
-makedepends=(gobject-introspection python2)
-license=(LGPL)
-source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver:0:4}/gtk+-$pkgver.tar.xz
- git-fixes.patch)
-sha256sums=('5e8c62b932f4f0384c3c8cbf251f65978bdecde3211bb16e4c2bde5d8b3af72f'
- '677ae56bd76121c1aa2efc7cc1cb4c5b9049d53d2ef9ddda0568f5e221886032')
-
-prepare() {
- cd gtk+-$pkgver
- patch -Np1 -i ../git-fixes.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
-}
Copied: gtk3/repos/extra-i686/PKGBUILD (from rev 225351, gtk3/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2014-10-26 00:22:12 UTC (rev 225352)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Ionut Biru <ibiru at archlinux.org>
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+
+pkgname=gtk3
+pkgver=3.14.4
+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 adwaita-icon-theme)
+makedepends=(gobject-introspection python2)
+license=(LGPL)
+source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver:0:4}/gtk+-$pkgver.tar.xz)
+sha256sums=('a006c716d723dab0c623491566e3292af84c87d9198a30199051d23cfc7bef2f')
+
+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
+}
Deleted: extra-i686/git-fixes.patch
===================================================================
--- extra-i686/git-fixes.patch 2014-10-26 00:18:57 UTC (rev 225351)
+++ extra-i686/git-fixes.patch 2014-10-26 00:22:12 UTC (rev 225352)
@@ -1,68 +0,0 @@
-diff --git a/gtk/deprecated/gtktrayicon-x11.c b/gtk/deprecated/gtktrayicon-x11.c
-index 503d64b..bfd6b9d 100644
---- a/gtk/deprecated/gtktrayicon-x11.c
-+++ b/gtk/deprecated/gtktrayicon-x11.c
-@@ -355,6 +355,27 @@ gtk_tray_icon_draw (GtkWidget *widget,
- cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
- cairo_paint (cr);
- }
-+ else
-+ {
-+ GdkRectangle clip;
-+
-+ if (gdk_cairo_get_clip_rectangle (cr, &clip))
-+ {
-+ /* Clear to parent-relative pixmap
-+ * We need to use direct X access here because GDK doesn't know about
-+ * the parent realtive pixmap. */
-+ cairo_surface_flush (target);
-+
-+ XClearArea (GDK_WINDOW_XDISPLAY (window),
-+ GDK_WINDOW_XID (window),
-+ clip.x, clip.y,
-+ clip.width, clip.height,
-+ False);
-+ cairo_surface_mark_dirty_rectangle (target,
-+ clip.x, clip.y,
-+ clip.width, clip.height);
-+ }
-+ }
-
- if (GTK_WIDGET_CLASS (gtk_tray_icon_parent_class)->draw)
- retval = GTK_WIDGET_CLASS (gtk_tray_icon_parent_class)->draw (widget, cr);
-@@ -480,6 +501,14 @@ gtk_tray_icon_get_visual_property (GtkTrayIcon *icon)
- icon->priv->manager_visual_rgba = FALSE;
- }
-
-+
-+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-+ /* For the background-relative hack we use when we aren't
-+ * using a real RGBA visual, we can't be double-buffered
-+ */
-+ gtk_widget_set_double_buffered (GTK_WIDGET (icon), icon->priv->manager_visual_rgba);
-+G_GNUC_END_IGNORE_DEPRECATIONS
-+
- if (type != None)
- XFree (prop.prop);
- }
-diff --git a/gtk/gtkbox.c b/gtk/gtkbox.c
-index 613b5ae..72f26e9 100644
---- a/gtk/gtkbox.c
-+++ b/gtk/gtkbox.c
-@@ -2619,10 +2619,14 @@ gtk_box_set_center_widget (GtkBox *box,
-
- g_return_if_fail (GTK_IS_BOX (box));
-
-+ if (priv->center)
-+ {
-+ gtk_box_remove (GTK_CONTAINER (box), priv->center->widget);
-+ priv->center = NULL;
-+ }
-+
- if (widget)
- priv->center = gtk_box_pack (box, widget, FALSE, TRUE, 0, GTK_PACK_START);
-- else if (priv->center)
-- gtk_box_remove (GTK_CONTAINER (box), priv->center->widget);
- }
-
- /**
Deleted: extra-i686/gtk3.install
===================================================================
--- extra-i686/gtk3.install 2014-10-26 00:18:57 UTC (rev 225351)
+++ extra-i686/gtk3.install 2014-10-26 00:22:12 UTC (rev 225352)
@@ -1,18 +0,0 @@
-post_install() {
- /usr/bin/gtk-query-immodules-3.0 --update-cache
- /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
- /usr/bin/gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-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
- /usr/bin/gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
Copied: gtk3/repos/extra-i686/gtk3.install (from rev 225351, gtk3/trunk/gtk3.install)
===================================================================
--- extra-i686/gtk3.install (rev 0)
+++ extra-i686/gtk3.install 2014-10-26 00:22:12 UTC (rev 225352)
@@ -0,0 +1,18 @@
+post_install() {
+ /usr/bin/gtk-query-immodules-3.0 --update-cache
+ /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
+ /usr/bin/gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+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
+ /usr/bin/gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
Deleted: extra-i686/settings.ini
===================================================================
--- extra-i686/settings.ini 2014-10-26 00:18:57 UTC (rev 225351)
+++ extra-i686/settings.ini 2014-10-26 00:22:12 UTC (rev 225352)
@@ -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 225351, gtk3/trunk/settings.ini)
===================================================================
--- extra-i686/settings.ini (rev 0)
+++ extra-i686/settings.ini 2014-10-26 00:22:12 UTC (rev 225352)
@@ -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 2014-10-26 00:18:57 UTC (rev 225351)
+++ extra-x86_64/PKGBUILD 2014-10-26 00:22:12 UTC (rev 225352)
@@ -1,47 +0,0 @@
-# $Id$
-# Maintainer: Ionut Biru <ibiru at archlinux.org>
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-
-pkgname=gtk3
-pkgver=3.14.3
-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 adwaita-icon-theme)
-makedepends=(gobject-introspection python2)
-license=(LGPL)
-source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver:0:4}/gtk+-$pkgver.tar.xz
- git-fixes.patch)
-sha256sums=('5e8c62b932f4f0384c3c8cbf251f65978bdecde3211bb16e4c2bde5d8b3af72f'
- '677ae56bd76121c1aa2efc7cc1cb4c5b9049d53d2ef9ddda0568f5e221886032')
-
-prepare() {
- cd gtk+-$pkgver
- patch -Np1 -i ../git-fixes.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
-}
Copied: gtk3/repos/extra-x86_64/PKGBUILD (from rev 225351, gtk3/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2014-10-26 00:22:12 UTC (rev 225352)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Ionut Biru <ibiru at archlinux.org>
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+
+pkgname=gtk3
+pkgver=3.14.4
+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 adwaita-icon-theme)
+makedepends=(gobject-introspection python2)
+license=(LGPL)
+source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver:0:4}/gtk+-$pkgver.tar.xz)
+sha256sums=('a006c716d723dab0c623491566e3292af84c87d9198a30199051d23cfc7bef2f')
+
+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
+}
Deleted: extra-x86_64/git-fixes.patch
===================================================================
--- extra-x86_64/git-fixes.patch 2014-10-26 00:18:57 UTC (rev 225351)
+++ extra-x86_64/git-fixes.patch 2014-10-26 00:22:12 UTC (rev 225352)
@@ -1,68 +0,0 @@
-diff --git a/gtk/deprecated/gtktrayicon-x11.c b/gtk/deprecated/gtktrayicon-x11.c
-index 503d64b..bfd6b9d 100644
---- a/gtk/deprecated/gtktrayicon-x11.c
-+++ b/gtk/deprecated/gtktrayicon-x11.c
-@@ -355,6 +355,27 @@ gtk_tray_icon_draw (GtkWidget *widget,
- cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
- cairo_paint (cr);
- }
-+ else
-+ {
-+ GdkRectangle clip;
-+
-+ if (gdk_cairo_get_clip_rectangle (cr, &clip))
-+ {
-+ /* Clear to parent-relative pixmap
-+ * We need to use direct X access here because GDK doesn't know about
-+ * the parent realtive pixmap. */
-+ cairo_surface_flush (target);
-+
-+ XClearArea (GDK_WINDOW_XDISPLAY (window),
-+ GDK_WINDOW_XID (window),
-+ clip.x, clip.y,
-+ clip.width, clip.height,
-+ False);
-+ cairo_surface_mark_dirty_rectangle (target,
-+ clip.x, clip.y,
-+ clip.width, clip.height);
-+ }
-+ }
-
- if (GTK_WIDGET_CLASS (gtk_tray_icon_parent_class)->draw)
- retval = GTK_WIDGET_CLASS (gtk_tray_icon_parent_class)->draw (widget, cr);
-@@ -480,6 +501,14 @@ gtk_tray_icon_get_visual_property (GtkTrayIcon *icon)
- icon->priv->manager_visual_rgba = FALSE;
- }
-
-+
-+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-+ /* For the background-relative hack we use when we aren't
-+ * using a real RGBA visual, we can't be double-buffered
-+ */
-+ gtk_widget_set_double_buffered (GTK_WIDGET (icon), icon->priv->manager_visual_rgba);
-+G_GNUC_END_IGNORE_DEPRECATIONS
-+
- if (type != None)
- XFree (prop.prop);
- }
-diff --git a/gtk/gtkbox.c b/gtk/gtkbox.c
-index 613b5ae..72f26e9 100644
---- a/gtk/gtkbox.c
-+++ b/gtk/gtkbox.c
-@@ -2619,10 +2619,14 @@ gtk_box_set_center_widget (GtkBox *box,
-
- g_return_if_fail (GTK_IS_BOX (box));
-
-+ if (priv->center)
-+ {
-+ gtk_box_remove (GTK_CONTAINER (box), priv->center->widget);
-+ priv->center = NULL;
-+ }
-+
- if (widget)
- priv->center = gtk_box_pack (box, widget, FALSE, TRUE, 0, GTK_PACK_START);
-- else if (priv->center)
-- gtk_box_remove (GTK_CONTAINER (box), priv->center->widget);
- }
-
- /**
Deleted: extra-x86_64/gtk3.install
===================================================================
--- extra-x86_64/gtk3.install 2014-10-26 00:18:57 UTC (rev 225351)
+++ extra-x86_64/gtk3.install 2014-10-26 00:22:12 UTC (rev 225352)
@@ -1,18 +0,0 @@
-post_install() {
- /usr/bin/gtk-query-immodules-3.0 --update-cache
- /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
- /usr/bin/gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-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
- /usr/bin/gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
Copied: gtk3/repos/extra-x86_64/gtk3.install (from rev 225351, gtk3/trunk/gtk3.install)
===================================================================
--- extra-x86_64/gtk3.install (rev 0)
+++ extra-x86_64/gtk3.install 2014-10-26 00:22:12 UTC (rev 225352)
@@ -0,0 +1,18 @@
+post_install() {
+ /usr/bin/gtk-query-immodules-3.0 --update-cache
+ /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
+ /usr/bin/gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+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
+ /usr/bin/gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
Deleted: extra-x86_64/settings.ini
===================================================================
--- extra-x86_64/settings.ini 2014-10-26 00:18:57 UTC (rev 225351)
+++ extra-x86_64/settings.ini 2014-10-26 00:22:12 UTC (rev 225352)
@@ -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 225351, gtk3/trunk/settings.ini)
===================================================================
--- extra-x86_64/settings.ini (rev 0)
+++ extra-x86_64/settings.ini 2014-10-26 00:22:12 UTC (rev 225352)
@@ -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