[arch-commits] Commit in xfdesktop/repos (10 files)
Evangelos Foutras
foutrelis at archlinux.org
Sun May 17 11:30:44 UTC 2015
Date: Sunday, May 17, 2015 @ 13:30:44
Author: foutrelis
Revision: 239493
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
xfdesktop/repos/extra-i686/PKGBUILD
(from rev 239491, xfdesktop/trunk/PKGBUILD)
xfdesktop/repos/extra-i686/xfdesktop.install
(from rev 239491, xfdesktop/trunk/xfdesktop.install)
xfdesktop/repos/extra-x86_64/PKGBUILD
(from rev 239491, xfdesktop/trunk/PKGBUILD)
xfdesktop/repos/extra-x86_64/xfdesktop.install
(from rev 239491, xfdesktop/trunk/xfdesktop.install)
Deleted:
xfdesktop/repos/extra-i686/PKGBUILD
xfdesktop/repos/extra-i686/git-fixes.patch
xfdesktop/repos/extra-i686/xfdesktop.install
xfdesktop/repos/extra-x86_64/PKGBUILD
xfdesktop/repos/extra-x86_64/git-fixes.patch
xfdesktop/repos/extra-x86_64/xfdesktop.install
--------------------------------+
/PKGBUILD | 86 +++++++++++++++++++++++++++++++++++++++
/xfdesktop.install | 26 +++++++++++
extra-i686/PKGBUILD | 50 ----------------------
extra-i686/git-fixes.patch | 86 ---------------------------------------
extra-i686/xfdesktop.install | 13 -----
extra-x86_64/PKGBUILD | 50 ----------------------
extra-x86_64/git-fixes.patch | 86 ---------------------------------------
extra-x86_64/xfdesktop.install | 13 -----
8 files changed, 112 insertions(+), 298 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2015-05-17 11:30:42 UTC (rev 239492)
+++ extra-i686/PKGBUILD 2015-05-17 11:30:44 UTC (rev 239493)
@@ -1,50 +0,0 @@
-# $Id$
-# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
-# Contributor: tobias <tobias funnychar archlinux.org>
-
-pkgname=xfdesktop
-pkgver=4.12.1
-pkgrel=2
-pkgdesc="A desktop manager for Xfce"
-arch=('i686' 'x86_64')
-url="http://www.xfce.org/"
-license=('GPL2')
-groups=('xfce4')
-depends=('libxfce4ui' 'thunar' 'garcon' 'hicolor-icon-theme' 'libwnck')
-makedepends=('intltool')
-conflicts=('xfce4-menueditor')
-replaces=('xfce4-menueditor')
-install=xfdesktop.install
-source=(http://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2
- git-fixes.patch)
-sha256sums=('95beff25b20957ec7b7c617b2f3f77a90b8d334393cd7dc3c1c1efa30151a725'
- '546f39e89736c098629f50330310f1194b02fd07e6c068a6cf4f84c07e1e81a5')
-
-prepare() {
- cd "$srcdir/$pkgname-$pkgver"
-
- patch -Np1 -i ../git-fixes.patch
-}
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --libexecdir=/usr/lib \
- --localstatedir=/var \
- --disable-static \
- --enable-gio-unix \
- --enable-thunarx \
- --enable-notifications \
- --disable-debug
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: xfdesktop/repos/extra-i686/PKGBUILD (from rev 239491, xfdesktop/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2015-05-17 11:30:44 UTC (rev 239493)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+# Contributor: tobias <tobias funnychar archlinux.org>
+
+pkgname=xfdesktop
+pkgver=4.12.2
+pkgrel=1
+pkgdesc="A desktop manager for Xfce"
+arch=('i686' 'x86_64')
+url="http://www.xfce.org/"
+license=('GPL2')
+groups=('xfce4')
+depends=('libxfce4ui' 'thunar' 'garcon' 'hicolor-icon-theme' 'libwnck')
+makedepends=('intltool')
+conflicts=('xfce4-menueditor')
+replaces=('xfce4-menueditor')
+install=xfdesktop.install
+source=(http://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
+sha256sums=('c9788883163b57bac39d12e5f8310c869d176454879defb78b67f8e9f1ad5225')
+
+prepare() {
+ cd "$srcdir/$pkgname-$pkgver"
+}
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --enable-gio-unix \
+ --enable-thunarx \
+ --enable-notifications \
+ --disable-debug
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: extra-i686/git-fixes.patch
===================================================================
--- extra-i686/git-fixes.patch 2015-05-17 11:30:42 UTC (rev 239492)
+++ extra-i686/git-fixes.patch 2015-05-17 11:30:44 UTC (rev 239493)
@@ -1,86 +0,0 @@
-From be464d06dc38cc068926e30d891318742410fc56 Mon Sep 17 00:00:00 2001
-From: Thaddaeus Tintenfisch <thad.fisch at gmail.com>
-Date: Tue, 17 Mar 2015 22:19:02 +0100
-Subject: [PATCH 1/2] Fix a previous commit
-
-This fixes commit 26bc8820e502f74b99648b213c28b681971e6ca6.
----
- src/xfdesktop-icon-view.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/xfdesktop-icon-view.c b/src/xfdesktop-icon-view.c
-index de764df..1b8c64e 100644
---- a/src/xfdesktop-icon-view.c
-+++ b/src/xfdesktop-icon-view.c
-@@ -43,6 +43,7 @@
-
- #include "xfdesktop-icon-view.h"
- #include "xfdesktop-file-icon-manager.h"
-+#include "xfdesktop-window-icon-manager.h"
- #include "xfdesktop-marshal.h"
- #include "xfce-desktop.h"
- #include "xfdesktop-volume-icon.h"
-@@ -1716,7 +1717,7 @@ xfdesktop_icon_view_drag_data_get(GtkWidget *widget,
-
- TRACE("entering");
-
-- if(XFDESKTOP_IS_ICON_VIEW_MANAGER(icon_view) == FALSE)
-+ if(XFDESKTOP_IS_WINDOW_ICON_MANAGER(icon_view->priv->manager))
- return;
-
- /* Sometimes during a ctrl+drag this is NULL
-@@ -1762,7 +1763,7 @@ xfdesktop_icon_view_drag_data_received(GtkWidget *widget,
-
- GdkDragAction action = icon_view->priv->proposed_drop_action;
-
-- if(XFDESKTOP_IS_ICON_VIEW_MANAGER(icon_view)) {
-+ if(!XFDESKTOP_IS_WINDOW_ICON_MANAGER(icon_view->priv->manager)) {
- action = xfdesktop_icon_view_manager_propose_drop_action(icon_view->priv->manager,
- icon_on_dest,
- action,
---
-2.3.4
-
-
-From a6761e4a3429fd82bb0f0b98277660d689b3d2a4 Mon Sep 17 00:00:00 2001
-From: Thaddaeus Tintenfisch <thad.fisch at gmail.com>
-Date: Mon, 23 Mar 2015 22:11:58 +0100
-Subject: [PATCH 2/2] Fix a regression
-
-This fixes a visual glitch caused by commit d8b37e5.
----
- src/xfdesktop-icon-view.c | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/src/xfdesktop-icon-view.c b/src/xfdesktop-icon-view.c
-index 1b8c64e..ae3a1a0 100644
---- a/src/xfdesktop-icon-view.c
-+++ b/src/xfdesktop-icon-view.c
-@@ -3057,13 +3057,13 @@ xfdesktop_icon_view_draw_image(cairo_t *cr, GdkPixbuf *pix, GdkRectangle *rect)
-
- static void
- xfdesktop_icon_view_draw_text(cairo_t *cr, PangoLayout *playout, GdkRectangle *text_area,
-- gint x_offset, gint y_offset, gint blur_radius,
-- GdkColor *color)
-+ GdkRectangle *box_area, gint x_offset, gint y_offset,
-+ gint blur_radius, GdkColor *color)
- {
- cairo_save(cr);
-
- /* Clip the cairo area to blur the minimum surface */
-- gdk_cairo_rectangle(cr, text_area);
-+ gdk_cairo_rectangle(cr, box_area);
- cairo_clip(cr);
-
- cairo_move_to(cr,
-@@ -3188,6 +3188,7 @@ xfdesktop_icon_view_paint_icon(XfdesktopIconView *icon_view,
- /* Draw the shadow */
- xfdesktop_icon_view_draw_text(cr, playout,
- &text_extents,
-+ &box_extents,
- x_offset,
- y_offset,
- icon_view->priv->shadow_blur_radius,
---
-2.3.4
-
Deleted: extra-i686/xfdesktop.install
===================================================================
--- extra-i686/xfdesktop.install 2015-05-17 11:30:42 UTC (rev 239492)
+++ extra-i686/xfdesktop.install 2015-05-17 11:30:44 UTC (rev 239493)
@@ -1,13 +0,0 @@
-post_install() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: xfdesktop/repos/extra-i686/xfdesktop.install (from rev 239491, xfdesktop/trunk/xfdesktop.install)
===================================================================
--- extra-i686/xfdesktop.install (rev 0)
+++ extra-i686/xfdesktop.install 2015-05-17 11:30:44 UTC (rev 239493)
@@ -0,0 +1,13 @@
+post_install() {
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2015-05-17 11:30:42 UTC (rev 239492)
+++ extra-x86_64/PKGBUILD 2015-05-17 11:30:44 UTC (rev 239493)
@@ -1,50 +0,0 @@
-# $Id$
-# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
-# Contributor: tobias <tobias funnychar archlinux.org>
-
-pkgname=xfdesktop
-pkgver=4.12.1
-pkgrel=2
-pkgdesc="A desktop manager for Xfce"
-arch=('i686' 'x86_64')
-url="http://www.xfce.org/"
-license=('GPL2')
-groups=('xfce4')
-depends=('libxfce4ui' 'thunar' 'garcon' 'hicolor-icon-theme' 'libwnck')
-makedepends=('intltool')
-conflicts=('xfce4-menueditor')
-replaces=('xfce4-menueditor')
-install=xfdesktop.install
-source=(http://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2
- git-fixes.patch)
-sha256sums=('95beff25b20957ec7b7c617b2f3f77a90b8d334393cd7dc3c1c1efa30151a725'
- '546f39e89736c098629f50330310f1194b02fd07e6c068a6cf4f84c07e1e81a5')
-
-prepare() {
- cd "$srcdir/$pkgname-$pkgver"
-
- patch -Np1 -i ../git-fixes.patch
-}
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --libexecdir=/usr/lib \
- --localstatedir=/var \
- --disable-static \
- --enable-gio-unix \
- --enable-thunarx \
- --enable-notifications \
- --disable-debug
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: xfdesktop/repos/extra-x86_64/PKGBUILD (from rev 239491, xfdesktop/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2015-05-17 11:30:44 UTC (rev 239493)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+# Contributor: tobias <tobias funnychar archlinux.org>
+
+pkgname=xfdesktop
+pkgver=4.12.2
+pkgrel=1
+pkgdesc="A desktop manager for Xfce"
+arch=('i686' 'x86_64')
+url="http://www.xfce.org/"
+license=('GPL2')
+groups=('xfce4')
+depends=('libxfce4ui' 'thunar' 'garcon' 'hicolor-icon-theme' 'libwnck')
+makedepends=('intltool')
+conflicts=('xfce4-menueditor')
+replaces=('xfce4-menueditor')
+install=xfdesktop.install
+source=(http://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
+sha256sums=('c9788883163b57bac39d12e5f8310c869d176454879defb78b67f8e9f1ad5225')
+
+prepare() {
+ cd "$srcdir/$pkgname-$pkgver"
+}
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --enable-gio-unix \
+ --enable-thunarx \
+ --enable-notifications \
+ --disable-debug
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: extra-x86_64/git-fixes.patch
===================================================================
--- extra-x86_64/git-fixes.patch 2015-05-17 11:30:42 UTC (rev 239492)
+++ extra-x86_64/git-fixes.patch 2015-05-17 11:30:44 UTC (rev 239493)
@@ -1,86 +0,0 @@
-From be464d06dc38cc068926e30d891318742410fc56 Mon Sep 17 00:00:00 2001
-From: Thaddaeus Tintenfisch <thad.fisch at gmail.com>
-Date: Tue, 17 Mar 2015 22:19:02 +0100
-Subject: [PATCH 1/2] Fix a previous commit
-
-This fixes commit 26bc8820e502f74b99648b213c28b681971e6ca6.
----
- src/xfdesktop-icon-view.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/xfdesktop-icon-view.c b/src/xfdesktop-icon-view.c
-index de764df..1b8c64e 100644
---- a/src/xfdesktop-icon-view.c
-+++ b/src/xfdesktop-icon-view.c
-@@ -43,6 +43,7 @@
-
- #include "xfdesktop-icon-view.h"
- #include "xfdesktop-file-icon-manager.h"
-+#include "xfdesktop-window-icon-manager.h"
- #include "xfdesktop-marshal.h"
- #include "xfce-desktop.h"
- #include "xfdesktop-volume-icon.h"
-@@ -1716,7 +1717,7 @@ xfdesktop_icon_view_drag_data_get(GtkWidget *widget,
-
- TRACE("entering");
-
-- if(XFDESKTOP_IS_ICON_VIEW_MANAGER(icon_view) == FALSE)
-+ if(XFDESKTOP_IS_WINDOW_ICON_MANAGER(icon_view->priv->manager))
- return;
-
- /* Sometimes during a ctrl+drag this is NULL
-@@ -1762,7 +1763,7 @@ xfdesktop_icon_view_drag_data_received(GtkWidget *widget,
-
- GdkDragAction action = icon_view->priv->proposed_drop_action;
-
-- if(XFDESKTOP_IS_ICON_VIEW_MANAGER(icon_view)) {
-+ if(!XFDESKTOP_IS_WINDOW_ICON_MANAGER(icon_view->priv->manager)) {
- action = xfdesktop_icon_view_manager_propose_drop_action(icon_view->priv->manager,
- icon_on_dest,
- action,
---
-2.3.4
-
-
-From a6761e4a3429fd82bb0f0b98277660d689b3d2a4 Mon Sep 17 00:00:00 2001
-From: Thaddaeus Tintenfisch <thad.fisch at gmail.com>
-Date: Mon, 23 Mar 2015 22:11:58 +0100
-Subject: [PATCH 2/2] Fix a regression
-
-This fixes a visual glitch caused by commit d8b37e5.
----
- src/xfdesktop-icon-view.c | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/src/xfdesktop-icon-view.c b/src/xfdesktop-icon-view.c
-index 1b8c64e..ae3a1a0 100644
---- a/src/xfdesktop-icon-view.c
-+++ b/src/xfdesktop-icon-view.c
-@@ -3057,13 +3057,13 @@ xfdesktop_icon_view_draw_image(cairo_t *cr, GdkPixbuf *pix, GdkRectangle *rect)
-
- static void
- xfdesktop_icon_view_draw_text(cairo_t *cr, PangoLayout *playout, GdkRectangle *text_area,
-- gint x_offset, gint y_offset, gint blur_radius,
-- GdkColor *color)
-+ GdkRectangle *box_area, gint x_offset, gint y_offset,
-+ gint blur_radius, GdkColor *color)
- {
- cairo_save(cr);
-
- /* Clip the cairo area to blur the minimum surface */
-- gdk_cairo_rectangle(cr, text_area);
-+ gdk_cairo_rectangle(cr, box_area);
- cairo_clip(cr);
-
- cairo_move_to(cr,
-@@ -3188,6 +3188,7 @@ xfdesktop_icon_view_paint_icon(XfdesktopIconView *icon_view,
- /* Draw the shadow */
- xfdesktop_icon_view_draw_text(cr, playout,
- &text_extents,
-+ &box_extents,
- x_offset,
- y_offset,
- icon_view->priv->shadow_blur_radius,
---
-2.3.4
-
Deleted: extra-x86_64/xfdesktop.install
===================================================================
--- extra-x86_64/xfdesktop.install 2015-05-17 11:30:42 UTC (rev 239492)
+++ extra-x86_64/xfdesktop.install 2015-05-17 11:30:44 UTC (rev 239493)
@@ -1,13 +0,0 @@
-post_install() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: xfdesktop/repos/extra-x86_64/xfdesktop.install (from rev 239491, xfdesktop/trunk/xfdesktop.install)
===================================================================
--- extra-x86_64/xfdesktop.install (rev 0)
+++ extra-x86_64/xfdesktop.install 2015-05-17 11:30:44 UTC (rev 239493)
@@ -0,0 +1,13 @@
+post_install() {
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
+
+# vim:set ts=2 sw=2 et:
More information about the arch-commits
mailing list