[arch-commits] Commit in xfce4-settings/repos (3 files)

2020-12-23 Thread Evangelos Foutras via arch-commits 
Date: Wednesday, December 23, 2020 @ 10:45:40
  Author: foutrelis
Revision: 404912

archrelease: copy trunk to staging-x86_64

Added:
  xfce4-settings/repos/staging-x86_64/
  xfce4-settings/repos/staging-x86_64/PKGBUILD
(from rev 404911, xfce4-settings/trunk/PKGBUILD)
  xfce4-settings/repos/staging-x86_64/default-xsettings-xml.patch
(from rev 404911, xfce4-settings/trunk/default-xsettings-xml.patch)

-+
 PKGBUILD|   51 ++
 default-xsettings-xml.patch |   26 +
 2 files changed, 77 insertions(+)

Copied: xfce4-settings/repos/staging-x86_64/PKGBUILD (from rev 404911, 
xfce4-settings/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2020-12-23 10:45:40 UTC (rev 404912)
@@ -0,0 +1,51 @@
+# Maintainer: Evangelos Foutras 
+# Contributor: tobias 
+# Contributor: Corrado Primier 
+
+pkgname=xfce4-settings
+pkgver=4.16.0
+pkgrel=1
+pkgdesc="Settings manager of the Xfce desktop"
+arch=('x86_64')
+url="https://www.xfce.org/;
+license=('GPL2')
+groups=('xfce4')
+depends=('exo' 'garcon' 'libxfce4ui' 'xfconf' 'libnotify' 'libcanberra'
+ 'colord' 'libxklavier' 'adwaita-icon-theme' 'gnome-themes-extra')
+makedepends=('intltool' 'xf86-input-libinput')
+optdepends=('python: xfce4-compose-mail -- "mailto:; URI handling')
+source=(https://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2
+default-xsettings-xml.patch)
+sha256sums=('67a1404fc754c675c6431e22a8fe0e5d79644fdfadbfe25a4523d68e1442ddc2'
+'8e9a6c70ab0ceb5d91b637dc290768f8a47edb5d7b6e2eebc4459dbc4ee040d7')
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # Enable Adwaita theme and font hinting by default
+  patch -Np1 -i "$srcdir/default-xsettings-xml.patch"
+}
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure \
+--prefix=/usr \
+--sysconfdir=/etc \
+--localstatedir=/var \
+--disable-static \
+--enable-xrandr \
+--enable-xcursor \
+--enable-libnotify \
+--enable-libxklavier \
+--enable-pluggable-dialogs \
+--enable-sound-settings \
+--disable-debug
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:

Copied: xfce4-settings/repos/staging-x86_64/default-xsettings-xml.patch (from 
rev 404911, xfce4-settings/trunk/default-xsettings-xml.patch)
===
--- staging-x86_64/default-xsettings-xml.patch  (rev 0)
+++ staging-x86_64/default-xsettings-xml.patch  2020-12-23 10:45:40 UTC (rev 
404912)
@@ -0,0 +1,26 @@
+diff -upr xfce4-settings-4.12.0.orig/xfsettingsd/xsettings.xml 
xfce4-settings-4.12.0/xfsettingsd/xsettings.xml
+--- xfce4-settings-4.12.0.orig/xfsettingsd/xsettings.xml   2015-02-24 
03:33:11.0 +0200
 xfce4-settings-4.12.0/xfsettingsd/xsettings.xml2015-03-01 
09:52:24.376869688 +0200
+@@ -6,8 +6,8 @@
+ 
+ 
+   
+-
+-
++
++
+ 
+ 
+ 
+@@ -19,9 +19,9 @@
+   
+   
+ 
+-
++
+ 
+-
++
+ 
+ 
+

[arch-commits] Commit in xfce4-settings/repos (3 files)

2019-08-11 Thread Evangelos Foutras via arch-commits 
Date: Sunday, August 11, 2019 @ 23:08:21
  Author: foutrelis
Revision: 359651

archrelease: copy trunk to staging-x86_64

Added:
  xfce4-settings/repos/staging-x86_64/
  xfce4-settings/repos/staging-x86_64/PKGBUILD
(from rev 359650, xfce4-settings/trunk/PKGBUILD)
  xfce4-settings/repos/staging-x86_64/default-xsettings-xml.patch
(from rev 359650, xfce4-settings/trunk/default-xsettings-xml.patch)

-+
 PKGBUILD|   52 ++
 default-xsettings-xml.patch |   26 +
 2 files changed, 78 insertions(+)

Copied: xfce4-settings/repos/staging-x86_64/PKGBUILD (from rev 359650, 
xfce4-settings/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-08-11 23:08:21 UTC (rev 359651)
@@ -0,0 +1,52 @@
+# Maintainer: Evangelos Foutras 
+# Contributor: tobias 
+# Contributor: Corrado Primier 
+
+pkgname=xfce4-settings
+pkgver=4.14.0
+pkgrel=1
+pkgdesc="Settings manager of the Xfce desktop"
+arch=('x86_64')
+url="https://www.xfce.org/;
+license=('GPL2')
+groups=('xfce4')
+depends=('exo' 'garcon' 'libxfce4ui' 'xfconf' 'libnotify' 'colord'
+ 'libxklavier' 'adwaita-icon-theme' 'gnome-themes-standard')
+makedepends=('intltool' 'xf86-input-libinput')
+optdepends=('libcanberra: for sound control')
+source=(https://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2
+default-xsettings-xml.patch)
+sha256sums=('e03040d623abda0222ad04f226582277a1936507ddfa927ec8e87927debc113c'
+'8e9a6c70ab0ceb5d91b637dc290768f8a47edb5d7b6e2eebc4459dbc4ee040d7')
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # Enable GNOME icon theme, Adwaita theme and font hinting by default
+  patch -Np1 -i "$srcdir/default-xsettings-xml.patch"
+}
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure \
+--prefix=/usr \
+--sysconfdir=/etc \
+--localstatedir=/var \
+--disable-static \
+--enable-xrandr \
+--enable-xcursor \
+--enable-libnotify \
+--enable-libxklavier \
+--enable-pluggable-dialogs \
+--enable-sound-settings \
+--disable-upower-glib \
+--disable-debug
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:

Copied: xfce4-settings/repos/staging-x86_64/default-xsettings-xml.patch (from 
rev 359650, xfce4-settings/trunk/default-xsettings-xml.patch)
===
--- staging-x86_64/default-xsettings-xml.patch  (rev 0)
+++ staging-x86_64/default-xsettings-xml.patch  2019-08-11 23:08:21 UTC (rev 
359651)
@@ -0,0 +1,26 @@
+diff -upr xfce4-settings-4.12.0.orig/xfsettingsd/xsettings.xml 
xfce4-settings-4.12.0/xfsettingsd/xsettings.xml
+--- xfce4-settings-4.12.0.orig/xfsettingsd/xsettings.xml   2015-02-24 
03:33:11.0 +0200
 xfce4-settings-4.12.0/xfsettingsd/xsettings.xml2015-03-01 
09:52:24.376869688 +0200
+@@ -6,8 +6,8 @@
+ 
+ 
+   
+-
+-
++
++
+ 
+ 
+ 
+@@ -19,9 +19,9 @@
+   
+   
+ 
+-
++
+ 
+-
++
+ 
+ 
+

[arch-commits] Commit in xfce4-settings/repos (3 files)

2010-01-02 Thread andyrtr 
Date: Saturday, January 2, 2010 @ 17:57:38
  Author: andyrtr
Revision: 62127

Merged revisions 62126 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/xfce4-settings/trunk


  r62126 | andyrtr | 2010-01-02 23:56:48 +0100 (Sa, 02 Jan 2010) | 2 lines
  
  upgpkg: xfce4-settings 4.6.4-1
  new version 4.6.4


Modified:
  xfce4-settings/repos/extra-i686/  (properties)
  xfce4-settings/repos/extra-i686/PKGBUILD
Deleted:
  xfce4-settings/repos/extra-i686/libxi.patch

-+
 PKGBUILD|   14 ++-
 libxi.patch |  106 --
 2 files changed, 5 insertions(+), 115 deletions(-)


Property changes on: xfce4-settings/repos/extra-i686
___
Modified: svnmerge-integrated
   - /xfce4-settings/trunk:1-57958
   + /xfce4-settings/trunk:1-62126

Modified: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2010-01-02 22:56:48 UTC (rev 62126)
+++ extra-i686/PKGBUILD 2010-01-02 22:57:38 UTC (rev 62127)
@@ -3,28 +3,24 @@
 # Contributor: Corrado Primier ba...@aur.archlinux.org
 
 pkgname=xfce4-settings
-pkgver=4.6.3
-pkgrel=3
+pkgver=4.6.4
+pkgrel=1
 pkgdesc=Settings manager for xfce
 arch=('i686' 'x86_64')
 license=('GPL2')
 url=http://www.xfce.org/;
 groups=('xfce4')
-depends=('exo=0.3.101' 'libnotify=0.4.5' 'libxfcegui4=4.6.1' 
'libxklavier=4.0' 'libwnck=2.28.0')
+depends=('exo=0.3.106' 'libnotify=0.4.5' 'libxfcegui4=4.6.1' 
'libxklavier=4.0' 'libwnck=2.28.0')
 makedepends=('intltool')
 makedepends=('intltool')
 optdepends=('libcanberra: for sound control')
 conflicts=('xfce-mcs-manager')
 replaces=('xfce-mcs-manager')
-source=( 
http://archive.xfce.org/src/xfce/${pkgname}/4.6/${pkgname}-${pkgver}.tar.bz2 
libxi.patch)
-md5sums=('60e726143baf0605f6ee8b158d536ed0'
- '8353faed197134e5815c1131ab26dc57')
+source=( 
http://archive.xfce.org/src/xfce/${pkgname}/4.6/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('04985407e8e5b916c44780314a177e96')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  # http://bugs.archlinux.org/task/16634
-  # 
http://git.xfce.org/xfce/xfce4-settings/patch/?id=041cb4450d1d7c525c3fde20c38e293665619bd3
-  patch -Np1 -i ${srcdir}/libxi.patch || return 1
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
 --disable-static --enable-libxklavier --enable-sound-settings || return 1
   make || return 1

Deleted: extra-i686/libxi.patch
===
--- extra-i686/libxi.patch  2010-01-02 22:56:48 UTC (rev 62126)
+++ extra-i686/libxi.patch  2010-01-02 22:57:38 UTC (rev 62127)
@@ -1,106 +0,0 @@
-From 041cb4450d1d7c525c3fde20c38e293665619bd3 Mon Sep 17 00:00:00 2001
-From: Nick Schermer n...@xfce.org
-Date: Sun, 11 Oct 2009 12:02:05 +
-Subject: Fix the check for Xi so it does not fail with Xi2 (bug #4929).
-

-diff --git a/dialogs/mouse-settings/main.c b/dialogs/mouse-settings/main.c
-index dc5604d..6edddac 100644
 a/dialogs/mouse-settings/main.c
-+++ b/dialogs/mouse-settings/main.c
-@@ -60,6 +60,10 @@
- #define IsXExtensionPointer 4
- #endif
- 
-+/* Xi 1.4 is required */
-+#define MIN_XI_VERS_MAJOR 1
-+#define MIN_XI_VERS_MINOR 4
-+
- /* settings */
- #ifdef HAVE_XCURSOR
- #define PREVIEW_ROWS(3)
-@@ -1221,13 +1225,21 @@ main (gint argc, gchar **argv)
- 
- return EXIT_FAILURE;
- }
--
--/* check for Xi 1.4 */
-+
-+/* check for Xi */
- version = XGetExtensionVersion (GDK_DISPLAY (), INAME);
--if (!version || !version-present || version-major_version  1 || 
version-minor_version  4)
-+if (version == NULL || !version-present)
-+{
-+g_critical (XI is not present.);
-+return EXIT_FAILURE;
-+}
-+else if (version-major_version  MIN_XI_VERS_MAJOR
-+ || (version-major_version == MIN_XI_VERS_MAJOR
-+  version-minor_version  MIN_XI_VERS_MINOR))
- {
--g_critical (XI is not present or too old.);
--
-+g_critical (Your XI is too old (%d.%d) version %d.%d is required.,
-+version-major_version, version-minor_version,
-+MIN_XI_VERS_MAJOR, MIN_XI_VERS_MINOR);
- return EXIT_FAILURE;
- }
- 
-diff --git a/xfce4-settings-helper/pointers.c 
b/xfce4-settings-helper/pointers.c
-index 6dd2cd4..b8718ba 100644
 a/xfce4-settings-helper/pointers.c
-+++ b/xfce4-settings-helper/pointers.c
-@@ -42,6 +42,10 @@
- 
- #define MAX_DENOMINATOR (100.00)
- 
-+/* Xi 1.4 is required */
-+#define MIN_XI_VERS_MAJOR 1
-+#define MIN_XI_VERS_MINOR 4
-+
- /* test if the required version of inputproto (1.4.2) is available */
- #if XI_Add_DevicePresenceNotify_Major = 1  defined (DeviceRemoved)
- #define HAS_DEVICE_HOTPLUGGING
-@@ -133,18 +137,22 @@ xfce_pointers_helper_init (XfcePointersHelper *helper)
- 
- /* get the default display */
- xdisplay =

[arch-commits] Commit in xfce4-settings/repos (3 files)

2010-01-02 Thread andyrtr 
Date: Saturday, January 2, 2010 @ 17:58:42
  Author: andyrtr
Revision: 62128

Merged revisions 62126 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/xfce4-settings/trunk


  r62126 | andyrtr | 2010-01-02 23:56:48 +0100 (Sa, 02 Jan 2010) | 2 lines
  
  upgpkg: xfce4-settings 4.6.4-1
  new version 4.6.4


Modified:
  xfce4-settings/repos/extra-x86_64/(properties)
  xfce4-settings/repos/extra-x86_64/PKGBUILD
Deleted:
  xfce4-settings/repos/extra-x86_64/libxi.patch

-+
 PKGBUILD|   14 ++-
 libxi.patch |  106 --
 2 files changed, 5 insertions(+), 115 deletions(-)


Property changes on: xfce4-settings/repos/extra-x86_64
___
Modified: svnmerge-integrated
   - /xfce4-settings/trunk:1-57951
   + /xfce4-settings/trunk:1-62127

Modified: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2010-01-02 22:57:38 UTC (rev 62127)
+++ extra-x86_64/PKGBUILD   2010-01-02 22:58:42 UTC (rev 62128)
@@ -3,28 +3,24 @@
 # Contributor: Corrado Primier ba...@aur.archlinux.org
 
 pkgname=xfce4-settings
-pkgver=4.6.3
-pkgrel=3
+pkgver=4.6.4
+pkgrel=1
 pkgdesc=Settings manager for xfce
 arch=('i686' 'x86_64')
 license=('GPL2')
 url=http://www.xfce.org/;
 groups=('xfce4')
-depends=('exo=0.3.101' 'libnotify=0.4.5' 'libxfcegui4=4.6.1' 
'libxklavier=4.0' 'libwnck=2.28.0')
+depends=('exo=0.3.106' 'libnotify=0.4.5' 'libxfcegui4=4.6.1' 
'libxklavier=4.0' 'libwnck=2.28.0')
 makedepends=('intltool')
 makedepends=('intltool')
 optdepends=('libcanberra: for sound control')
 conflicts=('xfce-mcs-manager')
 replaces=('xfce-mcs-manager')
-source=( 
http://archive.xfce.org/src/xfce/${pkgname}/4.6/${pkgname}-${pkgver}.tar.bz2 
libxi.patch)
-md5sums=('60e726143baf0605f6ee8b158d536ed0'
- '8353faed197134e5815c1131ab26dc57')
+source=( 
http://archive.xfce.org/src/xfce/${pkgname}/4.6/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('04985407e8e5b916c44780314a177e96')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  # http://bugs.archlinux.org/task/16634
-  # 
http://git.xfce.org/xfce/xfce4-settings/patch/?id=041cb4450d1d7c525c3fde20c38e293665619bd3
-  patch -Np1 -i ${srcdir}/libxi.patch || return 1
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
 --disable-static --enable-libxklavier --enable-sound-settings || return 1
   make || return 1

Deleted: extra-x86_64/libxi.patch
===
--- extra-x86_64/libxi.patch2010-01-02 22:57:38 UTC (rev 62127)
+++ extra-x86_64/libxi.patch2010-01-02 22:58:42 UTC (rev 62128)
@@ -1,106 +0,0 @@
-From 041cb4450d1d7c525c3fde20c38e293665619bd3 Mon Sep 17 00:00:00 2001
-From: Nick Schermer n...@xfce.org
-Date: Sun, 11 Oct 2009 12:02:05 +
-Subject: Fix the check for Xi so it does not fail with Xi2 (bug #4929).
-

-diff --git a/dialogs/mouse-settings/main.c b/dialogs/mouse-settings/main.c
-index dc5604d..6edddac 100644
 a/dialogs/mouse-settings/main.c
-+++ b/dialogs/mouse-settings/main.c
-@@ -60,6 +60,10 @@
- #define IsXExtensionPointer 4
- #endif
- 
-+/* Xi 1.4 is required */
-+#define MIN_XI_VERS_MAJOR 1
-+#define MIN_XI_VERS_MINOR 4
-+
- /* settings */
- #ifdef HAVE_XCURSOR
- #define PREVIEW_ROWS(3)
-@@ -1221,13 +1225,21 @@ main (gint argc, gchar **argv)
- 
- return EXIT_FAILURE;
- }
--
--/* check for Xi 1.4 */
-+
-+/* check for Xi */
- version = XGetExtensionVersion (GDK_DISPLAY (), INAME);
--if (!version || !version-present || version-major_version  1 || 
version-minor_version  4)
-+if (version == NULL || !version-present)
-+{
-+g_critical (XI is not present.);
-+return EXIT_FAILURE;
-+}
-+else if (version-major_version  MIN_XI_VERS_MAJOR
-+ || (version-major_version == MIN_XI_VERS_MAJOR
-+  version-minor_version  MIN_XI_VERS_MINOR))
- {
--g_critical (XI is not present or too old.);
--
-+g_critical (Your XI is too old (%d.%d) version %d.%d is required.,
-+version-major_version, version-minor_version,
-+MIN_XI_VERS_MAJOR, MIN_XI_VERS_MINOR);
- return EXIT_FAILURE;
- }
- 
-diff --git a/xfce4-settings-helper/pointers.c 
b/xfce4-settings-helper/pointers.c
-index 6dd2cd4..b8718ba 100644
 a/xfce4-settings-helper/pointers.c
-+++ b/xfce4-settings-helper/pointers.c
-@@ -42,6 +42,10 @@
- 
- #define MAX_DENOMINATOR (100.00)
- 
-+/* Xi 1.4 is required */
-+#define MIN_XI_VERS_MAJOR 1
-+#define MIN_XI_VERS_MINOR 4
-+
- /* test if the required version of inputproto (1.4.2) is available */
- #if XI_Add_DevicePresenceNotify_Major = 1  defined (DeviceRemoved)
- #define HAS_DEVICE_HOTPLUGGING
-@@ -133,18 +137,22 @@ xfce_pointers_helper_init (XfcePointersHelper *helper)
- 
- /* get the default display

[arch-commits] Commit in xfce4-settings/repos (3 files)

2009-11-02 Thread andyrtr 
Date: Monday, November 2, 2009 @ 17:08:54
  Author: andyrtr
Revision: 57953

Merged revisions 57950 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/xfce4-settings/trunk


  r57950 | andyrtr | 2009-11-02 22:08:01 + (Mo, 02 Nov 2009) | 2 lines
  
  upgpkg: xfce4-settings 4.6.3-3
  fix 16634, to work with new libxi


Added:
  xfce4-settings/repos/extra-x86_64/libxi.patch
(from rev 57950, xfce4-settings/trunk/libxi.patch)
Modified:
  xfce4-settings/repos/extra-x86_64/(properties)
  xfce4-settings/repos/extra-x86_64/PKGBUILD

-+
 PKGBUILD|   10 +++--
 libxi.patch |  106 ++
 2 files changed, 113 insertions(+), 3 deletions(-)


Property changes on: xfce4-settings/repos/extra-x86_64
___
Modified: svnmerge-integrated
   - /xfce4-settings/trunk:1-55213
   + /xfce4-settings/trunk:1-57951

Modified: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2009-11-02 22:08:33 UTC (rev 57952)
+++ extra-x86_64/PKGBUILD   2009-11-02 22:08:54 UTC (rev 57953)
@@ -4,7 +4,7 @@
 
 pkgname=xfce4-settings
 pkgver=4.6.3
-pkgrel=2
+pkgrel=3
 pkgdesc=Settings manager for xfce
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -16,11 +16,15 @@
 optdepends=('libcanberra: for sound control')
 conflicts=('xfce-mcs-manager')
 replaces=('xfce-mcs-manager')
-source=( 
http://archive.xfce.org/src/xfce/${pkgname}/4.6/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('60e726143baf0605f6ee8b158d536ed0')
+source=( 
http://archive.xfce.org/src/xfce/${pkgname}/4.6/${pkgname}-${pkgver}.tar.bz2 
libxi.patch)
+md5sums=('60e726143baf0605f6ee8b158d536ed0'
+ '8353faed197134e5815c1131ab26dc57')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
+  # http://bugs.archlinux.org/task/16634
+  # 
http://git.xfce.org/xfce/xfce4-settings/patch/?id=041cb4450d1d7c525c3fde20c38e293665619bd3
+  patch -Np1 -i ${srcdir}/libxi.patch || return 1
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
 --disable-static --enable-libxklavier --enable-sound-settings || return 1
   make || return 1

Copied: xfce4-settings/repos/extra-x86_64/libxi.patch (from rev 57950, 
xfce4-settings/trunk/libxi.patch)
===
--- extra-x86_64/libxi.patch(rev 0)
+++ extra-x86_64/libxi.patch2009-11-02 22:08:54 UTC (rev 57953)
@@ -0,0 +1,106 @@
+From 041cb4450d1d7c525c3fde20c38e293665619bd3 Mon Sep 17 00:00:00 2001
+From: Nick Schermer n...@xfce.org
+Date: Sun, 11 Oct 2009 12:02:05 +
+Subject: Fix the check for Xi so it does not fail with Xi2 (bug #4929).
+
+---
+diff --git a/dialogs/mouse-settings/main.c b/dialogs/mouse-settings/main.c
+index dc5604d..6edddac 100644
+--- a/dialogs/mouse-settings/main.c
 b/dialogs/mouse-settings/main.c
+@@ -60,6 +60,10 @@
+ #define IsXExtensionPointer 4
+ #endif
+ 
++/* Xi 1.4 is required */
++#define MIN_XI_VERS_MAJOR 1
++#define MIN_XI_VERS_MINOR 4
++
+ /* settings */
+ #ifdef HAVE_XCURSOR
+ #define PREVIEW_ROWS(3)
+@@ -1221,13 +1225,21 @@ main (gint argc, gchar **argv)
+ 
+ return EXIT_FAILURE;
+ }
+-
+-/* check for Xi 1.4 */
++
++/* check for Xi */
+ version = XGetExtensionVersion (GDK_DISPLAY (), INAME);
+-if (!version || !version-present || version-major_version  1 || 
version-minor_version  4)
++if (version == NULL || !version-present)
++{
++g_critical (XI is not present.);
++return EXIT_FAILURE;
++}
++else if (version-major_version  MIN_XI_VERS_MAJOR
++ || (version-major_version == MIN_XI_VERS_MAJOR
++  version-minor_version  MIN_XI_VERS_MINOR))
+ {
+-g_critical (XI is not present or too old.);
+-
++g_critical (Your XI is too old (%d.%d) version %d.%d is required.,
++version-major_version, version-minor_version,
++MIN_XI_VERS_MAJOR, MIN_XI_VERS_MINOR);
+ return EXIT_FAILURE;
+ }
+ 
+diff --git a/xfce4-settings-helper/pointers.c 
b/xfce4-settings-helper/pointers.c
+index 6dd2cd4..b8718ba 100644
+--- a/xfce4-settings-helper/pointers.c
 b/xfce4-settings-helper/pointers.c
+@@ -42,6 +42,10 @@
+ 
+ #define MAX_DENOMINATOR (100.00)
+ 
++/* Xi 1.4 is required */
++#define MIN_XI_VERS_MAJOR 1
++#define MIN_XI_VERS_MINOR 4
++
+ /* test if the required version of inputproto (1.4.2) is available */
+ #if XI_Add_DevicePresenceNotify_Major = 1  defined (DeviceRemoved)
+ #define HAS_DEVICE_HOTPLUGGING
+@@ -133,18 +137,22 @@ xfce_pointers_helper_init (XfcePointersHelper *helper)
+ 
+ /* get the default display */
+ xdisplay = gdk_x11_display_get_xdisplay (gdk_display_get_default ());
+-
++
+ /* query the extension version */
+ version = XGetExtensionVersion (xdisplay, INAME);
+-
+-/* check for Xi

[arch-commits] Commit in xfce4-settings/repos (3 files)

2009-11-02 Thread andyrtr 
Date: Monday, November 2, 2009 @ 17:11:15
  Author: andyrtr
Revision: 57959

Merged revisions 57950 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/xfce4-settings/trunk


  r57950 | andyrtr | 2009-11-02 23:08:01 +0100 (Mo, 02 Nov 2009) | 2 lines
  
  upgpkg: xfce4-settings 4.6.3-3
  fix 16634, to work with new libxi


Added:
  xfce4-settings/repos/extra-i686/libxi.patch
(from rev 57950, xfce4-settings/trunk/libxi.patch)
Modified:
  xfce4-settings/repos/extra-i686/  (properties)
  xfce4-settings/repos/extra-i686/PKGBUILD

-+
 PKGBUILD|   10 +++--
 libxi.patch |  106 ++
 2 files changed, 113 insertions(+), 3 deletions(-)


Property changes on: xfce4-settings/repos/extra-i686
___
Modified: svnmerge-integrated
   - /xfce4-settings/trunk:1-55212
   + /xfce4-settings/trunk:1-57958

Modified: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2009-11-02 22:10:15 UTC (rev 57958)
+++ extra-i686/PKGBUILD 2009-11-02 22:11:15 UTC (rev 57959)
@@ -4,7 +4,7 @@
 
 pkgname=xfce4-settings
 pkgver=4.6.3
-pkgrel=2
+pkgrel=3
 pkgdesc=Settings manager for xfce
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -16,11 +16,15 @@
 optdepends=('libcanberra: for sound control')
 conflicts=('xfce-mcs-manager')
 replaces=('xfce-mcs-manager')
-source=( 
http://archive.xfce.org/src/xfce/${pkgname}/4.6/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('60e726143baf0605f6ee8b158d536ed0')
+source=( 
http://archive.xfce.org/src/xfce/${pkgname}/4.6/${pkgname}-${pkgver}.tar.bz2 
libxi.patch)
+md5sums=('60e726143baf0605f6ee8b158d536ed0'
+ '8353faed197134e5815c1131ab26dc57')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
+  # http://bugs.archlinux.org/task/16634
+  # 
http://git.xfce.org/xfce/xfce4-settings/patch/?id=041cb4450d1d7c525c3fde20c38e293665619bd3
+  patch -Np1 -i ${srcdir}/libxi.patch || return 1
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
 --disable-static --enable-libxklavier --enable-sound-settings || return 1
   make || return 1

Copied: xfce4-settings/repos/extra-i686/libxi.patch (from rev 57950, 
xfce4-settings/trunk/libxi.patch)
===
--- extra-i686/libxi.patch  (rev 0)
+++ extra-i686/libxi.patch  2009-11-02 22:11:15 UTC (rev 57959)
@@ -0,0 +1,106 @@
+From 041cb4450d1d7c525c3fde20c38e293665619bd3 Mon Sep 17 00:00:00 2001
+From: Nick Schermer n...@xfce.org
+Date: Sun, 11 Oct 2009 12:02:05 +
+Subject: Fix the check for Xi so it does not fail with Xi2 (bug #4929).
+
+---
+diff --git a/dialogs/mouse-settings/main.c b/dialogs/mouse-settings/main.c
+index dc5604d..6edddac 100644
+--- a/dialogs/mouse-settings/main.c
 b/dialogs/mouse-settings/main.c
+@@ -60,6 +60,10 @@
+ #define IsXExtensionPointer 4
+ #endif
+ 
++/* Xi 1.4 is required */
++#define MIN_XI_VERS_MAJOR 1
++#define MIN_XI_VERS_MINOR 4
++
+ /* settings */
+ #ifdef HAVE_XCURSOR
+ #define PREVIEW_ROWS(3)
+@@ -1221,13 +1225,21 @@ main (gint argc, gchar **argv)
+ 
+ return EXIT_FAILURE;
+ }
+-
+-/* check for Xi 1.4 */
++
++/* check for Xi */
+ version = XGetExtensionVersion (GDK_DISPLAY (), INAME);
+-if (!version || !version-present || version-major_version  1 || 
version-minor_version  4)
++if (version == NULL || !version-present)
++{
++g_critical (XI is not present.);
++return EXIT_FAILURE;
++}
++else if (version-major_version  MIN_XI_VERS_MAJOR
++ || (version-major_version == MIN_XI_VERS_MAJOR
++  version-minor_version  MIN_XI_VERS_MINOR))
+ {
+-g_critical (XI is not present or too old.);
+-
++g_critical (Your XI is too old (%d.%d) version %d.%d is required.,
++version-major_version, version-minor_version,
++MIN_XI_VERS_MAJOR, MIN_XI_VERS_MINOR);
+ return EXIT_FAILURE;
+ }
+ 
+diff --git a/xfce4-settings-helper/pointers.c 
b/xfce4-settings-helper/pointers.c
+index 6dd2cd4..b8718ba 100644
+--- a/xfce4-settings-helper/pointers.c
 b/xfce4-settings-helper/pointers.c
+@@ -42,6 +42,10 @@
+ 
+ #define MAX_DENOMINATOR (100.00)
+ 
++/* Xi 1.4 is required */
++#define MIN_XI_VERS_MAJOR 1
++#define MIN_XI_VERS_MINOR 4
++
+ /* test if the required version of inputproto (1.4.2) is available */
+ #if XI_Add_DevicePresenceNotify_Major = 1  defined (DeviceRemoved)
+ #define HAS_DEVICE_HOTPLUGGING
+@@ -133,18 +137,22 @@ xfce_pointers_helper_init (XfcePointersHelper *helper)
+ 
+ /* get the default display */
+ xdisplay = gdk_x11_display_get_xdisplay (gdk_display_get_default ());
+-
++
+ /* query the extension version */
+ version = XGetExtensionVersion (xdisplay, INAME);
+-
+-/* check for Xi 1.4 */
+-if (!version